diff options
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 16 | ||||
| -rw-r--r-- | drivers/ieee1394/.gitignore | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/Kconfig | 21 | ||||
| -rw-r--r-- | drivers/ieee1394/Makefile | 10 | ||||
| -rw-r--r-- | drivers/ieee1394/csr1212.c | 15 | ||||
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 46 | ||||
| -rw-r--r-- | drivers/ieee1394/hosts.c | 13 | ||||
| -rw-r--r-- | drivers/ieee1394/hosts.h | 7 | ||||
| -rw-r--r-- | drivers/ieee1394/ieee1394_core.c | 23 | ||||
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 63 | ||||
| -rw-r--r-- | drivers/ieee1394/nodemgr.h | 3 | ||||
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 17 | ||||
| -rw-r--r-- | drivers/ieee1394/oui.db | 7048 | ||||
| -rw-r--r-- | drivers/ieee1394/oui2c.sh | 22 | ||||
| -rw-r--r-- | drivers/ieee1394/raw1394.c | 48 | ||||
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 23 | ||||
| -rw-r--r-- | drivers/ieee1394/video1394.c | 8 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
18 files changed, 105 insertions, 7280 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 4a1d8979ed9..fa844fd7bde 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -50,22 +50,6 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de> --------------------------- -What: ieee1394 core's unused exports (CONFIG_IEEE1394_EXPORT_FULL_API) -When: January 2007 -Why: There are no projects known to use these exported symbols, except - dfg1394 (uses one symbol whose functionality is core-internal now). -Who: Stefan Richter <stefanr@s5r6.in-berlin.de> - ---------------------------- - -What: ieee1394's *_oui sysfs attributes (CONFIG_IEEE1394_OUI_DB) -When: January 2007 -Files: drivers/ieee1394/: oui.db, oui2c.sh -Why: big size, little value -Who: Stefan Richter <stefanr@s5r6.in-berlin.de> - ---------------------------- - What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. When: December 2006 Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6 diff --git a/drivers/ieee1394/.gitignore b/drivers/ieee1394/.gitignore deleted file mode 100644 index 33da10a2532..00000000000 --- a/drivers/ieee1394/.gitignore +++ /dev/null @@ -1 +0,0 @@ -oui.c diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index e7d56573fe5..b8a47342cd2 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -35,20 +35,6 @@ config IEEE1394_VERBOSEDEBUG Say Y if you really want or need the debugging output, everyone else says N. -config IEEE1394_OUI_DB - bool "OUI Database built-in (deprecated)" - depends on IEEE1394 - help - If you say Y here, then an OUI list (vendor unique ID's) will be - compiled into the ieee1394 module. This doesn't really do much - except being able to display the vendor of a hardware node. The - downside is that it adds about 300k to the size of the module, - or kernel (depending on whether you compile ieee1394 as a - module, or static in the kernel). - - This option is not needed for userspace programs like gscanbus - to show this information. - config IEEE1394_EXTRA_CONFIG_ROMS bool "Build in extra config rom entries for certain functionality" depends on IEEE1394 @@ -66,13 +52,6 @@ config IEEE1394_CONFIG_ROM_IP1394 with MacOSX and WinXP IP-over-1394), enable this option and the eth1394 option below. -config IEEE1394_EXPORT_FULL_API - bool "Export all symbols of ieee1394's API (deprecated)" - depends on IEEE1394 - default n - help - This option will be removed soon. Don't worry, say N. - comment "Device Drivers" depends on IEEE1394 diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile index d9650d3d77a..489c133664d 100644 --- a/drivers/ieee1394/Makefile +++ b/drivers/ieee1394/Makefile @@ -5,9 +5,6 @@ ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \ highlevel.o csr.o nodemgr.o dma.o iso.o \ csr1212.o config_roms.o -ifdef CONFIG_IEEE1394_OUI_DB -ieee1394-objs += oui.o -endif obj-$(CONFIG_IEEE1394) += ieee1394.o obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o @@ -18,10 +15,3 @@ obj-$(CONFIG_IEEE1394_SBP2) += sbp2.o obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o -quiet_cmd_oui2c = OUI2C $@ - cmd_oui2c = $(CONFIG_SHELL) $(srctree)/$(src)/oui2c.sh < $< > $@ - -targets := oui.c -$(obj)/oui.o: $(obj)/oui.c -$(obj)/oui.c: $(src)/oui.db $(src)/oui2c.sh FORCE - $(call if_changed,oui2c) diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c index 586f71e7346..c28f639823d 100644 --- a/drivers/ieee1394/csr1212.c +++ b/drivers/ieee1394/csr1212.c @@ -47,14 +47,14 @@ #define __D (1 << CSR1212_KV_TYPE_DIRECTORY) #define __L (1 << CSR1212_KV_TYPE_LEAF) static const u_int8_t csr1212_key_id_type_map[0x30] = { - 0, /* Reserved */ + __C, /* used by Apple iSight */ __D | __L, /* Descriptor */ __I | __D | __L, /* Bus_Dependent_Info */ __I | __D | __L, /* Vendor */ __I, /* Hardware_Version */ 0, 0, /* Reserved */ - __D | __L, /* Module */ - 0, 0, 0, 0, /* Reserved */ + __D | __L | __I, /* Module */ + __I, 0, 0, 0, /* used by Apple iSight, Reserved */ __I, /* Node_Capabilities */ __L, /* EUI_64 */ 0, 0, 0, /* Reserved */ @@ -1234,6 +1234,12 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr) csr->private); if (ret != CSR1212_SUCCESS) return ret; + + /* check ROM header's info_length */ + if (i == 0 && + CSR1212_BE32_TO_CPU(csr->cache_head->data[0]) >> 24 != + bytes_to_quads(csr->bus_info_len) - 1) + return CSR1212_EINVAL; } bi = (struct csr1212_bus_info_block_img*)csr->cache_head->data; @@ -1250,9 +1256,6 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr) return ret; } - if (bytes_to_quads(csr->bus_info_len - sizeof(csr1212_quad_t)) != bi->length) - return CSR1212_EINVAL; - #if 0 /* Apparently there are too many differnt wrong implementations of the * CRC algorithm that verifying them is moot. */ diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 1084da4d88a..55d6ae664fd 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c @@ -2255,49 +2255,37 @@ static int dv1394_init(struct ti_ohci *ohci, enum pal_or_ntsc format, enum modes return 0; } -static void dv1394_un_init(struct video_card *video) +static void dv1394_remove_host(struct hpsb_host *host) { - /* obviously nobody has the driver open at this point */ - do_dv1394_shutdown(video, 1); - kfree(video); -} - - -static void dv1394_remove_host (struct hpsb_host *host) -{ - struct video_card *video; + struct video_card *video, *tmp_video; unsigned long flags; - int id = host->id; + int found_ohci_card = 0; - /* We only work with the OHCI-1394 driver */ - if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME)) - return; - - /* find the corresponding video_cards */ do { - struct video_card *tmp_vid; - video = NULL; - spin_lock_irqsave(&dv1394_cards_lock, flags); - list_for_each_entry(tmp_vid, &dv1394_cards, list) { - if ((tmp_vid->id >> 2) == id) { - list_del(&tmp_vid->list); - video = tmp_vid; + list_for_each_entry(tmp_video, &dv1394_cards, list) { + if ((tmp_video->id >> 2) == host->id) { + list_del(&tmp_video->list); + video = tmp_video; + found_ohci_card = 1; break; } } spin_unlock_irqrestore(&dv1394_cards_lock, flags); - if (video) - dv1394_un_init(video); - } while (video != NULL); + if (video) { + do_dv1394_shutdown(video, 1); + kfree(video); + } + } while (video); - class_device_destroy(hpsb_protocol_class, - MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); + if (found_ohci_card) + class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR, + IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2))); } -static void dv1394_add_host (struct hpsb_host *host) +static void dv1394_add_host(struct hpsb_host *host) { struct ti_ohci *ohci; int id = host->id; diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c index ee82a5320bf..32a13092193 100644 --- a/drivers/ieee1394/hosts.c +++ b/drivers/ieee1394/hosts.c @@ -190,14 +190,19 @@ int hpsb_add_host(struct hpsb_host *host) { if (hpsb_default_host_entry(host)) return -ENOMEM; - hpsb_add_extra_config_roms(host); - highlevel_add_host(host); - return 0; } +void hpsb_resume_host(struct hpsb_host *host) +{ + if (host->driver->set_hw_config_rom) + host->driver->set_hw_config_rom(host, + host->csr.rom->bus_info_data); + host->driver->devctl(host, RESET_BUS, SHORT_RESET); +} + void hpsb_remove_host(struct hpsb_host *host) { host->is_shutdown = 1; @@ -206,9 +211,7 @@ void hpsb_remove_host(struct hpsb_host *host) flush_scheduled_work(); host->driver = &dummy_driver; - highlevel_remove_host(host); - hpsb_remove_extra_config_roms(host); class_device_unregister(&host->class_dev); diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index d553e38c954..4bf4fb7f67b 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h @@ -61,9 +61,9 @@ struct hpsb_host { struct device device; struct class_device class_dev; - int update_config_rom; struct delayed_work delayed_reset; - unsigned int config_roms; + unsigned config_roms:31; + unsigned update_config_rom:1; struct list_head addr_space; u64 low_addr_space; /* upper bound of physical DMA area */ @@ -200,7 +200,8 @@ struct hpsb_host_driver { struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, struct device *dev); int hpsb_add_host(struct hpsb_host *host); -void hpsb_remove_host(struct hpsb_host *h); +void hpsb_resume_host(struct hpsb_host *host); +void hpsb_remove_host(struct hpsb_host *host); /* Updates the configuration rom image of a host. rom_version must be the * current version, otherwise it will fail with return value -1. If this diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index 9a48ca20d1f..1521e57e124 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c @@ -1178,6 +1178,7 @@ module_exit(ieee1394_cleanup); /** hosts.c **/ EXPORT_SYMBOL(hpsb_alloc_host); EXPORT_SYMBOL(hpsb_add_host); +EXPORT_SYMBOL(hpsb_resume_host); EXPORT_SYMBOL(hpsb_remove_host); EXPORT_SYMBOL(hpsb_update_config_rom_image); @@ -1195,10 +1196,6 @@ EXPORT_SYMBOL(hpsb_selfid_complete); EXPORT_SYMBOL(hpsb_packet_sent); EXPORT_SYMBOL(hpsb_packet_received); EXPORT_SYMBOL_GPL(hpsb_disable_irm); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(hpsb_send_phy_config); -EXPORT_SYMBOL(hpsb_send_packet_and_wait); -#endif /** ieee1394_transactions.c **/ EXPORT_SYMBOL(hpsb_get_tlabel); @@ -1229,20 +1226,12 @@ EXPORT_SYMBOL(hpsb_set_hostinfo_key); EXPORT_SYMBOL(hpsb_get_hostinfo_bykey); EXPORT_SYMBOL(hpsb_set_hostinfo); EXPORT_SYMBOL(highlevel_host_reset); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(highlevel_add_host); -EXPORT_SYMBOL(highlevel_remove_host); -#endif /** nodemgr.c **/ EXPORT_SYMBOL(hpsb_node_fill_packet); EXPORT_SYMBOL(hpsb_node_write); EXPORT_SYMBOL(__hpsb_register_protocol); EXPORT_SYMBOL(hpsb_unregister_protocol); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(ieee1394_bus_type); -EXPORT_SYMBOL(nodemgr_for_each_host); -#endif /** csr.c **/ EXPORT_SYMBOL(hpsb_update_config_rom); @@ -1287,13 +1276,3 @@ EXPORT_SYMBOL(csr1212_read); EXPORT_SYMBOL(csr1212_parse_keyval); EXPORT_SYMBOL(_csr1212_read_keyval); EXPORT_SYMBOL(_csr1212_destroy_keyval); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(csr1212_create_csr); -EXPORT_SYMBOL(csr1212_init_local_csr); -EXPORT_SYMBOL(csr1212_new_immediate); -EXPORT_SYMBOL(csr1212_associate_keyval); -EXPORT_SYMBOL(csr1212_new_string_descriptor_leaf); -EXPORT_SYMBOL(csr1212_destroy_csr); -EXPORT_SYMBOL(csr1212_generate_csr_image); -EXPORT_SYMBOL(csr1212_parse_csr); -#endif diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 61307ca296a..ba9faeff479 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -41,22 +41,6 @@ struct nodemgr_csr_info { }; -static char *nodemgr_find_oui_name(int oui) -{ -#ifdef CONFIG_IEEE1394_OUI_DB - extern struct oui_list_struct { - int oui; - char *name; - } oui_list[]; - int i; - - for (i = 0; oui_list[i].name; i++) - if (oui_list[i].oui == oui) - return oui_list[i].name; -#endif - return NULL; -} - /* * Correct the speed map entry. This is necessary * - for nodes with link speed < phy speed, @@ -274,7 +258,6 @@ static struct device_driver nodemgr_mid_layer_driver = { struct device nodemgr_dev_template_host = { .bus = &ieee1394_bus_type, .release = nodemgr_release_host, - .driver = &nodemgr_mid_layer_driver, }; @@ -473,11 +456,9 @@ fw_attr(ne, struct node_entry, nodeid, unsigned int, "0x%04x\n") fw_attr(ne, struct node_entry, vendor_id, unsigned int, "0x%06x\n") fw_attr_td(ne, struct node_entry, vendor_name_kv) -fw_attr(ne, struct node_entry, vendor_oui, const char *, "%s\n") fw_attr(ne, struct node_entry, guid, unsigned long long, "0x%016Lx\n") fw_attr(ne, struct node_entry, guid_vendor_id, unsigned int, "0x%06x\n") -fw_attr(ne, struct node_entry, guid_vendor_oui, const char *, "%s\n") fw_attr(ne, struct node_entry, in_limbo, int, "%d\n"); static struct device_attribute *const fw_ne_attrs[] = { @@ -503,7 +484,6 @@ fw_attr(ud, struct unit_directory, model_id, unsigned int, "0x%06x\n") fw_attr(ud, struct unit_directory, specifier_id, unsigned int, "0x%06x\n") fw_attr(ud, struct unit_directory, version, unsigned int, "0x%06x\n") fw_attr_td(ud, struct unit_directory, vendor_name_kv) -fw_attr(ud, struct unit_directory, vendor_oui, const char *, "%s\n") fw_attr_td(ud, struct unit_directory, model_name_kv) static struct device_attribute *const fw_ud_attrs[] = { @@ -865,7 +845,6 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr ne->guid = guid; ne->guid_vendor_id = (guid >> 40) & 0xffffff; - ne->guid_vendor_oui = nodemgr_find_oui_name(ne->guid_vendor_id); ne->csr = csr; memcpy(&ne->device, &nodemgr_dev_template_ne, @@ -885,9 +864,6 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr goto fail_classdevreg; get_device(&ne->device); - if (ne->guid_vendor_oui && - device_create_file(&ne->device, &dev_attr_ne_guid_vendor_oui)) - goto fail_addoiu; nodemgr_create_ne_dev_files(ne); nodemgr_update_bus_options(ne); @@ -898,8 +874,6 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, struct csr1212_csr return ne; -fail_addoiu: - put_device(&ne->device); fail_classdevreg: device_unregister(&ne->device); fail_devreg: @@ -975,15 +949,10 @@ static void nodemgr_register_device(struct node_entry *ne, goto fail_classdevreg; get_device(&ud->device); - if (ud->vendor_oui && - device_create_file(&ud->device, &dev_attr_ud_vendor_oui)) - goto fail_addoui; nodemgr_create_ud_dev_files(ud); return; -fail_addoui: - put_device(&ud->device); fail_classdevreg: device_unregister(&ud->device); fail_devreg: @@ -1020,9 +989,6 @@ static struct unit_directory *nodemgr_process_unit_directory if (kv->key.type == CSR1212_KV_TYPE_IMMEDIATE) { ud->vendor_id = kv->value.immediate; ud->flags |= UNIT_DIRECTORY_VENDOR_ID; - - if (ud->vendor_id) - ud->vendor_oui = nodemgr_find_oui_name(ud->vendor_id); } break; @@ -1153,9 +1119,6 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent switch (kv->key.id) { case CSR1212_KV_ID_VENDOR: ne->vendor_id = kv->value.immediate; - - if (ne->vendor_id) - ne->vendor_oui = nodemgr_find_oui_name(ne->vendor_id); break; case CSR1212_KV_ID_NODE_CAPABILITIES: @@ -1183,9 +1146,6 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent last_key_id = kv->key.id; } - if (ne->vendor_oui && - device_create_file(&ne->device, &dev_attr_ne_vendor_oui)) - goto fail; if (ne->vendor_name_kv && device_create_file(&ne->device, &dev_attr_ne_vendor_name_kv)) goto fail; @@ -1889,22 +1849,31 @@ int init_ieee1394_nodemgr(void) error = class_register(&nodemgr_ne_class); if (error) - return error; - + goto fail_ne; error = class_register(&nodemgr_ud_class); - if (error) { - class_unregister(&nodemgr_ne_class); - return error; - } + if (error) + goto fail_ud; error = driver_register(&nodemgr_mid_layer_driver); + if (error) + goto fail_ml; + /* This driver is not used if nodemgr is off (disable_nodemgr=1). */ + nodemgr_dev_template_host.driver = &nodemgr_mid_layer_driver; + hpsb_register_highlevel(&nodemgr_highlevel); return 0; + +fail_ml: + class_unregister(&nodemgr_ud_class); +fail_ud: + class_unregister(&nodemgr_ne_class); +fail_ne: + return error; } void cleanup_ieee1394_nodemgr(void) { hpsb_unregister_highlevel(&nodemgr_highlevel); - + driver_unregister(&nodemgr_mid_layer_driver); class_unregister(&nodemgr_ud_class); class_unregister(&nodemgr_ne_class); } diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h index e25cbadb8be..4147303ad44 100644 --- a/drivers/ieee1394/nodemgr.h +++ b/drivers/ieee1394/nodemgr.h @@ -70,7 +70,6 @@ struct unit_directory { quadlet_t vendor_id; struct csr1212_keyval *vendor_name_kv; - const char *vendor_oui; quadlet_t model_id; struct csr1212_keyval *model_name_kv; @@ -93,7 +92,6 @@ struct unit_directory { struct node_entry { u64 guid; /* GUID of this node */ u32 guid_vendor_id; /* Top 24bits of guid */ - const char *guid_vendor_oui; /* OUI name of guid vendor id */ struct hpsb_host *host; /* Host this node is attached to */ nodeid_t nodeid; /* NodeID */ @@ -104,7 +102,6 @@ struct node_entry { /* The following is read from the config rom */ u32 vendor_id; struct csr1212_keyval *vendor_name_kv; - const char *vendor_oui; u32 capabilities; diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 628130a58af..5729e412cc4 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3281,14 +3281,11 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!", (unsigned long long)pci_resource_len(dev, 0)); - /* Seems PCMCIA handles this internally. Not sure why. Seems - * pretty bogus to force a driver to special case this. */ -#ifndef PCMCIA - if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME)) + if (!request_mem_region(ohci_base, OHCI1394_REGISTER_SIZE, + OHCI1394_DRIVER_NAME)) FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable", (unsigned long long)ohci_base, (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE); -#endif ohci->init_state = OHCI_INIT_HAVE_MEM_REGION; ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE); @@ -3509,10 +3506,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) iounmap(ohci->registers); case OHCI_INIT_HAVE_MEM_REGION: -#ifndef PCMCIA release_mem_region(pci_resource_start(ohci->dev, 0), OHCI1394_REGISTER_SIZE); -#endif #ifdef CONFIG_PPC_PMAC /* On UniNorth, power down the cable and turn off the chip clock @@ -3541,9 +3536,6 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) int err; struct ti_ohci *ohci = pci_get_drvdata(pdev); - printk(KERN_INFO "%s does not fully support suspend and resume yet\n", - OHCI1394_DRIVER_NAME); - if (!ohci) { printk(KERN_ERR "%s: tried to suspend nonexisting host\n", OHCI1394_DRIVER_NAME); @@ -3630,15 +3622,14 @@ static int ohci1394_pci_resume(struct pci_dev *pdev) mdelay(50); ohci_initialize(ohci); + hpsb_resume_host(ohci->host); return 0; } #endif /* CONFIG_PM */ -#define PCI_CLASS_FIREWIRE_OHCI ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10) - static struct pci_device_id ohci1394_pci_tbl[] = { { - .class = PCI_CLASS_FIREWIRE_OHCI, + .class = PCI_CLASS_SERIAL_FIREWIRE_OHCI, .class_mask = PCI_ANY_ID, .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, diff --git a/drivers/ieee1394/oui.db b/drivers/ieee1394/oui.db deleted file mode 100644 index 592c8a60d01..00000000000 --- a/drivers/ieee1394/oui.db +++ /dev/null @@ -1,7048 +0,0 @@ -000000 XEROX CORPORATION -000001 XEROX CORPORATION -000002 XEROX CORPORATION -000003 XEROX CORPORATION -000004 XEROX CORPORATION -000005 XEROX CORPORATION -000006 XEROX CORPORATION -000007 XEROX CORPORATION -000008 XEROX CORPORATION -000009 XEROX CORPORATION -00000A OMRON TATEISI ELECTRONICS CO. -00000B MATRIX CORPORATION -00000C CISCO SYSTEMS, INC. -00000D FIBRONICS LTD. -00000E FUJITSU LIMITED -00000F NEXT, INC. -000010 SYTEK INC. -000011 NORMEREL SYSTEMES -000012 INFORMATION TECHNOLOGY LIMITED -000013 CAMEX -000014 NETRONIX -000015 DATAPOINT CORPORATION -000016 DU PONT PIXEL SYSTEMS . -000017 TEKELEC -000018 WEBSTER COMPUTER CORPORATION -000019 APPLIED DYNAMICS INTERNATIONAL -00001A ADVANCED MICRO DEVICES -00001B NOVELL INC. -00001C BELL TECHNOLOGIES -00001D CABLETRON SYSTEMS, INC. -00001E TELSIST INDUSTRIA ELECTRONICA -00001F Telco Systems, Inc. -000020 DATAINDUSTRIER DIAB AB -000021 SUREMAN COMP. & COMMUN. CORP. -000022 VISUAL TECHNOLOGY INC. -000023 ABB INDUSTRIAL SYSTEMS AB -000024 CONNECT AS -000025 RAMTEK CORP. -000026 SHA-KEN CO., LTD. -000027 JAPAN RADIO COMPANY -000028 PRODIGY SYSTEMS CORPORATION -000029 IMC NETWORKS CORP. -00002A TRW - SEDD/INP -00002B CRISP AUTOMATION, INC -00002C AUTOTOTE LIMITED -00002D CHROMATICS INC -00002E SOCIETE EVIRA -00002F TIMEPLEX INC. -000030 VG LABORATORY SYSTEMS LTD -000031 QPSX COMMUNICATIONS PTY LTD -000032 Marconi plc -000033 EGAN MACHINERY COMPANY -000034 NETWORK RESOURCES CORPORATION -000035 SPECTRAGRAPHICS CORPORATION -000036 ATARI CORPORATION -000037 OXFORD METRICS LIMITED -000038 CSS LABS -000039 TOSHIBA CORPORATION -00003A CHYRON CORPORATION -00003B i Controls, Inc. -00003C AUSPEX SYSTEMS INC. -00003D UNISYS -00003E SIMPACT -00003F SYNTREX, INC. -000040 APPLICON, INC. -000041 ICE CORPORATION -000042 METIER MANAGEMENT SYSTEMS LTD. -000043 MICRO TECHNOLOGY -000044 CASTELLE CORPORATION -000045 FORD AEROSPACE & COMM. CORP. -000046 OLIVETTI NORTH AMERICA -000047 NICOLET INSTRUMENTS CORP. -000048 SEIKO EPSON CORPORATION -000049 APRICOT COMPUTERS, LTD -00004A ADC CODENOLL TECHNOLOGY CORP. -00004B ICL DATA OY -00004C NEC CORPORATION -00004D DCI CORPORATION -00004E AMPEX CORPORATION -00004F LOGICRAFT, INC. -000050 RADISYS CORPORATION -000051 HOB ELECTRONIC GMBH & CO. KG -000052 Intrusion.com, Inc. -000053 COMPUCORP -000054 MODICON, INC. -000055 COMMISSARIAT A L`ENERGIE ATOM. -000056 DR. B. STRUCK -000057 SCITEX CORPORATION LTD. -000058 RACORE COMPUTER PRODUCTS INC. -000059 HELLIGE GMBH -00005A SysKonnect GmbH -00005B ELTEC ELEKTRONIK AG -00005C TELEMATICS INTERNATIONAL INC. -00005D CS TELECOM -00005E USC INFORMATION SCIENCES INST -00005F SUMITOMO ELECTRIC IND., LTD. -000060 KONTRON ELEKTRONIK GMBH -000061 GATEWAY COMMUNICATIONS -000062 BULL HN INFORMATION SYSTEMS -000063 DR.ING.SEUFERT GMBH -000064 YOKOGAWA DIGITAL COMPUTER CORP -000065 NETWORK ASSOCIATES, INC. -000066 TALARIS SYSTEMS, INC. -000067 SOFT * RITE, INC. -000068 ROSEMOUNT CONTROLS -000069 CONCORD COMMUNICATIONS INC -00006A COMPUTER CONSOLES INC. -00006B SILICON GRAPHICS INC./MIPS -00006D CRAY COMMUNICATIONS, LTD. -00006E ARTISOFT, INC. -00006F Madge Ltd. -000070 HCL LIMITED -000071 ADRA SYSTEMS INC. -000072 MINIWARE TECHNOLOGY -000073 SIECOR CORPORATION -000074 RICOH COMPANY LTD. -000075 Nortel Networks -000076 ABEKAS VIDEO SYSTEM -000077 INTERPHASE CORPORATION -000078 LABTAM LIMITED -000079 NETWORTH INCORPORATED -00007A DANA COMPUTER INC. -00007B RESEARCH MACHINES -00007C AMPERE INCORPORATED -00007D SUN MICROSYSTEMS, INC. -00007E CLUSTRIX CORPORATION -00007F LINOTYPE-HELL AG -000080 CRAY COMMUNICATIONS A/S -000081 BAY NETWORKS -000082 LECTRA SYSTEMES SA -000083 TADPOLE TECHNOLOGY PLC -000084 SUPERNET -000085 CANON INC. -000086 MEGAHERTZ CORPORATION -000087 HITACHI, LTD. -000088 COMPUTER NETWORK TECH. CORP. -000089 CAYMAN SYSTEMS INC. -00008A DATAHOUSE INFORMATION SYSTEMS -00008B INFOTRON -00008C Alloy Computer Products (Australia) Pty Ltd -00008D VERDIX CORPORATION -00008E SOLBOURNE COMPUTER, INC. -00008F RAYTHEON COMPANY -000090 MICROCOM -000091 ANRITSU CORPORATION -000092 COGENT DATA TECHNOLOGIES -000093 PROTEON INC. -000094 ASANTE TECHNOLOGIES -000095 SONY TEKTRONIX CORP. -000096 MARCONI ELECTRONICS LTD. -000097 EPOCH SYSTEMS -000098 CROSSCOMM CORPORATION -000099 MTX, INC. -00009A RC COMPUTER A/S -00009B INFORMATION INTERNATIONAL, INC -00009C ROLM MIL-SPEC COMPUTERS -00009D LOCUS COMPUTING CORPORATION -00009E MARLI S.A. -00009F AMERISTAR TECHNOLOGIES INC. -0000A0 TOKYO SANYO ELECTRIC CO. LTD. -0000A1 MARQUETTE ELECTRIC CO. -0000A2 BAY NETWORKS -0000A3 NETWORK APPLICATION TECHNOLOGY -0000A4 ACORN COMPUTERS LIMITED -0000A5 COMPATIBLE SYSTEMS CORP. -0000A6 NETWORK GENERAL CORPORATION -0000A7 NETWORK COMPUTING DEVICES INC. -0000A8 STRATUS COMPUTER INC. -0000A9 NETWORK SYSTEMS CORP. -0000AA XEROX CORPORATION -0000AB LOGIC MODELING CORPORATION -0000AC CONWARE COMPUTER CONSULTING -0000AD BRUKER INSTRUMENTS INC. -0000AE DASSAULT ELECTRONIQUE -0000AF NUCLEAR DATA INSTRUMENTATION -0000B0 RND-RAD NETWORK DEVICES -0000B1 ALPHA MICROSYSTEMS INC. -0000B2 TELEVIDEO SYSTEMS, INC. -0000B3 CIMLINC INCORPORATED -0000B4 EDIMAX COMPUTER COMPANY -0000B5 DATABILITY SOFTWARE SYS. INC. -0000B6 MICRO-MATIC RESEARCH -0000B7 DOVE COMPUTER CORPORATION -0000B8 SEIKOSHA CO., LTD. -0000B9 MCDONNELL DOUGLAS COMPUTER SYS -0000BA SIIG, INC. -0000BB TRI-DATA -0000BC ALLEN-BRADLEY CO. INC. -0000BD MITSUBISHI CABLE COMPANY -0000BE THE NTI GROUP -0000BF SYMMETRIC COMPUTER SYSTEMS -0000C0 WESTERN DIGITAL CORPORATION -0000C1 Madge Ltd. -0000C2 INFORMATION PRESENTATION TECH. -0000C3 HARRIS CORP COMPUTER SYS DIV -0000C4 WATERS DIV. OF MILLIPORE -0000C5 FARALLON COMPUTING/NETOPIA -0000C6 EON SYSTEMS -0000C7 ARIX CORPORATION -0000C8 ALTOS COMPUTER SYSTEMS -0000C9 EMULEX CORPORATION -0000CA APPLITEK -0000CB COMPU-SHACK ELECTRONIC GMBH -0000CC DENSAN CO., LTD. -0000CD Allied Telesyn Research Ltd. -0000CE MEGADATA CORP. -0000CF HAYES MICROCOMPUTER PRODUCTS -0000D0 DEVELCON ELECTRONICS LTD. -0000D1 ADAPTEC INCORPORATED -0000D2 SBE, INC. -0000D3 WANG LABORATORIES INC. -0000D4 PURE DATA LTD. -0000D5 MICROGNOSIS INTERNATIONAL -0000D6 PUNCH LINE HOLDING -0000D7 DARTMOUTH COLLEGE -0000D8 NOVELL, INC. -0000D9 NIPPON TELEGRAPH & TELEPHONE -0000DA ATEX -0000DB BRITISH TELECOMMUNICATIONS PLC -0000DC HAYES MICROCOMPUTER PRODUCTS -0000DD TCL INCORPORATED -0000DE CETIA -0000DF BELL & HOWELL PUB SYS DIV -0000E0 QUADRAM CORP. -0000E1 GRID SYSTEMS -0000E2 ACER TECHNOLOGIES CORP. -0000E3 INTEGRATED MICRO PRODUCTS LTD -0000E4 IN2 GROUPE INTERTECHNIQUE -0000E5 SIGMEX LTD. -0000E6 APTOR PRODUITS DE COMM INDUST -0000E7 STAR GATE TECHNOLOGIES -0000E8 ACCTON TECHNOLOGY CORP. -0000E9 ISICAD, INC. -0000EA UPNOD AB -0000EB MATSUSHITA COMM. IND. CO. LTD. -0000EC MICROPROCESS -0000ED APRIL -0000EE NETWORK DESIGNERS, LTD. -0000EF KTI -0000F0 SAMSUNG ELECTRONICS CO., LTD. -0000F1 MAGNA COMPUTER CORPORATION -0000F2 SPIDER COMMUNICATIONS -0000F3 GANDALF DATA LIMITED -0000F4 ALLIED TELESYN INTERNATIONAL -0000F5 DIAMOND SALES LIMITED -0000F6 APPLIED MICROSYSTEMS CORP. -0000F7 YOUTH KEEP ENTERPRISE CO LTD -0000F8 DIGITAL EQUIPMENT CORPORATION -0000F9 QUOTRON SYSTEMS INC. -0000FA MICROSAGE COMPUTER SYSTEMS INC -0000FB RECHNER ZUR KOMMUNIKATION -0000FC MEIKO -0000FD HIGH LEVEL HARDWARE -0000FE ANNAPOLIS MICRO SYSTEMS -0000FF CAMTEC ELECTRONICS LTD. -000100 EQUIP'TRANS -000102 3COM CORPORATION -000103 3COM CORPORATION -000104 DVICO Co., Ltd. -000105 BECKHOFF GmbH -000106 Tews Datentechnik GmbH -000107 Leiser GmbH -000108 AVLAB Technology, Inc. -000109 Nagano Japan Radio Co., Ltd. -00010A CIS TECHNOLOGY INC. -00010B Space CyberLink, Inc. -00010C System Talks Inc. -00010D CORECO, INC. -00010E Bri-Link Technologies Co., Ltd -00010F Nishan Systems, Inc. -000110 Gotham Networks -000111 iDigm Inc. -000112 Shark Multimedia Inc. -000113 OLYMPUS CORPORATION -000114 KANDA TSUSHIN KOGYO CO., LTD. -000115 EXTRATECH CORPORATION -000116 Netspect Technologies, Inc. -000117 CANAL + -000118 EZ Digital Co., Ltd. -000119 Action Controls Pty. Ltd. -00011A EEH DataLink GmbH -00011B Unizone Technologies, Inc. -00011C Universal Talkware Corporation -00011D Centillium Communications -00011E Precidia Technologies, Inc. -00011F RC Networks, Inc. -000120 OSCILLOQUARTZ S.A. -000121 RapidStream Inc. -000122 Trend Communications, Ltd. -000123 DIGITAL ELECTRONICS CORP. -000124 Acer Incorporated -000125 YAESU MUSEN CO., LTD. -000126 PAC Labs -000127 The OPEN Group Limited -000128 EnjoyWeb, Inc. -000129 DFI Inc. -00012A Telematica Sistems Inteligente -00012B TELENET Co., Ltd. -00012C Aravox Technologies, Inc. -00012D Komodo Technology -00012E PC Partner Ltd. -00012F Twinhead International Corp -000130 Extreme Networks -000131 Detection Systems, Inc. -000132 Dranetz - BMI -000133 KYOWA Electronic Instruments C -000134 SIG Positec Systems AG -000135 KDC Corp. -000136 CyberTAN Technology, Inc. -000137 IT Farm Corporation -000138 XAVi Technologies Corp. -000139 Point Multimedia Systems -00013A SHELCAD COMMUNICATIONS, LTD. -00013B BNA SYSTEMS -00013C TIW SYSTEMS -00013D RiscStation Ltd. -00013E Ascom Tateco AB -00013F Neighbor World Co., Ltd. -000140 Sendtek Corporation -000141 CABLE PRINT -000142 Cisco Systems, Inc. -000143 Cisco Systems, Inc. -000144 Cereva Networks, Inc. -000145 WINSYSTEMS, INC. -000146 Tesco Controls, Inc. -000147 Zhone Technologies -000148 X-traWeb Inc. -000149 T.D.T. Transfer Data Test GmbH -00014A SONY COMPUTER SCIENCE LABS., I -00014B Ennovate Networks, Inc. -00014C Berkeley Process Control -00014D Shin Kin Enterprises Co., Ltd -00014E WIN Enterprises, Inc. -00014F LUMINOUS Networks, Inc. -000150 GILAT COMMUNICATIONS, LTD. -000151 Ensemble Communications -000152 CHROMATEK INC. -000153 ARCHTEK TELECOM CORPORATION -000154 G3M Corporation -000155 Promise Technology, Inc. -000156 FIREWIREDIRECT.COM, INC. -000157 SYSWAVE CO., LTD -000158 Electro Industries/Gauge Tech -000159 S1 Corporation -00015A Digital Video Broadcasting -00015B ITALTEL S.p.A/RF-UP-I -00015C CADANT INC. -00015D Sun Microsystems, Inc -00015E BEST TECHNOLOGY CO., LTD. -00015F DIGITAL DESIGN GmbH -000160 ELMEX Co., LTD. -000161 Meta Machine Technology -000162 Cygnet Technologies, Inc. -000163 Cisco Systems, Inc. -000164 Cisco Systems, Inc. -000165 AirSwitch Corporation -000166 TC GROUP A/S -000167 HIOKI E.E. CORPORATION -000168 VITANA CORPORATION -000169 Celestix Networks Pte Ltd. -00016A ALITEC -00016B LightChip, Inc. -00016C FOXCONN -00016D CarrierComm Inc. -00016E Conklin Corporation -00016F HAITAI ELECTRONICS CO., LTD. -000170 ESE Embedded Syste |