git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1028 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2009-06-13 06:40:19 +00:00
parent b972ff53d2
commit 0d70a22f82
2 changed files with 47 additions and 37 deletions

View File

@ -18,6 +18,7 @@
*/ */
#include <ch.h> #include <ch.h>
#include <pal.h>
#include "board.h" #include "board.h"
#include "at91lib/aic.h" #include "at91lib/aic.h"
@ -97,11 +98,12 @@ void hwinit0(void) {
; ;
/* /*
* I/O setup, enable clocks, initially all pins are inputs with pullups. * PIO initialization.
*/ */
AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_PIOA) | (1 << AT91C_ID_PIOB); palInit();
/* AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_PIOA) | (1 << AT91C_ID_PIOB);
AT91C_BASE_PIOA->PIO_PER = 0xFFFFFFFF; AT91C_BASE_PIOA->PIO_PER = 0xFFFFFFFF;
AT91C_BASE_PIOB->PIO_PER = 0xFFFFFFFF; AT91C_BASE_PIOB->PIO_PER = 0xFFFFFFFF;*/
} }
/* /*
@ -126,24 +128,25 @@ void hwinit1(void) {
/* /*
* LCD pins setup. * LCD pins setup.
*/ */
AT91C_BASE_PIOB->PIO_CODR = PIOB_LCD_BL; // Set to low. palClearPad(IOPORT_B, PIOB_LCD_BL);
AT91C_BASE_PIOB->PIO_OER = PIOB_LCD_BL; // Configure as output. AT91C_BASE_PIOB->PIO_OER = PIOB_LCD_BL_MASK; // Configure as output.
AT91C_BASE_PIOB->PIO_PPUDR = PIOB_LCD_BL; // Disable internal pullup resistor. AT91C_BASE_PIOB->PIO_PPUDR = PIOB_LCD_BL_MASK; // Disable internal pullup resistor.
AT91C_BASE_PIOA->PIO_SODR = PIOA_LCD_RESET; // Set to high. palSetPad(IOPORT_A, PIOA_LCD_RESET);
AT91C_BASE_PIOA->PIO_OER = PIOA_LCD_RESET; // Configure as output. AT91C_BASE_PIOA->PIO_OER = PIOA_LCD_RESET_MASK; // Configure as output.
AT91C_BASE_PIOA->PIO_PPUDR = PIOA_LCD_RESET; // Disable internal pullup resistor. AT91C_BASE_PIOA->PIO_PPUDR = PIOA_LCD_RESET_MASK; // Disable internal pullup resistor.
/* /*
* Joystick and buttons, disable pullups, already inputs. * Joystick and buttons, disable pullups, already inputs.
*/ */
AT91C_BASE_PIOA->PIO_PPUDR = PIOA_B1 | PIOA_B2 | PIOA_B3 | PIOA_B4 | PIOA_B5; AT91C_BASE_PIOA->PIO_PPUDR = PIOA_B1_MASK | PIOA_B2_MASK | PIOA_B3_MASK |
AT91C_BASE_PIOB->PIO_PPUDR = PIOB_SW1 | PIOB_SW2; PIOA_B4_MASK | PIOA_B5_MASK;
AT91C_BASE_PIOB->PIO_PPUDR = PIOB_SW1_MASK | PIOB_SW2_MASK;
/* /*
* MMC/SD slot, disable pullups, already inputs. * MMC/SD slot, disable pullups, already inputs.
*/ */
AT91C_BASE_SYS->PIOB_PPUDR = PIOB_MMC_WP | PIOB_MMC_CP; AT91C_BASE_SYS->PIOB_PPUDR = PIOB_MMC_WP_MASK | PIOB_MMC_CP_MASK;
/* /*
* PIT Initialization. * PIT Initialization.

View File

@ -32,31 +32,38 @@
/* /*
* I/O definitions. * I/O definitions.
*/ */
#define PIOA_LCD_RESET (1 << 2) #define PIOA_LCD_RESET 2
#define PIOA_B1 (1 << 7) #define PIOA_LCD_RESET_MASK (1 << PIOA_LCD_RESET)
#define PIOA_B2 (1 << 8) #define PIOA_B1 7
#define PIOA_B3 (1 << 9) #define PIOA_B1_MASK (1 << PIOA_B1)
#define PIOA_B4 (1 << 14) #define PIOA_B2 8
#define PIOA_B5 (1 << 15) #define PIOA_B2_MASK (1 << PIOA_B2)
#define PIOA_USB_PUP (1 << 25) #define PIOA_B3 9
#define PIOA_USB_PR (1 << 26) #define PIOA_B3_MASK (1 << PIOA_B3)
#define PIOA_PA27 (1 << 27) #define PIOA_B4 14
#define PIOA_PA28 (1 << 28) #define PIOA_B4_MASK (1 << PIOA_B4)
#define PIOA_PA29 (1 << 29) #define PIOA_B5 15
#define PIOA_PA30 (1 << 30) #define PIOA_B5_MASK (1 << PIOA_B5)
#define PIOA_USB_PUP 25
#define PIOA_USB_PUP_MASK (1 << PIOA_USB_PUP)
#define PIOA_USB_PR 26
#define PIOA_USB_PR_MASK (1 << PIOA_USB_PR)
#define PIOB_PHY_PD (1 << 18) #define PIOB_PHY_PD 18
#define PIOB_AUDIO_OUT (1 << 19) #define PIOB_PHY_PD_MASK (1 << PIOB_PHY_PD)
#define PIOB_LCD_BL (1 << 20) #define PIOB_AUDIO_OUT 19
#define PIOB_PB21 (1 << 21) #define PIOB_AUDIO_OUT_MASK (1 << PIOB_AUDIO_OUT)
#define PIOB_MMC_WP (1 << 22) #define PIOB_LCD_BL 20
#define PIOB_MMC_CP (1 << 23) #define PIOB_LCD_BL_MASK (1 << PIOB_LCD_BL)
#define PIOB_SW1 (1 << 24) #define PIOB_MMC_WP 22
#define PIOB_SW2 (1 << 25) #define PIOB_MMC_WP_MASK (1 << PIOB_MMC_WP)
#define PIOB_PHY_IRQ (1 << 26) #define PIOB_MMC_CP 23
#define PIOB_PB27_AD0 (1 << 27) #define PIOB_MMC_CP_MASK (1 << PIOB_MMC_CP)
#define PIOB_PB28_AD1 (1 << 28) #define PIOB_SW1 24
#define PIOB_PB29_AD2 (1 << 29) #define PIOB_SW1_MASK (1 << PIOB_SW1)
#define PIOB_PB30_AD3 (1 << 30) #define PIOB_SW2 25
#define PIOB_SW2_MASK (1 << PIOB_SW2)
#define PIOB_PHY_IRQ 26
#define PIOB_PHY_IRQ_MASK (1 << PIOB_PHY_IRQ)
#endif /* _BOARD_H_ */ #endif /* _BOARD_H_ */