enum-ify stack/include/gatt_api::GATT_OP_CODE_

Toward readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I133f5bb129540404c1fb07dd5b3c068da725b4e5

diff --git a/stack/include/gatt_api.h b/stack/include/gatt_api.h
index 1dcd2a5..291a20b 100644 (file)
--- a/stack/include/gatt_api.h
+++ b/stack/include/gatt_api.h
@@ -79,39 +79,41 @@ typedef enum GattStatus : uint8_t {
   GATT_OUT_OF_RANGE = 0xFF,
 } tGATT_STATUS;
 
-#define GATT_RSP_ERROR 0x01
-#define GATT_REQ_MTU 0x02
-#define GATT_RSP_MTU 0x03
-#define GATT_REQ_FIND_INFO 0x04
-#define GATT_RSP_FIND_INFO 0x05
-#define GATT_REQ_FIND_TYPE_VALUE 0x06
-#define GATT_RSP_FIND_TYPE_VALUE 0x07
-#define GATT_REQ_READ_BY_TYPE 0x08
-#define GATT_RSP_READ_BY_TYPE 0x09
-#define GATT_REQ_READ 0x0A
-#define GATT_RSP_READ 0x0B
-#define GATT_REQ_READ_BLOB 0x0C
-#define GATT_RSP_READ_BLOB 0x0D
-#define GATT_REQ_READ_MULTI 0x0E
-#define GATT_RSP_READ_MULTI 0x0F
-#define GATT_REQ_READ_BY_GRP_TYPE 0x10
-#define GATT_RSP_READ_BY_GRP_TYPE 0x11
-/*                 0001-0010 (write)*/
-#define GATT_REQ_WRITE 0x12
-#define GATT_RSP_WRITE 0x13
-/* changed in V4.0 01001-0010(write cmd)*/
-#define GATT_CMD_WRITE 0x52
-#define GATT_REQ_PREPARE_WRITE 0x16
-#define GATT_RSP_PREPARE_WRITE 0x17
-#define GATT_REQ_EXEC_WRITE 0x18
-#define GATT_RSP_EXEC_WRITE 0x19
-#define GATT_HANDLE_VALUE_NOTIF 0x1B
-#define GATT_HANDLE_VALUE_IND 0x1D
-#define GATT_HANDLE_VALUE_CONF 0x1E
-/* changed in V4.0 1101-0010 (signed write)  see write cmd above*/
-#define GATT_SIGN_CMD_WRITE 0xD2
-/* 0x1E = 30 + 1 = 31*/
-#define GATT_OP_CODE_MAX (GATT_HANDLE_VALUE_CONF + 1)
+typedef enum : uint8_t {
+  GATT_RSP_ERROR = 0x01,
+  GATT_REQ_MTU = 0x02,
+  GATT_RSP_MTU = 0x03,
+  GATT_REQ_FIND_INFO = 0x04,
+  GATT_RSP_FIND_INFO = 0x05,
+  GATT_REQ_FIND_TYPE_VALUE = 0x06,
+  GATT_RSP_FIND_TYPE_VALUE = 0x07,
+  GATT_REQ_READ_BY_TYPE = 0x08,
+  GATT_RSP_READ_BY_TYPE = 0x09,
+  GATT_REQ_READ = 0x0A,
+  GATT_RSP_READ = 0x0B,
+  GATT_REQ_READ_BLOB = 0x0C,
+  GATT_RSP_READ_BLOB = 0x0D,
+  GATT_REQ_READ_MULTI = 0x0E,
+  GATT_RSP_READ_MULTI = 0x0F,
+  GATT_REQ_READ_BY_GRP_TYPE = 0x10,
+  GATT_RSP_READ_BY_GRP_TYPE = 0x11,
+  /*                 0001-0010 (write)*/
+  GATT_REQ_WRITE = 0x12,
+  GATT_RSP_WRITE = 0x13,
+  /* changed in V4.0 01001-0010(write cmd)*/
+  GATT_CMD_WRITE = 0x52,
+  GATT_REQ_PREPARE_WRITE = 0x16,
+  GATT_RSP_PREPARE_WRITE = 0x17,
+  GATT_REQ_EXEC_WRITE = 0x18,
+  GATT_RSP_EXEC_WRITE = 0x19,
+  GATT_HANDLE_VALUE_NOTIF = 0x1B,
+  GATT_HANDLE_VALUE_IND = 0x1D,
+  GATT_HANDLE_VALUE_CONF = 0x1E,
+  /* changed in V4.0 1101-0010 (signed write)  see write cmd above*/
+  GATT_SIGN_CMD_WRITE = 0xD2,
+  /* 0x1E = 30 + 1 = 31*/
+  GATT_OP_CODE_MAX = (GATT_HANDLE_VALUE_CONF + 1),
+} tGATT_OP_CODE;
 
 #define GATT_HANDLE_IS_VALID(x) ((x) != 0)