summaryrefslogtreecommitdiffstatshomepage
path: root/tools/insert-usb-ids.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/insert-usb-ids.py')
-rw-r--r--tools/insert-usb-ids.py26
1 files changed, 12 insertions, 14 deletions
diff --git a/tools/insert-usb-ids.py b/tools/insert-usb-ids.py
index 4f773b72f6..420db34c5a 100644
--- a/tools/insert-usb-ids.py
+++ b/tools/insert-usb-ids.py
@@ -8,22 +8,20 @@ import sys
import re
import string
+needed_keys = ('USB_PID_CDC_MSC', 'USB_PID_CDC_HID', 'USB_PID_CDC', 'USB_VID')
+
def parse_usb_ids(filename):
rv = dict()
- if filename == 'usbd_desc.c':
- for line in open(filename).readlines():
- line = line.rstrip('\r\n')
- match = re.match('^#define\s+(\w+)\s+0x([0-9A-Fa-f]+)$', line)
- if match:
- if match.group(1) == 'USBD_VID':
- rv['USB_VID'] = match.group(2)
- elif match.group(1) == 'USBD_PID':
- rv['USB_PID'] = match.group(2)
- if 'USB_VID' in rv and 'USB_PID' in rv:
- break
- else:
- raise Exception("Don't (yet) know how to parse USB IDs from %s" % filename)
- for k in ('USB_PID', 'USB_VID'):
+ for line in open(filename).readlines():
+ line = line.rstrip('\r\n')
+ match = re.match('^#define\s+(\w+)\s+\(0x([0-9A-Fa-f]+)\)$', line)
+ if match and match.group(1).startswith('USBD_'):
+ key = match.group(1).replace('USBD', 'USB')
+ val = match.group(2)
+ print("key =", key, "val =", val)
+ if key in needed_keys:
+ rv[key] = val
+ for k in needed_keys:
if k not in rv:
raise Exception("Unable to parse %s from %s" % (k, filename))
return rv