usb/114807: [patch] Make MetaGeek Wi-Spy 2.4x appear as such (and fix build error)

[Henrik Brix Andersen]

>Number:         114807
>Category:       usb
>Synopsis:       [patch] Make MetaGeek Wi-Spy 2.4x appear as such (and fix build error)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-usb
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 22 12:40:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Brix Andersen
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
pil.dk
>Environment:
System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #55: Fri Jul 20 01:36:09 CEST 2007 root at lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386


	
>Description:
The latest commit to sys/dev/usb/usbdevs (r1.324) breaks compilation
of sys/dev/usb/usb_quirks.c.

I take it the addition of an 'X' to the Wi-Spy PID was to make it
clear that this is the Wi-Spy 2.4x product (as suggested by
me). However, usb_quirks.c was not updated to match this, and neither
was the descriptive text in usbdevs.

	
>How-To-Repeat:
	
>Fix:

Below is my proposed patch for identifying the MetaGeek Wi-Spy 2.4x
correctly (and solving the current build issue).

	

--- wispy24x.diff begins here ---
--- sys/dev/usb/usbdevs.orig	2007-07-22 13:40:12.000000000 +0200
+++ sys/dev/usb/usbdevs	2007-07-22 13:40:45.000000000 +0200
@@ -1562,7 +1562,7 @@ product MELCO SG54HP		0x00d8	WLI-U2-SG54
 product MELCO G54HP		0x00d9	WLI-U2-G54HP
 
 /* MetaGeek products */
-product METAGEEK WISPYX		0x083e	MetaGeek Wi-Spy
+product METAGEEK WISPY24X	0x083e	MetaGeek Wi-Spy 2.4x
 
 /* Metricom products */
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
--- sys/dev/usb/usb_quirks.c.orig	2007-07-22 13:41:40.000000000 +0200
+++ sys/dev/usb/usb_quirks.c	2007-07-22 13:41:59.000000000 +0200
@@ -108,7 +108,7 @@ static const struct usbd_quirk_entry {
  /* Devices which should be ignored by both ukbd and uhid */
  { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_WISPY,
 	ANY, { UQ_KBD_IGNORE }},
- { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY,
+ { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24X,
 	ANY, { UQ_KBD_IGNORE }},
  { 0, 0, 0, { 0 } }
 };
--- wispy24x.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: