mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-28 19:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows-winusb: remove references to intel driver

Browse Source
This commit is contained in:
Matthias Ringwald 2020-06-22 14:54:15 +02:00
parent b1ace6bd96
commit 766dffb7a9
2 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
port/windows-winusb/Makefile
View File

@ -4,7 +4,7 @@ BTSTACK_ROOT ?= ../..
CORE += main.c btstack_stdin_windows.c
COMMON += hci_transport_h2_winusb.c btstack_run_loop_windows.c le_device_db_fs.c btstack_link_key_db_fs.c wav_util.c
COMMON += btstack_chipset_intel_firmware.c rijndael.c
COMMON += rijndael.c
include ${BTSTACK_ROOT}/example/Makefile.inc
@ -14,7 +14,6 @@ CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wpedantic
CFLAGS += -I${BTSTACK_ROOT}/platform/windows \
-I${BTSTACK_ROOT}/platform/posix \
-I${BTSTACK_ROOT}/chipset/intel \
-I${BTSTACK_ROOT}/platform/embedded \
-I${BTSTACK_ROOT}/3rd-party/rijndael \
-I${BTSTACK_ROOT}/3rd-party/tinydir
@ -25,7 +24,6 @@ VPATH += ${BTSTACK_ROOT}/platform/embedded
VPATH += ${BTSTACK_ROOT}/platform/posix
VPATH += ${BTSTACK_ROOT}/platform/windows
VPATH += ${BTSTACK_ROOT}/chipset/csr
VPATH += ${BTSTACK_ROOT}/chipset/intel
# use pkg-config for portaudio
# CFLAGS += $(shell pkg-config portaudio-2.0 --cflags) -DHAVE_PORTAUDIO

48
port/windows-winusb/main.c
View File

@ -61,14 +61,10 @@
#include "hci.h"
#include "hci_dump.h"
#include "btstack_stdin.h"
#include "btstack_chipset_intel_firmware.h"
int btstack_main(int argc, const char * argv[]);
static btstack_packet_callback_registration_t hci_event_callback_registration;
static int main_argc;
static const char ** main_argv;
static const hci_transport_t * transport;
static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
if (packet_type != HCI_EVENT_PACKET) return;
@ -101,40 +97,12 @@ void hal_led_toggle(void){
printf("LED State %u\n", led_state);
}
static void intel_firmware_done(int result){
printf("Done %x\n", result);
// close
transport->close();
//
// init HCI
hci_init(transport, NULL);
#ifdef ENABLE_CLASSIC
hci_set_link_key_db(btstack_link_key_db_fs_instance());
#endif
// inform about BTstack state
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
// setup app
btstack_main(main_argc, main_argv);
}
#define USB_MAX_PATH_LEN 7
int main(int argc, const char * argv[]){
// Prevent stdout buffering
setvbuf(stdout, NULL, _IONBF, 0);
main_argc = argc;
main_argv = argv;
printf("BTstack/windows-winusb booting up\n");
#if 0
@ -184,12 +152,22 @@ int main(int argc, const char * argv[]){
hci_dump_open(NULL, HCI_DUMP_STDOUT);
#endif
// init HCI
hci_init(hci_transport_usb_instance(), NULL);
#ifdef ENABLE_CLASSIC
hci_set_link_key_db(btstack_link_key_db_fs_instance());
#endif
// inform about BTstack state
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
// handle CTRL-c
signal(SIGINT, sigint_handler);
// setup USB Transport
transport = hci_transport_usb_instance();
btstack_chipset_intel_download_firmware(hci_transport_usb_instance(), &intel_firmware_done);
// setup app
btstack_main(argc, argv);
// go
btstack_run_loop_execute();