aboutsummaryrefslogtreecommitdiff
path: root/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2009-11-23 12:40:14 +0000
committerDean Camera <[email protected]>2009-11-23 12:40:14 +0000
commitaaa0bed556d0fa424b831418a7ce2531653a8b03 (patch)
tree53cbc38a5510a8a769e8ad0078c1e1124290554d /Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
parent6e867f7d9bc279a118fc774ab1ee05e99b4d8b7c (diff)
downloadqmk_firmware-aaa0bed556d0fa424b831418a7ce2531653a8b03.tar.gz
qmk_firmware-aaa0bed556d0fa424b831418a7ce2531653a8b03.zip
The incomplete StandaloneProgrammer project now uses Host and Device Mass storage classes, so that program data can either be loaded onto the device's Dataflash storage, or read off an attached USB memory stick.
The USB target family and allowable USB mode tokens are now public and documented (USB_CAN_BE_*, USB_SERIES_*_AVR). The SCSI_Request_Sense_Response_t and SCSI_Inquiry_Response_t type defines are now part of the Mass Storage Class driver common defines, rather than being defined in the Host mode Class driver section only. The USB_MODE_HOST token is now defined even when host mode is not available. Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver.
Diffstat (limited to 'Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h')
-rw-r--r--Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h23
1 files changed, 7 insertions, 16 deletions
diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
index 196b7ca727..698070af16 100644
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
@@ -42,7 +42,8 @@
#include <avr/power.h>
#include <stdio.h>
- #include "Descriptors.h"
+ #include "DiskDevice.h"
+ #include "DiskHost.h"
#include "Lib/SCSI.h"
#include "Lib/DataflashManager.h"
@@ -50,11 +51,8 @@
#include "Lib/PetiteFATFs/pff.h"
#include <LUFA/Version.h>
- #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Board/Buttons.h>
- #include <LUFA/Drivers/USB/USB.h>
- #include <LUFA/Drivers/USB/Class/MassStorage.h>
- #include <LUFA/Drivers/USB/Class/CDC.h>
+ #include <LUFA/Drivers/Peripheral/SerialStream.h>
/* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
@@ -73,22 +71,15 @@
#define LEDMASK_USB_BUSY (LEDS_LED2)
/* External Variables: */
- extern FILE USBSerialStream;
- extern FILE DataflashStream;
+ extern FILE DiskStream;
+ extern FATFS DiskFATState;
/* Function Prototypes: */
#if defined(INCLUDE_FROM_STANDALONEPROG_C)
- static int Dataflash_getchar(FILE* Stream);
+ static int Disk_getchar(FILE* Stream);
#endif
void SetupHardware(void);
void Programmer_Task(void);
-
- void EVENT_USB_Device_Connect(void);
- void EVENT_USB_Device_Disconnect(void);
- void EVENT_USB_Device_ConfigurationChanged(void);
- void EVENT_USB_Device_UnhandledControlRequest(void);
-
- bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);
-
+
#endif