Added new incomplete AudioInputHost Host LowLevel demo.

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

diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.c b/Projects/AVRISP-MKII/AVRISP-MKII.c
index 654ce54..d774b11 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP-MKII.c
+++ b/Projects/AVRISP-MKII/AVRISP-MKII.c
@@ -45,14 +45,14 @@ int main(void)
        V2Protocol_Init();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        V2Protocol_Init();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-       sei();
-
+       GlobalInterruptEnable();
+       

        for (;;)
        {
                #if (BOARD == BOARD_USBTINYMKII)
        for (;;)
        {
                #if (BOARD == BOARD_USBTINYMKII)

-               /* On the USBTINY-MKII target, there is a secondary LED which indicates the current selected power
-                  mode - either VBUS, or sourced from the VTARGET pin of the programming connectors */
-               LEDs_ChangeLEDs(LEDMASK_VBUSPOWER, (PIND & (1 << 0)) ? 0 : LEDMASK_VBUSPOWER);
+                       /* On the USBTINY-MKII board target, there is a secondary LED which indicates the current selected
+                          power mode - either VBUS, or sourced from the VTARGET pin of the programming connectors */
+                       LEDs_ChangeLEDs(LEDS_LED3, (PIND & (1 << 0)) ? 0 : LEDS_LED3);

                #endif
 
                AVRISP_Task();
                #endif
 
                AVRISP_Task();


@@ -63,13 +63,35 @@ int main(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)
 {

-       /* Disable watchdog if enabled by bootloader/fuses */
-       MCUSR &= ~(1 << WDRF);
-       wdt_disable();
-
-       /* Disable clock division */
-       clock_prescale_set(clock_div_1);
-
+       #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);
+       #elif (ARCH == ARCH_UC3)
+               /* Select slow startup, external high frequency crystal attached to OSC0 */
+               AVR32_PM.OSCCTRL0.mode    = 7;
+               AVR32_PM.OSCCTRL0.startup = 6;
+               AVR32_PM.MCCTRL.osc0en    = true;
+               while (!(AVR32_PM.POSCSR.osc0rdy));
+
+               /* Switch CPU core to use OSC0 as the system clock */
+               AVR32_PM.MCCTRL.mcsel     = 1;
+
+               /* Start PLL1 to feed into the USB generic clock module */
+               AVR32_PM.PLL[1].pllmul    = (F_USB / F_CPU) ? (((F_USB / F_CPU) - 1) / 2) : 0;
+               AVR32_PM.PLL[1].plldiv    = 0;
+               AVR32_PM.PLL[1].pllosc    = 0;  
+               AVR32_PM.PLL[1].pllen     = true;
+               while (!(AVR32_PM.POSCSR.lock1));
+       
+               /* Configure interrupt management peripheral */
+//             INTC_Init();
+               INTC_RegisterGroupHandler(AVR32_USBB_IRQ, AVR32_INTC_INT0, USB_GEN_vect);       
+       #endif
+       

        /* Hardware Initialization */
        LEDs_Init();
        USB_Init();
        /* Hardware Initialization */
        LEDs_Init();
        USB_Init();