Revert "(iOS/BTStack) Relative path includes"

This reverts commit 7b90adef58.

Conflicts:
	ios/RetroArch/input/BTStack/btstack/run_loop.h
This commit is contained in:
twinaphex 2013-03-19 03:54:01 +01:00
parent b90478fbb5
commit 401053307c
16 changed files with 55 additions and 31 deletions

View File

@ -40,9 +40,9 @@
#pragma once
#include "hci_cmds.h"
#include "run_loop.h"
#include "utils.h"
#include <btstack/hci_cmds.h>
#include <btstack/run_loop.h>
#include <btstack/utils.h>
#include <stdint.h>

View File

@ -44,7 +44,7 @@
*/
#include "btstack_memory.h"
#include "memory_pool.h"
#include <btstack/memory_pool.h>
#include <stdlib.h>

View File

@ -54,9 +54,9 @@
#include <getopt.h>
#include "btstack.h"
#include "linked_list.h"
#include "run_loop.h"
#include <btstack/btstack.h>
#include <btstack/linked_list.h>
#include <btstack/run_loop.h>
#include "debug.h"
#include "hci.h"

View File

@ -51,14 +51,14 @@
#ifndef EMBEDDED
#include <unistd.h> // gethostbyname
#include "version.h"
#include <btstack/version.h>
#endif
#include "btstack_memory.h"
#include "debug.h"
#include "hci_dump.h"
#include "hci_cmds.h"
#include <btstack/hci_cmds.h>
#define HCI_CONNECTION_TIMEOUT_MS 10000

View File

@ -40,11 +40,11 @@
* Created by Matthias Ringwald on 7/23/09.
*/
#include "hci_cmds.h"
#include <btstack/hci_cmds.h>
#include <string.h>
#include "sdp_util.h"
#include <btstack/sdp_util.h>
#include "config.h"
#include "hci.h"

View File

@ -54,9 +54,11 @@
#include "hci.h"
#include "hci_dump.h"
#include "hci_transport.h"
#include "run_loop.h"
#include <btstack/run_loop.h>
#include "hal_uart_dma.h"
#include <btstack/hal_uart_dma.h>
// #define DUMP
// eHCILL commands (+interal CTS signal)
#define EHCILL_GO_TO_SLEEP_IND 0x030
@ -314,6 +316,17 @@ static void h4_block_sent(void){
}
}
#ifdef DUMP
static void dump(uint8_t *data, uint16_t len){
int i;
if (len > 5) len = 8;
for (i=0; i<len;i++){
printf("%02X ", ((uint8_t *)data)[i]);
}
printf("\n\r");
}
#endif
static int h4_process(struct data_source *ds) {
// notify about packet sent
@ -326,6 +339,12 @@ static int h4_process(struct data_source *ds) {
if (h4_state != H4_PACKET_RECEIVED) return 0;
// log packet
#ifdef DUMP
printf("RX: ");
dump(hci_packet, read_pos);
#endif
packet_handler(hci_packet[0], &hci_packet[1], read_pos-1);
h4_rx_init_sm();
@ -436,6 +455,11 @@ static int ehcill_send_packet(uint8_t packet_type, uint8_t *packet, int size){
return -1;
}
#ifdef DUMP
printf("TX: %02x ", packet_type);
dump(packet, size);
#endif
tx_packet_type = packet_type;
tx_data = packet;
tx_len = size;

View File

@ -40,7 +40,7 @@
* Created by Matthias Ringwald on 7/13/09.
*/
#include "linked_list.h"
#include <btstack/linked_list.h>
#include <stdlib.h>
/**
* tests if list is empty

View File

@ -43,7 +43,7 @@
*
*/
#include "memory_pool.h"
#include <btstack/memory_pool.h>
#include <stddef.h>
typedef struct node {

View File

@ -43,11 +43,11 @@
#include <string.h> // memcpy
#include <stdint.h>
#include "btstack.h"
#include "hci_cmds.h"
#include "utils.h"
#include <btstack/btstack.h>
#include <btstack/hci_cmds.h>
#include <btstack/utils.h>
#include "utils.h"
#include <btstack/utils.h>
#include "btstack_memory.h"
#include "hci.h"
#include "hci_dump.h"

View File

@ -40,7 +40,7 @@
* Created by Matthias Ringwald on 6/6/09.
*/
#include "run_loop.h"
#include <btstack/run_loop.h>
#include <stdio.h>
#include <stdlib.h> // exit()

View File

@ -37,7 +37,7 @@
#pragma once
#include "linked_list.h"
#include <btstack/linked_list.h>
#include <stdint.h>

View File

@ -52,10 +52,10 @@
*/
#include "run_loop.h"
#include "linked_list.h"
#include "hal_tick.h"
#include "hal_cpu.h"
#include <btstack/run_loop.h>
#include <btstack/linked_list.h>
#include <btstack/hal_tick.h>
#include <btstack/hal_cpu.h>
#include "run_loop_private.h"
#include "debug.h"

View File

@ -40,8 +40,8 @@
* Created by Matthias Ringwald on 6/6/09.
*/
#include "run_loop.h"
#include "linked_list.h"
#include <btstack/run_loop.h>
#include <btstack/linked_list.h>
#include "debug.h"
#include "run_loop_private.h"

View File

@ -38,8 +38,8 @@
* sdp_util.c
*/
#include "sdp_util.h"
#include "utils.h"
#include <btstack/sdp_util.h>
#include <btstack/utils.h>
#include <stdio.h>
#include <stdlib.h>

View File

@ -50,7 +50,7 @@
#include "config.h"
#include "btstack.h"
#include <btstack/btstack.h>
#include <arpa/inet.h>
#include <errno.h>

View File

@ -43,7 +43,7 @@
*/
#include "config.h"
#include "utils.h"
#include <btstack/utils.h>
#include <stdio.h>
#include "debug.h"