Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[pub/USBasp.git] / Demos / Device / ClassDriver / VirtualSerialMassStorage / VirtualSerialMassStorage.c

diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c b/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
index f1dc049..6dc1ab6 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
@@ -44,7 +44,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        {
                .Config =
                        {
        {
                .Config =
                        {

-                               .ControlInterfaceNumber         = 0,
+                               .ControlInterfaceNumber         = INTERFACE_ID_CDC_CCI,

                                .DataINEndpoint                 =
                                        {
                                                .Address                = CDC_TX_EPADDR,
                                .DataINEndpoint                 =
                                        {
                                                .Address                = CDC_TX_EPADDR,


@@ -74,7 +74,7 @@ USB_ClassInfo_MS_Device_t Disk_MS_Interface =
        {
                .Config =
                        {
        {
                .Config =
                        {

-                               .InterfaceNumber                = 2,
+                               .InterfaceNumber                = INTERFACE_ID_MassStorage,

                                .DataINEndpoint                 =
                                        {
                                                .Address                = MASS_STORAGE_IN_EPADDR,
                                .DataINEndpoint                 =
                                        {
                                                .Address                = MASS_STORAGE_IN_EPADDR,


@@ -148,7 +148,6 @@ void SetupHardware(void)
        /* Hardware Initialization */
        LEDs_Init();
        Joystick_Init();
        /* Hardware Initialization */
        LEDs_Init();
        Joystick_Init();

-       SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);

        Dataflash_Init();
        USB_Init();
 
        Dataflash_Init();
        USB_Init();