diff --git a/pcireg/PCIIDS.LHA b/pcireg/PCIIDS.LHA index cec13b8..64e8118 100644 Binary files a/pcireg/PCIIDS.LHA and b/pcireg/PCIIDS.LHA differ diff --git a/pcireg/pciutil.py b/pcireg/pciutil.py index d0cbf34..a220f81 100644 --- a/pcireg/pciutil.py +++ b/pcireg/pciutil.py @@ -19,9 +19,9 @@ clean_device_abbr = [ # Generic patterns to catch extended abbreviations: "Abbreviated Terms (AT)" - ('([A-Z])[^\s]+ ([A-Z])[^\s]+ (?:\(|\[|\{|/)\\2\\3(?:$|\)|\]|\})', '\\2\\3'), - ('([A-Z])[^\s]+ ([A-Z])[^\s]+ ([A-Z])[^\s]+ (?:\(|\[|\{|/)\\2\\3\\4(?:$|\)|\]|\})', '\\2\\3\\4'), - ('([A-Z])[^\s]+ ([A-Z])[^\s]+ ([A-Z])[^\s]+ ([A-Z])[^\s]+ (?:\(|\[|\{|/)\\2\\3\\4\\5(?:$|\)|\]|\})', '\\2\\3\\4\\5'), + ('([A-Z])[^- ]+[- ]([A-Z])[^ ]+ (?:\(|\[|\{|/)\\2\\3(?:$|\)|\]|\})', '\\2\\3'), + ('([A-Z])[^- ]+[- ]([A-Z])[^- ]+[- ]([A-Z])[^ ]+ (?:\(|\[|\{|/)\\2\\3\\4(?:$|\)|\]|\})', '\\2\\3\\4'), + ('([A-Z])[^- ]+[- ]([A-Z])[^- ]+[- ]([A-Z])[^- ]+[- ]([A-Z])[^ ]+ (?:\(|\[|\{|/)\\2\\3\\4\\5(?:$|\)|\]|\})', '\\2\\3\\4\\5'), # Manual patterns ('100Base-TX?', 'FE'),