From: Peter K. <pk...@us...> - 2001-06-08 12:01:27
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- hci.c 1.156 1.157=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Minor change to debug messages. The diff of the modified file(s): --- hci.c 2001/06/07 14:33:41 1.156 +++ hci.c 2001/06/08 12:01:26 1.157 @@ -256,6 +256,7 @@ #endif =20 static void send_acl_data_task(void); + /****************** LOCAL VARIABLE DECLARATION SECTION *******************= ***/ =20 /* Struct used for sending command packets */ @@ -357,7 +358,7 @@ u8 *buf; /* Temporary pointer to the incoming data */ u32 tmp_data_len; =20=20 - PRINTPKT(__FUNCTION__", ", data, count); + PRINTPKT(__FUNCTION__ ": ", data, count); =20=20=20 tmp_data_len =3D count; buf =3D data; @@ -366,14 +367,14 @@ packet is received it is copied into a buffer and sent to the=20 processing function */ =20=20=20 - D_INDATA(__FUNCTION__", hci-%d\n", tmp_data_len); + D_INDATA(__FUNCTION__ ": hci-%d\n", tmp_data_len); while (count > 0) { switch (state) { =20=09=09=09 /* The first byte will tell us whether it is an event or a data packet */ case WAIT_FOR_PACKET_TYPE: - D_STATE(__FUNCTION__", WAIT_FOR_PACKET_TYPE\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_PACKET_TYPE\n"); tmp_pos =3D 0; switch(*buf) { case EVENT_PKT: state =3D WAIT_FOR_EVENT_TYPE; break; @@ -400,7 +401,7 @@ /* If it is an event packet we wait for the next byte which tell us which kind of event it is */=20 case WAIT_FOR_EVENT_TYPE: - D_STATE(__FUNCTION__", WAIT_FOR_EVENT_TYPE\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_EVENT_TYPE\n"); event_type =3D *buf; state =3D WAIT_FOR_EVENT_LENGTH; buf++; @@ -409,7 +410,7 @@ =20 /* If it is an event the length-field is one byte */ case WAIT_FOR_EVENT_LENGTH: - D_STATE(__FUNCTION__", WAIT_FOR_EVENT_LENGTH\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_EVENT_LENGTH\n"); event_len =3D *buf; buf++; count--; @@ -441,7 +442,7 @@ /* Before we can parse the event, we wait for the whole event */ case WAIT_FOR_EVENT_PARAM: - D_STATE(__FUNCTION__", WAIT_FOR_EVENT_PARAM\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_EVENT_PARAM\n"); if (tmp_pos < event_len) { c =3D MIN(count, event_len - tmp_pos); memcpy(event_buf + tmp_pos, buf, c); @@ -458,7 +459,7 @@ =20 /* Here we wait for the whole data header, four bytes*/ case WAIT_FOR_ACL_HDR: - D_STATE(__FUNCTION__", WAIT_FOR_ACL_HDR\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_ACL_HDR\n"); c =3D MIN(count, ACL_HDR_LEN - tmp_pos); memcpy(hdr + tmp_pos, buf, c); tmp_pos +=3D c; @@ -484,14 +485,14 @@ } =20 if (pb_flag =3D=3D L2CAP_FRAME_START) { - D_REC(__FUNCTION__", new frame\n"); + D_REC(__FUNCTION__ ": New frame\n"); in_buf =3D get_free_inbuffer(); if (in_buf) { in_buf->nbr_of_hci_pkt =3D 1; in_buf->hci_hdl =3D hci_hdl; }=09 } else { - D_REC(__FUNCTION__", cont frame\n"); + D_REC(__FUNCTION__ ": Cont frame\n"); in_buf =3D get_inbuffer(hci_hdl); if (in_buf) { in_buf->nbr_of_hci_pkt++; @@ -506,9 +507,9 @@ tmp_pos =3D 0; state =3D WAIT_FOR_ACL_DATA; } else if (tmp_pos < ACL_HDR_LEN) { - D_REC(__FUNCTION__" Didn't got whole header length, waiting for more\n= "); + D_REC(__FUNCTION__ ": Didn't got whole header length, waiting for more= \n"); } else { - D_ERR(__FUNCTION__" incorredt ACL header length\n"); + D_ERR(__FUNCTION__ ": incorredt ACL header length\n"); } break; =20 @@ -516,7 +517,7 @@ whole data packet and then we send it to a higher protocol layer, in this case the L2CAP-layer */ case WAIT_FOR_ACL_DATA: - D_STATE(__FUNCTION__", WAIT_FOR_ACL_DATA\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_ACL_DATA\n"); /* Find out how much data we can copy, don't copy more than one HCI packet at time */ c =3D MIN(count, data_len - tmp_pos); @@ -524,7 +525,7 @@ memcpy(in_buf->buf_ptr, buf, c); in_buf->buf_ptr +=3D c; in_buf->count +=3D c; - D_REC(__FUNCTION__", in_buf->count =3D %d\n",in_buf->count); + D_REC(__FUNCTION__ ": in_buf->count =3D %d\n",in_buf->count); } =20=20=20=20=20=20=20 /* Increase the data_index and decrease the amount of @@ -532,7 +533,7 @@ tmp_pos +=3D c; count -=3D c; =20=20=20=20=20=20=20 - D_REC(__FUNCTION__", Copied %d bytes into inbuffer\n",c); + D_REC(__FUNCTION__ ": Copied %d bytes into inbuffer\n",c); if (tmp_pos =3D=3D data_len) { if (in_buf) { process_acl_data(in_buf, pb_flag); @@ -546,7 +547,7 @@ =20=20=20=20=20=20=20 /* wait for the SCO header, three bytes */ case WAIT_FOR_SCO_HDR: - D_STATE(__FUNCTION__", WAIT_FOR_SCO_HDR\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_SCO_HDR\n"); if (tmp_pos < SCO_HDR_LEN) { c =3D MIN(count,SCO_HDR_LEN - tmp_pos); memcpy(hdr + tmp_pos, buf, c); @@ -565,7 +566,7 @@ /* Wait for the rest of the SCO packet and send it to the tty */ case WAIT_FOR_SCO_DATA: - D_STATE(__FUNCTION__", WAIT_FOR_SCO_DATA\n"); + D_STATE(__FUNCTION__ ": WAIT_FOR_SCO_DATA\n"); c =3D MIN(count, data_len - tmp_pos); process_sco_packet(buf, hci_hdl, c); tmp_pos +=3D c; @@ -580,7 +581,7 @@ break; =20 default: - D_ERR(__FUNCTION__", : Oups shouldn't be possible...\n"); + D_ERR(__FUNCTION__ ": Oops shouldn't be possible...\n"); break; } } @@ -601,7 +602,7 @@ tmp_buf +=3D 2; count -=3D 2; =20 - D_REC(__FUNCTION__", Received event 0x%02x with len:%d\n", event_type, e= vent_len); + D_REC(__FUNCTION__ ": Received event 0x%02x with len:%d\n", event_type, = event_len); =20=09=09 process_event(tmp_buf, event_len, event_type); tmp_buf +=3D event_len; @@ -643,14 +644,14 @@ } =20=09=09 if (pb_flag =3D=3D L2CAP_FRAME_START) { - D_REC(__FUNCTION__", new L2CAP frame\n"); + D_REC(__FUNCTION__ ": New L2CAP frame\n"); in_buf =3D get_free_inbuffer(); if (in_buf) { in_buf->nbr_of_hci_pkt =3D 1; in_buf->hci_hdl =3D hci_hdl; }=09 } else { - D_REC(__FUNCTION__", cont L2CAP frame\n"); + D_REC(__FUNCTION__ ": Cont L2CAP frame\n"); in_buf =3D get_inbuffer(hci_hdl); if (in_buf) { in_buf->nbr_of_hci_pkt++; @@ -659,13 +660,13 @@ =20=09=09 if (in_buf) { memcpy(in_buf->buf_ptr, tmp_buf, data_len); - D_REC(__FUNCTION__", Copied %d bytes into inbuffer\n", + D_REC(__FUNCTION__ ": Copied %d bytes into inbuffer\n", data_len); in_buf->buf_ptr +=3D data_len; in_buf->count +=3D data_len; - D_REC(__FUNCTION__", in_buf->count:%d\n", in_buf->count); + D_REC(__FUNCTION__ ": in_buf->count: %d\n", in_buf->count); } else { - D_ERR(__FUNCTION__", No inbuffer was found, "\ + D_ERR(__FUNCTION__ ": No inbuffer was found, "\ "discarding data\n"); return; } @@ -705,7 +706,7 @@ { s32 i; =20 - D_REC(__FUNCTION__", acl_num before : %d\n", hci_ctrl.hc_buf.acl_num); + D_REC(__FUNCTION__ ": acl_num before: %d\n", hci_ctrl.hc_buf.acl_num); =20=09 /* FIXME */ /* Check if we have to register which connection handlers that @@ -718,7 +719,7 @@ =20=09 D_QUEUE("<NCP:%d>\n",hci_ctrl.hc_buf.acl_num); =20 - D_REC(__FUNCTION__", acl_num after : %d\n", hci_ctrl.hc_buf.acl_num); + D_REC(__FUNCTION__ ": acl_num after: %d\n", hci_ctrl.hc_buf.acl_num); =20 /* We've just been notified that the hardware has free buffers. If we have any outstanding packets, send_acl_data_task will try @@ -766,7 +767,7 @@ wake_up_interruptible(&inq_wq); #ifndef __KERNEL__ for (i =3D 0; i < inq_res->nbr_of_units; i++) { - D_CMD(__FUNCTION__", BD %d: %02x:%02x:%02x:%02x:%02x:%02x\n",i, + D_CMD(__FUNCTION__ ": BD %d: %02x:%02x:%02x:%02x:%02x:%02x\n",i, inq_res->bd_addr[0+6*i],inq_res->bd_addr[1+6*i], inq_res->bd_addr[2+6*i],inq_res->bd_addr[3+6*i], inq_res->bd_addr[4+6*i],inq_res->bd_addr[5+6*i]); @@ -779,7 +780,7 @@ s32 i, j; u8 tmp_bd[6]; =20 - D_CMD(__FUNCTION__", INQUIRY_RESULT\n"); + D_CMD(__FUNCTION__ ": INQUIRY_RESULT\n"); for(i =3D 1; i < (buf[0] * 14) + 1; i +=3D 14) {=09=09 printk("BD addr %d\n", i % 14); =20=09=09=09 @@ -807,7 +808,7 @@ { u8 link_type; =20 - D_CMD(__FUNCTION__", CONNECTION_COMPLETE: %s\n", + D_CMD(__FUNCTION__ ": CONNECTION_COMPLETE: %s\n", get_err_msg(buf[0])); =20 hci_ctrl.nbr_of_connections++; @@ -822,12 +823,12 @@ #ifndef HCI_EMULATION if (buf[0]) { /* remove hci handle if connection failed */ - DSYS(__FUNCTION__", CONNECTION_COMPLETE %s\n",=20 + DSYS(__FUNCTION__ ": CONNECTION_COMPLETE %s\n", get_err_msg(buf[0])); hci_ctrl.nbr_of_connections--; reset_hci_con_bd(hci_hdl); } else { - DSYS(__FUNCTION__", ACL link is up\n"); + DSYS(__FUNCTION__ ": ACL link is up\n"); #ifdef CONFIG_BLUETOOTH_ERICSSON change_connection_packet_type(hci_hdl,=20 DM3|DH3|DM5|DH5); @@ -865,18 +866,18 @@ break; } case CONNECTION_REQUEST: - D_CMD(__FUNCTION__", CONNECTION_REQUEST\n"); + D_CMD(__FUNCTION__ ": CONNECTION_REQUEST\n"); =20 if (buf[9] =3D=3D ACL_LINK) { lp_connect_ind(buf); /* BD_ADDRESS */ } else { - printk(__FUNCTION__", CONNECTION_REQUEST for SCO LINK"); + printk(__FUNCTION__ ": CONNECTION_REQUEST for SCO LINK"); accept_connection_request(buf, 0x01); /* role ignored for SCO */ } break; =20 case DISCONNECTION_COMPLETE: - DSYS(__FUNCTION__", DISCONNECTION_COMPLETE %s\n", get_err_msg(buf[3])); + DSYS(__FUNCTION__ ": DISCONNECTION_COMPLETE %s\n", get_err_msg(buf[3])); lp_disconnect_ind(CHAR2INT12(buf[2], buf[1])); /* FIXME: No more NBR_OF_COMPLETE_PACKETS will arrive for this connection handle, if we only support point-to-point @@ -892,10 +893,10 @@ break; =20 case AUTHENTICATION_COMPLETE: - DSYS(__FUNCTION__", AUTHENTICATION_COMPLETE\n"); + DSYS(__FUNCTION__ ": AUTHENTICATION_COMPLETE\n"); #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER if (buf[0]) { - D_ERR(__FUNCTION__", AUTHENTICATION_COMPLETE: %s\n", get_err_msg(buf[0]= )); + D_ERR(__FUNCTION__ ": AUTHENTICATION_COMPLETE: %s\n", get_err_msg(buf[0= ])); =20=09=09=09 } =20=09=09 @@ -904,13 +905,13 @@ break; =20 case REMOTE_NAME_REQUEST_COMPLETE: - D_CMD(__FUNCTION__", REMOTE_NAME_REQUEST_COMPLETE %s\n", buf + 7); + D_CMD(__FUNCTION__ ": REMOTE_NAME_REQUEST_COMPLETE %s\n", buf + 7); if (buf[0]) { - D_ERR(__FUNCTION__", REMOTE_NAME_REQUEST_COMPLETE: %s\n", + D_ERR(__FUNCTION__ ": REMOTE_NAME_REQUEST_COMPLETE: %s\n", get_err_msg(buf[0])); } else { if (strlen(buf + 7) > 248) { - D_ERR(__FUNCTION__", REMOTE_NAME_REQUEST_COMPLETE: too long name lengt= h %d\n", (int)strlen(buf + 7)); + D_ERR(__FUNCTION__ ": REMOTE_NAME_REQUEST_COMPLETE: too long name leng= th %d\n", (int)strlen(buf + 7)); break; } set_hci_con_name(buf + 1, buf + 7); @@ -918,10 +919,10 @@ break; =20 case ENCRYPTION_CHANGE: - DSYS(__FUNCTION__", ENCRYPTION_CHANGE\n"); + DSYS(__FUNCTION__ ": ENCRYPTION_CHANGE\n"); #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER if (buf[0]) { - D_ERR(__FUNCTION__", ENCRYPTION_CHANGE: %s\n", get_err_msg(buf[0])); + D_ERR(__FUNCTION__ ": ENCRYPTION_CHANGE: %s\n", get_err_msg(buf[0])); } =20 { @@ -935,27 +936,27 @@ break; =20=09 case CHANGE_CONNECTION_LINK_KEY_COMPLETE: - DSYS(__FUNCTION__", CHANGE_CONNECTION_LINK_KEY_COMPLETE Not implemented!= \n"); + DSYS(__FUNCTION__ ": CHANGE_CONNECTION_LINK_KEY_COMPLETE Not implemented= !\n"); break; =20 case MASTER_LINK_KEY_COMPLETE: - DSYS(__FUNCTION__", MASTER_LINK_KEY_COMPLETE Not implemented!\n"); + DSYS(__FUNCTION__ ": MASTER_LINK_KEY_COMPLETE Not implemented!\n"); break; =20 case READ_REMOTE_SUPPORTED_FEATURES_COMPLETE: - DSYS(__FUNCTION__", READ_REMOTE_SUPPORTED_FEATURES_COMPLETE Not implemen= ted!\n"); + DSYS(__FUNCTION__ ": READ_REMOTE_SUPPORTED_FEATURES_COMPLETE Not impleme= nted!\n"); break; =20 case READ_REMOTE_VERSION_INFORMATION_COMPLETE: - DSYS(__FUNCTION__", READ_REMOTE_VERSION_INFORMATION_COMPLETE Not impleme= nted!\n"); + DSYS(__FUNCTION__ ": READ_REMOTE_VERSION_INFORMATION_COMPLETE Not implem= ented!\n"); break; =20 case QOS_SETUP_COMPLETE: - DSYS(__FUNCTION__", QOS_SETUP_COMPLETE\n"); + DSYS(__FUNCTION__ ": QOS_SETUP_COMPLETE\n"); break; =20 case COMMAND_COMPLETE: - D_CMD(__FUNCTION__", COMMAND_COMPLETE\n"); + D_CMD(__FUNCTION__ ": COMMAND_COMPLETE\n"); =20 /* FIXME - stop any outstanding send timers if cmd_num is > 0*/ D_QUEUE("<CC>\n"); @@ -970,7 +971,7 @@ =20=09=09 case COMMAND_STATUS: =20=09=09 - D_CMD(__FUNCTION__", COMMAND_STATUS\n"); + D_CMD(__FUNCTION__ ": COMMAND_STATUS\n"); =20=09=09 if (buf[0]) {=09=09=09 =20 @@ -979,7 +980,7 @@ command status with "ACL link already exist" is returned=20 This must be signalled using lp_connect_cfm (neg) */ - D_ERR(__FUNCTION__", COMMAND_STATUS: %s\n",get_err_msg(buf[0])); + D_ERR(__FUNCTION__ ": COMMAND_STATUS: %s\n", get_err_msg(buf[0])); #ifdef USE_INQTIMER if (hci_inq_pending) release_inq_timer(); @@ -989,48 +990,48 @@ update_nhcp(buf[1]); break; case FLUSH_OCCURRED: - D_CMD(__FUNCTION__", FLUSH_OCCURRED on hci_hdl %d\n", + D_CMD(__FUNCTION__ ": FLUSH_OCCURRED on hci_hdl %d\n", CHAR2INT12(buf[1],buf[0])); btmem_flushhandle(CHAR2INT12(buf[1],buf[0])); break; =20 case HARDWARE_ERROR: - D_ERR(__FUNCTION__", An hardware error with error code 0x%02x occurred\n= Please refer to your bluetooth module manual\n", buf[0]); + D_ERR(__FUNCTION__ ": An hardware error with error code 0x%02x occurred\= n Please refer to your bluetooth module manual\n", buf[0]); break; =20 case ROLE_CHANGED: - DSYS(__FUNCTION__", ROLE_CHANGED\n"); + DSYS(__FUNCTION__ ": ROLE_CHANGED\n"); =20=09=09 if (buf[0]) {=20 - D_ERR(__FUNCTION__", Role changed failed due to %s\n", + D_ERR(__FUNCTION__ ": Role changed failed due to %s\n", get_err_msg(buf[0])); =20=09=09=09 /* fixme -- Notify l2cap that this BD will go down */ =20=09=09=09 } else if (buf[7]) { - DSYS(__FUNCTION__", Current master is 0x%04x%08x\n",=20 + DSYS(__FUNCTION__ ": Current master is 0x%04x%08x\n",=20 CHAR2INT16(buf[6], buf[5]),=20 CHAR2INT32(buf[4], buf[3], buf[2], buf[1])); } else { - DSYS(__FUNCTION__", Our role is master for BD Address 0x%04x%08x\n", CH= AR2INT16(buf[6], buf[5]), CHAR2INT32(buf[4], buf[3], buf[2], buf[1])); + DSYS(__FUNCTION__ ": Our role is master for BD Address 0x%04x%08x\n", C= HAR2INT16(buf[6], buf[5]), CHAR2INT32(buf[4], buf[3], buf[2], buf[1])); } break; =20 case NBR_OF_COMPLETED_PACKETS:=20 =20 - D_CMD(__FUNCTION__", NUMBER_OF_COMPLETED_PACKETS\n"); + D_CMD(__FUNCTION__ ": NUMBER_OF_COMPLETED_PACKETS\n"); =20 update_ncp(buf[0], buf + 1); =20 break; =20 case MODE_CHANGE: - D_CMD(__FUNCTION__", MODE_CHANGE on hci_hdl %d\n", + D_CMD(__FUNCTION__ ": MODE_CHANGE on hci_hdl %d\n", CHAR2INT12(buf[2],buf[1])); break; =20 case RETURN_LINK_KEYS: - D_CMD(__FUNCTION__", RETURN_LINK_KEYS event\n"); + D_CMD(__FUNCTION__ ": RETURN_LINK_KEYS event\n"); #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER { u8 tmp_str[23]; @@ -1047,57 +1048,56 @@ break; =20=09 case PIN_CODE_REQUEST: - D_CMD(__FUNCTION__", PIN_CODE_REQUEST forwarding event to security manag= er\n"); + D_CMD(__FUNCTION__ ": PIN_CODE_REQUEST forwarding event to security mana= ger\n"); #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER sec_man_event(HCI, buf, PIN_CODE_REQUEST, NULL, 0); #endif break; =20=09 case LINK_KEY_REQUEST: - D_CMD(__FUNCTION__", LINK_KEY_REQUEST\n"); + D_CMD(__FUNCTION__ ": LINK_KEY_REQUEST\n"); #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER sec_man_event(HCI, buf, LINK_KEY_REQUEST, NULL, 0); #endif break; =20 case LINK_KEY_NOTIFICATION: - D_CMD(__FUNCTION__", LINK_KEY_NOTIFICATION forwarding event to security = manager\n"); + D_CMD(__FUNCTION__ ": LINK_KEY_NOTIFICATION forwarding event to security= manager\n"); #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER sec_man_event(HCI, buf, LINK_KEY_NOTIFICATION, buf + 6, 16); #endif break; =20 case LOOPBACK_COMMAND: - DSYS(__FUNCTION__", LOOPBACK_COMMAND, loopback mode not supported\n"); + DSYS(__FUNCTION__ ": LOOPBACK_COMMAND, loopback mode not supported\n"); break; =20 case DATA_BUFFER_OVERFLOW: - D_ERR(__FUNCTION__", DATA_BUFFER_OVERFLOW\n"); + D_ERR(__FUNCTION__ ": DATA_BUFFER_OVERFLOW\n"); break; =20 case MAX_SLOTS_CHANGE: - D_CMD(__FUNCTION__", MAX_SLOTS_CHANGE to %d\n", - (u32) buf[2]); + D_CMD(__FUNCTION__ ": MAX_SLOTS_CHANGE to %d\n", (u32) buf[2]); break; =20 case READ_CLOCK_OFFSET_COMPLETE: - D_CMD(__FUNCTION__", READ_CLOCK_OFFSET_COMPLETE\n"); + D_CMD(__FUNCTION__ ": READ_CLOCK_OFFSET_COMPLETE\n"); break; =20 case CONNECTION_PACKET_TYPE_CHANGED: - D_CMD(__FUNCTION__", CHANGE_CONNECTION_PACKET_TYPE\n"); + D_CMD(__FUNCTION__ ": CHANGE_CONNECTION_PACKET_TYPE\n"); break; =20 case QOS_VIOLATION: - D_CMD(__FUNCTION__", QOS_VIOLATION\n"); + D_CMD(__FUNCTION__ ": QOS_VIOLATION\n"); break; =20 case PAGE_SCAN_MODE_CHANGE: - DSYS(__FUNCTION__", PAGE_SCAN_MODE_CHANGE Not implemented\n"); + DSYS(__FUNCTION__ ": PAGE_SCAN_MODE_CHANGE Not implemented\n"); break; =20 case PAGE_SCAN_REPETITION_MODE_CHANGE: - DSYS(__FUNCTION__", PAGE_SCAN_REPETITION_MODE_CHANGE Not implemented\n"); + DSYS(__FUNCTION__ ": PAGE_SCAN_REPETITION_MODE_CHANGE Not implemented\n"= ); break;=09 =20 case VENDOR_EVENT: @@ -1105,7 +1105,7 @@ break; =20 default: - DSYS(__FUNCTION__", UNKNOWN EVENT CODE 0x%x\n",event_code); + DSYS(__FUNCTION__ ": UNKNOWN EVENT CODE 0x%x\n", event_code); break; } } @@ -1142,13 +1142,13 @@ case LINK_KEY_REQUEST_REPLY: release_cmd_timer(); =20=09=09=09 - D_CMD(__FUNCTION__", LINK_KEY_REQUEST_REPLY\n"); + D_CMD(__FUNCTION__ ": LINK_KEY_REQUEST_REPLY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", LINK_KEY_REQUEST_REPLY %s\n", get_err_msg(r_val[0= ])); + D_ERR(__FUNCTION__ ": LINK_KEY_REQUEST_REPLY %s\n", get_err_msg(r_val[= 0])); result_param =3D - r_val[0];=20 } else { - D_CMD(__FUNCTION__", LINK_KEY_REQUEST_REPLY Success\n"); + D_CMD(__FUNCTION__ ": LINK_KEY_REQUEST_REPLY Success\n"); result_param =3D 0; } =20=09=09=09 @@ -1158,13 +1158,13 @@ case LINK_KEY_REQUEST_NEGATIVE_REPLY: release_cmd_timer(); =20=09=09=09 - D_CMD(__FUNCTION__", LINK_KEY_REQUEST_NEGATIVE_REPLY\n"); + D_CMD(__FUNCTION__ ": LINK_KEY_REQUEST_NEGATIVE_REPLY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", LINK_KEY_REQUEST_NEGATIVE_REPLY %s\n", get_err_ms= g(r_val[0])); + D_ERR(__FUNCTION__ ": LINK_KEY_REQUEST_NEGATIVE_REPLY %s\n", get_err_m= sg(r_val[0])); result_param =3D - r_val[0];=20 } else { - D_CMD(__FUNCTION__", LINK_KEY_REQUEST_NEGATIVE_REPLY Success\n"); + D_CMD(__FUNCTION__ ": LINK_KEY_REQUEST_NEGATIVE_REPLY Success\n"); result_param =3D 0; } =20=09=09=09 @@ -1174,13 +1174,13 @@ case PIN_CODE_REQUEST_REPLY: release_cmd_timer(); =20=09=09=09=09=09 - D_CMD(__FUNCTION__", PIN_CODE_REQUEST_REPLY\n"); + D_CMD(__FUNCTION__ ": PIN_CODE_REQUEST_REPLY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", PIN_CODE_REQUEST_REPLY %s\n", get_err_msg(r_val[0= ])); + D_ERR(__FUNCTION__ ": PIN_CODE_REQUEST_REPLY %s\n", get_err_msg(r_val[= 0])); result_param =3D - r_val[0];=20 } else { - D_CMD(__FUNCTION__", PIN_CODE_REQUEST_REPLY Success\n"); + D_CMD(__FUNCTION__ ": PIN_CODE_REQUEST_REPLY Success\n"); result_param =3D 0; } =20 @@ -1191,13 +1191,13 @@ case PIN_CODE_REQUEST_NEGATIVE_REPLY: release_cmd_timer(); =20=09=09=09 - D_CMD(__FUNCTION__", PIN_CODE_REQUEST_NEGATIVE_REPLY\n"); + D_CMD(__FUNCTION__ ": PIN_CODE_REQUEST_NEGATIVE_REPLY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", PIN_CODE_REQUEST_NEGATIVE_REPLY %s\n", get_err_ms= g(r_val[0])); + D_ERR(__FUNCTION__ ": PIN_CODE_REQUEST_NEGATIVE_REPLY %s\n", get_err_m= sg(r_val[0])); result_param =3D - r_val[0];=20 } else { - D_CMD(__FUNCTION__", PIN_CODE_REQUEST_NEGATIVE_REPLY Success\n"); + D_CMD(__FUNCTION__ ": PIN_CODE_REQUEST_NEGATIVE_REPLY Success\n"); result_param =3D 0; } =20 @@ -1205,7 +1205,7 @@ break;=09 =20 default: - D_CMD(__FUNCTION__", HCI_LC, ocf %d not recognised!\n", ocf); + D_CMD(__FUNCTION__ ": HCI_LC, ocf %d not recognised!\n", ocf); break; } =20 @@ -1219,64 +1219,64 @@ switch (ocf) { =20=09=09=09 case CREATE_NEW_UNIT_KEY: - D_CMD(__FUNCTION__", CREATE_NEW_UNIT_KEY\n"); + D_CMD(__FUNCTION__ ": CREATE_NEW_UNIT_KEY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", CREATE_NEW_UNIT_KEY %s\n", get_err_msg(r_val[0])); + D_ERR(__FUNCTION__ ": CREATE_NEW_UNIT_KEY %s\n", get_err_msg(r_val[0])= ); result_param =3D - r_val[0];=20 } else { - D_CMD(__FUNCTION__", CREATE_NEW_UNIT_KEY Success\n"); + D_CMD(__FUNCTION__ ": CREATE_NEW_UNIT_KEY Success\n"); result_param =3D 0; } break; =20=09=09=09 =20=09=09=09 case READ_STORED_LINK_KEY: - DSYS(__FUNCTION__", READ_STORED_LINK_KEY\n"); + DSYS(__FUNCTION__ ": READ_STORED_LINK_KEY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_STORED_LINK_KEY %s\n", get_err_msg(r_val[0])= ); + D_ERR(__FUNCTION__ ": READ_STORED_LINK_KEY %s\n", get_err_msg(r_val[0]= )); result_param =3D - r_val[0]; } else { - D_CMD(__FUNCTION__", READ_STORED_LINK_KEY Success\n"); + D_CMD(__FUNCTION__ ": READ_STORED_LINK_KEY Success\n"); result_param =3D CHAR2INT32(r_val[4], r_val[3], r_val[2], r_val[= 1]); } - DSYS(__FUNCTION__", Max number of Linkkeys: %d\n", + DSYS(__FUNCTION__ ": Max number of Linkkeys: %d\n", CHAR2INT16(r_val[2], r_val[1])); - DSYS(__FUNCTION__", Number of Linkkeys read: %d\n", + DSYS(__FUNCTION__ ": Number of Linkkeys read: %d\n", CHAR2INT16(r_val[4], r_val[3])); break; =20 case WRITE_STORED_LINK_KEY: - D_CMD(__FUNCTION__", WRITE_STORED_LINK_KEY\n"); + D_CMD(__FUNCTION__ ": WRITE_STORED_LINK_KEY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_STORED_LINK_KEY %s\n", get_err_msg(r_val[0]= )); + D_ERR(__FUNCTION__ ": WRITE_STORED_LINK_KEY %s\n", get_err_msg(r_val[0= ])); result_param =3D - r_val[0];=20 } else { - D_CMD(__FUNCTION__", WRITE_STORED_LINK_KEY Success\n"); + D_CMD(__FUNCTION__ ": WRITE_STORED_LINK_KEY Success\n"); result_param =3D 0; } break; =20 case DELETE_STORED_LINK_KEY: - D_CMD(__FUNCTION__", DELETE_STORED_LINK_KEY\n"); + D_CMD(__FUNCTION__ ": DELETE_STORED_LINK_KEY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", DELETE_STORED_LINK_KEY %s\n", get_err_msg(r_val[0= ])); + D_ERR(__FUNCTION__ ": DELETE_STORED_LINK_KEY %s\n", get_err_msg(r_val[= 0])); result_param =3D - r_val[0]; } else { - D_CMD(__FUNCTION__", DELETE_STORED_LINK_KEY Success\n"); + D_CMD(__FUNCTION__ ": DELETE_STORED_LINK_KEY Success\n"); result_param =3D CHAR2INT16(r_val[2], r_val[1]); } =20=09=09=09 - D_CMD(__FUNCTION__", Number of Linkkeys deleted: %d\n", + D_CMD(__FUNCTION__ ": Number of Linkkeys deleted: %d\n", CHAR2INT16(r_val[2], r_val[1])); break;=09 =20=20=20=20=20=20=20=20=20=20=20=20=20 case READ_TRANSMIT_POWER_LEVEL:=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 =20=09=09=20=20 - printk(__FUNCTION__", READ_TRANSMIT_POWER_LEVEL\n"); + printk(__FUNCTION__ ": READ_TRANSMIT_POWER_LEVEL\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_TRANSMIT_POWER_LEVEL: %s\n", + D_ERR(__FUNCTION__ ": READ_TRANSMIT_POWER_LEVEL: %s\n", get_err_msg(r_val[0])); break; } else { @@ -1286,34 +1286,34 @@ break; =20 case SET_HOST_CONTROLLER_TO_HOST_FLOW_CONTROL: - D_CMD(__FUNCTION__", SET_HOST_CONTROLLER_TO_HOST_FLOW_CONTROL\n"); + D_CMD(__FUNCTION__ ": SET_HOST_CONTROLLER_TO_HOST_FLOW_CONTROL\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", SET_HOST_CONTROLLER_TO_HOST_FLOW_CONTROL: %s\n", + D_ERR(__FUNCTION__ ": SET_HOST_CONTROLLER_TO_HOST_FLOW_CONTROL: %s\n", get_err_msg(r_val[0])); break; } break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case HOST_BUFFER_SIZE:=20=20 - D_CMD(__FUNCTION__", HOST_BUFFER_SIZE\n"); + D_CMD(__FUNCTION__ ": HOST_BUFFER_SIZE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", HOST_BUFFER_SIZE: %s\n", + D_ERR(__FUNCTION__ ": HOST_BUFFER_SIZE: %s\n", get_err_msg(r_val[0])); } break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case CHANGE_LOCAL_NAME: - D_CMD(__FUNCTION__", CHANGE_LOCAL_NAME\n");=20=20=20=20=20=20=20=20=20= =20=20=20 + D_CMD(__FUNCTION__ ": CHANGE_LOCAL_NAME\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", CHANGE_LOCAL_NAME: %s\n", + D_ERR(__FUNCTION__ ": CHANGE_LOCAL_NAME: %s\n", get_err_msg(r_val[0])); } break; =20 case READ_SCAN_ENABLE: - D_CMD(__FUNCTION__", READ_SCAN_ENABLE\n"); + D_CMD(__FUNCTION__ ": READ_SCAN_ENABLE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_SCAN_ENABLE: %s\n", + D_ERR(__FUNCTION__ ": READ_SCAN_ENABLE: %s\n", get_err_msg(r_val[0])); result_param =3D -r_val[0]; } else { @@ -1323,34 +1323,34 @@ break; =20=09=09=09 case WRITE_SCAN_ENABLE: - D_CMD(__FUNCTION__", WRITE_SCAN_ENABLE\n"); + D_CMD(__FUNCTION__ ": WRITE_SCAN_ENABLE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_SCAN_ENABLE: %s\n", + D_ERR(__FUNCTION__ ": WRITE_SCAN_ENABLE: %s\n", get_err_msg(r_val[0])); } break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case WRITE_PAGESCAN_ACTIVITY: - D_CMD(__FUNCTION__", WRITE_PAGESCAN_ACTIVITY\n"); + D_CMD(__FUNCTION__ ": WRITE_PAGESCAN_ACTIVITY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_PAGESCAN_ACTIVITY: %s\n", + D_ERR(__FUNCTION__ ": WRITE_PAGESCAN_ACTIVITY: %s\n", get_err_msg(r_val[0])); } break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case WRITE_INQUIRYSCAN_ACTIVITY: - D_CMD(__FUNCTION__", WRITE_INQUIRYSCAN_ACTIVITY\n"); + D_CMD(__FUNCTION__ ": WRITE_INQUIRYSCAN_ACTIVITY\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_INQUIRYSCAN_ACTIVITY: %s\n", + D_ERR(__FUNCTION__ ": WRITE_INQUIRYSCAN_ACTIVITY: %s\n", get_err_msg(r_val[0])); result_param =3D -r_val[0]; } break; =20 case READ_AUTHENTICATION_ENABLE: - D_CMD(__FUNCTION__", READ_AUTHENTICATION_ENABLE\n"); + D_CMD(__FUNCTION__ ": READ_AUTHENTICATION_ENABLE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_AUTHENTICATION_ENABLE: %s\n", get_err_msg(r_= val[0])); + D_ERR(__FUNCTION__ ": READ_AUTHENTICATION_ENABLE: %s\n", get_err_msg(r= _val[0])); result_param =3D -r_val[0]; } else { result_param =3D r_val[1]; @@ -1358,18 +1358,18 @@ break; =20=09=09=09 case WRITE_AUTHENTICATION_ENABLE: - D_CMD(__FUNCTION__", WRITE_AUTHENTICATION_ENABLE\n"); + D_CMD(__FUNCTION__ ": WRITE_AUTHENTICATION_ENABLE\n"); if(r_val[0]) { - D_ERR(__FUNCTION__", WRITE_AUTHENTICATION_ENABLE: %s\n", + D_ERR(__FUNCTION__ ": WRITE_AUTHENTICATION_ENABLE: %s\n", get_err_msg(r_val[0])); result_param =3D -r_val[0]; }=20 break; =20=09=09=09 case READ_ENCRYPTION_MODE: - D_CMD(__FUNCTION__", READ_ENCRYPTION_MODE\n"); + D_CMD(__FUNCTION__ ": READ_ENCRYPTION_MODE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_ENCRYPTION_MODE: %s\n", get_err_msg(r_val[0]= )); + D_ERR(__FUNCTION__ ": READ_ENCRYPTION_MODE: %s\n", get_err_msg(r_val[0= ])); result_param =3D -r_val[0]; } else { result_param =3D r_val[1]; @@ -1377,57 +1377,57 @@ break; =20=09=09=09 case WRITE_ENCRYPTION_MODE: - D_CMD(__FUNCTION__", WRITE_AUTHENTICATION_ENABLE\n"); + D_CMD(__FUNCTION__ ": WRITE_AUTHENTICATION_ENABLE\n"); if(r_val[0]) { - D_ERR(__FUNCTION__", WRITE_AUTHENTICATION_ENABLE: %s\n", + D_ERR(__FUNCTION__ ": WRITE_AUTHENTICATION_ENABLE: %s\n", get_err_msg(r_val[0])); result_param =3D -r_val[0]; } break; =20=09=09=09 case WRITE_CLASS_OF_DEVICE: - D_CMD(__FUNCTION__", WRITE_CLASS_OF_DEVICE\n"); + D_CMD(__FUNCTION__ ": WRITE_CLASS_OF_DEVICE\n"); if(r_val[0]) { - D_ERR(__FUNCTION__", WRITE_CLASS_OF_DEVICE: %s\n", + D_ERR(__FUNCTION__ ": WRITE_CLASS_OF_DEVICE: %s\n", get_err_msg(r_val[0])); } break; =20 case WRITE_AUTOMATIC_FLUSH_TIMEOUT: - D_CMD(__FUNCTION__" WRITE_AUTOMATIC_FLUSH_TIMEOUT\n"); + D_CMD(__FUNCTION__ ": WRITE_AUTOMATIC_FLUSH_TIMEOUT\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_AUTOMATIC_FLUSH_TIMEOUT: %s\n", + D_ERR(__FUNCTION__ ": WRITE_AUTOMATIC_FLUSH_TIMEOUT: %s\n", get_err_msg(r_val[0])); } else { - D_CMD(__FUNCTION__", WRITE_AUTOMATIC_FLUSH_TIMEOUT Success\n"); + D_CMD(__FUNCTION__ ": WRITE_AUTOMATIC_FLUSH_TIMEOUT Success\n"); } =20=09=09=09 break; =20 =20=20=20=20=20=20=20=20=20=20=20=20=20 case READ_LINK_SUPERVISION_TIMEOUT: - D_CMD(__FUNCTION__", Link supervision timeout is: %d\n", + D_CMD(__FUNCTION__ ": Link supervision timeout is: %d\n", CHAR2INT16(buf[4],buf[3])); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case WRITE_LINK_SUPERVISION_TIMEOUT: - D_CMD(__FUNCTION__", WRITE_LINK_SUPERVISION_TO (%d)\n", r_val[0]); + D_CMD(__FUNCTION__ ": WRITE_LINK_SUPERVISION_TO (%d)\n", r_val[0]); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_LINK_SUPERVISION_TO: %s\n", + D_ERR(__FUNCTION__ ": WRITE_LINK_SUPERVISION_TO: %s\n", get_err_msg(r_val[0])); } break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case RESET: - D_CMD(__FUNCTION__", RESET\n");=09=09=09=20=20=20=20=20=20 + D_CMD(__FUNCTION__ ": RESET\n"); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case SET_EVENT_FILTER: - D_CMD(__FUNCTION__", SET_EVENT_FILTER\n");=09=09=09=20=20=20=20=20=20 + D_CMD(__FUNCTION__ ": SET_EVENT_FILTER\n"); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 default: - D_CMD(__FUNCTION__", HCI_HC, ocf %d not recognised!\n", ocf); + D_CMD(__FUNCTION__ ": HCI_HC, ocf %d not recognised!\n", ocf); break; } /* FIX ME : Wake up from the correct queue */ @@ -1437,9 +1437,9 @@ case HCI_LP: /* Link policy commands */ switch (ocf) { case ROLE_DISCOVERY: - printk(__FUNCTION__", ROLE_DISCOVERY: "); + printk(__FUNCTION__ ": ROLE_DISCOVERY: "); if (r_val[0]) { - D_ERR(__FUNCTION__", ROLE_DISCOVERY: %s\n", + D_ERR(__FUNCTION__ ": ROLE_DISCOVERY: %s\n", get_err_msg(r_val[0])); break; } @@ -1449,15 +1449,15 @@ printk("Connected as Master. \n"); break; case WRITE_LINK_POLICY_SETTINGS: - printk(__FUNCTION__", WRITE_LINK_POLICY_SETTINGS \n "); + printk(__FUNCTION__ ": WRITE_LINK_POLICY_SETTINGS \n "); if (r_val[0]) { - D_ERR(__FUNCTION__", WRITE_LINK_POLICY_SETTINGS: %s\n", + D_ERR(__FUNCTION__ ": WRITE_LINK_POLICY_SETTINGS: %s\n", get_err_msg(r_val[0])); break; } break; default: - D_CMD(__FUNCTION__", HCI_LP, ocf %d not recognised!\n", ocf); + D_CMD(__FUNCTION__ ": HCI_LP, ocf %d not recognised!\n", ocf); break; } break; @@ -1468,9 +1468,9 @@ switch (ocf) { =20 case READ_LOCAL_VERSION_INFORMATION: - D_CMD(__FUNCTION__", READ_LOCAL_VERSION_INFORMATION\n"); + D_CMD(__FUNCTION__ ": READ_LOCAL_VERSION_INFORMATION\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_LOCAL_VERSION_INFORMATION: %s\n", + D_ERR(__FUNCTION__ ": READ_LOCAL_VERSION_INFORMATION: %s\n", get_err_msg(r_val[0])); break; } @@ -1478,9 +1478,9 @@ break; =20 case READ_BUFFER_SIZE: - D_CMD(__FUNCTION__", READ_BUFFER_SIZE\n"); + D_CMD(__FUNCTION__ ": READ_BUFFER_SIZE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_BUFFER_SIZE: %s\n", + D_ERR(__FUNCTION__ ": READ_BUFFER_SIZE: %s\n", get_err_msg(r_val[0])); break; } @@ -1502,18 +1502,18 @@ break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case READ_BD_ADDR: - D_CMD(__FUNCTION__", READ_BD_ADDR\n"); + D_CMD(__FUNCTION__ ": READ_BD_ADDR\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", READ_BD_ADDR: %s\n", + D_ERR(__FUNCTION__ ": READ_BD_ADDR: %s\n", get_err_msg(r_val[0])); break; }=20=20=20=20=20=20=20=20=20=20=20=20 - PRINTPKT(__FUNCTION__", READ_BD_ADDR : ", &r_val[1], 6); + PRINTPKT(__FUNCTION__ ": READ_BD_ADDR : ", &r_val[1], 6); memcpy(hci_ctrl.local_bd, &r_val[1],6); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 default: - D_CMD(__FUNCTION__", HCI_IP, ocf %d not recognised!\n", ocf); + D_CMD(__FUNCTION__ ": HCI_IP, ocf %d not recognised!\n", ocf); break; } wake_up_interruptible(&hci_wq); @@ -1524,38 +1524,38 @@ =20 switch (ocf) {=20=20 case READ_LOOPBACK_MODE: - D_ERR(__FUNCTION__", READ_LOOPBACK_MODE -- not impl\n"); + D_ERR(__FUNCTION__ ": READ_LOOPBACK_MODE -- not impl\n"); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case WRITE_LOOPBACK_MODE: - D_ERR(__FUNCTION__", WRITE_LOOPBACK_MODE -- not impl\n"); + D_ERR(__FUNCTION__ ": WRITE_LOOPBACK_MODE -- not impl\n"); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 case ENABLE_DEVICE_UNDER_TEST_MODE: - DSYS(__FUNCTION__", ENABLE_DEVICE_UNDER_TEST_MODE\n"); + DSYS(__FUNCTION__ ": ENABLE_DEVICE_UNDER_TEST_MODE\n"); if (r_val[0]) { - D_ERR(__FUNCTION__", ENABLE_DEVICE_UNDER_TEST_MODE: %s\n", + D_ERR(__FUNCTION__ ": ENABLE_DEVICE_UNDER_TEST_MODE: %s\n", get_err_msg(r_val[0])); break; } - printk(__FUNCTION__", *** Local device now under test\n***"); + printk(__FUNCTION__ ": *** Local device now under test\n***"); break; =20=20=20=20=20=20=20=20=20=20=20=20=20 default: - D_ERR(__FUNCTION__", HCI_TC, ocf %d not recognised!\n", ocf); + D_ERR(__FUNCTION__ ": HCI_TC, ocf %d not recognised!\n", ocf); break; } wake_up_interruptible(&hci_wq); break; =20=20=20=20=20=20=20=20=20=20=20 case MANUFACTURER_SPEC: { /* manufacturer specific */ - D_CMD(__FUNCTION__", MANUFACTURER_SPEC\n"); + D_CMD(__FUNCTION__ ": MANUFACTURER_SPEC\n"); process_vendor_return_param(ocf, r_val); } break; =20=20=20=20=20=20=20=20=20 default: - D_CMD(__FUNCTION__", ogf %d, not recognised! \n", ogf); + D_CMD(__FUNCTION__ ": ogf %d, not recognised! \n", ogf); break; } } @@ -1568,7 +1568,7 @@ void=20 process_acl_data(hci_in_buffer *in_buf, u32 pb_flag) { - D_REC(__FUNCTION__", in_buf->count:%d, in_buf->l2cap_len:%d\n", + D_REC(__FUNCTION__ ": in_buf->count:%d, in_buf->l2cap_len:%d\n", in_buf->count, in_buf->l2cap_len); =20 if (pb_flag =3D=3D L2CAP_FRAME_START) { @@ -1589,7 +1589,7 @@ { hci_in_buffer *in_buf; if (!(in_buf =3D get_free_inbuffer())) { - printk(__FUNCTION__", couldn't find free in buffer\n"); + printk(__FUNCTION__ ": couldn't find free in buffer\n"); return; } memcpy(in_buf->buf_ptr, data, len); @@ -1615,7 +1615,7 @@ } } if (i >=3D MAX_NBR_OF_CONNECTIONS) { - D_ERR(__FUNCTION__", : No free connection object\n"); + D_ERR(__FUNCTION__ ": No free connection object\n"); } } =20 @@ -1632,7 +1632,7 @@ } } if (i >=3D MAX_NBR_OF_CONNECTIONS) { - D_ERR(__FUNCTION__", : Didn't find connection with con_hdl %d\n", con_hd= l); + D_ERR(__FUNCTION__ ": Didn't find connection with con_hdl %d\n", con_hdl= ); } } =20 @@ -1642,7 +1642,7 @@ s32 i; =20 if (!name) { - D_ERR(__FUNCTION__", set_hci_con_name: No name defined\n"); + D_ERR(__FUNCTION__ ": set_hci_con_name: No name defined\n"); return; } =20 @@ -1653,7 +1653,7 @@ } } if (i >=3D MAX_NBR_OF_CONNECTIONS) { - D_ERR(__FUNCTION__", : Didn't fin connecton with BD adress 0x%02x:%02x:%= 02x:%02x:%02x:%02x\n", bd[5],bd[4],bd[3],bd[2],bd[1],bd[0]); + D_ERR(__FUNCTION__ ": Didn't fin connecton with BD adress 0x%02x:%02x:%0= 2x:%02x:%02x:%02x\n", bd[5],bd[4],bd[3],bd[2],bd[1],bd[0]); } } =20 @@ -1726,10 +1726,10 @@ { hci_in_buffer *in_buf =3D NULL; =20=20=20 - D_CTRL(__FUNCTION__", \n"); + D_CTRL(__FUNCTION__ "\n"); =20 if (!(in_buf =3D get_inbuffer(hci_hdl))) { - printk(__FUNCTION__", couldn't find in buffer hci_hdl %d\n", hci_hdl); + printk(__FUNCTION__ ": couldn't find in buffer hci_hdl %d\n", hci_hdl); return; } =20 @@ -1754,11 +1754,11 @@ } =20 if (i >=3D NBR_OF_HCI_INBUFFERS) { - D_ERR(__FUNCTION__", WARNING! No inbuffer with hci_hdl %d\n", hci_hdl); + D_ERR(__FUNCTION__ ": WARNING! No inbuffer with hci_hdl %d\n", hci_hdl); return NULL; } =20=09 - D_CTRL(__FUNCTION__", Found inbuffer for hci_hdl %d %p\n",hci_hdl,=20 + D_CTRL(__FUNCTION__ ": Found inbuffer for hci_hdl %d %p\n",hci_hdl,=20 &hci_ctrl.hci_in_buf[i]); =20 return &hci_ctrl.hci_in_buf[i]; @@ -1778,11 +1778,11 @@ } =20 if (i >=3D NBR_OF_HCI_INBUFFERS) { - D_ERR(__FUNCTION__", No free buffer found, discarding data\n"); + D_ERR(__FUNCTION__ ": No free buffer found, discarding data\n"); return NULL; } =20=09 - D_CTRL(__FUNCTION__", inbuffer %d was free\n",i); + D_CTRL(__FUNCTION__ ": inbuffer %d was free\n",i); hci_ctrl.hci_in_buf[i].empty =3D FALSE; return &hci_ctrl.hci_in_buf[i]; } @@ -1792,7 +1792,7 @@ { u32 i; =20 - DSYS(__FUNCTION__", Initialising HCI\n"); + DSYS(__FUNCTION__ ": Initialising HCI\n"); =20 #ifdef HCI_EMULATION DSYS("*** HCI emulator on ***\n"); @@ -1811,7 +1811,7 @@ #endif /* LINUX_VERSION_CODE */ #endif /* __KERNEL__ */ =20 - DSYS(__FUNCTION__", Initialising HCI inbuffers [%d]\n", HCI_IN_SIZE); + DSYS(__FUNCTION__ ": Initialising HCI inbuffers [%d]\n", HCI_IN_SIZE); =20=09 /* Initiate the hci inbuffers */ for (i =3D 0; i < NBR_OF_HCI_INBUFFERS; i++) { @@ -1861,10 +1861,10 @@ hci_read_firmware_rev_info();=09 =20 #ifdef HOST_FLOW_CTRL - DSYS(__FUNCTION__", Host flow control enabled\n"); + DSYS(__FUNCTION__ ": Host flow control enabled\n"); hci_set_host_controller_flow_control(TRUE); #else - DSYS(__FUNCTION__", Host flow control not enabled\n"); + DSYS(__FUNCTION__ ": Host flow control not enabled\n"); #endif hci_host_buffer_size(HCI_ACL_LEN,HCI_SCO_LEN,HCI_ACL_NUM,HCI_SCO_NUM); =20 @@ -1911,7 +1911,7 @@ { s32 tmp; =20 - D_CMD(__FUNCTION__", Sending inquiry()\n"); + D_CMD(__FUNCTION__ ": Sending inquiry()\n"); =20 if (!results) return -EINVAL; @@ -2012,7 +2012,7 @@ s32=20 accept_connection_request(u8 bd[], u8 role) { - D_CMD(__FUNCTION__", bd_addr %x %x %x %x %x %x\n",bd[0], bd[1], bd[2], + D_CMD(__FUNCTION__ ": bd_addr %x %x %x %x %x %x\n",bd[0], bd[1], bd[2], bd[3], bd[4], bd[5]); =20 c_pkt.type =3D CMD_PKT; @@ -2034,7 +2034,7 @@ { u32 c =3D 0; =20=09 - D_CMD(__FUNCTION__", Rejecting bd_addr %x %x %x %x %x %x\n", + D_CMD(__FUNCTION__ ": Rejecting bd_addr %x %x %x %x %x %x\n", bd[0],bd[1],bd[2],bd[3],bd[4],bd[5]); =20 c_pkt.type =3D CMD_PKT; @@ -2054,8 +2054,8 @@ u32 c =3D 0; s32 tmp; =20=09 - print_data(__FUNCTION__", BD_addr", bd, 6); - print_data(__FUNCTION__", Link Key", link_key, 16); + print_data(__FUNCTION__ ": BD_addr", bd, 6); + print_data(__FUNCTION__ ": Link Key", link_key, 16); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(LINK_KEY_REQUEST_REPLY, HCI_LC) ; @@ -2080,7 +2080,7 @@ { s32 tmp; =20=09 - print_data(__FUNCTION__", BD_addr", bd, 6); + print_data(__FUNCTION__ ": BD_addr", bd, 6); =20=09 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(LINK_KEY_REQUEST_NEGATIVE_REPLY, HCI_LC) ; @@ -2090,7 +2090,7 @@ c_pkt.len =3D 6; =20 tmp =3D send_cmd_block((u8*) &c_pkt , c_pkt.len + CMD_HDR_LEN + HCI_HDR_L= EN); - printk(__FUNCTION__" returned from send_secblock\n"); + printk(__FUNCTION__ ": Returned from send_secblock\n"); if (tmp < 0) { return tmp; } else { @@ -2104,10 +2104,10 @@ u32 c =3D 0; s32 tmp; =20=09 - print_data(__FUNCTION__", New pin is\n", pin, pin_len);=20 + print_data(__FUNCTION__ ": New pin is\n", pin, pin_len);=20 =20 - print_data(__FUNCTION__", BD_addr", bd, 6); - print_data(__FUNCTION__", pin", pin, pin_len); + print_data(__FUNCTION__ ": BD_addr", bd, 6); + print_data(__FUNCTION__ ": pin", pin, pin_len); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(PIN_CODE_REQUEST_REPLY, HCI_LC) ; @@ -2134,7 +2134,7 @@ { s32 tmp; =20=09 - print_data(__FUNCTION__", BD_addr", bd, 6); + print_data(__FUNCTION__ ": BD_addr", bd, 6); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(PIN_CODE_REQUEST_NEGATIVE_REPLY, HCI_LC) ; @@ -2163,7 +2163,7 @@ s32 change_connection_packet_type(u32 hci_hdl, u32 pkt_type) { - D_CMD(__FUNCTION__", for connnection handle 0x%x\n", hci_hdl); + D_CMD(__FUNCTION__ ": for connnection handle 0x%x\n", hci_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(CHANGE_CONNECTION_PACKET_TYPE, HCI_LC) ; @@ -2201,7 +2201,7 @@ tmp =3D get_con_hdl(bd); =20=09 if (tmp < 0) { - D_ERR(__FUNCTION__", No connection handle found for bd 0x%02x:%02x:%02x:= %02x:%02x:%02x:\n", bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); + D_ERR(__FUNCTION__ ": No connection handle found for bd 0x%02x:%02x:%02x= :%02x:%02x:%02x:\n", bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); return -1; } else { return hci_authentication_requested((u16)tmp); @@ -2212,7 +2212,7 @@ hci_authentication_requested(u16 con_hdl) { =20 - D_CMD(__FUNCTION__" at connection handle %d\n", con_hdl); + D_CMD(__FUNCTION__ ": At connection handle %d\n", con_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(AUTHENTICATION_REQUESTED, HCI_LC); @@ -2242,7 +2242,7 @@ tmp =3D get_con_hdl(bd); =20=09 if (tmp < 0) { - D_ERR(__FUNCTION__", No connection handle found for bd 0x%02x:%02x:%02x:= %02x:%02x:%02x:\n", bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); + D_ERR(__FUNCTION__ ": No connection handle found for bd 0x%02x:%02x:%02x= :%02x:%02x:%02x:\n", bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); return -1; } else { return hci_set_connection_encryption((u16)tmp, enable); @@ -2253,7 +2253,7 @@ s32 hci_set_connection_encryption(u16 con_hdl, u8 enable) { - D_CMD(__FUNCTION__"enable:%d at connection handle %d\n", enable, con_hdl); + D_CMD(__FUNCTION__ ": enable:%d at connection handle %d\n", enable, con_h= dl); c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(SET_CONNECTION_ENCRYPTION, HCI_LC) ; =20 @@ -2322,7 +2322,7 @@ s32 c =3D 0; s32 zero =3D 0; =20=09=09 - D_CMD(__FUNCTION__", for bd address 0x%02x:%02x:%02x:%02x:%02x:%02x\n" + D_CMD(__FUNCTION__ ": for bd address 0x%02x:%02x:%02x:%02x:%02x:%02x\n" , bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); =20=09 c_pkt.type =3D CMD_PKT; @@ -2349,7 +2349,7 @@ =20=09 for (i =3D 0; i < MAX_NBR_OF_CONNECTIONS; i++) { if (hci_ctrl.con[i].state !=3D NOT_CONNECTED) { - printk(__FUNCTION__", Flushing handle:%d\n",hci_ctrl.con[i].con_hdl); + printk(__FUNCTION__ ": Flushing handle:%d\n",hci_ctrl.con[i].con_hdl); hci_flush(hci_ctrl.con[i].con_hdl); } }=09 @@ -2459,7 +2459,7 @@ hci_change_local_name(u8 *new_name) { #define NAME_LEN 248 - D_CMD(__FUNCTION__", New name: %s\n", new_name); + D_CMD(__FUNCTION__ ": New name: %s\n", new_name); c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(CHANGE_LOCAL_NAME, HCI_HC); =20 @@ -2501,7 +2501,7 @@ s32=20 hci_write_scan_enable(u32 enable) { - D_CMD(__FUNCTION__", enable %d\n", enable); + D_CMD(__FUNCTION__ ": enable %d\n", enable); c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(WRITE_SCAN_ENABLE, HCI_HC) ; =20=20=20 @@ -2520,7 +2520,7 @@ s32=20 hci_write_pagescan_activity(u32 interval, u32 wind) { - D_CMD(__FUNCTION__", \n"); + D_CMD(__FUNCTION__ "\n"); c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(WRITE_PAGESCAN_ACTIVITY, HCI_HC) ; =20 @@ -2542,7 +2542,7 @@ s32=20 write_inquiryscan_activity(u32 interval, u32 wind) { - D_CMD(__FUNCTION__", \n"); + D_CMD(__FUNCTION__ "\n"); c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(WRITE_INQUIRYSCAN_ACTIVITY, HCI_HC) ; =20=20=20 @@ -2649,9 +2649,9 @@ s32 hci_write_class_of_device(u8 *class_of_device) { - D_CMD(__FUNCTION__"Service class 0x%02x, major:0x%01x, minor:0x%01x\n",(c= lass_of_device[2] << 3) | (class_of_device[1] >> 5), (class_of_device[1] & = 0x1f), (class_of_device[0] >> 2)); + D_CMD(__FUNCTION__ ": Service class 0x%02x, major:0x%01x, minor:0x%01x\n"= ,(class_of_device[2] << 3) | (class_of_device[1] >> 5), (class_of_device[1]= & 0x1f), (class_of_device[0] >> 2)); =20 - D_CMD(__FUNCTION__"%01x:%01x:%01x\n", class_of_device[2], class_of_device= [1], class_of_device[0]); + D_CMD(__FUNCTION__ ": %01x:%01x:%01x\n", class_of_device[2], class_of_dev= ice[1], class_of_device[0]); =20=09 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(WRITE_CLASS_OF_DEVICE, HCI_HC) ; @@ -2685,7 +2685,7 @@ s32 write_automatic_flush_timeout(u16 con_hdl, u16 n) { - D_CMD(__FUNCTION__", con_hdl: %d, n:%d\n", con_hdl, n); + D_CMD(__FUNCTION__ ": con_hdl: %d, n:%d\n", con_hdl, n); =20=09 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(WRITE_AUTOMATIC_FLUSH_TIMEOUT, HCI_HC); @@ -2706,7 +2706,7 @@ hci_set_host_controller_flow_control(u32 enable) { #ifdef HOST_FLOW_CTRL - D_CMD(__FUNCTION__", enable:%d\n",enable); + D_CMD(__FUNCTION__ ": enable:%d\n",enable); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(SET_HOST_CONTROLLER_TO_HOST_FLOW_CONTROL,= HCI_HC) ; @@ -2773,7 +2773,7 @@ #ifdef HOST_FLOW_CTRL s32 tmp; =20=09 - D_CMD(__FUNCTION__", hci_hdl:0x%x, for %d packets\n", hci_hdl,nbr_of_pack= ets); + D_CMD(__FUNCTION__ ": hci_hdl:0x%x, for %d packets\n", hci_hdl,nbr_of_pac= kets); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(HOST_NUMBER_OF_COMPLETED_PACKETS, HCI_HC)= ; @@ -2921,7 +2921,7 @@ s32 hci_hold_mode(u16 hci_hdl, u16 max_int, u16 min_int) {=20=20 - D_CMD(__FUNCTION__", for connnection handle 0x%x\n", hci_hdl); + D_CMD(__FUNCTION__ ": for connnection handle 0x%x\n", hci_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(HOLD_MODE, HCI_LP); @@ -2940,7 +2940,7 @@ s32 hci_sniff_mode(u16 hci_hdl, u16 max_int, u16 min_int, u16 attempt, u16 tim= eout) {=20=20 - D_CMD(__FUNCTION__", for connnection handle 0x%x\n", hci_hdl); + D_CMD(__FUNCTION__ ": for connnection handle 0x%x\n", hci_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(SNIFF_MODE, HCI_LP); @@ -2964,7 +2964,7 @@ s32 hci_exit_sniff_mode(u16 hci_hdl) {=20 - D_CMD(__FUNCTION__", for connnection handle 0x%x\n", hci_hdl); + D_CMD(__FUNCTION__ ": for connnection handle 0x%x\n", hci_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(EXIT_SNIFF_MODE, HCI_LP); @@ -2979,7 +2979,7 @@ s32 hci_park_mode(u16 hci_hdl, u16 max_int, u16 min_int) {=20=20 - D_CMD(__FUNCTION__", for connnection handle 0x%x\n", hci_hdl); + D_CMD(__FUNCTION__ ": for connnection handle 0x%x\n", hci_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(PARK_MODE, HCI_LP); @@ -2998,7 +2998,7 @@ s32 hci_exit_park_mode(u16 hci_hdl) {=20=20 - D_CMD(__FUNCTION__", for connnection handle 0x%x\n", hci_hdl); + D_CMD(__FUNCTION__ ": for connnection handle 0x%x\n", hci_hdl); =20 c_pkt.type =3D CMD_PKT; c_pkt.opcode =3D hci_put_opcode(EXIT_PARK_MODE, HCI_LP); @@ -3024,7 +3024,7 @@ } =20 if (i >=3D MAX_NBR_OF_CONNECTIONS) { - D_ERR(__FUNCTION__", No connection handle found for bd 0x%02x:%02x:%02x:= %02x:%02x:%02x:\n", bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); + D_ERR(__FUNCTION__ ": No connection handle found for bd 0x%02x:%02x:%02x= :%02x:%02x:%02x:\n", bd[5], bd[4], bd[3], bd[2], bd[1], bd[0]); return -1; } else { return hci_ctrl.con[i].con_hdl; @@ -3044,7 +3044,7 @@ } =20 if (i >=3D MAX_NBR_OF_CONNECTIONS) { - D_ERR(__FUNCTION__", No BD Address found for connection handle %d\n", co= n_hdl); + D_ERR(__FUNCTION__ ": No BD Address found for connection handle %d\n", c= on_hdl); return NULL; } else { return hci_ctrl.con[i].bd; @@ -3193,7 +3193,7 @@ s32=20 lp_connect_req(u8 bd_addr[]) { - PRINTPKT(__FUNCTION__", bd address is: ", bd_addr, 6); + PRINTPKT(__FUNCTION__ ": bd address is: ", bd_addr, 6); /* FIXME, store the inparameters in the ctrl-block instead */ =20 if (!get_con(bd_addr, ANY_STATE)) @@ -3214,7 +3214,7 @@ s32=20 lp_connect_rsp(u8 bd_addr[], u32 cfm) {=20 - D_CMD(__FUNCTION__"Status:%d\n", cfm); + D_CMD(__FUNCTION__ ": Status: %d\n", cfm); if (cfm) { #ifdef CONFIG_BLUETOOTH_EARLY_MSSWITCH if (force_msswitch) { @@ -3248,7 +3248,7 @@ s32 hci_send_data(bt_tx_buf *tx_buf) { - D_SND(__FUNCTION__", %d bytes \n", tx_buf->cur_len); + D_SND(__FUNCTION__ ": %d bytes\n", tx_buf->cur_len); =20 /* Indicate that this is a L2CAP start frame. If the whole frame can't be sent, send_acl_data will fragment it an set the @@ -3284,10 +3284,10 @@ tx_buf =3D get_bt_buf(); if (tx_buf) { bytes2send =3D tx_buf->cur_len; - D_SND(__FUNCTION__", %d bytes \n", tx_buf->cur_len); + D_SND(__FUNCTION__ ": %d bytes \n", tx_buf->cur_len); } =20 - D_SND(__FUNCTION__", %d bytes \n", bytes2send); + D_SND(__FUNCTION__ ": %d bytes \n", bytes2send); =20=09 /* while there is space in the hardware buffers and we have hci packets to send, we send them. After each sent packet @@ -3340,14 +3340,14 @@ /* Calculate the maximum packet length we can send */ c =3D MIN(tx_buf->cur_len, hci_ctrl.hc_buf.acl_len); =20 - D_SND(__FUNCTION__", send %d bytes (excl HCI header) out of %d\n", + D_SND(__FUNCTION__ ": send %d bytes (excl HCI header) out of %d\n", c, tx_buf->cur_len); =20=20=20 /* Set the temporary cur_data pointer to point at the current data to be sent */ cur_data =3D tx_buf->data + (tx_buf->subscr_len - tx_buf->cur_len); =20=20 - D_SND(__FUNCTION__", There are %d bytes space for the headers\n", + D_SND(__FUNCTION__ ": There are %d bytes space for the headers\n", tx_buf->subscr_len - tx_buf->cur_len); =20=20=20 /* Move the pointer so the HCI header can be filled in, higher @@ -3365,7 +3365,7 @@ tx_buf->hci_hdl); =20 /* Send the whole packet plus its header to the serial driver */ - PRINTPKT(__FUNCTION__", ", cur_data, c + ACL_HDR_LEN + HCI_HDR_LEN); + PRINTPKT(__FUNCTION__ ": ", cur_data, c + ACL_HDR_LEN + HCI_HDR_LEN); =20 #ifdef HCI_EMULATION hci_emulator(cur_data, c + ACL_HDR_LEN + HCI_HDR_LEN); @@ -3381,7 +3381,7 @@ either send all or nothing...=20 (HW need complete packets) */ =20=09=09 - D_SND(__FUNCTION__", cannot send now, leave in buffers\n"); + D_SND(__FUNCTION__ ": cannot send now, leave in buffers\n"); return 0; } #endif @@ -3391,15 +3391,15 @@ /* Decrease the current length of the packet */ tx_buf->cur_len -=3D c; =20 - D_SND(__FUNCTION__", now c =3D %d\n", c); + D_SND(__FUNCTION__ ": now c =3D %d\n", c); =20=20=20 /* Check whether to unsubscribe the subscribed buffer or not */ if (tx_buf->cur_len =3D=3D 0) { - D_SND(__FUNCTION__", unsubscribing tx_buf.\n"); + D_SND(__FUNCTION__ ": unsubscribing tx_buf.\n"); unsubscribe_bt_buf(tx_buf); } else if (tx_buf->cur_len < 0) { - D_ERR(__FUNCTION__", negative cur_len... (%d)\n",=20 + D_ERR(__FUNCTION__ ": negative cur_len... (%d)\n",=20 tx_buf->cur_len); #ifndef __KERNEL__ sleep(10); @@ -3512,7 +3512,7 @@ =20=20=20=20=20=20 case CREATE_CONNECTION: /* Send connection request event */ - D_CMD(__FUNCTION__", CREATE_CONNECTION->connection request\n"); + D_CMD(__FUNCTION__ ": CREATE_CONNECTION->connection request\n"); o_len =3D set_con_req_event(out_event, cmd->data, 1); bt_write_lower_driver(o_event, o_len); =20=20=20=20=20=20=20 @@ -3523,14 +3523,14 @@ the conde for "Connection Terminated by Local Host" and 0x13 is the code for "Other End Terminated Connection: User Ended Connection" */ - D_CMD(__FUNCTION__", DISCONNECT->disconnection complete\n"); + D_CMD(__FUNCTION__ ": DISCONNECT->disconnection complete\n"); o_len =3D set_discon_cpl_event(out_event, CHAR2INT12(cmd->data[1], cmd-= >data[0]), 0x13); bt_write_lower_driver(o_event, o_len); lp_disconnect_ind(CHAR2INT12(cmd->data[1],cmd->data[0])); break; =20=20=20=20=20=20=20 case ACCEPT_CONNECTION_REQUEST: - D_CMD(__FUNCTION__", ACCEPT_CONNECTION->connection complete\n"); + D_CMD(__FUNCTION__ ": ACCEPT_CONNECTION->connection complete\n"); o_len =3D set_con_cpl_event(out_event, 0, cmd->data, HCI_HDL, ACL_CON); #ifndef __KERNEL__ @@ -3541,7 +3541,7 @@ break; =20=20=20=20=20=20=20 case REJECT_CONNECTION_REQUEST: - D_CMD(__FUNCTION__", REJECT_CONNECTION->connection complete\n"); + D_CMD(__FUNCTION__ ": REJECT_CONNECTION->connection complete\n"); o_len =3D set_con_cpl_event(out_event, cmd->data[6], cmd->data, HCI_HDL, ACL_CON); #ifndef __KERNEL__ @@ -3552,7 +3552,7 @@ break; =20=20=20=20=20=20=20 default: - printk(__FUNCTION__", Unknown command ogf:0x%x,ocf:0x%x\n", + printk(__FUNCTION__ ": Unknown command ogf:0x%x,ocf:0x%x\n", hci_get_ogf(cmd->opcode), hci_get_ocf(cmd->opcode)); break; } @@ -3561,7 +3561,7 @@ case HCI_IP: /* Informational parameters */ switch (hci_get_ocf(cmd->opcode)) { case READ_BUFFER_SIZE: - D_CMD(__FUNCTION__", READ_BUFFER_SIZE->setting buffer size\n"); + D_CMD(__FUNCTION__ ": READ_BUFFER_SIZE->setting buffer size\n"); hci_ctrl.hc_buf.acl_num =3D ACL_NUM; hci_ctrl.hc_buf.acl_len =3D ACL_LEN; hci_ctrl.hc_buf.sco_num =3D SCO_NUM; @@ -3569,14 +3569,14 @@ break; =20=20=20 default: - printk(__FUNCTION__", Unknown command ogf:0x%x,ocf:0x%x\n", + printk(__FUNCTION__ ": Unknown command ogf:0x%x,ocf:0x%x\n", hci_get_ogf(cmd->opcode), hci_get_ocf(cmd->opcode)); break; } break; =20 default: - printk(__FUNCTION__", Unknown command ogf:0x%x,ocf:0x%x\n", + printk(__FUNCTION__ ": Unknown command ogf:0x%x,ocf:0x%x\n", hci_get_ogf(cmd->opcode), hci_get_ocf(cmd->opcode)); break; } @@ -3660,7 +3660,7 @@ u32 i; cmd_t *tmp =3D NULL; =20=20 - D_CTRL(__FUNCTION__", Initializing\n"); + D_CTRL(__FUNCTION__ ": Initializing\n"); =20=20=20 while ((tmp =3D get_next_cmd()) !=3D NULL) { kfree(tmp->data); @@ -3692,7 +3692,7 @@ if (cmd_buf.next_to_send >=3D (NBR_CMD_BUFS - 1)) { /* If we are at last cmd in buffer, wrap ! */ cmd_buf.next_to_send =3D 0; - D_CTRL(__FUNCTION__", next_to_send WRAP\n"); + D_CTRL(__FUNCTION__ ": next_to_send WRAP\n"); } else { cmd_buf.next_to_send++; } @@ -3725,7 +3725,7 @@ =20 if (cmd_buf.first_free >=3D (NBR_CMD_BUFS - 1)) { cmd_buf.first_free =3D 0; /* wrap */ - D_CTRL(__FUNCTION__", WRAP\n"); + D_CTRL(__FUNCTION__ ": WRAP\n"); } else { cmd_buf.first_free++; } @@ -3774,7 +3774,7 @@ { hci_ctrl.hc_buf.cmd_num =3D nhcp; =20 - D_CTRL(__FUNCTION__", Num_HCI_Command_Packets=3D%d\n", hci_ctrl.hc_buf.cm= d_num); + D_CTRL(__FUNCTION__ ": Num_HCI_Command_Packets=3D%d\n", hci_ctrl.hc_buf.c= md_num); =20=09 #ifdef __KERNEL__ send_cmd_task.routine =3D (void*)send_cmd_queue; @@ -3796,7 +3796,7 @@ { cmd_t *tmp =3D NULL; =20=20=20 - D_CTRL(__FUNCTION__", start: Num_HCI_Command_Packets=3D%d\n",=20 + D_CTRL(__FUNCTION__ ": start: Num_HCI_Command_Packets=3D%d\n",=20 hci_ctrl.hc_buf.cmd_num); =20 cli(); @@ -3804,7 +3804,7 @@ && ((tmp =3D get_next_cmd()) !=3D NULL)) { sti(); =20=20=20=20 - PRINTPKT(__FUNCTION__", ", tmp->data, tmp->len); + PRINTPKT(__FUNCTION__ ": ", tmp->data, tmp->len); /* more in queue and we can send */ #ifdef HCI_EMULATION hci_emulator(tmp->data, tmp->len); @@ -3819,7 +3819,7 @@ } sti(); =20=09 - D_CTRL(__FUNCTION__", end : %d cmds left in queue\n", cmd_buf.count); + D_CTRL(__FUNCTION__ ": end : %d cmds left in queue\n", cmd_buf.count); =20 /*FIXME: this should really be fixed... */ if (hci_ctrl.hc_buf.cmd_num > 0) { @@ -3901,7 +3901,7 @@ counter to 1 again */ hci_ctrl.hc_buf.cmd_num =3D 1; =20=09 - printk(__FUNCTION__", Timeout when waiting for command response\n"); + printk(__FUNCTION__ ": Timeout when waiting for command response\n"); hci_cmd_pending =3D 0; wake_up_interruptible(&hci_wq); } @@ -3943,7 +3943,7 @@ =20 /* hci_ctrl.hc_buf.cmd_num =3D 1;*/ =20 - printk(__FUNCTION__", Timeout when waiting for inquiry response\n"); + printk(__FUNCTION__ ": Timeout when waiting for inquiry response\n"); hci_inq_pending =3D 0; hci_inq_aborted =3D 1; wake_up_interruptible(&inq_wq); @@ -4047,7 +4047,7 @@ for (i =3D 0; i < NBR_CMD_BUFS; i++) { printk("%d\n", i); if (cmd_buf.buf[i].len > 0) - PRINTPKT(__FUNCTION__", cmd_buf : ", cmd_buf.buf[i].data, cmd_buf.buf[i= ].len);=20=20=20=20=20=20 + PRINTPKT(__FUNCTION__ ": cmd_buf: ", cmd_buf.buf[i].data, cmd_buf.buf[i= ].len);=20=20=20=20=20=20 }=20=20 printk("------------------------------------------\n"); } |