Add extra tests to the MassStorage device demo and class driver for validating comman...

[pub/USBasp.git] / Projects / MissileLauncher / MissileLauncher.c

diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c
index bd542ee..88902cf 100644 (file)
--- a/Projects/MissileLauncher/MissileLauncher.c
+++ b/Projects/MissileLauncher/MissileLauncher.c
@@ -137,8 +137,9 @@ void SetupHardware(void)
 void Read_Joystick_Status(void)\r
 {\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
+       uint8_t Buttons_LCL   = Buttons_GetStatus();\r
 \r
-       if (BUTTONS_BUTTON1 && Buttons_GetStatus())\r
+       if (Buttons_LCL & BUTTONS_BUTTON1)\r
          Send_Command(CMD_FIRE);\r
        else if (JoyStatus_LCL & JOY_UP)\r
          Send_Command(CMD_UP);\r
@@ -154,8 +155,8 @@ void Read_Joystick_Status(void)
 \r
 /** Lower level send routine, copies report into a larger buffer and sends.\r
  *\r
- *  \param Report  Report data to send.\r
- *  \param ReportSize  Report length in bytes.\r
+ *  \param[in] Report  Report data to send.\r
+ *  \param[in] ReportSize  Report length in bytes.\r
  */\r
 void Send_Command_Report(uint8_t *Report, uint16_t ReportSize)\r
 {\r
@@ -163,9 +164,9 @@ void Send_Command_Report(uint8_t *Report, uint16_t ReportSize)
        WriteNextReport(CmdBuffer, ReportSize);\r
 }\r
 \r
-/** Send one of the CMD_* command constants listed above.\r
+/** Sends one of the CMD_* command constants to the attached device.\r
  *\r
- *  \param Command  One of the command constants.\r
+ *  \param[in] Command  One of the command constants.\r
  */\r
 void Send_Command(uint8_t* Command)\r
 {\r
@@ -248,8 +249,8 @@ void DiscardNextReport(void)
 \r
 /** Writes a report to the attached device.\r
  *\r
- *  \param ReportOUTData  Buffer containing the report to send to the device\r
- *  \param ReportLength  Length of the report to send\r
+ *  \param[in] ReportOUTData  Buffer containing the report to send to the device\r
+ *  \param[in] ReportLength  Length of the report to send\r
  */\r
 void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)\r
 {\r
@@ -285,7 +286,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
                /* Class specific request to send a HID report to the device */\r
                USB_ControlRequest = (USB_Request_Header_t)\r
                        {\r
-                               .bmRequestType = 0x21,\r
+                               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
                                .bRequest      = 0x09,\r
                                .wValue        = 0x02,\r
                                .wIndex        = 0x01,\r
@@ -318,7 +319,7 @@ void HID_Host_Task(void)
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                        }\r
 \r
@@ -329,7 +330,7 @@ void HID_Host_Task(void)
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                \r
                                /* Wait until USB device disconnected */\r
-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                break;\r
                        }\r
                        \r