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

View file

@ -32,13 +32,11 @@ 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)
@ -51,7 +49,8 @@ AT91S_DataFlashStatus AT91F_DataFlashSendCommand(
/* 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 */
@ -119,13 +118,13 @@ AT91S_DataFlashStatus AT91F_DataFlashGetStatus(AT91PS_DataflashDesc pDesc)
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;
@ -141,7 +140,6 @@ pDataFlashDesc, unsigned int timeout)
return DATAFLASH_OK; return DATAFLASH_OK;
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* Function Name : AT91F_DataFlashContinuousRead */ /* Function Name : AT91F_DataFlashContinuousRead */
/* Object : Continuous stream Read */ /* Object : Continuous stream Read */
@ -151,8 +149,7 @@ 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)
@ -175,7 +172,6 @@ AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
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)
@ -202,8 +197,8 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(
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;
@ -230,10 +226,10 @@ AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
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,8 +240,7 @@ 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,
@ -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;
@ -321,10 +317,10 @@ AT91S_DataFlashStatus AT91F_PageErase(
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;
@ -345,7 +340,8 @@ AT91S_DataFlashStatus AT91F_BlockErase(
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,8 +352,7 @@ 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)
{ {
@ -377,8 +372,8 @@ AT91S_DataFlashStatus AT91F_WriteBufferToMain (
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 */
@ -421,7 +414,8 @@ 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;
@ -448,11 +440,9 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
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)
@ -476,7 +466,8 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(
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);
@ -512,18 +503,14 @@ 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;
@ -537,11 +524,13 @@ int AT91F_DataFlashRead(
SizeToRead = (size < 0x8000) ? size : 0x8000; 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, if (AT91F_DataFlashContinuousRead(pDataFlash, addr,
(uchar *) buffer, SizeToRead) != DATAFLASH_OK) (uchar *) buffer,
SizeToRead) != DATAFLASH_OK)
return -1; return -1;
size -= SizeToRead; size -= SizeToRead;
@ -558,7 +547,8 @@ 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);