Lipasto

Diff between 60824d67a2b7a8970ec8163b15fdd3448476b5b7 and d433736ed51b19542ad7917df1f21e7e172ab173

Changed Files

File	Additions	Deletions	Status
android/bluetoothd-snoop.c	+1	-1	modified
monitor/analyze.c	+6	-6	modified
monitor/control.c	+13	-13	modified
src/shared/btsnoop.c	+18	-18	modified
src/shared/btsnoop.h	+9	-9	modified
Full Patch

diff --git a/android/bluetoothd-snoop.c b/android/bluetoothd-snoop.c
index 75f58cc..7526782 100644
--- a/android/bluetoothd-snoop.c
+++ b/android/bluetoothd-snoop.c
@@ -148,7 +148,7 @@ static int open_monitor(const char *path)
 	struct sockaddr_hci addr;
 	int opt = 1;
 
-	snoop = btsnoop_create(path, BTSNOOP_TYPE_HCI);
+	snoop = btsnoop_create(path, BTSNOOP_FORMAT_HCI);
 	if (!snoop)
 		return -1;
 
diff --git a/monitor/analyze.c b/monitor/analyze.c
index 47ae45f..0f2d19a 100644
--- a/monitor/analyze.c
+++ b/monitor/analyze.c
@@ -255,18 +255,18 @@ void analyze_trace(const char *path)
 {
 	struct btsnoop *btsnoop_file;
 	unsigned long num_packets = 0;
-	uint32_t type;
+	uint32_t format;
 
 	btsnoop_file = btsnoop_open(path, BTSNOOP_FLAG_PKLG_SUPPORT);
 	if (!btsnoop_file)
 		return;
 
-	type = btsnoop_get_type(btsnoop_file);
+	format = btsnoop_get_format(btsnoop_file);
 
-	switch (type) {
-	case BTSNOOP_TYPE_HCI:
-	case BTSNOOP_TYPE_UART:
-	case BTSNOOP_TYPE_MONITOR:
+	switch (format) {
+	case BTSNOOP_FORMAT_HCI:
+	case BTSNOOP_FORMAT_UART:
+	case BTSNOOP_FORMAT_MONITOR:
 		break;
 	default:
 		fprintf(stderr, "Unsupported packet format\n");
diff --git a/monitor/control.c b/monitor/control.c
index 00a60bc..b3fc93d 100644
--- a/monitor/control.c
+++ b/monitor/control.c
@@ -1159,7 +1159,7 @@ void control_server(const char *path)
 
 bool control_writer(const char *path)
 {
-	btsnoop_file = btsnoop_create(path, BTSNOOP_TYPE_MONITOR);
+	btsnoop_file = btsnoop_create(path, BTSNOOP_FORMAT_MONITOR);
 
 	return !!btsnoop_file;
 }
@@ -1168,33 +1168,33 @@ void control_reader(const char *path)
 {
 	unsigned char buf[BTSNOOP_MAX_PACKET_SIZE];
 	uint16_t pktlen;
-	uint32_t type;
+	uint32_t format;
 	struct timeval tv;
 
 	btsnoop_file = btsnoop_open(path, BTSNOOP_FLAG_PKLG_SUPPORT);
 	if (!btsnoop_file)
 		return;
 
-	type = btsnoop_get_type(btsnoop_file);
+	format = btsnoop_get_format(btsnoop_file);
 
-	switch (type) {
-	case BTSNOOP_TYPE_HCI:
-	case BTSNOOP_TYPE_UART:
-	case BTSNOOP_TYPE_SIMULATOR:
+	switch (format) {
+	case BTSNOOP_FORMAT_HCI:
+	case BTSNOOP_FORMAT_UART:
+	case BTSNOOP_FORMAT_SIMULATOR:
 		packet_del_filter(PACKET_FILTER_SHOW_INDEX);
 		break;
 
-	case BTSNOOP_TYPE_MONITOR:
+	case BTSNOOP_FORMAT_MONITOR:
 		packet_add_filter(PACKET_FILTER_SHOW_INDEX);
 		break;
 	}
 
 	open_pager();
 
-	switch (type) {
-	case BTSNOOP_TYPE_HCI:
-	case BTSNOOP_TYPE_UART:
-	case BTSNOOP_TYPE_MONITOR:
+	switch (format) {
+	case BTSNOOP_FORMAT_HCI:
+	case BTSNOOP_FORMAT_UART:
+	case BTSNOOP_FORMAT_MONITOR:
 		while (1) {
 			uint16_t index, opcode;
 
@@ -1210,7 +1210,7 @@ void control_reader(const char *path)
 		}
 		break;
 
-	case BTSNOOP_TYPE_SIMULATOR:
+	case BTSNOOP_FORMAT_SIMULATOR:
 		while (1) {
 			uint16_t frequency;
 
diff --git a/src/shared/btsnoop.c b/src/shared/btsnoop.c
index 3613c33..cec1b21 100644
--- a/src/shared/btsnoop.c
+++ b/src/shared/btsnoop.c
@@ -68,7 +68,7 @@ struct btsnoop {
 	int ref_count;
 	int fd;
 	unsigned long flags;
-	uint32_t type;
+	uint32_t format;
 	uint16_t index;
 	bool aborted;
 	bool pklg_format;
@@ -102,7 +102,7 @@ struct btsnoop *btsnoop_open(const char *path, unsigned long flags)
 		if (be32toh(hdr.version) != btsnoop_version)
 			goto failed;
 
-		btsnoop->type = be32toh(hdr.type);
+		btsnoop->format = be32toh(hdr.type);
 		btsnoop->index = 0xffff;
 	} else {
 		if (!(btsnoop->flags & BTSNOOP_FLAG_PKLG_SUPPORT))
@@ -113,7 +113,7 @@ struct btsnoop *btsnoop_open(const char *path, unsigned long flags)
 				(hdr.id[1] != 0x00 && hdr.id[1] != 0x01))
 			goto failed;
 
-		btsnoop->type = BTSNOOP_TYPE_MONITOR;
+		btsnoop->format = BTSNOOP_FORMAT_MONITOR;
 		btsnoop->index = 0xffff;
 		btsnoop->pklg_format = true;
 		btsnoop->pklg_v2 = (hdr.id[1] == 0x01);
@@ -131,7 +131,7 @@ failed:
 	return NULL;
 }
 
-struct btsnoop *btsnoop_create(const char *path, uint32_t type)
+struct btsnoop *btsnoop_create(const char *path, uint32_t format)
 {
 	struct btsnoop *btsnoop;
 	struct btsnoop_hdr hdr;
@@ -148,12 +148,12 @@ struct btsnoop *btsnoop_create(const char *path, uint32_t type)
 		return NULL;
 	}
 
-	btsnoop->type = type;
+	btsnoop->format = format;
 	btsnoop->index = 0xffff;
 
 	memcpy(hdr.id, btsnoop_id, sizeof(btsnoop_id));
 	hdr.version = htobe32(btsnoop_version);
-	hdr.type = htobe32(btsnoop->type);
+	hdr.type = htobe32(btsnoop->format);
 
 	written = write(btsnoop->fd, &hdr, BTSNOOP_HDR_SIZE);
 	if (written < 0) {
@@ -189,12 +189,12 @@ void btsnoop_unref(struct btsnoop *btsnoop)
 	free(btsnoop);
 }
 
-uint32_t btsnoop_get_type(struct btsnoop *btsnoop)
+uint32_t btsnoop_get_format(struct btsnoop *btsnoop)
 {
 	if (!btsnoop)
-		return BTSNOOP_TYPE_INVALID;
+		return BTSNOOP_FORMAT_INVALID;
 
-	return btsnoop->type;
+	return btsnoop->format;
 }
 
 bool btsnoop_write(struct btsnoop *btsnoop, struct timeval *tv,
@@ -262,8 +262,8 @@ bool btsnoop_write_hci(struct btsnoop *btsnoop, struct timeval *tv,
 	if (!btsnoop)
 		return false;
 
-	switch (btsnoop->type) {
-	case BTSNOOP_TYPE_HCI:
+	switch (btsnoop->format) {
+	case BTSNOOP_FORMAT_HCI:
 		if (btsnoop->index == 0xffff)
 			btsnoop->index = index;
 
@@ -275,7 +275,7 @@ bool btsnoop_write_hci(struct btsnoop *btsnoop, struct timeval *tv,
 			return false;
 		break;
 
-	case BTSNOOP_TYPE_MONITOR:
+	case BTSNOOP_FORMAT_MONITOR:
 		flags = (index << 16) | opcode;
 		break;
 
@@ -294,8 +294,8 @@ bool btsnoop_write_phy(struct btsnoop *btsnoop, struct timeval *tv,
 	if (!btsnoop)
 		return false;
 
-	switch (btsnoop->type) {
-	case BTSNOOP_TYPE_SIMULATOR:
+	switch (btsnoop->format) {
+	case BTSNOOP_FORMAT_SIMULATOR:
 		flags = (1 << 16) | frequency;
 		break;
 
@@ -452,13 +452,13 @@ bool btsnoop_read_hci(struct btsnoop *btsnoop, struct timeval *tv,
 	tv->tv_sec = (ts / 1000000ll) + 946684800ll;
 	tv->tv_usec = ts % 1000000ll;
 
-	switch (btsnoop->type) {
-	case BTSNOOP_TYPE_HCI:
+	switch (btsnoop->format) {
+	case BTSNOOP_FORMAT_HCI:
 		*index = 0;
 		*opcode = get_opcode_from_flags(0xff, flags);
 		break;
 
-	case BTSNOOP_TYPE_UART:
+	case BTSNOOP_FORMAT_UART:
 		len = read(btsnoop->fd, &pkt_type, 1);
 		if (len < 0) {
 			btsnoop->aborted = true;
@@ -470,7 +470,7 @@ bool btsnoop_read_hci(struct btsnoop *btsnoop, struct timeval *tv,
 		*opcode = get_opcode_from_flags(pkt_type, flags);
 		break;
 
-	case BTSNOOP_TYPE_MONITOR:
+	case BTSNOOP_FORMAT_MONITOR:
 		*index = flags >> 16;
 		*opcode = flags & 0xffff;
 		break;
diff --git a/src/shared/btsnoop.h b/src/shared/btsnoop.h
index 37788d6..735af55 100644
--- a/src/shared/btsnoop.h
+++ b/src/shared/btsnoop.h
@@ -25,13 +25,13 @@
 #include <stdbool.h>
 #include <sys/time.h>
 
-#define BTSNOOP_TYPE_INVALID		0
-#define BTSNOOP_TYPE_HCI		1001
-#define BTSNOOP_TYPE_UART		1002
-#define BTSNOOP_TYPE_BCSP		1003
-#define BTSNOOP_TYPE_3WIRE		1004
-#define BTSNOOP_TYPE_MONITOR		2001
-#define BTSNOOP_TYPE_SIMULATOR		2002
+#define BTSNOOP_FORMAT_INVALID		0
+#define BTSNOOP_FORMAT_HCI		1001
+#define BTSNOOP_FORMAT_UART		1002
+#define BTSNOOP_FORMAT_BCSP		1003
+#define BTSNOOP_FORMAT_3WIRE		1004
+#define BTSNOOP_FORMAT_MONITOR		2001
+#define BTSNOOP_FORMAT_SIMULATOR	2002
 
 #define BTSNOOP_FLAG_PKLG_SUPPORT	(1 << 0)
 
@@ -72,12 +72,12 @@ struct btsnoop_opcode_user_logging {
 struct btsnoop;
 
 struct btsnoop *btsnoop_open(const char *path, unsigned long flags);
-struct btsnoop *btsnoop_create(const char *path, uint32_t type);
+struct btsnoop *btsnoop_create(const char *path, uint32_t format);
 
 struct btsnoop *btsnoop_ref(struct btsnoop *btsnoop);
 void btsnoop_unref(struct btsnoop *btsnoop);
 
-uint32_t btsnoop_get_type(struct btsnoop *btsnoop);
+uint32_t btsnoop_get_format(struct btsnoop *btsnoop);
 
 bool btsnoop_write(struct btsnoop *btsnoop, struct timeval *tv,
 			uint32_t flags, const void *data, uint16_t size);