[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Gnumach cleanup - 'return type defaults to int'
From: |
Barry deFreese |
Subject: |
Gnumach cleanup - 'return type defaults to int' |
Date: |
Mon, 13 Nov 2006 05:39:34 -0500 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.8) Gecko/20050513 Debian/1.7.8-1 |
As per Samuels request, here is a patch to clean up all warnings for
non-typed functions.
* device/cons.c
* cninit() Add void return type to function definition
* cngetc() return type int
* cnmaygetc() Likewise
* cnputc() return type void
* device/net_io.c
* net_del_q_info() return type void
* net_free_dead_infp() Likewise
* net_free_dead_entp() Likewise
* device/chario.c
* tty_cts() Likewise
* i386/i386at/com.c
* comintr() return type int
* comparm() return type void
* comtimer() Likewise
* fix_modem_state() Likewise
* commodem_intr() Likewise
* commctl() return type int
* comstop() return type int
* i386/i386at/rtc.c
* rtcinit() Likewise
* rtcput() Likewise
* yeartoday() return type int
* readtodc() return type int
* i386/i386at/iopl.c
* ioplopen() return type int
* ioplclose() return type int
* i386/i386at/kd.c
* kd_io_map_open() return type void
* kd_io_map_close() Likewise
* feep() Likewise
* pause() Likewise
* kd_debug_put() Likewise
* cnpollc() Likewise
* kdopen() return type int
* kdclose() return type void
* kdread() return type int
* kdwrite() Likewise
* kdportdeath() Likewise
* kdsetbell() Likewise
* kdgetkbent() Likewise
* kdintr() return type void
* kd_handle_ack() return type void
* kd_resend() Likewise
* do_modifier() return type int
* kdstate2idx() Likewise
* kdstart() Likewise
* kdstop() return type void
* kdinit() Likewise
* kd_belloff() Likewise
* kd_bellon() Likewise
* kd_putc() Likewise
* kd_setpos() Likewise
* kd_scrollup() Likewise
* kd_scrolldn() Likewise
* kd_parseesc() Likewise
* kd_parserest() Likewise
* kd_tab() Likewise
* kd_cls() Likewise
* kd_home() Likewise
* kd_up() Likewise
* kd_down() Likewise
* kd_right() Likewise
* kd_left() Likewise
* kd_cr() Likewise
* kd_cltobcur() Likewise
* kd_cltopcur() Likewise
* kd_cltoecur() Likewise
* kd_clfrbcur() Likewise
* kd_delln() Likewise
* kd_insln() Likewise
* kd_delch() Likewise
* kd_erase() Likewise
* kd_eraseln() Likewise
* kd_insch() Likewise
* kd_isupper() return type boolean_t
* kd_islower() Likewise
* kd_senddata() return type void
* kd_sendcmd() Likewise
* kd_cmdreg_read() return type unsigned char
* kd_cmdreg_write() return type void
* kd_mouse_drain() Likewise
* set_kd_state() Likewise
* kd_setleds1() Likewise
* kd_setleds2() Likewise
* cnsetleds() Likewise
* kdreboot() Likewise
* kd_kbd_magic() return type int
* i386/i386at/kd_event.c
* kbdinit() return type void
* kbdopen() return type int
* kbdclose() return type void
* kbdioctl() return type int
* kbdselect() Likewise
* kbdread() Likewise
* kdb_in_out() return type void
* X_kdb_enter() Likewise
* X_kdb_exit() Likewise
* X_kdb_enter_init() Likewise
* X_kdb_exit_init() Likewise
* i386/i386at/kd_mouse.c
* init_mouse_hw() return type void
* mouseopen() return type int
* serial_mouse_open() return type void
* kd_mouse_open() Likewise
* mouseclose() Likewise
* serial_mouse_close() Likewise
* kd_mouse_close() Likewise
* mouseioctl() return type int
* mouseselect() Likewise
* mouseread() Likewise
* mouseread() return type void
* mouse_handle_byte() Likewise
* mouse_packet_mouse_system_mouse() Likewise
* mouse_packet_microsoft_mouse() Likewise
* ibm_ps2_mouse_open() Likewise
* ibm_ps2_mouse_close() Likewise
* mouse_packet_ibm_ps2_mouse() Likewise
* mouse_moved() Likewise
* mouse_button() Likewise
* i386/i386at/model_dep.c
* i386at_init() return type void
* timemmap() return type int
* startrtclock() return type void
* i386/i386at/lpr.c
* lprprobe() return type int
* lpropen() Likewise
* lprclose() return type void
* lprread() return type int
* lprwrite() Likewise
* lprportdeath() Likewise
* lprstop() Likewise
* lprpr() return type int
* lprpr_addr() return type void
* i386/i386/fpu.c
* fpnoextflt() return type void
* fpextovrflt() Likewise
* fpexterrflt() Likewise
* fp_save() Likewise
* fp_load() Likewise
* fpintr() Likewise
* i386/i386/loose_ends.c
* delay() return type void
* i386/i386/phys.c
* pmap_zero_page() return type void
* pmap_copy_page() Likewise
* copy_to_phys() Likewise
* copy_from_phys() Likewise
* i386/i386/pic.c
* picinit() return type void
* form_pic_mask() Likewise
* intnull() Likewise
* prtnull() Likewise
* i386/i386/pit.c
* clkstart() return type void
* i386/intel/pmap.c
* pmap_pageable() return type void
Thanks,
Barry deFreese (aka bddebian)
Index: device/chario.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/device/Attic/chario.c,v
retrieving revision 1.3.2.1
diff -u -p -r1.3.2.1 chario.c
--- device/chario.c 15 Oct 2006 14:59:03 -0000 1.3.2.1
+++ device/chario.c 13 Nov 2006 05:32:36 -0000
@@ -1080,6 +1080,7 @@ boolean_t ttymodem(
*
* Tty must be locked and on master.
*/
+void
tty_cts(
struct tty * tp,
boolean_t cts_up)
Index: device/cons.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/device/Attic/cons.c,v
retrieving revision 1.2.4.5
diff -u -p -r1.2.4.5 cons.c
--- device/cons.c 11 Nov 2006 01:12:23 -0000 1.2.4.5
+++ device/cons.c 13 Nov 2006 05:32:36 -0000
@@ -72,6 +72,7 @@ static char *consbp = consbuf;
static int consbufused = 0;
#endif
+void
cninit()
{
struct consdev *cp;
@@ -225,6 +226,7 @@ cncontrol(dev, cmd, data)
#endif
#endif
+int
cngetc()
{
if (cn_tab)
@@ -235,6 +237,7 @@ cngetc()
}
#ifdef MACH_KERNEL
+int
cnmaygetc()
{
if (cn_tab)
@@ -245,6 +248,7 @@ cnmaygetc()
}
#endif
+void
cnputc(c)
int c;
{
Index: device/net_io.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/device/net_io.c,v
retrieving revision 1.2.2.10
diff -u -p -r1.2.2.10 net_io.c
--- device/net_io.c 11 Nov 2006 00:54:05 -0000 1.2.2.10
+++ device/net_io.c 13 Nov 2006 05:32:36 -0000
@@ -2104,6 +2104,7 @@ net_add_q_info (rcv_port)
return (int)qlimit;
}
+void
net_del_q_info (qlimit)
int qlimit;
{
@@ -2121,6 +2122,7 @@ net_del_q_info (qlimit)
* Deallocates dead net_rcv_port_t.
* No locks should be held when called.
*/
+void
net_free_dead_infp (dead_infp)
queue_entry_t dead_infp;
{
@@ -2142,6 +2144,7 @@ net_free_dead_infp (dead_infp)
* Deallocates dead net_hash_entry_t.
* No locks should be held when called.
*/
+void
net_free_dead_entp (dead_entp)
queue_entry_t dead_entp;
{
Index: i386/i386/fpu.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386/fpu.c,v
retrieving revision 1.2.4.7
diff -u -p -r1.2.4.7 fpu.c
--- i386/i386/fpu.c 10 Nov 2006 01:22:57 -0000 1.2.4.7
+++ i386/i386/fpu.c 13 Nov 2006 05:32:41 -0000
@@ -459,6 +459,7 @@ ASSERT_IPL(SPL0);
/*
* Coprocessor not present.
*/
+void
fpnoextflt()
{
/*
@@ -502,6 +503,7 @@ ASSERT_IPL(SPL0);
* FPU overran end of segment.
* Re-initialize FPU. Floating point state is not valid.
*/
+void
fpextovrflt()
{
register thread_t thread = current_thread();
@@ -553,6 +555,7 @@ fpextovrflt()
/*
* FPU error. Called by AST.
*/
+void
fpexterrflt()
{
register thread_t thread = current_thread();
@@ -612,6 +615,7 @@ ASSERT_IPL(SPL0);
* . if called from fpnoextflt or fp_intr, we are single-cpu
* . otherwise, thread is running.
*/
+void
fp_save(thread)
register thread_t thread;
{
@@ -630,6 +634,7 @@ fp_save(thread)
*
* Locking not needed; always called on the current thread.
*/
+void
fp_load(thread)
register thread_t thread;
{
@@ -702,6 +707,7 @@ fp_state_alloc()
* Handle a coprocessor error interrupt on the AT386.
* This comes in on line 5 of the slave PIC at SPL1.
*/
+void
fpintr()
{
spl_t s;
Index: i386/i386/loose_ends.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386/Attic/loose_ends.c,v
retrieving revision 1.2.4.1
diff -u -p -r1.2.4.1 loose_ends.c
--- i386/i386/loose_ends.c 9 Oct 2006 10:57:00 -0000 1.2.4.1
+++ i386/i386/loose_ends.c 13 Nov 2006 05:32:41 -0000
@@ -41,6 +41,7 @@ int boothowto = 0;
/* Someone with time should write code to set cpuspeed automagically */
int cpuspeed = 4;
#define DELAY(n) { register int N = cpuspeed * (n); while (--N >
0); }
+void
delay(n)
{
DELAY(n);
Index: i386/i386/phys.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386/phys.c,v
retrieving revision 1.1.1.1.4.1
diff -u -p -r1.1.1.1.4.1 phys.c
--- i386/i386/phys.c 5 Nov 2006 18:54:51 -0000 1.1.1.1.4.1
+++ i386/i386/phys.c 13 Nov 2006 05:32:41 -0000
@@ -41,6 +41,7 @@
/*
* pmap_zero_page zeros the specified (machine independent) page.
*/
+void
pmap_zero_page(p)
vm_offset_t p;
{
@@ -51,6 +52,7 @@ pmap_zero_page(p)
/*
* pmap_copy_page copies the specified (machine independent) pages.
*/
+void
pmap_copy_page(src, dst)
vm_offset_t src, dst;
{
@@ -65,6 +67,7 @@ pmap_copy_page(src, dst)
*
* Copy virtual memory to physical memory
*/
+void
copy_to_phys(src_addr_v, dst_addr_p, count)
vm_offset_t src_addr_v, dst_addr_p;
int count;
@@ -79,6 +82,7 @@ copy_to_phys(src_addr_v, dst_addr_p, cou
* Copy physical memory to virtual memory. The virtual memory
* is assumed to be present (e.g. the buffer pool).
*/
+void
copy_from_phys(src_addr_p, dst_addr_v, count)
vm_offset_t src_addr_p, dst_addr_v;
int count;
Index: i386/i386/pic.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386/pic.c,v
retrieving revision 1.2.2.8
diff -u -p -r1.2.2.8 pic.c
--- i386/i386/pic.c 11 Nov 2006 01:39:01 -0000 1.2.2.8
+++ i386/i386/pic.c 13 Nov 2006 05:32:41 -0000
@@ -104,6 +104,7 @@ u_short PICM_ICW4, PICS_ICW4 ;
**
*/
+void
picinit()
{
@@ -221,6 +222,7 @@ picinit()
#define SLAVEACTV 0xFF00
+void
form_pic_mask()
{
unsigned int i, j, bit, mask;
@@ -237,12 +239,15 @@ form_pic_mask()
}
}
+void
intnull(unit_dev)
{
printf("intnull(%d)\n", unit_dev);
}
int prtnull_count = 0;
+
+void
prtnull(unit)
{
++prtnull_count;
Index: i386/i386/pit.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386/pit.c,v
retrieving revision 1.3.2.4
diff -u -p -r1.3.2.4 pit.c
--- i386/i386/pit.c 11 Nov 2006 00:54:05 -0000 1.3.2.4
+++ i386/i386/pit.c 13 Nov 2006 05:32:41 -0000
@@ -65,6 +65,7 @@ int pit0_mode = PIT_C0|PIT_SQUAREMODE|PI
unsigned int clknumb = CLKNUM; /* interrupt interval for timer 0 */
+void
clkstart()
{
unsigned char byte;
Index: i386/i386at/com.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/com.c,v
retrieving revision 1.3.2.3
diff -u -p -r1.3.2.3 com.c
--- i386/i386at/com.c 9 Nov 2006 23:33:44 -0000 1.3.2.3
+++ i386/i386at/com.c 13 Nov 2006 05:32:41 -0000
@@ -487,6 +487,7 @@ unsigned int count;
return (D_SUCCESS);
}
+int
comintr(unit)
int unit;
{
@@ -585,6 +586,7 @@ register int unit;
splx(s);
}
+void
comparm(int unit, int baud, int intr, int mode, int modem)
{
u_short addr = (u_short)(cominfo[unit]->address);
@@ -659,6 +661,7 @@ comst_4++;
/* Check for stuck xmitters */
int comtimer_interval = 5;
+void
comtimer()
{
spl_t s = spltty();
@@ -685,6 +688,7 @@ printf("Tty %x was stuck\n", tp);
/*
* Set receive modem state from modem status register.
*/
+void
fix_modem_state(unit, modem_stat)
int unit, modem_stat;
{
@@ -706,6 +710,7 @@ int unit, modem_stat;
/*
* Modem change (input signals)
*/
+void
commodem_intr(
int unit,
int stat)
@@ -735,6 +740,7 @@ commodem_intr(
/*
* Set/get modem bits
*/
+int
commctl(
register struct tty *tp,
int bits,
@@ -801,6 +807,7 @@ commctl(
return commodem[unit];
}
+int
comstop(tp, flags)
register struct tty *tp;
int flags;
Index: i386/i386at/iopl.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/iopl.c,v
retrieving revision 1.1.1.1.4.1
diff -u -p -r1.1.1.1.4.1 iopl.c
--- i386/i386at/iopl.c 5 Nov 2006 19:55:48 -0000 1.1.1.1.4.1
+++ i386/i386at/iopl.c 13 Nov 2006 05:32:41 -0000
@@ -90,6 +90,7 @@ ioplopen(dev, flag, ior)
/*ARGSUSED*/
+int
ioplclose(dev, flags)
int dev;
int flags;
Index: i386/i386at/kd.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/kd.c,v
retrieving revision 1.5.2.9
diff -u -p -r1.5.2.9 kd.c
--- i386/i386at/kd.c 11 Nov 2006 00:54:05 -0000 1.5.2.9
+++ i386/i386at/kd.c 13 Nov 2006 05:32:42 -0000
@@ -344,6 +344,7 @@ io_reg_t vga_port_list[] = {
mach_device_t kd_io_device = 0;
+void
kd_io_map_open(device)
mach_device_t device;
{
@@ -351,6 +352,7 @@ kd_io_map_open(device)
io_port_create(device, vga_port_list);
}
+void
kd_io_map_close()
{
io_port_destroy(kd_io_device);
@@ -394,6 +396,7 @@ int kd_pollc = 0;
* Ring the bell for a short time.
* Warning: uses outb(). You may prefer to use kd_debug_put.
*/
+void
feep()
{
int i;
@@ -404,6 +407,7 @@ feep()
kd_belloff();
}
+void
pause()
{
int i;
@@ -417,6 +421,7 @@ pause()
* LOC=0 means put it in the bottom right corner, LOC=1 means put it
* one column to the left, etc.
*/
+void
kd_debug_put(loc, c)
int loc;
char c;
@@ -431,6 +436,7 @@ char c;
extern int mouse_in_use;
int old_kb_mode;
+void
cnpollc(on)
boolean_t on;
{
@@ -472,6 +478,7 @@ boolean_t on;
* output: device is opened and setup
*
*/
+int
kdopen(dev, flag, ior)
dev_t dev;
int flag;
@@ -524,6 +531,7 @@ kdopen(dev, flag, ior)
*
*/
/*ARGSUSED*/
+void
kdclose(dev, flag)
int dev;
int flag;
@@ -558,6 +566,7 @@ int flag;
*
*/
/*ARGSUSED*/
+int
kdread(dev, uio)
int dev;
struct uio *uio;
@@ -582,6 +591,7 @@ struct uio *uio;
*
*/
/*ARGSUSED*/
+int
kdwrite(dev, uio)
int dev;
struct uio *uio;
@@ -607,6 +617,7 @@ kdmmap(dev, off, prot)
return(i386_btop(kd_bitmap_start+off));
}
+int
kdportdeath(dev, port)
dev_t dev;
mach_port_t port;
@@ -681,6 +692,7 @@ io_return_t kdsetstat(dev, flavor, data,
* Turn the bell on or off. Returns error code, if given bogus
* on/off value.
*/
+int
kdsetbell(val, flags)
int val; /* on or off */
int flags; /* flags set for console */
@@ -704,6 +716,7 @@ int flags; /* flags set for
console *
*
* Get entry from key mapping table. Returns error code, if any.
*/
+int
kdgetkbent(kbent)
struct kbentry * kbent;
{
@@ -756,6 +769,7 @@ int flags; /* flags set for
console *
*
*/
/*ARGSUSED*/
+int
kdintr(vec, regs)
int vec;
int regs;
@@ -894,6 +908,7 @@ int regs;
* For pending commands, complete the command. For data bytes,
* drop the ack on the floor.
*/
+void
kd_handle_ack()
{
switch (kd_ack) {
@@ -918,6 +933,7 @@ kd_handle_ack()
*
* Resend a missed keyboard command or data byte.
*/
+void
kd_resend()
{
if (kd_ack == NOT_WAITING)
@@ -938,6 +954,7 @@ kd_resend()
*
* output: the new state
*/
+int
do_modifier(state, c, up)
int state;
Scancode c;
@@ -1060,6 +1077,7 @@ int *regs;
* Return the value for the 2nd index into key_map that
* corresponds to the given state.
*/
+int
kdstate2idx(state, extended)
int state; /* bit vector, not a state index */
boolean_t extended;
@@ -1099,6 +1117,7 @@ boolean_t extended;
* Entered and left at spltty. Drops priority to spl0 to display character.
* ASSUMES that it is never called from interrupt-driven code.
*/
+int
kdstart(tp)
struct tty *tp;
{
@@ -1149,6 +1168,7 @@ struct tty *tp;
}
/*ARGSUSED*/
+int
kdstop(tp, flags)
register struct tty *tp;
int flags;
@@ -1175,6 +1195,7 @@ kdstop(tp, flags)
* output : Driver is initialized
*
*/
+void
kdinit()
{
void kd_xga_init();
@@ -1241,6 +1262,8 @@ kdinit()
*
*/
static unsigned int kd_bellstate = 0;
+
+void
kd_belloff()
{
unsigned char status;
@@ -1261,6 +1284,7 @@ kd_belloff()
* output : bell is turned on
*
*/
+void
kd_bellon()
{
unsigned char status;
@@ -1290,6 +1314,7 @@ kd_bellon()
*/
int sit_for_0 = 1;
+void
kd_putc(ch)
u_char ch;
{
@@ -1343,6 +1368,7 @@ u_char ch;
* screen.
*
*/
+void
kd_setpos(newpos)
csrpos_t newpos;
{
@@ -1369,6 +1395,7 @@ csrpos_t newpos;
* output : lines on screen appear to be shifted up one line
*
*/
+void
kd_scrollup()
{
csrpos_t to;
@@ -1398,6 +1425,7 @@ kd_scrollup()
* output : Lines on screen appear to be moved down one line
*
*/
+void
kd_scrolldn()
{
csrpos_t to;
@@ -1431,6 +1459,7 @@ kd_scrolldn()
* defined by the ansi terminal specification
*
*/
+void
kd_parseesc()
{
u_char *escp;
@@ -1502,6 +1531,7 @@ unsigned char color_table[] = { 0, 4, 2,
* sequence acceptable to the ansi terminal specification
*
*/
+void
kd_parserest(cp)
u_char *cp;
{
@@ -1797,6 +1827,7 @@ int *nump;
return(cp - original);
}
+void
kd_tab()
{
int i;
@@ -1817,6 +1848,7 @@ kd_tab()
* output : Screen is cleared
*
*/
+void
kd_cls()
{
(*kd_dclear)(0, ONE_PAGE/ONE_SPACE, kd_attr);
@@ -1834,6 +1866,7 @@ kd_cls()
* output : Cursor position is moved
*
*/
+void
kd_home()
{
kd_setpos(0);
@@ -1850,6 +1883,7 @@ kd_home()
* output : Cursor moves up one line, or screen is scrolled
*
*/
+void
kd_up()
{
if (kd_curpos < ONE_LINE)
@@ -1869,6 +1903,7 @@ kd_up()
* output : Cursor moves down one line or the screen is scrolled
*
*/
+void
kd_down()
{
if (kd_curpos >= (ONE_PAGE - ONE_LINE))
@@ -1888,6 +1923,7 @@ kd_down()
* output : Cursor moves one position to the right
*
*/
+void
kd_right()
{
if (kd_curpos < (ONE_PAGE - ONE_SPACE))
@@ -1909,6 +1945,7 @@ kd_right()
* output : Cursor moves one position to the left
*
*/
+void
kd_left()
{
if (0 < kd_curpos)
@@ -1927,6 +1964,7 @@ kd_left()
* output : Cursor moves to the beginning of the current line
*
*/
+void
kd_cr()
{
kd_setpos(BEG_OF_LINE(kd_curpos));
@@ -1944,6 +1982,7 @@ kd_cr()
* output : Screen is cleared from current cursor postion to bottom
*
*/
+void
kd_cltobcur()
{
csrpos_t start;
@@ -1966,6 +2005,7 @@ kd_cltobcur()
* output : Screen is cleared from current cursor postion to top
*
*/
+void
kd_cltopcur()
{
int count;
@@ -1985,6 +2025,7 @@ kd_cltopcur()
* output : Line is cleared from current cursor position to eoln
*
*/
+void
kd_cltoecur()
{
csrpos_t i;
@@ -2007,6 +2048,7 @@ kd_cltoecur()
* output : Line is cleared from beginning to current position
*
*/
+void
kd_clfrbcur()
{
csrpos_t i;
@@ -2027,6 +2069,7 @@ kd_clfrbcur()
* output : lines appear to be deleted
*
*/
+void
kd_delln(number)
int number;
{
@@ -2065,6 +2108,7 @@ int number;
* output : New lines appear to be inserted
*
*/
+void
kd_insln(number)
int number;
{
@@ -2104,6 +2148,7 @@ int number;
* output : characters appear to be deleted
*
*/
+void
kd_delch(number)
int number;
{
@@ -2145,6 +2190,7 @@ int number;
* output : characters appear to be blanked or erased
*
*/
+void
kd_erase(number)
int number;
{
@@ -2170,6 +2216,7 @@ int number;
* output : Current line is erased
*
*/
+void
kd_eraseln()
{
csrpos_t i;
@@ -2193,6 +2240,7 @@ kd_eraseln()
* output : Blanks are inserted at cursor position
*
*/
+void
kd_insch(number)
int number;
{
@@ -2234,6 +2282,7 @@ int number;
* returns TRUE if character is lowercase
*
*/
+boolean_t
kd_isupper(c)
u_char c;
{
@@ -2242,6 +2291,7 @@ u_char c;
return(FALSE);
}
+boolean_t
kd_islower(c)
u_char c;
{
@@ -2259,6 +2309,7 @@ u_char c;
* keyboard command.
*
*/
+void
kd_senddata(ch)
unsigned char ch;
{
@@ -2276,6 +2327,7 @@ unsigned char ch;
* clear before sending the data.
*
*/
+void
kd_sendcmd(ch)
unsigned char ch;
{
@@ -2299,6 +2351,7 @@ kd_getdata()
return(inb(K_RDWR));
}
+unsigned char
kd_cmdreg_read()
{
int ch=KC_CMD_READ;
@@ -2310,6 +2363,7 @@ int ch=KC_CMD_READ;
return(inb(K_RDWR));
}
+void
kd_cmdreg_write(val)
{
int ch=KC_CMD_WRITE;
@@ -2321,6 +2375,7 @@ int ch=KC_CMD_WRITE;
outb(K_RDWR, val);
}
+void
kd_mouse_drain()
{
int i;
@@ -2334,7 +2389,7 @@ kd_mouse_drain()
*
* Set kd_state and update the keyboard status LEDs.
*/
-
+void
set_kd_state(newstate)
int newstate;
{
@@ -2366,6 +2421,7 @@ int state;
*
* Set the keyboard LEDs according to the given byte.
*/
+void
kd_setleds1(val)
u_char val;
{
@@ -2379,6 +2435,7 @@ u_char val;
kd_senddata(K_CMD_LEDS);
}
+void
kd_setleds2()
{
kd_senddata(kd_nextled);
@@ -2392,6 +2449,7 @@ kd_setleds2()
* Currently disabled because cngetc ignores caps lock and num
* lock anyway.
*/
+void
cnsetleds(val)
u_char val;
{
@@ -2401,6 +2459,7 @@ u_char val;
(void)kd_getdata(); /* XXX - assume is ACK */
}
+void
kdreboot()
{
(*kd_dreset)();
@@ -2419,6 +2478,7 @@ kdreboot()
static int which_button[] = {0, MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT};
static struct mouse_motion moved;
+int
kd_kbd_magic(scancode)
{
int new_button = 0;
Index: i386/i386at/kd_event.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/kd_event.c,v
retrieving revision 1.3.2.6
diff -u -p -r1.3.2.6 kd_event.c
--- i386/i386at/kd_event.c 11 Nov 2006 00:54:05 -0000 1.3.2.6
+++ i386/i386at/kd_event.c 13 Nov 2006 05:32:42 -0000
@@ -115,6 +115,7 @@ static boolean_t initialized = FALSE;
* kbdinit - set up event queue.
*/
+void
kbdinit()
{
spl_t s = SPLKD();
@@ -133,6 +134,7 @@ kbdinit()
*/
/*ARGSUSED*/
+int
kbdopen(dev, flags)
dev_t dev;
int flags;
@@ -157,6 +159,7 @@ kbdopen(dev, flags)
*/
/*ARGSUSED*/
+void
kbdclose(dev, flags)
dev_t dev;
int flags;
@@ -231,6 +234,7 @@ io_return_t kbdsetstat(dev, flavor, data
*/
/*ARGSUSED*/
+int
kbdioctl(dev, cmd, data, flag)
dev_t dev;
int cmd;
@@ -282,6 +286,7 @@ kbdioctl(dev, cmd, data, flag)
*/
/*ARGSUSED*/
+int
kbdselect(dev, rw)
{
spl_t s = SPLKD();
@@ -310,6 +315,7 @@ kbdselect(dev, rw)
#ifdef MACH_KERNEL
boolean_t kbd_read_done(); /* forward */
+int
kbdread(dev, ior)
dev_t dev;
register io_req_t ior;
@@ -471,6 +477,7 @@ kbd_enqueue(ev)
u_int X_kdb_enter_str[512], X_kdb_exit_str[512];
int X_kdb_enter_len = 0, X_kdb_exit_len = 0;
+void
kdb_in_out(p)
u_int *p;
{
@@ -503,6 +510,7 @@ register int t = p[0];
}
}
+void
X_kdb_enter()
{
register u_int *u_ip, *endp;
@@ -513,6 +521,7 @@ register u_int *u_ip, *endp;
kdb_in_out(u_ip);
}
+void
X_kdb_exit()
{
register u_int *u_ip, *endp;
@@ -550,6 +559,7 @@ X_kdb_exit_init(data, count)
return D_SUCCESS;
}
#else /* MACH_KERNEL */
+void
X_kdb_enter_init(kp)
struct X_kdb *kp;
{
@@ -561,6 +571,7 @@ struct X_kdb *kp;
X_kdb_enter_len = kp->size>>2;
}
+void
X_kdb_exit_init(kp)
struct X_kdb *kp;
{
Index: i386/i386at/kd_mouse.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/kd_mouse.c,v
retrieving revision 1.3.2.6
diff -u -p -r1.3.2.6 kd_mouse.c
--- i386/i386at/kd_mouse.c 11 Nov 2006 01:39:01 -0000 1.3.2.6
+++ i386/i386at/kd_mouse.c 13 Nov 2006 05:32:43 -0000
@@ -130,6 +130,7 @@ int mouse_char_index; /* mouse respons
/*
* init_mouse_hw - initialize the serial port.
*/
+void
init_mouse_hw(unit, mode)
{
unsigned short base_addr = cominfo[unit]->address;
@@ -164,6 +165,7 @@ static int mousebufindex = 0;
int track_man[10];
/*ARGSUSED*/
+int
mouseopen(dev, flags)
dev_t dev;
int flags;
@@ -221,6 +223,7 @@ mouseopen(dev, flags)
return(0);
}
+void
serial_mouse_open(dev)
{
int unit = minor(dev) & 0x7;
@@ -239,6 +242,8 @@ serial_mouse_open(dev)
}
int mouse_packets = 0;
+
+void
kd_mouse_open(dev, mouse_pic)
{
spl_t s = splhi(); /* disable interrupts */
@@ -256,6 +261,7 @@ kd_mouse_open(dev, mouse_pic)
* mouseclose - Disable interrupts on the serial port, reset driver flags,
* and restore the serial port interrupt vector.
*/
+void
mouseclose(dev, flags)
{
switch (mouse_type) {
@@ -286,6 +292,7 @@ mouseclose(dev, flags)
}
/*ARGSUSED*/
+void
serial_mouse_close(dev, flags)
dev_t dev;
int flags;
@@ -304,6 +311,7 @@ serial_mouse_close(dev, flags)
(void)splx(o_pri);
}
+void
kd_mouse_close(dev, mouse_pic)
{
spl_t s = splhi();
@@ -339,6 +347,7 @@ io_return_t mousegetstat(dev, flavor, da
*/
/*ARGSUSED*/
+int
mouseioctl(dev, cmd, data, flag)
dev_t dev;
int cmd;
@@ -376,6 +385,7 @@ mouseioctl(dev, cmd, data, flag)
*/
/*ARGSUSED*/
+int
mouseselect(dev, rw)
{
int s = SPLKD();
@@ -402,6 +412,7 @@ mouseselect(dev, rw)
#ifdef MACH_KERNEL
boolean_t mouse_read_done(); /* forward */
+int
mouseread(dev, ior)
dev_t dev;
register io_req_t ior;
@@ -473,6 +484,7 @@ boolean_t mouse_read_done(ior)
#else /* MACH_KERNEL */
/*ARGSUSED*/
+int
mouseread(dev, uio)
dev_t dev;
struct uio *uio;
@@ -514,6 +526,7 @@ done:
/*
* mouseintr - Get a byte and pass it up for handling. Called at SPLKD.
*/
+void
mouseintr(unit)
{
unsigned short base_addr = cominfo[unit]->address;
@@ -561,6 +574,7 @@ int middlegitech = 0; /* what should th
#define MOUSEBUFSIZE 5 /* num bytes def'd by protocol */
static u_char mousebuf[MOUSEBUFSIZE]; /* 5-byte packet from mouse */
+void
mouse_handle_byte(ch)
u_char ch;
{
@@ -642,6 +656,7 @@ mouse_handle_byte(ch)
}
}
+void
mouse_packet_mouse_system_mouse(mousebuf)
u_char mousebuf[MOUSEBUFSIZE];
{
@@ -677,6 +692,7 @@ u_char mousebuf[MOUSEBUFSIZE];
* 1 0 Y5 Y4 Y3 Y2 Y1 Y0
*
*/
+void
mouse_packet_microsoft_mouse(mousebuf)
u_char mousebuf[MOUSEBUFSIZE];
{
@@ -773,6 +789,7 @@ void kd_mouse_read_reset(void)
mouse_char_index = 0;
}
+void
ibm_ps2_mouse_open(dev)
{
spl_t s = spltty();
@@ -815,6 +832,7 @@ ibm_ps2_mouse_open(dev)
splx(s);
}
+void
ibm_ps2_mouse_close(dev)
{
spl_t s = spltty();
@@ -845,6 +863,7 @@ ibm_ps2_mouse_close(dev)
* Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0
*
*/
+void
mouse_packet_ibm_ps2_mouse(mousebuf)
u_char mousebuf[MOUSEBUFSIZE];
{
@@ -877,6 +896,7 @@ u_char mousebuf[MOUSEBUFSIZE];
/*
* Enqueue a mouse-motion event. Called at SPLKD.
*/
+void
mouse_moved(where)
struct mouse_motion where;
{
@@ -892,6 +912,7 @@ mouse_moved(where)
/*
* Enqueue an event for mouse button press or release. Called at SPLKD.
*/
+void
mouse_button(which, direction)
kev_type which;
u_char direction;
Index: i386/i386at/lpr.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/lpr.c,v
retrieving revision 1.1.1.1.4.7
diff -u -p -r1.1.1.1.4.7 lpr.c
--- i386/i386at/lpr.c 11 Nov 2006 00:54:05 -0000 1.1.1.1.4.7
+++ i386/i386at/lpr.c 13 Nov 2006 05:32:43 -0000
@@ -83,6 +83,7 @@ struct tty lpr_tty[NLPR];
int lpr_alive[NLPR];
+int
lprprobe(port, dev)
struct bus_device *dev;
{
@@ -124,6 +125,7 @@ void lprattach(struct bus_device *dev)
return;
}
+int
lpropen(dev, flag, ior)
int dev;
int flag;
@@ -160,6 +162,7 @@ u_short addr;
return (char_open(dev, tp, flag, ior));
}
+void
lprclose(dev, flag)
int dev;
int flag;
@@ -179,6 +182,7 @@ u_short addr = (u_short) lprinfo[unit]
}
#ifdef MACH_KERNEL
+int
lprread(dev, ior)
int dev;
io_req_t ior;
@@ -186,6 +190,7 @@ io_req_t ior;
return char_read(&lpr_tty[minor(dev)], ior);
}
+int
lprwrite(dev, ior)
int dev;
io_req_t ior;
@@ -193,6 +198,7 @@ io_req_t ior;
return char_write(&lpr_tty[minor(dev)], ior);
}
+int
lprportdeath(dev, port)
dev_t dev;
mach_port_t port;
@@ -365,6 +371,7 @@ struct tty *tp;
}
#ifdef MACH_KERNEL
+int
lprstop(tp, flags)
register struct tty *tp;
int flags;
@@ -383,12 +390,14 @@ struct tty *tp;
splx(s);
}
#endif /* MACH_KERNEL */
+int
lprpr(unit)
{
lprpr_addr(lprinfo[unit]->address);
return 0;
}
+void
lprpr_addr(addr)
{
printf("DATA(%x) %x, STATUS(%x) %x, INTR_ENAB(%x) %x\n",
Index: i386/i386at/model_dep.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/model_dep.c,v
retrieving revision 1.9.2.7
diff -u -p -r1.9.2.7 model_dep.c
--- i386/i386at/model_dep.c 10 Nov 2006 01:22:57 -0000 1.9.2.7
+++ i386/i386at/model_dep.c 13 Nov 2006 05:32:43 -0000
@@ -221,6 +221,7 @@ mem_size_init()
* Basic PC VM initialization.
* Turns on paging and changes the kernel segments to use high linear
addresses.
*/
+void
i386at_init()
{
/* XXX move to intel/pmap.h */
@@ -387,6 +388,7 @@ void c_boot_entry(vm_offset_t bi)
#include <vm/pmap.h>
#include <mach/time_value.h>
+int
timemmap(dev,off,prot)
vm_prot_t prot;
{
@@ -401,6 +403,7 @@ timemmap(dev,off,prot)
return (i386_btop(pmap_extract(pmap_kernel(), (vm_offset_t) mtime)));
}
+void
startrtclock()
{
clkstart();
Index: i386/i386at/rtc.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/rtc.c,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 rtc.c
--- i386/i386at/rtc.c 5 Nov 2006 19:55:48 -0000 1.2.2.1
+++ i386/i386at/rtc.c 13 Nov 2006 05:32:43 -0000
@@ -56,6 +56,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
static unsigned char rtc[RTC_NREG];
static int first_rtcopen_ever = 1;
+void
rtcinit()
{
outb(RTC_ADDR, RTC_A);
@@ -82,6 +83,7 @@ unsigned char *regs;
return(0);
}
+void
rtcput(regs)
unsigned char *regs;
{
@@ -106,6 +108,7 @@ extern struct timezone tz;
static int month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+int
yeartoday(year)
int year;
{
@@ -125,7 +128,7 @@ int n;
return((char)(((n/10)<<4)&0xF0) | ((n%10)&0x0F));
}
-
+int
readtodc(tp)
u_int *tp;
{
Index: i386/intel/pmap.c
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/intel/pmap.c,v
retrieving revision 1.4.2.10
diff -u -p -r1.4.2.10 pmap.c
--- i386/intel/pmap.c 11 Nov 2006 01:47:21 -0000 1.4.2.10
+++ i386/intel/pmap.c 13 Nov 2006 05:32:43 -0000
@@ -1981,6 +1981,7 @@ pmap_copy_page(src, dst)
* will specify that these pages are to be wired
* down (or not) as appropriate.
*/
+void
pmap_pageable(pmap, start, end, pageable)
pmap_t pmap;
vm_offset_t start;
- Gnumach cleanup - 'return type defaults to int',
Barry deFreese <=