Loading system/hci/include/userial.h +2 −4 Original line number Original line Diff line number Diff line Loading @@ -49,10 +49,8 @@ typedef enum { USERIAL_PORT_18, USERIAL_PORT_18, } userial_port_t; } userial_port_t; // Initializes the userial module. This function should only ever be called // Initializes the userial module. This function should only be called once. // once. // It returns true if the module was initialized, false if there was an error. // It returns true if the module could be initialized, false if there was an // error. bool userial_init(void); bool userial_init(void); // Opens the given serial port. Returns true if successful, false otherwise. // Opens the given serial port. Returns true if successful, false otherwise. Loading system/hci/src/btsnoop_net.cc +1 −2 Original line number Original line Diff line number Diff line Loading @@ -138,8 +138,7 @@ static void* listen_fn_(UNUSED_ATTR void* context) { } } /* When a new client connects, we have to send the btsnoop file header. This /* When a new client connects, we have to send the btsnoop file header. This allows * allows a decoder to treat the session as a new, valid btsnoop file. */ a decoder to treat the session as a new, valid btsnoop file. */ pthread_mutex_lock(&client_socket_lock_); pthread_mutex_lock(&client_socket_lock_); safe_close_(&client_socket_); safe_close_(&client_socket_); client_socket_ = client_socket; client_socket_ = client_socket; Loading system/hci/src/hci_layer.cc +3 −6 Original line number Original line Diff line number Diff line Loading @@ -516,8 +516,7 @@ static void fragmenter_transmit_finished(BT_HDR* packet, buffer_allocator->free(packet); buffer_allocator->free(packet); } else { } else { // This is kind of a weird case, since we're dispatching a partially sent // This is kind of a weird case, since we're dispatching a partially sent // packet // packet up to a higher layer. // up to a higher layer. // TODO(zachoverflow): rework upper layer so this isn't necessary. // TODO(zachoverflow): rework upper layer so this isn't necessary. data_dispatcher_dispatch(interface.event_dispatcher, data_dispatcher_dispatch(interface.event_dispatcher, packet->event & MSG_EVT_MASK, packet); packet->event & MSG_EVT_MASK, packet); Loading Loading @@ -623,10 +622,8 @@ static void hal_says_data_ready(serial_data_type_t type) { if (incoming->bytes_remaining == 0) { if (incoming->bytes_remaining == 0) { incoming->state = BRAND_NEW; incoming->state = BRAND_NEW; // Don't forget to let the hal know we finished the packet we were // Don't forget to let the hal know we finished the packet we were // ignoring. // ignoring. Otherwise we'll get out of sync with hals that embed // Otherwise we'll get out of sync with hals that embed extra // extra information in the uart stream (like H4). #badnewsbears // information // in the uart stream (like H4). #badnewsbears hal->packet_finished(type); hal->packet_finished(type); return; return; } } Loading Loading
system/hci/include/userial.h +2 −4 Original line number Original line Diff line number Diff line Loading @@ -49,10 +49,8 @@ typedef enum { USERIAL_PORT_18, USERIAL_PORT_18, } userial_port_t; } userial_port_t; // Initializes the userial module. This function should only ever be called // Initializes the userial module. This function should only be called once. // once. // It returns true if the module was initialized, false if there was an error. // It returns true if the module could be initialized, false if there was an // error. bool userial_init(void); bool userial_init(void); // Opens the given serial port. Returns true if successful, false otherwise. // Opens the given serial port. Returns true if successful, false otherwise. Loading
system/hci/src/btsnoop_net.cc +1 −2 Original line number Original line Diff line number Diff line Loading @@ -138,8 +138,7 @@ static void* listen_fn_(UNUSED_ATTR void* context) { } } /* When a new client connects, we have to send the btsnoop file header. This /* When a new client connects, we have to send the btsnoop file header. This allows * allows a decoder to treat the session as a new, valid btsnoop file. */ a decoder to treat the session as a new, valid btsnoop file. */ pthread_mutex_lock(&client_socket_lock_); pthread_mutex_lock(&client_socket_lock_); safe_close_(&client_socket_); safe_close_(&client_socket_); client_socket_ = client_socket; client_socket_ = client_socket; Loading
system/hci/src/hci_layer.cc +3 −6 Original line number Original line Diff line number Diff line Loading @@ -516,8 +516,7 @@ static void fragmenter_transmit_finished(BT_HDR* packet, buffer_allocator->free(packet); buffer_allocator->free(packet); } else { } else { // This is kind of a weird case, since we're dispatching a partially sent // This is kind of a weird case, since we're dispatching a partially sent // packet // packet up to a higher layer. // up to a higher layer. // TODO(zachoverflow): rework upper layer so this isn't necessary. // TODO(zachoverflow): rework upper layer so this isn't necessary. data_dispatcher_dispatch(interface.event_dispatcher, data_dispatcher_dispatch(interface.event_dispatcher, packet->event & MSG_EVT_MASK, packet); packet->event & MSG_EVT_MASK, packet); Loading Loading @@ -623,10 +622,8 @@ static void hal_says_data_ready(serial_data_type_t type) { if (incoming->bytes_remaining == 0) { if (incoming->bytes_remaining == 0) { incoming->state = BRAND_NEW; incoming->state = BRAND_NEW; // Don't forget to let the hal know we finished the packet we were // Don't forget to let the hal know we finished the packet we were // ignoring. // ignoring. Otherwise we'll get out of sync with hals that embed // Otherwise we'll get out of sync with hals that embed extra // extra information in the uart stream (like H4). #badnewsbears // information // in the uart stream (like H4). #badnewsbears hal->packet_finished(type); hal->packet_finished(type); return; return; } } Loading
