Commit 9e34144c authored by Dean Camera's avatar Dean Camera
Browse files

Use puts_P() and printf_P() instead of the normal variants where possible in...

Use puts_P() and printf_P() instead of the normal variants where possible in the Host mode Class Driver demos.
parent 0063f721
...@@ -14,16 +14,16 @@ ...@@ -14,16 +14,16 @@
# code. # code.
all: all:
make -C 'DFU/' clean make -C DFU clean
make -C 'DFU/' all make -C DFU all
make -C 'CDC/' clean make -C CDC clean
make -C 'CDC/' all make -C CDC all
make -C 'TeensyHID/' clean make -C TeensyHID clean
make -C 'TeensyHID/' all make -C TeensyHID all
%: %:
make -C 'DFU/' $@ make -C DFU $@
make -C 'CDC/' $@ make -C CDC $@
make -C 'TeensyHID/' $@ make -C TeensyHID $@
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# code. # code.
%: %:
make -C ClassDriver/ $@ make -C ClassDriver $@
make -C LowLevel/ $@ make -C LowLevel $@
...@@ -85,7 +85,7 @@ int main(void) ...@@ -85,7 +85,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -94,7 +94,7 @@ int main(void) ...@@ -94,7 +94,7 @@ int main(void)
if (HID_Host_ConfigurePipes(&Joystick_HID_Interface, if (HID_Host_ConfigurePipes(&Joystick_HID_Interface,
ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError) ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)
{ {
printf("Attached Device Not a Valid Joystick.\r\n"); puts_P(PSTR("Attached Device Not a Valid Joystick.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -102,7 +102,7 @@ int main(void) ...@@ -102,7 +102,7 @@ int main(void)
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful) if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
{ {
printf("Error Setting Device Configuration.\r\n"); puts_P(PSTR("Error Setting Device Configuration.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -110,13 +110,13 @@ int main(void) ...@@ -110,13 +110,13 @@ int main(void)
if (HID_Host_SetReportProtocol(&Joystick_HID_Interface) != 0) if (HID_Host_SetReportProtocol(&Joystick_HID_Interface) != 0)
{ {
printf("Error Setting Report Protocol Mode or Not a Valid Joystick.\r\n"); puts_P(PSTR("Error Setting Report Protocol Mode or Not a Valid Joystick.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Joystick Enumerated.\r\n"); puts_P(PSTR("Joystick Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
......
...@@ -80,7 +80,7 @@ int main(void) ...@@ -80,7 +80,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -89,7 +89,7 @@ int main(void) ...@@ -89,7 +89,7 @@ int main(void)
if (HID_Host_ConfigurePipes(&Keyboard_HID_Interface, if (HID_Host_ConfigurePipes(&Keyboard_HID_Interface,
ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError) ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)
{ {
printf("Attached Device Not a Valid Keyboard.\r\n"); puts_P(PSTR("Attached Device Not a Valid Keyboard.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -97,7 +97,7 @@ int main(void) ...@@ -97,7 +97,7 @@ int main(void)
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful) if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
{ {
printf("Error Setting Device Configuration.\r\n"); puts_P(PSTR("Error Setting Device Configuration.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -105,13 +105,13 @@ int main(void) ...@@ -105,13 +105,13 @@ int main(void)
if (HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0) if (HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0)
{ {
printf("Could not Set Boot Protocol Mode.\r\n"); puts_P(PSTR("Could not Set Boot Protocol Mode.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Keyboard Enumerated.\r\n"); puts_P(PSTR("Keyboard Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
......
...@@ -85,7 +85,7 @@ int main(void) ...@@ -85,7 +85,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -94,7 +94,7 @@ int main(void) ...@@ -94,7 +94,7 @@ int main(void)
if (HID_Host_ConfigurePipes(&Keyboard_HID_Interface, if (HID_Host_ConfigurePipes(&Keyboard_HID_Interface,
ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError) ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)
{ {
printf("Attached Device Not a Valid Keyboard.\r\n"); puts_P(PSTR("Attached Device Not a Valid Keyboard.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -102,7 +102,7 @@ int main(void) ...@@ -102,7 +102,7 @@ int main(void)
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful) if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
{ {
printf("Error Setting Device Configuration.\r\n"); puts_P(PSTR("Error Setting Device Configuration.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -110,13 +110,13 @@ int main(void) ...@@ -110,13 +110,13 @@ int main(void)
if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0) if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)
{ {
printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n"); puts_P(PSTR("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Keyboard Enumerated.\r\n"); puts_P(PSTR("Keyboard Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
......
...@@ -78,7 +78,7 @@ int main(void) ...@@ -78,7 +78,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -87,7 +87,7 @@ int main(void) ...@@ -87,7 +87,7 @@ int main(void)
if (MIDI_Host_ConfigurePipes(&Keyboard_MIDI_Interface, if (MIDI_Host_ConfigurePipes(&Keyboard_MIDI_Interface,
ConfigDescriptorSize, ConfigDescriptorData) != MIDI_ENUMERROR_NoError) ConfigDescriptorSize, ConfigDescriptorData) != MIDI_ENUMERROR_NoError)
{ {
printf("Attached Device Not a Valid MIDI Class Device.\r\n"); puts_P(PSTR("Attached Device Not a Valid MIDI Class Device.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -95,13 +95,13 @@ int main(void) ...@@ -95,13 +95,13 @@ int main(void)
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful) if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
{ {
printf("Error Setting Device Configuration.\r\n"); puts_P(PSTR("Error Setting Device Configuration.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("MIDI Device Enumerated.\r\n"); puts_P(PSTR("MIDI Device Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
......
...@@ -78,7 +78,7 @@ int main(void) ...@@ -78,7 +78,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -87,7 +87,7 @@ int main(void) ...@@ -87,7 +87,7 @@ int main(void)
if (MS_Host_ConfigurePipes(&FlashDisk_MS_Interface, if (MS_Host_ConfigurePipes(&FlashDisk_MS_Interface,
ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError) ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)
{ {
printf("Attached Device Not a Valid Mass Storage Device.\r\n"); puts_P(PSTR("Attached Device Not a Valid Mass Storage Device.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -95,13 +95,13 @@ int main(void) ...@@ -95,13 +95,13 @@ int main(void)
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful) if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
{ {
printf("Error Setting Device Configuration.\r\n"); puts_P(PSTR("Error Setting Device Configuration.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Mass Storage Device Enumerated.\r\n"); puts_P(PSTR("Mass Storage Device Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
...@@ -111,17 +111,17 @@ int main(void) ...@@ -111,17 +111,17 @@ int main(void)
uint8_t MaxLUNIndex; uint8_t MaxLUNIndex;
if (MS_Host_GetMaxLUN(&FlashDisk_MS_Interface, &MaxLUNIndex)) if (MS_Host_GetMaxLUN(&FlashDisk_MS_Interface, &MaxLUNIndex))
{ {
printf("Error retrieving max LUN index.\r\n"); puts_P(PSTR("Error retrieving max LUN index.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Total LUNs: %d - Using first LUN in device.\r\n", (MaxLUNIndex + 1)); printf_P(PSTR("Total LUNs: %d - Using first LUN in device.\r\n"), (MaxLUNIndex + 1));
if (MS_Host_ResetMSInterface(&FlashDisk_MS_Interface)) if (MS_Host_ResetMSInterface(&FlashDisk_MS_Interface))
{ {
printf("Error resetting Mass Storage interface.\r\n"); puts_P(PSTR("Error resetting Mass Storage interface.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -130,7 +130,7 @@ int main(void) ...@@ -130,7 +130,7 @@ int main(void)
SCSI_Request_Sense_Response_t SenseData; SCSI_Request_Sense_Response_t SenseData;
if (MS_Host_RequestSense(&FlashDisk_MS_Interface, 0, &SenseData) != 0) if (MS_Host_RequestSense(&FlashDisk_MS_Interface, 0, &SenseData) != 0)
{ {
printf("Error retrieving device sense.\r\n"); puts_P(PSTR("Error retrieving device sense.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -138,7 +138,7 @@ int main(void) ...@@ -138,7 +138,7 @@ int main(void)
if (MS_Host_PreventAllowMediumRemoval(&FlashDisk_MS_Interface, 0, true)) if (MS_Host_PreventAllowMediumRemoval(&FlashDisk_MS_Interface, 0, true))
{ {
printf("Error setting Prevent Device Removal bit.\r\n"); puts_P(PSTR("Error setting Prevent Device Removal bit.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -147,15 +147,15 @@ int main(void) ...@@ -147,15 +147,15 @@ int main(void)
SCSI_Inquiry_Response_t InquiryData; SCSI_Inquiry_Response_t InquiryData;
if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, 0, &InquiryData)) if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, 0, &InquiryData))
{ {
printf("Error retrieving device Inquiry data.\r\n"); puts_P(PSTR("Error retrieving device Inquiry data.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Vendor \"%.8s\", Product \"%.16s\"\r\n", InquiryData.VendorID, InquiryData.ProductID); printf_P(PSTR("Vendor \"%.8s\", Product \"%.16s\"\r\n"), InquiryData.VendorID, InquiryData.ProductID);
printf("Waiting until ready...\r\n"); puts_P(PSTR("Waiting until ready...\r\n"));
for (;;) for (;;)
{ {
...@@ -167,37 +167,37 @@ int main(void) ...@@ -167,37 +167,37 @@ int main(void)
/* Check if an error other than a logical command error (device busy) received */ /* Check if an error other than a logical command error (device busy) received */
if (ErrorCode != MS_ERROR_LOGICAL_CMD_FAILED) if (ErrorCode != MS_ERROR_LOGICAL_CMD_FAILED)
{ {
printf("Error waiting for device to be ready.\r\n"); puts_P(PSTR("Error waiting for device to be ready.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
} }
printf("Retrieving Capacity... "); puts_P(PSTR("Retrieving Capacity...\r\n"));
SCSI_Capacity_t DiskCapacity; SCSI_Capacity_t DiskCapacity;
if (MS_Host_ReadDeviceCapacity(&FlashDisk_MS_Interface, 0, &DiskCapacity)) if (MS_Host_ReadDeviceCapacity(&FlashDisk_MS_Interface, 0, &DiskCapacity))
{ {
printf("Error retrieving device capacity.\r\n"); puts_P(PSTR("Error retrieving device capacity.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("%lu blocks of %lu bytes.\r\n", DiskCapacity.Blocks, DiskCapacity.BlockSize); printf_P(PSTR("%lu blocks of %lu bytes.\r\n"), DiskCapacity.Blocks, DiskCapacity.BlockSize);
uint8_t BlockBuffer[DiskCapacity.BlockSize]; uint8_t BlockBuffer[DiskCapacity.BlockSize];
if (MS_Host_ReadDeviceBlocks(&FlashDisk_MS_Interface, 0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer)) if (MS_Host_ReadDeviceBlocks(&FlashDisk_MS_Interface, 0, 0x00000000, 1, DiskCapacity.BlockSize, BlockBuffer))
{ {
printf("Error reading device block.\r\n"); puts_P(PSTR("Error reading device block.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("\r\nContents of first block:\r\n"); puts_P(PSTR("\r\nContents of first block:"));
for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++) for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++)
{ {
...@@ -210,7 +210,7 @@ int main(void) ...@@ -210,7 +210,7 @@ int main(void)
printf_P(PSTR("%.2X "), CurrByte); printf_P(PSTR("%.2X "), CurrByte);
} }
printf(" "); printf_P(PSTR(" "));
/* Print out the 16 bytes of the chunk in ASCII format */ /* Print out the 16 bytes of the chunk in ASCII format */
for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++) for (uint8_t ByteOffset = 0; ByteOffset < (1 << 4); ByteOffset++)
...@@ -219,7 +219,7 @@ int main(void) ...@@ -219,7 +219,7 @@ int main(void)
putchar(isprint(CurrByte) ? CurrByte : '.'); putchar(isprint(CurrByte) ? CurrByte : '.');
} }
printf("\r\n"); printf_P(PSTR("\r\n"));
} }
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
......
...@@ -80,7 +80,7 @@ int main(void) ...@@ -80,7 +80,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -89,7 +89,7 @@ int main(void) ...@@ -89,7 +89,7 @@ int main(void)
if (HID_Host_ConfigurePipes(&Mouse_HID_Interface, if (HID_Host_ConfigurePipes(&Mouse_HID_Interface,
ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError) ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)
{ {
printf("Attached Device Not a Valid Mouse.\r\n"); puts_P(PSTR("Attached Device Not a Valid Mouse.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -97,7 +97,7 @@ int main(void) ...@@ -97,7 +97,7 @@ int main(void)
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful) if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
{ {
printf("Error Setting Device Configuration.\r\n"); puts_P(PSTR("Error Setting Device Configuration.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
...@@ -105,13 +105,13 @@ int main(void) ...@@ -105,13 +105,13 @@ int main(void)
if (HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0) if (HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)
{ {
printf("Could not Set Boot Protocol Mode.\r\n"); puts_P(PSTR("Could not Set Boot Protocol Mode.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_HostState = HOST_STATE_WaitForDeviceRemoval; USB_HostState = HOST_STATE_WaitForDeviceRemoval;
break; break;
} }
printf("Mouse Enumerated.\r\n"); puts_P(PSTR("Mouse Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_HostState = HOST_STATE_Configured; USB_HostState = HOST_STATE_Configured;
break; break;
......
...@@ -85,7 +85,7 @@ int main(void) ...@@ -85,7 +85,7 @@ int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n");