Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

retire PUBLIC, PRIVATE and FORWARD

Browse Source
This commit is contained in:
Ben Gras
2012-03-25 20:25:53 +02:00
parent 6a73e85ad1
commit 7336a67dfe
603 changed files with 5776 additions and 5779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
lib/libaudiodriver/audio_fw.c
View File

@@ -47,43 +47,43 @@
#include <minix/ds.h>
FORWARD int msg_open(int minor_dev_nr);
FORWARD int msg_close(int minor_dev_nr);
FORWARD int msg_ioctl(const message *m_ptr);
FORWARD void msg_write(const message *m_ptr);
FORWARD void msg_read(message *m_ptr);
FORWARD void msg_hardware(void);
FORWARD void msg_status(message *m_ptr);
FORWARD int init_driver(void);
FORWARD int open_sub_dev(int sub_dev_nr, int operation);
FORWARD int close_sub_dev(int sub_dev_nr);
FORWARD void handle_int_write(int sub_dev_nr);
FORWARD void handle_int_read(int sub_dev_nr);
FORWARD void data_to_user(sub_dev_t *sub_dev_ptr);
FORWARD void data_from_user(sub_dev_t *sub_dev_ptr);
FORWARD int init_buffers(sub_dev_t *sub_dev_ptr);
FORWARD int get_started(sub_dev_t *sub_dev_ptr);
FORWARD void reply(int code, int replyee, int process,int status);
FORWARD int io_ctl_length(int io_request);
FORWARD special_file_t* get_special_file(int minor_dev_nr);
FORWARD void tell_dev(vir_bytes buf, size_t size, int pci_bus, int
static int msg_open(int minor_dev_nr);
static int msg_close(int minor_dev_nr);
static int msg_ioctl(const message *m_ptr);
static void msg_write(const message *m_ptr);
static void msg_read(message *m_ptr);
static void msg_hardware(void);
static void msg_status(message *m_ptr);
static int init_driver(void);
static int open_sub_dev(int sub_dev_nr, int operation);
static int close_sub_dev(int sub_dev_nr);
static void handle_int_write(int sub_dev_nr);
static void handle_int_read(int sub_dev_nr);
static void data_to_user(sub_dev_t *sub_dev_ptr);
static void data_from_user(sub_dev_t *sub_dev_ptr);
static int init_buffers(sub_dev_t *sub_dev_ptr);
static int get_started(sub_dev_t *sub_dev_ptr);
static void reply(int code, int replyee, int process,int status);
static int io_ctl_length(int io_request);
static special_file_t* get_special_file(int minor_dev_nr);
static void tell_dev(vir_bytes buf, size_t size, int pci_bus, int
pci_dev, int pci_func);
PRIVATE char io_ctl_buf[_IOCPARM_MASK];
PRIVATE int irq_hook_id = 0; /* id of irq hook at the kernel */
PRIVATE int irq_hook_set = FALSE;
PRIVATE int device_available = 0;/*todo*/
static char io_ctl_buf[_IOCPARM_MASK];
static int irq_hook_id = 0; /* id of irq hook at the kernel */
static int irq_hook_set = FALSE;
static int device_available = 0;/*todo*/
/* SEF functions and variables. */
FORWARD void sef_local_startup(void);
FORWARD int sef_cb_init_fresh(int type, sef_init_info_t *info);
FORWARD void sef_cb_signal_handler(int signo);
static void sef_local_startup(void);
static int sef_cb_init_fresh(int type, sef_init_info_t *info);
static void sef_cb_signal_handler(int signo);
EXTERN int sef_cb_lu_prepare(int state);
EXTERN int sef_cb_lu_state_isvalid(int state);
EXTERN void sef_cb_lu_state_dump(int state);
PUBLIC int is_status_msg_expected = FALSE;
int is_status_msg_expected = FALSE;
PUBLIC int main(void)
int main(void)
{
int r, caller;
message mess, repl_mess;
@@ -180,7 +180,7 @@ PUBLIC int main(void)
/*===========================================================================*
* sef_local_startup *
*===========================================================================*/
PRIVATE void sef_local_startup()
static void sef_local_startup()
{
/* Register init callbacks. */
sef_setcb_init_fresh(sef_cb_init_fresh);
@@ -202,13 +202,13 @@ PRIVATE void sef_local_startup()
/*===========================================================================*
* sef_cb_init_fresh *
*===========================================================================*/
PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
{
/* Initialize the audio driver framework. */
return init_driver();
}
PRIVATE int init_driver(void) {
static int init_driver(void) {
u32_t i; char irq;
static int executed = 0;
sub_dev_t* sub_dev_ptr;
@@ -263,7 +263,7 @@ PRIVATE int init_driver(void) {
/*===========================================================================*
* sef_cb_signal_handler *
*===========================================================================*/
PRIVATE void sef_cb_signal_handler(int signo)
static void sef_cb_signal_handler(int signo)
{
int i;
char irq;
@@ -289,7 +289,7 @@ PRIVATE void sef_cb_signal_handler(int signo)
}
}
PRIVATE int msg_open (int minor_dev_nr) {
static int msg_open (int minor_dev_nr) {
int r, read_chan, write_chan, io_ctl;
special_file_t* special_file_ptr;
@@ -341,7 +341,7 @@ PRIVATE int msg_open (int minor_dev_nr) {
}
PRIVATE int open_sub_dev(int sub_dev_nr, int dma_mode) {
static int open_sub_dev(int sub_dev_nr, int dma_mode) {
sub_dev_t* sub_dev_ptr;
sub_dev_ptr = &sub_dev[sub_dev_nr];
@@ -377,7 +377,7 @@ PRIVATE int open_sub_dev(int sub_dev_nr, int dma_mode) {
}
PRIVATE int msg_close(int minor_dev_nr) {
static int msg_close(int minor_dev_nr) {
int r, read_chan, write_chan, io_ctl;
special_file_t* special_file_ptr;
@@ -412,7 +412,7 @@ PRIVATE int msg_close(int minor_dev_nr) {
}
PRIVATE int close_sub_dev(int sub_dev_nr) {
static int close_sub_dev(int sub_dev_nr) {
sub_dev_t *sub_dev_ptr;
sub_dev_ptr = &sub_dev[sub_dev_nr];
if (sub_dev_ptr->DmaMode == DEV_WRITE_S && !sub_dev_ptr->OutOfData) {
@@ -436,7 +436,7 @@ PRIVATE int close_sub_dev(int sub_dev_nr) {
}
PRIVATE int msg_ioctl(const message *m_ptr)
static int msg_ioctl(const message *m_ptr)
{
int status, len, chan;
sub_dev_t *sub_dev_ptr;
@@ -497,7 +497,7 @@ PRIVATE int msg_ioctl(const message *m_ptr)
}
PRIVATE void msg_write(const message *m_ptr)
static void msg_write(const message *m_ptr)
{
int chan; sub_dev_t *sub_dev_ptr;
special_file_t* special_file_ptr;
@@ -545,7 +545,7 @@ PRIVATE void msg_write(const message *m_ptr)
}
PRIVATE void msg_read(message *m_ptr)
static void msg_read(message *m_ptr)
{
int chan; sub_dev_t *sub_dev_ptr;
special_file_t* special_file_ptr;
@@ -595,7 +595,7 @@ PRIVATE void msg_read(message *m_ptr)
}
PRIVATE void msg_hardware(void) {
static void msg_hardware(void) {
u32_t i;
@@ -621,7 +621,7 @@ PRIVATE void msg_hardware(void) {
}
PRIVATE void msg_status(message *m_ptr)
static void msg_status(message *m_ptr)
{
int i;
@@ -651,7 +651,7 @@ PRIVATE void msg_status(message *m_ptr)
}
/* handle interrupt for specified sub device; DmaMode == DEV_WRITE_S*/
PRIVATE void handle_int_write(int sub_dev_nr)
static void handle_int_write(int sub_dev_nr)
{
sub_dev_t *sub_dev_ptr;
@@ -704,7 +704,7 @@ PRIVATE void handle_int_write(int sub_dev_nr)
/* handle interrupt for specified sub device; DmaMode == DEV_READ_S */
PRIVATE void handle_int_read(int sub_dev_nr)
static void handle_int_read(int sub_dev_nr)
{
sub_dev_t *sub_dev_ptr;
@@ -755,7 +755,7 @@ PRIVATE void handle_int_read(int sub_dev_nr)
}
PRIVATE int get_started(sub_dev_t *sub_dev_ptr) {
static int get_started(sub_dev_t *sub_dev_ptr) {
u32_t i;
/* enable interrupt messages from MINIX */
@@ -775,7 +775,7 @@ PRIVATE int get_started(sub_dev_t *sub_dev_ptr) {
}
PRIVATE void data_from_user(sub_dev_t *subdev)
static void data_from_user(sub_dev_t *subdev)
{
int r;
message m;
@@ -845,7 +845,7 @@ PRIVATE void data_from_user(sub_dev_t *subdev)
}
PRIVATE void data_to_user(sub_dev_t *sub_dev_ptr)
static void data_to_user(sub_dev_t *sub_dev_ptr)
{
int r;
message m;
@@ -902,7 +902,7 @@ PRIVATE void data_to_user(sub_dev_t *sub_dev_ptr)
sub_dev_ptr->RevivePending = 0;
}
PRIVATE int init_buffers(sub_dev_t *sub_dev_ptr)
static int init_buffers(sub_dev_t *sub_dev_ptr)
{
#if (CHIP == INTEL)
char *base;
@@ -961,7 +961,7 @@ PRIVATE int init_buffers(sub_dev_t *sub_dev_ptr)
}
PRIVATE void reply(int code, int replyee, int process, int status) {
static void reply(int code, int replyee, int process, int status) {
message m;
m.m_type = code; /* DEV_REVIVE */
@@ -971,13 +971,13 @@ PRIVATE void reply(int code, int replyee, int process, int status) {
}
PRIVATE int io_ctl_length(int io_request) {
static int io_ctl_length(int io_request) {
io_request >>= 16;
return io_request & _IOCPARM_MASK;
}
PRIVATE special_file_t* get_special_file(int minor_dev_nr) {
static special_file_t* get_special_file(int minor_dev_nr) {
int i;
for(i = 0; i < drv.NrOfSpecialFiles; i++) {
@@ -992,7 +992,7 @@ PRIVATE special_file_t* get_special_file(int minor_dev_nr) {
return NULL;
}
PRIVATE void tell_dev(buf, size, pci_bus, pci_dev, pci_func)
static void tell_dev(buf, size, pci_bus, pci_dev, pci_func)
vir_bytes buf;
size_t size;
int pci_bus;

12
lib/libaudiodriver/liveupdate.c
View File

@@ -9,9 +9,9 @@ EXTERN int is_status_msg_expected;
*/
/* State management helpers */
PRIVATE int is_read_pending;
PRIVATE int is_write_pending;
PRIVATE void load_state_info(void)
static int is_read_pending;
static int is_write_pending;
static void load_state_info(void)
{
int i, dma_mode, found_pending;
@@ -44,7 +44,7 @@ PRIVATE void load_state_info(void)
/*===========================================================================*
* sef_cb_lu_prepare *
*===========================================================================*/
PUBLIC int sef_cb_lu_prepare(int state)
int sef_cb_lu_prepare(int state)
{
int is_ready;
@@ -81,7 +81,7 @@ PUBLIC int sef_cb_lu_prepare(int state)
/*===========================================================================*
* sef_cb_lu_state_isvalid *
*===========================================================================*/
PUBLIC int sef_cb_lu_state_isvalid(int state)
int sef_cb_lu_state_isvalid(int state)
{
return SEF_LU_STATE_IS_STANDARD(state) || AUDIO_STATE_IS_CUSTOM(state);
}
@@ -89,7 +89,7 @@ PUBLIC int sef_cb_lu_state_isvalid(int state)
/*===========================================================================*
* sef_cb_lu_state_dump *
*===========================================================================*/
PUBLIC void sef_cb_lu_state_dump(int state)
void sef_cb_lu_state_dump(int state)
{
/* Load state information. */
load_state_info();