Use USB Vendor Identifiers and Product Identifiers provided by V-USB - src

diff options


context:
space:
mode:

author	Edward Tomasz Napierala <trasz@FreeBSD.org>	2018-05-21 15:06:19 +0000
committer	Edward Tomasz Napierala <trasz@FreeBSD.org>	2018-05-21 15:06:19 +0000
commit	d01c1c8bfecfd71ab8958ed59114fb5fb88fcdbd (patch)
tree	56b21f074626b7525a69e975c6cb683b353b0c59 /sys/dev/usb/template
parent	c692df45fcfde88422b18637f4deeb4724ba4484 (diff)

Notes

Diffstat (limited to 'sys/dev/usb/template')

-rw-r--r--

sys/dev/usb/template/usb_template.h

-rw-r--r--

sys/dev/usb/template/usb_template_audio.c

-rw-r--r--

sys/dev/usb/template/usb_template_cdce.c

-rw-r--r--

sys/dev/usb/template/usb_template_kbd.c

-rw-r--r--

sys/dev/usb/template/usb_template_midi.c

-rw-r--r--

sys/dev/usb/template/usb_template_modem.c

-rw-r--r--

sys/dev/usb/template/usb_template_mouse.c

-rw-r--r--

sys/dev/usb/template/usb_template_msc.c

-rw-r--r--

sys/dev/usb/template/usb_template_mtp.c

-rw-r--r--

sys/dev/usb/template/usb_template_multi.c

-rw-r--r--

sys/dev/usb/template/usb_template_phone.c

-rw-r--r--

sys/dev/usb/template/usb_template_serialnet.c

12 files changed, 28 insertions, 23 deletions

diff --git a/sys/dev/usb/template/usb_template.h b/sys/dev/usb/template/usb_template.h
index ec8a9a925010..f500e343f676 100644
--- a/sys/dev/usb/template/usb_template.h
+++ b/sys/dev/usb/template/usb_template.h

@@ -33,7 +33,12 @@

#define _USB_TEMPLATE_H_

#ifndef USB_TEMPLATE_VENDOR

-#define USB_TEMPLATE_VENDOR 0x0001

+/*

+ * https://github.com/obdev/v-usb/blob/master/usbdrv/USB-IDs-for-free.txt

+ */

+#define USB_TEMPLATE_VENDOR 0x16c0

+#define USB_TEMPLATE_MANUFACTURER \

+ "The FreeBSD Project (https://www.FreeBSD.org)"

#endif

typedef const void *(usb_temp_get_string_desc_t)(uint16_t lang_id, uint8_t string_index);

diff --git a/sys/dev/usb/template/usb_template_audio.c b/sys/dev/usb/template/usb_template_audio.c
index 2c39fb98c2cd..188b2988f3eb 100644
--- a/sys/dev/usb/template/usb_template_audio.c
+++ b/sys/dev/usb/template/usb_template_audio.c

@@ -79,11 +79,11 @@ enum {

};

#define AUDIO_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define AUDIO_DEFAULT_PRODUCT_ID 0x000A

+#define AUDIO_DEFAULT_PRODUCT_ID 0x05dc

#define AUDIO_DEFAULT_MIXER "Mixer interface"

#define AUDIO_DEFAULT_RECORD "Record interface"

#define AUDIO_DEFAULT_PLAYBACK "Playback interface"

-#define AUDIO_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define AUDIO_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define AUDIO_DEFAULT_PRODUCT "Audio Test Device"

#define AUDIO_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_cdce.c b/sys/dev/usb/template/usb_template_cdce.c
index 592ccbde4669..0fc8b60b7059 100644
--- a/sys/dev/usb/template/usb_template_cdce.c
+++ b/sys/dev/usb/template/usb_template_cdce.c

@@ -80,12 +80,12 @@ enum {

};

#define ETH_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define ETH_DEFAULT_PRODUCT_ID 0x0001

+#define ETH_DEFAULT_PRODUCT_ID 0x05dc

#define ETH_DEFAULT_MAC "2A02030405060789AB"

#define ETH_DEFAULT_CONTROL "USB Ethernet Comm Interface"

#define ETH_DEFAULT_DATA "USB Ethernet Data Interface"

#define ETH_DEFAULT_CONFIG "Default Config"

-#define ETH_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define ETH_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define ETH_DEFAULT_PRODUCT "USB Ethernet Adapter"

#define ETH_DEFAULT_SERIAL_NUMBER "December 2007"

diff --git a/sys/dev/usb/template/usb_template_kbd.c b/sys/dev/usb/template/usb_template_kbd.c
index 9d525aa8c56f..7507e73b8035 100644
--- a/sys/dev/usb/template/usb_template_kbd.c
+++ b/sys/dev/usb/template/usb_template_kbd.c

@@ -77,9 +77,9 @@ enum {

};

#define KBD_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define KBD_DEFAULT_PRODUCT_ID 0x00CB

+#define KBD_DEFAULT_PRODUCT_ID 0x27db

#define KBD_DEFAULT_INTERFACE "Keyboard Interface"

-#define KBD_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define KBD_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define KBD_DEFAULT_PRODUCT "Keyboard Test Device"

#define KBD_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_midi.c b/sys/dev/usb/template/usb_template_midi.c
index 4f083cb9f34b..2b0e66f938b7 100644
--- a/sys/dev/usb/template/usb_template_midi.c
+++ b/sys/dev/usb/template/usb_template_midi.c

@@ -76,9 +76,9 @@ enum {

};

#define MIDI_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define MIDI_DEFAULT_PRODUCT_ID 0x00BB

+#define MIDI_DEFAULT_PRODUCT_ID 0x27de

#define MIDI_DEFAULT_INTERFACE "MIDI interface"

-#define MIDI_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define MIDI_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define MIDI_DEFAULT_PRODUCT "MIDI Test Device"

#define MIDI_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_modem.c b/sys/dev/usb/template/usb_template_modem.c
index b4380d587909..90b670b3a718 100644
--- a/sys/dev/usb/template/usb_template_modem.c
+++ b/sys/dev/usb/template/usb_template_modem.c

@@ -77,9 +77,9 @@ enum {

};

#define MODEM_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define MODEM_DEFAULT_PRODUCT_ID 0x000E

+#define MODEM_DEFAULT_PRODUCT_ID 0x27dd

#define MODEM_DEFAULT_INTERFACE "Modem interface"

-#define MODEM_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define MODEM_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define MODEM_DEFAULT_PRODUCT "Modem Test Device"

#define MODEM_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_mouse.c b/sys/dev/usb/template/usb_template_mouse.c
index c5255784634c..483962934285 100644
--- a/sys/dev/usb/template/usb_template_mouse.c
+++ b/sys/dev/usb/template/usb_template_mouse.c

@@ -77,9 +77,9 @@ enum {

};

#define MOUSE_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define MOUSE_DEFAULT_PRODUCT_ID 0x00AE

+#define MOUSE_DEFAULT_PRODUCT_ID 0x27da

#define MOUSE_DEFAULT_INTERFACE "Mouse interface"

-#define MOUSE_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define MOUSE_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define MOUSE_DEFAULT_PRODUCT "Mouse Test Interface"

#define MOUSE_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_msc.c b/sys/dev/usb/template/usb_template_msc.c
index a9f227d1aea3..2ba95109d957 100644
--- a/sys/dev/usb/template/usb_template_msc.c
+++ b/sys/dev/usb/template/usb_template_msc.c

@@ -77,10 +77,10 @@ enum {

};

#define MSC_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define MSC_DEFAULT_PRODUCT_ID 0x0012

+#define MSC_DEFAULT_PRODUCT_ID 0x05dc

#define MSC_DEFAULT_INTERFACE "USB Mass Storage Interface"

#define MSC_DEFAULT_CONFIGURATION "Default Config"

-#define MSC_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define MSC_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define MSC_DEFAULT_PRODUCT "USB Memory Stick"

#define MSC_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_mtp.c b/sys/dev/usb/template/usb_template_mtp.c
index 98c14659c1a5..b8b51162d4f5 100644
--- a/sys/dev/usb/template/usb_template_mtp.c
+++ b/sys/dev/usb/template/usb_template_mtp.c

@@ -86,10 +86,10 @@ enum {

};

#define MTP_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define MTP_DEFAULT_PRODUCT_ID 0x0011

+#define MTP_DEFAULT_PRODUCT_ID 0x05dc

#define MTP_DEFAULT_INTERFACE "USB MTP Interface"

#define MTP_DEFAULT_CONFIGURATION "Default Config"

-#define MTP_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define MTP_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define MTP_DEFAULT_PRODUCT "USB MTP"

#define MTP_DEFAULT_SERIAL_NUMBER "June 2008"

diff --git a/sys/dev/usb/template/usb_template_multi.c b/sys/dev/usb/template/usb_template_multi.c
index a978802c92c7..3e944cac79d7 100644
--- a/sys/dev/usb/template/usb_template_multi.c
+++ b/sys/dev/usb/template/usb_template_multi.c

@@ -90,14 +90,14 @@ enum {

};

#define MULTI_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define MULTI_DEFAULT_PRODUCT_ID 0x0001

+#define MULTI_DEFAULT_PRODUCT_ID 0x05dc

#define MULTI_DEFAULT_MODEM "Virtual serial console"

#define MULTI_DEFAULT_ETH_MAC "2A02030405060789AB"

#define MULTI_DEFAULT_ETH_CONTROL "Ethernet Comm Interface"

#define MULTI_DEFAULT_ETH_DATA "Ethernet Data Interface"

#define MULTI_DEFAULT_STORAGE "Mass Storage Interface"

#define MULTI_DEFAULT_CONFIGURATION "Default configuration"

-#define MULTI_DEFAULT_MANUFACTURER "The FreeBSD Project"

+#define MULTI_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define MULTI_DEFAULT_PRODUCT "Multifunction Device"

#define MULTI_DEFAULT_SERIAL_NUMBER "May 2018"

diff --git a/sys/dev/usb/template/usb_template_phone.c b/sys/dev/usb/template/usb_template_phone.c
index 16acbdf974ca..a9c684478fc2 100644
--- a/sys/dev/usb/template/usb_template_phone.c
+++ b/sys/dev/usb/template/usb_template_phone.c

@@ -80,12 +80,12 @@ enum {

};

#define PHONE_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define PHONE_DEFAULT_PRODUCT_ID 0xb001

+#define PHONE_DEFAULT_PRODUCT_ID 0x05dc

#define PHONE_DEFAULT_MIXER "Mixer interface"

#define PHONE_DEFAULT_RECORD "Record interface"

#define PHONE_DEFAULT_PLAYBACK "Playback interface"

#define PHONE_DEFAULT_HID "HID interface"

-#define PHONE_DEFAULT_MANUFACTURER "FreeBSD foundation"

+#define PHONE_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define PHONE_DEFAULT_PRODUCT "USB Phone Device"

#define PHONE_DEFAULT_SERIAL_NUMBER "March 2008"

diff --git a/sys/dev/usb/template/usb_template_serialnet.c b/sys/dev/usb/template/usb_template_serialnet.c
index 18d5a8c0906f..a97cef51ed21 100644
--- a/sys/dev/usb/template/usb_template_serialnet.c
+++ b/sys/dev/usb/template/usb_template_serialnet.c

@@ -89,13 +89,13 @@ enum {

};

#define SERIALNET_DEFAULT_VENDOR_ID USB_TEMPLATE_VENDOR

-#define SERIALNET_DEFAULT_PRODUCT_ID 0x0001

+#define SERIALNET_DEFAULT_PRODUCT_ID 0x05dc

#define SERIALNET_DEFAULT_MODEM "USB Modem Interface"

#define SERIALNET_DEFAULT_ETH_MAC "2A02030405060789AB"

#define SERIALNET_DEFAULT_ETH_CONTROL "USB Ethernet Comm Interface"

#define SERIALNET_DEFAULT_ETH_DATA "USB Ethernet Data Interface"

#define SERIALNET_DEFAULT_CONFIGURATION "Default configuration"

-#define SERIALNET_DEFAULT_MANUFACTURER "The FreeBSD Project"

+#define SERIALNET_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER

#define SERIALNET_DEFAULT_PRODUCT "SERIALNET"

#define SERIALNET_DEFAULT_SERIAL_NUMBER "January 2015"