summaryrefslogtreecommitdiff
path: root/i386/i386at/autoconf.c
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-07-21 19:34:47 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-07-21 19:34:47 +0200
commita2952398e5de8746a761a59686619d08d376bce3 (patch)
treedf2373bb1119468873c667624769455c36dc3786 /i386/i386at/autoconf.c
parentba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff)
parent92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff)
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'i386/i386at/autoconf.c')
-rw-r--r--i386/i386at/autoconf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 93c71412..908c3ec0 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -38,12 +38,12 @@
#if NCOM > 0
extern struct bus_driver comdriver;
-extern void comintr();
+#include <i386at/com.h>
#endif /* NCOM */
#if NLPR > 0
extern struct bus_driver lprdriver;
-extern void lprintr();
+#include <i386at/lpr.h>
#endif /* NLPR */
struct bus_ctlr bus_master_init[] = {
@@ -92,9 +92,9 @@ struct bus_device bus_device_init[] = {
*/
void probeio(void)
{
- register struct bus_device *device;
- register struct bus_ctlr *master;
- int i = 0;
+ struct bus_device *device;
+ struct bus_ctlr *master;
+ int i = 0;
for (master = bus_master_init; master->driver; master++)
{
@@ -122,7 +122,7 @@ void probeio(void)
}
void take_dev_irq(
- struct bus_device *dev)
+ const struct bus_device *dev)
{
int pic = (int)dev->sysdep1;
@@ -144,7 +144,7 @@ void take_dev_irq(
}
void take_ctlr_irq(
- struct bus_ctlr *ctlr)
+ const struct bus_ctlr *ctlr)
{
int pic = ctlr->sysdep1;
if (intpri[pic] == 0) {