Miscellaneous code cleanup.

This commit is contained in:
Kees van Reeuwijk
2010-03-22 20:43:06 +00:00
parent 4b2310a7ee
commit c33102ea6b
20 changed files with 38 additions and 44 deletions

View File

@@ -211,10 +211,10 @@ _PROTOTYPE (static void or_reset, (void));
_PROTOTYPE (static void or_watchdog_f, (timer_t *tp) );
_PROTOTYPE (static void setup_wepkey, (t_or *orp, char *wepkey0) );
_PROTOTYPE (static void or_getstat, (message *m));
_PROTOTYPE (static int do_hard_int, (void));
_PROTOTYPE (static void do_hard_int, (void));
_PROTOTYPE (static void check_int_events, (void));
_PROTOTYPE (static void or_getname, (message *m));
_PROTOTYPE (static int or_handler, (t_or *orp));
_PROTOTYPE (static void or_handler, (t_or *orp));
_PROTOTYPE (static void or_dump, (message *m));
/* The message used in the main loop is made global, so that rl_watchdog_f()
@@ -425,7 +425,8 @@ static void or_getname(message *mp) {
* *
* Process the interrupts which the card generated *
*****************************************************************************/
static int do_hard_int(void) {
static void do_hard_int(void)
{
u16_t evstat;
hermes_t *hw;
int i,s;
@@ -1108,7 +1109,8 @@ static void or_rec_mode (t_or * orp) {
* like EV_INFO and EV_RX have to be handled before an acknowledgement for *
* the event is returned to the card. See also the documentation *
*****************************************************************************/
static int or_handler (t_or *orp) {
static void or_handler (t_or *orp)
{
int i, err, length, nr = 0;
u16_t evstat, events, fid;
hermes_t *hw;

View File

@@ -172,7 +172,7 @@ _PROTOTYPE( static void rl_getname, (message *mp) );
_PROTOTYPE( static void reply, (re_t *rep, int err, int may_block) );
_PROTOTYPE( static void mess_reply, (message *req, message *reply) );
_PROTOTYPE( static void check_int_events, (void) );
_PROTOTYPE( static int do_hard_int, (void) );
_PROTOTYPE( static void do_hard_int, (void) );
_PROTOTYPE( static void rtl8139_dump, (message *m) );
#if 0
_PROTOTYPE( static void dump_phy, (re_t *rep) );
@@ -2402,7 +2402,7 @@ re_t *rep;
}
#endif
static int do_hard_int(void)
static void do_hard_int(void)
{
int i,s;

View File

@@ -330,8 +330,8 @@ PRIVATE int get_set_input(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);
}
@@ -387,8 +387,8 @@ PRIVATE int get_set_output(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);
}