Minor demo/project documentation and style fixes.

pull/1469/head
Dean Camera 13 years ago
parent 55aadf97d5
commit 3309c00a99

@ -41,7 +41,7 @@
* *
* This routine checks to ensure that the attached device's VID and PID matches Google's for Android devices. * This routine checks to ensure that the attached device's VID and PID matches Google's for Android devices.
* *
* \return An error code from the \ref BluetoothHost_GetDeviceDescriptorDataCodes_t enum. * \return An error code from the \ref AndroidHost_GetDeviceDescriptorDataCodes_t enum.
*/ */
uint8_t ProcessDeviceDescriptor(void) uint8_t ProcessDeviceDescriptor(void)
{ {
@ -55,9 +55,9 @@ uint8_t ProcessDeviceDescriptor(void)
if (DeviceDescriptor.Header.Type != DTYPE_Device) if (DeviceDescriptor.Header.Type != DTYPE_Device)
return InvalidDeviceDataReturned; return InvalidDeviceDataReturned;
/* Validate returned device Class, SubClass and Protocol values against the Bluetooth spec values */ /* Validate returned device Vendor ID against the Android ADK spec values */
if (DeviceDescriptor.VendorID != ANDROID_VENDOR_ID) if (DeviceDescriptor.VendorID != ANDROID_VENDOR_ID)
return IncorrectAndroidDevice; return IncorrectAndroidDevice;
/* Check the product ID to determine if the Android device is in accessory mode */ /* Check the product ID to determine if the Android device is in accessory mode */
if ((DeviceDescriptor.ProductID != ANDROID_ACCESSORY_PRODUCT_ID) && if ((DeviceDescriptor.ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&

@ -68,13 +68,13 @@ static uint8_t MassStore_SendCommand(MS_CommandBlockWrapper_t* const SCSICommand
{ {
uint8_t ErrorCode = PIPE_RWSTREAM_NoError; uint8_t ErrorCode = PIPE_RWSTREAM_NoError;
/* Each transmission should have a unique tag value, increment before use */
SCSICommandBlock->Tag = ++MassStore_Tag;
/* Wrap Tag value when invalid - MS class defines tag values of 0 and 0xFFFFFFFF to be invalid */ /* Wrap Tag value when invalid - MS class defines tag values of 0 and 0xFFFFFFFF to be invalid */
if (MassStore_Tag == 0xFFFFFFFF) if (++MassStore_Tag == 0xFFFFFFFF)
MassStore_Tag = 1; MassStore_Tag = 1;
/* Each transmission should have a unique tag value, increment before use */
SCSICommandBlock->Tag = MassStore_Tag;
/* Select the OUT data pipe for CBW transmission */ /* Select the OUT data pipe for CBW transmission */
Pipe_SelectPipe(MASS_STORE_DATA_OUT_PIPE); Pipe_SelectPipe(MASS_STORE_DATA_OUT_PIPE);
Pipe_Unfreeze(); Pipe_Unfreeze();
@ -95,7 +95,7 @@ static uint8_t MassStore_SendCommand(MS_CommandBlockWrapper_t* const SCSICommand
/* Freeze pipe after use */ /* Freeze pipe after use */
Pipe_Freeze(); Pipe_Freeze();
/* Send data if any */ /* Send data if any has been given */
if ((BufferPtr != NULL) && if ((BufferPtr != NULL) &&
((ErrorCode = MassStore_SendReceiveData(SCSICommandBlock, BufferPtr)) != PIPE_READYWAIT_NoError)) ((ErrorCode = MassStore_SendReceiveData(SCSICommandBlock, BufferPtr)) != PIPE_READYWAIT_NoError))
{ {

@ -64,16 +64,16 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
}; };
/** Circular buffer to hold data from the host before it is sent to the device via the serial port. */ /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
RingBuffer_t USBtoUART_Buffer; RingBuffer_t USBtoUART_Buffer;
/** Underlying data buffer for \ref USBtoUART_Buffer, where the stored bytes are located. */ /** Underlying data buffer for \ref USBtoUART_Buffer, where the stored bytes are located. */
static uint8_t USBtoUART_Buffer_Data[128]; static uint8_t USBtoUART_Buffer_Data[128];
/** Circular buffer to hold data from the serial port before it is sent to the host. */ /** Circular buffer to hold data from the serial port before it is sent to the host. */
RingBuffer_t UARTtoUSB_Buffer; RingBuffer_t UARTtoUSB_Buffer;
/** Underlying data buffer for \ref UARTtoUSB_Buffer, where the stored bytes are located. */ /** Underlying data buffer for \ref UARTtoUSB_Buffer, where the stored bytes are located. */
static uint8_t UARTtoUSB_Buffer_Data[128]; static uint8_t UARTtoUSB_Buffer_Data[128];
/** Main program entry point. This routine contains the overall program flow, including initial /** Main program entry point. This routine contains the overall program flow, including initial

Loading…
Cancel
Save