fusee/sept: isolate common code for mariko preparation (to be revised during C++ rewrite)

fusee/common/fatfs/diskio.c

@@ -12,10 +12,19 @@
 #include "ff.h"         /* Obtains integer types */
 #include "diskio.h"     /* Declarations of disk functions */
 #include "ffconf.h"
-#include "../../device_partition.h"
 
+#if defined(FUSEE_STAGE1_SRC)
+#include "../../../fusee/fusee-primary/src/fs_utils.h"
+#elif defined(FUSEE_STAGE2_SRC)
+#include "../../../fusee/fusee-secondary/src/device_partition.h"
+#elif defined(SEPT_STAGE2_SRC)
+#include "../../../sept/sept-secondary/src/fs_utils.h"
+#endif
+
+#ifdef FUSEE_STAGE2_SRC
 /* fs_dev.c */
 extern device_partition_t *g_volume_to_devparts[FF_VOLUMES];
+#endif
 
 /*-----------------------------------------------------------------------*/
 /* Get Drive Status                                                      */
@@ -25,11 +34,15 @@ DSTATUS disk_status (
     BYTE pdrv       /* Physical drive nmuber to identify the drive */
 )
 {
+    #ifdef FUSEE_STAGE2_SRC
     device_partition_t *devpart = g_volume_to_devparts[pdrv];
     if (devpart)
         return devpart->initialized ? RES_OK : STA_NOINIT;
     else
         return STA_NODISK;
+    #else
+    return RES_OK;
+    #endif
 }
 
 
@@ -42,6 +55,7 @@ DSTATUS disk_initialize (
     BYTE pdrv               /* Physical drive nmuber to identify the drive */
 )
 {
+    #ifdef FUSEE_STAGE2_SRC
     /* We aren't using FF_MULTI_PARTITION, so pdrv = volume id. */
     device_partition_t *devpart = g_volume_to_devparts[pdrv];
     if (!devpart)
@@ -50,6 +64,9 @@ DSTATUS disk_initialize (
         return devpart->initializer(devpart) ? STA_NOINIT : RES_OK;
     else 
         return RES_OK;
+    #else
+    return RES_OK;
+    #endif
 }
 
 
@@ -65,6 +82,7 @@ DRESULT disk_read (
     UINT count      /* Number of sectors to read */
 )
 {
+    #ifdef FUSEE_STAGE2_SRC
     /* We aren't using FF_MULTI_PARTITION, so pdrv = volume id. */
     device_partition_t *devpart = g_volume_to_devparts[pdrv];
     if (!devpart)
@@ -73,6 +91,14 @@ DRESULT disk_read (
         return device_partition_read_data(devpart, buff, sector, count) ? RES_ERROR : RES_OK;
     else
         return RES_ERROR;
+    #else
+    switch (pdrv) {
+        case 0:
+            return sdmmc_device_read(&g_sd_device, sector, count, (void *)buff) ? RES_OK : RES_ERROR;
+        default:
+            return RES_PARERR;
+    }
+    #endif
 }
 
 
@@ -90,6 +116,7 @@ DRESULT disk_write (
     UINT count          /* Number of sectors to write */
 )
 {
+    #ifdef FUSEE_STAGE2_SRC
     /* We aren't using FF_MULTI_PARTITION, so pdrv = volume id. */
     device_partition_t *devpart = g_volume_to_devparts[pdrv];
     if (!devpart)
@@ -98,6 +125,14 @@ DRESULT disk_write (
         return device_partition_write_data(devpart, buff, sector, count) ? RES_ERROR : RES_OK;
     else
         return RES_ERROR;
+    #else
+    switch (pdrv) {
+        case 0:
+            return sdmmc_device_write(&g_sd_device, sector, count, (void *)buff) ? RES_OK : RES_ERROR;
+        default:
+            return RES_PARERR;
+    }
+    #endif
 }
 
 #endif
@@ -113,6 +148,8 @@ DRESULT disk_ioctl (
     void *buff      /* Buffer to send/receive control data */
 )
 {
+    #ifdef FUSEE_STAGE2_SRC
+    /* We aren't using FF_MULTI_PARTITION, so pdrv = volume id. */
     device_partition_t *devpart = g_volume_to_devparts[pdrv];
     switch (cmd) {
         case GET_SECTOR_SIZE:
@@ -121,5 +158,8 @@ DRESULT disk_ioctl (
         default:
             return RES_OK;
     }
+    #else
+    return RES_OK;
+    #endif
 }
 

fusee/common/fatfs/ffconf.h

@@ -49,8 +49,11 @@
 #define FF_USE_EXPAND	0
 /* This option switches f_expand function. (0:Disable or 1:Enable) */
 
-
+#ifdef FUSEE_STAGE2_SRC
 #define FF_USE_CHMOD	1
+#else
+#define FF_USE_CHMOD	0
+#endif
 /* This option switches attribute manipulation functions, f_chmod() and f_utime().
 /  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
 
@@ -149,8 +152,11 @@
 /   3: Unicode in UTF-8
 */
 
-
+#ifdef FUSEE_STAGE2_SRC
 #define FF_FS_RPATH		2
+#else
+#define FF_FS_RPATH		0
+#endif
 /* This option configures support for relative path.
 /
 /   0: Disable relative path and remove related functions.
@@ -162,13 +168,20 @@
 /*---------------------------------------------------------------------------/
 / Drive/Volume Configurations
 /---------------------------------------------------------------------------*/
-
+#ifdef FUSEE_STAGE2_SRC
 #define FF_VOLUMES		10
+#else
+#define FF_VOLUMES		1
+#endif
 /* Number of volumes (logical drives) to be used. (1-10) */
 
-
+#ifdef FUSEE_STAGE2_SRC
 #define FF_STR_VOLUME_ID	1
 //#define FF_VOLUME_STRS		"sdmc"
+#else
+#define FF_STR_VOLUME_ID	0
+#define FF_VOLUME_STRS		"sdmc"
+#endif
 /* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
 /  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
 /  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
@@ -191,7 +204,11 @@
 
 
 #define FF_MIN_SS		512
+#ifdef FUSEE_STAGE2_SRC
 #define FF_MAX_SS		4096
+#else
+#define FF_MAX_SS		512
+#endif
 /* This set of options configures the range of sector size to be supported. (512,
 /  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
 /  harddisk. But a larger value may be required for on-board flash memory and some

fusee/common/log.c

@@ -15,11 +15,16 @@
  */
 
 #include "log.h"
-#include "../console.h"
 
+#ifdef FUSEE_STAGE2_SRC
+#include "../../../fusee/fusee-secondary/src/console.h"
 #include <stdio.h>
+#else
+#include "display/video_fb.h"
+#include "vsprintf.h"
+#endif
 
-/* default log level for screen output */
+/* Default log level for screen output. */
 ScreenLogLevel g_screen_log_level = SCREEN_LOG_LEVEL_NONE;
 
 void log_set_log_level(ScreenLogLevel log_level) {
@@ -31,14 +36,18 @@ ScreenLogLevel log_get_log_level() {
 }
 
 void log_to_uart(const char *message) {
-    /* TODO: add UART logging */
+    /* TODO: Add UART logging. */
 }
 
 static void print_to_screen(ScreenLogLevel screen_log_level, char *message) {
-    /* don't print to screen if below log level */
+    /* Don't print to screen if below log level */
     if(screen_log_level > g_screen_log_level) return;
-
+    
+    #ifdef FUSEE_STAGE2_SRC
     printf(message);
+    #else
+    video_puts(message);
+    #endif
 }
 
 /**
@@ -53,10 +62,10 @@ void vprint(ScreenLogLevel screen_log_level, const char *fmt, va_list args)
     char buf[PRINT_MESSAGE_MAX_LENGTH];
     vsnprintf(buf, PRINT_MESSAGE_MAX_LENGTH, fmt, args);
 
-    /* we don't need that flag here, but if it gets used, strip it so we print correctly */
+    /* We don't need that flag here, but if it gets used, strip it so we print correctly. */
     screen_log_level &= ~SCREEN_LOG_LEVEL_NO_PREFIX;
 
-    /* log to UART */
+    /* Log to UART. */
     log_to_uart(buf);
 
     print_to_screen(screen_log_level, buf);
@@ -65,8 +74,8 @@ void vprint(ScreenLogLevel screen_log_level, const char *fmt, va_list args)
 static void add_prefix(ScreenLogLevel screen_log_level, const char *fmt, char *buf) {
     char typebuf[] = "[%s] %s";
 
-    /* apply prefix and append message format */
+    /* Apply prefix and append message format. */
-    /* TODO: add coloring to the output */
+    /* TODO: Add coloring to the output. */
     switch(screen_log_level)
     {
         case SCREEN_LOG_LEVEL_ERROR:
@@ -91,7 +100,7 @@ static void add_prefix(ScreenLogLevel screen_log_level, const char *fmt, char *b
 
 /**
  * print - logs a message and prints it to screen based on its screen_log_level
- *
+ * 
  * If the level is below g_screen_log_level it will not be shown but logged to UART
  * Use SCREEN_LOG_LEVEL_NO_PREFIX if you don't want a prefix to be added
  * UART is TODO
@@ -101,14 +110,16 @@ void print(ScreenLogLevel screen_log_level, const char * fmt, ...)
     char buf[PRINT_MESSAGE_MAX_LENGTH] = {};
     char message[PRINT_MESSAGE_MAX_LENGTH] = {};
 
-    /* Make splash disappear if level is ERROR or WARNING */
+    /* Make splash disappear if level is ERROR or WARNING. */
+    #ifdef FUSEE_STAGE2_SRC
     if (screen_log_level < SCREEN_LOG_LEVEL_MANDATORY) {
         console_resume();
     }
+    #endif
 
-    /* make prefix free messages with log_level possible */
+    /* Make prefix free messages with log_level possible. */
     if(screen_log_level & SCREEN_LOG_LEVEL_NO_PREFIX) {
-        /* remove the NO_PREFIX flag so the enum can be recognized later on */
+        /* Remove the NO_PREFIX flag so the enum can be recognized later on. */
         screen_log_level &= ~SCREEN_LOG_LEVEL_NO_PREFIX;
 
         snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, "%s", fmt);
@@ -117,13 +128,13 @@ void print(ScreenLogLevel screen_log_level, const char * fmt, ...)
         add_prefix(screen_log_level, fmt, buf);
     }
 
-    /* input arguments */
+    /* Input arguments. */
     va_list args;
     va_start(args, fmt);
     vsnprintf(message, PRINT_MESSAGE_MAX_LENGTH, buf, args);
     va_end(args);
 
-    /* log to UART */
+    /* Log to UART. */
     log_to_uart(message);
 
     print_to_screen(screen_log_level, message);

fusee/common/log.h

@@ -25,11 +25,11 @@ typedef enum {
     SCREEN_LOG_LEVEL_NONE       = 0,
     SCREEN_LOG_LEVEL_ERROR      = 1,
     SCREEN_LOG_LEVEL_WARNING    = 2,
-    SCREEN_LOG_LEVEL_MANDATORY  = 3, /* no log prefix */
+    SCREEN_LOG_LEVEL_MANDATORY  = 3,    /* No log prefix. */
     SCREEN_LOG_LEVEL_INFO       = 4,
     SCREEN_LOG_LEVEL_DEBUG      = 5,
 
-    SCREEN_LOG_LEVEL_NO_PREFIX  = 0x100 /* OR this to your LOG_LEVEL to prevent prefix creation */
+    SCREEN_LOG_LEVEL_NO_PREFIX  = 0x100 /* OR this to your LOG_LEVEL to prevent prefix creation. */
 } ScreenLogLevel;
 
 extern ScreenLogLevel g_screen_log_level;

fusee/common/sdmmc/sdmmc.c

@@ -25,7 +25,14 @@
 #include "sdmmc.h"
 #include "mmc.h"
 #include "sd.h"
-#include "../timers.h"
+
+#if defined(FUSEE_STAGE1_SRC)
+#include "../../../fusee/fusee-primary/src/timers.h"
+#elif defined(FUSEE_STAGE2_SRC)
+#include "../../../fusee/fusee-secondary/src/timers.h"
+#elif defined(SEPT_STAGE2_SRC)
+#include "../../../sept/sept-secondary/src/timers.h"
+#endif
 
 #define UNSTUFF_BITS(resp,start,size)                               \
 ({                                                                  \

fusee/common/sdmmc/sdmmc_core.c

@@ -23,14 +23,32 @@
 #include <inttypes.h>
 
 #include "sdmmc_core.h"
-#include "../car.h"
+#if defined(FUSEE_STAGE1_SRC)
-#include "../pinmux.h"
+#include "../../../fusee/fusee-primary/src/car.h"
-#include "../timers.h"
+#include "../../../fusee/fusee-primary/src/pinmux.h"
-#include "../apb_misc.h"
+#include "../../../fusee/fusee-primary/src/timers.h"
-#include "../gpio.h"
+#include "../../../fusee/fusee-primary/src/apb_misc.h"
-#include "../pmc.h"
+#include "../../../fusee/fusee-primary/src/gpio.h"
-#include "../max7762x.h"
+#include "../../../fusee/fusee-primary/src/pmc.h"
-#include "../lib/log.h"
+#include "../../../fusee/fusee-primary/src/max7762x.h"
+#elif defined(FUSEE_STAGE2_SRC)
+#include "../../../fusee/fusee-secondary/src/car.h"
+#include "../../../fusee/fusee-secondary/src/pinmux.h"
+#include "../../../fusee/fusee-secondary/src/timers.h"
+#include "../../../fusee/fusee-secondary/src/apb_misc.h"
+#include "../../../fusee/fusee-secondary/src/gpio.h"
+#include "../../../fusee/fusee-secondary/src/pmc.h"
+#include "../../../fusee/fusee-secondary/src/max7762x.h"
+#elif defined(SEPT_STAGE2_SRC)
+#include "../../../sept/sept-secondary/src/car.h"
+#include "../../../sept/sept-secondary/src/pinmux.h"
+#include "../../../sept/sept-secondary/src/timers.h"
+#include "../../../sept/sept-secondary/src/apb_misc.h"
+#include "../../../sept/sept-secondary/src/gpio.h"
+#include "../../../sept/sept-secondary/src/pmc.h"
+#include "../../../sept/sept-secondary/src/max7762x.h"
+#endif
+#include "../log.h"
 
 static void sdmmc_print(sdmmc_t *sdmmc, ScreenLogLevel screen_log_level, char *fmt, va_list list)
 {

fusee/fusee-mtc/Makefile

@@ -27,7 +27,7 @@ endif
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	src src/lib src/display
+SOURCES		:=	src ../../fusee/common ../../fusee/common/display
 DATA		:=	data
 INCLUDES	:=	include ../../libraries/libvapours/include
 
@@ -35,7 +35,7 @@ INCLUDES	:=	include ../../libraries/libvapours/include
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-DEFINES :=	-D__BPMP__ -DFUSEE_STAGE1_SRC -DATMOSPHERE_GIT_BRANCH=\"$(AMSBRANCH)\" -DATMOSPHERE_GIT_REV=\"$(AMSREV)\"
+DEFINES :=	-D__BPMP__ -DFUSEE_MTC_SRC -DATMOSPHERE_GIT_BRANCH=\"$(AMSBRANCH)\" -DATMOSPHERE_GIT_REV=\"$(AMSREV)\"
 
 CFLAGS	:= \
 	-g \

fusee/fusee-mtc/src/display/video_fb.h

@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 1997-2002 ELTEC Elektronik AG
- * Frank Gottschling <fgottschling@eltec.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _VIDEO_FB_H_
-#define _VIDEO_FB_H_
-
-#define CONSOLE_BG_COL            0x00
-#define CONSOLE_FG_COL            0xa0
-
-/* Try using the small font */
-#define CONFIG_VIDEO_FONT_SMALL
-
-/*
- * Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT
- */
-#define GDF__8BIT_INDEX         0
-#define GDF_15BIT_555RGB        1
-#define GDF_16BIT_565RGB        2
-#define GDF_32BIT_X888RGB       3
-#define GDF_24BIT_888RGB        4
-#define GDF__8BIT_332RGB        5
-
-#define CONFIG_VIDEO_FB_LITTLE_ENDIAN
-#define CONFIG_VIDEO_VISIBLE_COLS 720
-#define CONFIG_VIDEO_VISIBLE_ROWS 1280
-#define CONFIG_VIDEO_COLS         768
-#define CONFIG_VIDEO_PIXEL_SIZE   4
-#define CONFIG_VIDEO_DATA_FORMAT  GDF_32BIT_X888RGB /* BGR actually, but w/e */
-
-int video_get_col(void);
-int video_get_row(void);
-
-int video_init(void *fb);
-int video_resume(void *fb, int row, int col);
-void video_puts(const char *s);
-
-#endif /*_VIDEO_FB_H_ */

fusee/fusee-mtc/src/lib/log.c

@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "log.h"
-
-#include "../display/video_fb.h"
-#include "vsprintf.h"
-
-/* default log level for screen output */
-ScreenLogLevel g_screen_log_level = SCREEN_LOG_LEVEL_NONE;
-
-void log_set_log_level(ScreenLogLevel log_level) {
-    g_screen_log_level = log_level;
-}
-
-ScreenLogLevel log_get_log_level() {
-    return g_screen_log_level;
-}
-
-void log_to_uart(const char *message) {
-    /* TODO: add UART logging */
-}
-
-static void print_to_screen(ScreenLogLevel screen_log_level, char *message) {
-    /* don't print to screen if below log level */
-    if(screen_log_level > g_screen_log_level) return;
-
-    video_puts(message);
-}
-
-/**
- * vprintk - logs a message and prints it to screen based on its screen_log_level
- *
- * If the level is below g_screen_log_level it will not be shown but logged to UART
- * This text will not be colored or prefixed
- * UART is TODO
- */
-void vprint(ScreenLogLevel screen_log_level, const char *fmt, va_list args)
-{
-    char buf[PRINT_MESSAGE_MAX_LENGTH];
-    vsnprintf(buf, PRINT_MESSAGE_MAX_LENGTH, fmt, args);
-
-    /* we don't need that flag here, but if it gets used, strip it so we print correctly */
-    screen_log_level &= ~SCREEN_LOG_LEVEL_NO_PREFIX;
-
-    /* log to UART */
-    log_to_uart(buf);
-
-    print_to_screen(screen_log_level, buf);
-}
-
-static void add_prefix(ScreenLogLevel screen_log_level, const char *fmt, char *buf) {
-    char typebuf[] = "[%s] %s";
-
-    /* apply prefix and append message format */
-    /* TODO: add coloring to the output */
-    switch(screen_log_level)
-    {
-        case SCREEN_LOG_LEVEL_ERROR:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "ERROR", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_WARNING:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "WARNING", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_MANDATORY:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, "%s", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_INFO:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "INFO", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_DEBUG:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "DEBUG", fmt);
-            break;
-        default:
-            break;
-    }
-}
-
-/**
- * print - logs a message and prints it to screen based on its screen_log_level
- * 
- * If the level is below g_screen_log_level it will not be shown but logged to UART
- * Use SCREEN_LOG_LEVEL_NO_PREFIX if you don't want a prefix to be added
- * UART is TODO
- */
-void print(ScreenLogLevel screen_log_level, const char * fmt, ...)
-{
-    char buf[PRINT_MESSAGE_MAX_LENGTH] = {};
-    char message[PRINT_MESSAGE_MAX_LENGTH] = {};
-
-    /* TODO: make splash disappear if level > MANDATORY */
-
-    /* make prefix free messages with log_level possible */
-    if(screen_log_level & SCREEN_LOG_LEVEL_NO_PREFIX) {
-        /* remove the NO_PREFIX flag so the enum can be recognized later on */
-        screen_log_level &= ~SCREEN_LOG_LEVEL_NO_PREFIX;
-
-        snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, "%s", fmt);
-    }
-    else {
-        add_prefix(screen_log_level, fmt, buf);
-    }
-
-    /* input arguments */
-    va_list args;
-    va_start(args, fmt);
-    vsnprintf(message, PRINT_MESSAGE_MAX_LENGTH, buf, args);
-    va_end(args);
-
-    /* log to UART */
-    log_to_uart(message);
-
-    print_to_screen(screen_log_level, message);
-}

fusee/fusee-mtc/src/lib/log.h

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FUSEE_LOG_H
-#define FUSEE_LOG_H
-
-#define PRINT_MESSAGE_MAX_LENGTH 1024
-
-#include <stdarg.h>
-
-typedef enum {
-    SCREEN_LOG_LEVEL_NONE       = 0,
-    SCREEN_LOG_LEVEL_ERROR      = 1,
-    SCREEN_LOG_LEVEL_WARNING    = 2,
-    SCREEN_LOG_LEVEL_MANDATORY  = 3, /* no log prefix */
-    SCREEN_LOG_LEVEL_INFO       = 4,
-    SCREEN_LOG_LEVEL_DEBUG      = 5,
-
-    SCREEN_LOG_LEVEL_NO_PREFIX  = 0x100 /* OR this to your LOG_LEVEL to prevent prefix creation */
-} ScreenLogLevel;
-
-extern ScreenLogLevel g_screen_log_level;
-
-void log_set_log_level(ScreenLogLevel screen_log_level);
-ScreenLogLevel log_get_log_level();
-void log_to_uart(const char *message);
-void vprint(ScreenLogLevel screen_log_level, const char *fmt, va_list args);
-void print(ScreenLogLevel screen_log_level, const char* fmt, ...);
-
-#endif

fusee/fusee-mtc/src/main.c

@@ -17,7 +17,7 @@
 #include <string.h>
 #include "mtc.h"
 #include "stage2.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
 
 static void *g_framebuffer;
 static __attribute__((__aligned__(0x200))) stage2_mtc_args_t g_mtc_args_store;

fusee/fusee-mtc/src/mtc.c

@@ -21,7 +21,7 @@
 #include "car.h"
 #include "fuse.h"
 #include "timers.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 /*
  * Macros.

fusee/fusee-mtc/src/stage2.h

@@ -17,7 +17,7 @@
 #ifndef FUSEE_STAGE2_H
 #define FUSEE_STAGE2_H
 
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 #define MTC_ARGV_ARGUMENT_STRUCT 0
 #define MTC_ARGC 1

fusee/fusee-mtc/src/utils.c

@@ -17,8 +17,8 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include "utils.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 __attribute__ ((noreturn)) void generic_panic(void) {
     while (true) {

fusee/fusee-primary/Makefile

@@ -27,7 +27,7 @@ endif
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	src src/sdmmc src/lib src/lib/fatfs src/display
+SOURCES		:=	src ../../fusee/common ../../fusee/common/display ../../fusee/common/fatfs ../../fusee/common/sdmmc
 DATA		:=	data
 INCLUDES	:=	include  ../../libraries/libvapours/include
 

fusee/fusee-primary/src/display/video_fb.h

@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 1997-2002 ELTEC Elektronik AG
- * Frank Gottschling <fgottschling@eltec.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _VIDEO_FB_H_
-#define _VIDEO_FB_H_
-
-#define CONSOLE_BG_COL            0x00
-#define CONSOLE_FG_COL            0xa0
-
-/* Try using the small font */
-#define CONFIG_VIDEO_FONT_SMALL
-
-/*
- * Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT
- */
-#define GDF__8BIT_INDEX         0
-#define GDF_15BIT_555RGB        1
-#define GDF_16BIT_565RGB        2
-#define GDF_32BIT_X888RGB       3
-#define GDF_24BIT_888RGB        4
-#define GDF__8BIT_332RGB        5
-
-#define CONFIG_VIDEO_FB_LITTLE_ENDIAN
-#define CONFIG_VIDEO_VISIBLE_COLS 720
-#define CONFIG_VIDEO_VISIBLE_ROWS 1280
-#define CONFIG_VIDEO_COLS         768
-#define CONFIG_VIDEO_PIXEL_SIZE   4
-#define CONFIG_VIDEO_DATA_FORMAT  GDF_32BIT_X888RGB /* BGR actually, but w/e */
-
-int video_get_col(void);
-int video_get_row(void);
-
-int video_init(void *fb);
-int video_resume(void *fb, int row, int col);
-void video_puts(const char *s);
-
-#endif /*_VIDEO_FB_H_ */

fusee/fusee-primary/src/exception_handlers.c

@@ -18,8 +18,8 @@
 
 #include "exception_handlers.h"
 #include "utils.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
-#include "lib/vsprintf.h"
+#include "../../../fusee/common/vsprintf.h"
 
 #define CODE_DUMP_SIZE      0x30
 #define STACK_DUMP_SIZE     0x30

fusee/fusee-primary/src/fs_utils.c

@@ -16,8 +16,8 @@
 
 #include "fs_utils.h"
 #include "mc.h"
-#include "lib/fatfs/ff.h"
+#include "../../../fusee/common/fatfs/ff.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 FATFS sd_fs;
 static bool g_sd_mounted = false;

fusee/fusee-primary/src/fs_utils.h

@@ -20,7 +20,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "sdmmc/sdmmc.h"
+#include "../../../fusee/common/sdmmc/sdmmc.h"
 #include "utils.h"
 
 extern sdmmc_t g_sd_sdmmc;

fusee/fusee-primary/src/lib/fatfs/diskio.c

@@ -1,100 +0,0 @@
-/*-----------------------------------------------------------------------*/
-/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2016        */
-/*-----------------------------------------------------------------------*/
-/* If a working storage control module is available, it should be        */
-/* attached to the FatFs via a glue function rather than modifying it.   */
-/* This is an example of glue functions to attach various exsisting      */
-/* storage control modules to the FatFs module with a defined API.       */
-/*-----------------------------------------------------------------------*/
-
-#include <stdbool.h>
-#include <string.h>
-#include "ff.h"         /* Obtains integer types */
-#include "diskio.h"     /* Declarations of disk functions */
-#include "../../fs_utils.h"
-
-
-/*-----------------------------------------------------------------------*/
-/* Get Drive Status                                                      */
-/*-----------------------------------------------------------------------*/
-
-DSTATUS disk_status (
-    BYTE pdrv       /* Physical drive nmuber to identify the drive */
-)
-{
-    return 0;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Inidialize a Drive                                                    */
-/*-----------------------------------------------------------------------*/
-
-DSTATUS disk_initialize (
-    BYTE pdrv               /* Physical drive nmuber to identify the drive */
-)
-{
-    return 0;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Read Sector(s)                                                        */
-/*-----------------------------------------------------------------------*/
-
-DRESULT disk_read (
-    BYTE pdrv,      /* Physical drive nmuber to identify the drive */
-    BYTE *buff,     /* Data buffer to store read data */
-    DWORD sector,   /* Start sector in LBA */
-    UINT count      /* Number of sectors to read */
-)
-{
-    switch (pdrv) {
-        case 0:
-            return sdmmc_device_read(&g_sd_device, sector, count, (void *)buff) ? RES_OK : RES_ERROR;
-        default:
-            return RES_PARERR;
-    }
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Write Sector(s)                                                       */
-/*-----------------------------------------------------------------------*/
-
-#if FF_FS_READONLY == 0
-
-DRESULT disk_write (
-    BYTE pdrv,          /* Physical drive nmuber to identify the drive */
-    const BYTE *buff,   /* Data to be written */
-    DWORD sector,       /* Start sector in LBA */
-    UINT count          /* Number of sectors to write */
-)
-{
-    switch (pdrv) {
-        case 0:
-            return sdmmc_device_write(&g_sd_device, sector, count, (void *)buff) ? RES_OK : RES_ERROR;
-        default:
-            return RES_PARERR;
-    }
-}
-
-#endif
-
-
-/*-----------------------------------------------------------------------*/
-/* Miscellaneous Functions                                               */
-/*-----------------------------------------------------------------------*/
-
-DRESULT disk_ioctl (
-    BYTE pdrv,      /* Physical drive nmuber (0..) */
-    BYTE cmd,       /* Control code */
-    void *buff      /* Buffer to send/receive control data */
-)
-{
-    return RES_OK;
-}
-

fusee/fusee-primary/src/lib/fatfs/ffconf.h

@@ -1,288 +0,0 @@
-/*---------------------------------------------------------------------------/
-/  FatFs Functional Configurations
-/---------------------------------------------------------------------------*/
-
-#define FFCONF_DEF	86604	/* Revision ID */
-
-/*---------------------------------------------------------------------------/
-/ Function Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_READONLY	0
-/* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
-/  Read-only configuration removes writing API functions, f_write(), f_sync(),
-/  f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
-/  and optional writing functions as well. */
-
-
-#define FF_FS_MINIMIZE	0
-/* This option defines minimization level to remove some basic API functions.
-/
-/   0: Basic functions are fully enabled.
-/   1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_truncate() and f_rename()
-/      are removed.
-/   2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.
-/   3: f_lseek() function is removed in addition to 2. */
-
-
-#define FF_USE_STRFUNC	2
-/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
-/
-/  0: Disable string functions.
-/  1: Enable without LF-CRLF conversion.
-/  2: Enable with LF-CRLF conversion. */
-
-
-#define FF_USE_FIND		0
-/* This option switches filtered directory read functions, f_findfirst() and
-/  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
-
-
-#define FF_USE_MKFS		0
-/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_FASTSEEK	0
-/* This option switches fast seek function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_EXPAND	0
-/* This option switches f_expand function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_CHMOD	0
-/* This option switches attribute manipulation functions, f_chmod() and f_utime().
-/  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
-
-
-#define FF_USE_LABEL	0
-/* This option switches volume label functions, f_getlabel() and f_setlabel().
-/  (0:Disable or 1:Enable) */
-
-
-#define FF_USE_FORWARD	0
-/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-
-
-/*---------------------------------------------------------------------------/
-/ Locale and Namespace Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_CODE_PAGE	850
-/* This option specifies the OEM code page to be used on the target system.
-/  Incorrect code page setting can cause a file open failure.
-/
-/   437 - U.S.
-/   720 - Arabic
-/   737 - Greek
-/   771 - KBL
-/   775 - Baltic
-/   850 - Latin 1
-/   852 - Latin 2
-/   855 - Cyrillic
-/   857 - Turkish
-/   860 - Portuguese
-/   861 - Icelandic
-/   862 - Hebrew
-/   863 - Canadian French
-/   864 - Arabic
-/   865 - Nordic
-/   866 - Russian
-/   869 - Greek 2
-/   932 - Japanese (DBCS)
-/   936 - Simplified Chinese (DBCS)
-/   949 - Korean (DBCS)
-/   950 - Traditional Chinese (DBCS)
-/     0 - Include all code pages above and configured by f_setcp()
-*/
-
-
-#define FF_USE_LFN		1
-#define FF_MAX_LFN		255
-/* The FF_USE_LFN switches the support for LFN (long file name).
-/
-/   0: Disable LFN. FF_MAX_LFN has no effect.
-/   1: Enable LFN with static working buffer on the BSS. Always NOT thread-safe.
-/   2: Enable LFN with dynamic working buffer on the STACK.
-/   3: Enable LFN with dynamic working buffer on the HEAP.
-/
-/  To enable the LFN, ffunicode.c needs to be added to the project. The LFN function
-/  requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and
-/  additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.
-/  The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can
-/  be in range of 12 to 255. It is recommended to be set 255 to fully support LFN
-/  specification.
-/  When use stack for the working buffer, take care on stack overflow. When use heap
-/  memory for the working buffer, memory management functions, ff_memalloc() and
-/  ff_memfree() in ffsystem.c, need to be added to the project. */
-
-
-#define FF_LFN_UNICODE	2
-/* This option switches the character encoding on the API when LFN is enabled.
-/
-/   0: ANSI/OEM in current CP (TCHAR = char)
-/   1: Unicode in UTF-16 (TCHAR = WCHAR)
-/   2: Unicode in UTF-8 (TCHAR = char)
-/   3: Unicode in UTF-32 (TCHAR = DWORD)
-/
-/  Also behavior of string I/O functions will be affected by this option.
-/  When LFN is not enabled, this option has no effect. */
-
-
-#define FF_LFN_BUF		255
-#define FF_SFN_BUF		12
-/* This set of options defines size of file name members in the FILINFO structure
-/  which is used to read out directory items. These values should be suffcient for
-/  the file names to read. The maximum possible length of the read file name depends
-/  on character encoding. When LFN is not enabled, these options have no effect. */
-
-
-#define FF_STRF_ENCODE	3
-/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
-/  f_putc(), f_puts and f_printf() convert the character encoding in it.
-/  This option selects assumption of character encoding ON THE FILE to be
-/  read/written via those functions.
-/
-/   0: ANSI/OEM in current CP
-/   1: Unicode in UTF-16LE
-/   2: Unicode in UTF-16BE
-/   3: Unicode in UTF-8
-*/
-
-
-#define FF_FS_RPATH		0
-/* This option configures support for relative path.
-/
-/   0: Disable relative path and remove related functions.
-/   1: Enable relative path. f_chdir() and f_chdrive() are available.
-/   2: f_getcwd() function is available in addition to 1.
-*/
-
-
-/*---------------------------------------------------------------------------/
-/ Drive/Volume Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_VOLUMES		1
-/* Number of volumes (logical drives) to be used. (1-10) */
-
-
-#define FF_STR_VOLUME_ID	0
-#define FF_VOLUME_STRS		"sdmc"
-/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
-/  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
-/  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
-/  logical drives. Number of items must not be less than FF_VOLUMES. Valid
-/  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
-/  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
-/  not defined, a user defined volume string table needs to be defined as:
-/
-/  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
-*/
-
-
-#define FF_MULTI_PARTITION	0
-/* This option switches support for multiple volumes on the physical drive.
-/  By default (0), each logical drive number is bound to the same physical drive
-/  number and only an FAT volume found on the physical drive will be mounted.
-/  When this function is enabled (1), each logical drive number can be bound to
-/  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/  funciton will be available. */
-
-
-#define FF_MIN_SS		512
-#define FF_MAX_SS		512
-/* This set of options configures the range of sector size to be supported. (512,
-/  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/  harddisk. But a larger value may be required for on-board flash memory and some
-/  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
-/  for variable sector size mode and disk_ioctl() function needs to implement
-/  GET_SECTOR_SIZE command. */
-
-
-#define FF_USE_TRIM		0
-/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
-/  To enable Trim function, also CTRL_TRIM command should be implemented to the
-/  disk_ioctl() function. */
-
-
-#define FF_FS_NOFSINFO	0
-/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
-/  option, and f_getfree() function at first time after volume mount will force
-/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
-/
-/  bit0=0: Use free cluster count in the FSINFO if available.
-/  bit0=1: Do not trust free cluster count in the FSINFO.
-/  bit1=0: Use last allocated cluster number in the FSINFO if available.
-/  bit1=1: Do not trust last allocated cluster number in the FSINFO.
-*/
-
-
-
-/*---------------------------------------------------------------------------/
-/ System Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_TINY		0
-/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
-/  At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
-/  Instead of private sector buffer eliminated from the file object, common sector
-/  buffer in the filesystem object (FATFS) is used for the file data transfer. */
-
-
-#define FF_FS_EXFAT		1
-/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)
-/  To enable exFAT, also LFN needs to be enabled. (FF_USE_LFN >= 1)
-/  Note that enabling exFAT discards ANSI C (C89) compatibility. */
-
-
-#define FF_FS_NORTC		1
-#define FF_NORTC_MON	1
-#define FF_NORTC_MDAY	1
-#define FF_NORTC_YEAR	2018
-/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
-/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
-/  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
-/  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
-/  added to the project to read current time form real-time clock. FF_NORTC_MON,
-/  FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
-/  These options have no effect at read-only configuration (FF_FS_READONLY = 1). */
-
-
-#define FF_FS_LOCK		0
-/* The option FF_FS_LOCK switches file lock function to control duplicated file open
-/  and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
-/  is 1.
-/
-/  0:  Disable file lock function. To avoid volume corruption, application program
-/      should avoid illegal open, remove and rename to the open objects.
-/  >0: Enable file lock function. The value defines how many files/sub-directories
-/      can be opened simultaneously under file lock control. Note that the file
-/      lock control is independent of re-entrancy. */
-
-
-/* #include <somertos.h>	// O/S definitions */
-#define FF_FS_REENTRANT	0
-#define FF_FS_TIMEOUT	1000
-#define FF_SYNC_t		HANDLE
-/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
-/  module itself. Note that regardless of this option, file access to different
-/  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
-/  and f_fdisk() function, are always not re-entrant. Only file/directory access
-/  to the same volume is under control of this function.
-/
-/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
-/   1: Enable re-entrancy. Also user provided synchronization handlers,
-/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
-/      function, must be added to the project. Samples are available in
-/      option/syscall.c.
-/
-/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
-/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
-/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
-/  included somewhere in the scope of ff.h. */
-
-
-
-/*--- End of configuration options ---*/

fusee/fusee-primary/src/lib/log.c

@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "log.h"
-
-#include "../display/video_fb.h"
-#include "vsprintf.h"
-
-/* default log level for screen output */
-ScreenLogLevel g_screen_log_level = SCREEN_LOG_LEVEL_NONE;
-
-void log_set_log_level(ScreenLogLevel log_level) {
-    g_screen_log_level = log_level;
-}
-
-ScreenLogLevel log_get_log_level() {
-    return g_screen_log_level;
-}
-
-void log_to_uart(const char *message) {
-    /* TODO: add UART logging */
-}
-
-static void print_to_screen(ScreenLogLevel screen_log_level, char *message) {
-    /* don't print to screen if below log level */
-    if(screen_log_level > g_screen_log_level) return;
-
-    video_puts(message);
-}
-
-/**
- * vprintk - logs a message and prints it to screen based on its screen_log_level
- *
- * If the level is below g_screen_log_level it will not be shown but logged to UART
- * This text will not be colored or prefixed
- * UART is TODO
- */
-void vprint(ScreenLogLevel screen_log_level, const char *fmt, va_list args)
-{
-    char buf[PRINT_MESSAGE_MAX_LENGTH];
-    vsnprintf(buf, PRINT_MESSAGE_MAX_LENGTH, fmt, args);
-
-    /* we don't need that flag here, but if it gets used, strip it so we print correctly */
-    screen_log_level &= ~SCREEN_LOG_LEVEL_NO_PREFIX;
-
-    /* log to UART */
-    log_to_uart(buf);
-
-    print_to_screen(screen_log_level, buf);
-}
-
-static void add_prefix(ScreenLogLevel screen_log_level, const char *fmt, char *buf) {
-    char typebuf[] = "[%s] %s";
-
-    /* apply prefix and append message format */
-    /* TODO: add coloring to the output */
-    switch(screen_log_level)
-    {
-        case SCREEN_LOG_LEVEL_ERROR:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "ERROR", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_WARNING:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "WARNING", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_MANDATORY:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, "%s", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_INFO:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "INFO", fmt);
-            break;
-        case SCREEN_LOG_LEVEL_DEBUG:
-            snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, typebuf, "DEBUG", fmt);
-            break;
-        default:
-            break;
-    }
-}
-
-/**
- * print - logs a message and prints it to screen based on its screen_log_level
- * 
- * If the level is below g_screen_log_level it will not be shown but logged to UART
- * Use SCREEN_LOG_LEVEL_NO_PREFIX if you don't want a prefix to be added
- * UART is TODO
- */
-void print(ScreenLogLevel screen_log_level, const char * fmt, ...)
-{
-    char buf[PRINT_MESSAGE_MAX_LENGTH] = {};
-    char message[PRINT_MESSAGE_MAX_LENGTH] = {};
-
-    /* TODO: make splash disappear if level > MANDATORY */
-
-    /* make prefix free messages with log_level possible */
-    if(screen_log_level & SCREEN_LOG_LEVEL_NO_PREFIX) {
-        /* remove the NO_PREFIX flag so the enum can be recognized later on */
-        screen_log_level &= ~SCREEN_LOG_LEVEL_NO_PREFIX;
-
-        snprintf(buf, PRINT_MESSAGE_MAX_LENGTH, "%s", fmt);
-    }
-    else {
-        add_prefix(screen_log_level, fmt, buf);
-    }
-
-    /* input arguments */
-    va_list args;
-    va_start(args, fmt);
-    vsnprintf(message, PRINT_MESSAGE_MAX_LENGTH, buf, args);
-    va_end(args);
-
-    /* log to UART */
-    log_to_uart(message);
-
-    print_to_screen(screen_log_level, message);
-}

fusee/fusee-primary/src/lib/log.h

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FUSEE_LOG_H
-#define FUSEE_LOG_H
-
-#define PRINT_MESSAGE_MAX_LENGTH 1024
-
-#include <stdarg.h>
-
-typedef enum {
-    SCREEN_LOG_LEVEL_NONE       = 0,
-    SCREEN_LOG_LEVEL_ERROR      = 1,
-    SCREEN_LOG_LEVEL_WARNING    = 2,
-    SCREEN_LOG_LEVEL_MANDATORY  = 3, /* no log prefix */
-    SCREEN_LOG_LEVEL_INFO       = 4,
-    SCREEN_LOG_LEVEL_DEBUG      = 5,
-
-    SCREEN_LOG_LEVEL_NO_PREFIX  = 0x100 /* OR this to your LOG_LEVEL to prevent prefix creation */
-} ScreenLogLevel;
-
-extern ScreenLogLevel g_screen_log_level;
-
-void log_set_log_level(ScreenLogLevel screen_log_level);
-ScreenLogLevel log_get_log_level();
-void log_to_uart(const char *message);
-void vprint(ScreenLogLevel screen_log_level, const char *fmt, va_list args);
-void print(ScreenLogLevel screen_log_level, const char* fmt, ...);
-
-#endif

fusee/fusee-primary/src/lib/vsprintf.h

@@ -1,28 +0,0 @@
-/*
- *  Copyright (C) 2011 Andrei Warkentin <andrey.warkentin@gmail.com>
- *
- * This program is free software ; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-#ifndef VSPRINTF_H
-#define VSPRINTF_H
-
-struct va_format {
-        const char *fmt;
-        va_list *va;
-};
-
-unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
-
-int sprintf(char *buf, const char *fmt, ...);
-int scnprintf(char *buf, size_t size, const char *fmt, ...);
-int snprintf(char *buf, size_t size, const char *fmt, ...);
-int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
-int sscanf(const char *buf, const char *fmt, ...);
-
-#endif /* VSPRINTF_H */

fusee/fusee-primary/src/main.c

@@ -23,12 +23,12 @@
 #include "fs_utils.h"
 #include "stage2.h"
 #include "chainloader.h"
-#include "sdmmc/sdmmc.h"
+#include "../../../fusee/common/sdmmc/sdmmc.h"
-#include "lib/fatfs/ff.h"
+#include "../../../fusee/common/fatfs/ff.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
-#include "lib/vsprintf.h"
+#include "../../../fusee/common/vsprintf.h"
-#include "lib/ini.h"
+#include "../../../fusee/common/ini.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
 
 extern void (*__program_exit_callback)(int rc);
 

fusee/fusee-primary/src/panic.c

@@ -21,8 +21,8 @@
 #include "fuse.h"
 #include "utils.h"
 #include "fs_utils.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
 
 #define PROGRAM_ID_AMS_MITM 0x010041544D530000ull
 #define PROGRAM_ID_BOOT     0x0100000000000005ull

fusee/fusee-primary/src/sdram.c

@@ -29,7 +29,7 @@
 #define CONFIG_SDRAM_COMPRESS_CFG
 
 #ifdef CONFIG_SDRAM_COMPRESS_CFG
-#include "lib/lz.h"
+#include "../../../fusee/common/lz.h"
 #include "sdram_lz.inl"
 #else
 #include "sdram.inl"

fusee/fusee-primary/src/stage2.h

@@ -20,11 +20,11 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
-#include "lib/vsprintf.h"
+#include "../../../fusee/common/vsprintf.h"
-#include "lib/ini.h"
+#include "../../../fusee/common/ini.h"
-#include "lib/fatfs/ff.h"
+#include "../../../fusee/common/fatfs/ff.h"
 
 /* TODO: Is there a more concise way to do this? */
 #define STAGE2_ARGV_PROGRAM_PATH 0

fusee/fusee-primary/src/utils.c

@@ -25,9 +25,9 @@
 #include "panic.h"
 #include "car.h"
 #include "btn.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
-#include "lib/vsprintf.h"
+#include "../../../fusee/common/vsprintf.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
 
 #include <inttypes.h>
 

fusee/fusee-secondary/Makefile

@@ -36,7 +36,7 @@ endef
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	src src/sdmmc src/lib src/lib/fatfs src/display
+SOURCES		:=	src ../../fusee/common ../../fusee/common/display ../../fusee/common/fatfs ../../fusee/common/sdmmc
 DATA		:=	data
 INCLUDES	:=	include ../../libraries/libvapours/include
 

fusee/fusee-secondary/src/console.c

@@ -16,7 +16,7 @@
  
 #include "console.h"
 #include "di.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
 
 static void *g_framebuffer = NULL;
 static bool g_display_initialized = false;

fusee/fusee-secondary/src/exception_handlers.c

@@ -19,8 +19,8 @@
 
 #include "exception_handlers.h"
 #include "utils.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 #define CODE_DUMP_SIZE      0x30
 #define STACK_DUMP_SIZE     0x30

fusee/fusee-secondary/src/fs_dev.c

@@ -25,7 +25,7 @@
 #include <sys/param.h>
 #include <unistd.h>
 
-#include "lib/fatfs/ff.h"
+#include "../../../fusee/common/fatfs/ff.h"
 
 #if FF_VOLUMES != 10
 #error "FatFs misconfigured, expected FF_VOLUMES == 10"

fusee/fusee-secondary/src/fs_utils.c

@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 #include <sys/stat.h>
-#include "lib/fatfs/ff.h"
+#include "../../../fusee/common/fatfs/ff.h"
 #include "fs_utils.h"
 #include "fs_dev.h"
 

fusee/fusee-secondary/src/ips.c

@@ -23,7 +23,7 @@
 #include "utils.h"
 #include "exocfg.h"
 #include "se.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 #include "ips.h"
 
 /* IPS Patching adapted from Luma3DS (https://github.com/AuroraWright/Luma3DS/blob/master/sysmodules/loader/source/patcher.c) */

fusee/fusee-secondary/src/lib/fatfs/00history.txt

@@ -1,330 +0,0 @@
-----------------------------------------------------------------------------
-  Revision history of FatFs module
-----------------------------------------------------------------------------
-
-R0.00 (February 26, 2006)
-
-  Prototype.
-
-
-
-R0.01 (April 29, 2006)
-
-  The first release.
-
-
-
-R0.02 (June 01, 2006)
-
-  Added FAT12 support.
-  Removed unbuffered mode.
-  Fixed a problem on small (<32M) partition.
-
-
-
-R0.02a (June 10, 2006)
-
-  Added a configuration option (_FS_MINIMUM).
-
-
-
-R0.03 (September 22, 2006)
-
-  Added f_rename().
-  Changed option _FS_MINIMUM to _FS_MINIMIZE.
-
-
-
-R0.03a (December 11, 2006)
-
-  Improved cluster scan algorithm to write files fast.
-  Fixed f_mkdir() creates incorrect directory on FAT32.
-
-
-
-R0.04 (February 04, 2007)
-
-  Added f_mkfs().
-  Supported multiple drive system.
-  Changed some interfaces for multiple drive system.
-  Changed f_mountdrv() to f_mount().
-
-
-
-R0.04a (April 01, 2007)
-
-  Supported multiple partitions on a physical drive.
-  Added a capability of extending file size to f_lseek().
-  Added minimization level 3.
-  Fixed an endian sensitive code in f_mkfs().
-
-
-
-R0.04b (May 05, 2007)
-
-  Added a configuration option _USE_NTFLAG.
-  Added FSINFO support.
-  Fixed DBCS name can result FR_INVALID_NAME.
-  Fixed short seek (<= csize) collapses the file object.
-
-
-
-R0.05 (August 25, 2007)
-
-  Changed arguments of f_read(), f_write() and f_mkfs().
-  Fixed f_mkfs() on FAT32 creates incorrect FSINFO.
-  Fixed f_mkdir() on FAT32 creates incorrect directory.
-
-
-
-R0.05a (February 03, 2008)
-
-  Added f_truncate() and f_utime().
-  Fixed off by one error at FAT sub-type determination.
-  Fixed btr in f_read() can be mistruncated.
-  Fixed cached sector is not flushed when create and close without write.
-
-
-
-R0.06 (April 01, 2008)
-
-  Added fputc(), fputs(), fprintf() and fgets().
-  Improved performance of f_lseek() on moving to the same or following cluster.
-
-
-
-R0.07 (April 01, 2009)
-
-  Merged Tiny-FatFs as a configuration option. (_FS_TINY)
-  Added long file name feature. (_USE_LFN)
-  Added multiple code page feature. (_CODE_PAGE)
-  Added re-entrancy for multitask operation. (_FS_REENTRANT)
-  Added auto cluster size selection to f_mkfs().
-  Added rewind option to f_readdir().
-  Changed result code of critical errors.
-  Renamed string functions to avoid name collision.
-
-
-
-R0.07a (April 14, 2009)
-
-  Septemberarated out OS dependent code on reentrant cfg.
-  Added multiple sector size feature.
-
-
-
-R0.07c (June 21, 2009)
-
-  Fixed f_unlink() can return FR_OK on error.
-  Fixed wrong cache control in f_lseek().
-  Added relative path feature.
-  Added f_chdir() and f_chdrive().
-  Added proper case conversion to extended character.
-
-
-
-R0.07e (November 03, 2009)
-
-  Septemberarated out configuration options from ff.h to ffconf.h.
-  Fixed f_unlink() fails to remove a sub-directory on _FS_RPATH.
-  Fixed name matching error on the 13 character boundary.
-  Added a configuration option, _LFN_UNICODE.
-  Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.
-
-
-
-R0.08 (May 15, 2010)
-
-  Added a memory configuration option. (_USE_LFN = 3)
-  Added file lock feature. (_FS_SHARE)
-  Added fast seek feature. (_USE_FASTSEEK)
-  Changed some types on the API, XCHAR->TCHAR.
-  Changed .fname in the FILINFO structure on Unicode cfg.
-  String functions support UTF-8 encoding files on Unicode cfg.
-
-
-
-R0.08a (August 16, 2010)
-
-  Added f_getcwd(). (_FS_RPATH = 2)
-  Added sector erase feature. (_USE_ERASE)
-  Moved file lock semaphore table from fs object to the bss.
-  Fixed f_mkfs() creates wrong FAT32 volume.
-
-
-
-R0.08b (January 15, 2011)
-
-  Fast seek feature is also applied to f_read() and f_write().
-  f_lseek() reports required table size on creating CLMP.
-  Extended format syntax of f_printf().
-  Ignores duplicated directory separators in given path name.
-
-
-
-R0.09 (September 06, 2011)
-
-  f_mkfs() supports multiple partition to complete the multiple partition feature.
-  Added f_fdisk().
-
-
-
-R0.09a (August 27, 2012)
-
-  Changed f_open() and f_opendir() reject null object pointer to avoid crash.
-  Changed option name _FS_SHARE to _FS_LOCK.
-  Fixed assertion failure due to OS/2 EA on FAT12/16 volume.
-
-
-
-R0.09b (January 24, 2013)
-
-  Added f_setlabel() and f_getlabel().
-
-
-
-R0.10 (October 02, 2013)
-
-  Added selection of character encoding on the file. (_STRF_ENCODE)
-  Added f_closedir().
-  Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO)
-  Added forced mount feature with changes of f_mount().
-  Improved behavior of volume auto detection.
-  Improved write throughput of f_puts() and f_printf().
-  Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write().
-  Fixed f_write() can be truncated when the file size is close to 4GB.
-  Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect value on error.
-
-
-
-R0.10a (January 15, 2014)
-
-  Added arbitrary strings as drive number in the path name. (_STR_VOLUME_ID)
-  Added a configuration option of minimum sector size. (_MIN_SS)
-  2nd argument of f_rename() can have a drive number and it will be ignored.
-  Fixed f_mount() with forced mount fails when drive number is >= 1. (appeared at R0.10)
-  Fixed f_close() invalidates the file object without volume lock.
-  Fixed f_closedir() returns but the volume lock is left acquired. (appeared at R0.10)
-  Fixed creation of an entry with LFN fails on too many SFN collisions. (appeared at R0.07)
-
-
-
-R0.10b (May 19, 2014)
-
-  Fixed a hard error in the disk I/O layer can collapse the directory entry.
-  Fixed LFN entry is not deleted when delete/rename an object with lossy converted SFN. (appeared at R0.07)
-
-
-
-R0.10c (November 09, 2014)
-
-  Added a configuration option for the platforms without RTC. (_FS_NORTC)
-  Changed option name _USE_ERASE to _USE_TRIM.
-  Fixed volume label created by Mac OS X cannot be retrieved with f_getlabel(). (appeared at R0.09b)
-  Fixed a potential problem of FAT access that can appear on disk error.
-  Fixed null pointer dereference on attempting to delete the root direcotry. (appeared at R0.08)
-
-
-
-R0.11 (February 09, 2015)
-
-  Added f_findfirst(), f_findnext() and f_findclose(). (_USE_FIND)
-  Fixed f_unlink() does not remove cluster chain of the file. (appeared at R0.10c)
-  Fixed _FS_NORTC option does not work properly. (appeared at R0.10c)
-
-
-
-R0.11a (September 05, 2015)
-
-  Fixed wrong media change can lead a deadlock at thread-safe configuration.
-  Added code page 771, 860, 861, 863, 864, 865 and 869. (_CODE_PAGE)
-  Removed some code pages actually not exist on the standard systems. (_CODE_PAGE)
-  Fixed errors in the case conversion teble of code page 437 and 850 (ff.c).
-  Fixed errors in the case conversion teble of Unicode (cc*.c).
-
-
-
-R0.12 (April 12, 2016)
-
-  Added support for exFAT file system. (_FS_EXFAT)
-  Added f_expand(). (_USE_EXPAND)
-  Changed some members in FINFO structure and behavior of f_readdir().
-  Added an option _USE_CHMOD.
-  Removed an option _WORD_ACCESS.
-  Fixed errors in the case conversion table of Unicode (cc*.c).
-
-
-
-R0.12a (July 10, 2016)
-
-  Added support for creating exFAT volume with some changes of f_mkfs().
-  Added a file open method FA_OPEN_APPEND. An f_lseek() following f_open() is no longer needed.
-  f_forward() is available regardless of _FS_TINY.
-  Fixed f_mkfs() creates wrong volume. (appeared at R0.12)
-  Fixed wrong memory read in create_name(). (appeared at R0.12)
-  Fixed compilation fails at some configurations, _USE_FASTSEEK and _USE_FORWARD.
-
-
-
-R0.12b (September 04, 2016)
-
-  Made f_rename() be able to rename objects with the same name but case.
-  Fixed an error in the case conversion teble of code page 866. (ff.c)
-  Fixed writing data is truncated at the file offset 4GiB on the exFAT volume. (appeared at R0.12)
-  Fixed creating a file in the root directory of exFAT volume can fail. (appeared at R0.12)
-  Fixed f_mkfs() creating exFAT volume with too small cluster size can collapse unallocated memory. (appeared at R0.12)
-  Fixed wrong object name can be returned when read directory at Unicode cfg. (appeared at R0.12)
-  Fixed large file allocation/removing on the exFAT volume collapses allocation bitmap. (appeared at R0.12)
-  Fixed some internal errors in f_expand() and f_lseek(). (appeared at R0.12)
-
-
-
-R0.12c (March 04, 2017)
-
-  Improved write throughput at the fragmented file on the exFAT volume.
-  Made memory usage for exFAT be able to be reduced as decreasing _MAX_LFN.
-  Fixed successive f_getfree() can return wrong count on the FAT12/16 volume. (appeared at R0.12)
-  Fixed configuration option _VOLUMES cannot be set 10. (appeared at R0.10c)
-
-
-
-R0.13 (May 21, 2017)
-
-  Changed heading character of configuration keywords "_" to "FF_".
-  Removed ASCII-only configuration, FF_CODE_PAGE = 1. Use FF_CODE_PAGE = 437 instead.
-  Added f_setcp(), run-time code page configuration. (FF_CODE_PAGE = 0)
-  Improved cluster allocation time on stretch a deep buried cluster chain.
-  Improved processing time of f_mkdir() with large cluster size by using FF_USE_LFN = 3.
-  Improved NoFatChain flag of the fragmented file to be set after it is truncated and got contiguous.
-  Fixed archive attribute is left not set when a file on the exFAT volume is renamed. (appeared at R0.12)
-  Fixed exFAT FAT entry can be collapsed when write or lseek operation to the existing file is done. (appeared at R0.12c)
-  Fixed creating a file can fail when a new cluster allocation to the exFAT directory occures. (appeared at R0.12c)
-
-
-
-R0.13a (October 14, 2017)
-
-  Added support for UTF-8 encoding on the API. (FF_LFN_UNICODE = 2)
-  Added options for file name output buffer. (FF_LFN_BUF, FF_SFN_BUF).
-  Added dynamic memory allocation option for working buffer of f_mkfs() and f_fdisk().
-  Fixed f_fdisk() and f_mkfs() create the partition table with wrong CHS parameters. (appeared at R0.09)
-  Fixed f_unlink() can cause lost clusters at fragmented file on the exFAT volume. (appeared at R0.12c)
-  Fixed f_setlabel() rejects some valid characters for exFAT volume. (appeared at R0.12)
-
-
-
-R0.13b (April 07, 2018)
-
-  Added support for UTF-32 encoding on the API. (FF_LFN_UNICODE = 3)
-  Added support for Unix style volume ID. (FF_STR_VOLUME_ID = 2)
-  Fixed accesing any object on the exFAT root directory beyond the cluster boundary can fail. (appeared at R0.12c)
-  Fixed f_setlabel() does not reject some invalid characters. (appeared at R0.09b)
-
-
-
-R0.13c (October 14, 2018)
-  Supported stdint.h for C99 and later. (integer.h was included in ff.h)
-  Fixed reading a directory gets infinite loop when the last directory entry is not empty. (appeared at R0.12)
-  Fixed creating a sub-directory in the fragmented sub-directory on the exFAT volume collapses FAT chain of the parent directory. (appeared at R0.12)
-  Fixed f_getcwd() cause output buffer overrun when the buffer has a valid drive number. (appeared at R0.13b)
-

fusee/fusee-secondary/src/lib/fatfs/00readme.txt

@@ -1,21 +0,0 @@
-FatFs Module Source Files R0.13c
-
-
-FILES
-
-  00readme.txt   This file.
-  00history.txt  Revision history.
-  ff.c           FatFs module.
-  ffconf.h       Configuration file of FatFs module.
-  ff.h           Common include file for FatFs and application module.
-  diskio.h       Common include file for FatFs and disk I/O module.
-  diskio.c       An example of glue function to attach existing disk I/O module to FatFs.
-  ffunicode.c    Optional Unicode utility functions.
-  ffsystem.c     An example of optional O/S related functions.
-
-
-  Low level disk I/O module is not included in this archive because the FatFs
-  module is only a generic file system layer and it does not depend on any specific
-  storage device. You need to provide a low level disk I/O module written to
-  control the storage device that attached to the target system.
-

fusee/fusee-secondary/src/lib/fatfs/diskio.h

@@ -1,77 +0,0 @@
-/*-----------------------------------------------------------------------/
-/  Low level disk interface modlue include file   (C)ChaN, 2014          /
-/-----------------------------------------------------------------------*/
-
-#ifndef _DISKIO_DEFINED
-#define _DISKIO_DEFINED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Status of Disk Functions */
-typedef BYTE	DSTATUS;
-
-/* Results of Disk Functions */
-typedef enum {
-	RES_OK = 0,		/* 0: Successful */
-	RES_ERROR,		/* 1: R/W Error */
-	RES_WRPRT,		/* 2: Write Protected */
-	RES_NOTRDY,		/* 3: Not Ready */
-	RES_PARERR		/* 4: Invalid Parameter */
-} DRESULT;
-
-
-/*---------------------------------------*/
-/* Prototypes for disk control functions */
-
-
-DSTATUS disk_initialize (BYTE pdrv);
-DSTATUS disk_status (BYTE pdrv);
-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);
-
-
-/* Disk Status Bits (DSTATUS) */
-
-#define STA_NOINIT		0x01	/* Drive not initialized */
-#define STA_NODISK		0x02	/* No medium in the drive */
-#define STA_PROTECT		0x04	/* Write protected */
-
-
-/* Command code for disk_ioctrl fucntion */
-
-/* Generic command (Used by FatFs) */
-#define CTRL_SYNC			0	/* Complete pending write process (needed at FF_FS_READONLY == 0) */
-#define GET_SECTOR_COUNT	1	/* Get media size (needed at FF_USE_MKFS == 1) */
-#define GET_SECTOR_SIZE		2	/* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */
-#define GET_BLOCK_SIZE		3	/* Get erase block size (needed at FF_USE_MKFS == 1) */
-#define CTRL_TRIM			4	/* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */
-
-/* Generic command (Not used by FatFs) */
-#define CTRL_POWER			5	/* Get/Set power status */
-#define CTRL_LOCK			6	/* Lock/Unlock media removal */
-#define CTRL_EJECT			7	/* Eject media */
-#define CTRL_FORMAT			8	/* Create physical format on the media */
-
-/* MMC/SDC specific ioctl command */
-#define MMC_GET_TYPE		10	/* Get card type */
-#define MMC_GET_CSD			11	/* Get CSD */
-#define MMC_GET_CID			12	/* Get CID */
-#define MMC_GET_OCR			13	/* Get OCR */
-#define MMC_GET_SDSTAT		14	/* Get SD status */
-#define ISDIO_READ			55	/* Read data form SD iSDIO register */
-#define ISDIO_WRITE			56	/* Write data to SD iSDIO register */
-#define ISDIO_MRITE			57	/* Masked write data to SD iSDIO register */
-
-/* ATA/CF specific ioctl command */
-#define ATA_GET_REV			20	/* Get F/W revision */
-#define ATA_GET_MODEL		21	/* Get model name */
-#define ATA_GET_SN			22	/* Get serial number */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

fusee/fusee-secondary/src/lib/fatfs/ff.h

@@ -1,405 +0,0 @@
-/*----------------------------------------------------------------------------/
-/  FatFs - Generic FAT Filesystem module  R0.13c                              /
-/-----------------------------------------------------------------------------/
-/
-/ Copyright (C) 2018, ChaN, all right reserved.
-/
-/ FatFs module is an open source software. Redistribution and use of FatFs in
-/ source and binary forms, with or without modification, are permitted provided
-/ that the following condition is met:
-
-/ 1. Redistributions of source code must retain the above copyright notice,
-/    this condition and the following disclaimer.
-/
-/ This software is provided by the copyright holder and contributors "AS IS"
-/ and any warranties related to this software are DISCLAIMED.
-/ The copyright owner or contributors be NOT LIABLE for any damages caused
-/ by use of this software.
-/
-/----------------------------------------------------------------------------*/
-
-
-#ifndef FF_DEFINED
-#define FF_DEFINED	86604	/* Revision ID */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ffconf.h"		/* FatFs configuration options */
-
-#if FF_DEFINED != FFCONF_DEF
-#error Wrong configuration file (ffconf.h).
-#endif
-
-
-/* Integer types used for FatFs API */
-
-#if defined(_WIN32)	/* Main development platform */
-#define FF_INTDEF 2
-#include <windows.h>
-typedef unsigned __int64 QWORD;
-#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus)	/* C99 or later */
-#define FF_INTDEF 2
-#include <stdint.h>
-typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
-typedef unsigned char	BYTE;	/* char must be 8-bit */
-typedef uint16_t		WORD;	/* 16-bit unsigned integer */
-typedef uint16_t		WCHAR;	/* 16-bit unsigned integer */
-typedef uint32_t		DWORD;	/* 32-bit unsigned integer */
-typedef uint64_t		QWORD;	/* 64-bit unsigned integer */
-#else  	/* Earlier than C99 */
-#define FF_INTDEF 1
-typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
-typedef unsigned char	BYTE;	/* char must be 8-bit */
-typedef unsigned short	WORD;	/* 16-bit unsigned integer */
-typedef unsigned short	WCHAR;	/* 16-bit unsigned integer */
-typedef unsigned long	DWORD;	/* 32-bit unsigned integer */
-#endif
-
-
-/* Definitions of volume management */
-
-#if FF_MULTI_PARTITION		/* Multiple partition configuration */
-typedef struct {
-	BYTE pd;	/* Physical drive number */
-	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
-} PARTITION;
-extern PARTITION VolToPart[];	/* Volume - Partition resolution table */
-#endif
-
-#if FF_STR_VOLUME_ID
-#ifndef FF_VOLUME_STRS
-extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
-#endif
-#endif
-
-
-
-/* Type of path name strings on FatFs API */
-
-#ifndef _INC_TCHAR
-#define _INC_TCHAR
-
-#if FF_USE_LFN && FF_LFN_UNICODE == 1 	/* Unicode in UTF-16 encoding */
-typedef WCHAR TCHAR;
-#define _T(x) L ## x
-#define _TEXT(x) L ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 2	/* Unicode in UTF-8 encoding */
-typedef char TCHAR;
-#define _T(x) u8 ## x
-#define _TEXT(x) u8 ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 3	/* Unicode in UTF-32 encoding */
-typedef DWORD TCHAR;
-#define _T(x) U ## x
-#define _TEXT(x) U ## x
-#elif FF_USE_LFN && (FF_LFN_UNICODE < 0 || FF_LFN_UNICODE > 3)
-#error Wrong FF_LFN_UNICODE setting
-#else									/* ANSI/OEM code in SBCS/DBCS */
-typedef char TCHAR;
-#define _T(x) x
-#define _TEXT(x) x
-#endif
-
-#endif
-
-
-
-/* Type of file size variables */
-
-#if FF_FS_EXFAT
-#if FF_INTDEF != 2
-#error exFAT feature wants C99 or later
-#endif
-typedef QWORD FSIZE_t;
-#else
-typedef DWORD FSIZE_t;
-#endif
-
-
-
-/* Filesystem object structure (FATFS) */
-
-typedef struct {
-	BYTE	fs_type;		/* Filesystem type (0:not mounted) */
-	BYTE	pdrv;			/* Associated physical drive */
-	BYTE	n_fats;			/* Number of FATs (1 or 2) */
-	BYTE	wflag;			/* win[] flag (b0:dirty) */
-	BYTE	fsi_flag;		/* FSINFO flags (b7:disabled, b0:dirty) */
-	WORD	id;				/* Volume mount ID */
-	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
-	WORD	csize;			/* Cluster size [sectors] */
-#if FF_MAX_SS != FF_MIN_SS
-	WORD	ssize;			/* Sector size (512, 1024, 2048 or 4096) */
-#endif
-#if FF_USE_LFN
-	WCHAR*	lfnbuf;			/* LFN working buffer */
-#endif
-#if FF_FS_EXFAT
-	BYTE*	dirbuf;			/* Directory entry block scratchpad buffer for exFAT */
-#endif
-#if FF_FS_REENTRANT
-	FF_SYNC_t	sobj;		/* Identifier of sync object */
-#endif
-#if !FF_FS_READONLY
-	DWORD	last_clst;		/* Last allocated cluster */
-	DWORD	free_clst;		/* Number of free clusters */
-#endif
-#if FF_FS_RPATH
-	DWORD	cdir;			/* Current directory start cluster (0:root) */
-#if FF_FS_EXFAT
-	DWORD	cdc_scl;		/* Containing directory start cluster (invalid when cdir is 0) */
-	DWORD	cdc_size;		/* b31-b8:Size of containing directory, b7-b0: Chain status */
-	DWORD	cdc_ofs;		/* Offset in the containing directory (invalid when cdir is 0) */
-#endif
-#endif
-	DWORD	n_fatent;		/* Number of FAT entries (number of clusters + 2) */
-	DWORD	fsize;			/* Size of an FAT [sectors] */
-	DWORD	volbase;		/* Volume base sector */
-	DWORD	fatbase;		/* FAT base sector */
-	DWORD	dirbase;		/* Root directory base sector/cluster */
-	DWORD	database;		/* Data base sector */
-#if FF_FS_EXFAT
-	DWORD	bitbase;		/* Allocation bitmap base sector */
-#endif
-	DWORD	winsect;		/* Current sector appearing in the win[] */
-	BYTE	win[FF_MAX_SS];	/* Disk access window for Directory, FAT (and file data at tiny cfg) */
-} FATFS;
-
-
-
-/* Object ID and allocation information (FFOBJID) */
-
-typedef struct {
-	FATFS*	fs;				/* Pointer to the hosting volume of this object */
-	WORD	id;				/* Hosting volume mount ID */
-	BYTE	attr;			/* Object attribute */
-	BYTE	stat;			/* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
-	DWORD	sclust;			/* Object data start cluster (0:no cluster or root directory) */
-	FSIZE_t	objsize;		/* Object size (valid when sclust != 0) */
-#if FF_FS_EXFAT
-	DWORD	n_cont;			/* Size of first fragment - 1 (valid when stat == 3) */
-	DWORD	n_frag;			/* Size of last fragment needs to be written to FAT (valid when not zero) */
-	DWORD	c_scl;			/* Containing directory start cluster (valid when sclust != 0) */
-	DWORD	c_size;			/* b31-b8:Size of containing directory, b7-b0: Chain status (valid when c_scl != 0) */
-	DWORD	c_ofs;			/* Offset in the containing directory (valid when file object and sclust != 0) */
-#endif
-#if FF_FS_LOCK
-	UINT	lockid;			/* File lock ID origin from 1 (index of file semaphore table Files[]) */
-#endif
-} FFOBJID;
-
-
-
-/* File object structure (FIL) */
-
-typedef struct {
-	FFOBJID	obj;			/* Object identifier (must be the 1st member to detect invalid object pointer) */
-	BYTE	flag;			/* File status flags */
-	BYTE	err;			/* Abort flag (error code) */
-	FSIZE_t	fptr;			/* File read/write pointer (Zeroed on file open) */
-	DWORD	clust;			/* Current cluster of fpter (invalid when fptr is 0) */
-	DWORD	sect;			/* Sector number appearing in buf[] (0:invalid) */
-#if !FF_FS_READONLY
-	DWORD	dir_sect;		/* Sector number containing the directory entry (not used at exFAT) */
-	BYTE*	dir_ptr;		/* Pointer to the directory entry in the win[] (not used at exFAT) */
-#endif
-#if FF_USE_FASTSEEK
-	DWORD*	cltbl;			/* Pointer to the cluster link map table (nulled on open, set by application) */
-#endif
-#if !FF_FS_TINY
-	BYTE	buf[FF_MAX_SS];	/* File private data read/write window */
-#endif
-} FIL;
-
-
-
-/* Directory object structure (DIR) */
-
-typedef struct {
-	FFOBJID	obj;			/* Object identifier */
-	DWORD	dptr;			/* Current read/write offset */
-	DWORD	clust;			/* Current cluster */
-	DWORD	sect;			/* Current sector (0:Read operation has terminated) */
-	BYTE*	dir;			/* Pointer to the directory item in the win[] */
-	BYTE	fn[12];			/* SFN (in/out) {body[8],ext[3],status[1]} */
-#if FF_USE_LFN
-	DWORD	blk_ofs;		/* Offset of current entry block being processed (0xFFFFFFFF:Invalid) */
-#endif
-#if FF_USE_FIND
-	const TCHAR* pat;		/* Pointer to the name matching pattern */
-#endif
-} DIR;
-
-
-
-/* File information structure (FILINFO) */
-
-typedef struct {
-	FSIZE_t	fsize;			/* File size */
-	WORD	fdate;			/* Modified date */
-	WORD	ftime;			/* Modified time */
-	BYTE	fattrib;		/* File attribute */
-#if FF_USE_LFN
-	TCHAR	altname[FF_SFN_BUF + 1];/* Altenative file name */
-	TCHAR	fname[FF_LFN_BUF + 1];	/* Primary file name */
-#else
-	TCHAR	fname[12 + 1];	/* File name */
-#endif
-} FILINFO;
-
-
-
-/* File function return code (FRESULT) */
-
-typedef enum {
-	FR_OK = 0,				/* (0) Succeeded */
-	FR_DISK_ERR,			/* (1) A hard error occurred in the low level disk I/O layer */
-	FR_INT_ERR,				/* (2) Assertion failed */
-	FR_NOT_READY,			/* (3) The physical drive cannot work */
-	FR_NO_FILE,				/* (4) Could not find the file */
-	FR_NO_PATH,				/* (5) Could not find the path */
-	FR_INVALID_NAME,		/* (6) The path name format is invalid */
-	FR_DENIED,				/* (7) Access denied due to prohibited access or directory full */
-	FR_EXIST,				/* (8) Access denied due to prohibited access */
-	FR_INVALID_OBJECT,		/* (9) The file/directory object is invalid */
-	FR_WRITE_PROTECTED,		/* (10) The physical drive is write protected */
-	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */
-	FR_NOT_ENABLED,			/* (12) The volume has no work area */
-	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume */
-	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any problem */
-	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */
-	FR_LOCKED,				/* (16) The operation is rejected according to the file sharing policy */
-	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */
-	FR_TOO_MANY_OPEN_FILES,	/* (18) Number of open files > FF_FS_LOCK */
-	FR_INVALID_PARAMETER	/* (19) Given parameter is invalid */
-} FRESULT;
-
-
-
-/*--------------------------------------------------------------*/
-/* FatFs module application interface                           */
-
-FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
-FRESULT f_close (FIL* fp);											/* Close an open file object */
-FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br);			/* Read data from the file */
-FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw);	/* Write data to the file */
-FRESULT f_lseek (FIL* fp, FSIZE_t ofs);								/* Move file pointer of the file object */
-FRESULT f_truncate (FIL* fp);										/* Truncate the file */
-FRESULT f_sync (FIL* fp);											/* Flush cached data of the writing file */
-FRESULT f_opendir (DIR* dp, const TCHAR* path);						/* Open a directory */
-FRESULT f_closedir (DIR* dp);										/* Close an open directory */
-FRESULT f_readdir (DIR* dp, FILINFO* fno);							/* Read a directory item */
-FRESULT f_findfirst (DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern);	/* Find first file */
-FRESULT f_findnext (DIR* dp, FILINFO* fno);							/* Find next file */
-FRESULT f_mkdir (const TCHAR* path);								/* Create a sub directory */
-FRESULT f_unlink (const TCHAR* path);								/* Delete an existing file or directory */
-FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new);	/* Rename/Move a file or directory */
-FRESULT f_stat (const TCHAR* path, FILINFO* fno);					/* Get file status */
-FRESULT f_chmod (const TCHAR* path, BYTE attr, BYTE mask);			/* Change attribute of a file/dir */
-FRESULT f_utime (const TCHAR* path, const FILINFO* fno);			/* Change timestamp of a file/dir */
-FRESULT f_chdir (const TCHAR* path);								/* Change current directory */
-FRESULT f_chdrive (const TCHAR* path);								/* Change current drive */
-FRESULT f_getcwd (TCHAR* buff, UINT len);							/* Get current directory */
-FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs);	/* Get number of free clusters on the drive */
-FRESULT f_getlabel (const TCHAR* path, TCHAR* label, DWORD* vsn);	/* Get volume label */
-FRESULT f_setlabel (const TCHAR* label);							/* Set volume label */
-FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf);	/* Forward data to the stream */
-FRESULT f_expand (FIL* fp, FSIZE_t fsz, BYTE opt);					/* Allocate a contiguous block to the file */
-FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt);			/* Mount/Unmount a logical drive */
-FRESULT f_mkfs (const TCHAR* path, BYTE opt, DWORD au, void* work, UINT len);	/* Create a FAT volume */
-FRESULT f_fdisk (BYTE pdrv, const DWORD* szt, void* work);			/* Divide a physical drive into some partitions */
-FRESULT f_setcp (WORD cp);											/* Set current code page */
-int f_putc (TCHAR c, FIL* fp);										/* Put a character to the file */
-int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
-int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
-TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */
-
-#define f_eof(fp) ((int)((fp)->fptr == (fp)->obj.objsize))
-#define f_error(fp) ((fp)->err)
-#define f_tell(fp) ((fp)->fptr)
-#define f_size(fp) ((fp)->obj.objsize)
-#define f_rewind(fp) f_lseek((fp), 0)
-#define f_rewinddir(dp) f_readdir((dp), 0)
-#define f_rmdir(path) f_unlink(path)
-#define f_unmount(path) f_mount(0, path, 0)
-
-#ifndef EOF
-#define EOF (-1)
-#endif
-
-
-
-
-/*--------------------------------------------------------------*/
-/* Additional user defined functions                            */
-
-/* RTC function */
-#if !FF_FS_READONLY && !FF_FS_NORTC
-DWORD get_fattime (void);
-#endif
-
-/* LFN support functions */
-#if FF_USE_LFN >= 1						/* Code conversion (defined in unicode.c) */
-WCHAR ff_oem2uni (WCHAR oem, WORD cp);	/* OEM code to Unicode conversion */
-WCHAR ff_uni2oem (DWORD uni, WORD cp);	/* Unicode to OEM code conversion */
-DWORD ff_wtoupper (DWORD uni);			/* Unicode upper-case conversion */
-#endif
-#if FF_USE_LFN == 3						/* Dynamic memory allocation */
-void* ff_memalloc (UINT msize);			/* Allocate memory block */
-void ff_memfree (void* mblock);			/* Free memory block */
-#endif
-
-/* Sync functions */
-#if FF_FS_REENTRANT
-int ff_cre_syncobj (BYTE vol, FF_SYNC_t* sobj);	/* Create a sync object */
-int ff_req_grant (FF_SYNC_t sobj);		/* Lock sync object */
-void ff_rel_grant (FF_SYNC_t sobj);		/* Unlock sync object */
-int ff_del_syncobj (FF_SYNC_t sobj);	/* Delete a sync object */
-#endif
-
-
-
-
-/*--------------------------------------------------------------*/
-/* Flags and offset address                                     */
-
-
-/* File access mode and open method flags (3rd argument of f_open) */
-#define	FA_READ				0x01
-#define	FA_WRITE			0x02
-#define	FA_OPEN_EXISTING	0x00
-#define	FA_CREATE_NEW		0x04
-#define	FA_CREATE_ALWAYS	0x08
-#define	FA_OPEN_ALWAYS		0x10
-#define	FA_OPEN_APPEND		0x30
-
-/* Fast seek controls (2nd argument of f_lseek) */
-#define CREATE_LINKMAP	((FSIZE_t)0 - 1)
-
-/* Format options (2nd argument of f_mkfs) */
-#define FM_FAT		0x01
-#define FM_FAT32	0x02
-#define FM_EXFAT	0x04
-#define FM_ANY		0x07
-#define FM_SFD		0x08
-
-/* Filesystem type (FATFS.fs_type) */
-#define FS_FAT12	1
-#define FS_FAT16	2
-#define FS_FAT32	3
-#define FS_EXFAT	4
-
-/* File attribute bits for directory entry (FILINFO.fattrib) */
-#define	AM_RDO	0x01	/* Read only */
-#define	AM_HID	0x02	/* Hidden */
-#define	AM_SYS	0x04	/* System */
-#define AM_DIR	0x10	/* Directory */
-#define AM_ARC	0x20	/* Archive */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FF_DEFINED */

fusee/fusee-secondary/src/lib/fatfs/ffsystem.c

@@ -1,170 +0,0 @@
-/*------------------------------------------------------------------------*/
-/* Sample Code of OS Dependent Functions for FatFs                        */
-/* (C)ChaN, 2018                                                          */
-/*------------------------------------------------------------------------*/
-
-
-#include "ff.h"
-
-
-#if FF_USE_LFN == 3	/* Dynamic memory allocation */
-
-/*------------------------------------------------------------------------*/
-/* Allocate a memory block                                                */
-/*------------------------------------------------------------------------*/
-
-void* ff_memalloc (	/* Returns pointer to the allocated memory block (null if not enough core) */
-	UINT msize		/* Number of bytes to allocate */
-)
-{
-	return malloc(msize);	/* Allocate a new memory block with POSIX API */
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Free a memory block                                                    */
-/*------------------------------------------------------------------------*/
-
-void ff_memfree (
-	void* mblock	/* Pointer to the memory block to free (nothing to do if null) */
-)
-{
-	free(mblock);	/* Free the memory block with POSIX API */
-}
-
-#endif
-
-
-
-#if FF_FS_REENTRANT	/* Mutal exclusion */
-
-/*------------------------------------------------------------------------*/
-/* Create a Synchronization Object                                        */
-/*------------------------------------------------------------------------*/
-/* This function is called in f_mount() function to create a new
-/  synchronization object for the volume, such as semaphore and mutex.
-/  When a 0 is returned, the f_mount() function fails with FR_INT_ERR.
-*/
-
-//const osMutexDef_t Mutex[FF_VOLUMES];	/* Table of CMSIS-RTOS mutex */
-
-
-int ff_cre_syncobj (	/* 1:Function succeeded, 0:Could not create the sync object */
-	BYTE vol,			/* Corresponding volume (logical drive number) */
-	FF_SYNC_t* sobj		/* Pointer to return the created sync object */
-)
-{
-	/* Win32 */
-	*sobj = CreateMutex(NULL, FALSE, NULL);
-	return (int)(*sobj != INVALID_HANDLE_VALUE);
-
-	/* uITRON */
-//	T_CSEM csem = {TA_TPRI,1,1};
-//	*sobj = acre_sem(&csem);
-//	return (int)(*sobj > 0);
-
-	/* uC/OS-II */
-//	OS_ERR err;
-//	*sobj = OSMutexCreate(0, &err);
-//	return (int)(err == OS_NO_ERR);
-
-	/* FreeRTOS */
-//	*sobj = xSemaphoreCreateMutex();
-//	return (int)(*sobj != NULL);
-
-	/* CMSIS-RTOS */
-//	*sobj = osMutexCreate(&Mutex[vol]);
-//	return (int)(*sobj != NULL);
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Delete a Synchronization Object                                        */
-/*------------------------------------------------------------------------*/
-/* This function is called in f_mount() function to delete a synchronization
-/  object that created with ff_cre_syncobj() function. When a 0 is returned,
-/  the f_mount() function fails with FR_INT_ERR.
-*/
-
-int ff_del_syncobj (	/* 1:Function succeeded, 0:Could not delete due to an error */
-	FF_SYNC_t sobj		/* Sync object tied to the logical drive to be deleted */
-)
-{
-	/* Win32 */
-	return (int)CloseHandle(sobj);
-
-	/* uITRON */
-//	return (int)(del_sem(sobj) == E_OK);
-
-	/* uC/OS-II */
-//	OS_ERR err;
-//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);
-//	return (int)(err == OS_NO_ERR);
-
-	/* FreeRTOS */
-//  vSemaphoreDelete(sobj);
-//	return 1;
-
-	/* CMSIS-RTOS */
-//	return (int)(osMutexDelete(sobj) == osOK);
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Request Grant to Access the Volume                                     */
-/*------------------------------------------------------------------------*/
-/* This function is called on entering file functions to lock the volume.
-/  When a 0 is returned, the file function fails with FR_TIMEOUT.
-*/
-
-int ff_req_grant (	/* 1:Got a grant to access the volume, 0:Could not get a grant */
-	FF_SYNC_t sobj	/* Sync object to wait */
-)
-{
-	/* Win32 */
-	return (int)(WaitForSingleObject(sobj, FF_FS_TIMEOUT) == WAIT_OBJECT_0);
-
-	/* uITRON */
-//	return (int)(wai_sem(sobj) == E_OK);
-
-	/* uC/OS-II */
-//	OS_ERR err;
-//	OSMutexPend(sobj, FF_FS_TIMEOUT, &err));
-//	return (int)(err == OS_NO_ERR);
-
-	/* FreeRTOS */
-//	return (int)(xSemaphoreTake(sobj, FF_FS_TIMEOUT) == pdTRUE);
-
-	/* CMSIS-RTOS */
-//	return (int)(osMutexWait(sobj, FF_FS_TIMEOUT) == osOK);
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Release Grant to Access the Volume                                     */
-/*------------------------------------------------------------------------*/
-/* This function is called on leaving file functions to unlock the volume.
-*/
-
-void ff_rel_grant (
-	FF_SYNC_t sobj	/* Sync object to be signaled */
-)
-{
-	/* Win32 */
-	ReleaseMutex(sobj);
-
-	/* uITRON */
-//	sig_sem(sobj);
-
-	/* uC/OS-II */
-//	OSMutexPost(sobj);
-
-	/* FreeRTOS */
-//	xSemaphoreGive(sobj);
-
-	/* CMSIS-RTOS */
-//	osMutexRelease(sobj);
-}
-
-#endif
-

fusee/fusee-secondary/src/lib/ini.c

@@ -1,272 +0,0 @@
-/* inih -- simple .INI file parser
-
-inih is released under the New BSD license (see LICENSE.txt). Go to the project
-home page for more info:
-
-https://github.com/benhoyt/inih
-
-*/
-
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#include "ini.h"
-
-#if !INI_USE_STACK
-#include <stdlib.h>
-#endif
-
-#define MAX_SECTION 50
-#define MAX_NAME 50
-
-/* Used by ini_parse_string() to keep track of string parsing state. */
-typedef struct {
-    const char* ptr;
-    size_t num_left;
-} ini_parse_string_ctx;
-
-/* Strip whitespace chars off end of given string, in place. Return s. */
-static char* rstrip(char* s)
-{
-    char* p = s + strlen(s);
-    while (p > s && isspace((unsigned char)(*--p)))
-        *p = '\0';
-    return s;
-}
-
-/* Return pointer to first non-whitespace char in given string. */
-static char* lskip(const char* s)
-{
-    while (*s && isspace((unsigned char)(*s)))
-        s++;
-    return (char*)s;
-}
-
-/* Return pointer to first char (of chars) or inline comment in given string,
-   or pointer to null at end of string if neither found. Inline comment must
-   be prefixed by a whitespace character to register as a comment. */
-static char* find_chars_or_comment(const char* s, const char* chars)
-{
-#if INI_ALLOW_INLINE_COMMENTS
-    int was_space = 0;
-    while (*s && (!chars || !strchr(chars, *s)) &&
-           !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) {
-        was_space = isspace((unsigned char)(*s));
-        s++;
-    }
-#else
-    while (*s && (!chars || !strchr(chars, *s))) {
-        s++;
-    }
-#endif
-    return (char*)s;
-}
-
-/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
-static char* strncpy0(char* dest, const char* src, size_t size)
-{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-truncation"
-    strncpy(dest, src, size - 1);
-#pragma GCC diagnostic pop
-    dest[size - 1] = '\0';
-    return dest;
-}
-
-/* See documentation in header file. */
-int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
-                     void* user)
-{
-    /* Uses a fair bit of stack (use heap instead if you need to) */
-#if INI_USE_STACK
-    char line[INI_MAX_LINE];
-    int max_line = INI_MAX_LINE;
-#else
-    char* line;
-    int max_line = INI_INITIAL_ALLOC;
-#endif
-#if INI_ALLOW_REALLOC
-    char* new_line;
-    int offset;
-#endif
-    char section[MAX_SECTION] = "";
-    char prev_name[MAX_NAME] = "";
-
-    char* start;
-    char* end;
-    char* name;
-    char* value;
-    int lineno = 0;
-    int error = 0;
-
-#if !INI_USE_STACK
-    line = (char*)malloc(INI_INITIAL_ALLOC);
-    if (!line) {
-        return -2;
-    }
-#endif
-
-#if INI_HANDLER_LINENO
-#define HANDLER(u, s, n, v) handler(u, s, n, v, lineno)
-#else
-#define HANDLER(u, s, n, v) handler(u, s, n, v)
-#endif
-
-    /* Scan through stream line by line */
-    while (reader(line, max_line, stream) != NULL) {
-#if INI_ALLOW_REALLOC
-        offset = strlen(line);
-        while (offset == max_line - 1 && line[offset - 1] != '\n') {
-            max_line *= 2;
-            if (max_line > INI_MAX_LINE)
-                max_line = INI_MAX_LINE;
-            new_line = realloc(line, max_line);
-            if (!new_line) {
-                free(line);
-                return -2;
-            }
-            line = new_line;
-            if (reader(line + offset, max_line - offset, stream) == NULL)
-                break;
-            if (max_line >= INI_MAX_LINE)
-                break;
-            offset += strlen(line + offset);
-        }
-#endif
-
-        lineno++;
-
-        start = line;
-#if INI_ALLOW_BOM
-        if (lineno == 1 && (unsigned char)start[0] == 0xEF &&
-                           (unsigned char)start[1] == 0xBB &&
-                           (unsigned char)start[2] == 0xBF) {
-            start += 3;
-        }
-#endif
-        start = lskip(rstrip(start));
-
-        if (strchr(INI_START_COMMENT_PREFIXES, *start)) {
-            /* Start-of-line comment */
-        }
-#if INI_ALLOW_MULTILINE
-        else if (*prev_name && *start && start > line) {
-            /* Non-blank line with leading whitespace, treat as continuation
-               of previous name's value (as per Python configparser). */
-            if (!HANDLER(user, section, prev_name, start) && !error)
-                error = lineno;
-        }
-#endif
-        else if (*start == '[') {
-            /* A "[section]" line */
-            end = find_chars_or_comment(start + 1, "]");
-            if (*end == ']') {
-                *end = '\0';
-                strncpy0(section, start + 1, sizeof(section));
-                *prev_name = '\0';
-            }
-            else if (!error) {
-                /* No ']' found on section line */
-                error = lineno;
-            }
-        }
-        else if (*start) {
-            /* Not a comment, must be a name[=:]value pair */
-            end = find_chars_or_comment(start, "=:");
-            if (*end == '=' || *end == ':') {
-                *end = '\0';
-                name = rstrip(start);
-                value = end + 1;
-#if INI_ALLOW_INLINE_COMMENTS
-                end = find_chars_or_comment(value, NULL);
-                if (*end)
-                    *end = '\0';
-#endif
-                value = lskip(value);
-                rstrip(value);
-
-                /* Valid name[=:]value pair found, call handler */
-                strncpy0(prev_name, name, sizeof(prev_name));
-                if (!HANDLER(user, section, name, value) && !error)
-                    error = lineno;
-            }
-            else if (!error) {
-                /* No '=' or ':' found on name[=:]value line */
-                error = lineno;
-            }
-        }
-
-#if INI_STOP_ON_FIRST_ERROR
-        if (error)
-            break;
-#endif
-    }
-
-#if !INI_USE_STACK
-    free(line);
-#endif
-
-    return error;
-}
-
-/* See documentation in header file. */
-int ini_parse_file(FILE* file, ini_handler handler, void* user)
-{
-    return ini_parse_stream((ini_reader)fgets, file, handler, user);
-}
-
-/* See documentation in header file. */
-int ini_parse(const char* filename, ini_handler handler, void* user)
-{
-    FILE* file;
-    int error;
-
-    file = fopen(filename, "r");
-    if (!file)
-        return -1;
-    error = ini_parse_file(file, handler, user);
-    fclose(file);
-    return error;
-}
-
-/* An ini_reader function to read the next line from a string buffer. This
-   is the fgets() equivalent used by ini_parse_string(). */
-static char* ini_reader_string(char* str, int num, void* stream) {
-    ini_parse_string_ctx* ctx = (ini_parse_string_ctx*)stream;
-    const char* ctx_ptr = ctx->ptr;
-    size_t ctx_num_left = ctx->num_left;
-    char* strp = str;
-    char c;
-
-    if (ctx_num_left == 0 || num < 2)
-        return NULL;
-
-    while (num > 1 && ctx_num_left != 0) {
-        c = *ctx_ptr++;
-        ctx_num_left--;
-        *strp++ = c;
-        if (c == '\n')
-            break;
-        num--;
-    }
-
-    *strp = '\0';
-    ctx->ptr = ctx_ptr;
-    ctx->num_left = ctx_num_left;
-    return str;
-}
-
-/* See documentation in header file. */
-int ini_parse_string(const char* string, ini_handler handler, void* user) {
-    ini_parse_string_ctx ctx;
-
-    ctx.ptr = string;
-    ctx.num_left = strlen(string);
-    return ini_parse_stream((ini_reader)ini_reader_string, &ctx, handler,
-                            user);
-}

fusee/fusee-secondary/src/lib/ini.h

@@ -1,130 +0,0 @@
-/* inih -- simple .INI file parser
-
-inih is released under the New BSD license (see LICENSE.txt). Go to the project
-home page for more info:
-
-https://github.com/benhoyt/inih
-
-*/
-
-#ifndef __INI_H__
-#define __INI_H__
-
-/* Make this header file easier to include in C++ code */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-
-/* Nonzero if ini_handler callback should accept lineno parameter. */
-#ifndef INI_HANDLER_LINENO
-#define INI_HANDLER_LINENO 0
-#endif
-
-/* Typedef for prototype of handler function. */
-#if INI_HANDLER_LINENO
-typedef int (*ini_handler)(void* user, const char* section,
-                           const char* name, const char* value,
-                           int lineno);
-#else
-typedef int (*ini_handler)(void* user, const char* section,
-                           const char* name, const char* value);
-#endif
-
-/* Typedef for prototype of fgets-style reader function. */
-typedef char* (*ini_reader)(char* str, int num, void* stream);
-
-/* Parse given INI-style file. May have [section]s, name=value pairs
-   (whitespace stripped), and comments starting with ';' (semicolon). Section
-   is "" if name=value pair parsed before any section heading. name:value
-   pairs are also supported as a concession to Python's configparser.
-
-   For each name=value pair parsed, call handler function with given user
-   pointer as well as section, name, and value (data only valid for duration
-   of handler call). Handler should return nonzero on success, zero on error.
-
-   Returns 0 on success, line number of first error on parse error (doesn't
-   stop on first error), -1 on file open error, or -2 on memory allocation
-   error (only when INI_USE_STACK is zero).
-*/
-int ini_parse(const char* filename, ini_handler handler, void* user);
-
-/* Same as ini_parse(), but takes a FILE* instead of filename. This doesn't
-   close the file when it's finished -- the caller must do that. */
-int ini_parse_file(FILE* file, ini_handler handler, void* user);
-
-/* Same as ini_parse(), but takes an ini_reader function pointer instead of
-   filename. Used for implementing custom or string-based I/O (see also
-   ini_parse_string). */
-int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
-                     void* user);
-
-/* Same as ini_parse(), but takes a zero-terminated string with the INI data
-instead of a file. Useful for parsing INI data from a network socket or
-already in memory. */
-int ini_parse_string(const char* string, ini_handler handler, void* user);
-
-/* Nonzero to allow multi-line value parsing, in the style of Python's
-   configparser. If allowed, ini_parse() will call the handler with the same
-   name for each subsequent line parsed. */
-#ifndef INI_ALLOW_MULTILINE
-#define INI_ALLOW_MULTILINE 1
-#endif
-
-/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of
-   the file. See http://code.google.com/p/inih/issues/detail?id=21 */
-#ifndef INI_ALLOW_BOM
-#define INI_ALLOW_BOM 1
-#endif
-
-/* Chars that begin a start-of-line comment. Per Python configparser, allow
-   both ; and # comments at the start of a line by default. */
-#ifndef INI_START_COMMENT_PREFIXES
-#define INI_START_COMMENT_PREFIXES ";#"
-#endif
-
-/* Nonzero to allow inline comments (with valid inline comment characters
-   specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match
-   Python 3.2+ configparser behaviour. */
-#ifndef INI_ALLOW_INLINE_COMMENTS
-#define INI_ALLOW_INLINE_COMMENTS 1
-#endif
-#ifndef INI_INLINE_COMMENT_PREFIXES
-#define INI_INLINE_COMMENT_PREFIXES ";"
-#endif
-
-/* Nonzero to use stack for line buffer, zero to use heap (malloc/free). */
-#ifndef INI_USE_STACK
-#define INI_USE_STACK 1
-#endif
-
-/* Maximum line length for any line in INI file (stack or heap). Note that
-   this must be 3 more than the longest line (due to '\r', '\n', and '\0'). */
-#ifndef INI_MAX_LINE
-#define INI_MAX_LINE 200
-#endif
-
-/* Nonzero to allow heap line buffer to grow via realloc(), zero for a
-   fixed-size buffer of INI_MAX_LINE bytes. Only applies if INI_USE_STACK is
-   zero. */
-#ifndef INI_ALLOW_REALLOC
-#define INI_ALLOW_REALLOC 0
-#endif
-
-/* Initial size in bytes for heap line buffer. Only applies if INI_USE_STACK
-   is zero. */
-#ifndef INI_INITIAL_ALLOC
-#define INI_INITIAL_ALLOC 200
-#endif
-
-/* Stop parsing on first error (default is to keep parsing). */
-#ifndef INI_STOP_ON_FIRST_ERROR
-#define INI_STOP_ON_FIRST_ERROR 0
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __INI_H__ */

fusee/fusee-secondary/src/loader.c

@@ -23,8 +23,8 @@
 #include "loader.h"
 #include "fs_utils.h"
 #include "stage2.h"
-#include "lib/ini.h"
+#include "../../../fusee/common/ini.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 static loader_ctx_t g_loader_ctx = {0};
 

fusee/fusee-secondary/src/main.c

@@ -31,9 +31,9 @@
 #include "fs_utils.h"
 #include "nxfs.h"
 #include "gpt.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
-#include "sdmmc/sdmmc.h"
+#include "../../../fusee/common/sdmmc/sdmmc.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 extern void (*__program_exit_callback)(int rc);
 

fusee/fusee-secondary/src/nxboot.c

@@ -47,9 +47,9 @@
 #include "lp0.h"
 #include "loader.h"
 #include "exocfg.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
-#include "lib/ini.h"
+#include "../../../fusee/common/ini.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 #include "splash_screen.h"
 
 #define u8 uint8_t

fusee/fusee-secondary/src/nxfs.c

@@ -25,10 +25,9 @@
 #include "se.h"
 #include "utils.h"
 #include "fs_utils.h"
-#include "sdmmc/sdmmc.h"
+#include "../../../fusee/common/sdmmc/sdmmc.h"
-
+#include "../../../fusee/common/log.h"
-#include "lib/log.h"
+#include "../../../fusee/common/fatfs/ff.h"
-#include "lib/fatfs/ff.h"
 
 static bool g_ahb_redirect_enabled = false;
 static bool g_sd_device_initialized = false;

fusee/fusee-secondary/src/package2.c

@@ -29,7 +29,7 @@
 #define u8 uint8_t
 #define u32 uint32_t
 #include "thermosphere_bin.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 #undef u8
 #undef u32
 

fusee/fusee-secondary/src/sdmmc/mmc.h

@@ -1,449 +0,0 @@
-/*
- * Header for MultiMediaCard (MMC)
- *
- * Copyright 2002 Hewlett-Packard Company
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * Use consistent with the GNU GPL is permitted,
- * provided that this copyright notice is
- * preserved in its entirety in all copies and derived works.
- *
- * HEWLETT-PACKARD COMPANY MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
- * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
- * FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- * Many thanks to Alessandro Rubini and Jonathan Corbet!
- *
- * Based strongly on code by:
- *
- * Author: Yong-iL Joh <tolkien@mizi.com>
- *
- * Author:  Andrew Christian
- *          15 May 2002
- */
-
-#ifndef LINUX_MMC_MMC_H
-#define LINUX_MMC_MMC_H
-
-/* Standard MMC commands (4.1)           type  argument     response */
-   /* class 1 */
-#define MMC_GO_IDLE_STATE         0   /* bc                          */
-#define MMC_SEND_OP_COND          1   /* bcr  [31:0] OCR         R3  */
-#define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
-#define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
-#define MMC_SET_DSR               4   /* bc   [31:16] RCA            */
-#define MMC_SLEEP_AWAKE           5   /* ac   [31:16] RCA 15:flg R1b */
-#define MMC_SWITCH                6   /* ac   [31:0] See below   R1b */
-#define MMC_SELECT_CARD           7   /* ac   [31:16] RCA        R1  */
-#define MMC_SEND_EXT_CSD          8   /* adtc                    R1  */
-#define MMC_SEND_CSD              9   /* ac   [31:16] RCA        R2  */
-#define MMC_SEND_CID             10   /* ac   [31:16] RCA        R2  */
-#define MMC_READ_DAT_UNTIL_STOP  11   /* adtc [31:0] dadr        R1  */
-#define MMC_STOP_TRANSMISSION    12   /* ac                      R1b */
-#define MMC_SEND_STATUS          13   /* ac   [31:16] RCA        R1  */
-#define MMC_BUS_TEST_R           14   /* adtc                    R1  */
-#define MMC_GO_INACTIVE_STATE    15   /* ac   [31:16] RCA            */
-#define MMC_BUS_TEST_W           19   /* adtc                    R1  */
-#define MMC_SPI_READ_OCR         58   /* spi                  spi_R3 */
-#define MMC_SPI_CRC_ON_OFF       59   /* spi  [0:0] flag      spi_R1 */
-
-  /* class 2 */
-#define MMC_SET_BLOCKLEN            16   /* ac   [31:0] block len   R1  */
-#define MMC_READ_SINGLE_BLOCK       17   /* adtc [31:0] data addr   R1  */
-#define MMC_READ_MULTIPLE_BLOCK     18   /* adtc [31:0] data addr   R1  */
-#define MMC_SEND_TUNING_BLOCK       19   /* adtc                    R1  */
-#define MMC_SEND_TUNING_BLOCK_HS200 21   /* adtc R1  */
-
-  /* class 3 */
-#define MMC_WRITE_DAT_UNTIL_STOP 20   /* adtc [31:0] data addr   R1  */
-
-  /* class 4 */
-#define MMC_SET_BLOCK_COUNT      23   /* adtc [31:0] data addr   R1  */
-#define MMC_WRITE_BLOCK          24   /* adtc [31:0] data addr   R1  */
-#define MMC_WRITE_MULTIPLE_BLOCK 25   /* adtc                    R1  */
-#define MMC_PROGRAM_CID          26   /* adtc                    R1  */
-#define MMC_PROGRAM_CSD          27   /* adtc                    R1  */
-
-  /* class 6 */
-#define MMC_SET_WRITE_PROT       28   /* ac   [31:0] data addr   R1b */
-#define MMC_CLR_WRITE_PROT       29   /* ac   [31:0] data addr   R1b */
-#define MMC_SEND_WRITE_PROT      30   /* adtc [31:0] wpdata addr R1  */
-
-  /* class 5 */
-#define MMC_ERASE_GROUP_START    35   /* ac   [31:0] data addr   R1  */
-#define MMC_ERASE_GROUP_END      36   /* ac   [31:0] data addr   R1  */
-#define MMC_ERASE                38   /* ac                      R1b */
-
-  /* class 9 */
-#define MMC_FAST_IO              39   /* ac   <Complex>          R4  */
-#define MMC_GO_IRQ_STATE         40   /* bcr                     R5  */
-
-  /* class 7 */
-#define MMC_LOCK_UNLOCK          42   /* adtc                    R1b */
-
-  /* class 8 */
-#define MMC_APP_CMD              55   /* ac   [31:16] RCA        R1  */
-#define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1  */
-
-  /* class 11 */
-#define MMC_QUE_TASK_PARAMS      44   /* ac   [20:16] task id    R1  */
-#define MMC_QUE_TASK_ADDR        45   /* ac   [31:0] data addr   R1  */
-#define MMC_EXECUTE_READ_TASK    46   /* adtc [20:16] task id    R1  */
-#define MMC_EXECUTE_WRITE_TASK   47   /* adtc [20:16] task id    R1  */
-#define MMC_CMDQ_TASK_MGMT       48   /* ac   [20:16] task id    R1b */
-
-/*
- * MMC_SWITCH argument format:
- *
- *  [31:26] Always 0
- *  [25:24] Access Mode
- *  [23:16] Location of target Byte in EXT_CSD
- *  [15:08] Value Byte
- *  [07:03] Always 0
- *  [02:00] Command Set
- */
-
-/*
-  MMC status in R1, for native mode (SPI bits are different)
-  Type
-    e : error bit
-    s : status bit
-    r : detected and set for the actual command response
-    x : detected and set during command execution. the host must poll
-            the card by sending status command in order to read these bits.
-  Clear condition
-    a : according to the card state
-    b : always related to the previous command. Reception of
-            a valid command will clear it (with a delay of one command)
-    c : clear by read
- */
-
-#define R1_OUT_OF_RANGE     (1 << 31)   /* er, c */
-#define R1_ADDRESS_ERROR    (1 << 30)   /* erx, c */
-#define R1_BLOCK_LEN_ERROR  (1 << 29)   /* er, c */
-#define R1_ERASE_SEQ_ERROR      (1 << 28)   /* er, c */
-#define R1_ERASE_PARAM      (1 << 27)   /* ex, c */
-#define R1_WP_VIOLATION     (1 << 26)   /* erx, c */
-#define R1_CARD_IS_LOCKED   (1 << 25)   /* sx, a */
-#define R1_LOCK_UNLOCK_FAILED   (1 << 24)   /* erx, c */
-#define R1_COM_CRC_ERROR    (1 << 23)   /* er, b */
-#define R1_ILLEGAL_COMMAND  (1 << 22)   /* er, b */
-#define R1_CARD_ECC_FAILED  (1 << 21)   /* ex, c */
-#define R1_CC_ERROR     (1 << 20)   /* erx, c */
-#define R1_ERROR        (1 << 19)   /* erx, c */
-#define R1_UNDERRUN     (1 << 18)   /* ex, c */
-#define R1_OVERRUN      (1 << 17)   /* ex, c */
-#define R1_CID_CSD_OVERWRITE    (1 << 16)   /* erx, c, CID/CSD overwrite */
-#define R1_WP_ERASE_SKIP    (1 << 15)   /* sx, c */
-#define R1_CARD_ECC_DISABLED    (1 << 14)   /* sx, a */
-#define R1_ERASE_RESET      (1 << 13)   /* sr, c */
-#define R1_STATUS(x)            (x & 0xFFFFE000)
-#define R1_CURRENT_STATE(x) ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
-#define R1_READY_FOR_DATA   (1 << 8)    /* sx, a */
-#define R1_SWITCH_ERROR     (1 << 7)    /* sx, c */
-#define R1_EXCEPTION_EVENT  (1 << 6)    /* sr, a */
-#define R1_APP_CMD      (1 << 5)    /* sr, c */
-
-#define R1_STATE_IDLE   0
-#define R1_STATE_READY  1
-#define R1_STATE_IDENT  2
-#define R1_STATE_STBY   3
-#define R1_STATE_TRAN   4
-#define R1_STATE_DATA   5
-#define R1_STATE_RCV    6
-#define R1_STATE_PRG    7
-#define R1_STATE_DIS    8
-
-/*
- * MMC/SD in SPI mode reports R1 status always, and R2 for SEND_STATUS
- * R1 is the low order byte; R2 is the next highest byte, when present.
- */
-#define R1_SPI_IDLE     (1 << 0)
-#define R1_SPI_ERASE_RESET  (1 << 1)
-#define R1_SPI_ILLEGAL_COMMAND  (1 << 2)
-#define R1_SPI_COM_CRC      (1 << 3)
-#define R1_SPI_ERASE_SEQ    (1 << 4)
-#define R1_SPI_ADDRESS      (1 << 5)
-#define R1_SPI_PARAMETER    (1 << 6)
-/* R1 bit 7 is always zero */
-#define R2_SPI_CARD_LOCKED  (1 << 8)
-#define R2_SPI_WP_ERASE_SKIP    (1 << 9)    /* or lock/unlock fail */
-#define R2_SPI_LOCK_UNLOCK_FAIL R2_SPI_WP_ERASE_SKIP
-#define R2_SPI_ERROR        (1 << 10)
-#define R2_SPI_CC_ERROR     (1 << 11)
-#define R2_SPI_CARD_ECC_ERROR   (1 << 12)
-#define R2_SPI_WP_VIOLATION (1 << 13)
-#define R2_SPI_ERASE_PARAM  (1 << 14)
-#define R2_SPI_OUT_OF_RANGE (1 << 15)   /* or CSD overwrite */
-#define R2_SPI_CSD_OVERWRITE    R2_SPI_OUT_OF_RANGE
-
-/*
- * OCR bits are mostly in host.h
- */
-#define MMC_CARD_BUSY       0x80000000  /* Card Power up status bit */
-#define MMC_VDD_165_195     0x00000080  /* VDD voltage 1.65 - 1.95 */
-#define MMC_VDD_20_21       0x00000100  /* VDD voltage 2.0 ~ 2.1 */
-#define MMC_VDD_21_22       0x00000200  /* VDD voltage 2.1 ~ 2.2 */
-#define MMC_VDD_22_23       0x00000400  /* VDD voltage 2.2 ~ 2.3 */
-#define MMC_VDD_23_24       0x00000800  /* VDD voltage 2.3 ~ 2.4 */
-#define MMC_VDD_24_25       0x00001000  /* VDD voltage 2.4 ~ 2.5 */
-#define MMC_VDD_25_26       0x00002000  /* VDD voltage 2.5 ~ 2.6 */
-#define MMC_VDD_26_27       0x00004000  /* VDD voltage 2.6 ~ 2.7 */
-#define MMC_VDD_27_28       0x00008000  /* VDD voltage 2.7 ~ 2.8 */
-#define MMC_VDD_28_29       0x00010000  /* VDD voltage 2.8 ~ 2.9 */
-#define MMC_VDD_29_30       0x00020000  /* VDD voltage 2.9 ~ 3.0 */
-#define MMC_VDD_30_31       0x00040000  /* VDD voltage 3.0 ~ 3.1 */
-#define MMC_VDD_31_32       0x00080000  /* VDD voltage 3.1 ~ 3.2 */
-#define MMC_VDD_32_33       0x00100000  /* VDD voltage 3.2 ~ 3.3 */
-#define MMC_VDD_33_34       0x00200000  /* VDD voltage 3.3 ~ 3.4 */
-#define MMC_VDD_34_35       0x00400000  /* VDD voltage 3.4 ~ 3.5 */
-#define MMC_VDD_35_36       0x00800000  /* VDD voltage 3.5 ~ 3.6 */
-
-/*
- * Card Command Classes (CCC)
- */
-#define CCC_BASIC       (1<<0)  /* (0) Basic protocol functions */
-                    /* (CMD0,1,2,3,4,7,9,10,12,13,15) */
-                    /* (and for SPI, CMD58,59) */
-#define CCC_STREAM_READ     (1<<1)  /* (1) Stream read commands */
-                    /* (CMD11) */
-#define CCC_BLOCK_READ      (1<<2)  /* (2) Block read commands */
-                    /* (CMD16,17,18) */
-#define CCC_STREAM_WRITE    (1<<3)  /* (3) Stream write commands */
-                    /* (CMD20) */
-#define CCC_BLOCK_WRITE     (1<<4)  /* (4) Block write commands */
-                    /* (CMD16,24,25,26,27) */
-#define CCC_ERASE       (1<<5)  /* (5) Ability to erase blocks */
-                    /* (CMD32,33,34,35,36,37,38,39) */
-#define CCC_WRITE_PROT      (1<<6)  /* (6) Able to write protect blocks */
-                    /* (CMD28,29,30) */
-#define CCC_LOCK_CARD       (1<<7)  /* (7) Able to lock down card */
-                    /* (CMD16,CMD42) */
-#define CCC_APP_SPEC        (1<<8)  /* (8) Application specific */
-                    /* (CMD55,56,57,ACMD*) */
-#define CCC_IO_MODE     (1<<9)  /* (9) I/O mode */
-                    /* (CMD5,39,40,52,53) */
-#define CCC_SWITCH      (1<<10) /* (10) High speed switch */
-                    /* (CMD6,34,35,36,37,50) */
-                    /* (11) Reserved */
-                    /* (CMD?) */
-
-/*
- * CSD field definitions
- */
-
-#define CSD_STRUCT_VER_1_0  0           /* Valid for system specification 1.0 - 1.2 */
-#define CSD_STRUCT_VER_1_1  1           /* Valid for system specification 1.4 - 2.2 */
-#define CSD_STRUCT_VER_1_2  2           /* Valid for system specification 3.1 - 3.2 - 3.31 - 4.0 - 4.1 */
-#define CSD_STRUCT_EXT_CSD  3           /* Version is coded in CSD_STRUCTURE in EXT_CSD */
-
-#define CSD_SPEC_VER_0      0           /* Implements system specification 1.0 - 1.2 */
-#define CSD_SPEC_VER_1      1           /* Implements system specification 1.4 */
-#define CSD_SPEC_VER_2      2           /* Implements system specification 2.0 - 2.2 */
-#define CSD_SPEC_VER_3      3           /* Implements system specification 3.1 - 3.2 - 3.31 */
-#define CSD_SPEC_VER_4      4           /* Implements system specification 4.0 - 4.1 */
-
-/*
- * EXT_CSD fields
- */
-
-#define EXT_CSD_CMDQ_MODE_EN        15  /* R/W */
-#define EXT_CSD_FLUSH_CACHE     32      /* W */
-#define EXT_CSD_CACHE_CTRL      33      /* R/W */
-#define EXT_CSD_POWER_OFF_NOTIFICATION  34  /* R/W */
-#define EXT_CSD_PACKED_FAILURE_INDEX    35  /* RO */
-#define EXT_CSD_PACKED_CMD_STATUS   36  /* RO */
-#define EXT_CSD_EXP_EVENTS_STATUS   54  /* RO, 2 bytes */
-#define EXT_CSD_EXP_EVENTS_CTRL     56  /* R/W, 2 bytes */
-#define EXT_CSD_DATA_SECTOR_SIZE    61  /* R */
-#define EXT_CSD_GP_SIZE_MULT        143 /* R/W */
-#define EXT_CSD_PARTITION_SETTING_COMPLETED 155 /* R/W */
-#define EXT_CSD_PARTITION_ATTRIBUTE 156 /* R/W */
-#define EXT_CSD_PARTITION_SUPPORT   160 /* RO */
-#define EXT_CSD_HPI_MGMT        161 /* R/W */
-#define EXT_CSD_RST_N_FUNCTION      162 /* R/W */
-#define EXT_CSD_BKOPS_EN        163 /* R/W */
-#define EXT_CSD_BKOPS_START     164 /* W */
-#define EXT_CSD_SANITIZE_START      165     /* W */
-#define EXT_CSD_WR_REL_PARAM        166 /* RO */
-#define EXT_CSD_RPMB_MULT       168 /* RO */
-#define EXT_CSD_FW_CONFIG       169 /* R/W */
-#define EXT_CSD_BOOT_WP         173 /* R/W */
-#define EXT_CSD_ERASE_GROUP_DEF     175 /* R/W */
-#define EXT_CSD_PART_CONFIG     179 /* R/W */
-#define EXT_CSD_ERASED_MEM_CONT     181 /* RO */
-#define EXT_CSD_BUS_WIDTH       183 /* R/W */
-#define EXT_CSD_STROBE_SUPPORT      184 /* RO */
-#define EXT_CSD_HS_TIMING       185 /* R/W */
-#define EXT_CSD_POWER_CLASS     187 /* R/W */
-#define EXT_CSD_REV         192 /* RO */
-#define EXT_CSD_STRUCTURE       194 /* RO */
-#define EXT_CSD_CARD_TYPE       196 /* RO */
-#define EXT_CSD_DRIVER_STRENGTH     197 /* RO */
-#define EXT_CSD_OUT_OF_INTERRUPT_TIME   198 /* RO */
-#define EXT_CSD_PART_SWITCH_TIME        199     /* RO */
-#define EXT_CSD_PWR_CL_52_195       200 /* RO */
-#define EXT_CSD_PWR_CL_26_195       201 /* RO */
-#define EXT_CSD_PWR_CL_52_360       202 /* RO */
-#define EXT_CSD_PWR_CL_26_360       203 /* RO */
-#define EXT_CSD_SEC_CNT         212 /* RO, 4 bytes */
-#define EXT_CSD_S_A_TIMEOUT     217 /* RO */
-#define EXT_CSD_REL_WR_SEC_C        222 /* RO */
-#define EXT_CSD_HC_WP_GRP_SIZE      221 /* RO */
-#define EXT_CSD_ERASE_TIMEOUT_MULT  223 /* RO */
-#define EXT_CSD_HC_ERASE_GRP_SIZE   224 /* RO */
-#define EXT_CSD_BOOT_MULT       226 /* RO */
-#define EXT_CSD_SEC_TRIM_MULT       229 /* RO */
-#define EXT_CSD_SEC_ERASE_MULT      230 /* RO */
-#define EXT_CSD_SEC_FEATURE_SUPPORT 231 /* RO */
-#define EXT_CSD_TRIM_MULT       232 /* RO */
-#define EXT_CSD_PWR_CL_200_195      236 /* RO */
-#define EXT_CSD_PWR_CL_200_360      237 /* RO */
-#define EXT_CSD_PWR_CL_DDR_52_195   238 /* RO */
-#define EXT_CSD_PWR_CL_DDR_52_360   239 /* RO */
-#define EXT_CSD_BKOPS_STATUS        246 /* RO */
-#define EXT_CSD_POWER_OFF_LONG_TIME 247 /* RO */
-#define EXT_CSD_GENERIC_CMD6_TIME   248 /* RO */
-#define EXT_CSD_CACHE_SIZE      249 /* RO, 4 bytes */
-#define EXT_CSD_PWR_CL_DDR_200_360  253 /* RO */
-#define EXT_CSD_FIRMWARE_VERSION    254 /* RO, 8 bytes */
-#define EXT_CSD_PRE_EOL_INFO        267 /* RO */
-#define EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_A  268 /* RO */
-#define EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_B  269 /* RO */
-#define EXT_CSD_CMDQ_DEPTH      307 /* RO */
-#define EXT_CSD_CMDQ_SUPPORT        308 /* RO */
-#define EXT_CSD_SUPPORTED_MODE      493 /* RO */
-#define EXT_CSD_TAG_UNIT_SIZE       498 /* RO */
-#define EXT_CSD_DATA_TAG_SUPPORT    499 /* RO */
-#define EXT_CSD_MAX_PACKED_WRITES   500 /* RO */
-#define EXT_CSD_MAX_PACKED_READS    501 /* RO */
-#define EXT_CSD_BKOPS_SUPPORT       502 /* RO */
-#define EXT_CSD_HPI_FEATURES        503 /* RO */
-
-/*
- * EXT_CSD field definitions
- */
-
-#define EXT_CSD_WR_REL_PARAM_EN     (1<<2)
-
-#define EXT_CSD_BOOT_WP_B_PWR_WP_DIS    (0x40)
-#define EXT_CSD_BOOT_WP_B_PERM_WP_DIS   (0x10)
-#define EXT_CSD_BOOT_WP_B_PERM_WP_EN    (0x04)
-#define EXT_CSD_BOOT_WP_B_PWR_WP_EN (0x01)
-
-#define EXT_CSD_PART_CONFIG_ACC_MASK    (0x7)
-#define EXT_CSD_PART_CONFIG_ACC_BOOT0   (0x1)
-#define EXT_CSD_PART_CONFIG_ACC_RPMB    (0x3)
-#define EXT_CSD_PART_CONFIG_ACC_GP0 (0x4)
-
-#define EXT_CSD_PART_SETTING_COMPLETED  (0x1)
-#define EXT_CSD_PART_SUPPORT_PART_EN    (0x1)
-
-#define EXT_CSD_CMD_SET_NORMAL      (1<<0)
-#define EXT_CSD_CMD_SET_SECURE      (1<<1)
-#define EXT_CSD_CMD_SET_CPSECURE    (1<<2)
-
-#define EXT_CSD_CARD_TYPE_HS_26 (1<<0)  /* Card can run at 26MHz */
-#define EXT_CSD_CARD_TYPE_HS_52 (1<<1)  /* Card can run at 52MHz */
-#define EXT_CSD_CARD_TYPE_HS    (EXT_CSD_CARD_TYPE_HS_26 | \
-                 EXT_CSD_CARD_TYPE_HS_52)
-#define EXT_CSD_CARD_TYPE_DDR_1_8V  (1<<2)   /* Card can run at 52MHz */
-                         /* DDR mode @1.8V or 3V I/O */
-#define EXT_CSD_CARD_TYPE_DDR_1_2V  (1<<3)   /* Card can run at 52MHz */
-                         /* DDR mode @1.2V I/O */
-#define EXT_CSD_CARD_TYPE_DDR_52       (EXT_CSD_CARD_TYPE_DDR_1_8V  \
-                    | EXT_CSD_CARD_TYPE_DDR_1_2V)
-#define EXT_CSD_CARD_TYPE_HS200_1_8V    (1<<4)  /* Card can run at 200MHz */
-#define EXT_CSD_CARD_TYPE_HS200_1_2V    (1<<5)  /* Card can run at 200MHz */
-                        /* SDR mode @1.2V I/O */
-#define EXT_CSD_CARD_TYPE_HS200     (EXT_CSD_CARD_TYPE_HS200_1_8V | \
-                     EXT_CSD_CARD_TYPE_HS200_1_2V)
-#define EXT_CSD_CARD_TYPE_HS400_1_8V    (1<<6)  /* Card can run at 200MHz DDR, 1.8V */
-#define EXT_CSD_CARD_TYPE_HS400_1_2V    (1<<7)  /* Card can run at 200MHz DDR, 1.2V */
-#define EXT_CSD_CARD_TYPE_HS400     (EXT_CSD_CARD_TYPE_HS400_1_8V | \
-                     EXT_CSD_CARD_TYPE_HS400_1_2V)
-#define EXT_CSD_CARD_TYPE_HS400ES   (1<<8)  /* Card can run at HS400ES */
-
-#define EXT_CSD_BUS_WIDTH_1 0   /* Card is in 1 bit mode */
-#define EXT_CSD_BUS_WIDTH_4 1   /* Card is in 4 bit mode */
-#define EXT_CSD_BUS_WIDTH_8 2   /* Card is in 8 bit mode */
-#define EXT_CSD_DDR_BUS_WIDTH_4 5   /* Card is in 4 bit DDR mode */
-#define EXT_CSD_DDR_BUS_WIDTH_8 6   /* Card is in 8 bit DDR mode */
-#define EXT_CSD_BUS_WIDTH_STROBE BIT(7) /* Enhanced strobe mode */
-
-#define EXT_CSD_TIMING_BC   0   /* Backwards compatility */
-#define EXT_CSD_TIMING_HS   1   /* High speed */
-#define EXT_CSD_TIMING_HS200    2   /* HS200 */
-#define EXT_CSD_TIMING_HS400    3   /* HS400 */
-#define EXT_CSD_DRV_STR_SHIFT   4   /* Driver Strength shift */
-
-#define EXT_CSD_SEC_ER_EN   BIT(0)
-#define EXT_CSD_SEC_BD_BLK_EN   BIT(2)
-#define EXT_CSD_SEC_GB_CL_EN    BIT(4)
-#define EXT_CSD_SEC_SANITIZE    BIT(6)  /* v4.5 only */
-
-#define EXT_CSD_RST_N_EN_MASK   0x3
-#define EXT_CSD_RST_N_ENABLED   1   /* RST_n is enabled on card */
-
-#define EXT_CSD_NO_POWER_NOTIFICATION   0
-#define EXT_CSD_POWER_ON        1
-#define EXT_CSD_POWER_OFF_SHORT     2
-#define EXT_CSD_POWER_OFF_LONG      3
-
-#define EXT_CSD_PWR_CL_8BIT_MASK    0xF0    /* 8 bit PWR CLS */
-#define EXT_CSD_PWR_CL_4BIT_MASK    0x0F    /* 8 bit PWR CLS */
-#define EXT_CSD_PWR_CL_8BIT_SHIFT   4
-#define EXT_CSD_PWR_CL_4BIT_SHIFT   0
-
-#define EXT_CSD_PACKED_EVENT_EN BIT(3)
-
-/*
- * EXCEPTION_EVENT_STATUS field
- */
-#define EXT_CSD_URGENT_BKOPS        BIT(0)
-#define EXT_CSD_DYNCAP_NEEDED       BIT(1)
-#define EXT_CSD_SYSPOOL_EXHAUSTED   BIT(2)
-#define EXT_CSD_PACKED_FAILURE      BIT(3)
-
-#define EXT_CSD_PACKED_GENERIC_ERROR    BIT(0)
-#define EXT_CSD_PACKED_INDEXED_ERROR    BIT(1)
-
-/*
- * BKOPS status level
- */
-#define EXT_CSD_BKOPS_LEVEL_2       0x2
-
-/*
- * BKOPS modes
- */
-#define EXT_CSD_MANUAL_BKOPS_MASK   0x01
-#define EXT_CSD_AUTO_BKOPS_MASK     0x02
-
-/*
- * Command Queue
- */
-#define EXT_CSD_CMDQ_MODE_ENABLED   BIT(0)
-#define EXT_CSD_CMDQ_DEPTH_MASK     GENMASK(4, 0)
-#define EXT_CSD_CMDQ_SUPPORTED      BIT(0)
-
-/*
- * MMC_SWITCH access modes
- */
-#define MMC_SWITCH_MODE_CMD_SET     0x00    /* Change the command set */
-#define MMC_SWITCH_MODE_SET_BITS    0x01    /* Set bits which are 1 in value */
-#define MMC_SWITCH_MODE_CLEAR_BITS  0x02    /* Clear bits which are 1 in value */
-#define MMC_SWITCH_MODE_WRITE_BYTE  0x03    /* Set target to value */
-
-/*
- * Erase/trim/discard
- */
-#define MMC_ERASE_ARG           0x00000000
-#define MMC_SECURE_ERASE_ARG        0x80000000
-#define MMC_TRIM_ARG            0x00000001
-#define MMC_DISCARD_ARG         0x00000003
-#define MMC_SECURE_TRIM1_ARG        0x80000001
-#define MMC_SECURE_TRIM2_ARG        0x80008000
-#define MMC_SECURE_ARGS         0x80000000
-#define MMC_TRIM_ARGS           0x00008001
-
-#endif /* LINUX_MMC_MMC_H */

fusee/fusee-secondary/src/sdmmc/sd.h

@@ -1,155 +0,0 @@
-/*
- *  include/linux/mmc/sd.h
- *
- *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
- *  Copyright (C) 2018 CTCaer
- *  Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- */
-
-#ifndef LINUX_MMC_SD_H
-#define LINUX_MMC_SD_H
-
-/* SD commands                           type  argument     response */
-/* class 0 */
-/* This is basically the same command as for MMC with some quirks. */
-#define SD_SEND_RELATIVE_ADDR     3   /* bcr                     R6  */
-#define SD_SEND_IF_COND           8   /* bcr  [11:0] See below   R7  */
-#define SD_SWITCH_VOLTAGE         11  /* ac                      R1  */
-
-/* class 10 */
-#define SD_SWITCH                 6   /* adtc [31:0] See below   R1  */
-
-/* class 5 */
-#define SD_ERASE_WR_BLK_START    32   /* ac   [31:0] data addr   R1  */
-#define SD_ERASE_WR_BLK_END      33   /* ac   [31:0] data addr   R1  */
-
-/* Application commands */
-#define SD_APP_SET_BUS_WIDTH        6   /* ac   [1:0] bus width    R1  */
-#define SD_APP_SD_STATUS            13  /* adtc                    R1  */
-#define SD_APP_SEND_NUM_WR_BLKS     22  /* adtc                    R1  */
-#define SD_APP_OP_COND              41  /* bcr  [31:0] OCR         R3  */
-#define SD_APP_SET_CLR_CARD_DETECT  42  /* ac   [0] set cd         R1  */
-#define SD_APP_SEND_SCR             51  /* adtc                    R1  */
-
-/* OCR bit definitions */
-#define SD_OCR_S18R             (1 << 24)                   /* 1.8V switching request */
-#define SD_ROCR_S18A            SD_OCR_S18R                 /* 1.8V switching accepted by card */
-#define SD_OCR_XPC              (1 << 28)                   /* SDXC power control */
-#define SD_OCR_CCS              (1 << 30)                   /* Card Capacity Status */
-#define SD_OCR_VDD_LOW          (1 << 7)                    /* SD: Reserved for Low Voltage Range */
-#define SD_OCR_VDD_20_21        (1 << 8)
-#define SD_OCR_VDD_21_22        (1 << 9)
-#define SD_OCR_VDD_22_23        (1 << 10)
-#define SD_OCR_VDD_23_24        (1 << 11)
-#define SD_OCR_VDD_24_25        (1 << 12)
-#define SD_OCR_VDD_25_26        (1 << 13)
-#define SD_OCR_VDD_26_27        (1 << 14)
-#define SD_OCR_VDD_27_28        (1 << 15)
-#define SD_OCR_VDD_28_29        (1 << 16)
-#define SD_OCR_VDD_29_30        (1 << 17)
-#define SD_OCR_VDD_30_31        (1 << 18)
-#define SD_OCR_VDD_31_32        (1 << 19)
-#define SD_OCR_VDD_32_33        (1 << 20)
-#define SD_OCR_VDD_33_34        (1 << 21)
-#define SD_OCR_VDD_34_35        (1 << 22)
-#define SD_OCR_VDD_35_36        (1 << 23)
-
-/*
- * SD_SWITCH argument format:
- *
- *      [31] Check (0) or switch (1)
- *      [30:24] Reserved (0)
- *      [23:20] Function group 6
- *      [19:16] Function group 5
- *      [15:12] Function group 4
- *      [11:8] Function group 3
- *      [7:4] Function group 2
- *      [3:0] Function group 1
- */
-
-/*
- * SD_SEND_IF_COND argument format:
- *
- *  [31:12] Reserved (0)
- *  [11:8] Host Voltage Supply Flags
- *  [7:0] Check Pattern (0xAA)
- */
-
-/*
- * SCR field definitions
- */
-
-#define SD_SCR_SPEC_VER_0       0   /* Implements system specification 1.0 - 1.01 */
-#define SD_SCR_SPEC_VER_1       1   /* Implements system specification 1.10 */
-#define SD_SCR_SPEC_VER_2       2   /* Implements system specification 2.00-3.0X */
-#define SD_SCR_BUS_WIDTH_1      1
-#define SD_SCR_BUS_WIDTH_4      4
-#define SD_SCR_CMD20_SUPPORT    1
-#define SD_SCR_CMD23_SUPPORT    2
-
-/*
- * SD bus widths
- */
-#define SD_BUS_WIDTH_1      0
-#define SD_BUS_WIDTH_4      2
-
-/*
- * SD bus speed modes
- */
-#define UHS_SDR12_BUS_SPEED     0
-#define HIGH_SPEED_BUS_SPEED    1
-#define UHS_SDR25_BUS_SPEED     1
-#define UHS_SDR50_BUS_SPEED     2
-#define UHS_SDR104_BUS_SPEED    3
-#define UHS_DDR50_BUS_SPEED     4
-#define SD_MODE_HIGH_SPEED      (1 << HIGH_SPEED_BUS_SPEED)
-#define SD_MODE_UHS_SDR12       (1 << UHS_SDR12_BUS_SPEED)
-#define SD_MODE_UHS_SDR25       (1 << UHS_SDR25_BUS_SPEED)
-#define SD_MODE_UHS_SDR50       (1 << UHS_SDR50_BUS_SPEED)
-#define SD_MODE_UHS_SDR104      (1 << UHS_SDR104_BUS_SPEED)
-#define SD_MODE_UHS_DDR50       (1 << UHS_DDR50_BUS_SPEED)
-
-/*
- * SD bus driver types
- */
-#define SD_DRIVER_TYPE_B    0x01
-#define SD_DRIVER_TYPE_A    0x02
-#define SD_DRIVER_TYPE_C    0x04
-#define SD_DRIVER_TYPE_D    0x08
-
-/*
- * SD bus current limits
- */
-#define SD_SET_CURRENT_LIMIT_200    0
-#define SD_SET_CURRENT_LIMIT_400    1
-#define SD_SET_CURRENT_LIMIT_600    2
-#define SD_SET_CURRENT_LIMIT_800    3
-#define SD_SET_CURRENT_NO_CHANGE    (-1)
-#define SD_MAX_CURRENT_200          (1 << SD_SET_CURRENT_LIMIT_200)
-#define SD_MAX_CURRENT_400          (1 << SD_SET_CURRENT_LIMIT_400)
-#define SD_MAX_CURRENT_600          (1 << SD_SET_CURRENT_LIMIT_600)
-#define SD_MAX_CURRENT_800          (1 << SD_SET_CURRENT_LIMIT_800)
-
-/*
- * SD_SWITCH mode
- */
-#define SD_SWITCH_CHECK     0
-#define SD_SWITCH_SET       1
-
-/*
- * SD_SWITCH function groups
- */
-#define SD_SWITCH_GRP_ACCESS    0
-
-/*
- * SD_SWITCH access modes
- */
-#define SD_SWITCH_ACCESS_DEF    0
-#define SD_SWITCH_ACCESS_HS     1
-
-#endif /* LINUX_MMC_SD_H */

fusee/fusee-secondary/src/sdmmc/sdmmc.h

@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018 CTCaer
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#ifndef FUSEE_SDMMC_H
-#define FUSEE_SDMMC_H
-
-#include "sdmmc_core.h"
-
-/* Structure for storing the MMC CID (adapted from Linux headers) */
-typedef struct {
-    uint32_t    manfid;
-    uint8_t     prod_name[8];
-    uint8_t     prv;
-    uint32_t    serial;
-    uint16_t    oemid;
-    uint16_t    year;
-    uint8_t     hwrev;
-    uint8_t     fwrev;
-    uint8_t     month;
-} mmc_cid_t;
-
-/* Structure for storing the MMC CSD (adapted from Linux headers) */
-typedef struct {
-    uint8_t     structure;
-    uint8_t     mmca_vsn;
-    uint16_t    cmdclass;
-    uint16_t    taac_clks;
-    uint32_t    taac_ns;
-    uint32_t    c_size;
-    uint32_t    r2w_factor;
-    uint32_t    max_dtr;
-    uint32_t    erase_size;     /* In sectors */
-    uint32_t    read_blkbits;
-    uint32_t    write_blkbits;
-    uint32_t    capacity;
-    uint32_t    read_partial:1,
-                read_misalign:1,
-                write_partial:1,
-                write_misalign:1,
-                dsr_imp:1;
-} mmc_csd_t;
-
-/* Structure for storing the MMC extended CSD (adapted from Linux headers) */
-typedef struct {
-    uint8_t     rev;
-    uint8_t     erase_group_def;
-    uint8_t     sec_feature_support;
-    uint8_t     rel_sectors;
-    uint8_t     rel_param;
-    uint8_t     part_config;
-    uint8_t     cache_ctrl;
-    uint8_t     rst_n_function;
-    uint8_t     max_packed_writes;
-    uint8_t     max_packed_reads;
-    uint8_t     packed_event_en;
-    uint32_t    part_time;                      /* Units: ms */
-    uint32_t    sa_timeout;                     /* Units: 100ns */
-    uint32_t    generic_cmd6_time;              /* Units: 10ms */
-    uint32_t    power_off_longtime;             /* Units: ms */
-    uint8_t     power_off_notification;         /* state */
-    uint32_t    hs_max_dtr;
-    uint32_t    hs200_max_dtr;
-    uint32_t    sectors;
-    uint32_t    hc_erase_size;                  /* In sectors */
-    uint32_t    hc_erase_timeout;               /* In milliseconds */
-    uint32_t    sec_trim_mult;                  /* Secure trim multiplier  */
-    uint32_t    sec_erase_mult;                 /* Secure erase multiplier */
-    uint32_t    trim_timeout;                   /* In milliseconds */
-    uint32_t    partition_setting_completed;    /* enable bit */
-    uint64_t    enhanced_area_offset;           /* Units: Byte */
-    uint32_t    enhanced_area_size;             /* Units: KB */
-    uint32_t    cache_size;                     /* Units: KB */
-    uint32_t    hpi_en;                         /* HPI enablebit */
-    uint32_t    hpi;                            /* HPI support bit */
-    uint32_t    hpi_cmd;                        /* cmd used as HPI */
-    uint32_t    bkops;                          /* background support bit */
-    uint32_t    man_bkops_en;                   /* manual bkops enable bit */
-    uint32_t    auto_bkops_en;                  /* auto bkops enable bit */
-    uint32_t    data_sector_size;               /* 512 bytes or 4KB */
-    uint32_t    data_tag_unit_size;             /* DATA TAG UNIT size */
-    uint32_t    boot_ro_lock;                   /* ro lock support */
-    uint32_t    boot_ro_lockable;
-    uint32_t    ffu_capable;                    /* Firmware upgrade support */
-    uint32_t    cmdq_en;                        /* Command Queue enabled */
-    uint32_t    cmdq_support;                   /* Command Queue supported */
-    uint32_t    cmdq_depth;                     /* Command Queue depth */
-    uint8_t     fwrev[8];                       /* FW version */
-    uint8_t     raw_exception_status;           /* 54 */
-    uint8_t     raw_partition_support;          /* 160 */
-    uint8_t     raw_rpmb_size_mult;             /* 168 */
-    uint8_t     raw_erased_mem_count;           /* 181 */
-    uint8_t     strobe_support;                 /* 184 */
-    uint8_t     raw_ext_csd_structure;          /* 194 */
-    uint8_t     raw_card_type;                  /* 196 */
-    uint8_t     raw_driver_strength;            /* 197 */
-    uint8_t     out_of_int_time;                /* 198 */
-    uint8_t     raw_pwr_cl_52_195;              /* 200 */
-    uint8_t     raw_pwr_cl_26_195;              /* 201 */
-    uint8_t     raw_pwr_cl_52_360;              /* 202 */
-    uint8_t     raw_pwr_cl_26_360;              /* 203 */
-    uint8_t     raw_s_a_timeout;                /* 217 */
-    uint8_t     raw_hc_erase_gap_size;          /* 221 */
-    uint8_t     raw_erase_timeout_mult;         /* 223 */
-    uint8_t     raw_hc_erase_grp_size;          /* 224 */
-    uint8_t     raw_sec_trim_mult;              /* 229 */
-    uint8_t     raw_sec_erase_mult;             /* 230 */
-    uint8_t     raw_sec_feature_support;        /* 231 */
-    uint8_t     raw_trim_mult;                  /* 232 */
-    uint8_t     raw_pwr_cl_200_195;             /* 236 */
-    uint8_t     raw_pwr_cl_200_360;             /* 237 */
-    uint8_t     raw_pwr_cl_ddr_52_195;          /* 238 */
-    uint8_t     raw_pwr_cl_ddr_52_360;          /* 239 */
-    uint8_t     raw_pwr_cl_ddr_200_360;         /* 253 */
-    uint8_t     raw_bkops_status;               /* 246 */
-    uint8_t     raw_sectors[4];                 /* 212 - 4 bytes */
-    uint8_t     pre_eol_info;                   /* 267 */
-    uint8_t     device_life_time_est_typ_a;     /* 268 */
-    uint8_t     device_life_time_est_typ_b;     /* 269 */
-    uint32_t    feature_support;
-} mmc_ext_csd_t;
-
-/* Structure for storing the SD SCR (adapted from Linux headers) */
-typedef struct  {
-    uint8_t     sda_vsn;
-    uint8_t     sda_spec3;
-    uint8_t     bus_widths;
-    uint8_t     cmds;
-} sd_scr_t;
-
-/* Structure for storing the SD SSR (adapted from Linux headers) */
-typedef struct  {
-    uint8_t     dat_bus_width;
-    uint8_t     secured_mode;
-    uint16_t    sd_card_type;
-    uint8_t     speed_class;
-    uint8_t     uhs_speed_grade;
-    uint8_t     uhs_au_size;
-    uint8_t     video_speed_class;
-    uint8_t     app_perf_class;
-} sd_ssr_t;
-
-/* Structure describing a SDMMC device's context. */
-typedef struct {
-    /* Underlying driver context. */
-    sdmmc_t *sdmmc;
-    
-    bool is_180v;
-    bool is_block_sdhc;
-    uint32_t rca;
-    mmc_cid_t cid;
-    mmc_csd_t csd;
-    mmc_ext_csd_t ext_csd;
-    sd_scr_t scr;
-    sd_ssr_t ssr;
-} sdmmc_device_t;
-
-int sdmmc_device_sd_init(sdmmc_device_t *device, sdmmc_t *sdmmc, SdmmcBusWidth bus_width, SdmmcBusSpeed bus_speed);
-int sdmmc_device_mmc_init(sdmmc_device_t *device, sdmmc_t *sdmmc, SdmmcBusWidth bus_width, SdmmcBusSpeed bus_speed);
-int sdmmc_device_read(sdmmc_device_t *device, uint32_t sector, uint32_t num_sectors, void *data);
-int sdmmc_device_write(sdmmc_device_t *device, uint32_t sector, uint32_t num_sectors, void *data);
-int sdmmc_device_finish(sdmmc_device_t *device);
-int sdmmc_mmc_select_partition(sdmmc_device_t *device, SdmmcPartitionNum partition);
-
-#endif

fusee/fusee-secondary/src/sdmmc/sdmmc_core.h

@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018 CTCaer
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#ifndef FUSEE_SDMMC_CORE_H
-#define FUSEE_SDMMC_CORE_H
-
-#include "sdmmc_tegra.h"
-
-/* Bounce buffer */
-#define SDMMC_BOUNCE_BUFFER_ADDRESS     0x90000000
-
-/* Present state */
-#define SDHCI_CMD_INHIBIT       0x00000001
-#define SDHCI_DATA_INHIBIT      0x00000002
-#define SDHCI_DOING_WRITE       0x00000100
-#define SDHCI_DOING_READ        0x00000200
-#define SDHCI_SPACE_AVAILABLE   0x00000400
-#define SDHCI_DATA_AVAILABLE    0x00000800
-#define SDHCI_CARD_PRESENT      0x00010000
-#define SDHCI_WRITE_PROTECT     0x00080000
-#define SDHCI_DATA_LVL_MASK     0x00F00000
-#define SDHCI_DATA_LVL_SHIFT    20
-#define SDHCI_DATA_0_LVL_MASK   0x00100000
-#define SDHCI_CMD_LVL           0x01000000
-
-/* SDHCI clock control */
-#define SDHCI_DIVIDER_SHIFT     8
-#define SDHCI_DIVIDER_HI_SHIFT  6
-#define SDHCI_DIV_MASK          0xFF
-#define SDHCI_DIV_MASK_LEN      8
-#define SDHCI_DIV_HI_MASK       0x300
-#define SDHCI_PROG_CLOCK_MODE   0x0020
-#define SDHCI_CLOCK_CARD_EN     0x0004
-#define SDHCI_CLOCK_INT_STABLE  0x0002
-#define SDHCI_CLOCK_INT_EN      0x0001
-
-/* SDHCI host control */
-#define SDHCI_CTRL_LED          0x01
-#define SDHCI_CTRL_4BITBUS      0x02
-#define SDHCI_CTRL_HISPD        0x04
-#define SDHCI_CTRL_DMA_MASK     0x18
-#define SDHCI_CTRL_SDMA         0x00
-#define SDHCI_CTRL_ADMA1        0x08
-#define SDHCI_CTRL_ADMA32       0x10
-#define SDHCI_CTRL_ADMA64       0x18
-#define SDHCI_CTRL_8BITBUS      0x20
-#define SDHCI_CTRL_CDTEST_INS   0x40
-#define SDHCI_CTRL_CDTEST_EN    0x80
-
-/* SDHCI host control 2 */
-#define SDHCI_CTRL_UHS_MASK             0x0007
-#define SDHCI_CTRL_UHS_SDR12            0x0000
-#define SDHCI_CTRL_UHS_SDR25            0x0001
-#define SDHCI_CTRL_UHS_SDR50            0x0002
-#define SDHCI_CTRL_UHS_SDR104           0x0003
-#define SDHCI_CTRL_UHS_DDR50            0x0004
-#define SDHCI_CTRL_HS400                0x0005
-#define SDHCI_CTRL_VDD_180              0x0008
-#define SDHCI_CTRL_DRV_TYPE_MASK        0x0030
-#define SDHCI_CTRL_DRV_TYPE_B           0x0000
-#define SDHCI_CTRL_DRV_TYPE_A           0x0010
-#define SDHCI_CTRL_DRV_TYPE_C           0x0020
-#define SDHCI_CTRL_DRV_TYPE_D           0x0030
-#define SDHCI_CTRL_EXEC_TUNING          0x0040
-#define SDHCI_CTRL_TUNED_CLK            0x0080
-#define SDHCI_UHS2_IF_EN                0x0100
-#define SDHCI_HOST_VERSION_4_EN         0x1000
-#define SDHCI_ADDRESSING_64BIT_EN       0x2000
-#define SDHCI_ASYNC_INTR_EN             0x4000
-#define SDHCI_CTRL_PRESET_VAL_ENABLE    0x8000
-
-/* SDHCI capabilities */
-#define SDHCI_CAN_DO_8BIT   0x00040000
-#define SDHCI_CAN_DO_ADMA2  0x00080000
-#define SDHCI_CAN_DO_ADMA1  0x00100000
-#define SDHCI_CAN_DO_HISPD  0x00200000
-#define SDHCI_CAN_DO_SDMA   0x00400000
-#define SDHCI_CAN_VDD_330   0x01000000
-#define SDHCI_CAN_VDD_300   0x02000000
-#define SDHCI_CAN_VDD_180   0x04000000
-#define SDHCI_CAN_64BIT     0x10000000
-#define SDHCI_ASYNC_INTR    0x20000000
-
-/* Vendor clock control */
-#define SDMMC_CLOCK_TAP_MASK                    (0xFF << 16)
-#define SDMMC_CLOCK_TAP_SDMMC1                  (0x04 << 16)
-#define SDMMC_CLOCK_TAP_SDMMC2                  (0x00 << 16)
-#define SDMMC_CLOCK_TAP_SDMMC3                  (0x03 << 16)
-#define SDMMC_CLOCK_TAP_SDMMC4                  (0x00 << 16)
-#define SDMMC_CLOCK_TRIM_MASK                   (0xFF << 24)
-#define SDMMC_CLOCK_TRIM_SDMMC1                 (0x02 << 24)
-#define SDMMC_CLOCK_TRIM_SDMMC2                 (0x08 << 24)
-#define SDMMC_CLOCK_TRIM_SDMMC3                 (0x03 << 24)
-#define SDMMC_CLOCK_TRIM_SDMMC4                 (0x08 << 24)
-#define SDMMC_CLOCK_PADPIPE_CLKEN_OVERRIDE      (1 << 3)
-
-/* Autocal configuration */
-#define SDMMC_AUTOCAL_PDPU_CONFIG_MASK          0x7F7F
-#define SDMMC_AUTOCAL_PDPU_SDMMC1_1V8           0x7B7B
-#define SDMMC_AUTOCAL_PDPU_SDMMC1_3V3           0x7D00
-#define SDMMC_AUTOCAL_PDPU_SDMMC4_1V8           0x0505
-#define SDMMC_AUTOCAL_START                     (1 << 31)
-#define SDMMC_AUTOCAL_ENABLE                    (1 << 29)
-
-/* Autocal status */
-#define SDMMC_AUTOCAL_ACTIVE                    (1 << 31)
-
-/* Vendor tuning control 0*/
-#define SDMMC_VENDOR_TUNING_TRIES_MASK          (0x7 << 13)
-#define SDMMC_VENDOR_TUNING_TRIES_SHIFT          13
-#define SDMMC_VENDOR_TUNING_MULTIPLIER_MASK     (0x7F << 6)
-#define SDMMC_VENDOR_TUNING_MULTIPLIER_UNITY    (1 << 6)
-#define SDMMC_VENDOR_TUNING_DIVIDER_MASK        (0x7 << 3)
-#define SDMMC_VENDOR_TUNING_SET_BY_HW           (1 << 17)
-
-/* Vendor tuning control 1*/
-#define SDMMC_VENDOR_TUNING_STEP_SIZE_SDR50_DEFAULT     (0 << 0)
-#define SDMMC_VENDOR_TUNING_STEP_SIZE_SDR104_DEFAULT    (0 << 4)
-
-/* Vendor capability overrides */
-#define SDMMC_VENDOR_CAPABILITY_DQS_TRIM_MASK           (0x3F << 8)
-#define SDMMC_VENDOR_CAPABILITY_DQS_TRIM_HS400          (0x11 << 8)
-
-/* Timeouts */
-#define SDMMC_AUTOCAL_TIMEOUT                           (10 * 1000)
-#define SDMMC_TUNING_TIMEOUT                            (150 * 1000)
-
-/* Command response flags */
-#define SDMMC_RSP_PRESENT                               (1 << 0)
-#define SDMMC_RSP_136                                   (1 << 1)
-#define SDMMC_RSP_CRC                                   (1 << 2)
-#define SDMMC_RSP_BUSY                                  (1 << 3)
-#define SDMMC_RSP_OPCODE                                (1 << 4)
-
-/* Command types */
-#define SDMMC_CMD_MASK                                  (3 << 5)
-#define SDMMC_CMD_AC                                    (0 << 5)
-#define SDMMC_CMD_ADTC                                  (1 << 5)
-#define SDMMC_CMD_BC                                    (2 << 5)
-#define SDMMC_CMD_BCR                                   (3 << 5)
-
-/* SPI command response flags */
-#define SDMMC_RSP_SPI_S1                                (1 << 7)
-#define SDMMC_RSP_SPI_S2                                (1 << 8)
-#define SDMMC_RSP_SPI_B4                                (1 << 9)
-#define SDMMC_RSP_SPI_BUSY                              (1 << 10)
-
-/* Native response types for commands */
-#define SDMMC_RSP_NONE          (0)
-#define SDMMC_RSP_R1            (SDMMC_RSP_PRESENT|SDMMC_RSP_CRC|SDMMC_RSP_OPCODE)
-#define SDMMC_RSP_R1B           (SDMMC_RSP_PRESENT|SDMMC_RSP_CRC|SDMMC_RSP_OPCODE|SDMMC_RSP_BUSY)
-#define SDMMC_RSP_R2            (SDMMC_RSP_PRESENT|SDMMC_RSP_136|SDMMC_RSP_CRC)
-#define SDMMC_RSP_R3            (SDMMC_RSP_PRESENT)
-#define SDMMC_RSP_R4            (SDMMC_RSP_PRESENT)
-#define SDMMC_RSP_R5            (SDMMC_RSP_PRESENT|SDMMC_RSP_CRC|SDMMC_RSP_OPCODE)
-#define SDMMC_RSP_R6            (SDMMC_RSP_PRESENT|SDMMC_RSP_CRC|SDMMC_RSP_OPCODE)
-#define SDMMC_RSP_R7            (SDMMC_RSP_PRESENT|SDMMC_RSP_CRC|SDMMC_RSP_OPCODE)
-#define SDMMC_RSP_R1_NO_CRC     (SDMMC_RSP_PRESENT|SDMMC_RSP_OPCODE)
-
-/* SPI response types for commands */
-#define SDMMC_RSP_SPI_R1        (SDMMC_RSP_SPI_S1)
-#define SDMMC_RSP_SPI_R1B       (SDMMC_RSP_SPI_S1|SDMMC_RSP_SPI_BUSY)
-#define SDMMC_RSP_SPI_R2        (SDMMC_RSP_SPI_S1|SDMMC_RSP_SPI_S2)
-#define SDMMC_RSP_SPI_R3        (SDMMC_RSP_SPI_S1|SDMMC_RSP_SPI_B4)
-#define SDMMC_RSP_SPI_R4        (SDMMC_RSP_SPI_S1|SDMMC_RSP_SPI_B4)
-#define SDMMC_RSP_SPI_R5        (SDMMC_RSP_SPI_S1|SDMMC_RSP_SPI_S2)
-#define SDMMC_RSP_SPI_R7        (SDMMC_RSP_SPI_S1|SDMMC_RSP_SPI_B4)
-
-/* SDMMC controllers */
-typedef enum {
-    SDMMC_1 = 0,
-    SDMMC_2 = 1,
-    SDMMC_3 = 2,
-    SDMMC_4 = 3
-} SdmmcControllerNum;
-
-typedef enum {
-    SDMMC_PARTITION_INVALID  = -1,
-    SDMMC_PARTITION_USER  = 0,
-    SDMMC_PARTITION_BOOT0 = 1,
-    SDMMC_PARTITION_BOOT1 = 2,
-    SDMMC_PARTITION_RPMB = 3
-} SdmmcPartitionNum;
-
-typedef enum {
-    SDMMC_VOLTAGE_NONE = 0,
-    SDMMC_VOLTAGE_1V8 = 1,
-    SDMMC_VOLTAGE_3V3 = 2
-} SdmmcBusVoltage;
-
-typedef enum {
-    SDMMC_BUS_WIDTH_1BIT = 0,
-    SDMMC_BUS_WIDTH_4BIT = 1,
-    SDMMC_BUS_WIDTH_8BIT = 2
-} SdmmcBusWidth;
-
-typedef enum {
-    SDMMC_SPEED_MMC_INIT        = 0,
-    SDMMC_SPEED_MMC_LEGACY      = 1,
-    SDMMC_SPEED_MMC_HS          = 2,
-    SDMMC_SPEED_MMC_HS200       = 3,
-    SDMMC_SPEED_MMC_HS400       = 4,
-    SDMMC_SPEED_SD_INIT         = 5,
-    SDMMC_SPEED_SD_LEGACY       = 6,
-    SDMMC_SPEED_SD_HS           = 7,
-    SDMMC_SPEED_UHS_SDR12       = 8,
-    SDMMC_SPEED_UHS_SDR25       = 9,
-    SDMMC_SPEED_UHS_SDR50       = 10,
-    SDMMC_SPEED_UHS_SDR104      = 11,
-    SDMMC_SPEED_UHS_RESERVED    = 12,
-    SDMMC_SPEED_UHS_DDR50       = 13,
-    SDMMC_SPEED_MMC_DDR52       = 14,
-    SDMMC_SPEED_EMU_SDR104      = 255, /* Custom speed mode. Prevents low voltage switch in MMC emulation. */
-} SdmmcBusSpeed;
-
-typedef enum {
-    SDMMC_CAR_DIVIDER_UHS_SDR12     = 31, /* (16.5 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_UHS_SDR25     = 15, /* (8.5 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_UHS_SDR50     = 7,  /* (4.5 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_UHS_SDR104    = 2,  /* (2 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_UHS_DDR50     = 18, /* (5 * 2 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_MMC_LEGACY    = 30, /* (16 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_MMC_HS        = 14, /* (8 * 2) - 2 */
-    SDMMC_CAR_DIVIDER_MMC_HS200     = 3,  /* (2.5 * 2) - 2 (for PLLP_OUT0, same as HS400) */
-} SdmmcCarDivider;
-
-/* Structure for describing a SDMMC device. */
-typedef struct {
-    /* Controller number */
-    SdmmcControllerNum controller;
-    
-    /* Backing register space */
-    volatile tegra_sdmmc_t *regs;
-    
-    /* Controller properties */
-    const char *name;
-    bool has_sd;
-    bool is_clk_running;
-    bool is_sd_clk_enabled;
-    bool is_tuning_tap_val_set;
-    bool use_adma;
-    uint32_t tap_val;
-    uint32_t internal_divider;
-    uint32_t resp[4];
-    uint32_t resp_auto_cmd12;
-    uint32_t next_dma_addr;
-    uint8_t* dma_bounce_buf;
-    SdmmcBusVoltage bus_voltage;
-    SdmmcBusWidth bus_width;
-    
-    /* Per-controller operations. */
-    int (*sdmmc_config)();
-} sdmmc_t;
-
-/* Structure for describing a SDMMC command. */
-typedef struct {
-    uint32_t    opcode;
-    uint32_t    arg;
-    uint32_t    resp[4];
-    uint32_t    flags;      /* Expected response type. */
-} sdmmc_command_t;
-
-/* Structure for describing a SDMMC request. */
-typedef struct {
-    void*       data;
-    uint32_t    blksz;
-    uint32_t    num_blocks;
-    bool        is_multi_block;
-    bool        is_read;
-    bool        is_auto_cmd12;
-} sdmmc_request_t;
-
-int sdmmc_init(sdmmc_t *sdmmc, SdmmcControllerNum controller, SdmmcBusVoltage bus_voltage, SdmmcBusWidth bus_width, SdmmcBusSpeed bus_speed);
-void sdmmc_finish(sdmmc_t *sdmmc);
-int sdmmc_select_speed(sdmmc_t *sdmmc, SdmmcBusSpeed bus_speed);
-void sdmmc_select_bus_width(sdmmc_t *sdmmc, SdmmcBusWidth width);
-void sdmmc_select_voltage(sdmmc_t *sdmmc, SdmmcBusVoltage voltage);
-void sdmmc_adjust_sd_clock(sdmmc_t *sdmmc);
-int sdmmc_switch_voltage(sdmmc_t *sdmmc);
-void sdmmc_set_tuning_tap_val(sdmmc_t *sdmmc);
-int sdmmc_execute_tuning(sdmmc_t *sdmmc, SdmmcBusSpeed bus_speed, uint32_t opcode);
-int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, uint32_t *num_blocks_out);
-int sdmmc_load_response(sdmmc_t *sdmmc, uint32_t flags, uint32_t *resp);
-int sdmmc_abort(sdmmc_t *sdmmc, uint32_t opcode);
-void sdmmc_error(sdmmc_t *sdmmc, char *fmt, ...);
-void sdmmc_warn(sdmmc_t *sdmmc, char *fmt, ...);
-void sdmmc_info(sdmmc_t *sdmmc, char *fmt, ...);
-void sdmmc_debug(sdmmc_t *sdmmc, char *fmt, ...);
-void sdmmc_dump_regs(sdmmc_t *sdmmc);
-
-#endif

fusee/fusee-secondary/src/sdmmc/sdmmc_tegra.h

@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018 CTCaer
- * Copyright (c) 2018-2020 Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#ifndef FUSEE_SDMMC_TEGRA_H
-#define FUSEE_SDMMC_TEGRA_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#define TEGRA_MMC_PWRCTL_SD_BUS_POWER                           (1 << 0)
-#define TEGRA_MMC_PWRCTL_SD_BUS_VOLTAGE_V1_8                    (5 << 1)
-#define TEGRA_MMC_PWRCTL_SD_BUS_VOLTAGE_V3_0                    (6 << 1)
-#define TEGRA_MMC_PWRCTL_SD_BUS_VOLTAGE_V3_3                    (7 << 1)
-
-#define TEGRA_MMC_HOSTCTL_DMASEL_MASK                           (3 << 3)
-#define TEGRA_MMC_HOSTCTL_DMASEL_SDMA                           (0 << 3)
-#define TEGRA_MMC_HOSTCTL_DMASEL_ADMA2_32BIT                    (2 << 3)
-#define TEGRA_MMC_HOSTCTL_DMASEL_ADMA2_64BIT                    (3 << 3)
-
-#define TEGRA_MMC_TRNMOD_DMA_ENABLE                             (1 << 0)
-#define TEGRA_MMC_TRNMOD_BLOCK_COUNT_ENABLE                     (1 << 1)
-#define TEGRA_MMC_TRNMOD_AUTO_CMD12                             (1 << 2)
-#define TEGRA_MMC_TRNMOD_AUTO_CMD23                             (1 << 3)
-#define TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_WRITE                (0 << 4)
-#define TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_READ                 (1 << 4)
-#define TEGRA_MMC_TRNMOD_MULTI_BLOCK_SELECT                     (1 << 5)
-
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_MASK                  (3 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_NO_RESPONSE           (0 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_136            (1 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48             (2 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48_BUSY        (3 << 0)
-
-#define TEGRA_MMC_TRNMOD_CMD_CRC_CHECK                          (1 << 3)
-#define TEGRA_MMC_TRNMOD_CMD_INDEX_CHECK                        (1 << 4)
-#define TEGRA_MMC_TRNMOD_DATA_PRESENT_SELECT_DATA_TRANSFER      (1 << 5)
-
-#define TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD                        (1 << 0)
-#define TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT                        (1 << 1)
-
-#define TEGRA_MMC_CLKCON_INTERNAL_CLOCK_ENABLE                  (1 << 0)
-#define TEGRA_MMC_CLKCON_INTERNAL_CLOCK_STABLE                  (1 << 1)
-#define TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE                        (1 << 2)
-#define TEGRA_MMC_CLKCON_PROG_CLOCK_MODE                        (1 << 5)
-
-#define TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_SHIFT                   8
-#define TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_MASK                    (0xff << 8)
-
-#define TEGRA_MMC_SWRST_SW_RESET_FOR_ALL                        (1 << 0)
-#define TEGRA_MMC_SWRST_SW_RESET_FOR_CMD_LINE                   (1 << 1)
-#define TEGRA_MMC_SWRST_SW_RESET_FOR_DAT_LINE                   (1 << 2)
-
-#define TEGRA_MMC_NORINTSTS_CMD_COMPLETE                        (1 << 0)
-#define TEGRA_MMC_NORINTSTS_XFER_COMPLETE                       (1 << 1)
-#define TEGRA_MMC_NORINTSTS_DMA_INTERRUPT                       (1 << 3)
-#define TEGRA_MMC_NORINTSTS_ERR_INTERRUPT                       (1 << 15)
-#define TEGRA_MMC_NORINTSTS_CMD_TIMEOUT                         (1 << 16)
-
-#define TEGRA_MMC_NORINTSTSEN_CMD_COMPLETE                      (1 << 0)
-#define TEGRA_MMC_NORINTSTSEN_XFER_COMPLETE                     (1 << 1)
-#define TEGRA_MMC_NORINTSTSEN_DMA_INTERRUPT                     (1 << 3)
-#define TEGRA_MMC_NORINTSTSEN_BUFFER_WRITE_READY                (1 << 4)
-#define TEGRA_MMC_NORINTSTSEN_BUFFER_READ_READY                 (1 << 5)
-
-#define TEGRA_MMC_NORINTSIGEN_XFER_COMPLETE                     (1 << 1)
-
-typedef struct {
-    /* SDHCI standard registers */
-    uint32_t dma_address;
-    uint16_t block_size;
-    uint16_t block_count;
-    uint32_t argument;
-    uint16_t transfer_mode;
-    uint16_t command;
-    uint32_t response[0x4];
-    uint32_t buffer;
-    uint32_t present_state;
-    uint8_t host_control;
-    uint8_t power_control;
-    uint8_t block_gap_control;
-    uint8_t wake_up_control;
-    uint16_t clock_control;
-    uint8_t timeout_control;
-    uint8_t software_reset;
-    uint32_t int_status;
-    uint32_t int_enable;
-    uint32_t signal_enable;
-    uint16_t acmd12_err;
-    uint16_t host_control2;
-    uint32_t capabilities;
-    uint32_t capabilities_1;
-    uint32_t max_current;
-    uint32_t _0x4c;
-    uint16_t set_acmd12_error;
-    uint16_t set_int_error;
-    uint8_t adma_error;
-    uint8_t _0x56[0x3];
-    uint32_t adma_address;
-    uint32_t upper_adma_address;
-    uint16_t preset_for_init;
-    uint16_t preset_for_default;
-    uint16_t preset_for_high;
-    uint16_t preset_for_sdr12;
-    uint16_t preset_for_sdr25;
-    uint16_t preset_for_sdr50;
-    uint16_t preset_for_sdr104;
-    uint16_t preset_for_ddr50;
-    uint32_t _0x70[0x23];
-    uint16_t slot_int_status;
-    uint16_t host_version;
-
-    /* Vendor specific registers */
-    uint32_t vendor_clock_cntrl;
-    uint32_t vendor_sys_sw_cntrl;
-    uint32_t vendor_err_intr_status;
-    uint32_t vendor_cap_overrides;
-    uint32_t vendor_boot_cntrl;
-    uint32_t vendor_boot_ack_timeout;
-    uint32_t vendor_boot_dat_timeout;
-    uint32_t vendor_debounce_count;
-    uint32_t vendor_misc_cntrl;
-    uint32_t max_current_override;
-    uint32_t max_current_override_hi;
-    uint32_t _0x12c[0x20];
-    uint32_t vendor_io_trim_cntrl;
-
-    /* Start of sdmmc2/sdmmc4 only */
-    uint32_t vendor_dllcal_cfg;
-    uint32_t vendor_dll_ctrl0;
-    uint32_t vendor_dll_ctrl1;
-    uint32_t vendor_dllcal_cfg_sta;
-    /* End of sdmmc2/sdmmc4 only */
-
-    uint32_t vendor_tuning_cntrl0;
-    uint32_t vendor_tuning_cntrl1;
-    uint32_t vendor_tuning_status0;
-    uint32_t vendor_tuning_status1;
-    uint32_t vendor_clk_gate_hysteresis_count;
-    uint32_t vendor_preset_val0;
-    uint32_t vendor_preset_val1;
-    uint32_t vendor_preset_val2;
-    uint32_t sdmemcomppadctrl;
-    uint32_t auto_cal_config;
-    uint32_t auto_cal_interval;
-    uint32_t auto_cal_status;
-    uint32_t io_spare;
-    uint32_t sdmmca_mccif_fifoctrl;
-    uint32_t timeout_wcoal_sdmmca;
-    uint32_t _0x1fc;
-} tegra_sdmmc_t;
-
-static inline volatile tegra_sdmmc_t *sdmmc_get_regs(uint32_t idx)
-{
-    return (volatile tegra_sdmmc_t *)(0x700B0000 + (idx * 0x200));
-}
-
-#endif

fusee/fusee-secondary/src/splash_screen.c

@@ -19,7 +19,7 @@
 #include "timers.h"
 #include "splash_screen.h"
 #include "fs_utils.h"
-#include "display/video_fb.h"
+#include "../../../fusee/common/display/video_fb.h"
 
 #define u8 uint8_t
 #define u32 uint32_t

fusee/fusee-secondary/src/stage2.h

@@ -17,7 +17,7 @@
 #ifndef FUSEE_STAGE2_H
 #define FUSEE_STAGE2_H
 
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 #include "utils.h"
 
 /* TODO: Is there a more concise way to do this? */

fusee/fusee-secondary/src/stratosphere.c

@@ -25,7 +25,7 @@
 #include "stratosphere.h"
 #include "fs_utils.h"
 #include "ips.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 #define u8 uint8_t
 #define u32 uint32_t

fusee/fusee-secondary/src/utils.c

@@ -24,7 +24,7 @@
 #include "timers.h"
 #include "btn.h"
 #include "panic.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 #include <stdio.h>
 #include <inttypes.h>

sept/sept-primary/Makefile

@@ -27,7 +27,7 @@ endif
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	src src/sdmmc src/lib src/lib/fatfs src/display
+SOURCES		:=	src
 DATA		:=	data
 INCLUDES	:=	include  ../../libraries/libvapours/include
 
@@ -35,7 +35,7 @@ INCLUDES	:=	include  ../../libraries/libvapours/include
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-DEFINES :=	-D__BPMP__ -DFUSEE_STAGE1_SRC -DATMOSPHERE_GIT_BRANCH=\"$(AMSBRANCH)\" -DATMOSPHERE_GIT_REV=\"$(AMSREV)\"
+DEFINES :=	-D__BPMP__ -DSEPT_STAGE1_SRC -DATMOSPHERE_GIT_BRANCH=\"$(AMSBRANCH)\" -DATMOSPHERE_GIT_REV=\"$(AMSREV)\"
 
 CFLAGS	:= \
 	-g \

sept/sept-secondary/Makefile

@@ -27,7 +27,7 @@ endif
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	src src/sdmmc src/lib src/lib/fatfs src/display
+SOURCES		:=	src ../../fusee/common ../../fusee/common/display ../../fusee/common/fatfs ../../fusee/common/sdmmc
 DATA		:=	data
 INCLUDES	:=	include  ../../libraries/libvapours/include
 
@@ -35,7 +35,7 @@ INCLUDES	:=	include  ../../libraries/libvapours/include
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-DEFINES :=	-D__BPMP__ -DFUSEE_STAGE1_SRC -DATMOSPHERE_GIT_BRANCH=\"$(AMSBRANCH)\" -DATMOSPHERE_GIT_REV=\"$(AMSREV)\"
+DEFINES :=	-D__BPMP__ -DSEPT_STAGE2_SRC -DATMOSPHERE_GIT_BRANCH=\"$(AMSBRANCH)\" -DATMOSPHERE_GIT_REV=\"$(AMSREV)\"
 
 CFLAGS	:= \
 	-g \

sept/sept-secondary/src/display/video_fb.h

@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 1997-2002 ELTEC Elektronik AG
- * Frank Gottschling <fgottschling@eltec.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _VIDEO_FB_H_
-#define _VIDEO_FB_H_
-
-#define CONSOLE_BG_COL            0x00
-#define CONSOLE_FG_COL            0xa0
-
-/* Try using the small font */
-#define CONFIG_VIDEO_FONT_SMALL
-
-/*
- * Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT
- */
-#define GDF__8BIT_INDEX         0
-#define GDF_15BIT_555RGB        1
-#define GDF_16BIT_565RGB        2
-#define GDF_32BIT_X888RGB       3
-#define GDF_24BIT_888RGB        4
-#define GDF__8BIT_332RGB        5
-
-#define CONFIG_VIDEO_FB_LITTLE_ENDIAN
-#define CONFIG_VIDEO_VISIBLE_COLS 720
-#define CONFIG_VIDEO_VISIBLE_ROWS 1280
-#define CONFIG_VIDEO_COLS         768
-#define CONFIG_VIDEO_PIXEL_SIZE   4
-#define CONFIG_VIDEO_DATA_FORMAT  GDF_32BIT_X888RGB /* BGR actually, but w/e */
-
-int video_get_col(void);
-int video_get_row(void);
-
-int video_init(void *fb);
-int video_resume(void *fb, int row, int col);
-void video_puts(const char *s);
-
-#endif /*_VIDEO_FB_H_ */

sept/sept-secondary/src/exception_handlers.c

@@ -18,8 +18,8 @@
 
 #include "exception_handlers.h"
 #include "utils.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
-#include "lib/vsprintf.h"
+#include "../../../fusee/common/vsprintf.h"
 
 #define CODE_DUMP_SIZE      0x30
 #define STACK_DUMP_SIZE     0x30

sept/sept-secondary/src/fs_utils.c

@@ -16,8 +16,8 @@
 
 #include "fs_utils.h"
 #include "mc.h"
-#include "lib/fatfs/ff.h"
+#include "../../../fusee/common/fatfs/ff.h"
-#include "lib/log.h"
+#include "../../../fusee/common/log.h"
 
 FATFS sd_fs;
 static bool g_sd_mounted = false;

sept/sept-secondary/src/fs_utils.h

@@ -20,7 +20,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "sdmmc/sdmmc.h"
+#include "../../../fusee/common/sdmmc/sdmmc.h"
 #include "utils.h"
 
 extern sdmmc_t g_sd_sdmmc;

sept/sept-secondary/src/init.c

@@ -49,7 +49,7 @@ static void __program_init_newlib_hooks(void) {
 }
 
 static void __program_move_additional_sections(void) {
-#if defined(FUSEE_STAGE1_SRC) || defined(FUSEE_STAGE2_SRC)
+#if defined(SEPT_STAGE1_SRC) || defined(SEPT_STAGE2_SRC)
     extern uint8_t __chainloader_lma__[], __chainloader_start__[], __chainloader_bss_start__[], __chainloader_end__[];
     memcpy(__chainloader_start__, __chainloader_lma__, __chainloader_bss_start__ - __chainloader_start__);
     memset(__chainloader_bss_start__, 0, __chainloader_end__ - __chainloader_bss_start__);
@@ -81,12 +81,12 @@ void __program_exit(int rc) {
     for (;;);
 }
 
-#ifdef FUSEE_STAGE1_SRC
+#ifdef SEPT_STAGE1_SRC
 static void __program_parse_argc_argv(int argc, char *argdata) {
     __program_argc = 0;
     __program_argv = NULL;
 }
-#elif defined(FUSEE_STAGE2_SRC)
+#elif defined(SEPT_STAGE2_SRC)
 #include "stage2.h"
 static void __program_parse_argc_argv(int argc, char *argdata) {
     size_t pos = 0, len;
@@ -136,7 +136,7 @@ static void __program_parse_argc_argv(int argc, char *argdata) {
 #endif
 
 static void __program_cleanup_argv(void) {
-#ifndef FUSEE_STAGE1_SRC
+#ifndef SEPT_STAGE1_SRC
     for (int i = 0; i < __program_argc; i++) {
         free(__program_argv[i]);
         __program_argv[i] = NULL;

sept/sept-secondary/src/lib/fatfs/00history.txt

@@ -1,330 +0,0 @@
-----------------------------------------------------------------------------
-  Revision history of FatFs module
-----------------------------------------------------------------------------
-
-R0.00 (February 26, 2006)
-
-  Prototype.
-
-
-
-R0.01 (April 29, 2006)
-
-  The first release.
-
-
-
-R0.02 (June 01, 2006)
-
-  Added FAT12 support.
-  Removed unbuffered mode.
-  Fixed a problem on small (<32M) partition.
-
-
-
-R0.02a (June 10, 2006)
-
-  Added a configuration option (_FS_MINIMUM).
-
-
-
-R0.03 (September 22, 2006)
-
-  Added f_rename().
-  Changed option _FS_MINIMUM to _FS_MINIMIZE.
-
-
-
-R0.03a (December 11, 2006)
-
-  Improved cluster scan algorithm to write files fast.
-  Fixed f_mkdir() creates incorrect directory on FAT32.
-
-
-
-R0.04 (February 04, 2007)
-
-  Added f_mkfs().
-  Supported multiple drive system.
-  Changed some interfaces for multiple drive system.
-  Changed f_mountdrv() to f_mount().
-
-
-
-R0.04a (April 01, 2007)
-
-  Supported multiple partitions on a physical drive.
-  Added a capability of extending file size to f_lseek().
-  Added minimization level 3.
-  Fixed an endian sensitive code in f_mkfs().
-
-
-
-R0.04b (May 05, 2007)
-
-  Added a configuration option _USE_NTFLAG.
-  Added FSINFO support.
-  Fixed DBCS name can result FR_INVALID_NAME.
-  Fixed short seek (<= csize) collapses the file object.
-
-
-
-R0.05 (August 25, 2007)
-
-  Changed arguments of f_read(), f_write() and f_mkfs().
-  Fixed f_mkfs() on FAT32 creates incorrect FSINFO.
-  Fixed f_mkdir() on FAT32 creates incorrect directory.
-
-
-
-R0.05a (February 03, 2008)
-
-  Added f_truncate() and f_utime().
-  Fixed off by one error at FAT sub-type determination.
-  Fixed btr in f_read() can be mistruncated.
-  Fixed cached sector is not flushed when create and close without write.
-
-
-
-R0.06 (April 01, 2008)
-
-  Added fputc(), fputs(), fprintf() and fgets().
-  Improved performance of f_lseek() on moving to the same or following cluster.
-
-
-
-R0.07 (April 01, 2009)
-
-  Merged Tiny-FatFs as a configuration option. (_FS_TINY)
-  Added long file name feature. (_USE_LFN)
-  Added multiple code page feature. (_CODE_PAGE)
-  Added re-entrancy for multitask operation. (_FS_REENTRANT)
-  Added auto cluster size selection to f_mkfs().
-  Added rewind option to f_readdir().
-  Changed result code of critical errors.
-  Renamed string functions to avoid name collision.
-
-
-
-R0.07a (April 14, 2009)
-
-  Septemberarated out OS dependent code on reentrant cfg.
-  Added multiple sector size feature.
-
-
-
-R0.07c (June 21, 2009)
-
-  Fixed f_unlink() can return FR_OK on error.
-  Fixed wrong cache control in f_lseek().
-  Added relative path feature.
-  Added f_chdir() and f_chdrive().
-  Added proper case conversion to extended character.
-
-
-
-R0.07e (November 03, 2009)
-
-  Septemberarated out configuration options from ff.h to ffconf.h.
-  Fixed f_unlink() fails to remove a sub-directory on _FS_RPATH.
-  Fixed name matching error on the 13 character boundary.
-  Added a configuration option, _LFN_UNICODE.
-  Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.
-
-
-
-R0.08 (May 15, 2010)
-
-  Added a memory configuration option. (_USE_LFN = 3)
-  Added file lock feature. (_FS_SHARE)
-  Added fast seek feature. (_USE_FASTSEEK)
-  Changed some types on the API, XCHAR->TCHAR.
-  Changed .fname in the FILINFO structure on Unicode cfg.
-  String functions support UTF-8 encoding files on Unicode cfg.
-
-
-
-R0.08a (August 16, 2010)
-
-  Added f_getcwd(). (_FS_RPATH = 2)
-  Added sector erase feature. (_USE_ERASE)
-  Moved file lock semaphore table from fs object to the bss.
-  Fixed f_mkfs() creates wrong FAT32 volume.
-
-
-
-R0.08b (January 15, 2011)
-
-  Fast seek feature is also applied to f_read() and f_write().
-  f_lseek() reports required table size on creating CLMP.
-  Extended format syntax of f_printf().
-  Ignores duplicated directory separators in given path name.
-
-
-
-R0.09 (September 06, 2011)
-
-  f_mkfs() supports multiple partition to complete the multiple partition feature.
-  Added f_fdisk().
-
-
-
-R0.09a (August 27, 2012)
-
-  Changed f_open() and f_opendir() reject null object pointer to avoid crash.
-  Changed option name _FS_SHARE to _FS_LOCK.
-  Fixed assertion failure due to OS/2 EA on FAT12/16 volume.
-
-
-
-R0.09b (January 24, 2013)
-
-  Added f_setlabel() and f_getlabel().
-
-
-
-R0.10 (October 02, 2013)
-
-  Added selection of character encoding on the file. (_STRF_ENCODE)
-  Added f_closedir().
-  Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO)
-  Added forced mount feature with changes of f_mount().
-  Improved behavior of volume auto detection.
-  Improved write throughput of f_puts() and f_printf().
-  Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write().
-  Fixed f_write() can be truncated when the file size is close to 4GB.
-  Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect value on error.
-
-
-
-R0.10a (January 15, 2014)
-
-  Added arbitrary strings as drive number in the path name. (_STR_VOLUME_ID)
-  Added a configuration option of minimum sector size. (_MIN_SS)
-  2nd argument of f_rename() can have a drive number and it will be ignored.
-  Fixed f_mount() with forced mount fails when drive number is >= 1. (appeared at R0.10)
-  Fixed f_close() invalidates the file object without volume lock.
-  Fixed f_closedir() returns but the volume lock is left acquired. (appeared at R0.10)
-  Fixed creation of an entry with LFN fails on too many SFN collisions. (appeared at R0.07)
-
-
-
-R0.10b (May 19, 2014)
-
-  Fixed a hard error in the disk I/O layer can collapse the directory entry.
-  Fixed LFN entry is not deleted when delete/rename an object with lossy converted SFN. (appeared at R0.07)
-
-
-
-R0.10c (November 09, 2014)
-
-  Added a configuration option for the platforms without RTC. (_FS_NORTC)
-  Changed option name _USE_ERASE to _USE_TRIM.
-  Fixed volume label created by Mac OS X cannot be retrieved with f_getlabel(). (appeared at R0.09b)
-  Fixed a potential problem of FAT access that can appear on disk error.
-  Fixed null pointer dereference on attempting to delete the root direcotry. (appeared at R0.08)
-
-
-
-R0.11 (February 09, 2015)
-
-  Added f_findfirst(), f_findnext() and f_findclose(). (_USE_FIND)
-  Fixed f_unlink() does not remove cluster chain of the file. (appeared at R0.10c)
-  Fixed _FS_NORTC option does not work properly. (appeared at R0.10c)
-
-
-
-R0.11a (September 05, 2015)
-
-  Fixed wrong media change can lead a deadlock at thread-safe configuration.
-  Added code page 771, 860, 861, 863, 864, 865 and 869. (_CODE_PAGE)
-  Removed some code pages actually not exist on the standard systems. (_CODE_PAGE)
-  Fixed errors in the case conversion teble of code page 437 and 850 (ff.c).
-  Fixed errors in the case conversion teble of Unicode (cc*.c).
-
-
-
-R0.12 (April 12, 2016)
-
-  Added support for exFAT file system. (_FS_EXFAT)
-  Added f_expand(). (_USE_EXPAND)
-  Changed some members in FINFO structure and behavior of f_readdir().
-  Added an option _USE_CHMOD.
-  Removed an option _WORD_ACCESS.
-  Fixed errors in the case conversion table of Unicode (cc*.c).
-
-
-
-R0.12a (July 10, 2016)
-
-  Added support for creating exFAT volume with some changes of f_mkfs().
-  Added a file open method FA_OPEN_APPEND. An f_lseek() following f_open() is no longer needed.
-  f_forward() is available regardless of _FS_TINY.
-  Fixed f_mkfs() creates wrong volume. (appeared at R0.12)
-  Fixed wrong memory read in create_name(). (appeared at R0.12)
-  Fixed compilation fails at some configurations, _USE_FASTSEEK and _USE_FORWARD.
-
-
-
-R0.12b (September 04, 2016)
-
-  Made f_rename() be able to rename objects with the same name but case.
-  Fixed an error in the case conversion teble of code page 866. (ff.c)
-  Fixed writing data is truncated at the file offset 4GiB on the exFAT volume. (appeared at R0.12)
-  Fixed creating a file in the root directory of exFAT volume can fail. (appeared at R0.12)
-  Fixed f_mkfs() creating exFAT volume with too small cluster size can collapse unallocated memory. (appeared at R0.12)
-  Fixed wrong object name can be returned when read directory at Unicode cfg. (appeared at R0.12)
-  Fixed large file allocation/removing on the exFAT volume collapses allocation bitmap. (appeared at R0.12)
-  Fixed some internal errors in f_expand() and f_lseek(). (appeared at R0.12)
-
-
-
-R0.12c (March 04, 2017)
-
-  Improved write throughput at the fragmented file on the exFAT volume.
-  Made memory usage for exFAT be able to be reduced as decreasing _MAX_LFN.
-  Fixed successive f_getfree() can return wrong count on the FAT12/16 volume. (appeared at R0.12)
-  Fixed configuration option _VOLUMES cannot be set 10. (appeared at R0.10c)
-
-
-
-R0.13 (May 21, 2017)
-
-  Changed heading character of configuration keywords "_" to "FF_".
-  Removed ASCII-only configuration, FF_CODE_PAGE = 1. Use FF_CODE_PAGE = 437 instead.
-  Added f_setcp(), run-time code page configuration. (FF_CODE_PAGE = 0)
-  Improved cluster allocation time on stretch a deep buried cluster chain.
-  Improved processing time of f_mkdir() with large cluster size by using FF_USE_LFN = 3.
-  Improved NoFatChain flag of the fragmented file to be set after it is truncated and got contiguous.
-  Fixed archive attribute is left not set when a file on the exFAT volume is renamed. (appeared at R0.12)
-  Fixed exFAT FAT entry can be collapsed when write or lseek operation to the existing file is done. (appeared at R0.12c)
-  Fixed creating a file can fail when a new cluster allocation to the exFAT directory occures. (appeared at R0.12c)
-
-
-
-R0.13a (October 14, 2017)
-
-  Added support for UTF-8 encoding on the API. (FF_LFN_UNICODE = 2)
-  Added options for file name output buffer. (FF_LFN_BUF, FF_SFN_BUF).
-  Added dynamic memory allocation option for working buffer of f_mkfs() and f_fdisk().
-  Fixed f_fdisk() and f_mkfs() create the partition table with wrong CHS parameters. (appeared at R0.09)
-  Fixed f_unlink() can cause lost clusters at fragmented file on the exFAT volume. (appeared at R0.12c)
-  Fixed f_setlabel() rejects some valid characters for exFAT volume. (appeared at R0.12)
-
-
-
-R0.13b (April 07, 2018)
-
-  Added support for UTF-32 encoding on the API. (FF_LFN_UNICODE = 3)
-  Added support for Unix style volume ID. (FF_STR_VOLUME_ID = 2)
-  Fixed accesing any object on the exFAT root directory beyond the cluster boundary can fail. (appeared at R0.12c)
-  Fixed f_setlabel() does not reject some invalid characters. (appeared at R0.09b)
-
-
-
-R0.13c (October 14, 2018)
-  Supported stdint.h for C99 and later. (integer.h was included in ff.h)
-  Fixed reading a directory gets infinite loop when the last directory entry is not empty. (appeared at R0.12)
-  Fixed creating a sub-directory in the fragmented sub-directory on the exFAT volume collapses FAT chain of the parent directory. (appeared at R0.12)
-  Fixed f_getcwd() cause output buffer overrun when the buffer has a valid drive number. (appeared at R0.13b)
-