Fixed misnamed SI_Host_USBTask() and SI_Host_ConfigurePipes() functions.

diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
index d5ed71a..fb3a784 100644 (file)
--- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
+++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
@@ -85,8 +85,8 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (SI_Host_ConfigurePipes(&DigitalCamera_SI_Interface,\r
-                                                          ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError)\r
+                               if (SImage_Host_ConfigurePipes(&DigitalCamera_SI_Interface,\r
+                                                              ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError)\r

                                {\r
                                        printf("Attached Device Not a Valid CDC Class Device.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                {\r
                                        printf("Attached Device Not a Valid CDC Class Device.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r


@@ -141,7 +141,7 @@ int main(void)
                                break;\r
                }\r
        \r
                                break;\r
                }\r
        \r

-               SI_Host_USBTask(&DigitalCamera_SI_Interface);\r
+               SImage_Host_USBTask(&DigitalCamera_SI_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c
index e809c92..fe14084 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.c
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.c
@@ -34,8 +34,8 @@
 #define INCLUDE_FROM_SI_CLASS_HOST_C\r
 #include "StillImage.h"\r
 \r
 #define INCLUDE_FROM_SI_CLASS_HOST_C\r
 #include "StillImage.h"\r
 \r

-uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                               void* DeviceConfigDescriptor)\r
+uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+                                   void* DeviceConfigDescriptor)\r

 {\r
        uint8_t  FoundEndpoints = 0;\r
        \r
 {\r
        uint8_t  FoundEndpoints = 0;\r
        \r


@@ -142,7 +142,7 @@ uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r

-void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r
+void SImage_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r

 {\r
 \r
 }\r
 {\r
 \r
 }\r

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h
index ab2864a..41e26e6 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.h
@@ -114,7 +114,7 @@
                         *\r
                         *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state\r
                         */\r
                         *\r
                         *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state\r
                         */\r

-                       void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       void SImage_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r

 \r
 \r
                        /** Host interface configuration routine, to configure a given Still Image host interface instance using the\r
 \r
 \r
                        /** Host interface configuration routine, to configure a given Still Image host interface instance using the\r


@@ -129,8 +129,8 @@
                         *\r
                         *  \return A value from the \ref SIHost_EnumerationFailure_ErrorCodes_t enum\r
                         */\r
                         *\r
                         *  \return A value from the \ref SIHost_EnumerationFailure_ErrorCodes_t enum\r
                         */\r

-                       uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                                           void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);\r
+                       uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+                                               void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);\r

 \r
                        /** Opens a new PIMA session with the attached device. This should be used before any session-orientated PIMA commands\r
                         *  are issued to the device. Only one session can be open at the one time.\r
 \r
                        /** Opens a new PIMA session with the attached device. This should be used before any session-orientated PIMA commands\r
                         *  are issued to the device. Only one session can be open at the one time.\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index e47c9c1..cf6c78d 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -29,7 +29,7 @@
 */\r
 \r
 /** \ingroup Group_USB\r
 */\r
 \r
 /** \ingroup Group_USB\r

- *  @defgroup Group_USBMode USB Configuration Tokens\r
+ *  @defgroup Group_USBMode USB Mode Tokens\r

  *\r
  *  After the inclusion of the master USB driver header, one or more of the following\r
  *  tokens may be defined, to allow the user code to conditionally enable or disable\r
  *\r
  *  After the inclusion of the master USB driver header, one or more of the following\r
  *  tokens may be defined, to allow the user code to conditionally enable or disable\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 0aa3daf..6a9155b 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -24,6 +24,7 @@
   *  <b>Fixed:</b>\r
   *  - Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver\r
   *  - Fixed incorrect values for REPORT_ITEM_TYPE_* enum values causing corrupt data in the HID Host Parser\r
   *  <b>Fixed:</b>\r
   *  - Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver\r
   *  - Fixed incorrect values for REPORT_ITEM_TYPE_* enum values causing corrupt data in the HID Host Parser\r

+  *  - Fixed misnamed SI_Host_USBTask() and SI_Host_ConfigurePipes() functions\r

   *\r
   *  \section Sec_ChangeLog091122 Version 091122\r
   *\r
   *\r
   *  \section Sec_ChangeLog091122 Version 091122\r
   *\r

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index aad002d..22fc408 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -11,7 +11,11 @@
  *  areas relevant to making older projects compatible with the API changes of each new release.\r
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 091122 to XXXXXX\r
  *  areas relevant to making older projects compatible with the API changes of each new release.\r
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 091122 to XXXXXX\r

- *  \r
+ *\r
+ *  <b>Host Mode</b>\r
+ *    - The Still Image Host Class driver SI_Host_USBTask() and SI_Host_ConfigurePipes() functions were misnamed, and are\r
+ *      now named SImage_Host_USBTask() and SImage_Host_ConfigurePipes() respectively.\r
+ *\r

  *  <b>Device Mode</b>\r
  *    - The CALLBACK_HID_Device_CreateHIDReport() HID Device Class driver callback now has a new ReportType parameter to\r
  *      indicate the report type to generate. Existing applications may simply add and ignore this additional parameter.\r
  *  <b>Device Mode</b>\r
  *    - The CALLBACK_HID_Device_CreateHIDReport() HID Device Class driver callback now has a new ReportType parameter to\r
  *      indicate the report type to generate. Existing applications may simply add and ignore this additional parameter.\r

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
index 013467c..b40adf1 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
@@ -15,11 +15,7 @@
 \r
 DSTATUS disk_initialize (void)\r
 {\r
 \r
 DSTATUS disk_initialize (void)\r
 {\r

-       DSTATUS stat;\r
-\r
-       stat = RES_OK;\r
-\r
-       return stat;\r
+       return RES_OK;\r

 }\r
 \r
 \r
 }\r
 \r
 \r