From 5b1726ad246b2422c01e8d629baa83530655df09 Mon Sep 17 00:00:00 2001 From: lottaviano Date: Mon, 5 Dec 2011 11:10:02 +0000 Subject: [PATCH 1/1] Update sd_fat project to use the latest INI reader config file. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5179 38d2e660-2303-0410-9eaa-f027e97ec537 --- .../examples/at91sam7x-ek_sd_fat/at91sam7x-ek_sd_fat.mk | 2 +- .../examples/at91sam7x-ek_sd_fat/cfg/cfg_ini_reader.h | 6 ++++++ .../examples/at91sam7x-ek_sd_fat/cfg/cfg_ser.h | 8 ++++---- .../examples/at91sam7x-ek_sd_fat/project.bertos | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/at91sam7x-ek_sd_fat.mk b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/at91sam7x-ek_sd_fat.mk index 8eab0aa0..95e9c509 100644 --- a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/at91sam7x-ek_sd_fat.mk +++ b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/at91sam7x-ek_sd_fat.mk @@ -65,7 +65,7 @@ at91sam7x-ek_sd_fat_WIZARD_ASRC = \ \ # -at91sam7x-ek_sd_fat_CPPFLAGS = -D'CPU_FREQ=(48054857UL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$(at91sam7x-ek_sd_fat_HW_PATH) -I$(at91sam7x-ek_sd_fat_SRC_PATH) $(at91sam7x-ek_sd_fat_CPU_CPPFLAGS) $(at91sam7x-ek_sd_fat_USER_CPPFLAGS) +at91sam7x-ek_sd_fat_CPPFLAGS = -D'CPU_FREQ=(48023000UL)' -D'ARCH=(ARCH_DEFAULT)' -D'WIZ_AUTOGEN' -I$(at91sam7x-ek_sd_fat_HW_PATH) -I$(at91sam7x-ek_sd_fat_SRC_PATH) $(at91sam7x-ek_sd_fat_CPU_CPPFLAGS) $(at91sam7x-ek_sd_fat_USER_CPPFLAGS) # Automatically generated by the wizard. PLEASE DO NOT EDIT! at91sam7x-ek_sd_fat_LDFLAGS = $(at91sam7x-ek_sd_fat_CPU_LDFLAGS) $(at91sam7x-ek_sd_fat_WIZARD_LDFLAGS) $(at91sam7x-ek_sd_fat_USER_LDFLAGS) diff --git a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ini_reader.h b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ini_reader.h index d0be4389..048139a4 100644 --- a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ini_reader.h +++ b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ini_reader.h @@ -45,4 +45,10 @@ */ #define CONFIG_INI_MAX_LINE_LEN 64 +/** + * Make case insensitive comparisons. + * $WIZ$ type = "boolean" + */ +#define CONFIG_INI_CASE_INSENSITIVE 0 + #endif /* CFG_INI_READER_H */ diff --git a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ser.h b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ser.h index 91a10e0b..e7d5cc43 100644 --- a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ser.h +++ b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/cfg/cfg_ser.h @@ -160,14 +160,14 @@ * * $WIZ$ type = "enum" * $WIZ$ value_list = "ser_order_bit" - * $WIZ$ supports = "avr" + * $WIZ$ supports = "avr and not xmega32d" */ #define CONFIG_SPI_DATA_ORDER SER_MSB_FIRST /** * SPI clock division factor. * $WIZ$ type = "int" - * $WIZ$ supports = "avr" + * $WIZ$ supports = "avr and not xmega32d" */ #define CONFIG_SPI_CLOCK_DIV 16 @@ -175,7 +175,7 @@ * SPI clock polarity: normal low or normal high. * $WIZ$ type = "enum" * $WIZ$ value_list = "ser_spi_pol" - * $WIZ$ supports = "avr" + * $WIZ$ supports = "avr and not xmega32d" */ #define CONFIG_SPI_CLOCK_POL SPI_NORMAL_LOW @@ -184,7 +184,7 @@ * sample on second clock edge. * $WIZ$ type = "enum" * $WIZ$ value_list = "ser_spi_phase" - * $WIZ$ supports = "avr" + * $WIZ$ supports = "avr and not xmega32d" */ #define CONFIG_SPI_CLOCK_PHASE SPI_SAMPLE_ON_FIRST_EDGE diff --git a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/project.bertos b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/project.bertos index 95e14def..e9ad1833 100644 --- a/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/project.bertos +++ b/boards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat/project.bertos @@ -21,9 +21,9 @@ S'path' p10 Varm-none-eabi-gcc p11 -ssS'PROJECT_SRC_PATH_FROM_MAKEFILE' +ssS'PROJECT_HW_PATH_FROM_MAKEFILE' p12 -Vboards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat +Vboards/at91sam7x-ek p13 sS'ENABLED_MODULES' p14 @@ -67,9 +67,9 @@ p33 sS'PRESET' p34 I01 -sS'PROJECT_HW_PATH_FROM_MAKEFILE' +sS'PROJECT_SRC_PATH_FROM_MAKEFILE' p35 -Vboards/at91sam7x-ek +Vboards/at91sam7x-ek/examples/at91sam7x-ek_sd_fat p36 sS'OUTPUT' p37 -- 2.25.1