diff options
| author | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2003-06-27 21:31:46 +0000 | 
| commit | 8bde7f776c77b343aca29b8c7b58464d915ac245 (patch) | |
| tree | 20f1fd99975215e7c658454a15cdb4ed4694e2d4 /board/dnp1110/flash.c | |
| parent | 993cad9364c6b87ae429d1ed1130d8153f6f027e (diff) | |
| download | olio-uboot-2014.01-8bde7f776c77b343aca29b8c7b58464d915ac245.tar.xz olio-uboot-2014.01-8bde7f776c77b343aca29b8c7b58464d915ac245.zip | |
* Code cleanup:LABEL_2003_06_27_2340
  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)
* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)
Diffstat (limited to 'board/dnp1110/flash.c')
| -rw-r--r-- | board/dnp1110/flash.c | 43 | 
1 files changed, 21 insertions, 22 deletions
| diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c index f4a8b999c..4416393fe 100644 --- a/board/dnp1110/flash.c +++ b/board/dnp1110/flash.c @@ -67,16 +67,16 @@ unsigned long flash_init (void)      for (i = 0; i < CFG_MAX_FLASH_BANKS; i++)      { -        switch (i) -        { -           case 0: -            flash_get_size((FPW *)PHYS_FLASH_1, &flash_info[i]); -	         flash_get_offsets(PHYS_FLASH_1, &flash_info[i]); -                break; -           default: -	        panic("configured to many flash banks!\n"); -                break; -        } +	switch (i) +	{ +	   case 0: +	    flash_get_size((FPW *)PHYS_FLASH_1, &flash_info[i]); +		 flash_get_offsets(PHYS_FLASH_1, &flash_info[i]); +		break; +	   default: +		panic("configured to many flash banks!\n"); +		break; +	}  	size += flash_info[i].size;      } @@ -122,7 +122,7 @@ void flash_print_info  (flash_info_t *info)  	if (info->flash_id == FLASH_UNKNOWN) {  		printf ("missing or unknown FLASH type\n");  		return; -        } +	}  	switch (info->flash_id & FLASH_VENDMASK) {  		case FLASH_MAN_INTEL:	printf ("INTEL ");		break; @@ -133,21 +133,21 @@ void flash_print_info  (flash_info_t *info)     case FLASH_28F128J3A:  				printf ("28F128J3A\n"); break;  	default:		printf ("Unknown Chip Type\n"); break; -        } +	}  	printf ("  Size: %ld MB in %d Sectors\n", -	        info->size >> 20, info->sector_count); +		info->size >> 20, info->sector_count);  	printf ("  Sector Start Addresses:");  	for (i=0; i<info->sector_count; ++i) { -	        if ((i % 5) == 0) -	        printf ("\n   "); +		if ((i % 5) == 0) +		printf ("\n   ");  		printf (" %08lX%s",  			info->start[i],  			info->protect[i] ? " (RO)" : "     "  		); -        } -        printf ("\n"); +	} +	printf ("\n");  	return;  } @@ -164,7 +164,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)     mb();  	value = addr[0]; -	 +     switch (value) {     case (FPW)INTEL_MANUFACT: @@ -280,8 +280,8 @@ int	flash_erase (flash_info_t *info, int s_first, int s_last)  			*addr = (FPW)0x00FF00FF; /* resest to read mode          */  			printf (" done\n"); -        } -        } +	} +	}  	return rcode;  } @@ -350,7 +350,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)  		cnt -= port_width;  		if (count++ > 0x800)  		{ -         spin_wheel(); +	 spin_wheel();  			count = 0;  		}      } @@ -422,4 +422,3 @@ spin_wheel(void)     printf("\010%c", w[p]);     (++p == 3) ? (p = 0) : 0;  } - |