Minor revision

The major difference is the potential support for different kind of
dongles
This commit is contained in:
Kristian Lauszus 2012-04-11 01:52:43 +02:00
parent 79dd1d6952
commit d4fcf68de4
3 changed files with 495 additions and 398 deletions

244
PS3BT.cpp
View file

@ -19,6 +19,10 @@
#define DEBUG // Uncomment to print data for debugging #define DEBUG // Uncomment to print data for debugging
//#define PRINTREPORT // Uncomment to print the report send by the PS3 Controllers //#define PRINTREPORT // Uncomment to print the report send by the PS3 Controllers
const uint8_t PS3BT::BTD_EVENT_PIPE = 1;
const uint8_t PS3BT::BTD_DATAIN_PIPE = 2;
const uint8_t PS3BT::BTD_DATAOUT_PIPE = 3;
prog_char OUTPUT_REPORT_BUFFER[] PROGMEM = prog_char OUTPUT_REPORT_BUFFER[] PROGMEM =
{ {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -35,6 +39,8 @@ prog_char OUTPUT_REPORT_BUFFER[] PROGMEM =
PS3BT::PS3BT(USB *p): PS3BT::PS3BT(USB *p):
pUsb(p), // pointer to USB class instance - mandatory pUsb(p), // pointer to USB class instance - mandatory
bAddress(0), // device address - mandatory bAddress(0), // device address - mandatory
bNumEP(1), // if config descriptor needs to be parsed
qNextPollTime(0),
bPollEnable(false) // don't start polling before dongle is connected bPollEnable(false) // don't start polling before dongle is connected
{ {
for(uint8_t i=0; i<PS3_MAX_ENDPOINTS; i++) for(uint8_t i=0; i<PS3_MAX_ENDPOINTS; i++)
@ -42,8 +48,7 @@ PS3BT::PS3BT(USB *p):
epInfo[i].epAddr = 0; epInfo[i].epAddr = 0;
epInfo[i].maxPktSize = (i) ? 0 : 8; epInfo[i].maxPktSize = (i) ? 0 : 8;
epInfo[i].epAttribs = 0; epInfo[i].epAttribs = 0;
if (!i) epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
epInfo[i].bmNakPower = USB_NAK_DEFAULT;
} }
if (pUsb) // register in USB subsystem if (pUsb) // register in USB subsystem
@ -59,11 +64,11 @@ PS3BT::PS3BT(USB *p):
uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed) uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
{ {
const uint8_t constBufSize = sizeof(USB_DEVICE_DESCRIPTOR); uint8_t buf[sizeof(USB_DEVICE_DESCRIPTOR)];
uint8_t buf[constBufSize];
uint8_t rcode; uint8_t rcode;
UsbDevice *p = NULL; UsbDevice *p = NULL;
EpInfo *oldep_ptr = NULL; EpInfo *oldep_ptr = NULL;
uint8_t num_of_conf; // number of configurations
uint16_t PID; uint16_t PID;
uint16_t VID; uint16_t VID;
@ -109,14 +114,13 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
p->lowspeed = lowspeed; p->lowspeed = lowspeed;
// Get device descriptor // Get device descriptor
rcode = pUsb->getDevDescr(0, 0, constBufSize, (uint8_t*)buf);// Get device descriptor - addr, ep, nbytes, data rcode = pUsb->getDevDescr(0, 0, sizeof(USB_DEVICE_DESCRIPTOR), (uint8_t*)buf);// Get device descriptor - addr, ep, nbytes, data
// Restore p->epinfo // Restore p->epinfo
p->epinfo = oldep_ptr; p->epinfo = oldep_ptr;
if( rcode ){ if(rcode)
goto FailGetDevDescr; goto FailGetDevDescr;
}
// Allocate new address according to device class // Allocate new address according to device class
bAddress = addrPool.AllocAddress(parent, false, port); bAddress = addrPool.AllocAddress(parent, false, port);
@ -148,27 +152,25 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
//get pointer to assigned address record //get pointer to assigned address record
p = addrPool.GetUsbDevicePtr(bAddress); p = addrPool.GetUsbDevicePtr(bAddress);
if (!p) if (!p)
{
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL; return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
}
p->lowspeed = lowspeed; p->lowspeed = lowspeed;
// Assign epInfo to epinfo pointer - only EP0 is known // Assign epInfo to epinfo pointer - only EP0 is known
rcode = pUsb->setEpInfoEntry(bAddress, 1, epInfo); rcode = pUsb->setEpInfoEntry(bAddress, 1, epInfo);
if (rcode) if (rcode)
{
goto FailSetDevTblEntry; goto FailSetDevTblEntry;
}
num_of_conf = ((USB_DEVICE_DESCRIPTOR*)buf)->bNumConfigurations;
VID = ((USB_DEVICE_DESCRIPTOR*)buf)->idVendor; VID = ((USB_DEVICE_DESCRIPTOR*)buf)->idVendor;
PID = ((USB_DEVICE_DESCRIPTOR*)buf)->idProduct; PID = ((USB_DEVICE_DESCRIPTOR*)buf)->idProduct;
if(VID == CSR_VID && PID == CSR_PID) if((VID == CSR_VID || VID == ISSC_VID) && (PID == CSR_PID || PID == ISSC_PID))
{ {
#ifdef DEBUG #ifdef DEBUG
Notify(PSTR("\r\nBluetooth Dongle Connected")); Notify(PSTR("\r\nBluetooth Dongle Connected"));
#endif #endif
//Needed for PS3 Dualshock Controller commands to work via bluetooth //Needed for PS3 Dualshock Controller commands to work via bluetooth
for (uint8_t i = 0; i < OUTPUT_REPORT_BUFFER_SIZE; i++) for (uint8_t i = 0; i < OUTPUT_REPORT_BUFFER_SIZE; i++)
HIDBuffer[i + 2] = pgm_read_byte(&OUTPUT_REPORT_BUFFER[i]);//First two bytes reserved for report type and ID HIDBuffer[i + 2] = pgm_read_byte(&OUTPUT_REPORT_BUFFER[i]);//First two bytes reserved for report type and ID
@ -186,33 +188,37 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
interrupt_dcid[0] = 0x41;//0x0041 interrupt_dcid[0] = 0x41;//0x0041
interrupt_dcid[1] = 0x00; interrupt_dcid[1] = 0x00;
/* Initialize data structures for endpoints of device */ //check if attached device is a Bluetooth dongle and fill endpoint data structure
epInfo[ CSR_EVENT_PIPE ].epAddr = 0x01; // Bluetooth event endpoint //first interface in the configuration must have Bluetooth assigned Class/Subclass/Protocol
epInfo[ CSR_EVENT_PIPE ].epAttribs = EP_INTERRUPT; //and 3 endpoints - interrupt-IN, bulk-IN, bulk-OUT,
epInfo[ CSR_EVENT_PIPE ].bmNakPower = USB_NAK_NOWAIT; // Only poll once for interrupt endpoints //not necessarily in this order
epInfo[ CSR_EVENT_PIPE ].maxPktSize = INT_MAXPKTSIZE; for (uint8_t i=0; i<num_of_conf; i++) {
epInfo[ CSR_EVENT_PIPE ].bmSndToggle = bmSNDTOG0; ConfigDescParser<USB_CLASS_WIRELESS_CTRL, WI_SUBCLASS_RF, WI_PROTOCOL_BT, CP_MASK_COMPARE_ALL> confDescrParser(this);
epInfo[ CSR_EVENT_PIPE ].bmRcvToggle = bmRCVTOG0; rcode = pUsb->getConfDescr(bAddress, 0, i, &confDescrParser);
epInfo[ CSR_DATAIN_PIPE ].epAddr = 0x02; // Bluetoth data endpoint if( rcode ) {
epInfo[ CSR_DATAIN_PIPE ].epAttribs = EP_BULK; goto FailGetConfDescr;
epInfo[ CSR_DATAIN_PIPE ].bmNakPower = USB_NAK_NOWAIT; }
epInfo[ CSR_DATAIN_PIPE ].maxPktSize = BULK_MAXPKTSIZE; if( bNumEP > 3 ) { //all endpoints extracted
epInfo[ CSR_DATAIN_PIPE ].bmSndToggle = bmSNDTOG0; break;
epInfo[ CSR_DATAIN_PIPE ].bmRcvToggle = bmRCVTOG0; }
epInfo[ CSR_DATAOUT_PIPE ].epAddr = 0x02; // Bluetooth data endpoint } // for (uint8_t i=0; i<num_of_conf; i++...
epInfo[ CSR_DATAOUT_PIPE ].epAttribs = EP_BULK;
epInfo[ CSR_DATAOUT_PIPE ].bmNakPower = USB_NAK_NOWAIT;
epInfo[ CSR_DATAOUT_PIPE ].maxPktSize = BULK_MAXPKTSIZE;
epInfo[ CSR_DATAOUT_PIPE ].bmSndToggle = bmSNDTOG0;
epInfo[ CSR_DATAOUT_PIPE ].bmRcvToggle = bmRCVTOG0;
rcode = pUsb->setEpInfoEntry(bAddress, 3, epInfo); if (bNumEP < PS3_MAX_ENDPOINTS) {
Notify(PSTR("\r\nBluetooth dongle is not supported"));
goto Fail;
}
// Assign epInfo to epinfo pointer - this time all 3 endpoins
rcode = pUsb->setEpInfoEntry(bAddress, bNumEP, epInfo);
if( rcode ) if( rcode )
goto FailSetDevTblEntry; goto FailSetDevTblEntry;
delay(200); // Give time for address change delay(200); // Give time for address change
rcode = pUsb->setConf(bAddress, epInfo[ CSR_CONTROL_PIPE ].epAddr, bConfigurationValue);//bConfigurationValue = 0x01 //rcode = pUsb->setConf(bAddress, epInfo[ CSR_CONTROL_PIPE ].epAddr, bConfigurationValue);//bConfigurationValue = 0x01
// Set Configuration Value
rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, bConfNum);
if( rcode ) if( rcode )
goto FailSetConf; goto FailSetConf;
@ -222,12 +228,16 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
#ifdef DEBUG #ifdef DEBUG
Notify(PSTR("\r\nCSR Initialized")); Notify(PSTR("\r\nCSR Initialized"));
#endif #endif
delay(200);
watingForConnection = false;
bPollEnable = true; bPollEnable = true;
} }
else if((VID == PS3_VID || VID == PS3NAVIGATION_VID || VID == PS3MOVE_VID) && (PID == PS3_PID || PID == PS3NAVIGATION_PID || PID == PS3MOVE_PID)) else if((VID == PS3_VID || VID == PS3NAVIGATION_VID || VID == PS3MOVE_VID) && (PID == PS3_PID || PID == PS3NAVIGATION_PID || PID == PS3MOVE_PID))
{ {
/*The application will work in reduced host mode, so we can save program and data
memory space. After verifying the PID and VID we will use known values for the
configuration values for device, interface, endpoints and HID for the PS3 Controllers */
/* Initialize data structures for endpoints of device */ /* Initialize data structures for endpoints of device */
epInfo[ PS3_OUTPUT_PIPE ].epAddr = 0x02; // PS3 output endpoint epInfo[ PS3_OUTPUT_PIPE ].epAddr = 0x02; // PS3 output endpoint
epInfo[ PS3_OUTPUT_PIPE ].epAttribs = EP_INTERRUPT; epInfo[ PS3_OUTPUT_PIPE ].epAttribs = EP_INTERRUPT;
@ -242,7 +252,6 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
epInfo[ PS3_INPUT_PIPE ].bmSndToggle = bmSNDTOG0; epInfo[ PS3_INPUT_PIPE ].bmSndToggle = bmSNDTOG0;
epInfo[ PS3_INPUT_PIPE ].bmRcvToggle = bmRCVTOG0; epInfo[ PS3_INPUT_PIPE ].bmRcvToggle = bmRCVTOG0;
rcode = pUsb->setEpInfoEntry(bAddress, 3, epInfo); rcode = pUsb->setEpInfoEntry(bAddress, 3, epInfo);
if( rcode ) if( rcode )
goto FailSetDevTblEntry; goto FailSetDevTblEntry;
@ -292,6 +301,11 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
Notify(PSTR("\r\nsetDevTblEn:")); Notify(PSTR("\r\nsetDevTblEn:"));
#endif #endif
goto Fail; goto Fail;
FailGetConfDescr:
#ifdef DEBUG
Notify(PSTR("\r\ngetConf:"));
#endif
goto Fail;
FailSetConf: FailSetConf:
#ifdef DEBUG #ifdef DEBUG
Notify(PSTR("\r\nsetConf:")); Notify(PSTR("\r\nsetConf:"));
@ -313,6 +327,55 @@ uint8_t PS3BT::Init(uint8_t parent, uint8_t port, bool lowspeed)
Release(); Release();
return rcode; return rcode;
} }
/* Extracts interrupt-IN, bulk-IN, bulk-OUT endpoint information from config descriptor */
void PS3BT::EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *pep)
{
//ErrorMessage<uint8_t>(PSTR("Conf.Val"),conf);
//ErrorMessage<uint8_t>(PSTR("Iface Num"),iface);
//ErrorMessage<uint8_t>(PSTR("Alt.Set"),alt);
if(alt) // wrong interface - by BT spec, no alt setting
return;
bConfNum = conf;
uint8_t index;
if ((pep->bmAttributes & 0x03) == 3 && (pep->bEndpointAddress & 0x80) == 0x80) //Interrupt In endpoint found
index = BTD_EVENT_PIPE;
else {
if ((pep->bmAttributes & 0x02) == 2) //bulk endpoint found
index = ((pep->bEndpointAddress & 0x80) == 0x80) ? BTD_DATAIN_PIPE : BTD_DATAOUT_PIPE;
else
return;
}
//Fill the rest of endpoint data structure
epInfo[index].epAddr = (pep->bEndpointAddress & 0x0F);
epInfo[index].maxPktSize = (uint8_t)pep->wMaxPacketSize;
//PrintEndpointDescriptor(pep);
if(pollInterval < pep->bInterval) // Set the polling interval as the largest polling interval obtained from endpoints
pollInterval = pep->bInterval;
bNumEP++;
return;
}
void PS3BT::PrintEndpointDescriptor( const USB_ENDPOINT_DESCRIPTOR* ep_ptr )
{
Notify(PSTR("Endpoint descriptor:"));
Notify(PSTR("\r\nLength:\t\t"));
PrintHex<uint8_t>(ep_ptr->bLength);
Notify(PSTR("\r\nType:\t\t"));
PrintHex<uint8_t>(ep_ptr->bDescriptorType);
Notify(PSTR("\r\nAddress:\t"));
PrintHex<uint8_t>(ep_ptr->bEndpointAddress);
Notify(PSTR("\r\nAttributes:\t"));
PrintHex<uint8_t>(ep_ptr->bmAttributes);
Notify(PSTR("\r\nMaxPktSize:\t"));
PrintHex<uint16_t>(ep_ptr->wMaxPacketSize);
Notify(PSTR("\r\nPoll Intrv:\t"));
PrintHex<uint8_t>(ep_ptr->bInterval);
Notify(PSTR("\r\n"));
}
/* Performs a cleanup after failed Init() attempt */ /* Performs a cleanup after failed Init() attempt */
uint8_t PS3BT::Release() uint8_t PS3BT::Release()
@ -320,16 +383,18 @@ uint8_t PS3BT::Release()
pUsb->GetAddressPool().FreeAddress(bAddress); pUsb->GetAddressPool().FreeAddress(bAddress);
bAddress = 0; bAddress = 0;
bPollEnable = false; bPollEnable = false;
bNumEP = 1; // must have to be reset to 1
return 0; return 0;
} }
uint8_t PS3BT::Poll() uint8_t PS3BT::Poll()
{ {
if (!bPollEnable) if (!bPollEnable)
return 0; return 0;
if (qNextPollTime <= millis()) { // Don't poll if shorter than polling interval
HCI_event_task(); // poll the HCI event pipe HCI_event_task(); // poll the HCI event pipe
ACL_event_task(); // start polling the ACL input pipe too, though discard data until connected ACL_event_task(); // start polling the ACL input pipe too, though discard data until connected
}
qNextPollTime = millis() + pollInterval; // Poll time
return 0; return 0;
} }
void PS3BT::setBdaddr(uint8_t* BDADDR) void PS3BT::setBdaddr(uint8_t* BDADDR)
@ -346,7 +411,7 @@ void PS3BT::setBdaddr(uint8_t* BDADDR)
buf[i+2] = my_bdaddr[5 - i];//Copy into buffer, has to be written reversed buf[i+2] = my_bdaddr[5 - i];//Copy into buffer, has to be written reversed
//bmRequest = Host to device (0x00) | Class (0x20) | Interface (0x01) = 0x21, bRequest = Set Report (0x09), Report ID (0xF5), Report Type (Feature 0x03), interface (0x00), datalength, datalength, data) //bmRequest = Host to device (0x00) | Class (0x20) | Interface (0x01) = 0x21, bRequest = Set Report (0x09), Report ID (0xF5), Report Type (Feature 0x03), interface (0x00), datalength, datalength, data)
pUsb->ctrlReq(bAddress,epInfo[PS3_CONTROL_PIPE].epAddr, bmREQ_HIDOUT, HID_REQUEST_SET_REPORT, 0xF5, 0x03, 0x00, 8, 8, buf, NULL); pUsb->ctrlReq(bAddress,epInfo[PS3_CONTROL_PIPE].epAddr, bmREQ_HID_OUT, HID_REQUEST_SET_REPORT, 0xF5, 0x03, 0x00, 8, 8, buf, NULL);
#ifdef DEBUG #ifdef DEBUG
Notify(PSTR("\r\nBluetooth Address was set to: ")); Notify(PSTR("\r\nBluetooth Address was set to: "));
for(int8_t i = 5; i > 0; i--) for(int8_t i = 5; i > 0; i--)
@ -376,7 +441,7 @@ void PS3BT::setMoveBdaddr(uint8_t* BDADDR)
buf[i + 1] = my_bdaddr[i]; buf[i + 1] = my_bdaddr[i];
//bmRequest = Host to device (0x00) | Class (0x20) | Interface (0x01) = 0x21, bRequest = Set Report (0x09), Report ID (0x05), Report Type (Feature 0x03), interface (0x00), datalength, datalength, data) //bmRequest = Host to device (0x00) | Class (0x20) | Interface (0x01) = 0x21, bRequest = Set Report (0x09), Report ID (0x05), Report Type (Feature 0x03), interface (0x00), datalength, datalength, data)
pUsb->ctrlReq(bAddress,epInfo[PS3_CONTROL_PIPE].epAddr, bmREQ_HIDOUT, HID_REQUEST_SET_REPORT, 0x05, 0x03, 0x00,11,11, buf, NULL); pUsb->ctrlReq(bAddress,epInfo[PS3_CONTROL_PIPE].epAddr, bmREQ_HID_OUT, HID_REQUEST_SET_REPORT, 0x05, 0x03, 0x00,11,11, buf, NULL);
#ifdef DEBUG #ifdef DEBUG
Notify(PSTR("\r\nBluetooth Address was set to: ")); Notify(PSTR("\r\nBluetooth Address was set to: "));
for(int8_t i = 5; i > 0; i--) for(int8_t i = 5; i > 0; i--)
@ -410,18 +475,14 @@ uint8_t PS3BT::getAnalogHat(AnalogHat a)
return (uint8_t)(l2capinbuf[(uint16_t)a]); return (uint8_t)(l2capinbuf[(uint16_t)a]);
} }
uint32_t PS3BT::getSensor(Sensor a) uint32_t PS3BT::getSensor(Sensor a)
{
if (a == aX || a == aY || a == aZ || a == gZ)
{ {
if (l2capinbuf == NULL) if (l2capinbuf == NULL)
return 0; return 0;
if (a == aX || a == aY || a == aZ || a == gZ)
return ((l2capinbuf[(uint16_t)a] << 8) | l2capinbuf[(uint16_t)a + 1]); return ((l2capinbuf[(uint16_t)a] << 8) | l2capinbuf[(uint16_t)a + 1]);
}
else if (a == mXmove || a == mYmove || a == mZmove) else if (a == mXmove || a == mYmove || a == mZmove)
{ {
// Might not be correct, haven't tested it yet // Might not be correct, haven't tested it yet
if (l2capinbuf == NULL)
return 0;
if (a == mXmove) if (a == mXmove)
return ((l2capinbuf[(uint16_t)a + 1] << 0x04) | (l2capinbuf[(uint16_t)a] << 0x0C)); return ((l2capinbuf[(uint16_t)a + 1] << 0x04) | (l2capinbuf[(uint16_t)a] << 0x0C));
//return (((unsigned char)l2capinbuf[(unsigned int)a + 1]) | (((unsigned char)l2capinbuf[(unsigned int)a] & 0x0F)) << 8); //return (((unsigned char)l2capinbuf[(unsigned int)a + 1]) | (((unsigned char)l2capinbuf[(unsigned int)a] & 0x0F)) << 8);
@ -442,8 +503,7 @@ uint32_t PS3BT::getSensor(Sensor a)
} }
else else
{ {
if (l2capinbuf == NULL)
return 0;
return (((l2capinbuf[(uint16_t)a + 1] << 8) | l2capinbuf[(uint16_t)a]) - 0x8000); return (((l2capinbuf[(uint16_t)a + 1] << 8) | l2capinbuf[(uint16_t)a]) - 0x8000);
} }
} }
@ -592,8 +652,10 @@ void PS3BT::disconnect()//Use this void to disconnect any of the controllers
void PS3BT::HCI_event_task() void PS3BT::HCI_event_task()
{ {
/* check the event pipe*/ /* check the event pipe*/
uint16_t MAX_BUFFER_SIZE = BULK_MAXPKTSIZE; uint16_t MAX_BUFFER_SIZE = BULK_MAXPKTSIZE; // Request more than 16 bytes anyway, the inTransfer routine will take care of this
pUsb->inTransfer(bAddress, epInfo[ CSR_EVENT_PIPE ].epAddr, &MAX_BUFFER_SIZE, hcibuf); // input on endpoint 1 uint8_t rcode = pUsb->inTransfer(bAddress, epInfo[ BTD_EVENT_PIPE ].epAddr, &MAX_BUFFER_SIZE, hcibuf); // input on endpoint 1
if(!rcode || rcode == hrNAK) // Check for errors
{
switch (hcibuf[0]) //switch on event type switch (hcibuf[0]) //switch on event type
{ {
case EV_COMMAND_COMPLETE: case EV_COMMAND_COMPLETE:
@ -606,8 +668,6 @@ void PS3BT::HCI_event_task()
break; break;
case EV_COMMAND_STATUS: case EV_COMMAND_STATUS:
//hci_command_packets = hcibuf[3]; // update flow control
hci_event_flag |= HCI_FLAG_CMD_STATUS; //set status flag
if(hcibuf[2]) // show status on serial if not OK if(hcibuf[2]) // show status on serial if not OK
{ {
#ifdef DEBUG #ifdef DEBUG
@ -622,26 +682,31 @@ void PS3BT::HCI_event_task()
break; break;
case EV_CONNECT_COMPLETE: case EV_CONNECT_COMPLETE:
hci_event_flag |= HCI_FLAG_CONN_COMPLETE; // set connection complete flag
if (!hcibuf[2]) // check if connected OK if (!hcibuf[2]) // check if connected OK
{ {
hci_handle = hcibuf[3] | hcibuf[4] << 8; //store the handle for the ACL connection hci_handle = hcibuf[3] | hcibuf[4] << 8; //store the handle for the ACL connection
hci_event_flag |= HCI_FLAG_CONNECT_OK; //set connection OK flag hci_event_flag |= HCI_FLAG_CONN_COMPLETE; // set connection complete flag
} }
break; break;
case EV_DISCONNECT_COMPLETE: case EV_DISCONNECT_COMPLETE:
hci_event_flag |= HCI_FLAG_DISCONN_COMPLETE; //set disconnect commend complete flag
if (!hcibuf[2]) // check if disconnected OK if (!hcibuf[2]) // check if disconnected OK
hci_event_flag &= ~(HCI_FLAG_CONNECT_OK); //clear connection OK flag {
hci_event_flag |= HCI_FLAG_DISCONN_COMPLETE; //set disconnect commend complete flag
hci_event_flag &= ~HCI_FLAG_CONN_COMPLETE; // clear connection complete flag
}
break; break;
case EV_NUM_COMPLETE_PKT: case EV_NUM_COMPLETE_PKT:
break; break;
case EV_REMOTE_NAME_COMPLETE: case EV_REMOTE_NAME_COMPLETE:
if (!hcibuf[2]) // check if reading is OK
{
for (uint8_t i = 0; i < 30; i++) for (uint8_t i = 0; i < 30; i++)
remote_name[i] = hcibuf[9 + i]; //store first 30 bytes remote_name[i] = hcibuf[9 + i]; //store first 30 bytes
hci_event_flag |= HCI_FLAG_REMOTE_NAME_COMPLETE; hci_event_flag |= HCI_FLAG_REMOTE_NAME_COMPLETE;
}
break; break;
case EV_INCOMING_CONNECT: case EV_INCOMING_CONNECT:
@ -661,6 +726,7 @@ void PS3BT::HCI_event_task()
#endif #endif
*/ */
break; break;
default: default:
/* /*
#ifdef DEBUG #ifdef DEBUG
@ -675,6 +741,11 @@ void PS3BT::HCI_event_task()
} // switch } // switch
HCI_task(); HCI_task();
} }
else {
Notify(PSTR("\r\nHCI event error: "));
PrintHex<uint8_t>(rcode);
}
}
/* Poll Bluetooth and print result */ /* Poll Bluetooth and print result */
void PS3BT::HCI_task() void PS3BT::HCI_task()
@ -729,12 +800,14 @@ void PS3BT::HCI_task()
Notify(PSTR("\r\nWait For Incoming Connection Request")); Notify(PSTR("\r\nWait For Incoming Connection Request"));
#endif #endif
hci_write_scan_enable(); hci_write_scan_enable();
watingForConnection = true;
hci_state = HCI_CONNECT_IN_STATE; hci_state = HCI_CONNECT_IN_STATE;
break; break;
case HCI_CONNECT_IN_STATE: case HCI_CONNECT_IN_STATE:
if(hci_incoming_connect_request) if(hci_incoming_connect_request)
{ {
watingForConnection = false;
#ifdef DEBUG #ifdef DEBUG
Notify(PSTR("\r\nIncoming Request")); Notify(PSTR("\r\nIncoming Request"));
#endif #endif
@ -819,7 +892,7 @@ void PS3BT::HCI_task()
for (uint8_t i = 0; i < OUTPUT_REPORT_BUFFER_SIZE; i++) for (uint8_t i = 0; i < OUTPUT_REPORT_BUFFER_SIZE; i++)
HIDBuffer[i + 2] = pgm_read_byte(&OUTPUT_REPORT_BUFFER[i]);//First two bytes reserved for report type and ID HIDBuffer[i + 2] = pgm_read_byte(&OUTPUT_REPORT_BUFFER[i]);//First two bytes reserved for report type and ID
for (uint8_t i = 2; i < HIDMOVEBUFFERSIZE; i++) for (uint8_t i = 2; i < HID_BUFFERSIZE; i++)
HIDMoveBuffer[i] = 0; HIDMoveBuffer[i] = 0;
l2cap_state = L2CAP_EV_WAIT; l2cap_state = L2CAP_EV_WAIT;
@ -834,7 +907,9 @@ void PS3BT::HCI_task()
void PS3BT::ACL_event_task() void PS3BT::ACL_event_task()
{ {
uint16_t MAX_BUFFER_SIZE = BULK_MAXPKTSIZE; uint16_t MAX_BUFFER_SIZE = BULK_MAXPKTSIZE;
pUsb->inTransfer(bAddress, epInfo[ CSR_DATAIN_PIPE ].epAddr, &MAX_BUFFER_SIZE, l2capinbuf); // input on endpoint 2 uint8_t rcode = pUsb->inTransfer(bAddress, epInfo[ BTD_DATAIN_PIPE ].epAddr, &MAX_BUFFER_SIZE, l2capinbuf); // input on endpoint 2
if(!rcode || rcode == hrNAK) // Check for errors
{
if (((l2capinbuf[0] | (l2capinbuf[1] << 8)) == (hci_handle | 0x2000)))//acl_handle_ok if (((l2capinbuf[0] | (l2capinbuf[1] << 8)) == (hci_handle | 0x2000)))//acl_handle_ok
{ {
if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001)//l2cap_control - Channel ID for ACL-U if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001)//l2cap_control - Channel ID for ACL-U
@ -978,6 +1053,11 @@ void PS3BT::ACL_event_task()
L2CAP_task(); L2CAP_task();
} }
} }
else {
Notify(PSTR("\r\nACL data in error: "));
PrintHex<uint8_t>(rcode);
}
}
void PS3BT::L2CAP_task() void PS3BT::L2CAP_task()
{ {
switch (l2cap_state) switch (l2cap_state)
@ -1110,7 +1190,7 @@ void PS3BT::L2CAP_task()
dtimeBulbRumble = millis() - timerBulbRumble; dtimeBulbRumble = millis() - timerBulbRumble;
if (dtimeBulbRumble > 4000)//Send at least every 4th second if (dtimeBulbRumble > 4000)//Send at least every 4th second
{ {
HIDMove_Command(HIDMoveBuffer, HIDMOVEBUFFERSIZE);//The Bulb and rumble values, has to be written again and again, for it to stay turned on HIDMove_Command(HIDMoveBuffer, HID_BUFFERSIZE);//The Bulb and rumble values, has to be written again and again, for it to stay turned on
timerBulbRumble = millis(); timerBulbRumble = millis();
} }
} }
@ -1159,17 +1239,21 @@ void PS3BT::readReport()
if(ButtonState != OldButtonState) if(ButtonState != OldButtonState)
{ {
ButtonChanged = true; buttonChanged = true;
if(ButtonState != 0x00) if(ButtonState != 0x00) {
ButtonPressed = true; buttonPressed = true;
else buttonReleased = false;
ButtonPressed = false; } else {
buttonPressed = false;
buttonReleased = true;
}
} }
else else
{ {
ButtonChanged = false; buttonChanged = false;
ButtonPressed = false; buttonPressed = false;
buttonReleased = false;
} }
OldButtonState = ButtonState; OldButtonState = ButtonState;
@ -1197,7 +1281,7 @@ void PS3BT::printReport() //Uncomment "#define PRINTREPORT" to print the report
void PS3BT::HCI_Command(uint8_t* data, uint16_t nbytes) void PS3BT::HCI_Command(uint8_t* data, uint16_t nbytes)
{ {
hci_event_flag &= ~HCI_FLAG_CMD_COMPLETE; hci_event_flag &= ~HCI_FLAG_CMD_COMPLETE;
pUsb->ctrlReq(bAddress, epInfo[ CSR_CONTROL_PIPE ].epAddr, bmREQ_HCI_OUT, 0x00, 0x00, 0x00 ,0x00, nbytes, nbytes, data, NULL); pUsb->ctrlReq(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, bmREQ_HCI_OUT, 0x00, 0x00, 0x00 ,0x00, nbytes, nbytes, data, NULL);
} }
void PS3BT::hci_reset() void PS3BT::hci_reset()
@ -1210,6 +1294,7 @@ void PS3BT::hci_reset()
} }
void PS3BT::hci_write_scan_enable() void PS3BT::hci_write_scan_enable()
{ {
hci_event_flag &= ~HCI_FLAG_INCOMING_REQUEST;
hcibuf[0] = 0x1A; // HCI OCF = 1A hcibuf[0] = 0x1A; // HCI OCF = 1A
hcibuf[1] = 0x03 << 2; // HCI OGF = 3 hcibuf[1] = 0x03 << 2; // HCI OGF = 3
hcibuf[2] = 0x01;// parameter length = 1 hcibuf[2] = 0x01;// parameter length = 1
@ -1233,9 +1318,6 @@ void PS3BT::hci_read_bdaddr()
} }
void PS3BT::hci_accept_connection() void PS3BT::hci_accept_connection()
{ {
hci_event_flag |= HCI_FLAG_CONNECT_OK;
hci_event_flag &= ~(HCI_FLAG_INCOMING_REQUEST);
hcibuf[0] = 0x09; // HCI OCF = 9 hcibuf[0] = 0x09; // HCI OCF = 9
hcibuf[1] = 0x01 << 2; // HCI OGF = 1 hcibuf[1] = 0x01 << 2; // HCI OGF = 1
hcibuf[2] = 0x07; // parameter length 7 hcibuf[2] = 0x07; // parameter length 7
@ -1251,7 +1333,7 @@ void PS3BT::hci_accept_connection()
} }
void PS3BT::hci_remote_name() void PS3BT::hci_remote_name()
{ {
hci_event_flag &= ~(HCI_FLAG_REMOTE_NAME_COMPLETE); hci_event_flag &= ~HCI_FLAG_REMOTE_NAME_COMPLETE;
hcibuf[0] = 0x19; // HCI OCF = 19 hcibuf[0] = 0x19; // HCI OCF = 19
hcibuf[1] = 0x01 << 2; // HCI OGF = 1 hcibuf[1] = 0x01 << 2; // HCI OGF = 1
hcibuf[2] = 0x0A; // parameter length = 10 hcibuf[2] = 0x0A; // parameter length = 10
@ -1298,7 +1380,7 @@ void PS3BT::L2CAP_Command(uint8_t* data, uint16_t nbytes)
for (uint16_t i = 0; i < nbytes; i++)//L2CAP C-frame for (uint16_t i = 0; i < nbytes; i++)//L2CAP C-frame
buf[8 + i] = data[i]; buf[8 + i] = data[i];
uint8_t rcode = pUsb->outTransfer(bAddress, epInfo[ CSR_DATAOUT_PIPE ].epAddr, (8 + nbytes), buf); uint8_t rcode = pUsb->outTransfer(bAddress, epInfo[ BTD_DATAOUT_PIPE ].epAddr, (8 + nbytes), buf);
if(rcode) if(rcode)
{ {
#ifdef DEBUG #ifdef DEBUG
@ -1432,7 +1514,7 @@ void PS3BT::HID_Command(uint8_t* data, uint16_t nbytes)
if (dtimeHID <= 250)// Check if is has been more than 250ms since last command if (dtimeHID <= 250)// Check if is has been more than 250ms since last command
delay((uint32_t)(250 - dtimeHID));//There have to be a delay between commands delay((uint32_t)(250 - dtimeHID));//There have to be a delay between commands
pUsb->outTransfer(bAddress, epInfo[ CSR_DATAOUT_PIPE ].epAddr, (8 + nbytes), buf); pUsb->outTransfer(bAddress, epInfo[ BTD_DATAOUT_PIPE ].epAddr, (8 + nbytes), buf);
timerHID = millis(); timerHID = millis();
} }
@ -1441,7 +1523,7 @@ void PS3BT::setAllOff()
for (uint8_t i = 0; i < OUTPUT_REPORT_BUFFER_SIZE; i++) for (uint8_t i = 0; i < OUTPUT_REPORT_BUFFER_SIZE; i++)
HIDBuffer[i + 2] = pgm_read_byte(&OUTPUT_REPORT_BUFFER[i]);//First two bytes reserved for report type and ID HIDBuffer[i + 2] = pgm_read_byte(&OUTPUT_REPORT_BUFFER[i]);//First two bytes reserved for report type and ID
HID_Command(HIDBuffer, OUTPUT_REPORT_BUFFER_SIZE + 2); HID_Command(HIDBuffer, HID_BUFFERSIZE);
} }
void PS3BT::setRumbleOff() void PS3BT::setRumbleOff()
{ {
@ -1450,7 +1532,7 @@ void PS3BT::setRumbleOff()
HIDBuffer[5] = 0x00; HIDBuffer[5] = 0x00;
HIDBuffer[6] = 0x00;//high mode off HIDBuffer[6] = 0x00;//high mode off
HID_Command(HIDBuffer, OUTPUT_REPORT_BUFFER_SIZE + 2); HID_Command(HIDBuffer, HID_BUFFERSIZE);
} }
void PS3BT::setRumbleOn(Rumble mode) void PS3BT::setRumbleOn(Rumble mode)
{ {
@ -1476,7 +1558,7 @@ void PS3BT::setRumbleOn(Rumble mode)
HIDBuffer[6] = 0;//high mode off HIDBuffer[6] = 0;//high mode off
} }
HID_Command(HIDBuffer, OUTPUT_REPORT_BUFFER_SIZE + 2); HID_Command(HIDBuffer, HID_BUFFERSIZE);
} }
} }
void PS3BT::setLedOff(LED a) void PS3BT::setLedOff(LED a)
@ -1487,18 +1569,18 @@ void PS3BT::setLedOff(LED a)
//set the LED into the write buffer //set the LED into the write buffer
HIDBuffer[11] = (uint8_t)((uint8_t)(((uint16_t)a & 0x0f) << 1) ^ HIDBuffer[11]); HIDBuffer[11] = (uint8_t)((uint8_t)(((uint16_t)a & 0x0f) << 1) ^ HIDBuffer[11]);
HID_Command(HIDBuffer, OUTPUT_REPORT_BUFFER_SIZE + 2); HID_Command(HIDBuffer, HID_BUFFERSIZE);
} }
} }
void PS3BT::setLedOn(LED a) void PS3BT::setLedOn(LED a)
{ {
HIDBuffer[11] = (uint8_t)((uint8_t)(((uint16_t)a & 0x0f) << 1) | HIDBuffer[11]); HIDBuffer[11] = (uint8_t)((uint8_t)(((uint16_t)a & 0x0f) << 1) | HIDBuffer[11]);
HID_Command(HIDBuffer, OUTPUT_REPORT_BUFFER_SIZE + 2); HID_Command(HIDBuffer, HID_BUFFERSIZE);
} }
void PS3BT::enable_sixaxis()//Command used to enable the Dualshock 3 and Navigation controller to send data via USB void PS3BT::enable_sixaxis()//Command used to enable the Dualshock 3 and Navigation controller to send data via USB
{ {
uint8_t cmd_buf[12]; uint8_t cmd_buf[6];
cmd_buf[0] = 0x53;// HID BT Set_report (0x50) | Report Type (Feature 0x03) cmd_buf[0] = 0x53;// HID BT Set_report (0x50) | Report Type (Feature 0x03)
cmd_buf[1] = 0xF4;// Report ID cmd_buf[1] = 0xF4;// Report ID
cmd_buf[2] = 0x42;// Special PS3 Controller enable commands cmd_buf[2] = 0x42;// Special PS3 Controller enable commands
@ -1530,7 +1612,7 @@ void PS3BT::HIDMove_Command(uint8_t* data,uint16_t nbytes)
if (dtimeHID <= 250)// Check if is has been less than 200ms since last command if (dtimeHID <= 250)// Check if is has been less than 200ms since last command
delay((uint32_t)(250 - dtimeHID));//There have to be a delay between commands delay((uint32_t)(250 - dtimeHID));//There have to be a delay between commands
pUsb->outTransfer(bAddress, epInfo[ CSR_DATAOUT_PIPE ].epAddr, (8 + nbytes), buf); pUsb->outTransfer(bAddress, epInfo[ BTD_DATAOUT_PIPE ].epAddr, (8 + nbytes), buf);
timerHID = millis(); timerHID = millis();
} }
@ -1541,7 +1623,7 @@ void PS3BT::moveSetBulb(uint8_t r, uint8_t g, uint8_t b)//Use this to set the Co
HIDMoveBuffer[4] = g; HIDMoveBuffer[4] = g;
HIDMoveBuffer[5] = b; HIDMoveBuffer[5] = b;
HIDMove_Command(HIDMoveBuffer, HIDMOVEBUFFERSIZE); HIDMove_Command(HIDMoveBuffer, HID_BUFFERSIZE);
} }
void PS3BT::moveSetBulb(Colors color)//Use this to set the Color using the predefined colors in "enums.h" void PS3BT::moveSetBulb(Colors color)//Use this to set the Color using the predefined colors in "enums.h"
{ {
@ -1550,12 +1632,12 @@ void PS3BT::moveSetBulb(Colors color)//Use this to set the Color using the prede
HIDMoveBuffer[4] = (uint8_t)(color >> 8); HIDMoveBuffer[4] = (uint8_t)(color >> 8);
HIDMoveBuffer[5] = (uint8_t)(color); HIDMoveBuffer[5] = (uint8_t)(color);
HIDMove_Command(HIDMoveBuffer, HIDMOVEBUFFERSIZE); HIDMove_Command(HIDMoveBuffer, HID_BUFFERSIZE);
} }
void PS3BT::moveSetRumble(uint8_t rumble) void PS3BT::moveSetRumble(uint8_t rumble)
{ {
//set the rumble value into the write buffer //set the rumble value into the write buffer
HIDMoveBuffer[7] = rumble; HIDMoveBuffer[7] = rumble;
HIDMove_Command(HIDMoveBuffer, HIDMOVEBUFFERSIZE); HIDMove_Command(HIDMoveBuffer, HID_BUFFERSIZE);
} }

68
PS3BT.h
View file

@ -25,10 +25,7 @@
#endif #endif
#include "Usb.h" #include "Usb.h"
#include "confdescparser.h"
/*The application will work in reduced host mode, so we can save program and data
memory space. After verifying the PID and VID we will use known values for the
configuration values for device, interface, endpoints and HID */
/* CSR Bluetooth data taken from descriptors */ /* CSR Bluetooth data taken from descriptors */
#define INT_MAXPKTSIZE 16 // max size for HCI data #define INT_MAXPKTSIZE 16 // max size for HCI data
@ -39,20 +36,17 @@
/* Endpoint types */ /* Endpoint types */
#define EP_INTERRUPT 0x03 #define EP_INTERRUPT 0x03
#define EP_BULK 0x02
#define CSR_CONTROL_PIPE 0 // names we give to the 4 pipes /* Names we give to the 3 ps3 pipes - this is only used for setting the bluetooth address into the ps3 controllers */
#define CSR_EVENT_PIPE 1 #define PS3_CONTROL_PIPE 0
#define CSR_DATAIN_PIPE 2
#define CSR_DATAOUT_PIPE 3
#define PS3_CONTROL_PIPE 0 // names we give to the 3 pipes
#define PS3_OUTPUT_PIPE 1 #define PS3_OUTPUT_PIPE 1
#define PS3_INPUT_PIPE 2 #define PS3_INPUT_PIPE 2
//PID and VID of the different devices //PID and VID of the different devices
#define CSR_VID 0x0A12 // Cambridge Silicon Radio Ltd. #define CSR_VID 0x0A12 // Cambridge Silicon Radio Ltd.
#define CSR_PID 0x0001 // Bluetooth HCI Device #define CSR_PID 0x0001 // Bluetooth HCI Device
#define ISSC_VID 0x1131 // Integrated System Solution Corp.
#define ISSC_PID 0x1004 // Bluetooth Device
#define PS3_VID 0x054C // Sony Corporation #define PS3_VID 0x054C // Sony Corporation
#define PS3_PID 0x0268 // PS3 Controller DualShock 3 #define PS3_PID 0x0268 // PS3 Controller DualShock 3
#define PS3NAVIGATION_VID 0x054C // Sony Corporation #define PS3NAVIGATION_VID 0x054C // Sony Corporation
@ -60,14 +54,14 @@
#define PS3MOVE_VID 0x054C // Sony Corporation #define PS3MOVE_VID 0x054C // Sony Corporation
#define PS3MOVE_PID 0x03D5 // Motion controller #define PS3MOVE_PID 0x03D5 // Motion controller
#define HIDMOVEBUFFERSIZE 50 // size of the buffer for the Playstation Motion Controller #define HID_BUFFERSIZE 50 // size of the buffer for the Playstation Motion Controller
#define OUTPUT_REPORT_BUFFER_SIZE 48 //Size of the output report buffer for the controllers #define OUTPUT_REPORT_BUFFER_SIZE 48 //Size of the output report buffer for the controllers
// used in control endpoint header for HCI Commands // used in control endpoint header for HCI Commands
#define bmREQ_HCI_OUT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE #define bmREQ_HCI_OUT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
// used in control endpoint header for HID Commands // used in control endpoint header for HID Commands
#define bmREQ_HIDOUT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_INTERFACE #define bmREQ_HID_OUT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_INTERFACE
#define HID_REQUEST_SET_REPORT 0x09 #define HID_REQUEST_SET_REPORT 0x09
/* Bluetooth HCI states for hci_task() */ /* Bluetooth HCI states for hci_task() */
@ -84,19 +78,15 @@
/* HCI event flags*/ /* HCI event flags*/
#define HCI_FLAG_CMD_COMPLETE 0x01 #define HCI_FLAG_CMD_COMPLETE 0x01
#define HCI_FLAG_CMD_STATUS 0x02 #define HCI_FLAG_CONN_COMPLETE 0x02
#define HCI_FLAG_CONN_COMPLETE 0x04 #define HCI_FLAG_DISCONN_COMPLETE 0x04
#define HCI_FLAG_DISCONN_COMPLETE 0x08 #define HCI_FLAG_REMOTE_NAME_COMPLETE 0x08
#define HCI_FLAG_CONNECT_OK 0x10 #define HCI_FLAG_INCOMING_REQUEST 0x10
#define HCI_FLAG_REMOTE_NAME_COMPLETE 0x20
#define HCI_FLAG_INCOMING_REQUEST 0x40
/*Macros for HCI event flag tests */ /*Macros for HCI event flag tests */
#define hci_cmd_complete (hci_event_flag & HCI_FLAG_CMD_COMPLETE) #define hci_cmd_complete (hci_event_flag & HCI_FLAG_CMD_COMPLETE)
#define hci_cmd_status (hci_event_flag & HCI_FLAG_CMD_STATUS)
#define hci_connect_complete (hci_event_flag & HCI_FLAG_CONN_COMPLETE) #define hci_connect_complete (hci_event_flag & HCI_FLAG_CONN_COMPLETE)
#define hci_disconnect_complete (hci_event_flag & HCI_FLAG_DISCONN_COMPLETE) #define hci_disconnect_complete (hci_event_flag & HCI_FLAG_DISCONN_COMPLETE)
#define hci_connect_ok (hci_event_flag & HCI_FLAG_CONNECT_OK)
#define hci_remote_name_complete (hci_event_flag & HCI_FLAG_REMOTE_NAME_COMPLETE) #define hci_remote_name_complete (hci_event_flag & HCI_FLAG_REMOTE_NAME_COMPLETE)
#define hci_incoming_connect_request (hci_event_flag & HCI_FLAG_INCOMING_REQUEST) #define hci_incoming_connect_request (hci_event_flag & HCI_FLAG_INCOMING_REQUEST)
@ -165,6 +155,8 @@
#define bConfigurationValue 0x01 // Used to set configuration #define bConfigurationValue 0x01 // Used to set configuration
#define PS3_MAX_ENDPOINTS 4 #define PS3_MAX_ENDPOINTS 4
#define WI_SUBCLASS_RF 0x01
#define WI_PROTOCOL_BT 0x01
enum LED enum LED
{ {
@ -321,7 +313,7 @@ enum Rumble
RumbleLow = 0x20, RumbleLow = 0x20,
}; };
class PS3BT : public USBDeviceConfig class PS3BT : public USBDeviceConfig, public UsbConfigXtracter
{ {
public: public:
PS3BT(USB *pUsb); PS3BT(USB *pUsb);
@ -331,6 +323,12 @@ public:
virtual uint8_t Release(); virtual uint8_t Release();
virtual uint8_t Poll(); virtual uint8_t Poll();
virtual uint8_t GetAddress() { return bAddress; }; virtual uint8_t GetAddress() { return bAddress; };
virtual bool isReady() { return bPollEnable; };
// UsbConfigXtracter implementation
virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
bool isWatingForConnection() { return watingForConnection; }; // Use this to indicate when it is ready for a incoming connection
void setBdaddr(uint8_t* BDADDR); void setBdaddr(uint8_t* BDADDR);
void setMoveBdaddr(uint8_t* BDADDR); void setMoveBdaddr(uint8_t* BDADDR);
@ -360,21 +358,35 @@ public:
bool PS3BTConnected;// Variable used to indicate if the normal playstation controller is successfully connected bool PS3BTConnected;// Variable used to indicate if the normal playstation controller is successfully connected
bool PS3MoveBTConnected;// Variable used to indicate if the move controller is successfully connected bool PS3MoveBTConnected;// Variable used to indicate if the move controller is successfully connected
bool PS3NavigationBTConnected;// Variable used to indicate if the navigation controller is successfully connected bool PS3NavigationBTConnected;// Variable used to indicate if the navigation controller is successfully connected
bool ButtonChanged;//Indicate if a button has been changed bool buttonChanged;//Indicate if a button has been changed
bool ButtonPressed;//Indicate if a button has been pressed bool buttonPressed;//Indicate if a button has been pressed
bool buttonReleased;//Indicate if a button has been pressed
protected: protected:
/* mandatory members */ /* mandatory members */
USB *pUsb; USB *pUsb;
uint8_t bAddress; uint8_t bAddress; // device address
EpInfo epInfo[PS3_MAX_ENDPOINTS]; //endpoint info structure EpInfo epInfo[PS3_MAX_ENDPOINTS]; //endpoint info structure
uint8_t bConfNum; // configuration number
uint8_t bNumEP; // total number of endpoints in the configuration
uint32_t qNextPollTime; // next poll time
#define BTD_CONTROL_PIPE 0 // Bluetooth dongles control endpoint
static const uint8_t BTD_EVENT_PIPE; // HCI event endpoint index
static const uint8_t BTD_DATAIN_PIPE; // ACL In endpoint index
static const uint8_t BTD_DATAOUT_PIPE; // ACL Out endpoint index
void PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr);
private: private:
bool bPollEnable; bool bPollEnable;
uint8_t pollInterval;
bool watingForConnection;
/*variables filled from HCI event management */ /*variables filled from HCI event management */
int16_t hci_handle; int16_t hci_handle;
uint8_t disc_bdaddr[6]; // maximum of three discovered devices uint8_t disc_bdaddr[6]; // the bluetooth address is always 6 bytes
uint8_t remote_name[30]; // first 30 chars of remote name uint8_t remote_name[30]; // first 30 chars of remote name
/* variables used by high level HCI task */ /* variables used by high level HCI task */
@ -397,8 +409,8 @@ private:
uint8_t hcibuf[BULK_MAXPKTSIZE];//General purpose buffer for hci data uint8_t hcibuf[BULK_MAXPKTSIZE];//General purpose buffer for hci data
uint8_t l2capinbuf[BULK_MAXPKTSIZE];//General purpose buffer for l2cap in data uint8_t l2capinbuf[BULK_MAXPKTSIZE];//General purpose buffer for l2cap in data
uint8_t l2capoutbuf[BULK_MAXPKTSIZE];//General purpose buffer for l2cap out data uint8_t l2capoutbuf[BULK_MAXPKTSIZE];//General purpose buffer for l2cap out data
uint8_t HIDBuffer[BULK_MAXPKTSIZE];// Used to store HID commands uint8_t HIDBuffer[HID_BUFFERSIZE];// Used to store HID commands
uint8_t HIDMoveBuffer[HIDMOVEBUFFERSIZE];// Used to store HID commands for the Move controller uint8_t HIDMoveBuffer[HID_BUFFERSIZE];// Used to store HID commands for the Move controller
/* L2CAP Channels */ /* L2CAP Channels */
uint8_t control_scid[2];// L2CAP source CID for HID_Control uint8_t control_scid[2];// L2CAP source CID for HID_Control

View file

@ -34,8 +34,11 @@ moveSetRumble KEYWORD2
PS3BTConnected KEYWORD2 PS3BTConnected KEYWORD2
PS3MoveBTConnected KEYWORD2 PS3MoveBTConnected KEYWORD2
PS3NavigationBTConnected KEYWORD2 PS3NavigationBTConnected KEYWORD2
ButtonChanged KEYWORD2 buttonChanged KEYWORD2
ButtonPressed KEYWORD2 buttonPressed KEYWORD2
buttonReleased KEYWORD2
isWatingForConnection KEYWORD2
################################################ ################################################
# Constants and enums (LITERAL1) # Constants and enums (LITERAL1)