the scheduled IEEE1394_OUI_DB removal
This patch contains the scheduled IEEE1394_OUI_DB removal. Signed-off-by: Adrian Bunk <bunk@stusta.de> Update: Also remove drivers/ieee1394/.gitignore. Remove now unused struct members in drivers/ieee1394/nodemgr.h. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>hifive-unleashed-5.1
Adrian Bunk
Stefan Richter
parent
d395a1774f
commit
e658bc556b
|
|
@ -50,14 +50,6 @@ Who: Dan Dennedy <dan@dennedy.org>, 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
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
oui.c
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
@ -473,11 +457,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 +485,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 +846,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 +865,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 +875,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 +950,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 +990,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 +1120,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 +1147,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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,22 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
cat <<EOF
|
||||
/* Generated file for OUI database */
|
||||
|
||||
|
||||
#ifdef CONFIG_IEEE1394_OUI_DB
|
||||
struct oui_list_struct {
|
||||
int oui;
|
||||
char *name;
|
||||
} oui_list[] = {
|
||||
EOF
|
||||
|
||||
while read oui name; do
|
||||
echo " { 0x$oui, \"$name\" },"
|
||||
done
|
||||
|
||||
cat <<EOF
|
||||
};
|
||||
|
||||
#endif /* CONFIG_IEEE1394_OUI_DB */
|
||||
EOF
|
||||
Loading…
Reference in New Issue