Menu
▾
▴
CVS: The file 'linux/drivers/char/bluetooth/hci_vendor.c' has been modified.
|
From: Peter K. <pk...@us...> - 2001-04-10 13:04:25
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci_vendor.c 1.20 1.21=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Some clean-up.
The diff of the modified file(s):
--- hci_vendor.c 2001/04/10 12:27:10 1.20
+++ hci_vendor.c 2001/04/10 13:04:24 1.21
@@ -145,7 +145,6 @@
return send_cmd_block((u8*) &c_pkt ,c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
);
}
=20
-
s32=20
hci_set_baudrate(u32 baudrate)
{
@@ -153,18 +152,22 @@
on the new baudrate, this function can not block (Since btd sets the
new physical device speed when this function returns). */=20=20
=20=20=20
- D_CMD(__FUNCTION__ VENDOR "(%d baud)\n", baudrate);
+ D_CMD(__FUNCTION__ VENDOR " (%u baud)\n", baudrate);
c_pkt.type =3D CMD_PKT;
c_pkt.opcode =3D hci_put_opcode(ERICSSON_SET_UART_BAUD_RATE, 0x3f) ;
c_pkt.len =3D 1;
switch (baudrate) {
- case 57600: c_pkt.data[0] =3D 0x03;
+ case 57600:
+ c_pkt.data[0] =3D 0x03;
break;
- case 115200: c_pkt.data[0] =3D 0x02;
+ case 115200:
+ c_pkt.data[0] =3D 0x02;
break;
- case 230400: c_pkt.data[0] =3D 0x01;
+ case 230400:
+ c_pkt.data[0] =3D 0x01;
break;
- case 460800: c_pkt.data[0] =3D 0x00;
+ case 460800:
+ c_pkt.data[0] =3D 0x00;
break;
default:
D_ERR(__FUNCTION__ VENDOR ": Baudrate not supported\n");
@@ -187,7 +190,6 @@
return 0;
}
=20
-
void
process_vendor_return_param(u32 ocf, u8* r_val)
{
@@ -258,20 +260,18 @@
}
}
=20
-
void
process_vendor_event(u8 *buf, u32 len, u32 event_code)
{
D_ERR(__FUNCTION__ VENDOR " Vendor specicic event not recognized.\n");
}
-
=20
-char* get_hw_name(void)
+char*
+get_hw_name(void)
{
return "Ericsson";
}
=20
-
#elif defined(CONFIG_BLUETOOTH_DIGIANSWER)
/*************************************************************************=
****/
/************************* Digianswer functions **************************=
****/
@@ -286,7 +286,6 @@
return 0;
}
=20
-
s32
hci_read_firmware_rev_info(void)
{
@@ -294,28 +293,32 @@
return 0;
}
=20
-
s32=20
hci_set_baudrate(u32 baudrate)
{
u8 pkt[5];
s32 tmp;
=20=20=20
- D_CMD(__FUNCTION__ VENDOR "(%d baud)\n", baudrate);
+ D_CMD(__FUNCTION__ VENDOR " (%u baud)\n", baudrate);
pkt[0] =3D CMD_PKT;
pkt[1] =3D 0x07;
pkt[2] =3D 0xfc;
pkt[3] =3D 0x01;
switch (baudrate) {
- case 9600: pkt[4] =3D 0x03;
+ case 9600:
+ pkt[4] =3D 0x03;
break;
- case 19200:pkt[4] =3D 0x05;
+ case 19200:
+ pkt[4] =3D 0x05;
break;
- case 38400: pkt[4] =3D 0x07;
+ case 38400:
+ pkt[4] =3D 0x07;
break;
- case 57600: pkt[4] =3D 0x09;
+ case 57600:
+ pkt[4] =3D 0x09;
break;
- case 115200: pkt[4] =3D 0x09;
+ case 115200:
+ pkt[4] =3D 0x09;
break;
}
tmp =3D send_cmd(pkt,5);
@@ -325,9 +328,9 @@
=20=20=20
return tmp;
}
-
=20
-u8* get_digi_err_code(u8 code)
+u8*
+get_digi_err_code(u8 code)
{
switch (code) {
case 0x01:
@@ -346,11 +349,10 @@
return "Unspecified error\n";
=20=20=20=20=20
default:
- return "Unkown error digianswer code";
+ return "Unkown error digianswer code\n";
}
}
=20
-
void
process_vendor_event(u8 *buf, u32 len, u32 event_code)
{
@@ -360,10 +362,8 @@
} else {=09=09=09
printk(get_digi_err_code(buf[0]));
}
-
}
=20
-
void
process_vendor_return_param(u32 ocf, u8* r_val)
{
@@ -380,13 +380,12 @@
}
}
=20
-
-char* get_hw_name(void)
+char*
+get_hw_name(void)
{
return "Digianswer";
}
=20
-
#if RS232_SUPPORT
s32=20
send_negotiation_pkt(void)
@@ -397,8 +396,8 @@
pkt[1] =3D seq_nbr;
seq_nbr++;
pkt[2] =3D SET_UART(0x0,0x0,0x0,0xb);
- pkt[3] =3D (SET_BAUD_RATE(115200) & 0xff);
- pkt[4] =3D ((SET_BAUD_RATE(115200) >> 8) & 0xff);
+ pkt[3] =3D SET_BAUD_RATE(115200) & 0xff;
+ pkt[4] =3D (SET_BAUD_RATE(115200) >> 8) & 0xff;
pkt[5] =3D 10; /*?!? Try with this ?!?*/
pkt[6] =3D 0;
pkt[7] =3D SET_PROTOCOL_MODE(0,0,0,1,0,0);
@@ -421,7 +420,6 @@
return 0;
}
=20
-
s32
hci_read_firmware_rev_info(void)
{
@@ -429,7 +427,6 @@
return 0;
}
=20
-
s32=20
hci_set_baudrate(u32 baudrate)
{
@@ -437,27 +434,24 @@
return 0;
}
=20
-
void
process_vendor_event(u8 *buf, u32 len, u32 event_code)
{
D_REC(__FUNCTION__ VENDOR "\n");
}
=20
-
void
process_vendor_return_param(u32 ocf, u8* r_val)
{
D_ERR(__FUNCTION__ VENDOR "Manufacturer specific : Invalid reply (0x%x)\n=
", ocf);
}
=20
-
-char* get_hw_name(void)
+char*
+get_hw_name(void)
{
return "CSR";
}
=20
-
#else
/*************************************************************************=
****/
/************************* HW_NOINIT and HW_GENERIC **********************=
****/
@@ -470,7 +464,6 @@
return 0;
}
=20
-
s32
hci_read_firmware_rev_info(void)
{
@@ -478,7 +471,6 @@
return 0;
}
=20
-
s32=20
hci_set_baudrate(u32 baudrate)
{
@@ -486,29 +478,27 @@
return 0;
}
=20
-
void
process_vendor_event(u8 *buf, u32 len, u32 event_code)
{
D_REC(__FUNCTION__ VENDOR "Manufacturer specific : Unknown event.\n");
}
=20
-
void
process_vendor_return_param(u32 ocf, u8* r_val)
{
D_ERR(__FUNCTION__ VENDOR "Manufacturer specific : Invalid reply (0x%x)\n=
", ocf);
}
-
=20
-char* get_hw_name(void)
+char*
+get_hw_name(void)
{
return "Unknown hardware";
}
-
#endif
=20
-void show_bt_vendor()
+void
+show_bt_vendor()
{
DSYS("Current HW : %s\n", VENDOR);
}
|
