Merge "hci: Fix multi-line comments after clang-format" (8b6258ce) · Commits · e / os / android_packages_modules_Bluetooth

system/hci/include/userial.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -49,10 +49,8 @@ typedef enum {
		USERIAL_PORT_18,
		} userial_port_t;

		// Initializes the userial module. This function should only ever be called
		// once.
		// It returns true if the module could be initialized, false if there was an
		// error.
		// Initializes the userial module. This function should only be called once.
		// It returns true if the module was initialized, false if there was an error.
		bool userial_init(void);

		// Opens the given serial port. Returns true if successful, false otherwise.

+1 −2

Original line number	Diff line number	Diff line
		@@ -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
		allows
		a decoder to treat the session as a new, valid btsnoop file. */
		* allows a decoder to treat the session as a new, valid btsnoop file. */
		pthread_mutex_lock(&client_socket_lock_);
		safe_close_(&client_socket_);
		client_socket_ = client_socket;

+3 −6

Original line number	Diff line number	Diff line
		@@ -516,8 +516,7 @@ static void fragmenter_transmit_finished(BT_HDR* packet,
		buffer_allocator->free(packet);
		} else {
		// This is kind of a weird case, since we're dispatching a partially sent
		// packet
		// up to a higher layer.
		// packet up to a higher layer.
		// TODO(zachoverflow): rework upper layer so this isn't necessary.
		data_dispatcher_dispatch(interface.event_dispatcher,
		packet->event & MSG_EVT_MASK, packet);
		@@ -623,10 +622,8 @@ static void hal_says_data_ready(serial_data_type_t type) {
		if (incoming->bytes_remaining == 0) {
		incoming->state = BRAND_NEW;
		// Don't forget to let the hal know we finished the packet we were
		// ignoring.
		// Otherwise we'll get out of sync with hals that embed extra
		// information
		// in the uart stream (like H4). #badnewsbears
		// ignoring. Otherwise we'll get out of sync with hals that embed
		// extra information in the uart stream (like H4). #badnewsbears
		hal->packet_finished(type);
		return;
		}