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

[pub/USBasp.git] / Projects / XPLAINBridge / XPLAINBridge.c

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 79145a1..1c63b71 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -47,7 +47,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,


@@ -169,12 +169,14 @@ void UARTBridge_Task(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {

+#if (ARCH == ARCH_AVR8)

        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

+#endif

 
        /* Disable JTAG debugging */
        MCUCR |= (1 << JTD);
 
        /* Disable JTAG debugging */
        MCUCR |= (1 << JTD);


@@ -197,8 +199,8 @@ void SetupHardware(void)
        #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
        UpdateCurrentCompatibilityMode();
        #endif
        #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
        UpdateCurrentCompatibilityMode();
        #endif

-       
-       /* USB Stack Initialization */  
+
+       /* USB Stack Initialization */

        USB_Init();
 }
 
        USB_Init();
 }