Remove serial driver use from the AVRISP project now that it is no longer needed.

[pub/USBasp.git] / Projects / AVRISP / Lib / V2Protocol.c

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index c0028f7..4f7904a 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -50,7 +50,7 @@ bool MustSetAddress;
 void V2Protocol_ProcessCommand(void)\r
 {\r
        uint8_t V2Command = Endpoint_Read_Byte();\r
 void V2Protocol_ProcessCommand(void)\r
 {\r
        uint8_t V2Command = Endpoint_Read_Byte();\r

-                 \r
+       \r

        switch (V2Command)\r
        {\r
                case CMD_SIGN_ON:\r
        switch (V2Command)\r
        {\r
                case CMD_SIGN_ON:\r


@@ -66,6 +66,7 @@ void V2Protocol_ProcessCommand(void)
                case CMD_RESET_PROTECTION:\r
                        V2Protocol_ResetProtection();\r
                        break;\r
                case CMD_RESET_PROTECTION:\r
                        V2Protocol_ResetProtection();\r
                        break;\r

+#if defined(ENABLE_ISP_PROTOCOL)\r

                case CMD_ENTER_PROGMODE_ISP:\r
                        ISPProtocol_EnterISPMode();\r
                        break;\r
                case CMD_ENTER_PROGMODE_ISP:\r
                        ISPProtocol_EnterISPMode();\r
                        break;\r


@@ -83,10 +84,6 @@ void V2Protocol_ProcessCommand(void)
                case CMD_CHIP_ERASE_ISP:\r
                        ISPProtocol_ChipErase();\r
                        break;\r
                case CMD_CHIP_ERASE_ISP:\r
                        ISPProtocol_ChipErase();\r
                        break;\r

-#if defined(ENABLE_XPROG_PROTOCOL)\r
-               case CMD_XPROG_SETMODE:\r
-                       V2Protocol_XPROG_SetMode();\r
-#endif\r

                case CMD_READ_FUSE_ISP:\r
                case CMD_READ_LOCK_ISP:\r
                case CMD_READ_SIGNATURE_ISP:\r
                case CMD_READ_FUSE_ISP:\r
                case CMD_READ_LOCK_ISP:\r
                case CMD_READ_SIGNATURE_ISP:\r


@@ -100,6 +97,15 @@ void V2Protocol_ProcessCommand(void)
                case CMD_SPI_MULTI:\r
                        ISPProtocol_SPIMulti();\r
                        break;\r
                case CMD_SPI_MULTI:\r
                        ISPProtocol_SPIMulti();\r
                        break;\r

+#endif\r
+#if defined(ENABLE_XPROG_PROTOCOL)\r
+               case CMD_XPROG_SETMODE:\r
+                       XPROGProtocol_SetMode();\r
+                       break;\r
+               case CMD_XPROG:\r
+                       XPROGProtocol_Command();\r
+                       break;\r
+#endif\r

                default:\r
                        V2Protocol_UnknownCommand(V2Command);\r
                        break;\r
                default:\r
                        V2Protocol_UnknownCommand(V2Command);\r
                        break;\r


@@ -114,7 +120,7 @@ void V2Protocol_ProcessCommand(void)
  *\r
  *  \param[in] V2Command  Issued V2 Protocol command byte from the host\r
  */\r
  *\r
  *  \param[in] V2Command  Issued V2 Protocol command byte from the host\r
  */\r

-static void V2Protocol_UnknownCommand(uint8_t V2Command)\r
+static void V2Protocol_UnknownCommand(const uint8_t V2Command)\r

 {\r
        /* Discard all incoming data */\r
        while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)\r
 {\r
        /* Discard all incoming data */\r
        while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)\r


@@ -163,7 +169,7 @@ static void V2Protocol_ResetProtection(void)
  *\r
  *  \param[in] V2Command  Issued V2 Protocol command byte from the host\r
  */\r
  *\r
  *  \param[in] V2Command  Issued V2 Protocol command byte from the host\r
  */\r

-static void V2Protocol_GetSetParam(uint8_t V2Command)\r
+static void V2Protocol_GetSetParam(const uint8_t V2Command)\r

 {\r
        uint8_t ParamID = Endpoint_Read_Byte();\r
        uint8_t ParamValue;\r
 {\r
        uint8_t ParamID = Endpoint_Read_Byte();\r
        uint8_t ParamValue;\r