Update to latest libopenui

This commit is contained in:
Bertrand Songis
2020-03-18 17:06:14 +01:00
parent d542019582
commit 34aa1e4327
25 changed files with 172 additions and 173 deletions
-11
View File
@@ -71,17 +71,6 @@ Idle task stack size(word).
#define CFG_IDLE_STACK_SIZE (25)
#endif
/*!<
System frequency (Hz).
*/
#if defined(STM32F4)
#define CFG_CPU_FREQ (168000000)
#elif defined(STM32)
#define CFG_CPU_FREQ (120000000)
#else
#define CFG_CPU_FREQ (36000000) // TODO check if really correct for sky9x?
#endif
/*!<
systick frequency (Hz).
*/
+2 -1
View File
@@ -42,10 +42,11 @@
#ifndef _CPU_H
#define _CPU_H
#include "board.h"
#define NVIC_ST_CTRL (*((volatile U32 *)0xE000E010))
#define NVIC_ST_RELOAD (*((volatile U32 *)0xE000E014))
#define RELOAD_VAL ((U32)(( (U32)CFG_CPU_FREQ) / (U32)CFG_SYSTICK_FREQ) -1)
#define RELOAD_VAL ((U32)(( (U32)CPU_FREQ) / (U32)CFG_SYSTICK_FREQ) -1)
/*!< Initial System tick. */
#define InitSysTick() NVIC_ST_RELOAD = RELOAD_VAL; \
+10 -2
View File
@@ -5,12 +5,12 @@
#ifndef _DISKIO_DEFINED
#define _DISKIO_DEFINED
#include "ff.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "ff.h"
/* Status of Disk Functions */
typedef BYTE DSTATUS;
@@ -34,6 +34,14 @@ DRESULT disk_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count);
DRESULT disk_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count);
DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
#if defined(DISK_CACHE)
// #include "FatFs/diskio.h"
DRESULT __disk_read(BYTE drv, BYTE * buff, DWORD sector, UINT count);
DRESULT __disk_write(BYTE drv, const BYTE * buff, DWORD sector, UINT count);
#else
#define __disk_read disk_read
#define __disk_write disk_write
#endif
/* Disk Status Bits (DSTATUS) */
+2 -2
View File
@@ -22,12 +22,12 @@
#ifndef FF_DEFINED
#define FF_DEFINED 86604 /* Revision ID */
#include "ffconf.h" /* FatFs configuration options */
#ifdef __cplusplus
extern "C" {
#endif
#include "ffconf.h" /* FatFs configuration options */
#if FF_DEFINED != FFCONF_DEF
#error Wrong configuration file (ffconf.h).
#endif