From 889dee8076aa1c639dbbd6ce4993872e7feb4acf Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 12 Jan 2022 16:05:33 +1100 Subject: [PATCH] extmod/modbluetooth: Fix conditional compilation of ringbuf_put_uuid. This fixes a bug introduced in a76604afba109d990e466cdcd5a69a82077a7f56 Signed-off-by: Damien George --- extmod/modbluetooth.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c index 1bf2ae6add..c4b9675cef 100644 --- a/extmod/modbluetooth.c +++ b/extmod/modbluetooth.c @@ -215,7 +215,9 @@ STATIC mp_int_t bluetooth_uuid_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bu return 0; } -#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS && MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE +#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS + +#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT STATIC void ringbuf_put_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) { assert(ringbuf_free(ringbuf) >= (size_t)uuid->type + 1); ringbuf_put(ringbuf, uuid->type); @@ -223,7 +225,9 @@ STATIC void ringbuf_put_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) ringbuf_put(ringbuf, uuid->data[i]); } } +#endif +#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) { assert(ringbuf_avail(ringbuf) >= 1); uuid->type = ringbuf_get(ringbuf); @@ -232,7 +236,9 @@ STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) uuid->data[i] = ringbuf_get(ringbuf); } } -#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE +#endif + +#endif // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS const mp_obj_type_t mp_type_bluetooth_uuid = { { &mp_type_type },