patch-2.4.11-dontuse linux/drivers/ieee1394/pcilynx.c
Next file: linux/drivers/ieee1394/raw1394.c
Previous file: linux/drivers/ieee1394/ohci1394.h
Back to the patch index
Back to the overall index
- Lines: 102
- Date:
Mon Oct 1 21:24:24 2001
- Orig file:
v2.4.10/linux/drivers/ieee1394/pcilynx.c
- Orig date:
Mon Aug 27 12:41:41 2001
diff -u --recursive --new-file v2.4.10/linux/drivers/ieee1394/pcilynx.c linux/drivers/ieee1394/pcilynx.c
@@ -38,6 +38,7 @@
#include "ieee1394_types.h"
#include "hosts.h"
#include "ieee1394_core.h"
+#include "highlevel.h"
#include "pcilynx.h"
@@ -393,7 +394,7 @@
struct lynx_send_data *d;
struct hpsb_packet *packet;
- d = (what == iso ? &lynx->iso_send : &lynx->async);
+ d = (what == hpsb_iso ? &lynx->iso_send : &lynx->async);
packet = d->queue;
d->header_dma = pci_map_single(lynx->dev, packet->header,
@@ -419,13 +420,13 @@
pcl.buffer[1].pointer = d->data_dma;
switch (packet->type) {
- case async:
+ case hpsb_async:
pcl.buffer[0].control |= PCL_CMD_XMT;
break;
- case iso:
+ case hpsb_iso:
pcl.buffer[0].control |= PCL_CMD_XMT | PCL_ISOMODE;
break;
- case raw:
+ case hpsb_raw:
pcl.buffer[0].control |= PCL_CMD_UNFXMT;
break;
}
@@ -606,11 +607,11 @@
}
switch (packet->type) {
- case async:
- case raw:
+ case hpsb_async:
+ case hpsb_raw:
d = &lynx->async;
break;
- case iso:
+ case hpsb_iso:
d = &lynx->iso_send;
break;
default:
@@ -1227,7 +1228,7 @@
}
if (lynx->async.queue != NULL) {
- send_next(lynx, async);
+ send_next(lynx, hpsb_async);
}
spin_unlock(&lynx->async.queue_lock);
@@ -1259,7 +1260,7 @@
}
if (lynx->iso_send.queue != NULL) {
- send_next(lynx, iso);
+ send_next(lynx, hpsb_iso);
}
spin_unlock(&lynx->iso_send.queue_lock);
@@ -1368,7 +1369,7 @@
FAIL("failed to allocate host structure");
lynx->state = have_host_struct;
-
+ lynx->host->hostdata = lynx;
lynx->id = num_of_cards-1;
lynx->dev = dev;
lynx->host->pdev = dev;
@@ -1501,6 +1502,9 @@
PRINT(KERN_INFO, lynx->id, "found old 1394 PHY");
}
+ /* Tell the highlevel this host is ready */
+ highlevel_add_one_host (lynx->host);
+
return 0;
#undef FAIL
}
@@ -1627,13 +1631,14 @@
MODULE_AUTHOR("Andreas E. Bombe <andreas.bombe@munich.netsurf.de>");
MODULE_DESCRIPTION("driver for Texas Instruments PCI Lynx IEEE-1394 controller");
+MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("pcilynx");
MODULE_DEVICE_TABLE(pci, pci_table);
static void __exit pcilynx_cleanup(void)
{
- pci_unregister_driver(&lynx_pcidriver);
hpsb_unregister_lowlevel(&lynx_template);
+ pci_unregister_driver(&lynx_pcidriver);
PRINT_G(KERN_INFO, "removed " PCILYNX_DRIVER_NAME " module");
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)