mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-21 03:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

wiced: adapt to changed signature of platform_uart_receive_bytes. make it compatible with 3.3.1, 3.4.0, and 3.5.2

Browse Source
This commit is contained in:
Matthias Ringwald 2016-07-04 11:42:13 +02:00
parent 24ca7397f7
commit e7a97f41ef
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
port/wiced/create_examples.py
View File

@ -20,6 +20,7 @@ GLOBAL_INCLUDES += .
$(NAME)_SOURCES := ../../../libraries/btstack/example/EXAMPLE.c $(NAME)_SOURCES := ../../../libraries/btstack/example/EXAMPLE.c
$(NAME)_COMPONENTS += btstack/port/wiced $(NAME)_COMPONENTS += btstack/port/wiced
$(NAME)_CFLAGS += ADDITIONAL_CFLAGS
''' '''
gatt_update_template = '''#!/bin/sh gatt_update_template = '''#!/bin/sh
@ -45,7 +46,14 @@ if not "WICED Version" in wiced_version:
sys.exit(1) sys.exit(1)
# show WICED version # show WICED version
print("Found %s" % wiced_version) wiced_version = wiced_version.split()[2]
print("Found WICED SDK version: %s" % wiced_version)
additional_cflags = ""
if wiced_version < "3.4.0":
print("Adding WICED_UART_READ_DOES_NOT_RETURN_BYTES_READ for SDK < 3.4.0")
additional_cflags = "-DWICED_UART_READ_DOES_NOT_RETURN_BYTES_READ"
# path to examples # path to examples
examples_embedded = script_path + "/../../example/" examples_embedded = script_path + "/../../example/"
@ -68,7 +76,7 @@ for file in os.listdir(examples_embedded):
# create .mk file # create .mk file
with open(apps_folder + example + ".mk", "wt") as fout: with open(apps_folder + example + ".mk", "wt") as fout:
fout.write(mk_template.replace("EXAMPLE", example).replace("TOOL", script_path).replace("DATE",time.strftime("%c"))) fout.write(mk_template.replace("EXAMPLE", example).replace("TOOL", script_path).replace("ADDITIONAL_CFLAGS", additional_cflags).replace("DATE",time.strftime("%c")))
# create update_gatt.sh if .gatt file is present # create update_gatt.sh if .gatt file is present
gatt_path = examples_embedded + example + ".gatt" gatt_path = examples_embedded + example + ".gatt"

12
port/wiced/hci_transport_h4_wiced.c
View File

@ -121,10 +121,22 @@ static wiced_result_t h4_main_notify_packet_send(void *arg){
} }
// executed on rx worker thread // executed on rx worker thread
static void h4_rx_worker_receive_bytes(int bytes_to_read){ static void h4_rx_worker_receive_bytes(int bytes_to_read){
#ifdef WICED_UART_READ_DOES_NOT_RETURN_BYTES_READ
// older API passes in number of bytes to read (checked in 3.3.1 and 3.4.0)
platform_uart_receive_bytes(wiced_bt_uart_driver, &hci_packet[rx_worker_read_pos], bytes_to_read, WICED_NEVER_TIMEOUT); platform_uart_receive_bytes(wiced_bt_uart_driver, &hci_packet[rx_worker_read_pos], bytes_to_read, WICED_NEVER_TIMEOUT);
#else
// newer API uses pointer to return number of read bytes
uint32_t bytes = bytes_to_read;
platform_uart_receive_bytes(wiced_bt_uart_driver, &hci_packet[rx_worker_read_pos], &bytes, WICED_NEVER_TIMEOUT);
// assumption: bytes = bytes_to_rad as timeout is never
#endif
rx_worker_read_pos += bytes_to_read; rx_worker_read_pos += bytes_to_read;
} }
static wiced_result_t h4_rx_worker_receive_packet(void * arg){ static wiced_result_t h4_rx_worker_receive_packet(void * arg){
#ifdef WICED_BT_UART_MANUAL_CTS_RTS #ifdef WICED_BT_UART_MANUAL_CTS_RTS

4
port/wiced/readme.md
View File

@ -1,6 +1,6 @@
# BTstack port for WICED platform # BTstack port for WICED platform
WICED SDK 3.5.2 or higher required. With RedBear Duo, please follow their installation guide for WICED SDK first. Only tested on Redbear Duo platform. Please install [RedBear WICED Add-On](https://github.com/redbear/WICED-SDK) first.
To integrate BTstack into the WICED SDK, please move the BTstack project into WICED-SDK-3.5.2/libraries. To integrate BTstack into the WICED SDK, please move the BTstack project into WICED-SDK-3.5.2/libraries.
Then create projects for BTstack examples in WICED/apps/btstack by running: Then create projects for BTstack examples in WICED/apps/btstack by running:
@ -15,8 +15,6 @@ to build the SPP-and-LE-Counter example.
See WICED documentation about how to install it. See WICED documentation about how to install it.
Only tested on Redbear Duo platform.
It should work with all WICED platforms that contain a Broadcom Bluetooth chipset. It should work with all WICED platforms that contain a Broadcom Bluetooth chipset.
The maximal baud rate is limited to 3 mbps. The maximal baud rate is limited to 3 mbps.

7
port/wiced/wiced.mk
View File

@ -42,4 +42,9 @@ $(NAME)_SOURCES += \
btstack_run_loop_wiced.c \ btstack_run_loop_wiced.c \
hci_transport_h4_wiced.c \ hci_transport_h4_wiced.c \
../../chipset/bcm/btstack_chipset_bcm.c \ ../../chipset/bcm/btstack_chipset_bcm.c \
../../../drivers/bluetooth/firmware/$(BT_CHIP)$(BT_CHIP_REVISION)/$(BT_CHIP_XTAL_FREQUENCY)/bt_firmware_image.c \
ifeq ($(BT_CHIP_XTAL_FREQUENCY),)
$(NAME)_SOURCES := ../../../drivers/bluetooth/firmware/$(BT_CHIP)$(BT_CHIP_REVISION)/bt_firmware_image.c
else
$(NAME)_SOURCES := ../../../drivers/bluetooth/firmware/$(BT_CHIP)$(BT_CHIP_REVISION)/$(BT_CHIP_XTAL_FREQUENCY)/bt_firmware_image.c
endif