bluez: dropped not used files
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2708 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
b860f81b05
commit
94346b04b8
|
@ -1,33 +0,0 @@
|
||||||
|
|
||||||
#
|
|
||||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
|
||||||
#
|
|
||||||
|
|
||||||
--- bluez-utils-2.17/pcmcia/bluetooth~base.patch
|
|
||||||
+++ bluez-utils-2.17/pcmcia/bluetooth
|
|
||||||
@@ -15,9 +15,16 @@
|
|
||||||
|
|
||||||
if [ -r ./shared ]; then . ./shared ; else . /etc/pcmcia/shared ; fi
|
|
||||||
|
|
||||||
+# Give the port some time to complete initialization
|
|
||||||
+sleep 5
|
|
||||||
+
|
|
||||||
# Get device attributes
|
|
||||||
get_info $DEVICE
|
|
||||||
|
|
||||||
+test "$DEVICE" = "ttyS7" && DEVICE="/dev/tts/7"
|
|
||||||
+test -z "$MANFID" && MANFID="bcsp"
|
|
||||||
+test "$MANFID" = "0000,0000" && MANFID="bcsp"
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# Serial devices
|
|
||||||
#
|
|
||||||
@@ -25,7 +32,7 @@
|
|
||||||
IRQ=`setserial /dev/$DEVICE | sed -e 's/.*IRQ: //'`
|
|
||||||
setserial /dev/$DEVICE irq 0 ; setserial /dev/$DEVICE irq $IRQ
|
|
||||||
|
|
||||||
- /usr/sbin/hciattach $DEVICE $MANFID
|
|
||||||
+ /sbin/hciattach $DEVICE $MANFID
|
|
||||||
}
|
|
||||||
stop_serial() {
|
|
||||||
do_fuser -k -HUP /dev/$DEVICE > /dev/null
|
|
|
@ -1,18 +0,0 @@
|
||||||
|
|
||||||
#
|
|
||||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
|
||||||
#
|
|
||||||
|
|
||||||
--- bluez-utils-2.14/pcmcia/bluetooth.conf~base
|
|
||||||
+++ bluez-utils-2.14/pcmcia/bluetooth.conf
|
|
||||||
@@ -26,6 +26,10 @@
|
|
||||||
version "Brain Boxes", "Bluetooth PC Card"
|
|
||||||
bind "serial_cs" class "bluetooth"
|
|
||||||
|
|
||||||
+card "F+ Bluetooth_Card, BCSP"
|
|
||||||
+ manfid 0x0160, 0xaba0
|
|
||||||
+ bind "serial_cs" class "bluetooth"
|
|
||||||
+
|
|
||||||
card "IBM Bluetooth PC Card II"
|
|
||||||
version "IBM", "Bluetooth PC Card II"
|
|
||||||
bind "serial_cs" class "bluetooth"
|
|
|
@ -1,13 +0,0 @@
|
||||||
#
|
|
||||||
# additional cards for /etc/pcmcia/bluetooth.conf
|
|
||||||
# Note for OE: This file is _appended_ to the stock
|
|
||||||
# bluetooth.conf in bluez-utils, so no need to duplicate
|
|
||||||
# entries for individual cards.
|
|
||||||
#
|
|
||||||
card "CSR BT01x0M Bluetooth CF Card"
|
|
||||||
version "Bluetooth BT0100M", "", ""
|
|
||||||
bind "serial_cs" class "bluetooth"
|
|
||||||
|
|
||||||
card "Socket Bluetooth CF Card Rev. G"
|
|
||||||
manfid 0x0104, 0x0096
|
|
||||||
bind "serial_cs" class "bluetooth"
|
|
|
@ -1,37 +0,0 @@
|
||||||
# Bluetooth configuraton file
|
|
||||||
|
|
||||||
# Start of hcid (allowed values are "true" and "false")
|
|
||||||
HCID_ENABLE=true
|
|
||||||
|
|
||||||
# Config file for hcid
|
|
||||||
HCID_CONFIG="/etc/bluetooth/hcid.conf"
|
|
||||||
|
|
||||||
# Start sdpd (allowed values are "true" and "false")
|
|
||||||
SDPD_ENABLE=true
|
|
||||||
|
|
||||||
# Start hidd (allowed values are "true" and "false")
|
|
||||||
HIDD_ENABLE=true
|
|
||||||
|
|
||||||
# Arguments to hidd
|
|
||||||
HIDD_OPTIONS=""
|
|
||||||
|
|
||||||
# Run hid2hci (allowed values are "true" and "false")
|
|
||||||
HID2HCI_ENABLE=true
|
|
||||||
|
|
||||||
# Bind rfcomm devices (allowed values are "true" and "false")
|
|
||||||
RFCOMM_ENABLE=true
|
|
||||||
|
|
||||||
# Config file for rfcomm
|
|
||||||
RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
|
|
||||||
|
|
||||||
# Start dund (allowed values are "true" and "false")
|
|
||||||
DUND_ENABLE=false
|
|
||||||
|
|
||||||
# Arguments to dund
|
|
||||||
DUND_OPTIONS="--listen --persist"
|
|
||||||
|
|
||||||
# Start pand (allowed values are "true" and "false")
|
|
||||||
PAND_ENABLE=false
|
|
||||||
|
|
||||||
# Arguments to pand
|
|
||||||
PAND_OPTIONS="--listen --role NAP"
|
|
|
@ -1,489 +0,0 @@
|
||||||
--- bluez-utils-2.24/tools/hciattach.c.orig 2005-12-10 15:14:36.000000000 +0100
|
|
||||||
+++ bluez-utils-2.24/tools/hciattach.c 2006-01-22 13:56:13.000000000 +0100
|
|
||||||
@@ -57,6 +57,8 @@
|
|
||||||
#define HCI_UART_3WIRE 2
|
|
||||||
#define HCI_UART_H4DS 3
|
|
||||||
|
|
||||||
+#include "ti_bts.h"
|
|
||||||
+
|
|
||||||
struct uart_t {
|
|
||||||
char *type;
|
|
||||||
int m_id;
|
|
||||||
@@ -66,6 +68,7 @@
|
|
||||||
int speed;
|
|
||||||
int flags;
|
|
||||||
int (*init) (int fd, struct uart_t *u, struct termios *ti);
|
|
||||||
+ char *bts; /* bluetooth script */
|
|
||||||
};
|
|
||||||
|
|
||||||
#define FLOW_CTL 0x0001
|
|
||||||
@@ -241,6 +244,114 @@
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int brf6150(int fd, struct uart_t *u, struct termios *ti)
|
|
||||||
+{
|
|
||||||
+ bts_t *bfp;
|
|
||||||
+ int i;
|
|
||||||
+ unsigned long vers;
|
|
||||||
+ unsigned char actionbuf[256];
|
|
||||||
+ unsigned char resp[128]; /* Response */
|
|
||||||
+ unsigned long count;
|
|
||||||
+ unsigned short atype;
|
|
||||||
+
|
|
||||||
+ if (u->bts == NULL) /* no script, ignore */
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ bfp = bts_load_script( u->bts, &vers );
|
|
||||||
+ if (bfp == NULL)
|
|
||||||
+ return -1;
|
|
||||||
+
|
|
||||||
+ fprintf( stderr, "Loading BTS script version %lu\n", vers );
|
|
||||||
+
|
|
||||||
+ while ((count = bts_next_action( bfp, actionbuf,
|
|
||||||
+ sizeof actionbuf - 1, &atype )) != 0) {
|
|
||||||
+ if (atype == ACTION_REMARKS) {
|
|
||||||
+ if (actionbuf[0] != 0)
|
|
||||||
+ fprintf( stderr, "%s\n", actionbuf );
|
|
||||||
+ }
|
|
||||||
+ else if (atype == ACTION_SEND_COMMAND) {
|
|
||||||
+#if 0
|
|
||||||
+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype );
|
|
||||||
+ for (i=0; i<count; i++) {
|
|
||||||
+ fprintf( stderr, "0x%02x ", actionbuf[i] );
|
|
||||||
+ }
|
|
||||||
+ fprintf( stderr, "\n" );
|
|
||||||
+#endif
|
|
||||||
+ int n;
|
|
||||||
+ n = write(fd, actionbuf, count);
|
|
||||||
+ if (n < 0 || n < count) {
|
|
||||||
+ perror("Failed to write TI action command");
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ else if (atype == ACTION_WAIT_EVENT) {
|
|
||||||
+ action_wait_t *wait = (action_wait_t *)actionbuf;
|
|
||||||
+#if 0
|
|
||||||
+ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size );
|
|
||||||
+ for (i=0; i<wait->size; i++) {
|
|
||||||
+ fprintf( stderr, "0x%02x ", wait->data[i] );
|
|
||||||
+ }
|
|
||||||
+ fprintf( stderr, "\n" );
|
|
||||||
+#endif
|
|
||||||
+ usleep(wait->msec); /* seems they give usec, not msec */
|
|
||||||
+ /* Read reply. */
|
|
||||||
+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) {
|
|
||||||
+ perror("Failed to read TI command response");
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+ if (count < wait->size) {
|
|
||||||
+ fprintf( stderr, "TI command response is short.");
|
|
||||||
+ }
|
|
||||||
+ for (i=0; i<wait->size; i++) {
|
|
||||||
+ if (i == 3) continue; /* ignore */
|
|
||||||
+ if (resp[i] != wait->data[i]) {
|
|
||||||
+ fprintf( stderr, "TI command response does not match expected result.\n" );
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) {
|
|
||||||
+ action_serial_t *sercmd = (action_serial_t *)actionbuf;
|
|
||||||
+
|
|
||||||
+ /* Set actual baudrate */
|
|
||||||
+ fprintf( stderr,
|
|
||||||
+ "BTS changing baud rate to %u, flow control to %u\n",
|
|
||||||
+ sercmd->baud, sercmd->flow_control );
|
|
||||||
+
|
|
||||||
+ tcflush(fd, TCIOFLUSH);
|
|
||||||
+
|
|
||||||
+ if (sercmd->flow_control)
|
|
||||||
+ ti->c_cflag |= CRTSCTS;
|
|
||||||
+ else
|
|
||||||
+ ti->c_cflag &= ~CRTSCTS;
|
|
||||||
+ if (tcsetattr(fd, TCSANOW, ti) < 0) {
|
|
||||||
+ perror("Can't set port settings");
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ u->speed = sercmd->baud;
|
|
||||||
+
|
|
||||||
+ tcflush(fd, TCIOFLUSH);
|
|
||||||
+ if (set_speed(fd, ti, sercmd->baud) < 0) {
|
|
||||||
+ perror("Can't set baud rate");
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ else if (atype == ACTION_DELAY) {
|
|
||||||
+ action_delay_t *delay = (action_delay_t *)actionbuf;
|
|
||||||
+ usleep(delay->msec); /* seems they give usec, not msec */
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ fprintf( stderr, "BTS action type = %d: ", (int)atype );
|
|
||||||
+ for (i=0; i<count; i++) {
|
|
||||||
+ fprintf( stderr, "0x%02x ", actionbuf[i] );
|
|
||||||
+ }
|
|
||||||
+ fprintf( stderr, "\n" );
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ bts_unload_script( bfp );
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int texas(int fd, struct uart_t *u, struct termios *ti)
|
|
||||||
{
|
|
||||||
struct timespec tm = {0, 50000};
|
|
||||||
@@ -281,14 +392,25 @@
|
|
||||||
} while (resp[4] != cmd[1] && resp[5] != cmd[2]);
|
|
||||||
|
|
||||||
/* Verify manufacturer */
|
|
||||||
- if ((resp[11] & 0xFF) != 0x0d)
|
|
||||||
+ if (resp[11] != 0x0d)
|
|
||||||
fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
|
|
||||||
|
|
||||||
/* Print LMP version */
|
|
||||||
- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
|
|
||||||
+ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
|
|
||||||
|
|
||||||
/* Print LMP subversion */
|
|
||||||
- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
|
|
||||||
+ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
|
|
||||||
+ if ((resp[14] >> 2) == 3) {
|
|
||||||
+ int err;
|
|
||||||
+ nanosleep(&tm, NULL);
|
|
||||||
+
|
|
||||||
+ /* BRF6150 */
|
|
||||||
+ if ((err=brf6150( fd, u, ti )) != 0) {
|
|
||||||
+ fprintf( stderr, "TI script failed (err=%d)\n",
|
|
||||||
+ err );
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
nanosleep(&tm, NULL);
|
|
||||||
return 0;
|
|
||||||
@@ -953,7 +1075,7 @@
|
|
||||||
{
|
|
||||||
printf("hciattach - HCI UART driver initialization utility\n");
|
|
||||||
printf("Usage:\n");
|
|
||||||
- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n");
|
|
||||||
+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
|
|
||||||
printf("\thciattach -l\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -970,11 +1092,12 @@
|
|
||||||
pid_t pid;
|
|
||||||
struct sigaction sa;
|
|
||||||
char dev[PATH_MAX];
|
|
||||||
+ char *bts = NULL;
|
|
||||||
|
|
||||||
detach = 1;
|
|
||||||
printpid = 0;
|
|
||||||
|
|
||||||
- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) {
|
|
||||||
+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) {
|
|
||||||
switch(opt) {
|
|
||||||
case 'b':
|
|
||||||
send_break = 1;
|
|
||||||
@@ -996,6 +1119,10 @@
|
|
||||||
init_speed = atoi(optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case 'S':
|
|
||||||
+ bts = optarg;
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
case 'l':
|
|
||||||
for (i = 0; uart[i].type; i++) {
|
|
||||||
printf("%-10s0x%04x,0x%04x\n", uart[i].type,
|
|
||||||
@@ -1067,6 +1194,8 @@
|
|
||||||
if (init_speed)
|
|
||||||
u->init_speed = init_speed;
|
|
||||||
|
|
||||||
+ u->bts = bts;
|
|
||||||
+
|
|
||||||
memset(&sa, 0, sizeof(sa));
|
|
||||||
sa.sa_flags = SA_NOCLDSTOP;
|
|
||||||
sa.sa_handler = sig_alarm;
|
|
||||||
--- bluez-utils-2.24/tools/Makefile.am.orig 2005-12-03 07:22:16.000000000 +0100
|
|
||||||
+++ bluez-utils-2.24/tools/Makefile.am 2006-01-22 13:53:59.000000000 +0100
|
|
||||||
@@ -37,6 +37,9 @@
|
|
||||||
|
|
||||||
noinst_PROGRAMS = hcisecfilter ppporc
|
|
||||||
|
|
||||||
+hciattach_SOURCES = hciattach.c ti_bts.h ti_bts.c
|
|
||||||
+hciattach_LDADD = @BLUEZ_LIBS@
|
|
||||||
+
|
|
||||||
hciconfig_SOURCES = hciconfig.c csr.h csr.c
|
|
||||||
hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a
|
|
||||||
|
|
||||||
--- bluez-utils-2.24/tools/ti_bts.h.orig 2006-01-22 13:56:38.000000000 +0100
|
|
||||||
+++ bluez-utils-2.24/tools/ti_bts.h 2006-01-22 13:53:59.000000000 +0100
|
|
||||||
@@ -0,0 +1,116 @@
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2005 Texas Instruments, Inc.
|
|
||||||
+ * Ported by SDG Systems, LLC
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License version 2 as
|
|
||||||
+ * published by the Free Software Foundation;
|
|
||||||
+ *
|
|
||||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
|
|
||||||
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
|
|
||||||
+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
|
|
||||||
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
+ *
|
|
||||||
+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
|
|
||||||
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
|
|
||||||
+ * SOFTWARE IS DISCLAIMED.
|
|
||||||
+ *
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#ifndef BT_SCRIPT_H
|
|
||||||
+#define BT_SCRIPT_H
|
|
||||||
+
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+extern "C" {
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Define the interface of Bluetooth Script
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+typedef void bts_t;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */
|
|
||||||
+#define ACTION_WAIT_EVENT 2 /* Wait for data */
|
|
||||||
+#define ACTION_SERIAL_PORT_PARAMETERS 3
|
|
||||||
+#define ACTION_DELAY 4
|
|
||||||
+#define ACTION_RUN_SCRIPT 5
|
|
||||||
+#define ACTION_REMARKS 6
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Structure for ACTION_SEND_COMMAND
|
|
||||||
+ */
|
|
||||||
+typedef struct tagCActionCommand
|
|
||||||
+{
|
|
||||||
+ unsigned char data[1]; /* Data to send */
|
|
||||||
+} action_command_t;
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Structure for ACTION_WAIT_EVENT
|
|
||||||
+ */
|
|
||||||
+typedef struct tagCActionWaitEvent
|
|
||||||
+{
|
|
||||||
+ unsigned long msec; /* in milliseconds */
|
|
||||||
+ unsigned long size;
|
|
||||||
+ unsigned char data[1]; /* Data to wait for */
|
|
||||||
+} action_wait_t;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Structure for ACTION_SERIAL_PORT_PARAMETERS
|
|
||||||
+ */
|
|
||||||
+typedef struct tagCActionSerialPortParameters
|
|
||||||
+{
|
|
||||||
+ unsigned long baud;
|
|
||||||
+ unsigned long flow_control;
|
|
||||||
+} action_serial_t;
|
|
||||||
+
|
|
||||||
+/* Flow Control Type */
|
|
||||||
+#define FCT_NONE 0
|
|
||||||
+#define FCT_HARDWARE 1
|
|
||||||
+
|
|
||||||
+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Structure for ACTION_DELAY
|
|
||||||
+ */
|
|
||||||
+typedef struct tagCActionDelay
|
|
||||||
+{
|
|
||||||
+ unsigned long msec; /* in milliseconds */
|
|
||||||
+} action_delay_t;
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Structure for ACTION_RUN_SCRIPT
|
|
||||||
+ */
|
|
||||||
+typedef struct tagCActionRunScript
|
|
||||||
+{
|
|
||||||
+ char filename[1];
|
|
||||||
+} action_run_t;
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Structure for ACTION_REMARKS
|
|
||||||
+ */
|
|
||||||
+typedef struct tagCActionRemarks
|
|
||||||
+{
|
|
||||||
+ char m_szRemarks[1];
|
|
||||||
+} action_remarks_t;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+const char *cis_create_filename(const unsigned char* cmdparms);
|
|
||||||
+bts_t * bts_load_script(const char* fname, unsigned long* version);
|
|
||||||
+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
|
|
||||||
+ unsigned long nMaxSize, unsigned short* ptype);
|
|
||||||
+void bts_unload_script(bts_t* bts_fp);
|
|
||||||
+
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+};
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#endif /* BT_SCRIPT_H */
|
|
||||||
+
|
|
||||||
--- bluez-utils-2.24/tools/ti_bts.c.orig 2006-01-22 13:56:36.000000000 +0100
|
|
||||||
+++ bluez-utils-2.24/tools/ti_bts.c 2006-01-22 13:56:31.000000000 +0100
|
|
||||||
@@ -0,0 +1,149 @@
|
|
||||||
+/*
|
|
||||||
+ * Copyright (c) 2005 Texas Instruments, Inc.
|
|
||||||
+ * Ported by SDG Systems, LLC
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License version 2 as
|
|
||||||
+ * published by the Free Software Foundation;
|
|
||||||
+ *
|
|
||||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
|
|
||||||
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
|
|
||||||
+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
|
|
||||||
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
+ *
|
|
||||||
+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
|
|
||||||
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
|
|
||||||
+ * SOFTWARE IS DISCLAIMED.
|
|
||||||
+ *
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include "ti_bts.h"
|
|
||||||
+
|
|
||||||
+#ifndef MAKEWORD
|
|
||||||
+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8))
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#define TI_MANUFACTURER_ID 13
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Common Init Script specific
|
|
||||||
+ */
|
|
||||||
+const char *
|
|
||||||
+cis_create_filename(const unsigned char* cmdparms)
|
|
||||||
+{
|
|
||||||
+ static char bts_file[50];
|
|
||||||
+
|
|
||||||
+ /* Check for TI's id */
|
|
||||||
+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]);
|
|
||||||
+
|
|
||||||
+ if (TI_MANUFACTURER_ID == manfid) {
|
|
||||||
+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]);
|
|
||||||
+
|
|
||||||
+ unsigned short chip = (version & 0x7C00) >> 10;
|
|
||||||
+ unsigned short min_ver = (version & 0x007F);
|
|
||||||
+ unsigned short maj_ver = (version & 0x0380) >> 7;
|
|
||||||
+
|
|
||||||
+ if (0 != (version & 0x8000)) {
|
|
||||||
+ maj_ver |= 0x0008;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ sprintf( bts_file, "TIInit_%d.%d.%d.bts",
|
|
||||||
+ (int)chip, (int)maj_ver, (int)min_ver);
|
|
||||||
+
|
|
||||||
+ return &bts_file[0];
|
|
||||||
+ }
|
|
||||||
+ return NULL;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+typedef struct tagCHeader
|
|
||||||
+{
|
|
||||||
+ unsigned long magic;
|
|
||||||
+ unsigned long version;
|
|
||||||
+ unsigned char future[24];
|
|
||||||
+} cheader_t;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/* The value 0x42535442 stands for (in ASCII) BTSB */
|
|
||||||
+/* which is Bluetooth Script Binary */
|
|
||||||
+#define FILE_HEADER_MAGIC 0x42535442
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+bts_t *
|
|
||||||
+bts_load_script(const char* fname, unsigned long* version)
|
|
||||||
+{
|
|
||||||
+ bts_t* bts = NULL;
|
|
||||||
+ FILE* fp = fopen(fname, "rb");
|
|
||||||
+
|
|
||||||
+ if (NULL != fp) {
|
|
||||||
+ /* Read header */
|
|
||||||
+ cheader_t header;
|
|
||||||
+
|
|
||||||
+ /* Read header */
|
|
||||||
+ if (1 == fread(&header, sizeof(header), 1, fp)) {
|
|
||||||
+ /* Check magic number for correctness */
|
|
||||||
+ if (header.magic == FILE_HEADER_MAGIC) {
|
|
||||||
+ /* If user wants the version number */
|
|
||||||
+ if (NULL != version) {
|
|
||||||
+ *version = header.version;
|
|
||||||
+ }
|
|
||||||
+ bts = (bts_t*)fp;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ /* If failed reading the file, close it */
|
|
||||||
+ if (NULL == bts) {
|
|
||||||
+ fclose(fp);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return bts;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+unsigned long
|
|
||||||
+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf,
|
|
||||||
+ unsigned long nMaxSize, unsigned short* ptype)
|
|
||||||
+{
|
|
||||||
+ unsigned long bytes = 0;
|
|
||||||
+ FILE* fp = (FILE*)bts_fp;
|
|
||||||
+ unsigned char action_hdr[4];
|
|
||||||
+
|
|
||||||
+ if (bts_fp == NULL)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ /* Each Action has the following: */
|
|
||||||
+ /* UINT16 type of this action */
|
|
||||||
+ /* UINT16 size of rest */
|
|
||||||
+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */
|
|
||||||
+
|
|
||||||
+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) {
|
|
||||||
+ unsigned short type = *(unsigned short*)&action_hdr[0];
|
|
||||||
+ unsigned short size = *(unsigned short*)&action_hdr[2];
|
|
||||||
+
|
|
||||||
+ if (size <= nMaxSize) {
|
|
||||||
+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp);
|
|
||||||
+
|
|
||||||
+ if (nread == size) {
|
|
||||||
+ *ptype = type;
|
|
||||||
+ bytes = (unsigned long)size;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return bytes;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+bts_unload_script(bts_t* bts_fp)
|
|
||||||
+{
|
|
||||||
+ FILE* fp = (FILE*)bts_fp;
|
|
||||||
+
|
|
||||||
+ if (NULL != fp) {
|
|
||||||
+ fclose(fp);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- bluez-utils-2.21/tools/hciattach.c.orig 2005-12-15 16:29:55.000000000 +0100
|
|
||||||
+++ bluez-utils-2.21/tools/hciattach.c 2005-12-15 16:29:37.000000000 +0100
|
|
||||||
@@ -973,7 +973,7 @@
|
|
||||||
int send_break = 0;
|
|
||||||
pid_t pid;
|
|
||||||
struct sigaction sa;
|
|
||||||
- char dev[20];
|
|
||||||
+ char dev[25];
|
|
||||||
|
|
||||||
detach = 1;
|
|
||||||
printpid = 0;
|
|
|
@ -1,72 +0,0 @@
|
||||||
#
|
|
||||||
# HCI daemon configuration file.
|
|
||||||
#
|
|
||||||
# $Id: hcid.conf,v 1.4 2004/04/29 20:14:21 holtmann Exp $
|
|
||||||
#
|
|
||||||
|
|
||||||
# HCId options
|
|
||||||
options {
|
|
||||||
# Automatically initialize new devices
|
|
||||||
autoinit yes;
|
|
||||||
|
|
||||||
# Security Manager mode
|
|
||||||
# none - Security manager disabled
|
|
||||||
# auto - Use local PIN for incoming connections
|
|
||||||
# user - Always ask user for a PIN
|
|
||||||
#
|
|
||||||
security auto;
|
|
||||||
|
|
||||||
# Pairing mode
|
|
||||||
# none - Pairing disabled
|
|
||||||
# multi - Allow pairing with already paired devices
|
|
||||||
# once - Pair once and deny successive attempts
|
|
||||||
pairing multi;
|
|
||||||
|
|
||||||
# PIN helper
|
|
||||||
pin_helper /bin/bluepin;
|
|
||||||
|
|
||||||
# D-Bus PIN helper
|
|
||||||
# dbus_pin_helper;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Default settings for HCI devices
|
|
||||||
device {
|
|
||||||
# Local device name
|
|
||||||
# %d - device id
|
|
||||||
# %h - host name
|
|
||||||
name "%h";
|
|
||||||
|
|
||||||
# Local device class
|
|
||||||
class 0x120112;
|
|
||||||
|
|
||||||
# Default packet type
|
|
||||||
#pkt_type DH1,DM1,HV1;
|
|
||||||
|
|
||||||
# Inquiry and Page scan
|
|
||||||
iscan enable; pscan enable;
|
|
||||||
|
|
||||||
# Default link mode
|
|
||||||
# none - no specific policy
|
|
||||||
# accept - always accept incoming connections
|
|
||||||
# master - become master on incoming connections,
|
|
||||||
# deny role switch on outgoing connections
|
|
||||||
#
|
|
||||||
#lm accept,master;
|
|
||||||
#
|
|
||||||
lm accept;
|
|
||||||
|
|
||||||
# Default link policy
|
|
||||||
# none - no specific policy
|
|
||||||
# rswitch - allow role switch
|
|
||||||
# hold - allow hold mode
|
|
||||||
# sniff - allow sniff mode
|
|
||||||
# park - allow park mode
|
|
||||||
#
|
|
||||||
#lp hold,sniff;
|
|
||||||
#
|
|
||||||
lp rswitch,hold,sniff,park;
|
|
||||||
|
|
||||||
# Authentication and Encryption
|
|
||||||
#auth enable;
|
|
||||||
encrypt enable;
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
Do not add -I/usr/include to the compile line just because we will
|
|
||||||
install bluez-utils there says zecke...
|
|
||||||
|
|
||||||
Index: bluez-utils-2.25/acinclude.m4
|
|
||||||
===================================================================
|
|
||||||
--- bluez-utils-2.25.orig/acinclude.m4 2006-05-18 12:39:57.473577920 +0200
|
|
||||||
+++ bluez-utils-2.25/acinclude.m4 2006-05-19 00:58:52.694599848 +0200
|
|
||||||
@@ -69,7 +69,9 @@
|
|
||||||
ac_save_LDFLAGS=$LDFLAGS
|
|
||||||
|
|
||||||
BLUEZ_CFLAGS=""
|
|
||||||
- test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include"
|
|
||||||
+ if test "$cross_compiling" = no; then
|
|
||||||
+ test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include"
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS"
|
|
||||||
AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found))
|
|
Loading…
Reference in New Issue