From 37f40f5574e04ae050507133ade8fe0e6bae2f0d Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 9 Oct 2006 20:49:57 -0500 Subject: Fixup whitespace Signed-off-by: Josh Boyer --- mtd_debug.c | 525 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 262 insertions(+), 263 deletions(-) (limited to 'mtd_debug.c') diff --git a/mtd_debug.c b/mtd_debug.c index ee3c67c..e0cc7d7 100644 --- a/mtd_debug.c +++ b/mtd_debug.c @@ -1,4 +1,3 @@ - /* * Copyright (c) 2d3D, Inc. * Written by Abraham vd Merwe @@ -46,7 +45,7 @@ */ static int getmeminfo (int fd,struct mtd_info_user *mtd) { - return (ioctl (fd,MEMGETINFO,mtd)); + return (ioctl (fd,MEMGETINFO,mtd)); } /* @@ -54,7 +53,7 @@ static int getmeminfo (int fd,struct mtd_info_user *mtd) */ static int memerase (int fd,struct erase_info_user *erase) { - return (ioctl (fd,MEMERASE,erase)); + return (ioctl (fd,MEMERASE,erase)); } /* @@ -63,66 +62,66 @@ static int memerase (int fd,struct erase_info_user *erase) */ static int getregions (int fd,struct region_info_user *regions,int *n) { - int i,err; - err = ioctl (fd,MEMGETREGIONCOUNT,n); - if (err) return (err); - for (i = 0; i < *n; i++) - { + int i,err; + err = ioctl (fd,MEMGETREGIONCOUNT,n); + if (err) return (err); + for (i = 0; i < *n; i++) + { regions[i].regionindex = i; err = ioctl (fd,MEMGETREGIONINFO,®ions[i]); if (err) return (err); - } - return (0); + } + return (0); } int erase_flash (int fd,u_int32_t offset,u_int32_t bytes) { - int err; - struct erase_info_user erase; - erase.start = offset; - erase.length = bytes; - err = memerase (fd,&erase); - if (err < 0) - { + int err; + struct erase_info_user erase; + erase.start = offset; + erase.length = bytes; + err = memerase (fd,&erase); + if (err < 0) + { perror ("MEMERASE"); return (1); - } - fprintf (stderr,"Erased %d bytes from address 0x%.8x in flash\n",bytes,offset); - return (0); + } + fprintf (stderr,"Erased %d bytes from address 0x%.8x in flash\n",bytes,offset); + return (0); } void printsize (u_int32_t x) { - int i; - static const char *flags = "KMGT"; - printf ("%u ",x); - for (i = 0; x >= 1024 && flags[i] != '\0'; i++) x /= 1024; - i--; - if (i >= 0) printf ("(%u%c)",x,flags[i]); + int i; + static const char *flags = "KMGT"; + printf ("%u ",x); + for (i = 0; x >= 1024 && flags[i] != '\0'; i++) x /= 1024; + i--; + if (i >= 0) printf ("(%u%c)",x,flags[i]); } int flash_to_file (int fd,u_int32_t offset,size_t len,const char *filename) { - u_int8_t *buf = NULL; - int outfd,err; - int size = len * sizeof (u_int8_t); - int n = len; + u_int8_t *buf = NULL; + int outfd,err; + int size = len * sizeof (u_int8_t); + int n = len; - if (offset != lseek (fd,offset,SEEK_SET)) - { + if (offset != lseek (fd,offset,SEEK_SET)) + { perror ("lseek()"); goto err0; - } - outfd = creat (filename,O_WRONLY); - if (outfd < 0) - { + } + outfd = creat (filename,O_WRONLY); + if (outfd < 0) + { perror ("creat()"); goto err1; - } + } retry: - if ((buf = (u_int8_t *) malloc (size)) == NULL) - { + if ((buf = (u_int8_t *) malloc (size)) == NULL) + { #define BUF_SIZE (64 * 1024 * sizeof (u_int8_t)) fprintf (stderr, "%s: malloc(%#x)\n", __FUNCTION__, size); if (size != BUF_SIZE) { @@ -132,68 +131,68 @@ retry: } perror ("malloc()"); goto err0; - } - do { - if (n <= size) - size = n; - err = read (fd,buf,size); - if (err < 0) - { - fprintf (stderr, "%s: read, size %#x, n %#x\n", __FUNCTION__, size, n); - perror ("read()"); - goto err2; - } - err = write (outfd,buf,size); - if (err < 0) - { - fprintf (stderr, "%s: write, size %#x, n %#x\n", __FUNCTION__, size, n); - perror ("write()"); - goto err2; - } - if (err != size) - { - fprintf (stderr,"Couldn't copy entire buffer to %s. (%d/%d bytes copied)\n",filename,err,size); - goto err2; - } - n -= size; - } while (n > 0); - - if (buf != NULL) - free (buf); - close (outfd); - printf ("Copied %d bytes from address 0x%.8x in flash to %s\n",len,offset,filename); - return (0); - - err2: - close (outfd); - err1: - if (buf != NULL) - free (buf); - err0: - return (1); + } + do { + if (n <= size) + size = n; + err = read (fd,buf,size); + if (err < 0) + { + fprintf (stderr, "%s: read, size %#x, n %#x\n", __FUNCTION__, size, n); + perror ("read()"); + goto err2; + } + err = write (outfd,buf,size); + if (err < 0) + { + fprintf (stderr, "%s: write, size %#x, n %#x\n", __FUNCTION__, size, n); + perror ("write()"); + goto err2; + } + if (err != size) + { + fprintf (stderr,"Couldn't copy entire buffer to %s. (%d/%d bytes copied)\n",filename,err,size); + goto err2; + } + n -= size; + } while (n > 0); + + if (buf != NULL) + free (buf); + close (outfd); + printf ("Copied %d bytes from address 0x%.8x in flash to %s\n",len,offset,filename); + return (0); + +err2: + close (outfd); +err1: + if (buf != NULL) + free (buf); +err0: + return (1); } int file_to_flash (int fd,u_int32_t offset,u_int32_t len,const char *filename) { - u_int8_t *buf = NULL; - FILE *fp; - int err; - int size = len * sizeof (u_int8_t); - int n = len; - - if (offset != lseek (fd,offset,SEEK_SET)) - { + u_int8_t *buf = NULL; + FILE *fp; + int err; + int size = len * sizeof (u_int8_t); + int n = len; + + if (offset != lseek (fd,offset,SEEK_SET)) + { perror ("lseek()"); return (1); - } - if ((fp = fopen (filename,"r")) == NULL) - { + } + if ((fp = fopen (filename,"r")) == NULL) + { perror ("fopen()"); return (1); - } + } retry: - if ((buf = (u_int8_t *) malloc (size)) == NULL) - { + if ((buf = (u_int8_t *) malloc (size)) == NULL) + { fprintf (stderr, "%s: malloc(%#x) failed\n", __FUNCTION__, size); if (size != BUF_SIZE) { size = BUF_SIZE; @@ -203,147 +202,147 @@ retry: perror ("malloc()"); fclose (fp); return (1); - } - do { - if (n <= size) - size = n; - if (fread (buf,size,1,fp) != 1 || ferror (fp)) - { - fprintf (stderr, "%s: fread, size %#x, n %#x\n", __FUNCTION__, size, n); - perror ("fread()"); - free (buf); - fclose (fp); - return (1); - } - err = write (fd,buf,size); - if (err < 0) - { - fprintf (stderr, "%s: write, size %#x, n %#x\n", __FUNCTION__, size, n); - perror ("write()"); + } + do { + if (n <= size) + size = n; + if (fread (buf,size,1,fp) != 1 || ferror (fp)) + { + fprintf (stderr, "%s: fread, size %#x, n %#x\n", __FUNCTION__, size, n); + perror ("fread()"); + free (buf); + fclose (fp); + return (1); + } + err = write (fd,buf,size); + if (err < 0) + { + fprintf (stderr, "%s: write, size %#x, n %#x\n", __FUNCTION__, size, n); + perror ("write()"); + free (buf); + fclose (fp); + return (1); + } + n -= size; + } while (n > 0); + + if (buf != NULL) free (buf); - fclose (fp); - return (1); - } - n -= size; -} while (n > 0); - - if (buf != NULL) - free (buf); - fclose (fp); - printf ("Copied %d bytes from %s to address 0x%.8x in flash\n",len,filename,offset); - return (0); + fclose (fp); + printf ("Copied %d bytes from %s to address 0x%.8x in flash\n",len,filename,offset); + return (0); } int showinfo (int fd) { - int i,err,n; - struct mtd_info_user mtd; - static struct region_info_user region[1024]; + int i,err,n; + struct mtd_info_user mtd; + static struct region_info_user region[1024]; - err = getmeminfo (fd,&mtd); - if (err < 0) - { + err = getmeminfo (fd,&mtd); + if (err < 0) + { perror ("MEMGETINFO"); return (1); - } + } - err = getregions (fd,region,&n); - if (err < 0) - { + err = getregions (fd,region,&n); + if (err < 0) + { perror ("MEMGETREGIONCOUNT"); return (1); - } - - printf ("mtd.type = "); - switch (mtd.type) - { - case MTD_ABSENT: - printf ("MTD_ABSENT"); - break; - case MTD_NORFLASH: - printf ("MTD_NORFLASH"); - break; - case MTD_NANDFLASH: - printf ("MTD_NANDFLASH"); - break; - case MTD_GENERIC_TYPE: - printf ("MTD_GENERIC_TYPE"); - break; - default: - printf ("(unknown type - new MTD API maybe?)"); - } - - printf ("\nmtd.flags = "); - if (mtd.flags == MTD_CAP_ROM) - printf ("MTD_CAP_ROM"); - else if (mtd.flags == MTD_CAP_RAM) - printf ("MTD_CAP_RAM"); - else if (mtd.flags == MTD_CAP_NORFLASH) - printf ("MTD_CAP_NORFLASH"); - else if (mtd.flags == MTD_CAP_NANDFLASH) - printf ("MTD_CAP_NANDFLASH"); - else if (mtd.flags == MTD_WRITEABLE) - printf ("MTD_WRITEABLE"); - else - { + } + + printf ("mtd.type = "); + switch (mtd.type) + { + case MTD_ABSENT: + printf ("MTD_ABSENT"); + break; + case MTD_NORFLASH: + printf ("MTD_NORFLASH"); + break; + case MTD_NANDFLASH: + printf ("MTD_NANDFLASH"); + break; + case MTD_GENERIC_TYPE: + printf ("MTD_GENERIC_TYPE"); + break; + default: + printf ("(unknown type - new MTD API maybe?)"); + } + + printf ("\nmtd.flags = "); + if (mtd.flags == MTD_CAP_ROM) + printf ("MTD_CAP_ROM"); + else if (mtd.flags == MTD_CAP_RAM) + printf ("MTD_CAP_RAM"); + else if (mtd.flags == MTD_CAP_NORFLASH) + printf ("MTD_CAP_NORFLASH"); + else if (mtd.flags == MTD_CAP_NANDFLASH) + printf ("MTD_CAP_NANDFLASH"); + else if (mtd.flags == MTD_WRITEABLE) + printf ("MTD_WRITEABLE"); + else + { int first = 1; static struct - { - const char *name; - int value; - } flags[] = - { - { "MTD_WRITEABLE", MTD_WRITEABLE }, - { "MTD_BIT_WRITEABLE", MTD_BIT_WRITEABLE }, - { NULL, -1 } - }; + { + const char *name; + int value; + } flags[] = + { + { "MTD_WRITEABLE", MTD_WRITEABLE }, + { "MTD_BIT_WRITEABLE", MTD_BIT_WRITEABLE }, + { NULL, -1 } + }; for (i = 0; flags[i].name != NULL; i++) - if (mtd.flags & flags[i].value) + if (mtd.flags & flags[i].value) { - if (first) - { + if (first) + { printf (flags[i].name); first = 0; - } - else printf (" | %s",flags[i].name); + } + else printf (" | %s",flags[i].name); } - } - - printf ("\nmtd.size = "); - printsize (mtd.size); - - printf ("\nmtd.erasesize = "); - printsize (mtd.erasesize); - - printf ("\nmtd.writesize = "); - printsize (mtd.writesize); - - printf ("\nmtd.oobsize = "); - printsize (mtd.oobsize); - - printf ("\nmtd.ecctype = "); - switch (mtd.ecctype) - { - case MTD_ECC_NONE: - printf ("MTD_ECC_NONE"); - break; - case MTD_ECC_RS_DiskOnChip: - printf ("MTD_ECC_RS_DiskOnChip"); - break; - case MTD_ECC_SW: - printf ("MTD_ECC_SW"); - break; - default: - printf ("(unknown ECC type - new MTD API maybe?)"); - } - - printf ("\n" - "regions = %d\n" - "\n", - n); - - for (i = 0; i < n; i++) - { + } + + printf ("\nmtd.size = "); + printsize (mtd.size); + + printf ("\nmtd.erasesize = "); + printsize (mtd.erasesize); + + printf ("\nmtd.writesize = "); + printsize (mtd.writesize); + + printf ("\nmtd.oobsize = "); + printsize (mtd.oobsize); + + printf ("\nmtd.ecctype = "); + switch (mtd.ecctype) + { + case MTD_ECC_NONE: + printf ("MTD_ECC_NONE"); + break; + case MTD_ECC_RS_DiskOnChip: + printf ("MTD_ECC_RS_DiskOnChip"); + break; + case MTD_ECC_SW: + printf ("MTD_ECC_SW"); + break; + default: + printf ("(unknown ECC type - new MTD API maybe?)"); + } + + printf ("\n" + "regions = %d\n" + "\n", + n); + + for (i = 0; i < n; i++) + { printf ("region[%d].offset = 0x%.8x\n" "region[%d].erasesize = ", i,region[i].offset,i); @@ -352,13 +351,13 @@ int showinfo (int fd) "region[%d].regionindex = %d\n", i,region[i].numblocks, i,region[i].regionindex); - } - return (0); + } + return (0); } void showusage (const char *progname) { - fprintf (stderr, + fprintf (stderr, "usage: %s info \n" " %s read \n" " %s write \n" @@ -367,7 +366,7 @@ void showusage (const char *progname) progname, progname, progname); - exit (1); + exit (1); } #define OPT_INFO 1 @@ -377,51 +376,51 @@ void showusage (const char *progname) int main (int argc,char *argv[]) { - const char *progname; - int err = 0,fd,option = OPT_INFO; - int open_flag; - (progname = strrchr (argv[0],'/')) ? progname++ : (progname = argv[0]); - - /* parse command-line options */ - if (argc == 3 && !strcmp (argv[1],"info")) - option = OPT_INFO; - else if (argc == 6 && !strcmp (argv[1],"read")) - option = OPT_READ; - else if (argc == 6 && !strcmp (argv[1],"write")) - option = OPT_WRITE; - else if (argc == 5 && !strcmp (argv[1],"erase")) - option = OPT_ERASE; - else - showusage (progname); - - /* open device */ - open_flag = (option==OPT_INFO || option==OPT_READ) ? O_RDONLY : O_RDWR; - if ((fd = open (argv[2],O_SYNC | open_flag)) < 0) - { + const char *progname; + int err = 0,fd,option = OPT_INFO; + int open_flag; + (progname = strrchr (argv[0],'/')) ? progname++ : (progname = argv[0]); + + /* parse command-line options */ + if (argc == 3 && !strcmp (argv[1],"info")) + option = OPT_INFO; + else if (argc == 6 && !strcmp (argv[1],"read")) + option = OPT_READ; + else if (argc == 6 && !strcmp (argv[1],"write")) + option = OPT_WRITE; + else if (argc == 5 && !strcmp (argv[1],"erase")) + option = OPT_ERASE; + else + showusage (progname); + + /* open device */ + open_flag = (option==OPT_INFO || option==OPT_READ) ? O_RDONLY : O_RDWR; + if ((fd = open (argv[2],O_SYNC | open_flag)) < 0) + { perror ("open()"); exit (1); - } - - switch (option) - { - case OPT_INFO: - showinfo (fd); - break; - case OPT_READ: - err = flash_to_file (fd,strtol (argv[3],NULL,0),strtol (argv[4],NULL,0),argv[5]); - break; - case OPT_WRITE: - err = file_to_flash (fd,strtol (argv[3],NULL,0),strtol (argv[4],NULL,0),argv[5]); - break; - case OPT_ERASE: - err = erase_flash (fd,strtol (argv[3],NULL,0),strtol (argv[4],NULL,0)); - break; - } - - /* close device */ - if (close (fd) < 0) - perror ("close()"); - - exit (err); + } + + switch (option) + { + case OPT_INFO: + showinfo (fd); + break; + case OPT_READ: + err = flash_to_file (fd,strtol (argv[3],NULL,0),strtol (argv[4],NULL,0),argv[5]); + break; + case OPT_WRITE: + err = file_to_flash (fd,strtol (argv[3],NULL,0),strtol (argv[4],NULL,0),argv[5]); + break; + case OPT_ERASE: + err = erase_flash (fd,strtol (argv[3],NULL,0),strtol (argv[4],NULL,0)); + break; + } + + /* close device */ + if (close (fd) < 0) + perror ("close()"); + + exit (err); } -- cgit v1.2.3