Skip to content

S
Software for White Rabbit PTP Core
Commit 953b043f authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

storage: bring back sdbfs formating from shell

parent 8dfe14bd
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 9 deletions
boards/generic/board.h
View file @ 953b043f
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
#define FMC_EEPROM_ADR 0x50 #define FMC_EEPROM_ADR 0x50
#define SDBFS_REC 4 #define SDBFS_REC 5
void sdb_find_devices(void); void sdb_find_devices(void);
void sdb_print_devices(void); void sdb_print_devices(void);
......
dev/storage.c
View file @ 953b043f
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
#define STORAGE_FLAG_DEVICE_OK (1<<0) #define STORAGE_FLAG_DEVICE_OK (1<<0)
static const uint32_t sdbfs_default_bin[] =
{
#include "dev/sdbfs-default.h"
};
struct storage_device wrc_storage_dev; struct storage_device wrc_storage_dev;
struct sdbfs wrc_sdbfs; struct sdbfs wrc_sdbfs;
...@@ -1090,8 +1095,9 @@ static inline unsigned long SDB_ALIGN(unsigned long x, int blocksize) ...@@ -1090,8 +1095,9 @@ static inline unsigned long SDB_ALIGN(unsigned long x, int blocksize)
int storage_sdbfs_format( struct storage_device *dev, uint32_t base_addr ) int storage_sdbfs_format( struct storage_device *dev, uint32_t base_addr )
{ {
struct sdb_device *sdbfs = struct sdb_device *sdbfs =
(struct sdb_device *) NULL; // fixme (struct sdb_device *) sdbfs_default_bin;
struct sdb_interconnect *sdbfs_dir = (struct sdb_interconnect *) NULL; struct sdb_interconnect *sdbfs_dir = (struct sdb_interconnect *)
sdbfs_default_bin;
struct sdb_device sdbfs_buf[SDBFS_REC]; struct sdb_device sdbfs_buf[SDBFS_REC];
int i; int i;
...@@ -1102,9 +1108,7 @@ int storage_sdbfs_format( struct storage_device *dev, uint32_t base_addr ) ...@@ -1102,9 +1108,7 @@ int storage_sdbfs_format( struct storage_device *dev, uint32_t base_addr )
wrc_sdbfs.drvdata = dev; wrc_sdbfs.drvdata = dev;
wrc_sdbfs.blocksize = dev->block_size; wrc_sdbfs.blocksize = dev->block_size;
/* first file starts /* first file starts after the SDBFS description */
after the SDBFS description */
cur_adr = base_addr + SDB_ALIGN(SDBFS_REC*sizeof(struct sdb_device), cur_adr = base_addr + SDB_ALIGN(SDBFS_REC*sizeof(struct sdb_device),
wrc_sdbfs.blocksize ); wrc_sdbfs.blocksize );
...@@ -1145,8 +1149,8 @@ int storage_sdbfs_format( struct storage_device *dev, uint32_t base_addr ) ...@@ -1145,8 +1149,8 @@ int storage_sdbfs_format( struct storage_device *dev, uint32_t base_addr )
size = sizeof(struct sdb_device); size = sizeof(struct sdb_device);
for (i = 0; i < SDBFS_REC; ++i) { for (i = 0; i < SDBFS_REC; ++i) {
sdbfs_write_callback(&wrc_sdbfs, base_addr + i*size, &sdbfs[i], sdbfs_write_callback(&wrc_sdbfs, base_addr + i*size, &sdbfs[i],
size); size);
} }
pp_printf("Verification...\n"); pp_printf("Verification...\n");
......
shell/cmd_sdb.c
View file @ 953b043f
...@@ -24,7 +24,7 @@ static int cmd_sdb(const char *args[]) ...@@ -24,7 +24,7 @@ static int cmd_sdb(const char *args[])
if (!args[0]) if (!args[0])
{ {
pp_printf("Command expected: format, ls"); pp_printf("Command expected: format, ls\n");
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment