oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lots of const correctness, other cleanup.

Browse Source
This commit is contained in:
Kees van Reeuwijk 2010-04-01 12:51:31 +00:00
parent 9fd4c2a20d
commit c3f649557e
17 changed files with 96 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/amddev/amddev.c
View File

@ -55,7 +55,7 @@ static u32_t read_reg(int function, int index);
static void write_reg(int function, int index, u32_t value); static void write_reg(int function, int index, u32_t value);
static void init_domain(int index); static void init_domain(int index);
static void init_map(unsigned int ix); static void init_map(unsigned int ix);
static int do_add4pci(message *m); static int do_add4pci(const message *m);
static void add_range(phys_bytes busaddr, phys_bytes size); static void add_range(phys_bytes busaddr, phys_bytes size);
static void del_range(phys_bytes busaddr, phys_bytes size); static void del_range(phys_bytes busaddr, phys_bytes size);
static void report_exceptions(void); static void report_exceptions(void);
@ -114,7 +114,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *UNUSED(info))
{ {
/* Initialize the amddev driver. */ /* Initialize the amddev driver. */
int r, n_maps, n_domains, revision; int r, n_maps, n_domains, revision;
@ -369,7 +369,7 @@ static int do_add(message *m)
static int do_add4pci(message *m) static int do_add4pci(const message *m)
{ {
int r, pci_bus, pci_dev, pci_func; int r, pci_bus, pci_dev, pci_func;
endpoint_t proc; endpoint_t proc;

10
drivers/at_wini/at_wini.c
View File

@ -253,7 +253,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
{ {
/* Initialize the at_wini driver. */ /* Initialize the at_wini driver. */
system_hz = sys_hz(); system_hz = sys_hz();
@ -1017,7 +1017,7 @@ PRIVATE int w_specify()
/*===========================================================================* /*===========================================================================*
* do_transfer * * do_transfer *
*===========================================================================*/ *===========================================================================*/
PRIVATE int do_transfer(struct wini *wn, unsigned int precomp, PRIVATE int do_transfer(const struct wini *wn, unsigned int precomp,
unsigned int count, unsigned int sector, unsigned int count, unsigned int sector,
unsigned int opcode, int do_dma) unsigned int opcode, int do_dma)
{ {
@ -1090,7 +1090,7 @@ PRIVATE int do_transfer(struct wini *wn, unsigned int precomp,
return com_out(&cmd); return com_out(&cmd);
} }
PRIVATE void stop_dma(struct wini *wn) PRIVATE void stop_dma(const struct wini *wn)
{ {
int r; int r;
@ -1099,7 +1099,7 @@ PRIVATE void stop_dma(struct wini *wn)
if (r != 0) panic("stop_dma: sys_outb failed: %d", r); if (r != 0) panic("stop_dma: sys_outb failed: %d", r);
} }
PRIVATE void start_dma(struct wini *wn, int do_write) PRIVATE void start_dma(const struct wini *wn, int do_write)
{ {
u32_t v; u32_t v;
int r; int r;
@ -1115,7 +1115,7 @@ PRIVATE void start_dma(struct wini *wn, int do_write)
if (r != 0) panic("start_dma: sys_outb failed: %d", r); if (r != 0) panic("start_dma: sys_outb failed: %d", r);
} }
PRIVATE int error_dma(struct wini *wn) PRIVATE int error_dma(const struct wini *wn)
{ {
int r; int r;
u32_t v; u32_t v;

8
drivers/atl2/atl2.c
View File

@ -754,7 +754,7 @@ PRIVATE void atl2_reply(void)
/*===========================================================================* /*===========================================================================*
* atl2_readv * * atl2_readv *
*===========================================================================*/ *===========================================================================*/
PRIVATE void atl2_readv(message *m, int from_int) PRIVATE void atl2_readv(const message *m, int from_int)
{ {
/* Read packet data. /* Read packet data.
*/ */
@ -860,7 +860,7 @@ suspend:
/*===========================================================================* /*===========================================================================*
* atl2_writev * * atl2_writev *
*===========================================================================*/ *===========================================================================*/
PRIVATE void atl2_writev(message *m, int from_int) PRIVATE void atl2_writev(const message *m, int from_int)
{ {
/* Write packet data. /* Write packet data.
*/ */
@ -988,7 +988,7 @@ suspend:
/*===========================================================================* /*===========================================================================*
* atl2_intr * * atl2_intr *
*===========================================================================*/ *===========================================================================*/
PRIVATE void atl2_intr(message *m) PRIVATE void atl2_intr(const message *m)
{ {
/* Interrupt received. /* Interrupt received.
*/ */
@ -1206,7 +1206,7 @@ PRIVATE void atl2_dump(void)
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *UNUSED(info))
{ {
/* Initialize the atl2 driver. /* Initialize the atl2 driver.
*/ */

14
drivers/audio/common/audio_fw.c
View File

@ -49,8 +49,8 @@
FORWARD _PROTOTYPE( int msg_open, (int minor_dev_nr) ); FORWARD _PROTOTYPE( int msg_open, (int minor_dev_nr) );
FORWARD _PROTOTYPE( int msg_close, (int minor_dev_nr) ); FORWARD _PROTOTYPE( int msg_close, (int minor_dev_nr) );
FORWARD _PROTOTYPE( int msg_ioctl, (message *m_ptr) ); FORWARD _PROTOTYPE( int msg_ioctl, (const message *m_ptr) );
FORWARD _PROTOTYPE( void msg_write, (message *m_ptr) ); FORWARD _PROTOTYPE( void msg_write, (const message *m_ptr) );
FORWARD _PROTOTYPE( void msg_read, (message *m_ptr) ); FORWARD _PROTOTYPE( void msg_read, (message *m_ptr) );
FORWARD _PROTOTYPE( void msg_hardware, (void) ); FORWARD _PROTOTYPE( void msg_hardware, (void) );
FORWARD _PROTOTYPE( void msg_status, (message *m_ptr) ); FORWARD _PROTOTYPE( void msg_status, (message *m_ptr) );
@ -229,16 +229,16 @@ PRIVATE int init_driver(void) {
/* initialize hardware*/ /* initialize hardware*/
if (drv_init_hw() != OK) { if (drv_init_hw() != OK) {
error("%s: Could not initialize hardware\n", drv.DriverName, 0); error("%s: Could not initialize hardware\n", drv.DriverName);
return EIO; return EIO;
} }
/* get irq from device driver...*/ /* get irq from device driver...*/
if (drv_get_irq(&irq) != OK) { if (drv_get_irq(&irq) != OK) {
error("%s: init driver couldn't get IRQ", drv.DriverName, i); error("%s: init driver couldn't get IRQ", drv.DriverName);
return EIO; return EIO;
} }
/* todo: execute the rest of this function only once /* TODO: execute the rest of this function only once
we don't want to set irq policy twice */ we don't want to set irq policy twice */
if (executed) return OK; if (executed) return OK;
executed = TRUE; executed = TRUE;
@ -432,7 +432,7 @@ PRIVATE int close_sub_dev(int sub_dev_nr) {
} }
PRIVATE int msg_ioctl(message *m_ptr) PRIVATE int msg_ioctl(const message *m_ptr)
{ {
int status, len, chan; int status, len, chan;
sub_dev_t *sub_dev_ptr; sub_dev_t *sub_dev_ptr;
@ -495,7 +495,7 @@ PRIVATE int msg_ioctl(message *m_ptr)
} }
PRIVATE void msg_write(message *m_ptr) PRIVATE void msg_write(const message *m_ptr)
{ {
int chan; sub_dev_t *sub_dev_ptr; int chan; sub_dev_t *sub_dev_ptr;
special_file_t* special_file_ptr; special_file_t* special_file_ptr;

2
drivers/audio/es1370/es1370.c
View File

@ -24,7 +24,7 @@
/* reg(n) will be the device specific addresses */ /* reg(n) will be the device specific addresses */
#define reg(n) dev.base + n #define reg(n) (dev.base + (n))
/* prototypes of private functions */ /* prototypes of private functions */

18
drivers/audio/es1371/AC97.c
View File

@ -9,15 +9,15 @@
FORWARD _PROTOTYPE( int AC97_read, FORWARD _PROTOTYPE( int AC97_read,
(DEV_STRUCT * pCC, u16_t wAddr, u16_t *data) ); (DEV_STRUCT * pCC, u16_t wAddr, u16_t *data) );
FORWARD _PROTOTYPE( int AC97_write, FORWARD _PROTOTYPE( int AC97_write,
(DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) ); (const DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) );
FORWARD _PROTOTYPE( void set_src_sync_state, (int state) ); FORWARD _PROTOTYPE( void set_src_sync_state, (int state) );
FORWARD _PROTOTYPE( int AC97_write_unsynced, FORWARD _PROTOTYPE( int AC97_write_unsynced,
(DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) ); (const DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) );
FORWARD _PROTOTYPE( int AC97_read_unsynced, FORWARD _PROTOTYPE( int AC97_read_unsynced,
(DEV_STRUCT * pCC, u16_t wAddr, u16_t *data) ); (const DEV_STRUCT * pCC, u16_t wAddr, u16_t *data) );
FORWARD _PROTOTYPE( void set_nice_volume, (void) ); FORWARD _PROTOTYPE( void set_nice_volume, (void) );
FORWARD _PROTOTYPE( int AC97_get_volume, (struct volume_level *level) ); FORWARD _PROTOTYPE( int AC97_get_volume, (struct volume_level *level) );
FORWARD _PROTOTYPE( int AC97_set_volume, (struct volume_level *level) ); FORWARD _PROTOTYPE( int AC97_set_volume, (const struct volume_level *level) );
@ -69,7 +69,7 @@ PRIVATE void set_src_sync_state (int state)
} }
PRIVATE int AC97_write (DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) PRIVATE int AC97_write (const DEV_STRUCT * pCC, u16_t wAddr, u16_t wData)
{ {
u32_t dtemp, i; u32_t dtemp, i;
u16_t wBaseAddr = pCC->base; u16_t wBaseAddr = pCC->base;
@ -206,7 +206,8 @@ u16_t base = pCC->base;
} }
PRIVATE int AC97_write_unsynced (DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) PRIVATE int AC97_write_unsynced (const DEV_STRUCT * pCC, u16_t wAddr,
u16_t wData)
{ {
/* wait for WIP to go away */ /* wait for WIP to go away */
if (WaitBitd (pCC->base + CODEC_READ, 30, 0, WIP_TIMEOUT)) if (WaitBitd (pCC->base + CODEC_READ, 30, 0, WIP_TIMEOUT))
@ -218,7 +219,8 @@ PRIVATE int AC97_write_unsynced (DEV_STRUCT * pCC, u16_t wAddr, u16_t wData)
} }
PRIVATE int AC97_read_unsynced (DEV_STRUCT * pCC, u16_t wAddr, u16_t *data) PRIVATE int AC97_read_unsynced (const DEV_STRUCT * pCC, u16_t wAddr,
u16_t *data)
{ {
u32_t dtemp; u32_t dtemp;
@ -450,7 +452,7 @@ PRIVATE int AC97_get_volume(struct volume_level *level) {
} }
PRIVATE int AC97_set_volume(struct volume_level *level) { PRIVATE int AC97_set_volume(const struct volume_level *level) {
int cmd; int cmd;
int left; int left;
int right; int right;

8
drivers/audio/es1371/sample_rate_converter.c
View File

@ -34,9 +34,9 @@
FORWARD _PROTOTYPE( int src_reg_read, (DEV_STRUCT * DSP, FORWARD _PROTOTYPE( int src_reg_read, (const DEV_STRUCT * DSP,
u16_t reg, u16_t *data) ); u16_t reg, u16_t *data) );
FORWARD _PROTOTYPE( int src_reg_write, (DEV_STRUCT * DSP, FORWARD _PROTOTYPE( int src_reg_write, (const DEV_STRUCT * DSP,
u16_t reg, u16_t val) ); u16_t reg, u16_t val) );
@ -104,7 +104,7 @@ int src_init ( DEV_STRUCT * DSP ) {
} }
PRIVATE int src_reg_read(DEV_STRUCT * DSP, u16_t reg, u16_t *data) { PRIVATE int src_reg_read(const DEV_STRUCT * DSP, u16_t reg, u16_t *data) {
u32_t dtemp; u32_t dtemp;
/* wait for ready */ /* wait for ready */
@ -130,7 +130,7 @@ PRIVATE int src_reg_read(DEV_STRUCT * DSP, u16_t reg, u16_t *data) {
} }
PRIVATE int src_reg_write(DEV_STRUCT * DSP, u16_t reg, u16_t val) { PRIVATE int src_reg_write(const DEV_STRUCT * DSP, u16_t reg, u16_t val) {
u32_t dtemp; u32_t dtemp;
/* wait for ready */ /* wait for ready */

5
drivers/audio/sb16/sb16.c
View File

@ -429,12 +429,13 @@ PUBLIC int dsp_command(int value) {
PUBLIC int sb16_inb(int port) { PUBLIC int sb16_inb(int port) {
int s, value = -1; int s;
unsigned long value;
if ((s=sys_inb(port, &value)) != OK) if ((s=sys_inb(port, &value)) != OK)
panic("sys_inb() failed: %d", s); panic("sys_inb() failed: %d", s);
return value; return (int) value;
} }

2
drivers/bios_wini/bios_wini.c
View File

@ -126,7 +126,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *UNUSED(info))
{ {
/* Initialize the bios_wini driver. */ /* Initialize the bios_wini driver. */
long v; long v;

50
drivers/dec21140A/dec21140A.c
View File

@ -27,26 +27,26 @@
_PROTOTYPE( PRIVATE u32_t io_inl, (u16_t); ); _PROTOTYPE( PRIVATE u32_t io_inl, (u16_t); );
_PROTOTYPE( PRIVATE void io_outl, (u16_t, u32_t); ); _PROTOTYPE( PRIVATE void io_outl, (u16_t, u32_t); );
_PROTOTYPE( PRIVATE void do_conf, (message *); ); _PROTOTYPE( PRIVATE void do_conf, (const message *); );
_PROTOTYPE( PRIVATE void do_get_name, (message *); ); _PROTOTYPE( PRIVATE void do_get_name, (message *); );
_PROTOTYPE( PRIVATE void do_get_stat_s, (message *); ); _PROTOTYPE( PRIVATE void do_get_stat_s, (message *); );
_PROTOTYPE( PRIVATE void do_interrupt, (dpeth_t *); ); _PROTOTYPE( PRIVATE void do_interrupt, (dpeth_t *); );
_PROTOTYPE( PRIVATE void do_reply, (dpeth_t *, int, int); ); _PROTOTYPE( PRIVATE void do_reply, (dpeth_t *, int, int); );
_PROTOTYPE( PRIVATE void do_vread_s, (message *, int); ); _PROTOTYPE( PRIVATE void do_vread_s, (const message *, int); );
_PROTOTYPE( PRIVATE void do_watchdog, (void *); ); _PROTOTYPE( PRIVATE void do_watchdog, (void *); );
_PROTOTYPE( PRIVATE void de_update_conf, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_update_conf, (dpeth_t *); );
_PROTOTYPE( PRIVATE int de_probe, (dpeth_t *); ); _PROTOTYPE( PRIVATE int de_probe, (dpeth_t *); );
_PROTOTYPE( PRIVATE void de_conf_addr, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_conf_addr, (dpeth_t *); );
_PROTOTYPE( PRIVATE void de_first_init, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_first_init, (dpeth_t *); );
_PROTOTYPE( PRIVATE void de_reset, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_reset, (const dpeth_t *); );
_PROTOTYPE( PRIVATE void de_hw_conf, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_hw_conf, (const dpeth_t *); );
_PROTOTYPE( PRIVATE void de_start, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_start, (const dpeth_t *); );
_PROTOTYPE( PRIVATE void de_setup_frame, (dpeth_t *); ); _PROTOTYPE( PRIVATE void de_setup_frame, (dpeth_t *); );
_PROTOTYPE( PRIVATE u16_t de_read_rom, (dpeth_t *, u8_t, u8_t); ); _PROTOTYPE( PRIVATE u16_t de_read_rom, (dpeth_t *, u8_t, u8_t); );
_PROTOTYPE( PRIVATE int de_calc_iov_size, (iovec_dat_s_t *); ); _PROTOTYPE( PRIVATE int de_calc_iov_size, (iovec_dat_s_t *); );
_PROTOTYPE( PRIVATE void de_next_iov, (iovec_dat_s_t *); ); _PROTOTYPE( PRIVATE void de_next_iov, (iovec_dat_s_t *); );
_PROTOTYPE( PRIVATE void do_vwrite_s, (message *, int); ); _PROTOTYPE( PRIVATE void do_vwrite_s, (const message *, int); );
_PROTOTYPE( PRIVATE void de_get_userdata_s, (int, cp_grant_id_t, _PROTOTYPE( PRIVATE void de_get_userdata_s, (int, cp_grant_id_t,
vir_bytes, int, void *); ); vir_bytes, int, void *); );
@ -151,7 +151,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *UNUSED(info))
{ {
/* Initialize the DEC 21140A driver. */ /* Initialize the DEC 21140A driver. */
int r; int r;
@ -161,7 +161,8 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
(progname=strrchr(env_argv[0],'/')) ? progname++ : (progname=env_argv[0]); (progname=strrchr(env_argv[0],'/')) ? progname++ : (progname=env_argv[0]);
/* Request function key for debug dumps */ /* Request function key for debug dumps */
fkeys = sfkeys = 0; bit_set(sfkeys, DE_FKEY); fkeys = sfkeys = 0;
bit_set(sfkeys, DE_FKEY);
if ((fkey_map(&fkeys, &sfkeys)) != OK) if ((fkey_map(&fkeys, &sfkeys)) != OK)
printf("%s: error using Shift+F%d key(%d)\n", str_DevName, DE_FKEY, errno); printf("%s: error using Shift+F%d key(%d)\n", str_DevName, DE_FKEY, errno);
@ -187,9 +188,9 @@ PRIVATE void do_get_stat_s(message * mp)
dep = &de_table[port]; dep = &de_table[port];
dep->de_client = mp->DL_PROC; dep->de_client = mp->DL_PROC;
if ((rc = sys_safecopyto(mp->DL_PROC, mp->DL_GRANT, 0, if ((rc = sys_safecopyto(mp->DL_PROC, mp->DL_GRANT, 0UL,
(vir_bytes)&dep->de_stat, (vir_bytes)&dep->de_stat,
(vir_bytes) sizeof(dep->de_stat), 0)) != OK) sizeof(dep->de_stat), 0)) != OK)
panic(str_CopyErrMsg, rc); panic(str_CopyErrMsg, rc);
mp->m_type = DL_STAT_REPLY; mp->m_type = DL_STAT_REPLY;
@ -201,13 +202,12 @@ PRIVATE void do_get_stat_s(message * mp)
return; return;
} }
PRIVATE void do_conf(message * mp) PRIVATE void do_conf(const message * mp)
{ {
int port; int port = mp->DL_PORT;
dpeth_t *dep; dpeth_t *dep;
message reply_mess; message reply_mess;
port = mp->DL_PORT;
if (port >= 0 && port < DE_PORT_NR) { if (port >= 0 && port < DE_PORT_NR) {
dep = &de_table[port]; dep = &de_table[port];
@ -258,13 +258,17 @@ PRIVATE void do_conf(message * mp)
default: break; default: break;
} }
} else /* Port number is out of range */ } else { /* Port number is out of range */
port = ENXIO; port = ENXIO;
}
reply_mess.m_type = DL_CONF_REPLY; reply_mess.m_type = DL_CONF_REPLY;
reply_mess.m3_i1 = port; reply_mess.m3_i1 = port;
reply_mess.m3_i2 = DE_PORT_NR; reply_mess.m3_i2 = DE_PORT_NR;
*(ether_addr_t *) reply_mess.m3_ca1 = dep->de_address; /* FIXME: if port number is out of range, this uses
* uninitialized variable 'dep'.
*/
*(ether_addr_t *) reply_mess.m3_ca1 = dep->de_address;
if (send(mp->m_source, &reply_mess) != OK) if (send(mp->m_source, &reply_mess) != OK)
panic(str_SendErrMsg, mp->m_source); panic(str_SendErrMsg, mp->m_source);
@ -314,7 +318,7 @@ PRIVATE void do_reply(dpeth_t * dep, int err, int may_block)
return; return;
} }
PRIVATE void do_watchdog(void *message) PRIVATE void do_watchdog(void *UNUSED(message))
{ {
/* nothing here yet */ /* nothing here yet */
return; return;
@ -383,7 +387,7 @@ PRIVATE int de_probe(dpeth_t *dep){
return TRUE; return TRUE;
} }
PRIVATE u16_t de_read_rom(dpeth_t *dep, u8_t addr, u8_t nbAddrBits){ PRIVATE u16_t de_read_rom(const dpeth_t *dep, u8_t addr, u8_t nbAddrBits){
u16_t retVal = 0; u16_t retVal = 0;
int i; int i;
u32_t csr = 0; u32_t csr = 0;
@ -455,7 +459,7 @@ static void de_update_conf(dpeth_t * dep)
return; return;
} }
PRIVATE void do_vread_s(message * mp, int from_int) PRIVATE void do_vread_s(const message * mp, int from_int)
{ {
char *buffer; char *buffer;
u32_t size; u32_t size;
@ -725,11 +729,11 @@ PRIVATE void do_interrupt(dpeth_t *dep){
return; return;
} }
PRIVATE void de_reset(dpeth_t *dep){ PRIVATE void de_reset(const dpeth_t *dep){
io_outl(CSR_ADDR(dep, CSR0), CSR0_SWR); io_outl(CSR_ADDR(dep, CSR0), CSR0_SWR);
} }
PRIVATE void de_hw_conf(dpeth_t *dep){ PRIVATE void de_hw_conf(const dpeth_t *dep){
u32_t val; u32_t val;
/* CSR0 - global host bus prop */ /* CSR0 - global host bus prop */
@ -754,7 +758,7 @@ PRIVATE void de_hw_conf(dpeth_t *dep){
io_outl(CSR_ADDR(dep, CSR6), val); io_outl(CSR_ADDR(dep, CSR6), val);
} }
PRIVATE void de_start(dpeth_t *dep){ PRIVATE void de_start(const dpeth_t *dep){
u32_t val; u32_t val;
val = io_inl(CSR_ADDR(dep, CSR6)) | CSR6_ST | CSR6_SR; val = io_inl(CSR_ADDR(dep, CSR6)) | CSR6_ST | CSR6_SR;
io_outl(CSR_ADDR(dep, CSR6), val); io_outl(CSR_ADDR(dep, CSR6), val);
@ -829,10 +833,10 @@ PRIVATE void de_next_iov(iovec_dat_s_t * iovp){
return; return;
} }
PRIVATE void do_vwrite_s(message * mp, int from_int){ PRIVATE void do_vwrite_s(const message * mp, int from_int){
static u8_t setupDone = 0; static u8_t setupDone = 0;
int size, r, bytes, ix, totalsize; int size, r, bytes, ix, totalsize;
dpeth_t *dep = NULL; dpeth_t *dep;
iovec_dat_s_t *iovp = NULL; iovec_dat_s_t *iovp = NULL;
de_loc_descr_t *descr = NULL; de_loc_descr_t *descr = NULL;
char *buffer = NULL; char *buffer = NULL;

2
drivers/dp8390/dp8390.c
View File

@ -309,7 +309,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *UNUSED(info))
{ {
/* Initialize the dp8390 driver. */ /* Initialize the dp8390 driver. */
int i, r, tasknr; int i, r, tasknr;

2
drivers/dpeth/3c501.c
View File

@ -70,7 +70,7 @@ static void el1_reset(dpeth_t * dep)
** Name: void el1_dumpstats(dpeth_t *dep, int port, vir_bytes size) ** Name: void el1_dumpstats(dpeth_t *dep, int port, vir_bytes size)
** Function: Dumps counter on screen (support for console display). ** Function: Dumps counter on screen (support for console display).
*/ */
static void el1_dumpstats(dpeth_t * dep) static void el1_dumpstats(dpeth_t * UNUSED(dep))
{ {
return; return;

2
drivers/dpeth/3c509.c
View File

@ -105,7 +105,7 @@ static void el3_rx_mode(dpeth_t * dep)
** Name: void el3_reset(dpeth_t *dep) ** Name: void el3_reset(dpeth_t *dep)
** Function: Reset function specific for Etherlink hardware. ** Function: Reset function specific for Etherlink hardware.
*/ */
static void el3_reset(dpeth_t * dep) static void el3_reset(dpeth_t * UNUSED(dep))
{ {
return; /* Done */ return; /* Done */

4
drivers/dpeth/8390.c
View File

@ -42,7 +42,7 @@ static char RdmaErrMsg[] = "remote dma failed to complete";
** Name: void ns_rw_setup(dpeth_t *dep, int mode, int size, u16_t offset); ** Name: void ns_rw_setup(dpeth_t *dep, int mode, int size, u16_t offset);
** Function: Sets the board for reading/writing. ** Function: Sets the board for reading/writing.
*/ */
static void ns_rw_setup(dpeth_t *dep, int mode, int size, u16_t offset) static void ns_rw_setup(const dpeth_t *dep, int mode, int size, u16_t offset)
{ {
if (mode == CR_DM_RW) outb_reg0(dep, DP_ISR, ISR_RDC); if (mode == CR_DM_RW) outb_reg0(dep, DP_ISR, ISR_RDC);
@ -59,7 +59,7 @@ static void ns_rw_setup(dpeth_t *dep, int mode, int size, u16_t offset)
** Name: void ns_start_xmit(dpeth_t *dep, int size, int pageno); ** Name: void ns_start_xmit(dpeth_t *dep, int size, int pageno);
** Function: Sets the board for for transmitting and fires it. ** Function: Sets the board for for transmitting and fires it.
*/ */
static void ns_start_xmit(dpeth_t * dep, int size, int pageno) static void ns_start_xmit(const dpeth_t * dep, int size, int pageno)
{ {
outb_reg0(dep, DP_TPSR, pageno); outb_reg0(dep, DP_TPSR, pageno);

26
drivers/sb16/dsp/sb16_dsp.c
View File

@ -31,8 +31,8 @@
_PROTOTYPE(void main, (void)); _PROTOTYPE(void main, (void));
FORWARD _PROTOTYPE( int dsp_open, (void) ); FORWARD _PROTOTYPE( int dsp_open, (void) );
FORWARD _PROTOTYPE( int dsp_close, (void) ); FORWARD _PROTOTYPE( int dsp_close, (void) );
FORWARD _PROTOTYPE( int dsp_ioctl, (message *m_ptr) ); FORWARD _PROTOTYPE( int dsp_ioctl, (const message *m_ptr) );
FORWARD _PROTOTYPE( void dsp_write, (message *m_ptr) ); FORWARD _PROTOTYPE( void dsp_write, (const message *m_ptr) );
FORWARD _PROTOTYPE( void dsp_hardware_msg, (void) ); FORWARD _PROTOTYPE( void dsp_hardware_msg, (void) );
FORWARD _PROTOTYPE( void dsp_status, (message *m_ptr) ); FORWARD _PROTOTYPE( void dsp_status, (message *m_ptr) );
@ -90,7 +90,9 @@ PUBLIC int is_status_msg_expected = FALSE;
*===========================================================================*/ *===========================================================================*/
PUBLIC void main() PUBLIC void main()
{ {
int r, caller, proc_nr; int r;
endpoint_t caller;
int proc_nr;
message mess; message mess;
/* SEF local startup. */ /* SEF local startup. */
@ -143,7 +145,7 @@ send_reply:
/*===========================================================================* /*===========================================================================*
* sef_local_startup * * sef_local_startup *
*===========================================================================*/ *===========================================================================*/
PRIVATE void sef_local_startup() PRIVATE void sef_local_startup(void)
{ {
/* Register init callbacks. */ /* Register init callbacks. */
sef_setcb_init_fresh(sef_cb_init_fresh); sef_setcb_init_fresh(sef_cb_init_fresh);
@ -162,7 +164,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================* /*===========================================================================*
* sef_cb_init_fresh * * sef_cb_init_fresh *
*===========================================================================*/ *===========================================================================*/
PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info) PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
{ {
/* Initialize the rtl8169 driver. */ /* Initialize the rtl8169 driver. */
unsigned left; unsigned left;
@ -172,7 +174,7 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
*/ */
#if (CHIP == INTEL) #if (CHIP == INTEL)
DmaPtr = DmaBuffer; DmaPtr = DmaBuffer;
sys_umap(SELF, D, (vir_bytes)DmaBuffer, (phys_bytes)sizeof(DmaBuffer), &DmaPhys); sys_umap(SELF, D, (vir_bytes)DmaBuffer, sizeof(DmaBuffer), &DmaPhys);
if((left = dma_bytes_left(DmaPhys)) < DMA_SIZE) { if((left = dma_bytes_left(DmaPhys)) < DMA_SIZE) {
/* First half of buffer crosses a 64K boundary, can't DMA into that */ /* First half of buffer crosses a 64K boundary, can't DMA into that */
@ -189,7 +191,7 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
/*===========================================================================* /*===========================================================================*
* dsp_open * dsp_open
*===========================================================================*/ *===========================================================================*/
PRIVATE int dsp_open() PRIVATE int dsp_open(void)
{ {
dprint("sb16_dsp.c: dsp_open()\n"); dprint("sb16_dsp.c: dsp_open()\n");
@ -218,7 +220,7 @@ PRIVATE int dsp_open()
/*===========================================================================* /*===========================================================================*
* dsp_close * dsp_close
*===========================================================================*/ *===========================================================================*/
PRIVATE int dsp_close() PRIVATE int dsp_close(void)
{ {
dprint("sb16_dsp.c: dsp_close()\n"); dprint("sb16_dsp.c: dsp_close()\n");
@ -231,10 +233,9 @@ PRIVATE int dsp_close()
/*===========================================================================* /*===========================================================================*
* dsp_ioctl * dsp_ioctl
*===========================================================================*/ *===========================================================================*/
PRIVATE int dsp_ioctl(message *m_ptr) PRIVATE int dsp_ioctl(const message *m_ptr)
{ {
int status; int status;
phys_bytes user_phys;
unsigned int val; unsigned int val;
dprint("sb16_dsp.c: dsp_ioctl()\n"); dprint("sb16_dsp.c: dsp_ioctl()\n");
@ -271,9 +272,8 @@ PRIVATE int dsp_ioctl(message *m_ptr)
/*===========================================================================* /*===========================================================================*
* dsp_write * dsp_write
*===========================================================================*/ *===========================================================================*/
PRIVATE void dsp_write(message *m_ptr) PRIVATE void dsp_write(const message *m_ptr)
{ {
int s;
message mess; message mess;
dprint("sb16_dsp.c: dsp_write()\n"); dprint("sb16_dsp.c: dsp_write()\n");
@ -485,7 +485,7 @@ PRIVATE int dsp_reset()
*===========================================================================*/ *===========================================================================*/
PRIVATE int dsp_command(int value) PRIVATE int dsp_command(int value)
{ {
int i, status; int i;
for (i = 0; i < SB_TIMEOUT; i++) { for (i = 0; i < SB_TIMEOUT; i++) {
if((sb16_inb(DSP_STATUS) & 0x80) == 0) { if((sb16_inb(DSP_STATUS) & 0x80) == 0) {

27
drivers/sb16/mixer/sb16_mixer.c
View File

@ -26,13 +26,13 @@
_PROTOTYPE(void main, (void)); _PROTOTYPE(void main, (void));
FORWARD _PROTOTYPE( int mixer_init, (void)); FORWARD _PROTOTYPE( int mixer_init, (void));
FORWARD _PROTOTYPE( int mixer_open, (message *m_ptr)); FORWARD _PROTOTYPE( int mixer_open, (const message *m_ptr));
FORWARD _PROTOTYPE( int mixer_close, (message *m_ptr)); FORWARD _PROTOTYPE( int mixer_close, (const message *m_ptr));
FORWARD _PROTOTYPE( int mixer_ioctl, (message *m_ptr)); FORWARD _PROTOTYPE( int mixer_ioctl, (const message *m_ptr));
FORWARD _PROTOTYPE( int mixer_get, (int reg)); FORWARD _PROTOTYPE( int mixer_get, (int reg));
FORWARD _PROTOTYPE( int get_set_volume, (message *m_ptr, int flag)); FORWARD _PROTOTYPE( int get_set_volume, (const message *m_ptr, int flag));
FORWARD _PROTOTYPE( int get_set_input, (message *m_ptr, int flag, int channel)); FORWARD _PROTOTYPE( int get_set_input, (const message *m_ptr, int flag, int channel));
FORWARD _PROTOTYPE( int get_set_output, (message *m_ptr, int flag)); FORWARD _PROTOTYPE( int get_set_output, (const message *m_ptr, int flag));
PRIVATE int mixer_avail = 0; /* Mixer exists? */ PRIVATE int mixer_avail = 0; /* Mixer exists? */
@ -109,7 +109,7 @@ PRIVATE void sef_local_startup()
/*=========================================================================* /*=========================================================================*
* mixer_open * mixer_open
*=========================================================================*/ *=========================================================================*/
PRIVATE int mixer_open(message *m_ptr) PRIVATE int mixer_open(const message *m_ptr)
{ {
dprint("mixer_open\n"); dprint("mixer_open\n");
@ -123,7 +123,7 @@ PRIVATE int mixer_open(message *m_ptr)
/*=========================================================================* /*=========================================================================*
* mixer_close * mixer_close
*=========================================================================*/ *=========================================================================*/
PRIVATE int mixer_close(message *m_ptr) PRIVATE int mixer_close(const message *m_ptr)
{ {
dprint("mixer_close\n"); dprint("mixer_close\n");
@ -134,7 +134,7 @@ PRIVATE int mixer_close(message *m_ptr)
/*=========================================================================* /*=========================================================================*
* mixer_ioctl * mixer_ioctl
*=========================================================================*/ *=========================================================================*/
PRIVATE int mixer_ioctl(message *m_ptr) PRIVATE int mixer_ioctl(const message *m_ptr)
{ {
int status; int status;
@ -198,10 +198,9 @@ PRIVATE int mixer_get(int reg)
/*=========================================================================* /*=========================================================================*
* get_set_volume * * get_set_volume *
*=========================================================================*/ *=========================================================================*/
PRIVATE int get_set_volume(message *m_ptr, int flag) PRIVATE int get_set_volume(const message *m_ptr, int flag)
/* flag 0 = get, 1 = set */ /* flag 0 = get, 1 = set */
{ {
phys_bytes user_phys;
struct volume_level level; struct volume_level level;
int cmd_left, cmd_right, shift, max_level; int cmd_left, cmd_right, shift, max_level;
@ -281,13 +280,12 @@ PRIVATE int get_set_volume(message *m_ptr, int flag)
/*=========================================================================* /*=========================================================================*
* get_set_input * * get_set_input *
*=========================================================================*/ *=========================================================================*/
PRIVATE int get_set_input(message *m_ptr, int flag, int channel) PRIVATE int get_set_input(const message *m_ptr, int flag, int channel)
/* /*
* flag 0 = get, 1 = set * flag 0 = get, 1 = set
* channel 0 = left, 1 = right * channel 0 = left, 1 = right
*/ */
{ {
phys_bytes user_phys;
struct inout_ctrl input; struct inout_ctrl input;
int input_cmd, input_mask, mask, del_mask, shift; int input_cmd, input_mask, mask, del_mask, shift;
@ -347,10 +345,9 @@ PRIVATE int get_set_input(message *m_ptr, int flag, int channel)
/*=========================================================================* /*=========================================================================*
* get_set_output * * get_set_output *
*=========================================================================*/ *=========================================================================*/
PRIVATE int get_set_output(message *m_ptr, int flag) PRIVATE int get_set_output(const message *m_ptr, int flag)
/* flag 0 = get, 1 = set */ /* flag 0 = get, 1 = set */
{ {
phys_bytes user_phys;
struct inout_ctrl output; struct inout_ctrl output;
int output_mask, mask, del_mask, shift; int output_mask, mask, del_mask, shift;

2
servers/inet/mnx_eth.c
View File

@ -37,7 +37,7 @@ FORWARD _PROTOTYPE( void send_getstat, (eth_port_t *eth_port) );
PUBLIC void osdep_eth_init() PUBLIC void osdep_eth_init()
{ {
int i, j, r, rport; int i, j, r, rport;
endpoint_t tasknr; u32_t tasknr;
struct eth_conf *ecp; struct eth_conf *ecp;
eth_port_t *eth_port, *rep; eth_port_t *eth_port, *rep;
message mess; message mess;