From bb6646c299da3dde90b2e208ba0a7d5a71719a0c Mon Sep 17 00:00:00 2001 From: Marin Ramesa Date: Sat, 14 Dec 2013 12:26:00 +0100 Subject: Type definition * i386/i386/ast_check.c (init_ast_check, cause_ast_check): Define return type. * i386/i386/pic.c (intnull, prtnull): Define argument types. * i386/i386at/com.c (compr_addr): Likewise. (compr): Likewise. (compr_addr): Fix printf format. * i386/i386at/kd.c (kd_cmdreg_write, kd_kbd_magic): Define argument types. * i386/i386at/kd_mouse.c (init_mouse_hw): Likewise. * ipc/mach_port.c (sact_count): Define return type. * ipc/mach_rpc.c (mach_port_rpc_sig): Define argument types. * kern/act.c (dump_act): Define return type. * kern/lock_mon.c (simple_lock, simple_lock_try, simple_unlock, lip, lock_info_sort, lock_info_clear, print_lock_info): Define return type. (time_lock): Define return type and argument type. * kern/timer.c (time_trap_uexit): Define argument type. --- i386/i386/ast_check.c | 4 ++-- i386/i386/pic.c | 4 ++-- i386/i386at/com.c | 10 +++++----- i386/i386at/kd.c | 4 ++-- i386/i386at/kd_mouse.c | 2 +- ipc/mach_port.c | 2 +- ipc/mach_rpc.c | 2 +- kern/act.c | 2 +- kern/lock_mon.c | 16 ++++++++-------- kern/timer.c | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/i386/i386/ast_check.c b/i386/i386/ast_check.c index 9afb902..61c68da 100644 --- a/i386/i386/ast_check.c +++ b/i386/i386/ast_check.c @@ -37,7 +37,7 @@ /* * Initialize for remote invocation of ast_check. */ -init_ast_check(processor) +void init_ast_check(processor) processor_t processor; { } @@ -45,7 +45,7 @@ init_ast_check(processor) /* * Cause remote invocation of ast_check. Caller is at splsched(). */ -cause_ast_check(processor) +void cause_ast_check(processor) processor_t processor; { } diff --git a/i386/i386/pic.c b/i386/i386/pic.c index 9c51497..e8c881a 100644 --- a/i386/i386/pic.c +++ b/i386/i386/pic.c @@ -237,7 +237,7 @@ form_pic_mask(void) } void -intnull(unit_dev) +intnull(int unit_dev) { printf("intnull(%d)\n", unit_dev); } @@ -245,7 +245,7 @@ intnull(unit_dev) int prtnull_count = 0; void -prtnull(unit) +prtnull(int unit) { ++prtnull_count; } diff --git a/i386/i386at/com.c b/i386/i386at/com.c index 4a62bb7..8f293af 100644 --- a/i386/i386at/com.c +++ b/i386/i386at/com.c @@ -826,16 +826,16 @@ int flags; * Code to be called from debugger. * */ -void compr_addr(addr) +void compr_addr(vm_offset_t addr) { /* The two line_stat prints may show different values, since * touching some of the registers constitutes changing them. */ - printf("LINE_STAT(%x) %x\n", + printf("LINE_STAT(%lu) %x\n", LINE_STAT(addr), inb(LINE_STAT(addr))); - printf("TXRX(%x) %x, INTR_ENAB(%x) %x, INTR_ID(%x) %x, LINE_CTL(%x) %x,\n\ -MODEM_CTL(%x) %x, LINE_STAT(%x) %x, MODEM_STAT(%x) %x\n", + printf("TXRX(%lu) %x, INTR_ENAB(%lu) %x, INTR_ID(%lu) %x, LINE_CTL(%lu) %x,\n\ +MODEM_CTL(%lu) %x, LINE_STAT(%lu) %x, MODEM_STAT(%lu) %x\n", TXRX(addr), inb(TXRX(addr)), INTR_ENAB(addr), inb(INTR_ENAB(addr)), INTR_ID(addr), inb(INTR_ID(addr)), @@ -845,7 +845,7 @@ MODEM_CTL(%x) %x, LINE_STAT(%x) %x, MODEM_STAT(%x) %x\n", MODEM_STAT(addr),inb(MODEM_STAT(addr))); } -int compr(unit) +int compr(int unit) { compr_addr(cominfo[unit]->address); return(0); diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c index a326626..33d1799 100644 --- a/i386/i386at/kd.c +++ b/i386/i386at/kd.c @@ -2283,7 +2283,7 @@ int ch=KC_CMD_READ; } void -kd_cmdreg_write(val) +kd_cmdreg_write(int val) { int ch=KC_CMD_WRITE; @@ -2400,7 +2400,7 @@ static int which_button[] = {0, MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT}; static struct mouse_motion moved; int -kd_kbd_magic(scancode) +kd_kbd_magic(int scancode) { int new_button = 0; diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c index 9aa4b81..ef399a5 100644 --- a/i386/i386at/kd_mouse.c +++ b/i386/i386at/kd_mouse.c @@ -112,7 +112,7 @@ int mouse_char_index; /* mouse response */ * init_mouse_hw - initialize the serial port. */ void -init_mouse_hw(unit, mode) +init_mouse_hw(dev_t unit, int mode) { unsigned short base_addr = cominfo[unit]->address; diff --git a/ipc/mach_port.c b/ipc/mach_port.c index 3e5af40..fbc5e69 100644 --- a/ipc/mach_port.c +++ b/ipc/mach_port.c @@ -1457,7 +1457,7 @@ mach_port_set_rpcinfo(space, name, rpc_info, rpc_info_count) int sacts, maxsacts; #endif -sact_count() +void sact_count(void) { printf("%d server activations in use, %d max\n", sacts, maxsacts); } diff --git a/ipc/mach_rpc.c b/ipc/mach_rpc.c index 7f5b2eb..643d0fb 100644 --- a/ipc/mach_rpc.c +++ b/ipc/mach_rpc.c @@ -141,7 +141,7 @@ mach_port_rpc_copy(portp, sact, dact) } kern_return_t -mach_port_rpc_sig(space, name, buffer, buflen) +mach_port_rpc_sig(ipc_space_t space, char *name, char *buffer, unsigned int buflen) { return KERN_FAILURE; } diff --git a/kern/act.c b/kern/act.c index c0b6aa8..b8ad602 100644 --- a/kern/act.c +++ b/kern/act.c @@ -1076,7 +1076,7 @@ void act_count(void) ACT_STATIC_KLUDGE-i, ACT_STATIC_KLUDGE, ACT_STATIC_KLUDGE-amin); } -dump_act(act) +void dump_act(act) Act *act; { act_count(); diff --git a/kern/lock_mon.c b/kern/lock_mon.c index 6138efc..33ce70f 100644 --- a/kern/lock_mon.c +++ b/kern/lock_mon.c @@ -112,7 +112,7 @@ decl_simple_lock_data(, **lock) } -simple_lock(lock) +void simple_lock(lock) decl_simple_lock_data(, *lock) { struct lock_info *li = locate_lock_info(&lock); @@ -131,7 +131,7 @@ decl_simple_lock_data(, *lock) li->time = time_stamp - li->time; } -simple_lock_try(lock) +int simple_lock_try(lock) decl_simple_lock_data(, *lock) { struct lock_info *li = locate_lock_info(&lock); @@ -151,7 +151,7 @@ decl_simple_lock_data(, *lock) } } -simple_unlock(lock) +void simple_unlock(lock) decl_simple_lock_data(, *lock) { time_stamp_t stamp = time_stamp; @@ -167,13 +167,13 @@ decl_simple_lock_data(, *lock) } } -lip() { +void lip(void) { lis(4, 1, 0); } #define lock_info_sort lis -lock_info_sort(arg, abs, count) +void lock_info_sort(arg, abs, count) { struct lock_info *li, mean; int bucket = 0; @@ -251,7 +251,7 @@ lock_info_sort(arg, abs, count) #define lock_info_clear lic -lock_info_clear() +void lock_info_clear(void) { struct lock_info *li; int bucket = 0; @@ -265,7 +265,7 @@ lock_info_clear() memset(&default_lock_info, 0, sizeof(struct lock_info)); } -print_lock_info(li) +void print_lock_info(li) struct lock_info *li; { int off; @@ -293,7 +293,7 @@ struct lock_info *li; * Measure lock/unlock operations */ -time_lock(loops) +void time_lock(int loops) { decl_simple_lock_data(, lock) time_stamp_t stamp; diff --git a/kern/timer.c b/kern/timer.c index 6ee9a10..47b834c 100644 --- a/kern/timer.c +++ b/kern/timer.c @@ -147,7 +147,7 @@ unsigned ts; * user mode. */ void -time_trap_uexit(ts) +time_trap_uexit(int ts) { int elapsed; int mycpu; -- cgit v1.2.3