Add missing SVN eol-style properties to source files to prevent mixed end-of-line...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / XPROGProtocol.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
index ffc07ad..72cc536 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -70,8 +70,8 @@ void XPROGProtocol_SetMode(void)
 
        XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;
 
 
        XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;
 

-       Endpoint_Write_Byte(CMD_XPROG_SETMODE);
-       Endpoint_Write_Byte((SetMode_XPROG_Params.Protocol != XPRG_PROTOCOL_JTAG) ? STATUS_CMD_OK : STATUS_CMD_FAILED);
+       Endpoint_Write_8(CMD_XPROG_SETMODE);
+       Endpoint_Write_8((SetMode_XPROG_Params.Protocol != XPRG_PROTOCOL_JTAG) ? STATUS_CMD_OK : STATUS_CMD_FAILED);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -80,7 +80,7 @@ void XPROGProtocol_SetMode(void)
  */
 void XPROGProtocol_Command(void)
 {
  */
 void XPROGProtocol_Command(void)
 {

-       uint8_t XPROGCommand = Endpoint_Read_Byte();
+       uint8_t XPROGCommand = Endpoint_Read_8();

 
        switch (XPROGCommand)
        {
 
        switch (XPROGCommand)
        {


@@ -122,9 +122,9 @@ static void XPROGProtocol_EnterXPROGMode(void)
        else if (XPROG_SelectedProtocol == XPRG_PROTOCOL_TPI)
          NVMBusEnabled = TINYNVM_EnableTPI();
 
        else if (XPROG_SelectedProtocol == XPRG_PROTOCOL_TPI)
          NVMBusEnabled = TINYNVM_EnableTPI();
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_ENTER_PROGMODE);
-       Endpoint_Write_Byte(NVMBusEnabled ? XPRG_ERR_OK : XPRG_ERR_FAILED);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_ENTER_PROGMODE);
+       Endpoint_Write_8(NVMBusEnabled ? XPRG_ERR_OK : XPRG_ERR_FAILED);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -148,9 +148,9 @@ static void XPROGProtocol_LeaveXPROGMode(void)
        ISPTarget_ConfigureRescueClock();
        #endif
 
        ISPTarget_ConfigureRescueClock();
        #endif
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_LEAVE_PROGMODE);
-       Endpoint_Write_Byte(XPRG_ERR_OK);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_LEAVE_PROGMODE);
+       Endpoint_Write_8(XPRG_ERR_OK);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -224,9 +224,9 @@ static void XPROGProtocol_Erase(void)
                  ReturnStatus = XPRG_ERR_TIMEOUT;
        }
 
                  ReturnStatus = XPRG_ERR_TIMEOUT;
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_ERASE);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_ERASE);
+       Endpoint_Write_8(ReturnStatus);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -317,9 +317,9 @@ static void XPROGProtocol_WriteMemory(void)
                }
        }
 
                }
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_WRITE_MEM);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_WRITE_MEM);
+       Endpoint_Write_8(ReturnStatus);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -360,9 +360,9 @@ static void XPROGProtocol_ReadMemory(void)
                  ReturnStatus = XPRG_ERR_TIMEOUT;
        }
 
                  ReturnStatus = XPRG_ERR_TIMEOUT;
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_READ_MEM);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_READ_MEM);
+       Endpoint_Write_8(ReturnStatus);

 
        if (ReturnStatus == XPRG_ERR_OK)
          Endpoint_Write_Stream_LE(ReadBuffer, ReadMemory_XPROG_Params.Length, NULL);
 
        if (ReturnStatus == XPRG_ERR_OK)
          Endpoint_Write_Stream_LE(ReadBuffer, ReadMemory_XPROG_Params.Length, NULL);


@@ -418,14 +418,14 @@ static void XPROGProtocol_ReadCRC(void)
                ReturnStatus = XPRG_ERR_FAILED;
        }
 
                ReturnStatus = XPRG_ERR_FAILED;
        }
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_CRC);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_CRC);
+       Endpoint_Write_8(ReturnStatus);

 
        if (ReturnStatus == XPRG_ERR_OK)
        {
 
        if (ReturnStatus == XPRG_ERR_OK)
        {

-               Endpoint_Write_Byte(MemoryCRC >> 16);
-               Endpoint_Write_Word_LE(MemoryCRC & 0xFFFF);
+               Endpoint_Write_8(MemoryCRC >> 16);
+               Endpoint_Write_16_LE(MemoryCRC & 0xFFFF);

        }
 
        Endpoint_ClearIN();
        }
 
        Endpoint_ClearIN();


@@ -438,22 +438,22 @@ static void XPROGProtocol_SetParam(void)
 {
        uint8_t ReturnStatus = XPRG_ERR_OK;
 
 {
        uint8_t ReturnStatus = XPRG_ERR_OK;
 

-       uint8_t XPROGParam = Endpoint_Read_Byte();
+       uint8_t XPROGParam = Endpoint_Read_8();

 
        /* Determine which parameter is being set, store the new parameter value */
        switch (XPROGParam)
        {
                case XPRG_PARAM_NVMBASE:
 
        /* Determine which parameter is being set, store the new parameter value */
        switch (XPROGParam)
        {
                case XPRG_PARAM_NVMBASE:

-                       XPROG_Param_NVMBase = Endpoint_Read_DWord_BE();
+                       XPROG_Param_NVMBase = Endpoint_Read_32_BE();

                        break;
                case XPRG_PARAM_EEPPAGESIZE:
                        break;
                case XPRG_PARAM_EEPPAGESIZE:

-                       XPROG_Param_EEPageSize = Endpoint_Read_Word_BE();
+                       XPROG_Param_EEPageSize = Endpoint_Read_16_BE();

                        break;
                case XPRG_PARAM_NVMCMD_REG:
                        break;
                case XPRG_PARAM_NVMCMD_REG:

-                       XPROG_Param_NVMCMDRegAddr = Endpoint_Read_Byte();
+                       XPROG_Param_NVMCMDRegAddr = Endpoint_Read_8();

                        break;
                case XPRG_PARAM_NVMCSR_REG:
                        break;
                case XPRG_PARAM_NVMCSR_REG:

-                       XPROG_Param_NVMCSRRegAddr = Endpoint_Read_Byte();
+                       XPROG_Param_NVMCSRRegAddr = Endpoint_Read_8();

                        break;
                default:
                        ReturnStatus = XPRG_ERR_FAILED;
                        break;
                default:
                        ReturnStatus = XPRG_ERR_FAILED;


@@ -464,9 +464,9 @@ static void XPROGProtocol_SetParam(void)
        Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 
        Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
 

-       Endpoint_Write_Byte(CMD_XPROG);
-       Endpoint_Write_Byte(XPRG_CMD_SET_PARAM);
-       Endpoint_Write_Byte(ReturnStatus);
+       Endpoint_Write_8(CMD_XPROG);
+       Endpoint_Write_8(XPRG_CMD_SET_PARAM);
+       Endpoint_Write_8(ReturnStatus);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }