mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-10 04:26:19 -04:00
[PATCH 5_9] Whitespace fixup on common_cmd_ace.c (using Lindent)
This patch is in preparation of additional changes to the sysace driver. May as well take this opportunity to fixup the inconsistent whitespace since this file is about to undergo major changes anyway. There are zero functional changes in this patch. It only cleans up the the whitespace. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Grant Likely
Stefan Roese
parent
80ba981d94
commit
984618f3e7
@ -17,7 +17,6 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
#ident "$Id:$"
|
||||
|
||||
/*
|
||||
* The Xilinx SystemACE chip support is activated by defining
|
||||
@ -39,11 +38,11 @@
|
||||
* CFGSTART : 0
|
||||
*/
|
||||
|
||||
# include <common.h>
|
||||
# include <command.h>
|
||||
# include <systemace.h>
|
||||
# include <part.h>
|
||||
# include <asm/io.h>
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <systemace.h>
|
||||
#include <part.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifdef CONFIG_SYSTEMACE
|
||||
|
||||
@ -60,15 +59,15 @@ static unsigned ace_readw(unsigned offset)
|
||||
u16 temp;
|
||||
|
||||
#if !defined(__BIG_ENDIAN)
|
||||
temp =((u16)readb(CFG_SYSTEMACE_BASE+offset) << 8);
|
||||
temp |= (u16)readb(CFG_SYSTEMACE_BASE+offset+1);
|
||||
temp = ((u16) readb(CFG_SYSTEMACE_BASE + offset) << 8);
|
||||
temp |= (u16) readb(CFG_SYSTEMACE_BASE + offset + 1);
|
||||
#else
|
||||
temp = (u16)readb(CFG_SYSTEMACE_BASE+offset);
|
||||
temp |=((u16)readb(CFG_SYSTEMACE_BASE+offset+1) << 8);
|
||||
temp = (u16) readb(CFG_SYSTEMACE_BASE + offset);
|
||||
temp |= ((u16) readb(CFG_SYSTEMACE_BASE + offset + 1) << 8);
|
||||
#endif
|
||||
return temp;
|
||||
#else
|
||||
return readw(CFG_SYSTEMACE_BASE+offset);
|
||||
return readw(CFG_SYSTEMACE_BASE + offset);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -76,37 +75,36 @@ static void ace_writew(unsigned val, unsigned offset)
|
||||
{
|
||||
#if (CFG_SYSTEMACE_WIDTH == 8)
|
||||
#if !defined(__BIG_ENDIAN)
|
||||
writeb((u8)(val>>8), CFG_SYSTEMACE_BASE+offset);
|
||||
writeb((u8)val, CFG_SYSTEMACE_BASE+offset+1);
|
||||
writeb((u8) (val >> 8), CFG_SYSTEMACE_BASE + offset);
|
||||
writeb((u8) val, CFG_SYSTEMACE_BASE + offset + 1);
|
||||
#else
|
||||
writeb((u8)val, CFG_SYSTEMACE_BASE+offset);
|
||||
writeb((u8)(val>>8), CFG_SYSTEMACE_BASE+offset+1);
|
||||
writeb((u8) val, CFG_SYSTEMACE_BASE + offset);
|
||||
writeb((u8) (val >> 8), CFG_SYSTEMACE_BASE + offset + 1);
|
||||
#endif
|
||||
#else
|
||||
writew(val, CFG_SYSTEMACE_BASE+offset);
|
||||
writew(val, CFG_SYSTEMACE_BASE + offset);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* */
|
||||
|
||||
static unsigned long systemace_read(int dev,
|
||||
unsigned long start,
|
||||
static unsigned long systemace_read(int dev, unsigned long start,
|
||||
unsigned long blkcnt,
|
||||
unsigned long *buffer);
|
||||
|
||||
static block_dev_desc_t systemace_dev = {0};
|
||||
static block_dev_desc_t systemace_dev = { 0 };
|
||||
|
||||
static int get_cf_lock(void)
|
||||
{
|
||||
int retry = 10;
|
||||
|
||||
/* CONTROLREG = LOCKREG */
|
||||
unsigned val=ace_readw(0x18);
|
||||
val|=0x0002;
|
||||
ace_writew((val&0xffff), 0x18);
|
||||
unsigned val = ace_readw(0x18);
|
||||
val |= 0x0002;
|
||||
ace_writew((val & 0xffff), 0x18);
|
||||
|
||||
/* Wait for MPULOCK in STATUSREG[15:0] */
|
||||
while (! (ace_readw(0x04) & 0x0002)) {
|
||||
while (!(ace_readw(0x04) & 0x0002)) {
|
||||
|
||||
if (retry < 0)
|
||||
return -1;
|
||||
@ -120,12 +118,12 @@ static int get_cf_lock(void)
|
||||
|
||||
static void release_cf_lock(void)
|
||||
{
|
||||
unsigned val=ace_readw(0x18);
|
||||
val&=~(0x0002);
|
||||
ace_writew((val&0xffff), 0x18);
|
||||
unsigned val = ace_readw(0x18);
|
||||
val &= ~(0x0002);
|
||||
ace_writew((val & 0xffff), 0x18);
|
||||
}
|
||||
|
||||
block_dev_desc_t * systemace_get_dev(int dev)
|
||||
block_dev_desc_t *systemace_get_dev(int dev)
|
||||
{
|
||||
/* The first time through this, the systemace_dev object is
|
||||
not yet initialized. In that case, fill it in. */
|
||||
@ -150,29 +148,27 @@ block_dev_desc_t * systemace_get_dev(int dev)
|
||||
* the dev_desc) to read blocks of data. The return value is the
|
||||
* number of blocks read. A zero return indicates an error.
|
||||
*/
|
||||
static unsigned long systemace_read(int dev,
|
||||
unsigned long start,
|
||||
unsigned long blkcnt,
|
||||
unsigned long *buffer)
|
||||
static unsigned long systemace_read(int dev, unsigned long start,
|
||||
unsigned long blkcnt, unsigned long *buffer)
|
||||
{
|
||||
int retry;
|
||||
unsigned blk_countdown;
|
||||
unsigned char*dp = (unsigned char*)buffer;
|
||||
unsigned char *dp = (unsigned char *)buffer;
|
||||
unsigned val;
|
||||
|
||||
if (get_cf_lock() < 0) {
|
||||
unsigned status = ace_readw(0x04);
|
||||
|
||||
/* If CFDETECT is false, card is missing. */
|
||||
if (! (status&0x0010)) {
|
||||
if (!(status & 0x0010)) {
|
||||
printf("** CompactFlash card not present. **\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
printf("**** ACE locked away from me (STATUSREG=%04x)\n", status);
|
||||
printf("**** ACE locked away from me (STATUSREG=%04x)\n",
|
||||
status);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_SYSTEMACE
|
||||
printf("... systemace read %lu sectors at %lu\n", blkcnt, start);
|
||||
#endif
|
||||
@ -182,7 +178,7 @@ static unsigned long systemace_read(int dev,
|
||||
val = ace_readw(0x04);
|
||||
|
||||
/* If CFDETECT is false, card is missing. */
|
||||
if (! (val & 0x0010)) {
|
||||
if (!(val & 0x0010)) {
|
||||
printf("**** ACE CompactFlash not found.\n");
|
||||
release_cf_lock();
|
||||
return 0;
|
||||
@ -210,25 +206,26 @@ static unsigned long systemace_read(int dev,
|
||||
while (blk_countdown > 0) {
|
||||
unsigned trans = blk_countdown;
|
||||
|
||||
if (trans > 256) trans = 256;
|
||||
if (trans > 256)
|
||||
trans = 256;
|
||||
|
||||
#ifdef DEBUG_SYSTEMACE
|
||||
printf("... transfer %lu sector in a chunk\n", trans);
|
||||
#endif
|
||||
/* Write LBA block address */
|
||||
ace_writew((start>> 0) & 0xffff, 0x10);
|
||||
ace_writew((start>>16) & 0x00ff, 0x12);
|
||||
ace_writew((start >> 0) & 0xffff, 0x10);
|
||||
ace_writew((start >> 16) & 0x00ff, 0x12);
|
||||
|
||||
/* NOTE: in the Write Sector count below, a count of 0
|
||||
causes a transfer of 256, so &0xff gives the right
|
||||
value for whatever transfer count we want. */
|
||||
|
||||
/* Write sector count | ReadMemCardData. */
|
||||
ace_writew((trans&0xff) | 0x0300, 0x14);
|
||||
ace_writew((trans & 0xff) | 0x0300, 0x14);
|
||||
|
||||
/* Reset the configruation controller */
|
||||
val = ace_readw(0x18);
|
||||
val|=0x0080;
|
||||
val |= 0x0080;
|
||||
ace_writew(val, 0x18);
|
||||
|
||||
retry = trans * 16;
|
||||
@ -236,15 +233,15 @@ static unsigned long systemace_read(int dev,
|
||||
int idx;
|
||||
|
||||
/* Wait for buffer to become ready. */
|
||||
while (! (ace_readw(0x04) & 0x0020)) {
|
||||
while (!(ace_readw(0x04) & 0x0020)) {
|
||||
udelay(100);
|
||||
}
|
||||
|
||||
/* Read 16 words of 2bytes from the sector buffer. */
|
||||
for (idx = 0 ; idx < 16 ; idx += 1) {
|
||||
for (idx = 0; idx < 16; idx += 1) {
|
||||
unsigned short val = ace_readw(0x40);
|
||||
*dp++ = val & 0xff;
|
||||
*dp++ = (val>>8) & 0xff;
|
||||
*dp++ = (val >> 8) & 0xff;
|
||||
}
|
||||
|
||||
retry -= 1;
|
||||
@ -252,7 +249,7 @@ static unsigned long systemace_read(int dev,
|
||||
|
||||
/* Clear the configruation controller reset */
|
||||
val = ace_readw(0x18);
|
||||
val&=~0x0080;
|
||||
val &= ~0x0080;
|
||||
ace_writew(val, 0x18);
|
||||
|
||||
/* Count the blocks we transfer this time. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user