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

Fix printfs with too few or too many parms, remove unused vars, fix incorrect flag tests, other code cleanup.

Browse Source
This commit is contained in:
Kees van Reeuwijk
2010-04-01 13:25:05 +00:00
parent c3f649557e
commit fc7dced1fa
59 changed files with 127 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/atl2/atl2.c
View File

@@ -1307,7 +1307,6 @@ int main(int argc, char **argv)
/* Driver task.
*/
message m;
sigset_t set;
int r;
/* Initialize SEF. */

11
drivers/dec21140A/dec21140A.c
View File

@@ -260,15 +260,15 @@ PRIVATE void do_conf(const message * mp)
}
} else { /* Port number is out of range */
port = ENXIO;
dep = NULL;
}
reply_mess.m_type = DL_CONF_REPLY;
reply_mess.m3_i1 = port;
reply_mess.m3_i2 = DE_PORT_NR;
/* FIXME: if port number is out of range, this uses
* uninitialized variable 'dep'.
*/
*(ether_addr_t *) reply_mess.m3_ca1 = dep->de_address;
if(dep != NULL){
*(ether_addr_t *) reply_mess.m3_ca1 = dep->de_address;
}
if (send(mp->m_source, &reply_mess) != OK)
panic(str_SendErrMsg, mp->m_source);
@@ -291,7 +291,7 @@ PRIVATE void do_get_name(message *mp)
PRIVATE void do_reply(dpeth_t * dep, int err, int may_block)
{
message reply;
int status = FALSE;
int status = 0;
if (dep->de_flags & DEF_ACK_SEND) status |= DL_PACK_SEND;
if (dep->de_flags & DEF_ACK_RECV) status |= DL_PACK_RECV;
@@ -620,7 +620,6 @@ PRIVATE void de_first_init(dpeth_t *dep)
int i,j,r;
vir_bytes descr_vir = dep->sendrecv_descr_buf;
vir_bytes buffer_vir = dep->sendrecv_buf;
de_descr_t *phys_descr;
de_loc_descr_t *loc_descr;
u32_t temp;

4
drivers/orinoco/hermes.c
View File

@@ -624,8 +624,8 @@ int hermes_read_ltv (hermes_t * hw, int bap, u16_t rid, unsigned bufsize,
if (rtype != rid) {
printf("hermes @ %lx: hermes_read_ltv(): rid (0x%04x)",
hw->iobase);
printf("does not match type (0x%04x)\n", rid, rtype);
hw->iobase, rid);
printf("does not match type (0x%04x)\n", rtype);
}
if (HERMES_RECLEN_TO_BYTES (rlength) > bufsize) {

9
drivers/pci/pci.c
View File

@@ -1168,7 +1168,7 @@ int devind;
/*===========================================================================*
* record_bars *
*===========================================================================*/
PRIVATE void record_bars(devind, last_reg)
PRIVATE void record_bars(int devind, int last_reg)
{
int i, reg, width;
@@ -2397,7 +2397,7 @@ int port;
port);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n");
printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
@@ -2514,7 +2514,7 @@ u32_t value;
port, value);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n");
printf("PCI: warning, sys_outl failed: %d\n",s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
@@ -2523,8 +2523,7 @@ u32_t value;
/*===========================================================================*
* pcii_rsts *
*===========================================================================*/
PRIVATE u16_t pcii_rsts(busind)
int busind;
PRIVATE u16_t pcii_rsts(int busind)
{
u16_t v;
int s;

7
drivers/rtl8169/rtl8169.c
View File

@@ -263,7 +263,7 @@ _PROTOTYPE( static void check_int_events, (void) );
_PROTOTYPE( static void do_hard_int, (void) );
_PROTOTYPE( static void rtl8169_dump, (void) );
_PROTOTYPE( static void dump_phy, (re_t *rep) );
_PROTOTYPE( static int rl_handler, (re_t *rep) );
_PROTOTYPE( static void rl_handler, (re_t *rep) );
_PROTOTYPE( static void rl_watchdog_f, (timer_t *tp) );
/*
@@ -1989,8 +1989,7 @@ static void do_hard_int(void)
/*===========================================================================*
* rl_handler *
*===========================================================================*/
static int rl_handler(rep)
re_t *rep;
static void rl_handler(re_t *rep)
{
int i, port, tx_head, tx_tail, link_up;
u16_t isr;
@@ -2093,8 +2092,6 @@ re_t *rep;
if (isr)
printf("rl_handler: unhandled interrupt isr = 0x%04x\n", isr);
return 1;
}
/*===========================================================================*

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

@@ -328,10 +328,10 @@ PRIVATE int get_set_input(const message *m_ptr, int flag, int channel)
mixer_set(input_cmd, mask);
} else { /* Get input */
if (shift > 0) {
input.left = (((mask >> (shift+1)) & 1) == 1 ? ON : OFF);
input.right = (((mask >> shift) & 1) == 1 ? ON : OFF);
input.left = ((((mask >> (shift+1)) & 1) == 1) ? ON : OFF);
input.right = ((((mask >> shift) & 1) == 1) ? ON : OFF);
} else {
input.left = ((mask & 1) == 1 ? ON : OFF);
input.left = (((mask & 1) == 1) ? ON : OFF);
}
/* Copy back to user */
@@ -384,10 +384,10 @@ PRIVATE int get_set_output(const message *m_ptr, int flag)
mixer_set(MIXER_OUTPUT_CTRL, mask);
} else { /* Get input */
if (shift > 0) {
output.left = (((mask >> (shift+1)) & 1) == 1 ? ON : OFF);
output.right = (((mask >> shift) & 1) == 1 ? ON : OFF);
output.left = ((((mask >> (shift+1)) & 1) == 1) ? ON : OFF);
output.right = ((((mask >> shift) & 1) == 1) ? ON : OFF);
} else {
output.left = ((mask & 1) == 1 ? ON : OFF);
output.left = (((mask & 1) == 1) ? ON : OFF);
}
/* Copy back to user */

2
drivers/ti1225/ti1225.c
View File

@@ -440,7 +440,7 @@ struct port *pp;
v8= pci_attr_r8(devind, TI_CARD_CTRL);
if (v8 & TI_CCR_IFG)
{
printf("ti1225: got functional interrupt\n", v8);
printf("ti1225: got functional interrupt\n");
pci_attr_w8(devind, TI_CARD_CTRL, v8);
}