diff options
Diffstat (limited to 'i386')
-rw-r--r-- | i386/i386/io_port.h | 4 | ||||
-rw-r--r-- | i386/i386/lock.h | 2 | ||||
-rw-r--r-- | i386/i386/mp_desc.c | 2 | ||||
-rw-r--r-- | i386/i386/mp_desc.h | 2 | ||||
-rw-r--r-- | i386/i386/proc_reg.h | 2 | ||||
-rw-r--r-- | i386/i386/user_ldt.h | 4 | ||||
-rw-r--r-- | i386/i386at/kd_queue.h | 8 | ||||
-rw-r--r-- | i386/i386at/kdsoft.h | 42 | ||||
-rw-r--r-- | i386/intel/pmap.c | 2 | ||||
-rw-r--r-- | i386/intel/pmap.h | 4 |
10 files changed, 39 insertions, 33 deletions
diff --git a/i386/i386/io_port.h b/i386/i386/io_port.h index 62022b7..3344103 100644 --- a/i386/i386/io_port.h +++ b/i386/i386/io_port.h @@ -37,7 +37,7 @@ typedef unsigned short io_reg_t; * Allocate and destroy io port sets for users to map into * threads. */ -extern void io_port_create(/* device_t, io_reg_t * */); -extern void io_port_destroy(/* device_t */); +extern void io_port_create(mach_device_t, io_reg_t *); +extern void io_port_destroy(mach_device_t); #endif /* _I386_IO_PORT_H_ */ diff --git a/i386/i386/lock.h b/i386/i386/lock.h index 6ed243b..09b3f2b 100644 --- a/i386/i386/lock.h +++ b/i386/i386/lock.h @@ -119,7 +119,7 @@ #endif /* __GNUC__ */ -extern void simple_lock_pause(); +extern void simple_lock_pause(void); #endif /* NCPUS > 1 */ diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c index 9678b6a..1e95f81 100644 --- a/i386/i386/mp_desc.c +++ b/i386/i386/mp_desc.c @@ -218,7 +218,7 @@ int simple_lock_pause_loop = 100; unsigned int simple_lock_pause_count = 0; /* debugging */ void -simple_lock_pause() +simple_lock_pause(void) { static volatile int dummy; int i; diff --git a/i386/i386/mp_desc.h b/i386/i386/mp_desc.h index d683cf6..e9a69d2 100644 --- a/i386/i386/mp_desc.h +++ b/i386/i386/mp_desc.h @@ -74,7 +74,7 @@ extern struct real_descriptor *mp_gdt[NCPUS]; /* * Each CPU calls this routine to set up its descriptor tables. */ -extern struct mp_desc_table * mp_desc_init(/* int */); +extern struct mp_desc_table * mp_desc_init(int); #endif /* MULTIPROCESSOR */ diff --git a/i386/i386/proc_reg.h b/i386/i386/proc_reg.h index f1b21d4..448b645 100644 --- a/i386/i386/proc_reg.h +++ b/i386/i386/proc_reg.h @@ -73,7 +73,7 @@ #ifdef __GNUC__ static inline unsigned -get_eflags() +get_eflags(void) { unsigned eflags; asm("pushfd; popl %0" : "=r" (eflags)); diff --git a/i386/i386/user_ldt.h b/i386/i386/user_ldt.h index 9267ac7..dd3ad4b 100644 --- a/i386/i386/user_ldt.h +++ b/i386/i386/user_ldt.h @@ -48,8 +48,8 @@ typedef struct user_ldt * user_ldt_t; #define S_STACK 1 /* stack segment */ #define S_DATA 2 /* data segment */ -extern boolean_t selector_check(/* thread_t thread, +extern boolean_t selector_check(thread_t thread, int sel, - int type */); + int type); #endif /* _I386_USER_LDT_H_ */ diff --git a/i386/i386at/kd_queue.h b/i386/i386at/kd_queue.h index 1190e60..c976acf 100644 --- a/i386/i386at/kd_queue.h +++ b/i386/i386at/kd_queue.h @@ -74,6 +74,8 @@ typedef struct { int firstfree, firstout; } kd_event_queue; -extern void kdq_put(), kdq_reset(); -extern boolean_t kdq_empty(), kdq_full(); -extern kd_event *kdq_get(); +extern void kdq_put(kd_event_queue *, kd_event *); +extern void kdq_reset(kd_event_queue *); +extern boolean_t kdq_empty(kd_event_queue *); +extern boolean_t kdq_full(kd_event_queue *); +extern kd_event *kdq_get(kd_event_queue *); diff --git a/i386/i386at/kdsoft.h b/i386/i386at/kdsoft.h index 2be21d0..96e2df8 100644 --- a/i386/i386at/kdsoft.h +++ b/i386/i386at/kdsoft.h @@ -58,6 +58,24 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* + * Globals used for both character-based controllers and bitmap-based + * controllers. + */ +typedef short csrpos_t; /* cursor position, ONE_SPACE bytes per char */ + +extern u_char *vid_start; /* VM start of video RAM or frame buffer */ +extern csrpos_t kd_curpos; /* should be set only by kd_setpos */ +extern short kd_lines; /* num lines in tty display */ +extern short kd_cols; +extern char kd_attr; /* current character attribute */ + + +/* + * Globals used only for bitmap-based controllers. + * XXX - probably needs reworking for color. + */ + +/* * This driver handles two types of graphics cards. The first type * (e.g., EGA, CGA), treats the screen as a page of characters and * has a hardware cursor. The second type (e.g., the Blit) treats the @@ -118,7 +136,11 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * system to reboot. */ -extern void bmpput(), bmpmvup(), bmpmvdown(), bmpclear(), bmpsetcursor(); +extern void bmpput(csrpos_t, char, char); +extern void bmpmvup(csrpos_t, csrpos_t, int); +extern void bmpmvdown(csrpos_t, csrpos_t, int); +extern void bmpclear(csrpos_t, int, char); +extern void bmpsetcursor(csrpos_t); extern void (*kd_dput)(); /* put attributed char */ extern void (*kd_dmvup)(); /* block move up */ @@ -130,24 +152,6 @@ extern void (*kd_dreset)(); /* prepare for reboot */ /* - * Globals used for both character-based controllers and bitmap-based - * controllers. - */ -typedef short csrpos_t; /* cursor position, ONE_SPACE bytes per char */ - -extern u_char *vid_start; /* VM start of video RAM or frame buffer */ -extern csrpos_t kd_curpos; /* should be set only by kd_setpos */ -extern short kd_lines; /* num lines in tty display */ -extern short kd_cols; -extern char kd_attr; /* current character attribute */ - - -/* - * Globals used only for bitmap-based controllers. - * XXX - probably needs reworking for color. - */ - -/* * The following font layout is assumed: * * The top scan line of all the characters comes first. Then the diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c index de65ac8..1043daa 100644 --- a/i386/intel/pmap.c +++ b/i386/intel/pmap.c @@ -2312,7 +2312,7 @@ void process_pmap_updates(my_pmap) /* * Interrupt routine for TBIA requested from other processor. */ -void pmap_update_interrupt() +void pmap_update_interrupt(void) { register int my_cpu; register pmap_t my_pmap; diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h index a6e4ab9..0255f5a 100644 --- a/i386/intel/pmap.h +++ b/i386/intel/pmap.h @@ -162,8 +162,8 @@ boolean_t cpu_update_needed[NCPUS]; * External declarations for PMAP_ACTIVATE. */ -void process_pmap_updates(); -void pmap_update_interrupt(); +void process_pmap_updates(pmap_t); +void pmap_update_interrupt(void); extern pmap_t kernel_pmap; #endif /* NCPUS > 1 */ |