From b415128e481fce0ff4ac3ced81fb5ab09824fa47 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Tue, 24 Jan 2012 02:30:57 +0000 Subject: From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6739 : Update company ids and HCI/LMP versions to the latest Assigned Numbers I made the cosmetic changes: - simplify version description - I updated all company ids from Assigned Numbers, so there are some very small differences with old version (inadvertently) Based on: https://www.bluetooth.org/Technical/AssignedNumbers/hci.htm https://www.bluetooth.org/Technical/AssignedNumbers/link_manager.htm https://www.bluetooth.org/technical/assignednumbers/identifiers.htm From me: list the above URLs in comments in the code. svn path=/trunk/; revision=40681 --- epan/dissectors/packet-bthci_evt.c | 140 ++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 40 deletions(-) (limited to 'epan/dissectors/packet-bthci_evt.c') diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index f3497d50b0..0a96bd2b96 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -340,26 +340,35 @@ static const value_string evt_key_flag[] = { {0, NULL } }; +/* Taken from https://www.bluetooth.org/Technical/AssignedNumbers/link_manager.htm */ static const value_string evt_lmp_vers_nr[] = { - {0x00, "Bluetooth LMP 1.0"}, - {0x01, "Bluetooth LMP 1.1"}, - {0x02, "Bluetooth LMP 1.2"}, - {0x03, "Bluetooth LMP 2.0"}, - {0x04, "Bluetooth LMP 2.1"}, + {0x00, "1.0b"}, + {0x01, "1.1"}, + {0x02, "1.2"}, + {0x03, "2.0 + EDR"}, + {0x04, "2.1 + EDR"}, + {0x05, "3.0 + HS"}, + {0x06, "4.0"}, {0, NULL } }; +/* Taken from https://www.bluetooth.org/Technical/AssignedNumbers/hci.htm + * (requires a login/password) + */ static const value_string evt_hci_vers_nr[] = { - {0x00, "Bluetooth HCI Specification 1.0B"}, - {0x01, "Bluetooth HCI Specification 1.1"}, - {0x02, "Bluetooth HCI Specification 1.2"}, - {0x03, "Bluetooth HCI Specification 2.0"}, - {0x04, "Bluetooth HCI Specification 2.1"}, + {0x00, "1.0b"}, + {0x01, "1.1"}, + {0x02, "1.2"}, + {0x03, "2.0 + EDR"}, + {0x04, "2.1 + EDR"}, + {0x05, "3.0 + HS"}, + {0x06, "4.0"}, {0, NULL } }; +/* Taken from https://www.bluetooth.org/technical/assignednumbers/identifiers.htm */ static const value_string evt_comp_id[] = { - {0x0000, "Ericsson Mobile Communications"}, + {0x0000, "Ericsson Technology Licensing"}, {0x0001, "Nokia Mobile Phones"}, {0x0002, "Intel Corp."}, {0x0003, "IBM Corp."}, @@ -369,12 +378,12 @@ static const value_string evt_comp_id[] = { {0x0007, "Lucent"}, {0x0008, "Motorola"}, {0x0009, "Infineon Technologies AG"}, - {0x000a, "Cambridge Silicon Radio"}, - {0x000b, "Silicon Wave"}, - {0x000c, "Digianswer"}, - {0x000d, "Texas Instruments Inc."}, - {0x000e, "Parthus Technologies Inc."}, - {0x000f, "Broadcom Corporation"}, + {0x000A, "Cambridge Silicon Radio"}, + {0x000B, "Silicon Wave"}, + {0x000C, "Digianswer A/S"}, + {0x000D, "Texas Instruments Inc."}, + {0x000E, "Ceva, Inc. (formerly Parthus Technologies, Inc.)"}, + {0x000F, "Broadcom Corporation"}, {0x0010, "Mitel Semiconductor"}, {0x0011, "Widcomm, Inc."}, {0x0012, "Zeevo, Inc."}, @@ -385,28 +394,28 @@ static const value_string evt_comp_id[] = { {0x0017, "Newlogic"}, {0x0018, "Transilica, Inc."}, {0x0019, "Rohde & Schwarz GmbH & Co. KG"}, - {0x001a, "TTPCom Limited"}, - {0x001b, "Signia Technologies, Inc."}, - {0x001c, "Conexant Systems Inc."}, - {0x001d, "Qualcomm"}, - {0x001e, "Inventel"}, - {0x001f, "AVM Berlin"}, + {0x001A, "TTPCom Limited"}, + {0x001B, "Signia Technologies, Inc."}, + {0x001C, "Conexant Systems Inc."}, + {0x001D, "Qualcomm"}, + {0x001E, "Inventel"}, + {0x001F, "AVM Berlin"}, {0x0020, "BandSpeed, Inc."}, {0x0021, "Mansella Ltd"}, {0x0022, "NEC Corporation"}, - {0x0023, "WavePlus Technology Co., Ltd"}, + {0x0023, "WavePlus Technology Co., Ltd."}, {0x0024, "Alcatel"}, {0x0025, "Philips Semiconductors"}, {0x0026, "C Technologies"}, {0x0027, "Open Interface"}, - {0x0028, "RF Micro Devices"}, + {0x0028, "R F Micro Devices"}, {0x0029, "Hitachi Ltd"}, - {0x002a, "Symbol Technologies, Inc."}, - {0x002b, "Tenovis"}, - {0x002c, "Macronix International Co. Ltd."}, - {0x002d, "GCT Semiconductor"}, - {0x002e, "Norwood Systems"}, - {0x002f, "MewTel Technology Inc."}, + {0x002A, "Symbol Technologies, Inc."}, + {0x002B, "Tenovis"}, + {0x002C, "Macronix International Co. Ltd."}, + {0x002D, "GCT Semiconductor"}, + {0x002E, "Norwood Systems"}, + {0x002F, "MewTel Technology Inc."}, {0x0030, "ST Microelectronics"}, {0x0031, "Synopsys"}, {0x0032, "Red-M (Communications) Ltd"}, @@ -417,23 +426,74 @@ static const value_string evt_comp_id[] = { {0x0037, "Mobilian Corporation"}, {0x0038, "Terax"}, {0x0039, "Integrated System Solution Corp."}, - {0x003a, "Matsushita Electric Industrial Co. Ltd."}, - {0x003b, "Gennum Corporation"}, - {0x003c, "Research In Motion"}, - {0x003d, "IPextreme, Inc."}, - {0x003e, "Systems and Chips, Inc"}, - {0x003f, "Bluetooth SIG, Inc"}, + {0x003A, "Matsushita Electric Industrial Co., Ltd."}, + {0x003B, "Gennum Corporation"}, + {0x003C, "Research In Motion"}, + {0x003D, "IPextreme, Inc."}, + {0x003E, "Systems and Chips, Inc"}, + {0x003F, "Bluetooth SIG, Inc"}, {0x0040, "Seiko Epson Corporation"}, {0x0041, "Integrated Silicon Solution Taiwan, Inc."}, {0x0042, "CONWISE Technology Corporation Ltd"}, {0x0043, "PARROT SA"}, - {0x0044, "Socket Communications"}, - {0x0045, "Atheros Communications Inc."}, + {0x0044, "Socket Mobile"}, + {0x0045, "Atheros Communications, Inc."}, {0x0046, "MediaTek, Inc."}, {0x0047, "Bluegiga"}, {0x0048, "Marvell Technology Group Ltd."}, {0x0049, "3DSP Corporation"}, - {0x004a, "Accel Semiconductor Ltd."}, + {0x004A, "Accel Semiconductor Ltd."}, + {0x004B, "Continental Automotive Systems"}, + {0x004C, "Apple, Inc."}, + {0x004D, "Staccato Communications, Inc."}, + {0x004E, "Avago Technologies"}, + {0x004F, "APT Licensing Ltd."}, + {0x0050, "SiRF Technology, Inc."}, + {0x0051, "Tzero Technologies, Inc."}, + {0x0052, "J&M Corporation"}, + {0x0053, "Free2move AB"}, + {0x0054, "3DiJoy Corporation"}, + {0x0055, "Plantronics, Inc."}, + {0x0056, "Sony Ericsson Mobile Communications"}, + {0x0057, "Harman International Industries, Inc."}, + {0x0058, "Vizio, Inc."}, + {0x0059, "Nordic Semiconductor ASA"}, + {0x005A, "EM Microelectronic-Marin SA"}, + {0x005B, "Ralink Technology Corporation"}, + {0x005C, "Belkin International, Inc."}, + {0x005D, "Realtek Semiconductor Corporation"}, + {0x005E, "Stonestreet One, LLC"}, + {0x005F, "Wicentric, Inc."}, + {0x0060, "RivieraWaves S.A.S"}, + {0x0061, "RDA Microelectronics"}, + {0x0062, "Gibson Guitars"}, + {0x0063, "MiCommand Inc."}, + {0x0064, "Band XI International, LLC"}, + {0x0065, "Hewlett-Packard Company"}, + {0x0066, "9Solutions Oy"}, + {0x0067, "GN Netcom A/S"}, + {0x0068, "General Motors"}, + {0x0069, "A&D Engineering, Inc."}, + {0x006A, "MindTree Ltd."}, + {0x006B, "Polar Electro OY"}, + {0x006C, "Beautiful Enterprise Co., Ltd."}, + {0x006D, "BriarTek, Inc."}, + {0x006E, "Summit Data Communications, Inc."}, + {0x006F, "Sound ID"}, + {0x0070, "Monster, LLC"}, + {0x0071, "connectBlue AB"}, + {0x0072, "ShangHai Super Smart Electronics Co. Ltd."}, + {0x0073, "Group Sense Ltd."}, + {0x0074, "Zomm, LLC"}, + {0x0075, "Samsung Electronics Co. Ltd."}, + {0x0076, "Creative Technology Ltd."}, + {0x0077, "Laird Technologies"}, + {0x0078, "Nike, Inc."}, + {0x0079, "lesswire AG"}, + {0x007A, "MStar Semiconductor, Inc."}, + {0x007B, "Hanlynn Technologies"}, + {0x007C, "A & R Cambridge"}, + {0x007D, "Seers Technology Co. Ltd."}, {0xFFFF, "For use in internal and interoperability tests."}, {0, NULL } }; -- cgit v1.2.3