diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-29 16:20:45 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-29 16:20:45 +0000 |
| commit | 28401f7bb749350a66ebe95649d01a25c01842f7 (patch) | |
| tree | eff8174e307ea39ee7c1351fde7c23f0f33faf6c /Projects | |
| parent | ca007f91f2aa959a738649d35becb54cb1efc8b8 (diff) | |
| download | lufa-28401f7bb749350a66ebe95649d01a25c01842f7.tar.gz lufa-28401f7bb749350a66ebe95649d01a25c01842f7.tar.bz2 lufa-28401f7bb749350a66ebe95649d01a25c01842f7.zip | |
Spell check all source files once again to find any typos.
Diffstat (limited to 'Projects')
34 files changed, 275 insertions, 275 deletions
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.txt b/Projects/AVRISP-MKII/AVRISP-MKII.txt index 15c2dab62..eb2c24410 100644 --- a/Projects/AVRISP-MKII/AVRISP-MKII.txt +++ b/Projects/AVRISP-MKII/AVRISP-MKII.txt @@ -55,7 +55,7 @@ * * Note that this design currently has the following limitations: * - No reversed/shorted target connector detection and notification - * - A seperate header is required for each of the ISP, PDI and TPI programming protocols that the user wishes to use + * - A separate header is required for each of the ISP, PDI and TPI programming protocols that the user wishes to use * * On AVR models with an ADC converter, AVCC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be * set to an appropriate ADC channel number in the project makefile for VTARGET detection to operate correctly. On models @@ -203,7 +203,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> diff --git a/Projects/Benito/Benito.txt b/Projects/Benito/Benito.txt index ab3098392..806397c6c 100644 --- a/Projects/Benito/Benito.txt +++ b/Projects/Benito/Benito.txt @@ -58,7 +58,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> @@ -94,7 +94,7 @@ * <tr> * <td>PING_PONG_LED_PULSE_MS</td> * <td>Makefile LUFA_OPTS</td> - * <td>Pulse length in milliseconds for the enumeration LED ping-poning between toggles.</td> + * <td>Pulse length in milliseconds for the enumeration LED ping-ponging between toggles.</td> * </tr> * <tr> * <td>RECEIVE_BUFFER_FLUSH_MS</td> diff --git a/Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.c b/Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.c index 4b55b8da8..ba498c99d 100644 --- a/Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.c +++ b/Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.c @@ -149,7 +149,7 @@ void SetupHardware(void) /* PWM speaker timer initialization */ TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP - TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, Fcpu speed + TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed } /** Event handler for the library USB Connection event. */ diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c index b274a1083..af6c865a6 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c +++ b/Projects/Incomplete/StandaloneProgrammer/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. @@ -40,9 +40,9 @@ #include "DataflashManager.h" #if defined(USB_CAN_BE_DEVICE) -/** 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 @@ -61,13 +61,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); @@ -79,7 +79,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 */ @@ -93,30 +93,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); @@ -124,12 +124,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()); @@ -147,7 +147,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 */ @@ -162,7 +162,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); @@ -172,11 +172,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. * @@ -195,7 +195,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); @@ -211,7 +211,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 */ @@ -225,17 +225,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); @@ -244,7 +244,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()); @@ -262,7 +262,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 */ @@ -281,14 +281,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 @@ -307,13 +307,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); @@ -321,33 +321,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); @@ -355,17 +355,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 */ @@ -376,20 +376,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 @@ -406,7 +406,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); @@ -418,20 +418,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); @@ -440,11 +440,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 */ @@ -455,14 +455,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); @@ -478,7 +478,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); @@ -496,7 +496,7 @@ void DataflashManager_ResetDataflashProtections(void) } #endif - /* Deselect current dataflash chip */ + /* Deselect current Dataflash chip */ Dataflash_DeselectChip(); } diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.h b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.h index 4e9aa76f4..43ba78403 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.h +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/diskio.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -/ PFF - Low level disk interface modlue include file (C)ChaN, 2010 +/ PFF - Low level disk interface module include file (C)ChaN, 2010 /-----------------------------------------------------------------------*/ #ifndef _DISKIO @@ -15,7 +15,7 @@ typedef BYTE DSTATUS; typedef enum { RES_OK = 0, /* 0: Function succeeded */ RES_ERROR, /* 1: Disk error */ - RES_STRERR, /* 2: Seream error */ + RES_STRERR, /* 2: Stream error */ RES_NOTRDY, /* 3: Not ready */ RES_PARERR /* 4: Invalid parameter */ } DRESULT; diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/pff.c b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/pff.c index b7b7fb8cb..85b88e6e1 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/pff.c +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/PetiteFATFs/pff.c @@ -3,7 +3,7 @@ /-----------------------------------------------------------------------------/ / Petit FatFs module is an open source software to implement FAT file system to / small embedded systems. This is a free software and is opened for education, -/ research and commercial developments under license policy of following trems. +/ research and commercial developments under license policy of following terms. / / Copyright (C) 2010, ChaN, all right reserved. / @@ -106,7 +106,7 @@ CLUST get_fat ( /* 1:IO error, Else:Cluster status */ #endif } - return 1; /* An error occured at the disk I/O layer */ + return 1; /* An error occurred at the disk I/O layer */ } @@ -167,7 +167,7 @@ FRESULT dir_rewind ( /*-----------------------------------------------------------------------*/ static -FRESULT dir_next ( /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and could not streach */ +FRESULT dir_next ( /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and could not stretch */ DIR *dj /* Pointer to directory object */ ) { @@ -310,7 +310,7 @@ FRESULT create_name ( sfn[i++] = c; } if (!i) return FR_INVALID_NAME; /* Reject null string */ - *path = &p[si]; /* Rerurn pointer to the next segment */ + *path = &p[si]; /* Rerun pointer to the next segment */ sfn[11] = (c < ' ') ? 1 : 0; /* Set last segment flag if end of path */ @@ -448,7 +448,7 @@ BYTE check_fs ( /* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2: /*-----------------------------------------------------------------------*/ -/* Mount/Unmount a Locical Drive */ +/* Mount/Unmount a Logical Drive */ /*-----------------------------------------------------------------------*/ FRESULT pf_mount ( @@ -480,7 +480,7 @@ FRESULT pf_mount ( } } if (fmt == 3) return FR_DISK_ERR; - if (fmt) return FR_NO_FILESYSTEM; /* No valid FAT patition is found */ + if (fmt) return FR_NO_FILESYSTEM; /* No valid FAT partition is found */ /* Initialize the file system object */ if (disk_readp(buf, bsect, 13, sizeof(buf))) return FR_DISK_ERR; @@ -491,7 +491,7 @@ FRESULT pf_mount ( fsize *= buf[BPB_NumFATs-13]; /* Number of sectors in FAT area */ fs->fatbase = bsect + LD_WORD(buf+BPB_RsvdSecCnt-13); /* FAT start sector (lba) */ fs->csize = buf[BPB_SecPerClus-13]; /* Number of sectors per cluster */ - fs->n_rootdir = LD_WORD(buf+BPB_RootEntCnt-13); /* Nmuber of root directory entries */ + fs->n_rootdir = LD_WORD(buf+BPB_RootEntCnt-13); /* Number of root directory entries */ tsect = LD_WORD(buf+BPB_TotSec16-13); /* Number of sectors on the file system */ if (!tsect) tsect = LD_DWORD(buf+BPB_TotSec32-13); mclst = (tsect /* Last cluster# + 1 */ @@ -688,7 +688,7 @@ FRESULT pf_lseek ( #if _USE_DIR /*-----------------------------------------------------------------------*/ -/* Create a Directroy Object */ +/* Create a Directory Object */ /*-----------------------------------------------------------------------*/ FRESULT pf_opendir ( @@ -733,7 +733,7 @@ FRESULT pf_opendir ( /*-----------------------------------------------------------------------*/ -/* Read Directory Entry in Sequense */ +/* Read Directory Entry in Sequence */ /*-----------------------------------------------------------------------*/ FRESULT pf_readdir ( diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c index 0bf6abdf7..29f97491d 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c @@ -242,7 +242,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 diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c index 4db5a568a..4b019bd37 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c @@ -40,7 +40,7 @@ /** Standard file stream for the currently open file on the disk. */ FILE DiskStream = FDEV_SETUP_STREAM(NULL, Disk_getchar, _FDEV_SETUP_READ); -/** Petite FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */ +/** Petite FAT Fs structure to hold the internal state of the FAT driver for the Dataflash contents. */ FATFS DiskFATState; /** Stream character fetching routine for the FAT driver so that characters from the currently open file can be @@ -68,7 +68,7 @@ void EVENT_USB_UIDChange(void) #endif /** Task to determine if the user is wishes to start the programming sequence, and if so executes the - * required functions to program the attached target (if any) with the files loaded to the dataflash. + * required functions to program the attached target (if any) with the files loaded to the Dataflash. */ void Programmer_Task(void) { diff --git a/Projects/LEDNotifier/LEDNotifier.txt b/Projects/LEDNotifier/LEDNotifier.txt index ee0a2eb85..db8d6225d 100644 --- a/Projects/LEDNotifier/LEDNotifier.txt +++ b/Projects/LEDNotifier/LEDNotifier.txt @@ -50,7 +50,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> @@ -59,4 +59,4 @@ * </td> * </tr> * </table> - */
\ No newline at end of file + */ diff --git a/Projects/Magstripe/Magstripe.txt b/Projects/Magstripe/Magstripe.txt index 29258ed49..d3dfd291b 100644 --- a/Projects/Magstripe/Magstripe.txt +++ b/Projects/Magstripe/Magstripe.txt @@ -97,7 +97,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> diff --git a/Projects/MissileLauncher/MissileLauncher.txt b/Projects/MissileLauncher/MissileLauncher.txt index d93c21da1..d9ffd57b3 100644 --- a/Projects/MissileLauncher/MissileLauncher.txt +++ b/Projects/MissileLauncher/MissileLauncher.txt @@ -47,7 +47,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> diff --git a/Projects/TempDataLogger/Lib/DataflashManager.c b/Projects/TempDataLogger/Lib/DataflashManager.c index 1750e15b3..3cabda776 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 fa2fa84c8..a34c951c9 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 d4f3897bb..68c2aeb97 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 ad126712d..5feb82f83 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 236c86fbc..7f4cd25fb 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 cddced6cb..1087c3a0e 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 390441aa1..6923f7819 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 diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index 7d88ba7bf..d26871bcc 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -89,7 +89,7 @@ uint8_t LoggingInterval500MS_SRAM; /** Total number of 500ms logging ticks elapsed since the last log value was recorded */ uint16_t CurrentLoggingTicks; -/** FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */ +/** FAT Fs structure to hold the internal state of the FAT driver for the Dataflash contents. */ FATFS DiskFATState; /** FAT Fs structure to hold a FAT file handle for the log data write destination. */ @@ -146,7 +146,7 @@ int main(void) if (LoggingInterval500MS_SRAM == 0xFF) LoggingInterval500MS_SRAM = DEFAULT_LOG_INTERVAL; - /* Mount and open the log file on the dataflash FAT partition */ + /* Mount and open the log file on the Dataflash FAT partition */ OpenLogFile(); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); @@ -230,7 +230,7 @@ void EVENT_USB_Device_Disconnect(void) { LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); - /* Mount and open the log file on the dataflash FAT partition */ + /* Mount and open the log file on the Dataflash FAT partition */ OpenLogFile(); } diff --git a/Projects/TempDataLogger/TemperatureDataLogger.txt b/Projects/TempDataLogger/TemperatureDataLogger.txt index d5a44ad6e..a3729a63d 100644 --- a/Projects/TempDataLogger/TemperatureDataLogger.txt +++ b/Projects/TempDataLogger/TemperatureDataLogger.txt @@ -67,7 +67,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value. + * The following defines can be found in this demo, which can control the demo behavior when defined, or changed in value. * * <table> * <tr> diff --git a/Projects/USBtoSerial/USBtoSerial.txt b/Projects/USBtoSerial/USBtoSerial.txt index e10b359bd..aacf63b2a 100644 --- a/Projects/USBtoSerial/USBtoSerial.txt +++ b/Projects/USBtoSerial/USBtoSerial.txt @@ -65,7 +65,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> @@ -79,4 +79,4 @@ * <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td> * </tr> * </table> - */
\ No newline at end of file + */ diff --git a/Projects/Webserver/Lib/DataflashManager.c b/Projects/Webserver/Lib/DataflashManager.c index 1750e15b3..3cabda776 100644 --- a/Projects/Webserver/Lib/DataflashManager.c +++ b/Projects/Webserver/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/Webserver/Lib/FATFs/00readme.txt b/Projects/Webserver/Lib/FATFs/00readme.txt index fa2fa84c8..a34c951c9 100644 --- a/Projects/Webserver/Lib/FATFs/00readme.txt +++ b/Projects/Webserver/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/Webserver/Lib/FATFs/diskio.c b/Projects/Webserver/Lib/FATFs/diskio.c index d81885c29..59ec70765 100644 --- a/Projects/Webserver/Lib/FATFs/diskio.c +++ b/Projects/Webserver/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) */ diff --git a/Projects/Webserver/Lib/FATFs/diskio.h b/Projects/Webserver/Lib/FATFs/diskio.h index bd9d223c0..81044d12e 100644 --- a/Projects/Webserver/Lib/FATFs/diskio.h +++ b/Projects/Webserver/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/Webserver/Lib/FATFs/ff.c b/Projects/Webserver/Lib/FATFs/ff.c index 236c86fbc..cd01f46c0 100644 --- a/Projects/Webserver/Lib/FATFs/ff.c +++ b/Projects/Webserver/Lib/FATFs/ff.c @@ -304,7 +304,7 @@ void unlock_fs ( /*-----------------------------------------------------------------------*/ -/* File shareing control functions */ +/* File sharing control functions */ /*-----------------------------------------------------------------------*/ #if _FS_SHARE @@ -495,7 +495,7 @@ DWORD get_fat ( /* 0xFFFFFFFF:Disk error, 1:Internal error, Else:Cluster status BYTE *p; - if (clst < 2 || clst >= fs->n_fatent) /* Chack range */ + if (clst < 2 || clst >= fs->n_fatent) /* Check range */ return 1; switch (fs->fs_type) { @@ -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 */ @@ -2527,7 +2527,7 @@ FRESULT f_lseek ( #if _FS_MINIMIZE <= 1 /*-----------------------------------------------------------------------*/ -/* Create a Directroy Object */ +/* Create a Directory Object */ /*-----------------------------------------------------------------------*/ FRESULT f_opendir ( @@ -2569,7 +2569,7 @@ FRESULT f_opendir ( /*-----------------------------------------------------------------------*/ -/* Read Directory Entry in Sequense */ +/* Read Directory Entry in Sequence */ /*-----------------------------------------------------------------------*/ FRESULT f_readdir ( @@ -2878,7 +2878,7 @@ FRESULT f_mkdir ( mem_set(dir, 0, SS(dj.fs)); } } - if (res == FR_OK) res = dir_register(&dj); /* Register the object to the directoy */ + if (res == FR_OK) res = dir_register(&dj); /* Register the object to the directory */ if (res != FR_OK) { remove_chain(dj.fs, dcl); /* Could not register, remove cluster chain */ } else { @@ -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/Webserver/Lib/FATFs/ffconf.h b/Projects/Webserver/Lib/FATFs/ffconf.h index ede977e92..044be252c 100644 --- a/Projects/Webserver/Lib/FATFs/ffconf.h +++ b/Projects/Webserver/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,7 +129,7 @@ /* 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. */ @@ -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/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c index 646410f3d..6378ebe44 100644 --- a/Projects/Webserver/Lib/HTTPServerApp.c +++ b/Projects/Webserver/Lib/HTTPServerApp.c @@ -77,7 +77,7 @@ const MIME_Type_t MIMETypes[] = {.Extension = "pdf", .MIMEType = "application/pdf"}, }; -/** FATFs structure to hold the internal state of the FAT driver for the dataflash contents. */ +/** FATFs structure to hold the internal state of the FAT driver for the Dataflash contents. */ FATFS DiskFATState; @@ -87,7 +87,7 @@ void HTTPServerApp_Init(void) /* Listen on port 80 for HTTP connections from hosts */ uip_listen(HTONS(HTTP_SERVER_PORT)); - /* Mount the dataflash disk via FatFS */ + /* Mount the Dataflash disk via FatFS */ f_mount(0, &DiskFATState); } diff --git a/Projects/Webserver/Lib/SCSI.c b/Projects/Webserver/Lib/SCSI.c index 7c40a3db7..8999fabb0 100644 --- a/Projects/Webserver/Lib/SCSI.c +++ b/Projects/Webserver/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 diff --git a/Projects/Webserver/Lib/uip/timer.c b/Projects/Webserver/Lib/uip/timer.c index 74eedf611..3c5fd202e 100644 --- a/Projects/Webserver/Lib/uip/timer.c +++ b/Projects/Webserver/Lib/uip/timer.c @@ -94,7 +94,7 @@ timer_reset(struct timer *t) * current time. * * \note A periodic timer will drift if this function is used to reset - * it. For preioric timers, use the timer_reset() function instead. + * it. For periodic timers, use the timer_reset() function instead. * * \param t A pointer to the timer. * diff --git a/Projects/Webserver/Lib/uip/uip-split.c b/Projects/Webserver/Lib/uip/uip-split.c index 5924fabe5..5fac6d53b 100644 --- a/Projects/Webserver/Lib/uip/uip-split.c +++ b/Projects/Webserver/Lib/uip/uip-split.c @@ -89,7 +89,7 @@ uip_split_output(void) /* Now, create the second packet. To do this, it is not enough to just alter the length field, but we must also update the TCP sequence number and point the uip_appdata to a new place in - memory. This place is detemined by the length of the first + memory. This place is determined by the length of the first packet (len1). */ uip_len = len2 + UIP_TCPIP_HLEN + UIP_LLH_LEN; #if UIP_CONF_IPV6 diff --git a/Projects/Webserver/Lib/uip/uip_arp.c b/Projects/Webserver/Lib/uip/uip_arp.c index 56dff9c43..b7e3b7342 100644 --- a/Projects/Webserver/Lib/uip/uip_arp.c +++ b/Projects/Webserver/Lib/uip/uip_arp.c @@ -364,7 +364,7 @@ uip_arp_out(void) struct arp_entry *tabptr = NULL; /* Find the destination IP address in the ARP table and construct - the Ethernet header. If the destination IP addres isn't on the + the Ethernet header. If the destination IP address isn't on the local network, we use the default router's IP address instead. If not ARP table entry is found, we overwrite the original IP diff --git a/Projects/Webserver/Webserver.txt b/Projects/Webserver/Webserver.txt index 97a9f1382..2e8e9bc5c 100644 --- a/Projects/Webserver/Webserver.txt +++ b/Projects/Webserver/Webserver.txt @@ -48,7 +48,7 @@ * \section SSec_Description Project Description: * * Simple HTTP webserver project. This project combines the LUFA library with the uIP TCP/IP full network stack and FatFS - * library to create a RNDIS host capable of serving out HTTP webpages to multiple hosts simultaneously. This project + * library to create a RNDIS host capable of serving out HTTP web pages to multiple hosts simultaneously. This project * demonstrates how the libraries can be combined into a robust network enabled application, with the addition of a RNDIS * network device. * @@ -63,13 +63,13 @@ * device being used for this project to work if the DHCP client is disabled (see \ref SSec_Options) - otherwise, the device * will query the network's DHCP server for these parameters automatically. * - * When properly configured, the webserver can be accessed from any HTTP webrowser by typing in the device's statically or + * When properly configured, the webserver can be accessed from any HTTP web browser by typing in the device's statically or * dynamically allocated IP address. The TELNET client can be accessed via any network socket app by connecting to the device * on port 23 on the device's statically or dynamically allocated IP address. * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> @@ -107,7 +107,7 @@ * <tr> * <td>MAX_URI_LENGTH</td> * <td>Makefile LUFA_OPTS</td> - * <td>Maximum length of a URI for the Webserver. This is the maximum file path, including subdirectories and seperators.</td> + * <td>Maximum length of a URI for the Webserver. This is the maximum file path, including subdirectories and separators.</td> * </tr> * </table> - */
\ No newline at end of file + */ diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt index e60ff783e..766dbf2d4 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.txt +++ b/Projects/XPLAINBridge/XPLAINBridge.txt @@ -47,7 +47,7 @@ * \section SSec_Description Project Description: * * This project serves a dual purpose. When loaded into the USB AVR on the XPLAIN board, it will act as either a USB to Serial - * converter for the XPLAIN's hardware USART (at a speed of 9600 baud), or an AVRStudio compaible PDI programmer for the XMEGA. + * converter for the XPLAIN's hardware USART (at a speed of 9600 baud), or an AVRStudio compatible PDI programmer for the XMEGA. * This project replaces the firmware preloaded onto the XPLAIN's onboard AT90USB1287 microcontroller. * * When power to the board is applied, the TDI pin (pin 9) of the USB AVR's JTAG port is read. If the pin is left high, the device @@ -70,7 +70,7 @@ * * \section SSec_Options Project Options * - * The following defines can be found in this project, which can control the project behaviour when defined, or changed in value. + * The following defines can be found in this project, which can control the project behavior when defined, or changed in value. * * <table> * <tr> @@ -90,4 +90,4 @@ * the code compatible with software such as avrdude (all platforms) that use the libUSB driver. * </tr> * </table> - */
\ No newline at end of file + */ |