Commit 3705330d authored by Dean Camera's avatar Dean Camera
Browse files

Use -pedantic compile time option to find and correct several minor code errors.

parent 307ba254
...@@ -42,11 +42,11 @@ static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength) ...@@ -42,11 +42,11 @@ static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength)
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_DEVICE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_DEVICE),
bRequest: 0, .bRequest = 0,
wValue: 0, .wValue = 0,
wIndex: 0, .wIndex = 0,
wLength: sizeof(CommandBuffer) .wLength = sizeof(CommandBuffer)
}; };
memset(CommandBuffer, 0x00, sizeof(CommandBuffer)); memset(CommandBuffer, 0x00, sizeof(CommandBuffer));
......
...@@ -81,11 +81,11 @@ uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize) ...@@ -81,11 +81,11 @@ uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
bRequest: REQ_GetDeviceID, .bRequest = REQ_GetDeviceID,
wValue: 0, .wValue = 0,
wIndex: 0, .wIndex = 0,
wLength: sizeof(DeviceIDStringLength), .wLength = sizeof(DeviceIDStringLength),
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
...@@ -149,11 +149,11 @@ uint8_t Printer_SoftReset(void) ...@@ -149,11 +149,11 @@ uint8_t Printer_SoftReset(void)
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
bRequest: REQ_SoftReset, .bRequest = REQ_SoftReset,
wValue: 0, .wValue = 0,
wIndex: 0, .wIndex = 0,
wLength: 0, .wLength = 0,
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
......
...@@ -174,11 +174,11 @@ void USB_Printer_Host(void) ...@@ -174,11 +174,11 @@ void USB_Printer_Host(void)
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE),
bRequest: REQ_SetInterface, .bRequest = REQ_SetInterface,
wValue: PrinterAltSetting, .wValue = PrinterAltSetting,
wIndex: PrinterInterfaceNumber, .wIndex = PrinterInterfaceNumber,
wLength: 0, .wLength = 0,
}; };
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
static inline void Joystick_Init(void) static inline void Joystick_Init(void)
{ {
// TODO: Initialize joystick port pins as inputs with pull-ups // TODO: Initialize joystick port pins as inputs with pull-ups
}; }
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
{ {
DDRD &= ~JOY_MASK; DDRD &= ~JOY_MASK;
PORTD |= JOY_MASK; PORTD |= JOY_MASK;
}; }
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
PORTF |= JOY_FMASK; PORTF |= JOY_FMASK;
PORTC |= JOY_CMASK; PORTC |= JOY_CMASK;
}; }
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
PORTB |= JOY_BMASK; PORTB |= JOY_BMASK;
PORTE |= JOY_EMASK; PORTE |= JOY_EMASK;
}; }
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
DDRB &= ~JOY_BMASK; DDRB &= ~JOY_BMASK;
PORTB |= JOY_BMASK; PORTB |= JOY_BMASK;
}; }
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
PORTB |= JOY_BMASK; PORTB |= JOY_BMASK;
PORTE |= JOY_EMASK; PORTE |= JOY_EMASK;
}; }
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
......
...@@ -135,11 +135,11 @@ uint8_t PRNT_Host_SetBidirectionalMode(USB_ClassInfo_PRNT_Host_t* const PRNTInte ...@@ -135,11 +135,11 @@ uint8_t PRNT_Host_SetBidirectionalMode(USB_ClassInfo_PRNT_Host_t* const PRNTInte
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE),
bRequest: REQ_SetInterface, .bRequest = REQ_SetInterface,
wValue: PRNTInterfaceInfo->State.AlternateSetting, .wValue = PRNTInterfaceInfo->State.AlternateSetting,
wIndex: PRNTInterfaceInfo->State.InterfaceNumber, .wIndex = PRNTInterfaceInfo->State.InterfaceNumber,
wLength: 0, .wLength = 0,
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
...@@ -155,11 +155,11 @@ uint8_t PRNT_Host_GetPortStatus(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceIn ...@@ -155,11 +155,11 @@ uint8_t PRNT_Host_GetPortStatus(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceIn
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
bRequest: REQ_GetPortStatus, .bRequest = REQ_GetPortStatus,
wValue: 0, .wValue = 0,
wIndex: PRNTInterfaceInfo->State.InterfaceNumber, .wIndex = PRNTInterfaceInfo->State.InterfaceNumber,
wLength: sizeof(uint8_t), .wLength = sizeof(uint8_t),
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
...@@ -171,11 +171,11 @@ uint8_t PRNT_Host_SoftReset(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ...@@ -171,11 +171,11 @@ uint8_t PRNT_Host_SoftReset(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
bRequest: REQ_SoftReset, .bRequest = REQ_SoftReset,
wValue: 0, .wValue = 0,
wIndex: PRNTInterfaceInfo->State.InterfaceNumber, .wIndex = PRNTInterfaceInfo->State.InterfaceNumber,
wLength: 0, .wLength = 0,
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
...@@ -215,11 +215,11 @@ uint8_t PRNT_Host_GetDeviceID(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo ...@@ -215,11 +215,11 @@ uint8_t PRNT_Host_GetDeviceID(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
bRequest: REQ_GetDeviceID, .bRequest = REQ_GetDeviceID,
wValue: 0, .wValue = 0,
wIndex: PRNTInterfaceInfo->State.InterfaceNumber, .wIndex = PRNTInterfaceInfo->State.InterfaceNumber,
wLength: sizeof(DeviceIDStringLength), .wLength = sizeof(DeviceIDStringLength),
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
......
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
{ {
uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size; uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;
*CurrConfigLoc += CurrDescriptorSize; *((uint8_t**)CurrConfigLoc) += CurrDescriptorSize;
*BytesRem -= CurrDescriptorSize; *BytesRem -= CurrDescriptorSize;
} }
......
...@@ -296,11 +296,11 @@ uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr) ...@@ -296,11 +296,11 @@ uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE), .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
bRequest: REQ_GetDescriptor, .bRequest = REQ_GetDescriptor,
wValue: (DTYPE_Device << 8), .wValue = (DTYPE_Device << 8),
wIndex: 0, .wIndex = 0,
wLength: sizeof(USB_Descriptor_Device_t), .wLength = sizeof(USB_Descriptor_Device_t),
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
...@@ -312,11 +312,11 @@ uint8_t USB_Host_GetDeviceStringDescriptor(uint8_t Index, void* const Buffer, ui ...@@ -312,11 +312,11 @@ uint8_t USB_Host_GetDeviceStringDescriptor(uint8_t Index, void* const Buffer, ui
{ {
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE), .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
bRequest: REQ_GetDescriptor, .bRequest = REQ_GetDescriptor,
wValue: (DTYPE_String << 8) | Index, .wValue = (DTYPE_String << 8) | Index,
wIndex: 0, .wIndex = 0,
wLength: BufferLength, .wLength = BufferLength,
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
......
...@@ -1032,7 +1032,7 @@ ...@@ -1032,7 +1032,7 @@
return (4 << EPSIZE0); return (4 << EPSIZE0);
else else
return (5 << EPSIZE0); return (5 << EPSIZE0);
}; }
#endif #endif
......
...@@ -218,7 +218,14 @@ static void PDIProtocol_ReadMemory(void) ...@@ -218,7 +218,14 @@ static void PDIProtocol_ReadMemory(void)
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
// TODO: Send read command here via PDI protocol if (ReadMemory_XPROG_Params.MemoryType == XPRG_MEM_TYPE_USERSIG)
{
PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));
PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CMD);
PDITarget_SendByte(NVM_CMD_READUSERSIG);
}
Endpoint_Write_Byte(CMD_XPROG); Endpoint_Write_Byte(CMD_XPROG);
Endpoint_Write_Byte(XPRG_CMD_READ_MEM); Endpoint_Write_Byte(XPRG_CMD_READ_MEM);
...@@ -233,15 +240,46 @@ static void PDIProtocol_ReadMemory(void) ...@@ -233,15 +240,46 @@ static void PDIProtocol_ReadMemory(void)
static void PDIProtocol_ReadCRC(void) static void PDIProtocol_ReadCRC(void)
{ {
uint8_t ReturnStatus = XPRG_ERR_OK; uint8_t ReturnStatus = XPRG_ERR_OK;
uint8_t CRCType = Endpoint_Read_Byte();
struct
{
uint8_t CRCType;
} ReadCRC_XPROG_Params;
Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params));
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
uint32_t MemoryCRC = 0; uint32_t MemoryCRC = 0;
uint8_t CRCReadCommand;
if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_APP)
CRCReadCommand = NVM_CMD_APPCRC;
else if (ReadCRC_XPROG_Params.CRCType == XPRG_CRC_BOOT)
CRCReadCommand = NVM_CMD_BOOTCRC;
else
CRCReadCommand = NVM_CMD_FLASHCRC;
/* Set the NVM command to the correct CRC read command */
PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));
PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CMD);
PDITarget_SendByte(CRCReadCommand);
/* Set CMDEX bit in NVM CTRLA register to start the CRC generation */
PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_1BYTE << 2));
PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_CTRLA);
PDITarget_SendByte(1 << 0);
/* Wait until the NVM bus and controller is no longer busy */
PDITarget_WaitWhileNVMBusBusy();
PDITarget_WaitWhileNVMControllerBusy();
// TODO: Read device CRC for desired memory via PDI protocol /* Read the three byte generated CRC value */
PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_3BYTES << 2));
PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_DAT0);
MemoryCRC = PDITarget_ReceiveByte();
MemoryCRC |= ((uint16_t)PDITarget_ReceiveByte() << 8);
MemoryCRC |= ((uint32_t)PDITarget_ReceiveByte() << 16);
Endpoint_Write_Byte(CMD_XPROG); Endpoint_Write_Byte(CMD_XPROG);
Endpoint_Write_Byte(XPRG_CMD_CRC); Endpoint_Write_Byte(XPRG_CMD_CRC);
......
...@@ -304,7 +304,7 @@ void PDITarget_WaitWhileNVMControllerBusy(void) ...@@ -304,7 +304,7 @@ void PDITarget_WaitWhileNVMControllerBusy(void)
for (;;) for (;;)
{ {
PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_1BYTE << 2)); PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_1BYTE << 2));
PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_BASE | 0x0F); PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_STATUS);
if (!(PDITarget_ReceiveByte() & (1 << 7))) if (!(PDITarget_ReceiveByte() & (1 << 7)))
return; return;
......
...@@ -104,6 +104,23 @@ ...@@ -104,6 +104,23 @@
#define USER_SIGNATURE_BASE 0x008E0400 #define USER_SIGNATURE_BASE 0x008E0400
#define DATAMEM_NVM_BASE 0x01C0 #define DATAMEM_NVM_BASE 0x01C0
#define DATAMEM_NVM_ADDR0 (DATAMEM_NVM_BASE | 0x00)
#define DATAMEM_NVM_ADDR1 (DATAMEM_NVM_BASE | 0x01)
#define DATAMEM_NVM_ADDR2 (DATAMEM_NVM_BASE | 0x02)
#define DATAMEM_NVM_DAT0 (DATAMEM_NVM_BASE | 0x04)
#define DATAMEM_NVM_DAT1 (DATAMEM_NVM_BASE | 0x05)
#define DATAMEM_NVM_DAT2 (DATAMEM_NVM_BASE | 0x06)
#define DATAMEM_NVM_CMD (DATAMEM_NVM_BASE | 0x0A)
#define DATAMEM_NVM_CTRLA (DATAMEM_NVM_BASE | 0x0B)
#define DATAMEM_NVM_CTRLB (DATAMEM_NVM_BASE | 0x0C)
#define DATAMEM_NVM_INTCTRL (DATAMEM_NVM_BASE | 0x0D)
#define DATAMEM_NVM_STATUS (DATAMEM_NVM_BASE | 0x0F)
#define DATAMEM_NVM_LOCKBITS (DATAMEM_NVM_BASE | 0x10)
#define NVM_CMD_APPCRC 0x38
#define NVM_CMD_BOOTCRC 0x39
#define NVM_CMD_FLASHCRC 0x78
#define NVM_CMD_READUSERSIG 0x03
/* Function Prototypes: */ /* Function Prototypes: */
void PDITarget_EnableTargetPDI(void); void PDITarget_EnableTargetPDI(void);
...@@ -112,8 +129,8 @@ ...@@ -112,8 +129,8 @@
uint8_t PDITarget_ReceiveByte(void); uint8_t PDITarget_ReceiveByte(void);
void PDITarget_SendBreak(void); void PDITarget_SendBreak(void);
void PDITarget_SendAddress(uint32_t Address); void PDITarget_SendAddress(uint32_t Address);
bool PDITarget_WaitWhileNVMBusBusy(void); bool PDITarget_WaitWhileNVMBusBusy(void);
void PDITarget_WaitWhileNVMControllerBusy(void); void PDITarget_WaitWhileNVMControllerBusy(void);
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment