diff options
| -rw-r--r-- | emulator/btdev.c | 54 | ||||
| -rw-r--r-- | emulator/btdev.h | 1 | ||||
| -rw-r--r-- | emulator/hciemu.c | 3 | ||||
| -rw-r--r-- | emulator/hciemu.h | 1 |
4 files changed, 49 insertions, 10 deletions
diff --git a/emulator/btdev.c b/emulator/btdev.c index b50df0f62..9642e8668 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -314,11 +314,8 @@ static void set_common_commands_bredrle(struct btdev *btdev) btdev->commands[15] |= 0x02; /* Read BD ADDR */ } -static void set_bredr_commands(struct btdev *btdev) +static void set_common_commands_bredr20(struct btdev *btdev) { - set_common_commands_all(btdev); - set_common_commands_bredrle(btdev); - btdev->commands[0] |= 0x01; /* Inquiry */ btdev->commands[0] |= 0x02; /* Inquiry Cancel */ btdev->commands[0] |= 0x10; /* Create Connection */ @@ -371,6 +368,14 @@ static void set_bredr_commands(struct btdev *btdev) btdev->commands[14] |= 0x40; /* Read Local Extended Features */ btdev->commands[15] |= 0x01; /* Read Country Code */ btdev->commands[16] |= 0x04; /* Enable Device Under Test Mode */ +} + +static void set_bredr_commands(struct btdev *btdev) +{ + set_common_commands_all(btdev); + set_common_commands_bredrle(btdev); + set_common_commands_bredr20(btdev); + btdev->commands[16] |= 0x08; /* Setup Synchronous Connection */ btdev->commands[17] |= 0x01; /* Read Extended Inquiry Response */ btdev->commands[17] |= 0x02; /* Write Extended Inquiry Response */ @@ -385,6 +390,13 @@ static void set_bredr_commands(struct btdev *btdev) btdev->commands[30] |= 0x08; /* Get MWS Transport Layer Config */ } +static void set_bredr20_commands(struct btdev *btdev) +{ + set_common_commands_all(btdev); + set_common_commands_bredrle(btdev); + set_common_commands_bredr20(btdev); +} + static void set_le_commands(struct btdev *btdev) { set_common_commands_all(btdev); @@ -496,6 +508,25 @@ static void set_bredr_features(struct btdev *btdev) btdev->max_page = 1; } +static void set_bredr20_features(struct btdev *btdev) +{ + btdev->features[0] |= 0x04; /* Encryption */ + btdev->features[0] |= 0x20; /* Role switch */ + btdev->features[0] |= 0x80; /* Sniff mode */ + btdev->features[1] |= 0x08; /* SCO link */ + btdev->features[3] |= 0x40; /* RSSI with inquiry results */ + btdev->features[3] |= 0x80; /* Extended SCO link */ + btdev->features[4] |= 0x08; /* AFH capable slave */ + btdev->features[4] |= 0x10; /* AFH classification slave */ + btdev->features[5] |= 0x02; /* Sniff subrating */ + btdev->features[5] |= 0x04; /* Pause encryption */ + btdev->features[5] |= 0x08; /* AFH capable master */ + btdev->features[5] |= 0x10; /* AFH classification master */ + btdev->features[7] |= 0x80; /* Extended features */ + + btdev->max_page = 1; +} + static void set_le_features(struct btdev *btdev) { btdev->features[4] |= 0x20; /* BR/EDR Not Supported */ @@ -521,31 +552,34 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id) btdev->type = type; btdev->manufacturer = 63; - - if (type == BTDEV_TYPE_BREDR) - btdev->version = 0x05; - else - btdev->version = 0x08; - btdev->revision = 0x0000; switch (btdev->type) { case BTDEV_TYPE_BREDRLE: + btdev->version = 0x08; set_bredrle_features(btdev); set_bredrle_commands(btdev); break; case BTDEV_TYPE_BREDR: + btdev->version = 0x05; set_bredr_features(btdev); set_bredr_commands(btdev); break; case BTDEV_TYPE_LE: + btdev->version = 0x08; set_le_features(btdev); set_le_commands(btdev); break; case BTDEV_TYPE_AMP: + btdev->version = 0x01; set_amp_features(btdev); set_amp_commands(btdev); break; + case BTDEV_TYPE_BREDR20: + btdev->version = 0x04; + set_bredr20_features(btdev); + set_bredr20_commands(btdev); + break; } btdev->page_scan_interval = 0x0800; diff --git a/emulator/btdev.h b/emulator/btdev.h index 32c708f78..4b724a7b8 100644 --- a/emulator/btdev.h +++ b/emulator/btdev.h @@ -62,6 +62,7 @@ enum btdev_type { BTDEV_TYPE_BREDR, BTDEV_TYPE_LE, BTDEV_TYPE_AMP, + BTDEV_TYPE_BREDR20, }; enum btdev_hook_type { diff --git a/emulator/hciemu.c b/emulator/hciemu.c index fe2f66286..4881a2499 100644 --- a/emulator/hciemu.c +++ b/emulator/hciemu.c @@ -327,6 +327,9 @@ struct hciemu *hciemu_new(enum hciemu_type type) case HCIEMU_TYPE_LE: hciemu->btdev_type = BTDEV_TYPE_LE; break; + case HCIEMU_TYPE_LEGACY: + hciemu->btdev_type = BTDEV_TYPE_BREDR20; + break; default: return NULL; } diff --git a/emulator/hciemu.h b/emulator/hciemu.h index d948867b4..41ca3fce6 100644 --- a/emulator/hciemu.h +++ b/emulator/hciemu.h @@ -30,6 +30,7 @@ enum hciemu_type { HCIEMU_TYPE_BREDRLE, HCIEMU_TYPE_BREDR, HCIEMU_TYPE_LE, + HCIEMU_TYPE_LEGACY, }; enum hciemu_hook_type { |