projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Doxygen documentation build scripts to fail if any warnings are generated.
[pub/USBasp.git]
/
Projects
/
Incomplete
/
StandaloneProgrammer
/
StandaloneProgrammer.c
diff --git
a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
index
3f5d48b
..
cc79a83
100644
(file)
--- a/
Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
+++ b/
Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
1
.
+ Copyright (C) Dean Camera, 201
2
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
1
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-43,7
+43,6
@@
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. */
FATFS DiskFATState;
/** 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
* read in sequence when applied to a stdio stream.
*/
/** Stream character fetching routine for the FAT driver so that characters from the currently open file can be
* read in sequence when applied to a stdio stream.
*/
@@
-115,18
+114,15
@@
int main(void)
{
Programmer_Task();
{
Programmer_Task();
+ #if defined(USB_CAN_BE_HOST)
if (USB_CurrentMode == USB_MODE_Host)
if (USB_CurrentMode == USB_MODE_Host)
- {
- #if defined(USB_CAN_BE_HOST)
- DiskHost_USBTask();
- #endif
- }
- else
- {
- #if defined(USB_CAN_BE_DEVICE)
- DiskDevice_USBTask();
- #endif
- }
+ DiskHost_USBTask();
+ #endif
+
+ #if defined(USB_CAN_BE_DEVICE)
+ if (USB_CurrentMode == USB_MODE_Device)
+ DiskDevice_USBTask();
+ #endif
USB_USBTask();
}
USB_USBTask();
}