From 1f1d780c5ec0c233691a0059be2537c4cb862915 Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 11 Sep 2008 16:32:55 +0000 Subject: [PATCH] Unbreak battfs_test: comply with new policy. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1802 38d2e660-2303-0410-9eaa-f027e97ec537 --- app/battfs/appconfig.h | 230 ------------------------ app/battfs/battfs_test.mk | 30 ---- app/battfs/verstag.h | 94 ---------- bertos/fs/battfs.c | 5 - {app/battfs => bertos/fs}/battfs_test.c | 20 +-- 5 files changed, 8 insertions(+), 371 deletions(-) delete mode 100644 app/battfs/appconfig.h delete mode 100644 app/battfs/battfs_test.mk delete mode 100644 app/battfs/verstag.h rename {app/battfs => bertos/fs}/battfs_test.c (98%) diff --git a/app/battfs/appconfig.h b/app/battfs/appconfig.h deleted file mode 100644 index 74686264..00000000 --- a/app/battfs/appconfig.h +++ /dev/null @@ -1,230 +0,0 @@ -/** - * \file - * - * - * \brief DevLib configuration options - * - * You should copy this header in your project and rename it to - * "config.h" and delete the CONFIG_ macros for the modules - * you're not using. - * - *

Working with multiple applications

- * - * If your project is made of multiple DevLib-based applications, - * create a custom "config.h" file in each application subdirectory - * and play with the compiler include path to get the desired result. - * You can share common options by creationg a "config_common.h" header - * and including it from all your "config.h" copies. - * - *

Configuration style

- * - * For improved compile-time checking of configuration options, - * the preferred way to use a \c CONFIG_ symbol is keeping it - * always defined with a value of either 0 or 1. This lets - * you write tests like this: - * - * \code - * #if CONFIG_FOO - * void foo(void) - * { - * if (CONFIG_BAR) - * bar(); - * } - * #endif // CONFIG_FOO - * \endcode - * - * In most cases, we rely on the optimizer to discard checks - * on constant values and performing dead-code elimination. - * - * \version $Id$ - * \author Bernie Innocenti - * \author Stefano Fedrigo - */ - -#ifndef APPCONFIG_COMMON_H -#define APPCONFIG_COMMON_H - -/** kdebug console */ -#define CONFIG_KDEBUG_PORT 0 - - -/** Baud-rate for the kdebug console */ -#define CONFIG_KDEBUG_BAUDRATE 19200 - -/** - * printf()-style formatter configuration. - * - * \sa PRINTF_DISABLED - * \sa PRINTF_NOMODIFIERS - * \sa PRINTF_REDUCED - * \sa PRINTF_NOFLOAT - * \sa PRINTF_FULL - */ -#define CONFIG_PRINTF PRINTF_FULL - -/** - * Multithreading kernel. - * - * \sa config_kern.h - */ -#define CONFIG_KERN 0 - -/** - * \name Serial driver parameters - * \{ - */ - /** [bytes] Size of the outbound FIFO buffer for port 0. */ - #define CONFIG_UART0_TXBUFSIZE 32 - - /** [bytes] Size of the inbound FIFO buffer for port 0. */ - #define CONFIG_UART0_RXBUFSIZE 64 - - /** [bytes] Size of the outbound FIFO buffer for port 1. */ - #define CONFIG_UART1_TXBUFSIZE 32 - - /** [bytes] Size of the inbound FIFO buffer for port 1. */ - #define CONFIG_UART1_RXBUFSIZE 64 - - /** [bytes] Size of the outbound FIFO buffer for SPI port (AVR only). */ - #define CONFIG_SPI_TXBUFSIZE 16 - - /** [bytes] Size of the inbound FIFO buffer for SPI port (AVR only). */ - #define CONFIG_SPI_RXBUFSIZE 32 - - /** SPI data order (AVR only). */ - #define CONFIG_SPI_DATA_ORDER SER_MSB_FIRST - - /** SPI clock division factor (AVR only). */ - #define CONFIG_SPI_CLOCK_DIV 16 - - /** SPI clock polarity: 0 = normal low, 1 = normal high (AVR only). */ - #define CONFIG_SPI_CLOCK_POL 0 - - /** SPI clock phase: 0 = sample on first edge, 1 = sample on second clock edge (AVR only). */ - #define CONFIG_SPI_CLOCK_PHASE 0 - - /** Default transmit timeout (ms). Set to -1 to disable timeout support */ - #define CONFIG_SER_TXTIMEOUT -1 - - /** Default receive timeout (ms). Set to -1 to disable timeout support */ - #define CONFIG_SER_RXTIMEOUT -1 - - /** Use RTS/CTS handshake */ - #define CONFIG_SER_HWHANDSHAKE 0 - - /** Default baud rate (set to 0 to disable) */ - #define CONFIG_SER_DEFBAUDRATE 0 - - /** Enable second serial port in emulator. */ - #define CONFIG_EMUL_UART1 0 - - /** - * Transmit always something on serial port 0 TX - * to avoid interference when sending burst of data, - * using AVR multiprocessor serial mode - */ - #define CONFIG_SER_TXFILL 0 - - #define CONFIG_SER_STROBE 0 -/*\}*/ - -/// Hardware timer selection for drv/timer.c -#define CONFIG_TIMER TIMER_ON_OUTPUT_COMPARE2 - -/// Debug timer interrupt using a strobe pin. -#define CONFIG_TIMER_STROBE 0 - -/// Enable ADS strobe. -#define CONFIG_ADC_STROBE 0 - -/// Enable watchdog timer. -#define CONFIG_WATCHDOG 0 - -/// EEPROM type for drv/eeprom.c -#define CONFIG_EEPROM_TYPE EEPROM_24XX256 - -/// Select bitmap pixel format. -#define CONFIG_BITMAP_FMT BITMAP_FMT_PLANAR_V_LSB - -/// Enable line clipping algorithm. -#define CONFIG_GFX_CLIPPING 1 - -/// Enable text rendering in bitmaps. -#define CONFIG_GFX_TEXT 1 - -/// Enable virtual coordinate system. -#define CONFIG_GFX_VCOORDS 1 - -/// Keyboard polling method -#define CONFIG_KBD_POLL KBD_POLL_SOFTINT - -/// Enable keyboard event delivery to observers -#define CONFIG_KBD_OBSERVER 0 - -/// Enable key beeps -#define CONFIG_KBD_BEEP 1 - -/// Enable long pression handler for keys -#define CONFIG_KBD_LONGPRESS 1 - -/** - * \name Type for the chart dataset - * \{ - */ -#define CONFIG_CHART_TYPE_X uint8_t -#define CONFIG_CHART_TYPE_Y uint8_t -/*\}*/ - -/// Enable button bar behind menus -#define CONFIG_MENU_MENUBAR 0 - -/// Enable smooth scrolling in menus -#define CONFIG_MENU_SMOOTH 1 - -/// Size of block for MD2 algorithm. -#define CONFIG_MD2_BLOCK_LEN 16 - -/// Use standard permutation in MD2 algorithm. -#define CONFIG_MD2_STD_PERM 0 - -/// Define a size, in byte, of entropy pool. -#define CONFIG_SIZE_ENTROPY_POOL 64 - -/// Turn on or off timer support in Randpool. -#define CONFIG_RANDPOOL_TIMER 1 - -/** Enable kfile_gets() and kfile_gets_echo() */ -#define CONFIG_KFILE_GETS 1 - -#define CONFIG_TEST 0 - - -#endif /* APPCONFIG_H */ diff --git a/app/battfs/battfs_test.mk b/app/battfs/battfs_test.mk deleted file mode 100644 index 553aa3e3..00000000 --- a/app/battfs/battfs_test.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# $Id: demo.mk 18234 2007-10-08 13:39:48Z rasky $ -# Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/) -# All rights reserved. -# -# Makefile fragment for DevLib demo application. -# -# Author: Bernie Innocenti -# - -# Set to 1 for debug builds -battfs_test_DEBUG = 1 - -# Our target application -TRG += battfs_test - - -battfs_test_CSRC = \ - bertos/fs/battfs.c \ - app/battfs/battfs_test.c \ - bertos/kern/kfile.c - -battfs_test_CFLAGS = -O0 -D'ARCH=ARCH_EMUL' -D_EMUL -Iapp/battfs -g3 - - -# Debug stuff -ifeq ($(battfs_test_DEBUG),1) - battfs_test_CFLAGS += -D_DEBUG -endif - diff --git a/app/battfs/verstag.h b/app/battfs/verstag.h deleted file mode 100644 index b6bbde4b..00000000 --- a/app/battfs/verstag.h +++ /dev/null @@ -1,94 +0,0 @@ -/** - * \file - * - * - * \version $Id$ - * - * \author Bernie Innocenti - * - * \brief Declare application version strings - */ -#ifndef DEVLIB_VERSTAG_H -#define DEVLIB_VERSTAG_H - -#ifndef ARCH_CONFIG_H - #include "cfg/arch_config.h" -#endif - -#define APP_NAME "Devlib Demo" -#define APP_DESCRIPTION "DevLib Multidemo Application" -#define APP_AUTHOR "Develer" -#define APP_COPYRIGHT "Copyright 2006 Develer (http://www.develer.com/)" - -#define VERS_MAJOR 0 -#define VERS_MINOR 1 -#define VERS_REV 0 -#define VERS_LETTER "" - -/** - * If _SNAPSHOT is defined, \c VERS_TAG contains the build date - * date instead of a numeric version string. - */ -#define _SNAPSHOT - -#ifdef _DEBUG - #define VERS_DBG "D" -#else - #define VERS_DBG "" -#endif - -#define __STRINGIZE(x) #x -#define _STRINGIZE(x) __STRINGIZE(x) - -/** Build application version string (i.e.: "1.7.0") */ -#define MAKE_VERS(maj,min,rev) _STRINGIZE(maj) "." _STRINGIZE(min) "." _STRINGIZE(rev) VERS_LETTER VERS_DBG -#ifdef _SNAPSHOT - #define VERS_TAG "snapshot" " " __DATE__ " " __TIME__ " " VERS_LETTER " " VERS_DBG -#else - #define VERS_TAG MAKE_VERS(VERS_MAJOR,VERS_MINOR,VERS_REV) -#endif - -/** Build application version string suitable for MS windows resource files (i.e.: "1, 7, 0, 1") */ -#define MAKE_RCVERS(maj,min,rev,bld) _STRINGIZE(maj) ", " _STRINGIZE(min) ", " _STRINGIZE(rev) ", " _STRINGIZE(bld) -#define RCVERSION_TAG MAKE_VERS(VERS_MAJOR,VERS_MINOR,VERS_REV) - -/** The revision string (contains VERS_TAG) */ -extern const char vers_tag[]; - -/** Sequential build number (contains VERS_BUILD) */ -extern const int vers_build_nr; -//extern const char vers_build_str[]; - -/** Hostname of the machine used to build this binary (contains VERS_HOST) */ -extern const char vers_host[]; - -#endif /* DEVLIB_VERSTAG_H */ diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c index 6d6b92d8..74c5ac5f 100644 --- a/bertos/fs/battfs.c +++ b/bertos/fs/battfs.c @@ -40,9 +40,6 @@ #include "battfs.h" -#warning TODO:Fix and complete this module. - -#if 0 #include #include /* MIN, MAX */ #include /* cpu_to_xx */ @@ -828,5 +825,3 @@ bool battfs_writeTestBlock(struct BattFsSuper *disk, pgcnt_t page, inode_t inode return true; } - -#endif diff --git a/app/battfs/battfs_test.c b/bertos/fs/battfs_test.c similarity index 98% rename from app/battfs/battfs_test.c rename to bertos/fs/battfs_test.c index 839d7811..5b5c4631 100644 --- a/app/battfs/battfs_test.c +++ b/bertos/fs/battfs_test.c @@ -31,7 +31,7 @@ * * \brief BattFS Test. * - * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $ + * \version $Id$ * \author Francesco Sacchi */ @@ -48,6 +48,8 @@ #define PAGE_SIZE 128 #define PAGE_COUNT FILE_SIZE / PAGE_SIZE +#if UNIT_TEST + FILE *fp; const char test_filename[]="battfs_disk.bin"; @@ -538,8 +540,6 @@ int battfs_testRun(void) return 0; } -#if UNIT_TEST - int battfs_testSetup(void) { return 0; @@ -552,14 +552,10 @@ int battfs_testTearDown(void) TEST_MAIN(battfs) -#include "fs/battfs.c" -#include "drv/kdebug.c" -#include "mware/formatwr.c" -#include "mware/hex.c" +#include +#include +#include +#include +#include -#else -int main(void) -{ - return battfs_testRun(); -} #endif // _TEST -- 2.25.1