Fixed misnamed SI_Host_USBTask() and SI_Host_ConfigurePipes() functions.

7 files changed, 17 insertions, 16 deletions

diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
index d5ed71a54..fb3a78448 100644
--- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
+++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
@@ -85,8 +85,8 @@ int main(void)
 					break;

 				}

 

-				if (SI_Host_ConfigurePipes(&DigitalCamera_SI_Interface,

-				                           ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError)

+				if (SImage_Host_ConfigurePipes(&DigitalCamera_SI_Interface,

+				                               ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError)

 				{

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

 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

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

 		}

 	

-		SI_Host_USBTask(&DigitalCamera_SI_Interface);

+		SImage_Host_USBTask(&DigitalCamera_SI_Interface);

 		USB_USBTask();

 	}

 }

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c
index e809c92dd..fe14084a9 100644
--- 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

 #include "StillImage.h"

 

-uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,

-                               void* DeviceConfigDescriptor)

+uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,

+                                   void* DeviceConfigDescriptor)

 {

 	uint8_t  FoundEndpoints = 0;

 	

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

 }

 

-void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)

+void SImage_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)

 {

 

 }

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h
index ab2864aaa..41e26e627 100644
--- a/LUFA/Drivers/USB/Class/Host/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.h
@@ -114,7 +114,7 @@
 			 *

 			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state

 			 */

-			void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

+			void SImage_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

 

 

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

@@ -129,8 +129,8 @@
 			 *

 			 *  \return A value from the \ref SIHost_EnumerationFailure_ErrorCodes_t enum

 			 */

-			uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,

-                                           void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);

+			uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,

+                                               void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);

 

 			/** Opens a new PIMA session with the attached device. This should be used before any session-orientated PIMA commands

 			 *  are issued to the device. Only one session can be open at the one time.

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index e47c9c1d9..cf6c78d9e 100644
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -29,7 +29,7 @@
 */

 

 /** \ingroup Group_USB

- *  @defgroup Group_USBMode USB Configuration Tokens

+ *  @defgroup Group_USBMode USB Mode Tokens

  *

  *  After the inclusion of the master USB driver header, one or more of the following

  *  tokens may be defined, to allow the user code to conditionally enable or disable

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 0aa3dafaa..6a9155ba2 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -24,6 +24,7 @@
   *  <b>Fixed:</b>

   *  - Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver

   *  - Fixed incorrect values for REPORT_ITEM_TYPE_* enum values causing corrupt data in the HID Host Parser

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

   *

   *  \section Sec_ChangeLog091122 Version 091122

   *

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index aad002dde..22fc4085d 100644
--- 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.

  *

  * \section Sec_MigrationXXXXXX Migrating from 091122 to XXXXXX

- *  

+ *

+ *  <b>Host Mode</b>

+ *    - The Still Image Host Class driver SI_Host_USBTask() and SI_Host_ConfigurePipes() functions were misnamed, and are

+ *      now named SImage_Host_USBTask() and SImage_Host_ConfigurePipes() respectively.

+ *

  *  <b>Device Mode</b>

  *    - The CALLBACK_HID_Device_CreateHIDReport() HID Device Class driver callback now has a new ReportType parameter to

  *      indicate the report type to generate. Existing applications may simply add and ignore this additional parameter.

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
index 013467c25..b40adf1d8 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.c
@@ -15,11 +15,7 @@
 

 DSTATUS disk_initialize (void)

 {

-	DSTATUS stat;

-

-	stat = RES_OK;

-

-	return stat;

+	return RES_OK;

 }