|
From: Peter K. <pk...@us...> - 2001-04-20 16:11:36
|
The following files were modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
bt_conf.h 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
bt_vendor.c 1.8 1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
bt_vendor.h 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Use bt_hw_vendor() to identify which kind of hardware is used,
instead of deciding this when compiling.
The diff of the modified file(s):
--- bt_conf.h 2001/04/17 10:38:18 1.3
+++ bt_conf.h 2001/04/20 16:11:35 1.4
@@ -42,18 +42,6 @@
#ifndef __BT_CONF_H__
#define __BT_CONF_H__
=20
-#define HW_NOINIT 0
-#define HW_ERICSSON 1
-#define HW_DIGIANSWER 2
-#define HW_CSR 3
-#define HW_GENERIC 4
-#define HW_USBMODULE 5 /* Not implemented */
-
-/* This sets current HW in usermode application */
-#define HW_CURRENT HW_CSR
-
-#define HW_USED(x) (HW_CURRENT =3D=3D x)
-
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D GENERAL =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D*/
=20
#define BT_NBR_DATAPORTS 7
--- bt_vendor.c 2001/04/17 17:35:03 1.8
+++ bt_vendor.c 2001/04/20 16:11:35 1.9
@@ -50,189 +50,224 @@
#include "bt_vendor.h"
#include "bt_if.h"
=20
-/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
-/* Ericsson specific commands */
-/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
+#define HW_NOT_PROBED -1
+#define HW_ERICSSON 0
+#define HW_CSR 1
+#define HW_DIGIANSWER 2
+#define HW_USB 3
+#define HW_GENERIC 4
+#define HW_NO_INIT 5
+#define HW_UNKNOWN 6
=20
-#if HW_USED(HW_ERICSSON)
+static int hw_vendor(void);
=20
-/* Set the phys device to Ericsson default speed, 57600 */
-void init_phys(int fd)
-{
- fd_setup(fd, 57600, USE_FLOW_CTRL);
-}
+static void ericsson_init_phys(int fd);
+static void ericsson_init_hw(int bt_cfd, int phys_fd, int spd);
+static void csr_init_phys(int fd);
+static void csr_init_hw(int bt_cfd, int phys_fd, int spd);
+static void digianswer_init_phys(int fd);
+static void digianswer_init_hw(int bt_cfd, int phys_fd, int spd);
+static void usb_init_phys(int fd);
+static void usb_init_hw(int bt_cfd, int phys_fd, int spd);
+static void generic_init_phys(int fd);
+static void generic_init_hw(int bt_cfd, int phys_fd, int spd);
+static void no_init_phys(int fd);
+static void no_init_hw(int bt_cfd, int phys_fd, int spd);
+static void unknown_init_phys(int fd);
+static void unknown_init_hw(int bt_cfd, int phys_fd, int spd);
=20
void
-init_hw(int bt_cfd, int phys_fd, int spd)
+init_phys(int fd)
{
- bt_write_scan_enable(bt_cfd, 0 /* inpars not used */);
-
- sleep(1);
+ switch (hw_vendor())
+ {
+ case HW_ERICSSON:
+ ericsson_init_phys(fd);
+ break;
=20
- /* set_event_filter must be called for m/s switch on IrmaC! */
- bt_set_event_filter(bt_cfd, 0 /* inpars not used */);
+ case HW_CSR:
+ csr_init_phys(fd);
+ break;
=20
- sleep(1); // wait for HW...
+ case HW_DIGIANSWER:
+ digianswer_init_phys(fd);
+ break;
=20
- printf("Setting baudrate in Ericsson module!\n");=20=20
- bt_set_baudrate(bt_cfd, spd);
+ case HW_USB:
+ usb_init_phys(fd);
+ break;
=20=20=20
- /* Now set phys device speed to whatever HW was set to use */
- fd_setup(phys_fd, spd, USE_FLOW_CTRL);
- tcflush(phys_fd, TCIOFLUSH);
-}
+ case HW_GENERIC:
+ generic_init_phys(fd);
+ break;
=20
-/* Ericsson specific test commands sent through RAW interface */
-#ifdef ECS_TEST_FUNCTIONS
+ case HW_NO_INIT:
+ no_init_phys(fd);
+ break;
=20
-#define ERICSSON_ENTER_TEST_MODE 0x11
-#define ERICSSON_TEST_CONTROL 0x12
-#define ERICSSON_TX_TEST 0x19
+ case HW_UNKNOWN:
+ default:
+ unknown_init_phys(fd);
+ break;
+ }
+}
=20
void
-ericsson_test_control(int bt_cfd, int* tmp)
+init_hw(int bt_cfd, int phys_fd, int spd)
{
- unsigned char ecs_test_msg[16];
- unsigned char test_msg[64];
- unsigned short hdl =3D (unsigned short)tmp[0];
- int i;
-
- ecs_test_msg[0] =3D CMD_PKT;
- ecs_test_msg[1] =3D OPCODE_LSB(ERICSSON_TEST_CONTROL, MANUFACTURER_SPEC);
- ecs_test_msg[2] =3D OPCODE_MSB(ERICSSON_TEST_CONTROL, MANUFACTURER_SPEC);
- ecs_test_msg[3] =3D 12;
+ switch (hw_vendor())
+ {
+ case HW_ERICSSON:
+ ericsson_init_hw(bt_cfd, phys_fd, spd);
+ break;
=20
- /* connection handle */
- ecs_test_msg[4] =3D (unsigned char)(hdl & 0xff);=20=20=20=20
- ecs_test_msg[5] =3D (unsigned char)((hdl >> 8) & 0xff);
+ case HW_CSR:
+ csr_init_hw(bt_cfd, phys_fd, spd);
+ break;
=20
- /* cast ints to to uchars */
- for (i =3D 6; i < 13; i++)
- {
- ecs_test_msg[i] =3D (unsigned char)tmp[i-6];
- }
+ case HW_DIGIANSWER:
+ digianswer_init_hw(bt_cfd, phys_fd, spd);
+ break;
=20
- /* length */
- ecs_test_msg[14] =3D (unsigned char)(tmp[8] & 0xff);=20=20=20=20
- ecs_test_msg[15] =3D (unsigned char)((tmp[8] >> 8) & 0xff);
+ case HW_USB:
+ usb_init_hw(bt_cfd, phys_fd, spd);
+ break;
=20
- printf("*** Sending Ericsson_Test_Control with params : ***\n");
+ case HW_GENERIC:
+ generic_init_hw(bt_cfd, phys_fd, spd);
+ break;
=20
- printf("Connection handle : 0x%x\n", hdl);
- printf("Test_Scenario : 0x%x\n", ecs_test_msg[6]);
- printf("Hopping_Mode : 0x%x\n", ecs_test_msg[7]);
- printf("TX_Frequency : 0x%x\n", ecs_test_msg[8]);
- printf("RX_Frequency : 0x%x\n", ecs_test_msg[9]);
- printf("Power_Control_Mode : 0x%x\n", ecs_test_msg[10]);
- printf("Poll_Period : 0x%x\n", ecs_test_msg[11]);
- printf("Test_Packet_Type : 0x%x\n", ecs_test_msg[12]);
- printf("Length_Of_Test_Data : 0x%x\n", tmp[8]);
+ case HW_NO_INIT:
+ no_init_hw(bt_cfd, phys_fd, spd);
+ break;
=20
- bt_send_raw_hci(bt_cfd, test_msg, 16);
+ case HW_UNKNOWN:
+ default:
+ unknown_init_hw(bt_cfd, phys_fd, spd);
+ break;
+ }
}
=20
-void
-ericsson_enter_test_mode(int bt_cfd, int* tmp)
+int
+hw_vendor(void)
{
- unsigned char ecs_test_msg[7];
+ static int hw_vendor =3D HW_NOT_PROBED;
=20
- ecs_test_msg[0] =3D CMD_PKT;
- ecs_test_msg[1] =3D OPCODE_LSB(ERICSSON_ENTER_TEST_MODE, MANUFACTURER_SP=
EC);
- ecs_test_msg[2] =3D OPCODE_MSB(ERICSSON_ENTER_TEST_MODE, MANUFACTURER_SP=
EC);
- ecs_test_msg[3] =3D 2;
- ecs_test_msg[5]=3D (unsigned char)(tmp[0] & 0xff);=20=20=20=20
- ecs_test_msg[6]=3D (unsigned char)((tmp[0] >> 8)&0xff);
+ if (hw_vendor =3D=3D HW_NOT_PROBED)
+ {
+ char *vendor =3D bt_hw_vendor();
=20
- printf("*** Sending enter test mode (handle : 0x%x)***\n", tmp[0]);
+ if (!vendor)
+ hw_vendor =3D HW_UNKNOWN;
+ else if (!strcmp(vendor, "Ericsson"))
+ hw_vendor =3D HW_ERICSSON;
+ else if (!strcmp(vendor, "CSR"))
+ hw_vendor =3D HW_CSR;
+ else if (!strcmp(vendor, "Digianswer"))
+ hw_vendor =3D HW_DIGIANSWER;
+ else if (!strcmp(vendor, "USB"))
+ hw_vendor =3D HW_USB;
+ else if (!strcmp(vendor, "Generic"))
+ hw_vendor =3D HW_GENERIC;
+ else if (!strcmp(vendor, "No Init"))
+ hw_vendor =3D HW_NO_INIT;
+ else
+ hw_vendor =3D HW_UNKNOWN;
+ }
=20
- bt_send_raw_hci(bt_cfd, ecs_test_msg, 7);
+ return hw_vendor;
}
=20
+/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
+/* Ericsson specific commands */
+/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
+
+/* Set the phys device to Ericsson default speed, 57600 */
void
-test_connection_req(int bt_cfd, int* bd)
+ericsson_init_phys(int fd)
{
- int hdl, i;
- bt_connection btcon;
+ fd_setup(fd, 57600, USE_FLOW_CTRL);
+}
=20=20=20=20=20
- for (i =3D 0; i < 6; i++)
+void
+ericsson_init_hw(int bt_cfd, int phys_fd, int spd)
{
- btcon.bd[i] =3D (unsigned char)bd[i];
- }
+ bt_write_scan_enable(bt_cfd, 0 /* inpars not used */);
=20=20=20
- printf("*** Connecting baseband ***\n");
+ sleep(1);
=20=20=20
-#ifndef BT_USERSTACK
- if ((hdl =3D ioctl(bt_cfd, HCITESTCONNECTREQ, btcon.bd)) < 0)
- {
- perror("test con req");
+ /* set_event_filter must be called for m/s switch on IrmaC! */
+ bt_set_event_filter(bt_cfd, 0 /* inpars not used */);
+
+ sleep(1); // wait for HW...
+
+ printf("Setting baudrate in Ericsson module!\n");=20=20
+ bt_set_baudrate(bt_cfd, spd);
+=20=20
+ /* Now set phys device speed to whatever HW was set to use */
+ fd_setup(phys_fd, spd, USE_FLOW_CTRL);
+ tcflush(phys_fd, TCIOFLUSH);
}
-#else
- hdl =3D hci_test_connect_req(btcon.bd);
-#endif
=20=20=20
- printf("Returned handle : %d\n", hdl);
+/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
+/* CSR specific commands */
+/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
+
+/* Set the phys device to CSR default, 115200 */=20
+void
+csr_init_phys(int fd)
+{
+ syslog(LOG_INFO, "Setting default speed 115200");
+ fd_setup(fd, 115200, USE_FLOW_CTRL);
}
=20
+/* fixme -- remove hardcoded values */
void
-ericsson_tx_test(int bt_cfd, int* tmp)
+csr_init_hw(int bt_cfd, int phys_fd, int spd)
{
- unsigned char ecs_test_msg[17];
- unsigned char test_msg[17];
- int i;
+ unsigned int wrscan =3D (PAGE_SCAN_ENABLE | INQUIRY_SCAN_ENABLE);
=20=20=20
- ecs_test_msg[0] =3D CMD_PKT;
- ecs_test_msg[1] =3D OPCODE_LSB(ERICSSON_TX_TEST, MANUFACTURER_SPEC);
- ecs_test_msg[2] =3D OPCODE_MSB(ERICSSON_TX_TEST, MANUFACTURER_SPEC);
- ecs_test_msg[3] =3D 13;
+ printf("Setting write_scan_enable in CSR module!\n");
=20=20=20=20=20
- /* cast ints to to uchars */
- for (i =3D 4; i < 14; i++)
- {
- ecs_test_msg[i] =3D (unsigned char)tmp[i-4];
- }
+ bt_write_scan_enable(bt_cfd, wrscan);
=20=20=20
- /* length of test data */
- ecs_test_msg[15] =3D (unsigned char)(tmp[10] & 0xff);=20=20=20=20
- ecs_test_msg[16] =3D (unsigned char)((tmp[10] >> 8)&0xff);
+ /* improves reliability when doing a connect */
+ printf("Setting write_pagescan_activity in CSR module!\n");
=20=20=20
- printf("*** Sending Ericsson_TX_Test ***\n");
+ bt_write_pagescan_activity(bt_cfd, 0x50, 0x20);
=20=20=20
- printf("RX_On_Start : 0x%x\n", ecs_test_msg[4]);
- printf("Synt_On_Start : 0x%x\n", ecs_test_msg[5]);
- printf("TX_On_Start : 0x%x\n", ecs_test_msg[6]);
- printf("Phd_Off_Start : 0x%x\n", ecs_test_msg[7]);
- printf("Test_Scenario : 0x%x\n", ecs_test_msg[8]);
- printf("Hopping_Mode : 0x%x\n", ecs_test_msg[9]);
- printf("TX_Frequency : 0x%x\n", ecs_test_msg[10]);
- printf("RX_Frequency : 0x%x\n", ecs_test_msg[11]);
- printf("TX_Test_Interval : 0x%x\n", ecs_test_msg[12] );
- printf("Test_Packet_Type : 0x%x\n", ecs_test_msg[13]);
- printf("Length_Of_Test_Data : 0x%x\n", tmp[10]);
+ sleep(1);
=20=20=20
- bt_send_raw_hci(bt_cfd, test_msg, 17);
+ bt_set_event_filter(bt_cfd, 0 /* inpars not used */);
=20
- printf("TX test starting.\n");
-}
+ syslog(LOG_INFO, "Setting baudrate in CSR module!\n");=20=20
=20
-#endif /* ECS_TEST_FUNCTIONS */
+ bt_set_baudrate(bt_cfd, spd);
=20
-#elif HW_USED(HW_DIGIANSWER)
+ syslog(LOG_INFO, "Baudrate set\n");
=20
+ /* Now set phys device speed to whatever HW was set to use */
+ fd_setup(phys_fd, spd, USE_FLOW_CTRL);
+ tcflush(phys_fd, TCIOFLUSH);
+}
+
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
/* Digianswer specific commands */
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
=20
/* Set the phys device to Digianswer default, 9600 */=20
-void init_phys(int fd)
+void
+digianswer_init_phys(int fd)
{
fd_setup(fd, 9600, USE_FLOW_CTRL);
}
=20=20
-init_hw(int bt_cfd, int phys_fd, int spd)
+void
+digianswer_init_hw(int bt_cfd, int phys_fd, int spd)
{
printf("Setting baudrate in Digianswer PC card\n");
=20
- bt_set_baudrate(spd);
+ bt_set_baudrate(bt_cfd, spd);
=20=20=20
if (spd > 115200)
{
@@ -247,101 +282,76 @@
tcflush(phys_fd, TCIOFLUSH);
}
=20
-#elif HW_USED(HW_CSR)
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
-/* CSR specific commands */
+/* USB specific commands */
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
=20
-/* Set the phys device to CSR default, 115200 */=20
-void init_phys(int fd)
+void
+usb_init_phys(int fd)
{
- syslog(LOG_INFO, "Setting default speed 115200");
fd_setup(fd, 115200, USE_FLOW_CTRL);
}
=20
-/* fixme -- remove hardcoded values */
void
-init_hw(int bt_cfd, int phys_fd, int spd)
+usb_init_hw(int bt_cfd, int phys_fd, int spd)
{
unsigned int wrscan =3D (PAGE_SCAN_ENABLE | INQUIRY_SCAN_ENABLE);
=20
- printf("Setting write_scan_enable in CSR module!\n");
+ printf("Setting write_scan_enable in USB module!\n");
=20
bt_write_scan_enable(bt_cfd, wrscan);
-=20=20
- /* improves reliability when doing a connect */
- printf("Setting write_pagescan_activity in CSR module!\n");
-
- bt_write_pagescan_activity(bt_cfd, 0x50, 0x20);
-
- sleep(1);
-
bt_set_event_filter(bt_cfd, 0 /* inpars not used */);
-
- syslog(LOG_INFO, "Setting baudrate in CSR module!\n");=20=20
-
- bt_set_baudrate(bt_cfd, spd);
-
- syslog(LOG_INFO, "Baudrate set\n");
-=20=20
- /* Now set phys device speed to whatever HW was set to use */
- fd_setup(phys_fd, spd, USE_FLOW_CTRL);
- tcflush(phys_fd, TCIOFLUSH);
}
=20
-#elif HW_USED(HW_GENERIC)
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
-/* Generic specific commands */
+/* Generic commands */
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
=20
-void init_phys(int fd)
+void
+generic_init_phys(int fd)
{
fd_setup(fd, 115200, USE_FLOW_CTRL);
}
=20
void
-init_hw(int bt_cfd, int phys_fd, int spd)
+generic_init_hw(int bt_cfd, int phys_fd, int spd)
{
unsigned int wrscan =3D (PAGE_SCAN_ENABLE | INQUIRY_SCAN_ENABLE);
=20
- printf("Setting write_scan_enable in USB module!\n");
+ printf("Setting write_scan_enable in generic module!\n");
=20=20=20
bt_write_scan_enable(bt_cfd, wrscan);
bt_set_event_filter(bt_cfd, 0 /* inpars not used */);
-
}
=20
-#elif HW_USED(HW_NOINIT)
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
-/* HW No init commands */
+/* No HW init commands */
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
=20
-void init_phys(int fd)
+void
+no_init_phys(int fd)
{
- printf("init_phys: No hardware.\n");
}
=20
void
-init_hw(int bt_cfd, int phys_fd, int spd)
+no_init_hw(int bt_cfd, int phys_fd, int spd)
{
- printf("No hw init done\n");
}
=20
-#else
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
/* Default */
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
=20
-void init_phys(int fd)
+void
+unknown_init_phys(int fd)
{
printf("ERROR: init_phys() not implemented!\n");
}
=20
-init_hw(int bt_cfd, int phys_fd, int spd)
+void
+unknown_init_hw(int bt_cfd, int phys_fd, int spd)
{
printf("ERROR: init_hw() not implemented!\n");
}
-
-#endif /* HW_USED() */
=20
/*********************************************************************/
--- bt_vendor.h 2001/03/02 10:59:57 1.1
+++ bt_vendor.h 2001/04/20 16:11:35 1.2
@@ -57,11 +57,4 @@
void init_hw(int bt_cfd, int phys_fd, int spd);
void init_phys(int fd);
=20
-#if HW_USED(HW_ERICSSON)
-void enable_dut(int bt_cfd);
-void test_connection_req(int bt_cfd, int* bd);
-void ericsson_test_control(int bt_cfd, int* tmp);
-void ericsson_enter_test_mode(int bt_cfd, int* tmp);
-void ericsson_tx_test(int bt_cfd, int* tmp);
-#endif
#endif /* __BT_VENDOR_H__*/
|