[zephyr] Updated Zephyr to v1.11.0 (#1862)

Signed-off-by: Jimmy Huang <[email protected]>

Author: Jimmy Huang

deps/zephyr

@@ -33,7 +33,7 @@ touch $SRCDIR/syscalls/sensor.h
 PASSCOUNT=0
 TOTAL=0
 
-CFLAGS="-m32 -DCONFIG_X86 -DCONFIG_PREEMPT_ENABLED -DCONFIG_LOAPIC_BASE_ADDRESS=0xFEE00000 -DCONFIG_NET_RAW_MODE -I. -I$SRCDIR -I../deps/jerryscript/jerry-core -I../deps/jerryscript/jerry-core/include -I../deps/jerryscript/jerry-ext/include -I../deps/zephyr/include -I../deps/zephyr/arch/x86/include -I../deps/iotivity-constrained/include -I../deps/iotivity-constrained -include../deps/iotivity-constrained/port/zephyr/src/config.h -I../deps/zephyr/tests/ztest/include"
+CFLAGS="-m32 -DCONFIG_X86 -DCONFIG_PREEMPT_ENABLED -DCONFIG_LOAPIC_BASE_ADDRESS=0xFEE00000 -DCONFIG_NET_RAW_MODE -DCONFIG_NET_BUF_USER_DATA_SIZE=4 -I. -I$SRCDIR -I../deps/jerryscript/jerry-core -I../deps/jerryscript/jerry-core/include -I../deps/jerryscript/jerry-ext/include -I../deps/zephyr/include -I../deps/zephyr/arch/x86/include -I../deps/iotivity-constrained/include -I../deps/iotivity-constrained -include../deps/iotivity-constrained/port/zephyr/src/config.h -I../deps/zephyr/tests/ztest/include"
 
 FAILURES=
 

scripts/checkheaders

@@ -84,13 +84,6 @@ typedef struct zjs_ble_handle {
     ble_connection_t *connections;
 } ble_handle_t;
 
-static struct bt_uuid *gatt_primary_service_uuid =
-    BT_UUID_DECLARE_16(BT_UUID_GATT_PRIMARY_VAL);
-static struct bt_uuid *gatt_characteristic_uuid =
-    BT_UUID_DECLARE_16(BT_UUID_GATT_CHRC_VAL);
-static struct bt_uuid *gatt_cud_uuid = BT_UUID_DECLARE_16(BT_UUID_GATT_CUD_VAL);
-static struct bt_uuid *gatt_ccc_uuid = BT_UUID_DECLARE_16(BT_UUID_GATT_CCC_VAL);
-
 static struct k_sem ble_sem;
 
 static ble_handle_t *ble_handle = NULL;
@@ -869,7 +862,8 @@ static bool zjs_ble_parse_characteristic(ble_characteristic_t *chrc)
             return false;
         }
 
-        if (strtoul(desc_uuid, NULL, 16) == BT_UUID_GATT_CUD_VAL) {
+        unsigned long cud_uuid = (unsigned long)BT_UUID_16(BT_UUID_GATT_CUD)->val;
+        if (strtoul(desc_uuid, NULL, 16) == cud_uuid) {
             // Support CUD only, ignore all other type of descriptors
             ZVAL v_value = zjs_get_property(v_desc, "value");
             if (jerry_value_is_string(v_value)) {
@@ -1038,7 +1032,7 @@ static bool zjs_ble_register_service(ble_service_t *service)
     memset(bt_attrs, 0, sizeof(struct bt_gatt_attr) * num_of_entries);
 
     // GATT Primary Service
-    bt_attrs[entry_index].uuid = gatt_primary_service_uuid;
+    bt_attrs[entry_index].uuid = BT_UUID_GATT_PRIMARY;
     bt_attrs[entry_index].perm = BT_GATT_PERM_READ;
     bt_attrs[entry_index].read = bt_gatt_attr_read_service;
     bt_attrs[entry_index].user_data = service->uuid;
@@ -1058,7 +1052,7 @@ static bool zjs_ble_register_service(ble_service_t *service)
 
         chrc_user_data->uuid = ch->uuid;
         chrc_user_data->properties = ch->flags;
-        bt_attrs[entry_index].uuid = gatt_characteristic_uuid;
+        bt_attrs[entry_index].uuid = BT_UUID_GATT_CHRC;
         bt_attrs[entry_index].perm = BT_GATT_PERM_READ;
         bt_attrs[entry_index].read = bt_gatt_attr_read_chrc;
         bt_attrs[entry_index].user_data = chrc_user_data;
@@ -1095,7 +1089,7 @@ static bool zjs_ble_register_service(ble_service_t *service)
             // FIXME: cud_buffer should be freed later if no longer needed, but
             //   doesn't seem to be
 
-            bt_attrs[entry_index].uuid = gatt_cud_uuid;
+            bt_attrs[entry_index].uuid = BT_UUID_GATT_CUD;
             bt_attrs[entry_index].perm = BT_GATT_PERM_READ;
             bt_attrs[entry_index].read = bt_gatt_attr_read_cud;
             bt_attrs[entry_index].user_data = cud_buffer;
@@ -1117,7 +1111,7 @@ static bool zjs_ble_register_service(ble_service_t *service)
             ccc_user_data->cfg = ble_handle->blvl_ccc_cfg;
             ccc_user_data->cfg_len = ARRAY_SIZE(ble_handle->blvl_ccc_cfg);
             ccc_user_data->cfg_changed = zjs_ble_blvl_ccc_cfg_changed;
-            bt_attrs[entry_index].uuid = gatt_ccc_uuid;
+            bt_attrs[entry_index].uuid = BT_UUID_GATT_CCC;
             bt_attrs[entry_index].perm = BT_GATT_PERM_READ | BT_GATT_PERM_WRITE;
             bt_attrs[entry_index].read = bt_gatt_attr_read_ccc;
             bt_attrs[entry_index].write = bt_gatt_attr_write_ccc;

src/zjs_ble.c

@@ -6,7 +6,6 @@
     "zephyr_conf": {
         "all": [
             "CONFIG_BT=y",
-            "CONFIG_NBLE=y",
             "CONFIG_BT_SMP=y",
             "CONFIG_BT_PERIPHERAL=y",
             "CONFIG_BT_MAX_CONN=4"

src/zjs_ble.json

@@ -15,7 +15,7 @@
 
 #ifndef ZJS_LINUX_BUILD
 // Zephyr includes
-#include <misc/ring_buffer.h>
+#include <ring_buffer.h>
 #include <zephyr.h>
 
 // ZJS includes