diff options
| author | Dean Camera <[email protected]> | 2010-07-29 16:20:45 +0000 | 
|---|---|---|
| committer | Dean Camera <[email protected]> | 2010-07-29 16:20:45 +0000 | 
| commit | 28401f7bb749350a66ebe95649d01a25c01842f7 (patch) | |
| tree | eff8174e307ea39ee7c1351fde7c23f0f33faf6c /Projects/TempDataLogger/Lib | |
| parent | ca007f91f2aa959a738649d35becb54cb1efc8b8 (diff) | |
| download | qmk_firmware-28401f7bb749350a66ebe95649d01a25c01842f7.tar.gz qmk_firmware-28401f7bb749350a66ebe95649d01a25c01842f7.zip | |
Spell check all source files once again to find any typos.
Diffstat (limited to 'Projects/TempDataLogger/Lib')
| -rw-r--r-- | Projects/TempDataLogger/Lib/DataflashManager.c | 122 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/FATFs/00readme.txt | 6 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/FATFs/diskio.c | 12 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/FATFs/diskio.h | 2 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/FATFs/ff.c | 16 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/FATFs/ffconf.h | 12 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/SCSI.c | 2 | 
7 files changed, 86 insertions, 86 deletions
| diff --git a/Projects/TempDataLogger/Lib/DataflashManager.c b/Projects/TempDataLogger/Lib/DataflashManager.c index 1750e15b3e..3cabda776b 100644 --- a/Projects/TempDataLogger/Lib/DataflashManager.c +++ b/Projects/TempDataLogger/Lib/DataflashManager.c @@ -30,7 +30,7 @@  /** \file   * - *  Functions to manage the physical dataflash media, including reading and writing of + *  Functions to manage the physical Dataflash media, including reading and writing of   *  blocks of data. These functions are called by the SCSI layer when data must be stored   *  or retrieved to/from the physical storage media. If a different media is used (such   *  as a SD card or EEPROM), functions similar to these will need to be generated. @@ -39,9 +39,9 @@  #define  INCLUDE_FROM_DATAFLASHMANAGER_C  #include "DataflashManager.h" -/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from +/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board Dataflash IC(s), from   *  the pre-selected data OUT endpoint. This routine reads in OS sized blocks from the endpoint and writes - *  them to the dataflash in Dataflash page sized blocks. + *  them to the Dataflash in Dataflash page sized blocks.   *   *  \param[in] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state   *  \param[in] BlockAddress  Data block starting address for the write sequence @@ -60,13 +60,13 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  	Dataflash_SelectChipFromPage(CurrDFPage);  #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE) -	/* Copy selected dataflash's current page contents to the dataflash buffer */ +	/* Copy selected dataflash's current page contents to the Dataflash buffer */  	Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);  	Dataflash_SendAddressBytes(CurrDFPage, 0);  	Dataflash_WaitWhileBusy();  #endif -	/* Send the dataflash buffer write command */ +	/* Send the Dataflash buffer write command */  	Dataflash_SendByte(DF_CMD_BUFF1WRITE);  	Dataflash_SendAddressBytes(0, CurrDFPageByte); @@ -78,7 +78,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  	{  		uint8_t BytesInBlockDiv16 = 0; -		/* Write an endpoint packet sized data block to the dataflash */ +		/* Write an endpoint packet sized data block to the Dataflash */  		while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))  		{  			/* Check if the endpoint is currently empty */ @@ -92,30 +92,30 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  				  return;  			} -			/* Check if end of dataflash page reached */ +			/* Check if end of Dataflash page reached */  			if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))  			{ -				/* Write the dataflash buffer contents back to the dataflash page */ +				/* Write the Dataflash buffer contents back to the Dataflash page */  				Dataflash_WaitWhileBusy();  				Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);  				Dataflash_SendAddressBytes(CurrDFPage, 0); -				/* Reset the dataflash buffer counter, increment the page counter */ +				/* Reset the Dataflash buffer counter, increment the page counter */  				CurrDFPageByteDiv16 = 0;  				CurrDFPage++; -				/* Once all the dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */ +				/* Once all the Dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */  				if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))  				  UsingSecondBuffer = !(UsingSecondBuffer); -				/* Select the next dataflash chip based on the new dataflash page index */ +				/* Select the next Dataflash chip based on the new Dataflash page index */  				Dataflash_SelectChipFromPage(CurrDFPage);  #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE) -				/* If less than one dataflash page remaining, copy over the existing page to preserve trailing data */ +				/* If less than one Dataflash page remaining, copy over the existing page to preserve trailing data */  				if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))  				{ -					/* Copy selected dataflash's current page contents to the dataflash buffer */ +					/* Copy selected dataflash's current page contents to the Dataflash buffer */  					Dataflash_WaitWhileBusy();  					Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);  					Dataflash_SendAddressBytes(CurrDFPage, 0); @@ -123,12 +123,12 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  				}  #endif -				/* Send the dataflash buffer write command */ +				/* Send the Dataflash buffer write command */  				Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2WRITE : DF_CMD_BUFF1WRITE);  				Dataflash_SendAddressBytes(0, 0);				  			} -			/* Write one 16-byte chunk of data to the dataflash */ +			/* Write one 16-byte chunk of data to the Dataflash */  			Dataflash_SendByte(Endpoint_Read_Byte());  			Dataflash_SendByte(Endpoint_Read_Byte());  			Dataflash_SendByte(Endpoint_Read_Byte()); @@ -146,7 +146,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  			Dataflash_SendByte(Endpoint_Read_Byte());  			Dataflash_SendByte(Endpoint_Read_Byte()); -			/* Increment the dataflash page 16 byte block counter */ +			/* Increment the Dataflash page 16 byte block counter */  			CurrDFPageByteDiv16++;  			/* Increment the block 16 byte block counter */ @@ -161,7 +161,7 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  		TotalBlocks--;  	} -	/* Write the dataflash buffer contents back to the dataflash page */ +	/* Write the Dataflash buffer contents back to the Dataflash page */  	Dataflash_WaitWhileBusy();  	Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);  	Dataflash_SendAddressBytes(CurrDFPage, 0x00); @@ -171,11 +171,11 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn  	if (!(Endpoint_IsReadWriteAllowed()))  	  Endpoint_ClearOUT(); -	/* Deselect all dataflash chips */ +	/* Deselect all Dataflash chips */  	Dataflash_DeselectChip();  } -/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board dataflash IC(s), into +/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board Dataflash IC(s), into   *  the pre-selected data IN endpoint. This routine reads in Dataflash page sized blocks from the Dataflash   *  and writes them in OS sized blocks to the endpoint.   * @@ -194,7 +194,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf  	/* Select the correct starting Dataflash IC for the block requested */  	Dataflash_SelectChipFromPage(CurrDFPage); -	/* Send the dataflash main memory page read command */ +	/* Send the Dataflash main memory page read command */  	Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);  	Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);  	Dataflash_SendByte(0x00); @@ -210,7 +210,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf  	{  		uint8_t BytesInBlockDiv16 = 0; -		/* Write an endpoint packet sized data block to the dataflash */ +		/* Write an endpoint packet sized data block to the Dataflash */  		while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))  		{  			/* Check if the endpoint is currently full */ @@ -224,17 +224,17 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf  				  return;  			} -			/* Check if end of dataflash page reached */ +			/* Check if end of Dataflash page reached */  			if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))  			{ -				/* Reset the dataflash buffer counter, increment the page counter */ +				/* Reset the Dataflash buffer counter, increment the page counter */  				CurrDFPageByteDiv16 = 0;  				CurrDFPage++; -				/* Select the next dataflash chip based on the new dataflash page index */ +				/* Select the next Dataflash chip based on the new Dataflash page index */  				Dataflash_SelectChipFromPage(CurrDFPage); -				/* Send the dataflash main memory page read command */ +				/* Send the Dataflash main memory page read command */  				Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);  				Dataflash_SendAddressBytes(CurrDFPage, 0);  				Dataflash_SendByte(0x00); @@ -243,7 +243,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf  				Dataflash_SendByte(0x00);  			}	 -			/* Read one 16-byte chunk of data from the dataflash */ +			/* Read one 16-byte chunk of data from the Dataflash */  			Endpoint_Write_Byte(Dataflash_ReceiveByte());  			Endpoint_Write_Byte(Dataflash_ReceiveByte());  			Endpoint_Write_Byte(Dataflash_ReceiveByte()); @@ -261,7 +261,7 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf  			Endpoint_Write_Byte(Dataflash_ReceiveByte());  			Endpoint_Write_Byte(Dataflash_ReceiveByte()); -			/* Increment the dataflash page 16 byte block counter */ +			/* Increment the Dataflash page 16 byte block counter */  			CurrDFPageByteDiv16++;  			/* Increment the block 16 byte block counter */ @@ -280,14 +280,14 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf  	if (!(Endpoint_IsReadWriteAllowed()))  	  Endpoint_ClearIN(); -	/* Deselect all dataflash chips */ +	/* Deselect all Dataflash chips */  	Dataflash_DeselectChip();  } -/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board dataflash IC(s), from +/** Writes blocks (OS blocks, not Dataflash pages) to the storage medium, the board Dataflash IC(s), from   *  the a given RAM buffer. This routine reads in OS sized blocks from the buffer and writes them to the - *  dataflash in Dataflash page sized blocks. This can be linked to FAT libraries to write files to the - *  dataflash. + *  Dataflash in Dataflash page sized blocks. This can be linked to FAT libraries to write files to the + *  Dataflash.   *   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write @@ -306,13 +306,13 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,  	Dataflash_SelectChipFromPage(CurrDFPage);  #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE) -	/* Copy selected dataflash's current page contents to the dataflash buffer */ +	/* Copy selected dataflash's current page contents to the Dataflash buffer */  	Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF1);  	Dataflash_SendAddressBytes(CurrDFPage, 0);  	Dataflash_WaitWhileBusy();  #endif -	/* Send the dataflash buffer write command */ +	/* Send the Dataflash buffer write command */  	Dataflash_SendByte(DF_CMD_BUFF1WRITE);  	Dataflash_SendAddressBytes(0, CurrDFPageByte); @@ -320,33 +320,33 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,  	{  		uint8_t BytesInBlockDiv16 = 0; -		/* Write an endpoint packet sized data block to the dataflash */ +		/* Write an endpoint packet sized data block to the Dataflash */  		while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))  		{ -			/* Check if end of dataflash page reached */ +			/* Check if end of Dataflash page reached */  			if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))  			{ -				/* Write the dataflash buffer contents back to the dataflash page */ +				/* Write the Dataflash buffer contents back to the Dataflash page */  				Dataflash_WaitWhileBusy();  				Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);  				Dataflash_SendAddressBytes(CurrDFPage, 0); -				/* Reset the dataflash buffer counter, increment the page counter */ +				/* Reset the Dataflash buffer counter, increment the page counter */  				CurrDFPageByteDiv16 = 0;  				CurrDFPage++; -				/* Once all the dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */ +				/* Once all the Dataflash ICs have had their first buffers filled, switch buffers to maintain throughput */  				if (Dataflash_GetSelectedChip() == DATAFLASH_CHIP_MASK(DATAFLASH_TOTALCHIPS))  				  UsingSecondBuffer = !(UsingSecondBuffer); -				/* Select the next dataflash chip based on the new dataflash page index */ +				/* Select the next Dataflash chip based on the new Dataflash page index */  				Dataflash_SelectChipFromPage(CurrDFPage);  #if (DATAFLASH_PAGE_SIZE > VIRTUAL_MEMORY_BLOCK_SIZE) -				/* If less than one dataflash page remaining, copy over the existing page to preserve trailing data */ +				/* If less than one Dataflash page remaining, copy over the existing page to preserve trailing data */  				if ((TotalBlocks * (VIRTUAL_MEMORY_BLOCK_SIZE >> 4)) < (DATAFLASH_PAGE_SIZE >> 4))  				{ -					/* Copy selected dataflash's current page contents to the dataflash buffer */ +					/* Copy selected dataflash's current page contents to the Dataflash buffer */  					Dataflash_WaitWhileBusy();  					Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_MAINMEMTOBUFF2 : DF_CMD_MAINMEMTOBUFF1);  					Dataflash_SendAddressBytes(CurrDFPage, 0); @@ -354,17 +354,17 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,  				}  #endif -				/* Send the dataflash buffer write command */ +				/* Send the Dataflash buffer write command */  				Dataflash_ToggleSelectedChipCS();  				Dataflash_SendByte(DF_CMD_BUFF1WRITE);  				Dataflash_SendAddressBytes(0, 0);  			} -			/* Write one 16-byte chunk of data to the dataflash */ +			/* Write one 16-byte chunk of data to the Dataflash */  			for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)  			  Dataflash_SendByte(*(BufferPtr++)); -			/* Increment the dataflash page 16 byte block counter */ +			/* Increment the Dataflash page 16 byte block counter */  			CurrDFPageByteDiv16++;  			/* Increment the block 16 byte block counter */ @@ -375,20 +375,20 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress,  		TotalBlocks--;  	} -	/* Write the dataflash buffer contents back to the dataflash page */ +	/* Write the Dataflash buffer contents back to the Dataflash page */  	Dataflash_WaitWhileBusy();  	Dataflash_SendByte(UsingSecondBuffer ? DF_CMD_BUFF2TOMAINMEMWITHERASE : DF_CMD_BUFF1TOMAINMEMWITHERASE);  	Dataflash_SendAddressBytes(CurrDFPage, 0x00);  	Dataflash_WaitWhileBusy(); -	/* Deselect all dataflash chips */ +	/* Deselect all Dataflash chips */  	Dataflash_DeselectChip();  } -/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board dataflash IC(s), into +/** Reads blocks (OS blocks, not Dataflash pages) from the storage medium, the board Dataflash IC(s), into   *  the a preallocated RAM buffer. This routine reads in Dataflash page sized blocks from the Dataflash   *  and writes them in OS sized blocks to the given buffer. This can be linked to FAT libraries to read - *  the files stored on the dataflash. + *  the files stored on the Dataflash.   *   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read @@ -405,7 +405,7 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress,  	/* Select the correct starting Dataflash IC for the block requested */  	Dataflash_SelectChipFromPage(CurrDFPage); -	/* Send the dataflash main memory page read command */ +	/* Send the Dataflash main memory page read command */  	Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);  	Dataflash_SendAddressBytes(CurrDFPage, CurrDFPageByte);  	Dataflash_SendByte(0x00); @@ -417,20 +417,20 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress,  	{  		uint8_t BytesInBlockDiv16 = 0; -		/* Write an endpoint packet sized data block to the dataflash */ +		/* Write an endpoint packet sized data block to the Dataflash */  		while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))  		{ -			/* Check if end of dataflash page reached */ +			/* Check if end of Dataflash page reached */  			if (CurrDFPageByteDiv16 == (DATAFLASH_PAGE_SIZE >> 4))  			{ -				/* Reset the dataflash buffer counter, increment the page counter */ +				/* Reset the Dataflash buffer counter, increment the page counter */  				CurrDFPageByteDiv16 = 0;  				CurrDFPage++; -				/* Select the next dataflash chip based on the new dataflash page index */ +				/* Select the next Dataflash chip based on the new Dataflash page index */  				Dataflash_SelectChipFromPage(CurrDFPage); -				/* Send the dataflash main memory page read command */ +				/* Send the Dataflash main memory page read command */  				Dataflash_SendByte(DF_CMD_MAINMEMPAGEREAD);  				Dataflash_SendAddressBytes(CurrDFPage, 0);  				Dataflash_SendByte(0x00); @@ -439,11 +439,11 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress,  				Dataflash_SendByte(0x00);  			}	 -			/* Read one 16-byte chunk of data from the dataflash */ +			/* Read one 16-byte chunk of data from the Dataflash */  			for (uint8_t ByteNum = 0; ByteNum < 16; ByteNum++)  			  *(BufferPtr++) = Dataflash_ReceiveByte(); -			/* Increment the dataflash page 16 byte block counter */ +			/* Increment the Dataflash page 16 byte block counter */  			CurrDFPageByteDiv16++;  			/* Increment the block 16 byte block counter */ @@ -454,14 +454,14 @@ void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress,  		TotalBlocks--;  	} -	/* Deselect all dataflash chips */ +	/* Deselect all Dataflash chips */  	Dataflash_DeselectChip();  } -/** Disables the dataflash memory write protection bits on the board Dataflash ICs, if enabled. */ +/** Disables the Dataflash memory write protection bits on the board Dataflash ICs, if enabled. */  void DataflashManager_ResetDataflashProtections(void)  { -	/* Select first dataflash chip, send the read status register command */ +	/* Select first Dataflash chip, send the read status register command */  	Dataflash_SelectChip(DATAFLASH_CHIP1);  	Dataflash_SendByte(DF_CMD_GETSTATUS); @@ -477,7 +477,7 @@ void DataflashManager_ResetDataflashProtections(void)  		Dataflash_SendByte(DF_CMD_SECTORPROTECTIONOFF[3]);  	} -	/* Select second dataflash chip (if present on selected board), send read status register command */ +	/* Select second Dataflash chip (if present on selected board), send read status register command */  	#if (DATAFLASH_TOTALCHIPS == 2)  	Dataflash_SelectChip(DATAFLASH_CHIP2);  	Dataflash_SendByte(DF_CMD_GETSTATUS); @@ -495,7 +495,7 @@ void DataflashManager_ResetDataflashProtections(void)  	}  	#endif -	/* Deselect current dataflash chip */ +	/* Deselect current Dataflash chip */  	Dataflash_DeselectChip();  } diff --git a/Projects/TempDataLogger/Lib/FATFs/00readme.txt b/Projects/TempDataLogger/Lib/FATFs/00readme.txt index fa2fa84c82..a34c951c93 100644 --- a/Projects/TempDataLogger/Lib/FATFs/00readme.txt +++ b/Projects/TempDataLogger/Lib/FATFs/00readme.txt @@ -41,14 +41,14 @@ REVISION HISTORY    Jun 01, 2006  R0.02  Added FAT12.                         Removed unbuffered mode. -                       Fixed a problem on small (<32M) patition. +                       Fixed a problem on small (<32M) partition.    Jun 10, 2006  R0.02a Added a configuration option _FS_MINIMUM.    Sep 22, 2006  R0.03  Added f_rename.                         Changed option _FS_MINIMUM to _FS_MINIMIZE. -  Dec 11, 2006  R0.03a Improved cluster scan algolithm to write files fast. +  Dec 11, 2006  R0.03a Improved cluster scan algorithm to write files fast.                         Fixed f_mkdir creates incorrect directory on FAT32.    Feb 04, 2007  R0.04  Supported multiple drive system. (FatFs) @@ -56,7 +56,7 @@ REVISION HISTORY                         Added f_mkfs. (FatFs)                         Added _USE_FAT32 option. (Tiny-FatFs) -  Apr 01, 2007  R0.04a Supported multiple partitions on a plysical drive. (FatFs) +  Apr 01, 2007  R0.04a Supported multiple partitions on a physical drive. (FatFs)                         Fixed an endian sensitive code in f_mkfs. (FatFs)                         Added a capability of extending the file size to f_lseek.                         Added minimization level 3. diff --git a/Projects/TempDataLogger/Lib/FATFs/diskio.c b/Projects/TempDataLogger/Lib/FATFs/diskio.c index d4f3897bb1..68c2aeb972 100644 --- a/Projects/TempDataLogger/Lib/FATFs/diskio.c +++ b/Projects/TempDataLogger/Lib/FATFs/diskio.c @@ -8,10 +8,10 @@  #include "diskio.h"  /*-----------------------------------------------------------------------*/ -/* Inidialize a Drive                                                    */ +/* Initialize a Drive                                                    */  DSTATUS disk_initialize ( -	BYTE drv				/* Physical drive nmuber (0..) */ +	BYTE drv				/* Physical drive number (0..) */  )  {  	return FR_OK; @@ -23,7 +23,7 @@ DSTATUS disk_initialize (  /* Return Disk Status                                                    */  DSTATUS disk_status ( -	BYTE drv		/* Physical drive nmuber (0..) */ +	BYTE drv		/* Physical drive number (0..) */  )  {  	return FR_OK; @@ -35,7 +35,7 @@ DSTATUS disk_status (  /* Read Sector(s)                                                        */  DRESULT disk_read ( -	BYTE drv,		/* Physical drive nmuber (0..) */ +	BYTE drv,		/* Physical drive number (0..) */  	BYTE *buff,		/* Data buffer to store read data */  	DWORD sector,	/* Sector address (LBA) */  	BYTE count		/* Number of sectors to read (1..255) */ @@ -52,7 +52,7 @@ DRESULT disk_read (  #if _READONLY == 0  DRESULT disk_write ( -	BYTE drv,			/* Physical drive nmuber (0..) */ +	BYTE drv,			/* Physical drive number (0..) */  	const BYTE *buff,	/* Data to be written */  	DWORD sector,		/* Sector address (LBA) */  	BYTE count			/* Number of sectors to write (1..255) */ @@ -69,7 +69,7 @@ DRESULT disk_write (  /* Miscellaneous Functions                                               */  DRESULT disk_ioctl ( -	BYTE drv,		/* Physical drive nmuber (0..) */ +	BYTE drv,		/* Physical drive number (0..) */  	BYTE ctrl,		/* Control code */  	void *buff		/* Buffer to send/receive control data */  ) diff --git a/Projects/TempDataLogger/Lib/FATFs/diskio.h b/Projects/TempDataLogger/Lib/FATFs/diskio.h index ad126712d1..5feb82f830 100644 --- a/Projects/TempDataLogger/Lib/FATFs/diskio.h +++ b/Projects/TempDataLogger/Lib/FATFs/diskio.h @@ -1,5 +1,5 @@  /*----------------------------------------------------------------------- -/  Low level disk interface modlue include file  R0.07   (C)ChaN, 2010 +/  Low level disk interface module include file  R0.07   (C)ChaN, 2010  /-----------------------------------------------------------------------*/  #ifndef _DISKIO diff --git a/Projects/TempDataLogger/Lib/FATFs/ff.c b/Projects/TempDataLogger/Lib/FATFs/ff.c index 236c86fbcd..7f4cd25fbb 100644 --- a/Projects/TempDataLogger/Lib/FATFs/ff.c +++ b/Projects/TempDataLogger/Lib/FATFs/ff.c @@ -1593,7 +1593,7 @@ FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */  			res = dir_find(dj);				/* Find it */  			ns = *(dj->fn+NS);  			if (res != FR_OK) {				/* Failed to find the object */ -				if (res != FR_NO_FILE) break;	/* Abort if any hard error occured */ +				if (res != FR_NO_FILE) break;	/* Abort if any hard error occurred */  				/* Object not found */  				if (_FS_RPATH && (ns & NS_DOT)) {	/* If dot entry is not exit */  					dj->sclust = 0; dj->dir = 0;	/* It is the root dir */ @@ -1710,7 +1710,7 @@ FRESULT chk_mounted (	/* FR_OK(0): successful, !=0: any error occurred */  	if (chk_wp && (stat & STA_PROTECT))	/* Check disk write protection if needed */  		return FR_WRITE_PROTECTED;  #endif -	/* Search FAT partition on the drive (Supports only generic partitionings, FDISK and SFD) */ +	/* Search FAT partition on the drive (Supports only generic partitions, FDISK and SFD) */  	fmt = check_fs(fs, bsect = 0);		/* Check sector 0 if it is a VBR */  	if (fmt == 1) {						/* Not an FAT-VBR, the disk may be partitioned */  		/* Check the partition listed in top of the partition table */ @@ -2569,7 +2569,7 @@ FRESULT f_opendir (  /*-----------------------------------------------------------------------*/ -/* Read Directory Entry in Sequense                                      */ +/* Read Directory Entry in Sequence                                      */  /*-----------------------------------------------------------------------*/  FRESULT f_readdir ( @@ -2943,7 +2943,7 @@ FRESULT f_chmod (  /*-----------------------------------------------------------------------*/ -/* Change Timestamp                                                      */ +/* Change Time-stamp                                                      */  /*-----------------------------------------------------------------------*/  FRESULT f_utime ( @@ -3361,18 +3361,18 @@ TCHAR* f_gets (  #if _LFN_UNICODE					/* Read a character in UTF-8 encoding */  		if (c >= 0x80) {  			if (c < 0xC0) continue;	/* Skip stray trailer */ -			if (c < 0xE0) {			/* Two-byte sequense */ +			if (c < 0xE0) {			/* Two-byte sequence */  				f_read(fil, s, 1, &rc);  				if (rc != 1) break;  				c = ((c & 0x1F) << 6) | (s[0] & 0x3F);  				if (c < 0x80) c = '?';  			} else { -				if (c < 0xF0) {		/* Three-byte sequense */ +				if (c < 0xF0) {		/* Three-byte sequence */  					f_read(fil, s, 2, &rc);  					if (rc != 2) break;  					c = (c << 12) | ((s[0] & 0x3F) << 6) | (s[1] & 0x3F);  					if (c < 0x800) c = '?'; -				} else {			/* Reject four-byte sequense */ +				} else {			/* Reject four-byte sequence */  					c = '?';  				}  			} @@ -3510,7 +3510,7 @@ int f_printf (  		case 'D' :					/* Signed decimal */  		case 'U' :					/* Unsigned decimal */  			r = 10; break; -		case 'X' :					/* Hexdecimal */ +		case 'X' :					/* Hexadecimal */  			r = 16; break;  		default:					/* Unknown */  			cc = f_putc(c, fil); continue; diff --git a/Projects/TempDataLogger/Lib/FATFs/ffconf.h b/Projects/TempDataLogger/Lib/FATFs/ffconf.h index cddced6cb1..1087c3a0ea 100644 --- a/Projects/TempDataLogger/Lib/FATFs/ffconf.h +++ b/Projects/TempDataLogger/Lib/FATFs/ffconf.h @@ -113,7 +113,7 @@  #define _FS_RPATH	0		/* 0:Disable or 1:Enable */  /* When _FS_RPATH is set to 1, relative path feature is enabled and f_chdir,  /  f_chdrive function are available. -/  Note that output of the f_readdir fnction is affected by this option. */ +/  Note that output of the f_readdir function is affected by this option. */ @@ -129,13 +129,13 @@  /* Maximum sector size to be handled.  /  Always set 512 for memory card and hard disk but a larger value may be  /  required for floppy disk (512/1024) and optical disk (512/2048). -/  When _MAX_SS is larger than 512, GET_SECTOR_SIZE command must be implememted +/  When _MAX_SS is larger than 512, GET_SECTOR_SIZE command must be implemented  /  to the disk_ioctl function. */ -#define	_MULTI_PARTITION	0	/* 0:Single parition or 1:Multiple partition */ +#define	_MULTI_PARTITION	0	/* 0:Single partition or 1:Multiple partition */  /* When _MULTI_PARTITION is set to 0, each volume is bound to the same physical -/ drive number and can mount only first primaly partition. When it is set to 1, +/ drive number and can mount only first primary partition. When it is set to 1,  / each volume is tied to the partitions listed in Drives[]. */ @@ -161,7 +161,7 @@  #define _FS_TIMEOUT		1000	/* Timeout period in unit of time ticks */  #define	_SYNC_t			HANDLE	/* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */  /* Include a header file here to define O/S system calls */ -/* #include <windows.h>, <ucos_ii.h.h>, <semphr.h> or ohters. */ +/* #include <windows.h>, <ucos_ii.h.h>, <semphr.h> or others. */  /* The _FS_REENTRANT option switches the reentrancy of the FatFs module.  / @@ -172,7 +172,7 @@  #define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */ -/* To enable file shareing feature, set _FS_SHARE to >= 1 and also user +/* To enable file sharing feature, set _FS_SHARE to >= 1 and also user     provided memory handlers, ff_memalloc and ff_memfree function must be     added to the project. The value defines number of files can be opened     per volume. */ diff --git a/Projects/TempDataLogger/Lib/SCSI.c b/Projects/TempDataLogger/Lib/SCSI.c index 390441aa11..6923f78199 100644 --- a/Projects/TempDataLogger/Lib/SCSI.c +++ b/Projects/TempDataLogger/Lib/SCSI.c @@ -241,7 +241,7 @@ static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInte  }  /** Command processing for an issued SCSI READ (10) or WRITE (10) command. This command reads in the block start address - *  and total number of blocks to process, then calls the appropriate low-level dataflash routine to handle the actual + *  and total number of blocks to process, then calls the appropriate low-level Dataflash routine to handle the actual   *  reading and writing of the data.   *   *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with | 
