Browse Source

Fix up fill_mca_nic.

tags/v0.9.3
Michael Brown 20 years ago
parent
commit
3e8c2aa78b
2 changed files with 8 additions and 3 deletions
  1. 1
    2
      src/drivers/bus/mca.c
  2. 7
    1
      src/include/mca.h

+ 1
- 2
src/drivers/bus/mca.c View File

8
 #include "string.h"
8
 #include "string.h"
9
 #include "io.h"
9
 #include "io.h"
10
 #include "console.h"
10
 #include "console.h"
11
-#include "nic.h"
12
 #include "mca.h"
11
 #include "mca.h"
13
 
12
 
14
 /*
13
 /*
145
  * Fill in a nic structure
144
  * Fill in a nic structure
146
  *
145
  *
147
  */
146
  */
148
-void mca_fill_nic ( struct nic *nic, struct mca_device *mca ) {
147
+void fill_mca_nic ( struct nic *nic, struct mca_device *mca ) {
149
 
148
 
150
 	/* ioaddr and irqno must be read in a device-dependent way
149
 	/* ioaddr and irqno must be read in a device-dependent way
151
 	 * from the POS registers
150
 	 * from the POS registers

+ 7
- 1
src/include/mca.h View File

9
 #define MCA_H
9
 #define MCA_H
10
 
10
 
11
 #include "isa_ids.h"
11
 #include "isa_ids.h"
12
-#include "dev.h"
12
+#include "nic.h"
13
 
13
 
14
 #define MCA_BUS_TYPE	3
14
 #define MCA_BUS_TYPE	3
15
 
15
 
72
 	.id_count = sizeof ( _ids ) / sizeof ( _ids[0] ),	\
72
 	.id_count = sizeof ( _ids ) / sizeof ( _ids[0] ),	\
73
 }
73
 }
74
 
74
 
75
+/*
76
+ * Functions in mca.c
77
+ *
78
+ */
79
+extern void fill_mca_nic ( struct nic *nic, struct mca_device *mca );
80
+
75
 /*
81
 /*
76
  * MCA bus global definition
82
  * MCA bus global definition
77
  *
83
  *

Loading…
Cancel
Save