[Horus] SD Storage started. UI continued.

+ Some boyscout work on LCD functions
This commit is contained in:
Bertrand Songis
2015-10-22 07:10:19 +02:00
parent d353f3c388
commit c8f77fceec
270 changed files with 2403 additions and 2474 deletions
-8
View File
@@ -246,18 +246,10 @@ void checkTrainerSettings()
}
// TODO
void eeDirty(uint8_t msk) { }
uint8_t s_eeDirtyMsk;
tmr10ms_t s_eeDirtyTime10ms;
void eeCheck(bool) { }
ModelHeader modelHeaders[MAX_MODELS];
void eeLoadModelHeaders() { }
void eeLoadModelHeader(uint8_t id, ModelHeader *header) { }
bool eeCopyModel(uint8_t dst, uint8_t src) { }
void eeSwapModels(uint8_t id1, uint8_t id2) { }
void eeDeleteModel(uint8_t idx) { }
uint8_t eeFindEmptyModel(uint8_t id, bool down) { return 0; };
void eeLoadModel(uint8_t id) { }
bool eeModelExists(uint8_t id) { return true; }
const pm_char * eeBackupModel(uint8_t i_fileSrc) { return NULL; }
const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name) { return NULL; }
+1 -1
View File
@@ -252,7 +252,7 @@ void ledBlue(void);
// LCD driver
void lcdInit(void);
void lcdRefresh(void);
void lcdDrawFilledRectDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color);
void lcdDrawSolidFilledRectDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color);
// Backlight driver
#define setBacklight(xx)
+1 -1
View File
@@ -439,7 +439,7 @@ void lcdInit(void)
LCD_SetTransparency(255);
}
void lcdDrawFilledRectDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color)
void lcdDrawSolidFilledRectDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color)
{
uint32_t addr = CurrentFrameBuffer + 2*(LCD_PIXEL_WIDTH*y + x);
uint16_t red = (0xF800 & color) >> 11;
@@ -32,10 +32,10 @@
//------------------------------------------------------------------------------
#include <string.h>
#include "Media.h"
#include "debug.h"
#include "board.h"
#include "../FatFs/diskio.h"
#include "../Sky9x/board.h"
#include "../Sky9x/Media.h"
//------------------------------------------------------------------------------
// Constants
@@ -40,16 +40,17 @@
#define board_h
#include <stdint.h>
#include "chip.h"
#include "../Sky9x/chip.h"
#if defined(REVA)
#include "AT91SAM3S2.h"
#include "../Sky9x/AT91SAM3S2.h"
#else
#include "AT91SAM3S4.h"
#include "../Sky9x/AT91SAM3S4.h"
#endif
#if !defined(SIMU)
#include "core_cm3.h"
#include "../Sky9x/core_cm3.h"
#endif
//------------------------------------------------------------------------------
@@ -97,7 +98,7 @@
// ADC
//------------------------------------------------------------------------------
/// Startup time max, return from Idle mode (in µs)
/// Startup time max, return from Idle mode (in �s)
#define ADC_STARTUP_TIME_MAX 15
/// Track and hold Acquisition Time min (in ns)
#define ADC_TRACK_HOLD_TIME_MIN 1200
@@ -39,7 +39,7 @@
* Headers
*----------------------------------------------------------------------------*/
#include "board.h"
#include "../Sky9x/board.h"
/*----------------------------------------------------------------------------
* Local definitions
@@ -42,11 +42,11 @@
/*-----------------------------------------------------------------------*/
#include <string.h>
#include "board.h"
#include "debug.h"
#include "../FatFs/diskio.h"
#include "../FatFs/ff.h"
#include "../CoOS/kernel/CoOS.h"
#include "../Sky9x/board.h"
#define CARD_TYPE_bmHC (1 << 0) /**< Bit for High-Capacity(Density) */
#define CARD_TYPE_bmSDMMC (0x3 << 1) /**< Bits mask for SD/MMC */
@@ -39,7 +39,7 @@
#ifndef SIMU
extern "C" {
#include "usb/device/massstorage/MSDDriver.h"
#include "../Sky9x/usb/device/massstorage/MSDDriver.h"
extern unsigned char MEDSdcard_Initialize(Media *media, unsigned char mciID);
}
@@ -38,7 +38,7 @@
// Headers
//-----------------------------------------------------------------------------
#include "USBConfigurationDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h"
//-----------------------------------------------------------------------------
// Exported functions
@@ -54,9 +54,9 @@
// Headers
//-----------------------------------------------------------------------------
#include "USBGenericDescriptor.h"
#include "USBInterfaceDescriptor.h"
#include "USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBInterfaceDescriptor.h"
//-----------------------------------------------------------------------------
// Definitions
@@ -42,7 +42,7 @@
#ifndef USBDEVICEDESCRIPTOR_H
#define USBDEVICEDESCRIPTOR_H
#include <board.h>
#include "../../../../Sky9x/board.h"
//------------------------------------------------------------------------------
// Definitions
//------------------------------------------------------------------------------
@@ -111,7 +111,7 @@ typedef struct {
unsigned char bLength;
/// Descriptor type (USBGenericDescriptor_OTG).
unsigned char bDescriptorType;
/// Attribute Fields D7…2: Reserved D1: HNP support D0: SRP support
/// Attribute Fields D7�2: Reserved D1: HNP support D0: SRP support
unsigned char bmAttributes;
} __attribute__ ((packed)) USBOtgDescriptor; // GCC
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBFeatureRequest.h"
#include "../../../../Sky9x/usb/common/core/USBFeatureRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -50,7 +50,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Definitions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGetDescriptorRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGetDescriptorRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -51,7 +51,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBInterfaceRequest.h"
#include "../../../../Sky9x/usb/common/core/USBInterfaceRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -51,7 +51,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -37,10 +37,9 @@
//------------------------------------------------------------------------------
// Headers
//------------------------------------------------------------------------------
#include <board.h>
#include <usb/device/core/USBD.h>
#include <exceptions.h>
#include "../../../../Sky9x/board.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBSetAddressRequest.h"
#include "../../../../Sky9x/usb/common/core/USBSetAddressRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -47,7 +47,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -38,7 +38,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBSetConfigurationRequest.h"
#include "../../../../Sky9x/usb/common/core/USBSetConfigurationRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -48,7 +48,7 @@
// Headers
//------------------------------------------------------------------------------
#include "USBGenericRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Exported functions
@@ -50,8 +50,8 @@
//------------------------------------------------------------------------------
// #include <board.h>
#include <usb/common/core/USBEndpointDescriptor.h>
#include <usb/common/core/USBGenericRequest.h>
#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
//------------------------------------------------------------------------------
// Compile Options
@@ -31,22 +31,22 @@
// Headers
//------------------------------------------------------------------------------
#include "USBDDriver.h"
#include "USBD.h"
#include <board.h>
#include "debug.h"
#include <usb/common/core/USBGenericDescriptor.h>
#include <usb/common/core/USBDeviceDescriptor.h>
#include <usb/common/core/USBConfigurationDescriptor.h>
#include <usb/common/core/USBDeviceQualifierDescriptor.h>
#include <usb/common/core/USBEndpointDescriptor.h>
#include <usb/common/core/USBFeatureRequest.h>
#include <usb/common/core/USBSetAddressRequest.h>
#include <usb/common/core/USBGetDescriptorRequest.h>
#include <usb/common/core/USBSetConfigurationRequest.h>
#include <usb/common/core/USBInterfaceRequest.h>
#include "../../../../Sky9x/usb/device/core/USBDDriver.h"
#include "debug.h"
#include <string.h>
#include "../../../../Sky9x/board.h"
#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBDeviceDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBDeviceQualifierDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBFeatureRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBGetDescriptorRequest.h"
#include "../../../../Sky9x/usb/common/core/USBInterfaceRequest.h"
#include "../../../../Sky9x/usb/common/core/USBSetAddressRequest.h"
#include "../../../../Sky9x/usb/common/core/USBSetConfigurationRequest.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
//------------------------------------------------------------------------------
// Local functions
@@ -419,8 +419,8 @@ static void USBDDriver_Test(unsigned char test)
//patterns, jitter, and any other dynamic waveform specifications.
//The test packet is made up by concatenating the following strings.
//(Note: For J/K NRZI data, and for NRZ data, the bit on the left is the first one
//transmitted. “S” indicates that a bit stuff occurs, which inserts an “extra” NRZI data bit.
//“* N” is used to indicate N occurrences of a string of bits or symbols.)
//transmitted. �S� indicates that a bit stuff occurs, which inserts an �extra� NRZI data bit.
//�* N� is used to indicate N occurrences of a string of bits or symbols.)
//A port in Test_Packet mode must send this packet repetitively. The inter-packet timing
//must be no less than the minimum allowable inter-packet gap as defined in Section 7.1.18 and
//no greater than 125 us.
@@ -433,7 +433,7 @@ static void USBDDriver_Test(unsigned char test)
case USBFeatureRequest_TESTJ:
//Test mode Test_J:
//Upon command, a port’s transceiver must enter the high-speed J state and remain in that
//Upon command, a port�s transceiver must enter the high-speed J state and remain in that
//state until the exit action is taken. This enables the testing of the high output drive
//level on the D+ line.
// Send ZLP
@@ -445,7 +445,7 @@ static void USBDDriver_Test(unsigned char test)
case USBFeatureRequest_TESTK:
//Test mode Test_K:
//Upon command, a port’s transceiver must enter the high-speed K state and remain in
//Upon command, a port�s transceiver must enter the high-speed K state and remain in
//that state until the exit action is taken. This enables the testing of the high output drive
//level on the D- line.
// Send a ZLP
@@ -456,7 +456,7 @@ static void USBDDriver_Test(unsigned char test)
case USBFeatureRequest_TESTSE0NAK:
//Test mode Test_SE0_NAK:
//Upon command, a port’s transceiver must enter the high-speed receive mode
//Upon command, a port�s transceiver must enter the high-speed receive mode
//and remain in that mode until the exit action is taken. This enables the testing
//of output impedance, low level output voltage, and loading characteristics.
//In addition, while in this mode, upstream facing ports (and only upstream facing ports)
@@ -50,8 +50,8 @@
// Headers
//------------------------------------------------------------------------------
#include "USBDDriverDescriptors.h"
#include <usb/common/core/USBGenericRequest.h>
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
#include "../../../../Sky9x/usb/device/core/USBDDriverDescriptors.h"
//------------------------------------------------------------------------------
// Types
@@ -43,9 +43,9 @@
// Headers
//------------------------------------------------------------------------------
#include <usb/common/core/USBDeviceDescriptor.h>
#include <usb/common/core/USBConfigurationDescriptor.h>
#include <usb/common/core/USBDeviceQualifierDescriptor.h>
#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBDeviceDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBDeviceQualifierDescriptor.h"
//------------------------------------------------------------------------------
// Types
@@ -41,11 +41,11 @@
// Headers
//------------------------------------------------------------------------------
#include "USBD.h"
#include <board.h>
#include "../../../../Sky9x/board.h"
#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
#include "debug.h"
#include <usb/common/core/USBEndpointDescriptor.h>
#include <usb/common/core/USBGenericRequest.h>
//------------------------------------------------------------------------------
// Local definitions
@@ -31,8 +31,9 @@
// Includes
//-----------------------------------------------------------------------------
#include "SBCMethods.h"
#include "MSDDStateMachine.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDDStateMachine.h"
#include "../../../../Sky9x/usb/device/massstorage/SBCMethods.h"
//-----------------------------------------------------------------------------
// Internal functions
@@ -51,8 +51,8 @@
// Headers
//-----------------------------------------------------------------------------
#include "MSD.h"
#include "MSDLun.h"
#include "../../../../Sky9x/usb/device/massstorage/MSD.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDLun.h"
#include "debug.h"
//-----------------------------------------------------------------------------
@@ -31,15 +31,16 @@
// Includes
//------------------------------------------------------------------------------
#include <Media.h>
#include "MSDDriver.h"
#include "MSDDriverDescriptors.h"
#include "SBCMethods.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDDriver.h"
#include "../../../../Sky9x/Media.h"
#include "../../../../Sky9x/usb/common/core/USBFeatureRequest.h"
#include "../../../../Sky9x/usb/common/core/USBGenericRequest.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
#include "../../../../Sky9x/usb/device/core/USBDDriver.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDDriverDescriptors.h"
#include "../../../../Sky9x/usb/device/massstorage/SBCMethods.h"
#include "debug.h"
#include <usb/common/core/USBGenericRequest.h>
#include <usb/common/core/USBFeatureRequest.h>
#include <usb/device/core/USBD.h>
#include <usb/device/core/USBDDriver.h>
//-----------------------------------------------------------------------------
// Internal variables
@@ -50,8 +50,8 @@
// Headers
//------------------------------------------------------------------------------
#include "MSD.h"
#include "MSDLun.h"
#include "../../../../Sky9x/usb/device/massstorage/MSD.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDLun.h"
// #include <utility/trace.h>
//------------------------------------------------------------------------------
@@ -31,16 +31,17 @@
// Headers
//------------------------------------------------------------------------------
#include "MSDDriverDescriptors.h"
#include <board.h>
#include <usb/common/core/USBGenericDescriptor.h>
#include <usb/common/core/USBDeviceDescriptor.h>
#include <usb/common/core/USBConfigurationDescriptor.h>
#include <usb/common/core/USBInterfaceDescriptor.h>
#include <usb/common/core/USBEndpointDescriptor.h>
#include <usb/common/core/USBStringDescriptor.h>
#include <usb/common/massstorage/MSDeviceDescriptor.h>
#include <usb/common/massstorage/MSInterfaceDescriptor.h>
#include "../../../../Sky9x/usb/device/massstorage/MSDDriverDescriptors.h"
#include "../../../../Sky9x/board.h"
#include "../../../../Sky9x/usb/common/core/USBConfigurationDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBDeviceDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBEndpointDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBGenericDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBInterfaceDescriptor.h"
#include "../../../../Sky9x/usb/common/core/USBStringDescriptor.h"
#include "../../../../Sky9x/usb/common/massstorage/MSDeviceDescriptor.h"
#include "../../../../Sky9x/usb/common/massstorage/MSInterfaceDescriptor.h"
//------------------------------------------------------------------------------
// Internal definitions
@@ -47,7 +47,7 @@
// Headers
//------------------------------------------------------------------------------
#include <usb/device/core/USBDDriverDescriptors.h>
#include "../../../../Sky9x/usb/device/core/USBDDriverDescriptors.h"
//------------------------------------------------------------------------------
// Definitions
@@ -32,9 +32,10 @@
//------------------------------------------------------------------------------
#include "MSDLun.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDLun.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
#include "debug.h"
#include <usb/device/core/USBD.h>
//------------------------------------------------------------------------------
// Constants
@@ -50,10 +50,10 @@
// Headers
//------------------------------------------------------------------------------
#include "SBC.h"
#include <Media.h>
#include <usb/device/massstorage/MSDIOFifo.h>
#include <usb/device/core/USBD.h>
#include "../../../../Sky9x/Media.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDIOFifo.h"
#include "../../../../Sky9x/usb/device/massstorage/SBC.h"
//------------------------------------------------------------------------------
// Definitions
@@ -31,11 +31,11 @@
// Headers
//------------------------------------------------------------------------------
#include "SBCMethods.h"
#include "MSDDStateMachine.h"
#include <usb/device/core/USBD.h>
#include "../../../../Sky9x/usb/device/massstorage/SBCMethods.h"
#include "MSDIOFifo.h"
#include "../../../../Sky9x/usb/device/core/USBD.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDDStateMachine.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDIOFifo.h"
//------------------------------------------------------------------------------
// Global variables
@@ -51,9 +51,8 @@
// Headers
//------------------------------------------------------------------------------
#include "SBC.h"
// #include <nand/MSDLun.h>
#include "MSDDStateMachine.h"
#include "../../../../Sky9x/usb/device/massstorage/MSDDStateMachine.h"
#include "../../../../Sky9x/usb/device/massstorage/SBC.h"
//------------------------------------------------------------------------------
// Definitions

Some files were not shown because too many files have changed in this diff Show More