summaryrefslogtreecommitdiff
path: root/usb-i2c-sl018
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-01-30 01:45:10 +0000
committerChristian Pointner <equinox@spreadspace.org>2013-01-30 01:45:10 +0000
commit3ced4d84d5dce6c3ec149137631b1bb9e3b7a0a2 (patch)
tree973987fc67e69bbc7e066032205e2973e0eeb958 /usb-i2c-sl018
parentsl018_reset as own function (diff)
name refactoring
git-svn-id: https://svn.spreadspace.org/avr/trunk@99 aa12f405-d877-488e-9caf-2d797e2a1cc7
Diffstat (limited to 'usb-i2c-sl018')
-rw-r--r--usb-i2c-sl018/tuer-rfid.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index a2eb1d6..69d23cc 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -163,7 +163,9 @@ void EVENT_USB_Device_Disconnect(void)
}
/* end LUFA CDC-ACM specific definitions*/
-int16_t stdio_BytesReceived(void)
+
+
+int16_t stdio_bytes_received(void)
{
if(stdio == &usb_stream)
return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
@@ -249,10 +251,10 @@ void flash_eeprom_from_stdio(void)
CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
USB_USBTask();
- int16_t BytesReceived = stdio_BytesReceived();
- while(BytesReceived >0) {
+ int16_t bytes_received = stdio_bytes_received();
+ while(bytes_received >0) {
keyslot[byte_pos++]=fgetc(stdio);
- BytesReceived--;
+ bytes_received--;
if (byte_pos == sizeof(keyslot)) {
byte_pos=0;
eeprom_update_block(&keyslot,&keyslots[keyslot_pos],sizeof(keyslot));
@@ -406,8 +408,8 @@ int main(void)
CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
USB_USBTask();
- int16_t BytesReceived = stdio_BytesReceived();
- if(BytesReceived > 0)
+ int16_t bytes_received = stdio_bytes_received();
+ if(bytes_received > 0)
handle_stdio(fgetc(stdio));
if(CARD_PRESENT != card_status) {