From: Leo C <erbl259-lmu@yahoo.de>
Date: Mon, 28 May 2018 11:07:24 +0000 (+0200)
Subject: Merge branch 'fatfs-integration' into fatcommands
X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/commitdiff_plain/b40024e18f0750418894d1b0cf3fcaf99ffb09a3

Merge branch 'fatfs-integration' into fatcommands

# Conflicts:
#	include/avr/ffconf.h
---

b40024e18f0750418894d1b0cf3fcaf99ffb09a3
diff --cc avr/Tupfile
index e3ab922,05e7e69..5e1f305
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@@ -6,13 -7,14 +7,13 @@@ FATFS	= $(FATFSD)/ff.c $(FATFSD)/ffunic
  
  SRC		= main.c
  SRC		+= cli.c cli_readline.c command.c command_tbl.c
 -SRC		+= cmd_help.c cmd_run.c cmd_boot.c cmd_misc.c
 +SRC		+= cmd_run.c cmd_boot.c cmd_misc.c
  SRC		+= cmd_date.c cmd_mem.c cmd_gpio.c cmd_attach.c
  SRC		+= cmd_loadihex.c cmd_loadcpm3.c cmd_sd.c cmd_fat.c
 -SRC		+= env.c xmalloc.c con-utils.c print-utils.c
 -SRC		+= getopt-min.c eval_arg.c
 +SRC		+= env.c con-utils.c print-utils.c getopt-min.c eval_arg.c
  SRC		+= timer.c serial.c i2c.c bcd.c pcf8583.c mmc.c
  SRC		+= background.c z180-serv.c z80-if.c gpio.c
- SRC		+= $(FATFS) $(TOP)/fatfs/src/option/unicode.c
+ SRC		+= $(FATFS)
  
  #TODO: time lib
  SRC		+= ../time/asctime_r.c ../time/gmtime_r.c ../time/mk_gmtime.c
diff --cc include/avr/ffconf.h
index a7a908d,51a3c23..336df0a
--- a/include/avr/ffconf.h
+++ b/include/avr/ffconf.h
@@@ -34,7 -33,7 +33,7 @@@
  /  2: Enable with LF-CRLF conversion. */
  
  
- #define _USE_FIND		1
 -#define FF_USE_FIND		0
++#define FF_USE_FIND		1
  /* This option switches filtered directory read functions, f_findfirst() and
  /  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
  
@@@ -51,12 -50,12 +50,12 @@@
  /* This option switches f_expand function. (0:Disable or 1:Enable) */
  
  
- #define _USE_CHMOD		1
 -#define FF_USE_CHMOD	0
++#define FF_USE_CHMOD	1
  /* This option switches attribute manipulation functions, f_chmod() and f_utime().
- /  (0:Disable or 1:Enable) Also _FS_READONLY needs to be 0 to enable this option. */
+ /  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
  
  
- #define _USE_LABEL		1
 -#define FF_USE_LABEL	0
++#define FF_USE_LABEL	1
  /* This option switches volume label functions, f_getlabel() and f_setlabel().
  /  (0:Disable or 1:Enable) */