Menu
▾
▴
CVS: 6 files have been modified in linux/drivers/char/bluetooth.
|
From: Peter K. <pk...@us...> - 2001-05-18 16:03:52
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bcsp.c 1.7 1.8=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_datagram.c 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_integrity.c 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_mux.c 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_sequence.c 1.7 1.8=20=20=20=20=20=20=20=20=20=20=20=20=20
bcsp_slip.c 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made all global function names start with bcsp_.
The diff of the modified file(s):
--- bcsp.c 2001/05/18 15:38:01 1.7
+++ bcsp.c 2001/05/18 16:03:51 1.8
@@ -113,8 +113,8 @@
bcsp_init(void)
{
BCSP_SYS(__FUNCTION__ ": Initializing BCSP\n");
- sequence_init();
- send_sync();
+ bcsp_sequence_init();
+ bcsp_send_sync();
cli();
if (!bcsp_sync) {
interruptible_sleep_on(&bcsp_sync_wq);
@@ -126,7 +126,7 @@
bcsp_shutdown(void)
{
BCSP_SYS(__FUNCTION__": Shuting down BCSP\n");
- sequence_shutdown();
+ bcsp_sequence_shutdown();
}
=20
void
@@ -172,11 +172,11 @@
PRINTPKT(data, len);
=20
while (handled < len) {
- init_bcsp_packet(&bcsp);
- handled +=3D slip_receive(&bcsp, data + handled, len - handled);
+ bcsp_init_packet(&bcsp);
+ handled +=3D bcsp_slip_receive(&bcsp, data + handled, len - handled);
D(__FUNCTION__ ": So far handled: %d bytes\n", handled);
if (bcsp.packet) {
- integrity_receive(&bcsp);
+ bcsp_integrity_receive(&bcsp);
kfree(bcsp.packet);
}
}
@@ -193,16 +193,16 @@
case CMD_PKT:
opcode =3D le16_to_cpu(get_unaligned((u16 *)&data[1]));
if (hci_get_ocf(opcode) =3D=3D BCSP_OCF) {
- ret =3D sequence_send(data + 5, len - 5, data[4] & 0x3f);
+ ret =3D bcsp_sequence_send(data + 5, len - 5, data[4] & 0x3f);
} else {
- ret =3D sequence_send(data + 1, len - 1, BCSP_CMD_CHN);
+ ret =3D bcsp_sequence_send(data + 1, len - 1, BCSP_CMD_CHN);
}
break;
case ACL_PKT:
- ret =3D sequence_send(data + 1, len - 1, BCSP_ACL_CHN);
+ ret =3D bcsp_sequence_send(data + 1, len - 1, BCSP_ACL_CHN);
break;
case SCO_PKT:
- ret =3D sequence_send(data + 1, len - 1, BCSP_SCO_CHN);
+ ret =3D bcsp_sequence_send(data + 1, len - 1, BCSP_SCO_CHN);
break;
default:
D_ERR(__FUNCTION__ ": Unknown packet type: 0x%x\n", data[0]);
@@ -222,7 +222,7 @@
}
=20
void
-init_bcsp_packet(struct bcsp *bcsp)
+bcsp_init_packet(struct bcsp *bcsp)
{
memset(bcsp, 0, sizeof *bcsp);
};
--- bcsp_datagram.c 2001/05/18 15:42:13 1.3
+++ bcsp_datagram.c 2001/05/18 16:03:51 1.4
@@ -82,7 +82,7 @@
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
s32
-datagram_receive(struct bcsp *bcsp)
+bcsp_datagram_receive(struct bcsp *bcsp)
{
if (handle_sync_pkt(bcsp)) {
D(__FUNCTION__ ": Sync packet received, sending respose\n");
@@ -96,18 +96,18 @@
}
=20
s32
-datagram_send(u8 *data, u32 len, u8 chn)
+bcsp_datagram_send(u8 *data, u32 len, u8 chn)
{
struct bcsp bcsp;
=20=09
- init_bcsp_packet(&bcsp);
+ bcsp_init_packet(&bcsp);
=20
BCSP_SET_PROTOCOL_TYPE(&bcsp, BCSP_UNRELIABLE);
=20=09
bcsp.payload =3D data;
bcsp.payload_length =3D len;
=20=09
- return mux_send(&bcsp);
+ return bcsp_mux_send(&bcsp);
}
=20
s32
@@ -135,7 +135,7 @@
}
=20
s32
-send_sync(void)
+bcsp_send_sync(void)
{
return send_sync_pkt(SYNC);
}
@@ -160,13 +160,13 @@
=20=09
D(__FUNCTION__ "\n");
=20
- init_bcsp_packet(&bcsp);
+ bcsp_init_packet(&bcsp);
=20=09
bcsp.identifier =3D 1;=20
bcsp.payload =3D (u8 *)&payload;
bcsp.payload_length =3D sizeof(u32);
=20
- return mux_send(&bcsp);
+ return bcsp_mux_send(&bcsp);
}
=20
/****************** END OF FILE sequence.c *******************************=
***/
--- bcsp_integrity.c 2001/05/18 15:39:45 1.4
+++ bcsp_integrity.c 2001/05/18 16:03:51 1.5
@@ -89,7 +89,7 @@
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
s32
-integrity_receive(struct bcsp* bcsp)
+bcsp_integrity_receive(struct bcsp* bcsp)
{
bcsp->flags =3D BCSP_GET_FLAGS(bcsp);
bcsp->identifier =3D BCSP_GET_IDENTIFIER(bcsp);
@@ -118,11 +118,11 @@
bcsp->payload =3D bcsp->packet + BCSP_HDR_SIZE;
PRINTPKT(bcsp->payload, bcsp->payload_length);
=20
- return mux_receive(bcsp);
+ return bcsp_mux_receive(bcsp);
}
=20
s32
-integrity_send(struct bcsp* bcsp)
+bcsp_integrity_send(struct bcsp* bcsp)
{
bcsp->checksum =3D calc_checksum(bcsp->flags, bcsp->identifier, bcsp->pay=
load_length);
=20
@@ -130,7 +130,7 @@
bcsp->crc =3D calc_crc(bcsp);
}
=20
- return slip_send(bcsp);
+ return bcsp_slip_send(bcsp);
}
=20
s32
--- bcsp_mux.c 2001/05/18 15:18:17 1.4
+++ bcsp_mux.c 2001/05/18 16:03:51 1.5
@@ -65,22 +65,22 @@
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
s32
-mux_receive(struct bcsp *bcsp)
+bcsp_mux_receive(struct bcsp *bcsp)
{
/* If we received an ack packet, we discard the packet, sice the ack
has already been handled by signal_rxack */
if (bcsp->identifier =3D=3D 0) {
D(__FUNCTION__ ": Received ack, returning\n");
- signal_rxack(BCSP_GET_ACK(bcsp));
+ bcsp_signal_rxack(BCSP_GET_ACK(bcsp));
return 0;
}
=20=09
if (BCSP_GET_PROTOCOL_TYPE(bcsp) =3D=3D BCSP_RELIABLE) {
D(__FUNCTION__ ": Sending to sequencing layer\n");
- return sequence_receive(bcsp);
+ return bcsp_sequence_receive(bcsp);
} else if (BCSP_GET_PROTOCOL_TYPE(bcsp) =3D=3D BCSP_UNRELIABLE) {
D(__FUNCTION__ ": Sending to datagram layer\n");
- return datagram_receive(bcsp);
+ return bcsp_datagram_receive(bcsp);
} else {
/* This shouldn't be possible */
BCSP_SYS(__FUNCTION__ ": Packet is neither reliable nor unreliable\n");
@@ -89,26 +89,26 @@
}
=20
s32
-mux_send(struct bcsp *bcsp)
+bcsp_mux_send(struct bcsp *bcsp)
{
D(__FUNCTION__ "\n");
- return integrity_send(bcsp);
+ return bcsp_integrity_send(bcsp);
}
=20
-s32 send_txack(u8 txack)
+s32 bcsp_send_txack(u8 txack)
{
struct bcsp bcsp;
=20
D(__FUNCTION__ ": txack: 0x%x\n", txack);
=20
- init_bcsp_packet(&bcsp);
+ bcsp_init_packet(&bcsp);
=20=09
BCSP_SET_ACK(&bcsp, txack);
BCSP_SET_SEQ(&bcsp, 0);
bcsp.identifier =3D 0; /* According to AN004.pdf page 20 */
bcsp.payload_length =3D 0;
=20
- return integrity_send(&bcsp);
+ return bcsp_integrity_send(&bcsp);
}
=20
/****************** END OF FILE mux.c ************************************=
***/
--- bcsp_sequence.c 2001/05/18 13:58:17 1.7
+++ bcsp_sequence.c 2001/05/18 16:03:51 1.8
@@ -103,7 +103,7 @@
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
void
-sequence_init(void)
+bcsp_sequence_init(void)
{
resend_data_task.routine =3D (void*)sequence_resend;
resend_data_task.data =3D NULL;
@@ -113,13 +113,13 @@
}
=20
void
-sequence_shutdown(void)
+bcsp_sequence_shutdown(void)
{
release_resend_timer();
}
=20
s32
-sequence_receive(struct bcsp *bcsp)
+bcsp_sequence_receive(struct bcsp *bcsp)
{
if (!got_packet) {
got_packet =3D TRUE;
@@ -149,14 +149,13 @@
return 0;
}
=20
-
s32
-sequence_send(u8 *data, u32 len, u8 chn)
+bcsp_sequence_send(u8 *data, u32 len, u8 chn)
{
struct bcsp bcsp;
=20=09
if (winspace > 0) {
- init_bcsp_packet(&bcsp);
+ bcsp_init_packet(&bcsp);
=20=09=09
bcsp.identifier =3D chn;
=20=09=09
@@ -187,13 +186,12 @@
return 0;
}
=20=09=09
- return mux_send(&bcsp);
+ return bcsp_mux_send(&bcsp);
}
=20
void
-signal_rxack(u8 new_ack)
+bcsp_signal_rxack(u8 new_ack)
{
-
D(__FUNCTION__": Got rxack:%d\n", new_ack);
=20=09
if (rxack =3D=3D new_ack) {
@@ -239,7 +237,7 @@
while (resend_cnt !=3D txseq) {
printk(__FUNCTION__": Resending with seq_nbr:%d, last ack was %d, cur se=
q_nbr:%d\n", resend_cnt, rxack, txseq);
=20=09=09
- init_bcsp_packet(&bcsp);
+ bcsp_init_packet(&bcsp);
=20=09=09
bcsp.identifier =3D resend_buffer[resend_cnt].chn;
=20=09=09
@@ -252,7 +250,7 @@
bcsp.payload =3D resend_buffer[resend_cnt].data;
bcsp.payload_length =3D resend_buffer[resend_cnt].len;
=20=09=09
- mux_send(&bcsp);
+ bcsp_mux_send(&bcsp);
resend_cnt =3D (resend_cnt + 1) % 8;
}
=20
@@ -262,7 +260,7 @@
void
send_ack(void)
{
- send_txack(txack);
+ bcsp_send_txack(txack);
}
=20
void
--- bcsp_slip.c 2001/05/18 13:48:46 1.3
+++ bcsp_slip.c 2001/05/18 16:03:51 1.4
@@ -59,38 +59,20 @@
=20
/****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
=20
+static void slip_send_add_byte(struct bcsp* bcsp, u8 data);
+
/****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
/****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
-static void
-slip_send_add_byte(struct bcsp* bcsp, u8 data)
-{
- switch (data) {
- case 0xC0:
- bcsp->packet[bcsp->packet_length++] =3D 0xDB;
- bcsp->packet[bcsp->packet_length++] =3D 0xDC;
- break;
-
- case 0xDB:
- bcsp->packet[bcsp->packet_length++] =3D 0xDB;
- bcsp->packet[bcsp->packet_length++] =3D 0xDD;
- break;
-
- default:
- bcsp->packet[bcsp->packet_length++] =3D data;
- break;
- }
-}
-
s32
-slip_send(struct bcsp* bcsp)
+bcsp_slip_send(struct bcsp* bcsp)
{
s32 i;
=20
- D(__FUNCTION__ "\n");
+ D(__FUNCTION__ ":\n");
PRINTPKT(bcsp->payload, bcsp->payload_length);
=20
if (!(bcsp->packet =3D kmalloc(2 * (4 + bcsp->payload_length) + 2, GFP_AT=
OMIC))) {
@@ -127,7 +109,7 @@
}
=20
s32
-slip_receive(struct bcsp* bcsp, const u8* packet, u32 len)
+bcsp_slip_receive(struct bcsp* bcsp, const u8* packet, u32 len)
{
static u8 buffer[4 + 4096 + 2 + 1];
static s32 length =3D 0;
@@ -188,6 +170,26 @@
}
=20
return i;
+}
+
+void
+slip_send_add_byte(struct bcsp* bcsp, u8 data)
+{
+ switch (data) {
+ case 0xC0:
+ bcsp->packet[bcsp->packet_length++] =3D 0xDB;
+ bcsp->packet[bcsp->packet_length++] =3D 0xDC;
+ break;
+
+ case 0xDB:
+ bcsp->packet[bcsp->packet_length++] =3D 0xDB;
+ bcsp->packet[bcsp->packet_length++] =3D 0xDD;
+ break;
+
+ default:
+ bcsp->packet[bcsp->packet_length++] =3D data;
+ break;
+ }
}
=20
/****************** END OF FILE slip.c ***********************************=
***/
|
