diff options
Diffstat (limited to 'hw/bt-hci.c')
| -rw-r--r-- | hw/bt-hci.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/hw/bt-hci.c b/hw/bt-hci.c index 41df24c70..a3a7fb49e 100644 --- a/hw/bt-hci.c +++ b/hw/bt-hci.c @@ -721,7 +721,7 @@ static void bt_hci_connection_reject_event(struct bt_hci_s *hci, static void bt_hci_connection_accept(struct bt_hci_s *hci, struct bt_device_s *host) { - struct bt_hci_link_s *link = qemu_mallocz(sizeof(struct bt_hci_link_s)); + struct bt_hci_link_s *link = g_malloc0(sizeof(struct bt_hci_link_s)); evt_conn_complete params; uint16_t handle; uint8_t status = HCI_SUCCESS; @@ -736,7 +736,7 @@ static void bt_hci_connection_accept(struct bt_hci_s *hci, tries); if (!tries) { - qemu_free(link); + g_free(link); bt_hci_connection_reject(hci, host, HCI_REJECTED_LIMITED_RESOURCES); status = HCI_NO_CONNECTION; goto complete; @@ -893,7 +893,7 @@ static void bt_hci_disconnect(struct bt_hci_s *hci, /* We are the slave, we get to clean this burden */ link = (struct bt_hci_link_s *) btlink; - qemu_free(link); + g_free(link); complete: bt_hci_lmp_link_teardown(hci, handle); @@ -928,7 +928,7 @@ static void bt_hci_lmp_disconnect_slave(struct bt_link_s *btlink) uint16_t handle = link->handle; evt_disconn_complete params; - qemu_free(link); + g_free(link); bt_hci_lmp_link_teardown(hci, handle); @@ -1138,7 +1138,7 @@ static void bt_hci_reset(struct bt_hci_s *hci) hci->device.inquiry_scan = 0; hci->device.page_scan = 0; if (hci->device.lmp_name) - qemu_free((void *) hci->device.lmp_name); + g_free((void *) hci->device.lmp_name); hci->device.lmp_name = NULL; hci->device.class[0] = 0x00; hci->device.class[1] = 0x00; @@ -1816,8 +1816,8 @@ static void bt_submit_hci(struct HCIInfo *info, LENGTH_CHECK(change_local_name); if (hci->device.lmp_name) - qemu_free((void *) hci->device.lmp_name); - hci->device.lmp_name = qemu_strndup(PARAM(change_local_name, name), + g_free((void *) hci->device.lmp_name); + hci->device.lmp_name = g_strndup(PARAM(change_local_name, name), sizeof(PARAM(change_local_name, name))); bt_hci_event_complete_status(hci, HCI_SUCCESS); break; @@ -2143,7 +2143,7 @@ static void bt_hci_destroy(struct bt_device_s *dev) struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net) { - struct bt_hci_s *s = qemu_mallocz(sizeof(struct bt_hci_s)); + struct bt_hci_s *s = g_malloc0(sizeof(struct bt_hci_s)); s->lm.inquiry_done = qemu_new_timer_ns(vm_clock, bt_hci_inquiry_done, s); s->lm.inquiry_next = qemu_new_timer_ns(vm_clock, bt_hci_inquiry_next, s); @@ -2188,7 +2188,7 @@ static void bt_hci_done(struct HCIInfo *info) bt_device_done(&hci->device); if (hci->device.lmp_name) - qemu_free((void *) hci->device.lmp_name); + g_free((void *) hci->device.lmp_name); /* Be gentle and send DISCONNECT to all connected peers and those * currently waiting for us to accept or reject a connection request. @@ -2217,5 +2217,5 @@ static void bt_hci_done(struct HCIInfo *info) qemu_free_timer(hci->lm.inquiry_next); qemu_free_timer(hci->conn_accept_timer); - qemu_free(hci); + g_free(hci); } |