瀏覽代碼

Fix up the automatic modifications.

tags/v0.9.3
Michael Brown 19 年之前
父節點
當前提交
393969a3f8
共有 1 個文件被更改,包括 11 次插入10 次删除
  1. 11
    10
      src/drivers/net/skel.c

+ 11
- 10
src/drivers/net/skel.c 查看文件

@@ -127,6 +127,14 @@ static void skel_irq(struct nic *nic, irq_action_t action)
127 127
 	}
128 128
 }
129 129
 
130
+static struct nic_operations skel_operations = {
131
+	.connect	= dummy_connect,
132
+	.poll		= skel_poll,
133
+	.transmit	= skel_transmit,
134
+	.irq		= skel_irq,
135
+	.disable	= skel_disable,
136
+};
137
+
130 138
 /**************************************************************************
131 139
 PROBE - Look for an adapter, this routine's visible to the outside
132 140
 ***************************************************************************/
@@ -140,17 +148,10 @@ static int skel_probe ( struct dev *dev, struct pci_device *pci ) {
140 148
 	if (board_found && valid_link)
141 149
 	{
142 150
 		/* store NIC parameters */
143
-		nic->ioaddr = pci->ioaddr & ~3;
151
+		nic->ioaddr = pci->ioaddr;
144 152
 		nic->irqno = pci->irq;
145 153
 		/* point to NIC specific routines */
146
-static struct nic_operations skel_operations;
147
-static struct nic_operations skel_operations = {
148
-	.connect	= dummy_connect,
149
-	.poll		= skel_poll,
150
-	.transmit	= skel_transmit,
151
-	.irq		= skel_irq,
152
-	.disable	= skel_disable,
153
-};		nic->nic_op	= &skel_operations;
154
+		nic->nic_op	= &skel_operations;
154 155
 		return 1;
155 156
 	}
156 157
 	/* else */
@@ -164,7 +165,7 @@ PCI_ROM(0x0000, 0x0000, "skel-pci", "Skeleton PCI Adaptor"),
164 165
 static struct pci_driver skel_driver =
165 166
 	PCI_DRIVER ( "SKELETON/PCI", skel_nics, PCI_NO_CLASS );
166 167
 
167
-BOOT_DRIVER ( "SKELETON/PCI", skel_probe );
168
+BOOT_DRIVER ( "SKELETON/PCI", find_pci_boot_device, skel_driver, skel_probe );
168 169
 
169 170
 /**************************************************************************
170 171
 PROBE - Look for an adapter, this routine's visible to the outside

Loading…
取消
儲存