diff options
Diffstat (limited to 'board/lpc2292sodimm')
| -rw-r--r-- | board/lpc2292sodimm/config.mk | 1 | ||||
| -rw-r--r-- | board/lpc2292sodimm/eth.c | 657 | ||||
| -rw-r--r-- | board/lpc2292sodimm/flash.c | 31 | ||||
| -rw-r--r-- | board/lpc2292sodimm/iap_entry.S | 2 | ||||
| -rw-r--r-- | board/lpc2292sodimm/lowlevel_init.S | 16 | ||||
| -rw-r--r-- | board/lpc2292sodimm/mmc.c | 8 | ||||
| -rw-r--r-- | board/lpc2292sodimm/mmc_hw.c | 12 | ||||
| -rw-r--r-- | board/lpc2292sodimm/spi.h | 4 |
8 files changed, 364 insertions, 367 deletions
diff --git a/board/lpc2292sodimm/config.mk b/board/lpc2292sodimm/config.mk index 4146dac..b28f418 100644 --- a/board/lpc2292sodimm/config.mk +++ b/board/lpc2292sodimm/config.mk @@ -28,4 +28,3 @@ #address where u-boot will be relocated #TEXT_BASE = 0x0 TEXT_BASE = 0x81500000 - diff --git a/board/lpc2292sodimm/eth.c b/board/lpc2292sodimm/eth.c index 14bec19..249ab04 100644 --- a/board/lpc2292sodimm/eth.c +++ b/board/lpc2292sodimm/eth.c @@ -25,18 +25,18 @@ * Control Registers in Bank 0 */ -#define CTL_REG_ERDPTL 0x00 -#define CTL_REG_ERDPTH 0x01 -#define CTL_REG_EWRPTL 0x02 -#define CTL_REG_EWRPTH 0x03 -#define CTL_REG_ETXSTL 0x04 -#define CTL_REG_ETXSTH 0x05 -#define CTL_REG_ETXNDL 0x06 -#define CTL_REG_ETXNDH 0x07 -#define CTL_REG_ERXSTL 0x08 -#define CTL_REG_ERXSTH 0x09 -#define CTL_REG_ERXNDL 0x0A -#define CTL_REG_ERXNDA 0x0B +#define CTL_REG_ERDPTL 0x00 +#define CTL_REG_ERDPTH 0x01 +#define CTL_REG_EWRPTL 0x02 +#define CTL_REG_EWRPTH 0x03 +#define CTL_REG_ETXSTL 0x04 +#define CTL_REG_ETXSTH 0x05 +#define CTL_REG_ETXNDL 0x06 +#define CTL_REG_ETXNDH 0x07 +#define CTL_REG_ERXSTL 0x08 +#define CTL_REG_ERXSTH 0x09 +#define CTL_REG_ERXNDL 0x0A +#define CTL_REG_ERXNDA 0x0B #define CTL_REG_ERXRDPTL 0x0C #define CTL_REG_ERXRDPTH 0x0D #define CTL_REG_ERXWRPTL 0x0E @@ -50,38 +50,38 @@ #define CTL_REG_EDMACSL 0x16 #define CTL_REG_EDMACSH 0x17 /* these are common in all banks */ -#define CTL_REG_EIE 0x1B -#define CTL_REG_EIR 0x1C -#define CTL_REG_ESTAT 0x1D -#define CTL_REG_ECON2 0x1E -#define CTL_REG_ECON1 0x1F +#define CTL_REG_EIE 0x1B +#define CTL_REG_EIR 0x1C +#define CTL_REG_ESTAT 0x1D +#define CTL_REG_ECON2 0x1E +#define CTL_REG_ECON1 0x1F /* * Control Registers in Bank 1 */ -#define CTL_REG_EHT0 0x00 -#define CTL_REG_EHT1 0x01 -#define CTL_REG_EHT2 0x02 -#define CTL_REG_EHT3 0x03 -#define CTL_REG_EHT4 0x04 -#define CTL_REG_EHT5 0x05 -#define CTL_REG_EHT6 0x06 -#define CTL_REG_EHT7 0x07 -#define CTL_REG_EPMM0 0x08 -#define CTL_REG_EPMM1 0x09 -#define CTL_REG_EPMM2 0x0A -#define CTL_REG_EPMM3 0x0B -#define CTL_REG_EPMM4 0x0C -#define CTL_REG_EPMM5 0x0D -#define CTL_REG_EPMM6 0x0E -#define CTL_REG_EPMM7 0x0F -#define CTL_REG_EPMCSL 0x10 -#define CTL_REG_EPMCSH 0x11 -#define CTL_REG_EPMOL 0x14 -#define CTL_REG_EPMOH 0x15 -#define CTL_REG_EWOLIE 0x16 -#define CTL_REG_EWOLIR 0x17 +#define CTL_REG_EHT0 0x00 +#define CTL_REG_EHT1 0x01 +#define CTL_REG_EHT2 0x02 +#define CTL_REG_EHT3 0x03 +#define CTL_REG_EHT4 0x04 +#define CTL_REG_EHT5 0x05 +#define CTL_REG_EHT6 0x06 +#define CTL_REG_EHT7 0x07 +#define CTL_REG_EPMM0 0x08 +#define CTL_REG_EPMM1 0x09 +#define CTL_REG_EPMM2 0x0A +#define CTL_REG_EPMM3 0x0B +#define CTL_REG_EPMM4 0x0C +#define CTL_REG_EPMM5 0x0D +#define CTL_REG_EPMM6 0x0E +#define CTL_REG_EPMM7 0x0F +#define CTL_REG_EPMCSL 0x10 +#define CTL_REG_EPMCSH 0x11 +#define CTL_REG_EPMOL 0x14 +#define CTL_REG_EPMOH 0x15 +#define CTL_REG_EWOLIE 0x16 +#define CTL_REG_EWOLIR 0x17 #define CTL_REG_ERXFCON 0x18 #define CTL_REG_EPKTCNT 0x19 @@ -89,46 +89,46 @@ * Control Registers in Bank 2 */ -#define CTL_REG_MACON1 0x00 -#define CTL_REG_MACON2 0x01 -#define CTL_REG_MACON3 0x02 -#define CTL_REG_MACON4 0x03 +#define CTL_REG_MACON1 0x00 +#define CTL_REG_MACON2 0x01 +#define CTL_REG_MACON3 0x02 +#define CTL_REG_MACON4 0x03 #define CTL_REG_MABBIPG 0x04 -#define CTL_REG_MAIPGL 0x06 -#define CTL_REG_MAIPGH 0x07 +#define CTL_REG_MAIPGL 0x06 +#define CTL_REG_MAIPGH 0x07 #define CTL_REG_MACLCON1 0x08 #define CTL_REG_MACLCON2 0x09 #define CTL_REG_MAMXFLL 0x0A #define CTL_REG_MAMXFLH 0x0B #define CTL_REG_MAPHSUP 0x0D -#define CTL_REG_MICON 0x11 -#define CTL_REG_MICMD 0x12 +#define CTL_REG_MICON 0x11 +#define CTL_REG_MICMD 0x12 #define CTL_REG_MIREGADR 0x14 -#define CTL_REG_MIWRL 0x16 -#define CTL_REG_MIWRH 0x17 -#define CTL_REG_MIRDL 0x18 -#define CTL_REG_MIRDH 0x19 +#define CTL_REG_MIWRL 0x16 +#define CTL_REG_MIWRH 0x17 +#define CTL_REG_MIRDL 0x18 +#define CTL_REG_MIRDH 0x19 /* * Control Registers in Bank 3 */ -#define CTL_REG_MAADR1 0x00 -#define CTL_REG_MAADR0 0x01 -#define CTL_REG_MAADR3 0x02 -#define CTL_REG_MAADR2 0x03 -#define CTL_REG_MAADR5 0x04 -#define CTL_REG_MAADR4 0x05 -#define CTL_REG_EBSTSD 0x06 +#define CTL_REG_MAADR1 0x00 +#define CTL_REG_MAADR0 0x01 +#define CTL_REG_MAADR3 0x02 +#define CTL_REG_MAADR2 0x03 +#define CTL_REG_MAADR5 0x04 +#define CTL_REG_MAADR4 0x05 +#define CTL_REG_EBSTSD 0x06 #define CTL_REG_EBSTCON 0x07 #define CTL_REG_EBSTCSL 0x08 #define CTL_REG_EBSTCSH 0x09 -#define CTL_REG_MISTAT 0x0A -#define CTL_REG_EREVID 0x12 -#define CTL_REG_ECOCON 0x15 +#define CTL_REG_MISTAT 0x0A +#define CTL_REG_EREVID 0x12 +#define CTL_REG_ECOCON 0x15 #define CTL_REG_EFLOCON 0x17 -#define CTL_REG_EPAUSL 0x18 -#define CTL_REG_EPAUSH 0x19 +#define CTL_REG_EPAUSL 0x18 +#define CTL_REG_EPAUSH 0x19 /* @@ -161,7 +161,7 @@ #define ENC_ECON1_DMAST 0x20 #define ENC_ECON1_CSUMEN 0x10 #define ENC_ECON1_TXRTS 0x08 -#define ENC_ECON1_RXEN 0x04 +#define ENC_ECON1_RXEN 0x04 #define ENC_ECON1_BSEL1 0x02 #define ENC_ECON1_BSEL0 0x01 @@ -171,7 +171,7 @@ #define ENC_ECON2_AUTOINC 0x80 #define ENC_ECON2_PKTDEC 0x40 #define ENC_ECON2_PWRSV 0x20 -#define ENC_ECON2_VRPS 0x08 +#define ENC_ECON2_VRPS 0x08 /* * EIR Register Bits @@ -188,7 +188,7 @@ * ESTAT Register Bits */ -#define ENC_ESTAT_INT 0x80 +#define ENC_ESTAT_INT 0x80 #define ENC_ESTAT_LATECOL 0x10 #define ENC_ESTAT_RXBUSY 0x04 #define ENC_ESTAT_TXABRT 0x02 @@ -257,11 +257,11 @@ */ #define ENC_PHID1_VALUE 0x0083 #define ENC_PHID2_VALUE 0x1400 -#define ENC_PHID2_MASK 0xFC00 +#define ENC_PHID2_MASK 0xFC00 -#define ENC_SPI_SLAVE_CS 0x00010000 /* pin P1.16 */ -#define ENC_RESET 0x00020000 /* pin P1.17 */ +#define ENC_SPI_SLAVE_CS 0x00010000 /* pin P1.16 */ +#define ENC_RESET 0x00020000 /* pin P1.17 */ #define FAILSAFE_VALUE 5000 @@ -280,21 +280,21 @@ #define enc_enable() PUT32(IO1CLR, ENC_SPI_SLAVE_CS) #define enc_disable() PUT32(IO1SET, ENC_SPI_SLAVE_CS) -#define enc_cfg_spi() spi_set_cfg(0, 0, 0); spi_set_clock(8); - - -static unsigned char encReadReg(unsigned char regNo); -static void encWriteReg(unsigned char regNo, unsigned char data); -static void encWriteRegRetry(unsigned char regNo, unsigned char data, int c); -static void encReadBuff(unsigned short length, unsigned char *pBuff); -static void encWriteBuff(unsigned short length, unsigned char *pBuff); -static void encBitSet(unsigned char regNo, unsigned char data); -static void encBitClr(unsigned char regNo, unsigned char data); -static void encReset(void); -static void encInit(unsigned char *pEthAddr); -static unsigned short phyRead(unsigned char addr); -static void encPoll(void); -static void encRx(void); +#define enc_cfg_spi() spi_set_cfg(0, 0, 0); spi_set_clock(8); + + +static unsigned char encReadReg (unsigned char regNo); +static void encWriteReg (unsigned char regNo, unsigned char data); +static void encWriteRegRetry (unsigned char regNo, unsigned char data, int c); +static void encReadBuff (unsigned short length, unsigned char *pBuff); +static void encWriteBuff (unsigned short length, unsigned char *pBuff); +static void encBitSet (unsigned char regNo, unsigned char data); +static void encBitClr (unsigned char regNo, unsigned char data); +static void encReset (void); +static void encInit (unsigned char *pEthAddr); +static unsigned short phyRead (unsigned char addr); +static void encPoll (void); +static void encRx (void); #define m_nic_read(reg) encReadReg(reg) #define m_nic_write(reg, data) encWriteReg(reg, data) @@ -308,63 +308,64 @@ static void encRx(void); /* bit field clear */ #define m_nic_bfc(reg, data) encBitClr(reg, data) -static unsigned char bank = 0; /* current bank in enc28j60 */ +static unsigned char bank = 0; /* current bank in enc28j60 */ static unsigned char next_pointer_lsb; static unsigned char next_pointer_msb; static unsigned char buffer[ENC_MAX_FRM_LEN]; static int rxResetCounter = 0; + #define RX_RESET_COUNTER 1000; /*----------------------------------------------------------------------------- * Returns 0 when failes otherwize 1 */ -int eth_init(bd_t *bis) +int eth_init (bd_t * bis) { /* configure GPIO */ (*((volatile unsigned long *) IO1DIR)) |= ENC_SPI_SLAVE_CS; (*((volatile unsigned long *) IO1DIR)) |= ENC_RESET; /* CS and RESET active low */ - PUT32(IO1SET, ENC_SPI_SLAVE_CS); - PUT32(IO1SET, ENC_RESET); + PUT32 (IO1SET, ENC_SPI_SLAVE_CS); + PUT32 (IO1SET, ENC_RESET); - spi_init(); + spi_init (); /* initialize controller */ - encReset(); - encInit(bis->bi_enetaddr); + encReset (); + encInit (bis->bi_enetaddr); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_RXEN); /* enable receive */ + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_RXEN); /* enable receive */ return 0; } -int eth_send(volatile void *packet, int length) +int eth_send (volatile void *packet, int length) { /* check frame length, etc. */ /* TODO: */ /* switch to bank 0 */ - m_nic_bfc(CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); + m_nic_bfc (CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); /* set EWRPT */ - m_nic_write(CTL_REG_EWRPTL, (ENC_TX_BUF_START & 0xff)); - m_nic_write(CTL_REG_EWRPTH, (ENC_TX_BUF_START >> 8)); + m_nic_write (CTL_REG_EWRPTL, (ENC_TX_BUF_START & 0xff)); + m_nic_write (CTL_REG_EWRPTH, (ENC_TX_BUF_START >> 8)); /* set ETXST */ - m_nic_write(CTL_REG_ETXSTL, ENC_TX_BUF_START & 0xFF); - m_nic_write(CTL_REG_ETXSTH, ENC_TX_BUF_START >> 8); + m_nic_write (CTL_REG_ETXSTL, ENC_TX_BUF_START & 0xFF); + m_nic_write (CTL_REG_ETXSTH, ENC_TX_BUF_START >> 8); /* write packet */ - m_nic_write_data(length, (unsigned char*)packet); + m_nic_write_data (length, (unsigned char *) packet); /* set ETXND */ - m_nic_write(CTL_REG_ETXNDL, (length + ENC_TX_BUF_START) & 0xFF); - m_nic_write(CTL_REG_ETXNDH, (length + ENC_TX_BUF_START) >> 8); + m_nic_write (CTL_REG_ETXNDL, (length + ENC_TX_BUF_START) & 0xFF); + m_nic_write (CTL_REG_ETXNDH, (length + ENC_TX_BUF_START) >> 8); /* set ECON1.TXRTS */ - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_TXRTS); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_TXRTS); return 0; } @@ -374,13 +375,13 @@ int eth_send(volatile void *packet, int length) * This function resets the receiver only. This function may be called from * interrupt-context. */ -static void encReceiverReset(void) +static void encReceiverReset (void) { unsigned char econ1; - econ1 = m_nic_read(CTL_REG_ECON1); - if((econ1 & ENC_ECON1_RXRST) == 0) { - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_RXRST); + econ1 = m_nic_read (CTL_REG_ECON1); + if ((econ1 & ENC_ECON1_RXRST) == 0) { + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_RXRST); rxResetCounter = RX_RESET_COUNTER; } } @@ -388,85 +389,84 @@ static void encReceiverReset(void) /***************************************************************************** * receiver reset timer */ -static void encReceiverResetCallback(void) +static void encReceiverResetCallback (void) { - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_RXRST); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_RXEN); /* enable receive */ + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_RXRST); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_RXEN); /* enable receive */ } /*----------------------------------------------------------------------------- * Check for received packets. Call NetReceive for each packet. The return * value is ignored by the caller. */ -int eth_rx(void) +int eth_rx (void) { - if(rxResetCounter > 0 && --rxResetCounter == 0) - { - encReceiverResetCallback(); + if (rxResetCounter > 0 && --rxResetCounter == 0) { + encReceiverResetCallback (); } - encPoll(); + encPoll (); return 0; } -void eth_halt(void) +void eth_halt (void) { - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_RXEN); /* disable receive */ + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_RXEN); /* disable receive */ } /*****************************************************************************/ -static void encPoll(void) +static void encPoll (void) { unsigned char eir_reg; volatile unsigned char estat_reg; unsigned char pkt_cnt; /* clear global interrupt enable bit in enc28j60 */ - m_nic_bfc(CTL_REG_EIE, ENC_EIE_INTIE); - estat_reg = m_nic_read(CTL_REG_ESTAT); + m_nic_bfc (CTL_REG_EIE, ENC_EIE_INTIE); + estat_reg = m_nic_read (CTL_REG_ESTAT); - eir_reg = m_nic_read(CTL_REG_EIR); + eir_reg = m_nic_read (CTL_REG_EIR); - if (eir_reg & ENC_EIR_TXIF){ + if (eir_reg & ENC_EIR_TXIF) { /* clear TXIF bit in EIR */ - m_nic_bfc(CTL_REG_EIR, ENC_EIR_TXIF); + m_nic_bfc (CTL_REG_EIR, ENC_EIR_TXIF); } /* We have to use pktcnt and not pktif bit, see errata pt. 6 */ /* move to bank 1 */ - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_BSEL1); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_BSEL0); + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_BSEL1); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_BSEL0); /* read pktcnt */ - pkt_cnt = m_nic_read(CTL_REG_EPKTCNT); + pkt_cnt = m_nic_read (CTL_REG_EPKTCNT); if (pkt_cnt > 0) { if ((eir_reg & ENC_EIR_PKTIF) == 0) { - /*printf("encPoll: pkt cnt > 0, but pktif not set\n"); */ + /*printf("encPoll: pkt cnt > 0, but pktif not set\n"); */ } - encRx(); + encRx (); /* clear PKTIF bit in EIR, this should not need to be done but it seems like we get problems if we do not */ - m_nic_bfc(CTL_REG_EIR, ENC_EIR_PKTIF); + m_nic_bfc (CTL_REG_EIR, ENC_EIR_PKTIF); } if (eir_reg & ENC_EIR_RXERIF) { - printf("encPoll: rx error\n"); - m_nic_bfc(CTL_REG_EIR, ENC_EIR_RXERIF); + printf ("encPoll: rx error\n"); + m_nic_bfc (CTL_REG_EIR, ENC_EIR_RXERIF); } if (eir_reg & ENC_EIR_TXERIF) { - printf("encPoll: tx error\n"); - m_nic_bfc(CTL_REG_EIR, ENC_EIR_TXERIF); + printf ("encPoll: tx error\n"); + m_nic_bfc (CTL_REG_EIR, ENC_EIR_TXERIF); } /* set global interrupt enable bit in enc28j60 */ - m_nic_bfs(CTL_REG_EIE, ENC_EIE_INTIE); + m_nic_bfs (CTL_REG_EIE, ENC_EIE_INTIE); } -static void encRx(void) +static void encRx (void) { unsigned short pkt_len; unsigned short copy_len; @@ -475,19 +475,19 @@ static void encRx(void) unsigned char pkt_cnt = 0; /* switch to bank 0 */ - m_nic_bfc(CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); + m_nic_bfc (CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); - m_nic_write(CTL_REG_ERDPTL, next_pointer_lsb); - m_nic_write(CTL_REG_ERDPTH, next_pointer_msb); + m_nic_write (CTL_REG_ERDPTL, next_pointer_lsb); + m_nic_write (CTL_REG_ERDPTH, next_pointer_msb); do { - m_nic_read_data(6, buffer); + m_nic_read_data (6, buffer); next_pointer_lsb = buffer[0]; next_pointer_msb = buffer[1]; pkt_len = buffer[2]; - pkt_len |= (unsigned short)buffer[3] << 8; + pkt_len |= (unsigned short) buffer[3] << 8; status = buffer[4]; - status |= (unsigned short)buffer[5] << 8; + status |= (unsigned short) buffer[5] << 8; if (pkt_len <= ENC_MAX_FRM_LEN) { copy_len = pkt_len; @@ -497,343 +497,344 @@ static void encRx(void) /* we will drop this packet */ } - if ((status & (1L << 7)) == 0) { /* check Received Ok bit */ + if ((status & (1L << 7)) == 0) { /* check Received Ok bit */ copy_len = 0; /* p_priv->stats.rx_errors++; */ } - if (copy_len > 0) { - m_nic_read_data(copy_len, buffer); - } + if (copy_len > 0) { + m_nic_read_data (copy_len, buffer); + } /* advance read pointer to next pointer */ - m_nic_write(CTL_REG_ERDPTL, next_pointer_lsb); - m_nic_write(CTL_REG_ERDPTH, next_pointer_msb); + m_nic_write (CTL_REG_ERDPTL, next_pointer_lsb); + m_nic_write (CTL_REG_ERDPTH, next_pointer_msb); /* decrease packet counter */ - m_nic_bfs(CTL_REG_ECON2, ENC_ECON2_PKTDEC); + m_nic_bfs (CTL_REG_ECON2, ENC_ECON2_PKTDEC); /* move to bank 1 */ - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_BSEL1); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_BSEL0); + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_BSEL1); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_BSEL0); /* read pktcnt */ - pkt_cnt = m_nic_read(CTL_REG_EPKTCNT); + pkt_cnt = m_nic_read (CTL_REG_EPKTCNT); /* switch to bank 0 */ - m_nic_bfc(CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); + m_nic_bfc (CTL_REG_ECON1, + (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); if (copy_len == 0) { - eir_reg = m_nic_read(CTL_REG_EIR); - encReceiverReset(); - printf("eth_rx: copy_len=0\n"); + eir_reg = m_nic_read (CTL_REG_EIR); + encReceiverReset (); + printf ("eth_rx: copy_len=0\n"); continue; } - NetReceive((unsigned char *)buffer, pkt_len); + NetReceive ((unsigned char *) buffer, pkt_len); - eir_reg = m_nic_read(CTL_REG_EIR); - } while (pkt_cnt); /* Use EPKTCNT not EIR.PKTIF flag, see errata pt. 6 */ - m_nic_write(CTL_REG_ERXRDPTL, next_pointer_lsb); - m_nic_write(CTL_REG_ERXRDPTH, next_pointer_msb); + eir_reg = m_nic_read (CTL_REG_EIR); + } while (pkt_cnt); /* Use EPKTCNT not EIR.PKTIF flag, see errata pt. 6 */ + m_nic_write (CTL_REG_ERXRDPTL, next_pointer_lsb); + m_nic_write (CTL_REG_ERXRDPTH, next_pointer_msb); } -static void encWriteReg(unsigned char regNo, unsigned char data) +static void encWriteReg (unsigned char regNo, unsigned char data) { - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0x40 | regNo); /* write in regNo */ - spi_write(data); + spi_write (0x40 | regNo); /* write in regNo */ + spi_write (data); - enc_disable(); - enc_enable(); + enc_disable (); + enc_enable (); - spi_write(0x1f); /* write reg 0x1f */ + spi_write (0x1f); /* write reg 0x1f */ - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); } -static void encWriteRegRetry(unsigned char regNo, unsigned char data, int c) +static void encWriteRegRetry (unsigned char regNo, unsigned char data, int c) { unsigned char readback; int i; - spi_lock(); + spi_lock (); for (i = 0; i < c; i++) { - enc_cfg_spi(); - enc_enable(); + enc_cfg_spi (); + enc_enable (); - spi_write(0x40 | regNo); /* write in regNo */ - spi_write(data); + spi_write (0x40 | regNo); /* write in regNo */ + spi_write (data); - enc_disable(); - enc_enable(); + enc_disable (); + enc_enable (); - spi_write(0x1f); /* write reg 0x1f */ + spi_write (0x1f); /* write reg 0x1f */ - enc_disable(); + enc_disable (); - spi_unlock(); /* we must unlock spi first */ + spi_unlock (); /* we must unlock spi first */ - readback = encReadReg(regNo); + readback = encReadReg (regNo); - spi_lock(); + spi_lock (); if (readback == data) break; } - spi_unlock(); + spi_unlock (); if (i == c) { - printf("enc28j60: write reg %d failed\n", regNo); + printf ("enc28j60: write reg %d failed\n", regNo); } } -static unsigned char encReadReg(unsigned char regNo) +static unsigned char encReadReg (unsigned char regNo) { unsigned char rxByte; - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0x1f); /* read reg 0x1f */ + spi_write (0x1f); /* read reg 0x1f */ - bank = spi_read() & 0x3; + bank = spi_read () & 0x3; - enc_disable(); - enc_enable(); + enc_disable (); + enc_enable (); - spi_write(regNo); - rxByte = spi_read(); + spi_write (regNo); + rxByte = spi_read (); /* check if MAC or MII register */ if (((bank == 2) && (regNo <= 0x1a)) || - ((bank == 3) && (regNo <= 0x05 || regNo == 0x0a))) { + ((bank == 3) && (regNo <= 0x05 || regNo == 0x0a))) { /* ignore first byte and read another byte */ - rxByte = spi_read(); + rxByte = spi_read (); } - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); return rxByte; } -static void encReadBuff(unsigned short length, unsigned char *pBuff) +static void encReadBuff (unsigned short length, unsigned char *pBuff) { - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0x20 | 0x1a); /* read buffer memory */ + spi_write (0x20 | 0x1a); /* read buffer memory */ - while(length--) { - if(pBuff != NULL) - *pBuff++ = spi_read(); + while (length--) { + if (pBuff != NULL) + *pBuff++ = spi_read (); else - spi_write(0); + spi_write (0); } - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); } -static void encWriteBuff(unsigned short length, - unsigned char *pBuff) +static void encWriteBuff (unsigned short length, unsigned char *pBuff) { - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0x60 | 0x1a); /* write buffer memory */ + spi_write (0x60 | 0x1a); /* write buffer memory */ - spi_write(0x00); /* control byte */ + spi_write (0x00); /* control byte */ - while(length--) - spi_write(*pBuff++); + while (length--) + spi_write (*pBuff++); - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); } -static void encBitSet(unsigned char regNo, unsigned char data) +static void encBitSet (unsigned char regNo, unsigned char data) { - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0x80 | regNo); /* bit field set */ - spi_write(data); + spi_write (0x80 | regNo); /* bit field set */ + spi_write (data); - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); } -static void encBitClr(unsigned char regNo, unsigned char data) +static void encBitClr (unsigned char regNo, unsigned char data) { - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0xA0 | regNo); /* bit field clear */ - spi_write(data); + spi_write (0xA0 | regNo); /* bit field clear */ + spi_write (data); - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); } -static void encReset(void) +static void encReset (void) { - spi_lock(); - enc_cfg_spi(); - enc_enable(); + spi_lock (); + enc_cfg_spi (); + enc_enable (); - spi_write(0xff); /* soft reset */ + spi_write (0xff); /* soft reset */ - enc_disable(); - spi_unlock(); + enc_disable (); + spi_unlock (); /* sleep 1 ms. See errata pt. 2 */ - udelay(1000); + udelay (1000); #if 0 - (*((volatile unsigned long*)IO1CLR)) &= ENC_RESET; - mdelay(5); - (*((volatile unsigned long*)IO1SET)) &= ENC_RESET; + (*((volatile unsigned long *) IO1CLR)) &= ENC_RESET; + mdelay (5); + (*((volatile unsigned long *) IO1SET)) &= ENC_RESET; #endif } -static void encInit(unsigned char *pEthAddr) +static void encInit (unsigned char *pEthAddr) { unsigned short phid1 = 0; unsigned short phid2 = 0; /* switch to bank 0 */ - m_nic_bfc(CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); + m_nic_bfc (CTL_REG_ECON1, (ENC_ECON1_BSEL1 | ENC_ECON1_BSEL0)); - /* - * Setup the buffer space. The reset values are valid for the - * other pointers. - */ + /* + * Setup the buffer space. The reset values are valid for the + * other pointers. + */ #if 0 - /* We shall not write to ERXST, see errata pt. 5. Instead we - have to make sure that ENC_RX_BUS_START is 0. */ - m_nic_write_retry(CTL_REG_ERXSTL, (ENC_RX_BUF_START & 0xFF), 1); - m_nic_write_retry(CTL_REG_ERXSTH, (ENC_RX_BUF_START >> 8), 1); + /* We shall not write to ERXST, see errata pt. 5. Instead we + have to make sure that ENC_RX_BUS_START is 0. */ + m_nic_write_retry (CTL_REG_ERXSTL, (ENC_RX_BUF_START & 0xFF), 1); + m_nic_write_retry (CTL_REG_ERXSTH, (ENC_RX_BUF_START >> 8), 1); #endif - m_nic_write_retry(CTL_REG_ERDPTL, (ENC_RX_BUF_START & 0xFF), 1); - m_nic_write_retry(CTL_REG_ERDPTH, (ENC_RX_BUF_START >> 8), 1); + m_nic_write_retry (CTL_REG_ERDPTL, (ENC_RX_BUF_START & 0xFF), 1); + m_nic_write_retry (CTL_REG_ERDPTH, (ENC_RX_BUF_START >> 8), 1); next_pointer_lsb = (ENC_RX_BUF_START & 0xFF); next_pointer_msb = (ENC_RX_BUF_START >> 8); /* - * For tracking purposes, the ERXRDPT registers should be programmed with - * the same value. This is the read pointer. - */ - m_nic_write(CTL_REG_ERXRDPTL, (ENC_RX_BUF_START & 0xFF)); - m_nic_write_retry(CTL_REG_ERXRDPTH, (ENC_RX_BUF_START >> 8), 1); + * For tracking purposes, the ERXRDPT registers should be programmed with + * the same value. This is the read pointer. + */ + m_nic_write (CTL_REG_ERXRDPTL, (ENC_RX_BUF_START & 0xFF)); + m_nic_write_retry (CTL_REG_ERXRDPTH, (ENC_RX_BUF_START >> 8), 1); /* Setup receive filters. */ /* move to bank 1 */ - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_BSEL1); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_BSEL0); + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_BSEL1); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_BSEL0); /* OR-filtering, Unicast, CRC-check and broadcast */ - m_nic_write_retry(CTL_REG_ERXFCON, - (ENC_RFR_UCEN|ENC_RFR_CRCEN|ENC_RFR_BCEN), 1); + m_nic_write_retry (CTL_REG_ERXFCON, + (ENC_RFR_UCEN | ENC_RFR_CRCEN | ENC_RFR_BCEN), 1); /* Wait for Oscillator Start-up Timer (OST). */ - while((m_nic_read(CTL_REG_ESTAT) & ENC_ESTAT_CLKRDY) == 0) { + while ((m_nic_read (CTL_REG_ESTAT) & ENC_ESTAT_CLKRDY) == 0) { static int cnt = 0; - if(cnt++ >= 1000){ - cnt = 0; + + if (cnt++ >= 1000) { + cnt = 0; } } /* verify identification */ - phid1 = phyRead(PHY_REG_PHID1); - phid2 = phyRead(PHY_REG_PHID2); - - if(phid1 != ENC_PHID1_VALUE - || (phid2 & ENC_PHID2_MASK) != ENC_PHID2_VALUE) { - printf("ERROR: failed to identify controller\n"); - printf("phid1 = %x, phid2 = %x\n", - phid1, (phid2&ENC_PHID2_MASK)); - printf("should be phid1 = %x, phid2 = %x\n", + phid1 = phyRead (PHY_REG_PHID1); + phid2 = phyRead (PHY_REG_PHID2); + + if (phid1 != ENC_PHID1_VALUE + || (phid2 & ENC_PHID2_MASK) != ENC_PHID2_VALUE) { + printf ("ERROR: failed to identify controller\n"); + printf ("phid1 = %x, phid2 = %x\n", + phid1, (phid2 & ENC_PHID2_MASK)); + printf ("should be phid1 = %x, phid2 = %x\n", ENC_PHID1_VALUE, ENC_PHID2_VALUE); } /* - * --- MAC Initialization --- - */ + * --- MAC Initialization --- + */ /* Pull MAC out of Reset */ /* switch to bank 2 */ - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_BSEL0); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_BSEL1); + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_BSEL0); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_BSEL1); /* clear MAC reset bits */ - m_nic_write_retry(CTL_REG_MACON2, 0, 1); + m_nic_write_retry (CTL_REG_MACON2, 0, 1); /* enable MAC to receive frames */ - m_nic_write_retry(CTL_REG_MACON1, ENC_MACON1_MARXEN, 10); + m_nic_write_retry (CTL_REG_MACON1, ENC_MACON1_MARXEN, 10); - /* configure pad, tx-crc and duplex */ + /* configure pad, tx-crc and duplex */ /* TODO maybe enable FRMLNEN */ - m_nic_write_retry(CTL_REG_MACON3, (ENC_MACON3_PADCFG0|ENC_MACON3_TXCRCEN), - 10); + m_nic_write_retry (CTL_REG_MACON3, + (ENC_MACON3_PADCFG0 | ENC_MACON3_TXCRCEN), 10); /* set maximum frame length */ - m_nic_write_retry(CTL_REG_MAMXFLL, (ENC_MAX_FRM_LEN & 0xff), 10); - m_nic_write_retry(CTL_REG_MAMXFLH, (ENC_MAX_FRM_LEN >> 8), 10); + m_nic_write_retry (CTL_REG_MAMXFLL, (ENC_MAX_FRM_LEN & 0xff), 10); + m_nic_write_retry (CTL_REG_MAMXFLH, (ENC_MAX_FRM_LEN >> 8), 10); - /* - * Set MAC back-to-back inter-packet gap. Recommended 0x12 for half duplex - * and 0x15 for full duplex. - */ - m_nic_write_retry(CTL_REG_MABBIPG, 0x12, 10); + /* + * Set MAC back-to-back inter-packet gap. Recommended 0x12 for half duplex + * and 0x15 for full duplex. + */ + m_nic_write_retry (CTL_REG_MABBIPG, 0x12, 10); /* Set (low byte) Non-Back-to_Back Inter-Packet Gap. Recommended 0x12 */ - m_nic_write_retry(CTL_REG_MAIPGL, 0x12, 10); + m_nic_write_retry (CTL_REG_MAIPGL, 0x12, 10); - /* - * Set (high byte) Non-Back-to_Back Inter-Packet Gap. Recommended - * 0x0c for half-duplex. Nothing for full-duplex - */ - m_nic_write_retry(CTL_REG_MAIPGH, 0x0C, 10); + /* + * Set (high byte) Non-Back-to_Back Inter-Packet Gap. Recommended + * 0x0c for half-duplex. Nothing for full-duplex + */ + m_nic_write_retry (CTL_REG_MAIPGH, 0x0C, 10); /* set MAC address */ /* switch to bank 3 */ - m_nic_bfs(CTL_REG_ECON1, (ENC_ECON1_BSEL0|ENC_ECON1_BSEL1)); + m_nic_bfs (CTL_REG_ECON1, (ENC_ECON1_BSEL0 | ENC_ECON1_BSEL1)); - m_nic_write_retry(CTL_REG_MAADR0, pEthAddr[5], 1); - m_nic_write_retry(CTL_REG_MAADR1, pEthAddr[4], 1); - m_nic_write_retry(CTL_REG_MAADR2, pEthAddr[3], 1); - m_nic_write_retry(CTL_REG_MAADR3, pEthAddr[2], 1); - m_nic_write_retry(CTL_REG_MAADR4, pEthAddr[1], 1); - m_nic_write_retry(CTL_REG_MAADR5, pEthAddr[0], 1); + m_nic_write_retry (CTL_REG_MAADR0, pEthAddr[5], 1); + m_nic_write_retry (CTL_REG_MAADR1, pEthAddr[4], 1); + m_nic_write_retry (CTL_REG_MAADR2, pEthAddr[3], 1); + m_nic_write_retry (CTL_REG_MAADR3, pEthAddr[2], 1); + m_nic_write_retry (CTL_REG_MAADR4, pEthAddr[1], 1); + m_nic_write_retry (CTL_REG_MAADR5, pEthAddr[0], 1); /* - * Receive settings - */ + * Receive settings + */ /* auto-increment RX-pointer when reading a received packet */ - m_nic_bfs(CTL_REG_ECON2, ENC_ECON2_AUTOINC); + m_nic_bfs (CTL_REG_ECON2, ENC_ECON2_AUTOINC); /* enable interrupts */ - m_nic_bfs(CTL_REG_EIE, ENC_EIE_PKTIE); - m_nic_bfs(CTL_REG_EIE, ENC_EIE_TXIE); - m_nic_bfs(CTL_REG_EIE, ENC_EIE_RXERIE); - m_nic_bfs(CTL_REG_EIE, ENC_EIE_TXERIE); - m_nic_bfs(CTL_REG_EIE, ENC_EIE_INTIE); + m_nic_bfs (CTL_REG_EIE, ENC_EIE_PKTIE); + m_nic_bfs (CTL_REG_EIE, ENC_EIE_TXIE); + m_nic_bfs (CTL_REG_EIE, ENC_EIE_RXERIE); + m_nic_bfs (CTL_REG_EIE, ENC_EIE_TXERIE); + m_nic_bfs (CTL_REG_EIE, ENC_EIE_INTIE); } /***************************************************************************** @@ -849,25 +850,25 @@ static void encInit(unsigned char *pEthAddr) * Returns: * The value in the register */ -static unsigned short phyRead(unsigned char addr) +static unsigned short phyRead (unsigned char addr) { unsigned short ret = 0; /* move to bank 2 */ - m_nic_bfc(CTL_REG_ECON1, ENC_ECON1_BSEL0); - m_nic_bfs(CTL_REG_ECON1, ENC_ECON1_BSEL1); + m_nic_bfc (CTL_REG_ECON1, ENC_ECON1_BSEL0); + m_nic_bfs (CTL_REG_ECON1, ENC_ECON1_BSEL1); /* write address to MIREGADR */ - m_nic_write(CTL_REG_MIREGADR, addr); + m_nic_write (CTL_REG_MIREGADR, addr); /* set MICMD.MIIRD */ - m_nic_write(CTL_REG_MICMD, ENC_MICMD_MIIRD); + m_nic_write (CTL_REG_MICMD, ENC_MICMD_MIIRD); /* poll MISTAT.BUSY bit until operation is complete */ - while((m_nic_read(CTL_REG_MISTAT) & ENC_MISTAT_BUSY) != 0) { + while ((m_nic_read (CTL_REG_MISTAT) & ENC_MISTAT_BUSY) != 0) { static int cnt = 0; - if(cnt++ >= 1000) { + if (cnt++ >= 1000) { /* GJ - this seems extremely dangerous! */ /* printf("#"); */ cnt = 0; @@ -875,10 +876,10 @@ static unsigned short phyRead(unsigned char addr) } /* clear MICMD.MIIRD */ - m_nic_write(CTL_REG_MICMD, 0); + m_nic_write (CTL_REG_MICMD, 0); - ret = (m_nic_read(CTL_REG_MIRDH) << 8); - ret |= (m_nic_read(CTL_REG_MIRDL) & 0xFF); + ret = (m_nic_read (CTL_REG_MIRDH) << 8); + ret |= (m_nic_read (CTL_REG_MIRDL) & 0xFF); return ret; } diff --git a/board/lpc2292sodimm/flash.c b/board/lpc2292sodimm/flash.c index dcef7dd..55aaabf 100644 --- a/board/lpc2292sodimm/flash.c +++ b/board/lpc2292sodimm/flash.c @@ -64,7 +64,7 @@ int get_flash_sector(flash_info_t * info, ulong flash_addr) /*----------------------------------------------------------------------- * This function assumes that flash_addr is aligned on 512 bytes boundary - * in flash. This function also assumes that prepare have been called + * in flash. This function also assumes that prepare have been called * for the sector in question. */ int copy_buffer_to_flash(flash_info_t * info, ulong flash_addr) @@ -141,7 +141,7 @@ ulong flash_init (void) for (j = 0; j < 7; j++, k++) { flash_info[0].start[k] = flashbase; flashbase += 0x00002000; - } + } size += flash_info[0].size; flash_info[1].flash_id = (SST_MANUFACT & FLASH_VENDMASK); @@ -163,7 +163,7 @@ ulong flash_init (void) flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, + CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); return size; @@ -292,9 +292,9 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) { switch (info->flash_id & FLASH_VENDMASK) { case (SST_MANUFACT & FLASH_VENDMASK): - return flash_erase_sst(info, s_first, s_last); + return flash_erase_sst(info, s_first, s_last); case (PHILIPS_LPC2292 & FLASH_VENDMASK): - return flash_erase_philips(info, s_first, s_last); + return flash_erase_philips(info, s_first, s_last); default: return ERR_PROTECTED; } @@ -350,13 +350,12 @@ int write_buff_sst (flash_info_t * info, uchar * src, ulong addr, ulong cnt) src_org++; } - return ret; } -int write_buff_philips (flash_info_t * info, - uchar * src, - ulong addr, +int write_buff_philips (flash_info_t * info, + uchar * src, + ulong addr, ulong cnt) { int first_copy_size; @@ -393,9 +392,9 @@ int write_buff_philips (flash_info_t * info, #endif /* copy first block */ - memcpy((void*)COPY_BUFFER_LOCATION, + memcpy((void*)COPY_BUFFER_LOCATION, (void*)(first_block * 512), 512); - memcpy((void*)(COPY_BUFFER_LOCATION + 512 - first_copy_size), + memcpy((void*)(COPY_BUFFER_LOCATION + 512 - first_copy_size), src, first_copy_size); copy_buffer_to_flash(info, first_block * 512); src += first_copy_size; @@ -414,7 +413,7 @@ int write_buff_philips (flash_info_t * info, memcpy((void*)COPY_BUFFER_LOCATION, src, 512); copy_buffer_to_flash(info, addr); src += 512; - addr += 512; + addr += 512; } @@ -431,9 +430,9 @@ int write_buff_philips (flash_info_t * info, (ulong)addr); #endif /* copy last block */ - memcpy((void*)COPY_BUFFER_LOCATION, + memcpy((void*)COPY_BUFFER_LOCATION, (void*)(last_block * 512), 512); - memcpy((void*)COPY_BUFFER_LOCATION, + memcpy((void*)COPY_BUFFER_LOCATION, src, last_copy_size); copy_buffer_to_flash(info, addr); } @@ -467,9 +466,9 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) { switch (info->flash_id & FLASH_VENDMASK) { case (SST_MANUFACT & FLASH_VENDMASK): - return write_buff_sst(info, src, addr, cnt); + return write_buff_sst(info, src, addr, cnt); case (PHILIPS_LPC2292 & FLASH_VENDMASK): - return write_buff_philips(info, src, addr, cnt); + return write_buff_philips(info, src, addr, cnt); default: return ERR_PROG_ERROR; } diff --git a/board/lpc2292sodimm/iap_entry.S b/board/lpc2292sodimm/iap_entry.S index 28ed805..c31d519 100644 --- a/board/lpc2292sodimm/iap_entry.S +++ b/board/lpc2292sodimm/iap_entry.S @@ -1,5 +1,5 @@ IAP_ADDRESS: .word 0x7FFFFFF1 - + .globl iap_entry iap_entry: ldr r2, IAP_ADDRESS diff --git a/board/lpc2292sodimm/lowlevel_init.S b/board/lpc2292sodimm/lowlevel_init.S index a91e678..a0e9747 100644 --- a/board/lpc2292sodimm/lowlevel_init.S +++ b/board/lpc2292sodimm/lowlevel_init.S @@ -27,10 +27,10 @@ #define SRAM_SIZE 0x00004000 #define BCFG0_VALUE 0x1000ffef #define BCFG1_VALUE 0x10001C61 - + _TEXT_BASE: .word TEXT_BASE -MEMMAP_ADR: +MEMMAP_ADR: .word MEMMAP BCFG0_ADR: .word BCFG0 @@ -69,19 +69,19 @@ lowlevel_init: and r1, r1, r2 orr r1, r1, r3 str r1, [r0] - + /* move vectors to beginning of SRAM */ - mov r2, #SRAM_START + mov r2, #SRAM_START mov r0, #0 /*_start*/ - ldmneia r0!, {r3-r10} - stmneia r2!, {r3-r10} + ldmneia r0!, {r3-r10} + stmneia r2!, {r3-r10} ldmneia r0, {r3-r9} stmneia r2, {r3-r9} - /* Set-up MEMMAP register, so vectors are taken from SRAM */ + /* Set-up MEMMAP register, so vectors are taken from SRAM */ ldr r0, MEMMAP_ADR mov r1, #0x02 /* vectors re-mapped to static RAM */ str r1, [r0] - + /* everything is fine now */ mov pc, lr diff --git a/board/lpc2292sodimm/mmc.c b/board/lpc2292sodimm/mmc.c index e361db1..1c0922f 100644 --- a/board/lpc2292sodimm/mmc.c +++ b/board/lpc2292sodimm/mmc.c @@ -41,8 +41,8 @@ block_dev_desc_t * mmc_get_dev(int dev) return (block_dev_desc_t *)(&mmc_dev); } -unsigned long mmc_block_read(int dev, - unsigned long start, +unsigned long mmc_block_read(int dev, + unsigned long start, lbaint_t blkcnt, unsigned long *buffer) { @@ -52,7 +52,7 @@ unsigned long mmc_block_read(int dev, unsigned long addr = start; #ifdef MMC_DEBUG - printf("mmc_block_read: start=%lu, blkcnt=%lu\n", start, + printf("mmc_block_read: start=%lu, blkcnt=%lu\n", start, (unsigned long)blkcnt); #endif @@ -64,7 +64,7 @@ unsigned long mmc_block_read(int dev, rc++; addr++; p += hw_sect_size; - } + } return rc; } diff --git a/board/lpc2292sodimm/mmc_hw.c b/board/lpc2292sodimm/mmc_hw.c index 0b5ddf9..31f2a79 100644 --- a/board/lpc2292sodimm/mmc_hw.c +++ b/board/lpc2292sodimm/mmc_hw.c @@ -24,7 +24,7 @@ #define MMC_Enable() PUT32(IO1CLR, 1l << 22) #define MMC_Disable() PUT32(IO1SET, 1l << 22) -#define mmc_spi_cfg() spi_set_clock(8); spi_set_cfg(0, 1, 0); +#define mmc_spi_cfg() spi_set_clock(8); spi_set_cfg(0, 1, 0); static unsigned char Write_Command_MMC (unsigned char *CMD); static void MMC_Read_Block(unsigned char *CMD, unsigned char *Buffer, @@ -124,7 +124,7 @@ void MMC_Read_Block(unsigned char *CMD, unsigned char *Buffer, unsigned short MMC_Disable(); spi_unlock(); return; - } + } while (spi_read() != 0xfe) {}; for (a = 0; a < Bytes; a++) @@ -146,7 +146,7 @@ void MMC_Read_Block(unsigned char *CMD, unsigned char *Buffer, unsigned short unsigned char mmc_read_sector (unsigned long addr,unsigned char *Buffer) { /* Command 16 to read aBlocks from the MMC/SD - caed */ - unsigned char CMD[] = {0x51,0x00,0x00,0x00,0x00,0xFF}; + unsigned char CMD[] = {0x51,0x00,0x00,0x00,0x00,0xFF}; /* The addres on the MMC/SD-card is in bytes, addr is transformed from blocks to bytes and the result is @@ -171,7 +171,7 @@ unsigned char mmc_write_sector (unsigned long addr,unsigned char *Buffer) unsigned char tmp, a; unsigned short int b; /* Command 24 to write a block to the MMC/SD - card */ - unsigned char CMD[] = {0x58, 0x00, 0x00, 0x00, 0x00, 0xFF}; + unsigned char CMD[] = {0x58, 0x00, 0x00, 0x00, 0x00, 0xFF}; /* The addres on the MMC/SD-card is in bytes, addr is transformed from blocks to bytes and the result is @@ -193,14 +193,14 @@ unsigned char mmc_write_sector (unsigned long addr,unsigned char *Buffer) MMC_Disable(); spi_unlock(); return(tmp); - } + } /* Do a short delay and send a clock-pulse to the MMC/SD-card */ for (a = 0; a < 100; a++) spi_read(); /* Send a start byte to the MMC/SD-card */ - spi_write(0xFE); + spi_write(0xFE); /* Write the block (512 bytes) to the MMC/SD-card */ for (b = 0; b < 512; b++) diff --git a/board/lpc2292sodimm/spi.h b/board/lpc2292sodimm/spi.h index 64f088c..6ae66e8 100644 --- a/board/lpc2292sodimm/spi.h +++ b/board/lpc2292sodimm/spi.h @@ -79,6 +79,4 @@ static inline void spi_set_cfg(unsigned char phase, PUT8(S0SPCR, v); } - -#endif - +#endif /* SPI_H */ |