From 20b8555d476ced7b1ceae0f615a84fef6082a9a0 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Sat, 11 Aug 2018 14:49:48 +0100 Subject: [PATCH] Correct spelling mistakes. --- examples/custom-class/firmware/Makefile | 2 +- examples/drivertest/firmware/Makefile | 2 +- examples/drivertest/firmware/usbconfig.h | 4 ++-- examples/usbtool/Readme.txt | 2 +- libs-host/opendevice.c | 2 +- libs-host/opendevice.h | 2 +- tests/Makefile | 2 +- tests/usbconfig.h | 4 ++-- usbdrv/usbconfig-prototype.h | 4 ++-- usbdrv/usbdrvasm12.inc | 2 +- usbdrv/usbdrvasm128.inc | 2 +- usbdrv/usbdrvasm15.inc | 2 +- usbdrv/usbdrvasm16.inc | 2 +- usbdrv/usbdrvasm165.inc | 2 +- usbdrv/usbdrvasm18-crc.inc | 12 ++++++------ usbdrv/usbdrvasm18.inc | 10 +++++----- usbdrv/usbdrvasm20.inc | 4 ++-- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/custom-class/firmware/Makefile b/examples/custom-class/firmware/Makefile index a653e7f..f945d41 100644 --- a/examples/custom-class/firmware/Makefile +++ b/examples/custom-class/firmware/Makefile @@ -142,7 +142,7 @@ clean: # file targets: -# Since we don't want to ship the driver multipe times, we copy it into this project: +# Since we don't want to ship the driver multiple times, we copy it into this project: usbdrv: cp -r ../../../usbdrv . diff --git a/examples/drivertest/firmware/Makefile b/examples/drivertest/firmware/Makefile index 326072b..48fba69 100644 --- a/examples/drivertest/firmware/Makefile +++ b/examples/drivertest/firmware/Makefile @@ -142,7 +142,7 @@ clean: # file targets: -# Since we don't want to ship the driver multipe times, we copy it into this project: +# Since we don't want to ship the driver multiple times, we copy it into this project: usbdrv: cp -r ../../../usbdrv . diff --git a/examples/drivertest/firmware/usbconfig.h b/examples/drivertest/firmware/usbconfig.h index 7272869..d712dfc 100644 --- a/examples/drivertest/firmware/usbconfig.h +++ b/examples/drivertest/firmware/usbconfig.h @@ -81,7 +81,7 @@ section at the end of this file). /* The above macro defines the startup condition for data toggling on the * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. * Since the token is toggled BEFORE sending any data, the first packet is - * sent with the oposite value of this configuration! + * sent with the opposite value of this configuration! */ #define USB_CFG_IMPLEMENT_HALT 0 /* Define this to 1 if you also want to implement the ENDPOINT_HALT feature @@ -359,7 +359,7 @@ macro tuneOsccal /* The following configurations have working defaults in usbdrv.h. You * usually don't need to set them explicitly. Only if you want to run * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt + * which is not fully supported (such as IAR C) or if you use a different * interrupt than INT0, you may have to define some of these. */ //#define USB_INTR_CFG_SET ((1 << ISC01)) /* cfg for falling edge */ diff --git a/examples/usbtool/Readme.txt b/examples/usbtool/Readme.txt index 33f527c..125da1c 100644 --- a/examples/usbtool/Readme.txt +++ b/examples/usbtool/Readme.txt @@ -25,7 +25,7 @@ SYNOPSIS COMMANDS ======== list - This command prints a list of devices found on all available USB busses. + This command prints a list of devices found on all available USB buses. Options -v, -V, -p and -P can be used to filter the list. control in|out diff --git a/libs-host/opendevice.c b/libs-host/opendevice.c index ea88e86..1731e90 100644 --- a/libs-host/opendevice.c +++ b/libs-host/opendevice.c @@ -122,7 +122,7 @@ int errorCode = USBOPEN_ERR_NOTFOUND; usb_find_busses(); usb_find_devices(); for(bus = usb_get_busses(); bus; bus = bus->next){ - for(dev = bus->devices; dev; dev = dev->next){ /* iterate over all devices on all busses */ + for(dev = bus->devices; dev; dev = dev->next){ /* iterate over all devices on all buses */ if((vendorID == 0 || dev->descriptor.idVendor == vendorID) && (productID == 0 || dev->descriptor.idProduct == productID)){ char vendor[256], product[256], serial[256]; diff --git a/libs-host/opendevice.h b/libs-host/opendevice.h index c925276..3d2863f 100644 --- a/libs-host/opendevice.h +++ b/libs-host/opendevice.h @@ -37,7 +37,7 @@ int usbGetStringAscii(usb_dev_handle *dev, int index, char *buf, int buflen); */ int usbOpenDevice(usb_dev_handle **device, int vendorID, char *vendorNamePattern, int productID, char *productNamePattern, char *serialNamePattern, FILE *printMatchingDevicesFp, FILE *warningsFp); -/* This function iterates over all devices on all USB busses and searches for +/* This function iterates over all devices on all USB buses and searches for * a device. Matching is done first by means of Vendor- and Product-ID (passed * in 'vendorID' and 'productID'. An ID of 0 matches any numeric ID (wildcard). * When a device matches by its IDs, matching by names is performed. Name diff --git a/tests/Makefile b/tests/Makefile index 43f8da1..13f4b41 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -114,7 +114,7 @@ clean: # file targets: -# Since we don't want to ship the driver multipe times, we copy it into this project: +# Since we don't want to ship the driver multiple times, we copy it into this project: usbdrv: cp -r ../usbdrv . diff --git a/tests/usbconfig.h b/tests/usbconfig.h index e079e06..d73f162 100644 --- a/tests/usbconfig.h +++ b/tests/usbconfig.h @@ -68,7 +68,7 @@ features. Don't use it as a prototype, use usbconfig-prototype.h instead! /* The above macro defines the startup condition for data toggling on the * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. * Since the token is toggled BEFORE sending any data, the first packet is - * sent with the oposite value of this configuration! + * sent with the opposite value of this configuration! */ //#define USB_CFG_IMPLEMENT_HALT 0 /* Define this to 1 if you also want to implement the ENDPOINT_HALT feature @@ -284,7 +284,7 @@ features. Don't use it as a prototype, use usbconfig-prototype.h instead! /* The following configurations have working defaults in usbdrv.h. You * usually don't need to set them explicitly. Only if you want to run * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt + * which is not fully supported (such as IAR C) or if you use a different * interrupt than INT0, you may have to define some of these. */ /* #define USB_INTR_CFG MCUCR */ diff --git a/usbdrv/usbconfig-prototype.h b/usbdrv/usbconfig-prototype.h index 22dd9e8..466d8eb 100644 --- a/usbdrv/usbconfig-prototype.h +++ b/usbdrv/usbconfig-prototype.h @@ -93,7 +93,7 @@ section at the end of this file). /* The above macro defines the startup condition for data toggling on the * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. * Since the token is toggled BEFORE sending any data, the first packet is - * sent with the oposite value of this configuration! + * sent with the opposite value of this configuration! */ #define USB_CFG_IMPLEMENT_HALT 0 /* Define this to 1 if you also want to implement the ENDPOINT_HALT feature @@ -369,7 +369,7 @@ section at the end of this file). /* The following configurations have working defaults in usbdrv.h. You * usually don't need to set them explicitly. Only if you want to run * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt + * which is not fully supported (such as IAR C) or if you use a different * interrupt than INT0, you may have to define some of these. */ /* #define USB_INTR_CFG MCUCR */ diff --git a/usbdrv/usbdrvasm12.inc b/usbdrv/usbdrvasm12.inc index d3bd056..2266d3a 100644 --- a/usbdrv/usbdrvasm12.inc +++ b/usbdrv/usbdrvasm12.inc @@ -48,7 +48,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL diff --git a/usbdrv/usbdrvasm128.inc b/usbdrv/usbdrvasm128.inc index 8f67bcc..75e119d 100644 --- a/usbdrv/usbdrvasm128.inc +++ b/usbdrv/usbdrvasm128.inc @@ -108,7 +108,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL diff --git a/usbdrv/usbdrvasm15.inc b/usbdrv/usbdrvasm15.inc index 33bcf0e..1c76854 100644 --- a/usbdrv/usbdrvasm15.inc +++ b/usbdrv/usbdrvasm15.inc @@ -43,7 +43,7 @@ USB_INTR_VECTOR: ; sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ; sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL diff --git a/usbdrv/usbdrvasm16.inc b/usbdrv/usbdrvasm16.inc index 25b84e6..1007472 100644 --- a/usbdrv/usbdrvasm16.inc +++ b/usbdrv/usbdrvasm16.inc @@ -41,7 +41,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL diff --git a/usbdrv/usbdrvasm165.inc b/usbdrv/usbdrvasm165.inc index ae91588..fb79742 100644 --- a/usbdrv/usbdrvasm165.inc +++ b/usbdrv/usbdrvasm165.inc @@ -46,7 +46,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL diff --git a/usbdrv/usbdrvasm18-crc.inc b/usbdrv/usbdrvasm18-crc.inc index 0ff2f42..2b1df6e 100644 --- a/usbdrv/usbdrvasm18-crc.inc +++ b/usbdrv/usbdrvasm18-crc.inc @@ -56,7 +56,7 @@ of CPU cycles, but even an exact number of cycles! ; CRC algorithm: ; The crc register is formed by x3 (higher byte) and ZL (lower byte). The algorithm uses a 'reversed' form ; i.e. that it takes the least significant bit first and shifts to the right. So in fact the highest order -; bit seen from the polynomial devision point of view is the lsb of ZL. (If this sounds strange to you i +; bit seen from the polynomial division point of view is the lsb of ZL. (If this sounds strange to you i ; propose a research on CRC :-) ) ; Each data byte received is xored to ZL, the lower crc byte. This byte now builds the crc ; table index. Next the new high byte is loaded from the table and stored in x4 until we have space in x3 @@ -104,9 +104,9 @@ macro CRC_CLEANUP_AND_CHECK lpm ZL, Z ;[+6][+7][+8] eor ZL, x3 ;[+7] xor the old high byte with the value from the table, x2:ZL now holds the crc value cpi ZL, 0x01 ;[+8] if the crc is ok we have a fixed remainder value of 0xb001 in x2:ZL (see usb spec) - brne ignorePacket ;[+9] detected a crc fault -> paket is ignored and retransmitted by the host + brne ignorePacket ;[+9] detected a crc fault -> packet is ignored and retransmitted by the host cpi x2, 0xb0 ;[+10] - brne ignorePacket ;[+11] detected a crc fault -> paket is ignored and retransmitted by the host + brne ignorePacket ;[+11] detected a crc fault -> packet is ignored and retransmitted by the host endm @@ -122,7 +122,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL @@ -227,7 +227,7 @@ bitloopPid: ror shift ;[6] ldi ZL, 0x54 ;[7] ZL is the low order crc value ser x4 ;[8] the is no bit stuffing check here as the pid bit can't be stuffed. if so - ; some error occured. In this case the paket is discarded later on anyway. + ; some error occurred. In this case the packet is discarded later on anyway. mov x2, x1 ;[9] prepare for the next cycle brcc bitloopPid ;[10] while 0s drop out of shift we get the next bit eor x4, shift ;[11] invert all bits in shift and store result in x4 @@ -516,7 +516,7 @@ didunstuff5: lpm x4, Z ;[8] load the higher crc xor-byte and store it for later use ;[9] lpm needs 3 cycles ;[10] - ldi ZH, hi8(usbCrcTableLow);[11] load the lower crc xor byte adress + ldi ZH, hi8(usbCrcTableLow);[11] load the lower crc xor byte address ; bit6 in x1, USBIN ;[0] sample line state diff --git a/usbdrv/usbdrvasm18.inc b/usbdrv/usbdrvasm18.inc index e058bb9..0a8e973 100644 --- a/usbdrv/usbdrvasm18.inc +++ b/usbdrv/usbdrvasm18.inc @@ -72,9 +72,9 @@ macro POP_RETI ; 7 cycles ; lpm ZL, Z ;[+6][+7][+8] ; eor ZL, x3 ;[+7] xor the old high byte with the value from the table, x2:ZL now holds the crc value ; cpi ZL, 0x01 ;[+8] if the crc is ok we have a fixed remainder value of 0xb001 in x2:ZL (see usb spec) -; brne ignorePacket ;[+9] detected a crc fault -> paket is ignored and retransmitted by the host +; brne ignorePacket ;[+9] detected a crc fault -> packet is ignored and retransmitted by the host ; cpi x2, 0xb0 ;[+10] -; brne ignorePacket ;[+11] detected a crc fault -> paket is ignored and retransmitted by the host +; brne ignorePacket ;[+11] detected a crc fault -> packet is ignored and retransmitted by the host ; endm @@ -90,7 +90,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL @@ -180,7 +180,7 @@ bitloopPid: ror shift ;[6] nop ;[7] ZL is the low order crc value ser x4 ;[8] the is no bit stuffing check here as the pid bit can't be stuffed. if so - ; some error occured. In this case the paket is discarded later on anyway. + ; some error occurred. In this case the packet is discarded later on anyway. mov x2, x1 ;[9] prepare for the next cycle brcc bitloopPid ;[10] while 0s drop out of shift we get the next bit eor x4, shift ;[11] invert all bits in shift and store result in x4 @@ -468,7 +468,7 @@ didunstuff5: nop2 ;[8] load the higher crc xor-byte and store it for later use ;[9] lpm needs 3 cycles nop ;[10] - nop ;[11] load the lower crc xor byte adress + nop ;[11] load the lower crc xor byte address ; bit6 in x1, USBIN ;[0] sample line state diff --git a/usbdrv/usbdrvasm20.inc b/usbdrv/usbdrvasm20.inc index 5027edd..9de8cc7 100644 --- a/usbdrv/usbdrvasm20.inc +++ b/usbdrv/usbdrvasm20.inc @@ -57,7 +57,7 @@ USB_INTR_VECTOR: ;sync byte (D-) pattern LSb to MSb: 01010100 [1 = idle = J, 0 = K] ;sync up with J to K edge during sync pattern -- use fastest possible loops ;The first part waits at most 1 bit long since we must be in sync pattern. -;YL is guarenteed to be < 0x80 because I flag is clear. When we jump to +;YL is guaranteed to be < 0x80 because I flag is clear. When we jump to ;waitForJ, ensure that this prerequisite is met. waitForJ: inc YL @@ -144,7 +144,7 @@ b6checkUnstuff: dec bitcnt ;[9] breq unstuff6 ;[10] bit7: - subi cnt, 1 ;[11] cannot use dec becaus it does not affect the carry flag + subi cnt, 1 ;[11] cannot use dec because it does not affect the carry flag brcs overflow ;[12] Too many bytes received. Ignore packet in x1, USBIN ;[0] sample line state andi x1, USBMASK ;[1] filter only D+ and D- bits