mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-18 23:42:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation for mtk/android

Browse Source
This commit is contained in:
Matthias Ringwald 2015-04-03 22:20:11 +02:00
parent 64c9c43f68
commit 0ce292f215
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/btstack/utils.h
View File

@ -131,6 +131,11 @@ void bt_flip_addr(bd_addr_t dest, bd_addr_t src);
void net_store_16(uint8_t *buffer, uint16_t pos, uint16_t value); void net_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);
void net_store_32(uint8_t *buffer, uint16_t pos, uint32_t value); void net_store_32(uint8_t *buffer, uint16_t pos, uint32_t value);
// hack: compilation with the android ndk causes an error as there's a swap64 macro
#ifdef swap64
#undef swap64
#endif
void swapX(const uint8_t *src, uint8_t *dst, int len); void swapX(const uint8_t *src, uint8_t *dst, int len);
void swap24(const uint8_t src[3], uint8_t dst[3]); void swap24(const uint8_t src[3], uint8_t dst[3]);
void swap56(const uint8_t src[7], uint8_t dst[7]); void swap56(const uint8_t src[7], uint8_t dst[7]);

10
platforms/mtk/Makefile
View File

@ -33,7 +33,7 @@ libBTstack_OBJS = \
BTdaemon_OBJS = $(libBTstack_OBJS) \ BTdaemon_OBJS = $(libBTstack_OBJS) \
att_dispatch.o \ att_dispatch.o \
ledevice_db_memory.o \ le_device_db_memory.o \
att.o \ att.o \
att_server.o \ att_server.o \
gatt_client.o \ gatt_client.o \
@ -91,19 +91,19 @@ libBTstack.so: $(libBTstack_OBJS)
$(GCC) $(LDFLAGS) -shared -Wl,-soname,/system/lib/libBTstack.so -o $@ $^ $(GCC) $(LDFLAGS) -shared -Wl,-soname,/system/lib/libBTstack.so -o $@ $^
inquiry: inquiry.o inquiry: inquiry.o
$(GCC) $(LDFLAGS) -Wl,-rpath,/system/lib libBTstack.so -o $@ $(BTSTACK_ROOT)/example/daemon/inquiry.o $(GCC) $(LDFLAGS) -Wl,-rpath,/system/lib libBTstack.so -o $@ inquiry.o
rfcomm-echo: rfcomm-echo.o rfcomm-echo: rfcomm-echo.o
$(GCC) $(LDFLAGS) -Wl,-rpath,/system/lib libBTstack.so -o $@ $(BTSTACK_ROOT)/example/daemon/rfcomm-echo.o $(GCC) $(LDFLAGS) -Wl,-rpath,/system/lib libBTstack.so -o $@ rfcomm-echo.o
le_scan: le_scan.o le_scan: le_scan.o
$(GCC) $(LDFLAGS) -Wl,-rpath,/system/lib libBTstack.so -o $@ $(BTSTACK_ROOT)/example/daemon/le_scan.o $(GCC) $(LDFLAGS) -Wl,-rpath,/system/lib libBTstack.so -o $@ le_scan.o
# minimal_peripheral: minimal_peripheral.o # minimal_peripheral: minimal_peripheral.o
# $(GCC) $(LDFLAGS) libs/libbluetoothdrv.so -o $@ minimal_peripheral.o # $(GCC) $(LDFLAGS) libs/libbluetoothdrv.so -o $@ minimal_peripheral.o
hci_dump: hci_dump:
-killall PacketLogger # killall PacketLogger
$(ADB) shell su root chmod 666 /data/btstack/hci_dump.pklg $(ADB) shell su root chmod 666 /data/btstack/hci_dump.pklg
$(ADB) pull /data/btstack/hci_dump.pklg 2> /dev/null $(ADB) pull /data/btstack/hci_dump.pklg 2> /dev/null
open hci_dump.pklg open hci_dump.pklg