From b0dd36766ad69ba81d3ff4659ab0d2d2439d56ef Mon Sep 17 00:00:00 2001 From: batt Date: Mon, 4 Feb 2008 23:41:14 +0000 Subject: [PATCH] Add battfs test. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1083 38d2e660-2303-0410-9eaa-f027e97ec537 --- app/demo/appconfig.h | 108 ++++++++++++--------------------- app/demo/battfs_test.c | 131 ++++++++++++++++++++++++++++++++++++++++ app/demo/battfs_test.mk | 29 +++++++++ 3 files changed, 198 insertions(+), 70 deletions(-) create mode 100644 app/demo/battfs_test.c create mode 100644 app/demo/battfs_test.mk diff --git a/app/demo/appconfig.h b/app/demo/appconfig.h index e1a6107f..4361d0f0 100644 --- a/app/demo/appconfig.h +++ b/app/demo/appconfig.h @@ -69,62 +69,12 @@ * \author Stefano Fedrigo */ -/*#* - *#* $Log$ - *#* Revision 1.5 2006/09/20 19:55:01 marco - *#* Added CONFIG_LCD_4BIT. - *#* - *#* Revision 1.4 2006/09/13 18:29:22 bernie - *#* Add a few missing CONFIG_ definitions. - *#* - *#* Revision 1.3 2006/07/19 12:56:24 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.2 2006/05/28 12:18:12 bernie - *#* Disable menu timeout. - *#* - *#* Revision 1.1 2006/05/27 22:31:57 bernie - *#* Add appconfig.h for demo app. - *#* - *#* Revision 1.1 2006/05/18 00:40:43 bernie - *#* Rename appconfig.h to appconfig_common.h. - *#* - *#* Revision 1.11 2006/04/11 00:08:53 bernie - *#* Add smooth scrolling for menus. - *#* - *#* Revision 1.10 2006/03/22 09:48:51 bernie - *#* Add a few more config options. - *#* - *#* Revision 1.9 2006/02/24 00:27:35 bernie - *#* Enable kernel and fix Doxygen markup. - *#* - *#* Revision 1.8 2006/02/21 16:06:05 bernie - *#* Update copyright info. - *#* - *#* Revision 1.7 2006/02/17 22:28:19 bernie - *#* Add missing UART definitions. - *#* - *#* Revision 1.6 2006/02/15 09:12:56 bernie - *#* Switch to BITMAP_FMT_PLANAR_V_LSB. - *#* - *#* Revision 1.5 2006/02/10 12:34:33 bernie - *#* Add missing config options for gfx and kbd. - *#* - *#* Revision 1.4 2006/01/23 23:12:27 bernie - *#* Enable CONFIG_GFX_VCOORDS. - *#* - *#* Revision 1.3 2006/01/17 02:30:06 bernie - *#* Add new config vars. - *#* - *#* Revision 1.2 2005/11/27 03:04:57 bernie - *#* CONFIG_WATCHDOG: New config option. - *#* - *#* Revision 1.1 2005/11/04 17:42:12 bernie - *#* Move cfg/config.h to appconfig.h. - *#*/ - -#ifndef APPCONFIG_H -#define APPCONFIG_H +#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 @@ -145,7 +95,7 @@ * * \sa config_kern.h */ -#define CONFIG_KERNEL 1 +#define CONFIG_KERNEL 0 /** * \name Serial driver parameters @@ -169,6 +119,18 @@ /** [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 @@ -203,8 +165,11 @@ /// 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 1 +#define CONFIG_WATCHDOG 0 /// EEPROM type for drv/eeprom.c #define CONFIG_EEPROM_TYPE EEPROM_24XX256 @@ -213,13 +178,13 @@ #define CONFIG_BITMAP_FMT BITMAP_FMT_PLANAR_V_LSB /// Enable line clipping algorithm. -#define CONFIG_GFX_CLIPPING 1 +#define CONFIG_GFX_CLIPPING 1 /// Enable text rendering in bitmaps. -#define CONFIG_GFX_TEXT 1 +#define CONFIG_GFX_TEXT 1 /// Enable virtual coordinate system. -#define CONFIG_GFX_VCOORDS 1 +#define CONFIG_GFX_VCOORDS 1 /// Keyboard polling method #define CONFIG_KBD_POLL KBD_POLL_SOFTINT @@ -227,11 +192,11 @@ /// Enable keyboard event delivery to observers #define CONFIG_KBD_OBSERVER 0 -/// Enable key beeps. +/// Enable key beeps #define CONFIG_KBD_BEEP 1 /// Enable long pression handler for keys -#define CONFIG_KBD_LONGPRESS 0 +#define CONFIG_KBD_LONGPRESS 1 /** * \name Type for the chart dataset @@ -244,16 +209,19 @@ /// Enable button bar behind menus #define CONFIG_MENU_MENUBAR 0 -/// Enable smooth scrolling in menus. +/// Enable smooth scrolling in menus #define CONFIG_MENU_SMOOTH 1 -/// Abort menu after this amount of time. -#define CONFIG_MENU_TIMEOUT 0 /* ms */ +/// Size of block for MD2 algorithm. +#define CONFIG_MD2_BLOCK_LEN 16 + +/// Use standard permutation in MD2 algorithm. +#define CONFIG_MD2_STD_PERM 0 -/// Accept input implicitly after this amount of time. -#define CONFIG_LEVELEDIT_TIMEOUT 3000 /* ms */ +/// Define a size, in byte, of entropy pool. +#define CONFIG_SIZE_ENTROPY_POOL 64 -/// LCD bus size. If 0 use 8bit bus. -#define CONFIG_LCD_4BIT 0 +/// Turn on or off timer support in Randpool. +#define CONFIG_RANDPOOL_TIMER 1 #endif /* APPCONFIG_H */ diff --git a/app/demo/battfs_test.c b/app/demo/battfs_test.c new file mode 100644 index 00000000..a0b8e348 --- /dev/null +++ b/app/demo/battfs_test.c @@ -0,0 +1,131 @@ +/** + * \file + * + * + * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $ + * + * \author Francesco Sacchi + * + * \brief BattFs Test. + */ + +#include +#include + +#include +#include +#include + +FILE *fp; +const char test_filename[]="battfs_disk.bin"; +const char *filename; + +#define PAGE_SIZE 128 +static bool disk_open(struct BattFsSuper *d) +{ + fp = fopen(filename, "r+b"); + ASSERT(fp); + fseek(fp, 0, SEEK_END); + d->page_size = PAGE_SIZE; + d->page_count = ftell(fp) / d->page_size; + d->disk_size = d->page_size * d->page_count; + d->page_array = malloc(d->page_count * sizeof(pgcnt_t)); + TRACEMSG("page_size:%d, page_count:%d, disk_size:%d\n", d->page_size, d->page_count, d->disk_size); + return (fp && d->page_array); +} + +static size_t disk_page_read(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t size) +{ + TRACEMSG("page:%d, addr:%d, size:%d\n", page, addr, size); + fseek(fp, page * d->page_size + addr, SEEK_SET); + return fread(buf, 1, size, fp); +} + +static size_t disk_page_write(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t size) +{ + TRACEMSG("page:%d, addr:%d, size:%d\n", page, addr, size); + fseek(fp, page * d->page_size + addr, SEEK_SET); + return fwrite(buf, 1, size, fp); +} + +static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page) +{ + TRACEMSG("page:%d\n", page); + fseek(fp, page * d->page_size, SEEK_SET); + + for (int i = 0; i < d->page_size; i++) + if (fputc(0xff, fp) == EOF) + return false; + return true; +} + +static bool disk_close(struct BattFsSuper *d) +{ + TRACE; + free(d->page_array); + return (fclose(fp) != EOF); +} + +int main(int argc, char *argv[]) +{ + if (argc < 2) + { + FILE *fpt = fopen(test_filename, "w+"); + for (int i = 0; i < 32768; i++) + fputc(0xff, fpt); + fclose(fpt); + filename = test_filename; + } + else + filename = argv[1]; + + BattFsSuper disk; + disk.open = disk_open; + disk.read = disk_page_read; + disk.write = disk_page_write; + disk.erase = disk_page_erase; + disk.close = disk_close; + + if (battfs_init(&disk)) + { + kprintf("page_array:\n"); + for (pgcnt_t i = 0; i < disk.page_count; i++) + { + if (!(i % 16)) + kputchar('\n'); + kprintf("%04d ", disk.page_array[i]); + } + kputchar('\n'); + return 0; + } + else + return 1; +} diff --git a/app/demo/battfs_test.mk b/app/demo/battfs_test.mk new file mode 100644 index 00000000..5df84bf7 --- /dev/null +++ b/app/demo/battfs_test.mk @@ -0,0 +1,29 @@ +# +# $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: Bernardo Innocenti +# + +# Set to 1 for debug builds +battfs_test_DEBUG = 1 + +# Our target application +TRG += battfs_test + + +battfs_test_CSRC = \ + fs/battfs.c \ + app/battfs/battfs_test.c + +battfs_test_CFLAGS = -O0 -D'ARCH=ARCH_EMUL' -D_EMUL -Iapp/battfs -Ihw -g3 + + +# Debug stuff +ifeq ($(battfs_test_DEBUG),1) + battfs_test_CFLAGS += -D_DEBUG +endif + -- 2.34.1