Index: io/flash//current/ChangeLog =================================================================== RCS file: /cvs/ecos/ecos/packages/io/flash/current/ChangeLog,v retrieving revision 1.30 diff -u -r1.30 ChangeLog --- io/flash//current/ChangeLog 20 Nov 2003 14:48:46 -0000 1.30 +++ io/flash//current/ChangeLog 20 Nov 2003 16:39:20 -0000 @@ -1,4 +1,10 @@ 2003-11-20 Jani Monoses + * src/flash.c: + * src/flashiodev.c: + * include/flash.h: Remove references to work_space and work_space_size + since they are no longer used. + +2003-11-20 Jani Monoses * cdl/io_flash.cdl: * src/flash.c: Remove handling of CYGHWR_IO_FLASH_DEVICE_NOT_IN_RAM Index: io/flash//current/include/flash.h =================================================================== RCS file: /cvs/ecos/ecos/packages/io/flash/current/include/flash.h,v retrieving revision 1.16 diff -u -r1.16 flash.h --- io/flash//current/include/flash.h 19 Sep 2003 17:11:31 -0000 1.16 +++ io/flash//current/include/flash.h 20 Nov 2003 16:39:21 -0000 @@ -61,7 +61,7 @@ #define FLASH_MIN_WORKSPACE CYGNUM_FLASH_WORKSPACE_SIZE // Space used by FLASH code -externC int flash_init(void *work_space, int work_space_length, _printf *pf); +externC int flash_init(_printf *pf); externC int flash_erase(void *base, int len, void **err_address); externC int flash_program(void *flash_base, void *ram_base, int len, void **err_address); externC int flash_read(void *flash_base, void *ram_base, int len, void **err_address); @@ -113,8 +113,6 @@ #ifdef _FLASH_PRIVATE_ struct flash_info { - void *work_space; - int work_space_size; int block_size; // Assuming fixed size "blocks" int blocks; // Number of blocks int buffer_size; // Size of write buffer (only defined for some devices) Index: io/flash//current/src/flash.c =================================================================== RCS file: /cvs/ecos/ecos/packages/io/flash/current/src/flash.c,v retrieving revision 1.23 diff -u -r1.23 flash.c --- io/flash//current/src/flash.c 20 Nov 2003 14:48:46 -0000 1.23 +++ io/flash//current/src/flash.c 20 Nov 2003 16:39:22 -0000 @@ -73,14 +73,12 @@ struct flash_info flash_info; int -flash_init(void *work_space, int work_space_size, _printf *pf) +flash_init(_printf *pf) { int err; if (flash_info.init) return FLASH_ERR_OK; flash_info.pf = pf; // Do this before calling into the driver - flash_info.work_space = work_space; - flash_info.work_space_size = work_space_size; if ((err = flash_hwr_init()) != FLASH_ERR_OK) { return err; } Index: io/flash//current/src/flashiodev.c =================================================================== RCS file: /cvs/ecos/ecos/packages/io/flash/current/src/flashiodev.c,v retrieving revision 1.4 diff -u -r1.4 flashiodev.c --- io/flash//current/src/flashiodev.c 19 Mar 2003 14:14:56 -0000 1.4 +++ io/flash//current/src/flashiodev.c 20 Nov 2003 16:39:23 -0000 @@ -63,11 +63,7 @@ #define MIN(x,y) ((x)<(y) ? (x) : (y)) -// 1 per devtab entry, so only 1 for now -//static char flashiodev_workspaces[1][FLASH_MIN_WORKSPACE]; - struct flashiodev_priv_t{ - char workspace[FLASH_MIN_WORKSPACE]; char *start; char *end; }; @@ -80,8 +76,7 @@ flashiodev_init( struct cyg_devtab_entry *tab ) { struct flashiodev_priv_t *dev = (struct flashiodev_priv_t *)tab->priv; - char *ws = dev->workspace; - int stat = flash_init( ws, FLASH_MIN_WORKSPACE, &dummy_printf ); + int stat = flash_init( &dummy_printf ); if ( stat == 0 ) { #ifdef CYGNUM_IO_FLASH_BLOCK_CFG_FIS_1 CYG_ADDRESS flash_base;