sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Ran Lindent on drivers/at45.c

This commit is contained in:
Peter Pearse 2007-09-04 14:25:51 +01:00
parent 557ab89d29
commit 6e4bf9b24e
1 changed files with 162 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
drivers/at45.c
View File

@ -27,31 +27,30 @@
/* /*
* spi.c API * spi.c API
*/ */
extern unsigned int AT91F_SpiWrite (AT91PS_DataflashDesc pDesc); extern unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc);
extern void AT91F_SpiEnable(int cs); extern void AT91F_SpiEnable(int cs);
#define AT91C_TIMEOUT_WRDY 200000 #define AT91C_TIMEOUT_WRDY 200000
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* \fn AT91F_DataFlashSendCommand */ /* \fn AT91F_DataFlashSendCommand */
/* \brief Generic function to send a command to the dataflash */ /* \brief Generic function to send a command to the dataflash */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashSendCommand( AT91S_DataFlashStatus AT91F_DataFlashSendCommand(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned char OpCode, unsigned char OpCode,
unsigned int CmdSize, unsigned int CmdSize,
unsigned int DataflashAddress) unsigned int DataflashAddress)
{ {
unsigned int adr; unsigned int adr;
if ( (pDataFlash->pDataFlashDesc->state) != IDLE) if ((pDataFlash->pDataFlashDesc->state) != IDLE)
return DATAFLASH_BUSY; return DATAFLASH_BUSY;
/* process the address to obtain page address and byte address */ /* process the address to obtain page address and byte address */
adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) << adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) <<
pDataFlash->pDevice->page_offset) + (DataflashAddress % pDataFlash->pDevice->page_offset) + (DataflashAddress %
(pDataFlash->pDevice->pages_size)); (pDataFlash->pDevice->
pages_size));
/* fill the command buffer */ /* fill the command buffer */
pDataFlash->pDataFlashDesc->command[0] = OpCode; pDataFlash->pDataFlashDesc->command[0] = OpCode;
@ -86,8 +85,8 @@ AT91S_DataFlashStatus AT91F_DataFlashSendCommand(
pDataFlash->pDataFlashDesc->rx_cmd_size = CmdSize; pDataFlash->pDataFlashDesc->rx_cmd_size = CmdSize;
/* send the command and read the data */ /* send the command and read the data */
return AT91F_SpiWrite (pDataFlash->pDataFlashDesc); } return AT91F_SpiWrite(pDataFlash->pDataFlashDesc);
}
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* \fn AT91F_DataFlashGetStatus */ /* \fn AT91F_DataFlashGetStatus */
@ -98,7 +97,7 @@ AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc)
AT91S_DataFlashStatus status; AT91S_DataFlashStatus status;
/* if a transfert is in progress ==> return 0 */ /* if a transfert is in progress ==> return 0 */
if( (pDesc->state) != IDLE) if ((pDesc->state) != IDLE)
return DATAFLASH_BUSY; return DATAFLASH_BUSY;
/* first send the read status command (D7H) */ /* first send the read status command (D7H) */
@ -112,36 +111,35 @@ AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc)
pDesc->rx_cmd_pt = pDesc->command; pDesc->rx_cmd_pt = pDesc->command;
pDesc->rx_cmd_size = 2; pDesc->rx_cmd_size = 2;
pDesc->tx_cmd_size = 2; pDesc->tx_cmd_size = 2;
status = AT91F_SpiWrite (pDesc); status = AT91F_SpiWrite(pDesc);
pDesc->DataFlash_state = *( (unsigned char *) (pDesc->rx_cmd_pt) +1); pDesc->DataFlash_state = *((unsigned char *)(pDesc->rx_cmd_pt) + 1);
return status; return status;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* \fn AT91F_DataFlashWaitReady */ /* \fn AT91F_DataFlashWaitReady */
/* \brief wait for dataflash ready (bit7 of the status register == 1) */ /* \brief wait for dataflash ready (bit7 of the status register == 1) */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc
pDataFlashDesc, unsigned int timeout) pDataFlashDesc,
unsigned int timeout)
{ {
pDataFlashDesc->DataFlash_state = IDLE; pDataFlashDesc->DataFlash_state = IDLE;
do { do {
AT91F_DataFlashGetStatus(pDataFlashDesc); AT91F_DataFlashGetStatus(pDataFlashDesc);
timeout--; timeout--;
} while( ((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) && } while (((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) &&
(timeout > 0) ); (timeout > 0));
if((pDataFlashDesc->DataFlash_state & 0x80) != 0x80) if ((pDataFlashDesc->DataFlash_state & 0x80) != 0x80)
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
return DATAFLASH_OK; return DATAFLASH_OK;
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashContinuousRead */ /* Function Name : AT91F_DataFlashContinuousRead */
/* Object : Continuous stream Read */ /* Object : Continuous stream Read */
@ -151,15 +149,14 @@ pDataFlashDesc, unsigned int timeout)
/* : <sizeToRead> = data buffer size */ /* : <sizeToRead> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashContinuousRead ( AT91S_DataFlashStatus AT91F_DataFlashContinuousRead(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
int src, int src,
unsigned char *dataBuffer, unsigned char *dataBuffer,
int sizeToRead ) int sizeToRead)
{ {
AT91S_DataFlashStatus status; AT91S_DataFlashStatus status;
/* Test the size to read in the device */ /* Test the size to read in the device */
if ( (src + sizeToRead) > if ((src + sizeToRead) >
(pDataFlash->pDevice->pages_size * (pDataFlash->pDevice->pages_size *
(pDataFlash->pDevice->pages_number))) (pDataFlash->pDevice->pages_number)))
return DATAFLASH_MEMORY_OVERFLOW; return DATAFLASH_MEMORY_OVERFLOW;
@ -172,10 +169,9 @@ AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
status = AT91F_DataFlashSendCommand status = AT91F_DataFlashSendCommand
(pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src); (pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src);
/* Send the command to the dataflash */ /* Send the command to the dataflash */
return(status); return (status);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashPagePgmBuf */ /* Function Name : AT91F_DataFlashPagePgmBuf */
/* Object : Main memory page program thru buffer 1 or buffer 2 */ /* Object : Main memory page program thru buffer 1 or buffer 2 */
@ -185,8 +181,7 @@ AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
/* : <SizeToWrite> = data buffer size */ /* : <SizeToWrite> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf( AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned char *src, unsigned char *src,
unsigned int dest, unsigned int dest,
unsigned int SizeToWrite) unsigned int SizeToWrite)
@ -201,9 +196,9 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(
/* Send the command to the dataflash */ /* Send the command to the dataflash */
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_PGM_BUF1, return (AT91F_DataFlashSendCommand(pDataFlash, DB_PAGE_PGM_BUF1,
cmdsize, dest)); } cmdsize, dest));
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_MainMemoryToBufferTransfert */ /* Function Name : AT91F_MainMemoryToBufferTransfert */
@ -213,9 +208,10 @@ cmdsize, dest)); }
/* : */ /* : */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert( AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(AT91PS_DataFlash
AT91PS_DataFlash pDataFlash, pDataFlash,
unsigned char BufferCommand, unsigned char
BufferCommand,
unsigned int page) unsigned int page)
{ {
int cmdsize; int cmdsize;
@ -229,11 +225,11 @@ AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, BufferCommand, cmdsize,
page*pDataFlash->pDevice->pages_size)); page *
pDataFlash->pDevice->pages_size));
} }
/*-------------------------------------------------------------------------- */ /*-------------------------------------------------------------------------- */
/* Function Name : AT91F_DataFlashWriteBuffer */ /* Function Name : AT91F_DataFlashWriteBuffer */
/* Object : Write data to the internal sram buffer 1 or 2 */ /* Object : Write data to the internal sram buffer 1 or 2 */
@ -244,12 +240,11 @@ page*pDataFlash->pDevice->pages_size));
/* : <SizeToWrite> = data buffer size */ /* : <SizeToWrite> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer ( AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned char BufferCommand, unsigned char BufferCommand,
unsigned char *dataBuffer, unsigned char *dataBuffer,
unsigned int bufferAddress, unsigned int bufferAddress,
int SizeToWrite ) int SizeToWrite)
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
@ -261,7 +256,7 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer (
if (bufferAddress > pDataFlash->pDevice->pages_size) if (bufferAddress > pDataFlash->pDevice->pages_size)
return DATAFLASH_BAD_ADDRESS; return DATAFLASH_BAD_ADDRESS;
if ( (pDataFlash->pDataFlashDesc->state) != IDLE) if ((pDataFlash->pDataFlashDesc->state) != IDLE)
return DATAFLASH_BUSY; return DATAFLASH_BUSY;
/* Send first Write Command */ /* Send first Write Command */
@ -271,14 +266,16 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer (
pDataFlash->pDataFlashDesc->command[2] = 0; pDataFlash->pDataFlashDesc->command[2] = 0;
pDataFlash->pDataFlashDesc->command[3] = pDataFlash->pDataFlashDesc->command[3] =
(unsigned char)(((unsigned int)(bufferAddress & (unsigned char)(((unsigned int)(bufferAddress &
pDataFlash->pDevice->byte_mask)) >> 8); pDataFlash->pDevice->
byte_mask)) >> 8);
pDataFlash->pDataFlashDesc->command[4] = pDataFlash->pDataFlashDesc->command[4] =
(unsigned char)((unsigned int)bufferAddress & 0x00FF); (unsigned char)((unsigned int)bufferAddress & 0x00FF);
cmdsize = 5; cmdsize = 5;
} else { } else {
pDataFlash->pDataFlashDesc->command[2] = pDataFlash->pDataFlashDesc->command[2] =
(unsigned char)(((unsigned int)(bufferAddress & (unsigned char)(((unsigned int)(bufferAddress &
pDataFlash->pDevice->byte_mask)) >> 8); pDataFlash->pDevice->
byte_mask)) >> 8);
pDataFlash->pDataFlashDesc->command[3] = pDataFlash->pDataFlashDesc->command[3] =
(unsigned char)((unsigned int)bufferAddress & 0x00FF); (unsigned char)((unsigned int)bufferAddress & 0x00FF);
pDataFlash->pDataFlashDesc->command[4] = 0; pDataFlash->pDataFlashDesc->command[4] = 0;
@ -308,8 +305,7 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer (
/* : */ /* : */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_PageErase( AT91S_DataFlashStatus AT91F_PageErase(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned int page) unsigned int page)
{ {
int cmdsize; int cmdsize;
@ -320,11 +316,11 @@ AT91S_DataFlashStatus AT91F_PageErase(
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, DB_PAGE_ERASE, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, DB_PAGE_ERASE, cmdsize,
page*pDataFlash->pDevice->pages_size)); page *
pDataFlash->pDevice->pages_size));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_BlockErase */ /* Function Name : AT91F_BlockErase */
/* Object : Erase a Block */ /* Object : Erase a Block */
@ -333,8 +329,7 @@ page*pDataFlash->pDevice->pages_size));
/* : */ /* : */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_BlockErase( AT91S_DataFlashStatus AT91F_BlockErase(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned int block) unsigned int block)
{ {
int cmdsize; int cmdsize;
@ -344,8 +339,9 @@ AT91S_DataFlashStatus AT91F_BlockErase(
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return(AT91F_DataFlashSendCommand (pDataFlash, DB_BLOCK_ERASE,cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, DB_BLOCK_ERASE, cmdsize,
block*8*pDataFlash->pDevice->pages_size)); block * 8 *
pDataFlash->pDevice->pages_size));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -356,17 +352,16 @@ block*8*pDataFlash->pDevice->pages_size));
/* : <dest> = main memory address */ /* : <dest> = main memory address */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_WriteBufferToMain ( AT91S_DataFlashStatus AT91F_WriteBufferToMain(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned char BufferCommand, unsigned char BufferCommand,
unsigned int dest ) unsigned int dest)
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is correct */ /* Test if the buffer command is correct */
if ((BufferCommand != DB_BUF1_PAGE_PGM) && if ((BufferCommand != DB_BUF1_PAGE_PGM) &&
(BufferCommand != DB_BUF1_PAGE_ERASE_PGM) && (BufferCommand != DB_BUF1_PAGE_ERASE_PGM) &&
(BufferCommand != DB_BUF2_PAGE_PGM) && (BufferCommand != DB_BUF2_PAGE_PGM) &&
(BufferCommand != DB_BUF2_PAGE_ERASE_PGM) ) (BufferCommand != DB_BUF2_PAGE_ERASE_PGM))
return DATAFLASH_BAD_COMMAND; return DATAFLASH_BAD_COMMAND;
/* no data to transmit or receive */ /* no data to transmit or receive */
@ -376,9 +371,9 @@ AT91S_DataFlashStatus AT91F_WriteBufferToMain (
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
/* Send the command to the dataflash */ /* Send the command to the dataflash */
return(AT91F_DataFlashSendCommand (pDataFlash, BufferCommand, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, BufferCommand, cmdsize,
dest)); } dest));
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_PartialPageWrite */ /* Function Name : AT91F_PartialPageWrite */
@ -387,8 +382,7 @@ AT91S_DataFlashStatus AT91F_WriteBufferToMain (
/* : <AdrInpage> = adr to begin the fading */ /* : <AdrInpage> = adr to begin the fading */
/* : <length> = Number of bytes to erase */ /* : <length> = Number of bytes to erase */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_PartialPageWrite ( AT91S_DataFlashStatus AT91F_PartialPageWrite(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned char *src, unsigned char *src,
unsigned int dest, unsigned int dest,
unsigned int size) unsigned int size)
@ -400,8 +394,7 @@ AT91S_DataFlashStatus AT91F_PartialPageWrite (
AdrInPage = dest % (pDataFlash->pDevice->pages_size); AdrInPage = dest % (pDataFlash->pDevice->pages_size);
/* Read the contents of the page in the Sram Buffer */ /* Read the contents of the page in the Sram Buffer */
AT91F_MainMemoryToBufferTransfert(pDataFlash, AT91F_MainMemoryToBufferTransfert(pDataFlash, DB_PAGE_2_BUF1_TRF, page);
DB_PAGE_2_BUF1_TRF, page);
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
/*Update the SRAM buffer */ /*Update the SRAM buffer */
@ -420,8 +413,9 @@ AT91S_DataFlashStatus AT91F_PartialPageWrite (
} }
/* Rewrite the modified Sram Buffer in the main memory */ /* Rewrite the modified Sram Buffer in the main memory */
return(AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM, return (AT91F_WriteBufferToMain(pDataFlash, DB_BUF1_PAGE_ERASE_PGM,
(page*pDataFlash->pDevice->pages_size))); (page *
pDataFlash->pDevice->pages_size)));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -431,11 +425,9 @@ AT91S_DataFlashStatus AT91F_PartialPageWrite (
/* : <dest> = dataflash adress */ /* : <dest> = dataflash adress */
/* : <size> = data buffer size */ /* : <size> = data buffer size */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWrite( AT91S_DataFlashStatus AT91F_DataFlashWrite(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash,
unsigned char *src, unsigned char *src,
int dest, int dest, int size)
int size )
{ {
unsigned int length; unsigned int length;
unsigned int page; unsigned int page;
@ -443,22 +435,20 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
AT91F_SpiEnable(pDataFlash->pDevice->cs); AT91F_SpiEnable(pDataFlash->pDevice->cs);
if ( (dest + size) > (pDataFlash->pDevice->pages_size * if ((dest + size) > (pDataFlash->pDevice->pages_size *
(pDataFlash->pDevice->pages_number))) (pDataFlash->pDevice->pages_number)))
return DATAFLASH_MEMORY_OVERFLOW; return DATAFLASH_MEMORY_OVERFLOW;
/* If destination does not fit a page start address */ /* If destination does not fit a page start address */
if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0 ) if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0) {
{
length = pDataFlash->pDevice->pages_size - length = pDataFlash->pDevice->pages_size -
(dest % (dest % ((unsigned int)
((unsigned int)
(pDataFlash->pDevice->pages_size))); (pDataFlash->pDevice->pages_size)));
if (size < length) if (size < length)
length = size; length = size;
if(!AT91F_PartialPageWrite(pDataFlash,src, dest, length)) if (!AT91F_PartialPageWrite(pDataFlash, src, dest, length))
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
@ -470,13 +460,14 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
src += length; src += length;
} }
while (( size - pDataFlash->pDevice->pages_size ) >= 0 ) { while ((size - pDataFlash->pDevice->pages_size) >= 0) {
/* program dataflash page */ /* program dataflash page */
page = (unsigned int)dest / (pDataFlash->pDevice->pages_size); page = (unsigned int)dest / (pDataFlash->pDevice->pages_size);
status = AT91F_DataFlashWriteBuffer(pDataFlash, status = AT91F_DataFlashWriteBuffer(pDataFlash,
DB_BUF1_WRITE, src, 0, DB_BUF1_WRITE, src, 0,
pDataFlash->pDevice->pages_size); pDataFlash->pDevice->
pages_size);
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY); AT91C_TIMEOUT_WRDY);
@ -486,9 +477,9 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
if (!status) if (!status)
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
status = AT91F_WriteBufferToMain (pDataFlash, status = AT91F_WriteBufferToMain(pDataFlash,
DB_BUF1_PAGE_PGM, dest); DB_BUF1_PAGE_PGM, dest);
if(!status) if (!status)
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
@ -501,9 +492,9 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
} }
/* If still some bytes to read */ /* If still some bytes to read */
if ( size > 0 ) { if (size > 0) {
/* program dataflash page */ /* program dataflash page */
if(!AT91F_PartialPageWrite(pDataFlash, src, dest, size) ) if (!AT91F_PartialPageWrite(pDataFlash, src, dest, size))
return DATAFLASH_ERROR; return DATAFLASH_ERROR;
AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
@ -512,36 +503,34 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
return DATAFLASH_OK; return DATAFLASH_OK;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashRead */ /* Function Name : AT91F_DataFlashRead */
/* Object : Read a block in dataflash */ /* Object : Read a block in dataflash */
/* Input Parameters : */ /* Input Parameters : */
/* Return value : */ /* Return value : */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int AT91F_DataFlashRead( int AT91F_DataFlashRead(AT91PS_DataFlash pDataFlash,
AT91PS_DataFlash pDataFlash, unsigned long addr, unsigned long size, char *buffer)
unsigned long addr,
unsigned long size,
char *buffer)
{ {
unsigned long SizeToRead; unsigned long SizeToRead;
AT91F_SpiEnable(pDataFlash->pDevice->cs); AT91F_SpiEnable(pDataFlash->pDevice->cs);
if(AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY) != DATAFLASH_OK)
return -1;
while (size) {
SizeToRead = (size < 0x8000)? size:0x8000;
if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) AT91C_TIMEOUT_WRDY) != DATAFLASH_OK)
return -1; return -1;
if (AT91F_DataFlashContinuousRead (pDataFlash, addr, while (size) {
(uchar *) buffer, SizeToRead) != DATAFLASH_OK) SizeToRead = (size < 0x8000) ? size : 0x8000;
if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc,
AT91C_TIMEOUT_WRDY) !=
DATAFLASH_OK)
return -1;
if (AT91F_DataFlashContinuousRead(pDataFlash, addr,
(uchar *) buffer,
SizeToRead) != DATAFLASH_OK)
return -1; return -1;
size -= SizeToRead; size -= SizeToRead;
@ -558,9 +547,10 @@ int AT91F_DataFlashRead(
/* Input Parameters : */ /* Input Parameters : */
/* Return value : Dataflash status register */ /* Return value : Dataflash status register */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc) { int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
{
AT91F_SpiEnable(cs); AT91F_SpiEnable(cs);
AT91F_DataFlashGetStatus(pDesc); AT91F_DataFlashGetStatus(pDesc);
return((pDesc->command[1] == 0xFF)? 0: pDesc->command[1] & 0x3C); return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C);
} }
#endif #endif