Merge branch 'fatfs-integration' into fatcommands

# Conflicts:
#	include/avr/ffconf.h

diff --cc avr/Tupfile
index e3ab922751432d9796d7bb48d589f6ea006f71c3,05e7e69db6694c25eec355a668283b3c02ab4ac6..5e1f305229e38fddaa4c5a222a3b6e43a7ddbe21
--- 1/avr/Tupfile
--- 2/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 avr/cmd_fat.c
Simple merge

diff --cc avr/cmd_sd.c
Simple merge

diff --cc include/avr/ffconf.h
index a7a908d5a53fbf3aa48cf411e01cd39220c68a92,51a3c23633ebe325952f16dbe591d346005509cf..336df0ae80af9ebc290da1912b78e9d57a806c03
--- 1/include/avr/ffconf.h
--- 2/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) */