board/w7o/fpga.c: make (mostly) checkpatch clean

Just reformated the code.  No attempts were made to clean up warnings
about "Use of volatile is usually wrong" or "externs should be avoided".

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-12-07 12:19:23 +00:00
parent fb82fd7a32
commit 100a4dcefd
1 changed files with 292 additions and 285 deletions

View File

@ -31,349 +31,356 @@
static void static void
fpga_img_write(unsigned long *src, unsigned long len, unsigned short *daddr) fpga_img_write(unsigned long *src, unsigned long len, unsigned short *daddr)
{ {
unsigned long i; unsigned long i;
volatile unsigned long val; volatile unsigned long val;
volatile unsigned short *dest = daddr; /* volatile-bypass optimizer */ volatile unsigned short *dest = daddr; /* volatile-bypass optimizer */
for (i = 0; i < len; i++, src++) { for (i = 0; i < len; i++, src++) {
val = *src; val = *src;
*dest = (unsigned short)((val & 0xff000000L) >> 16); *dest = (unsigned short) ((val & 0xff000000L) >> 16);
*dest = (unsigned short)((val & 0x00ff0000L) >> 8); *dest = (unsigned short) ((val & 0x00ff0000L) >> 8);
*dest = (unsigned short)(val & 0x0000ff00L); *dest = (unsigned short) (val & 0x0000ff00L);
*dest = (unsigned short)((val & 0x000000ffL) << 8); *dest = (unsigned short) ((val & 0x000000ffL) << 8);
} }
/* Terminate programming with 4 C clocks */ /* Terminate programming with 4 C clocks */
dest = daddr; dest = daddr;
val = *(unsigned short *)dest; val = *(unsigned short *) dest;
val = *(unsigned short *)dest; val = *(unsigned short *) dest;
val = *(unsigned short *)dest; val = *(unsigned short *) dest;
val = *(unsigned short *)dest; val = *(unsigned short *) dest;
} }
int int
fpgaDownload(unsigned char *saddr, fpgaDownload(unsigned char *saddr, unsigned long size, unsigned short *daddr)
unsigned long size,
unsigned short *daddr)
{ {
int i; /* index, intr disable flag */ int i; /* index, intr disable flag */
int start; /* timer */ int start; /* timer */
unsigned long greg, grego; /* GPIO & output register */ unsigned long greg, grego; /* GPIO & output register */
unsigned long length; /* image size in words */ unsigned long length; /* image size in words */
unsigned long *source; /* image source addr */ unsigned long *source; /* image source addr */
unsigned short *dest; /* destination FPGA addr */ unsigned short *dest; /* destination FPGA addr */
volatile unsigned short *ndest; /* temp dest FPGA addr */ volatile unsigned short *ndest; /* temp dest FPGA addr */
volatile unsigned short val; /* temp val */ volatile unsigned short val; /* temp val */
unsigned long cnfg = GPIO_XCV_CNFG; /* FPGA CNFG */ unsigned long cnfg = GPIO_XCV_CNFG; /* FPGA CNFG */
unsigned long eirq = GPIO_XCV_IRQ; unsigned long eirq = GPIO_XCV_IRQ;
int retval = -1; /* Function return value */ int retval = -1; /* Function return value */
/* Setup some basic values */ /* Setup some basic values */
length = (size / 4) + 1; /* size in words, rounding UP length = (size / 4) + 1; /* size in words, rounding UP
is OK */ is OK */
source = (unsigned long *)saddr; source = (unsigned long *) saddr;
dest = (unsigned short *)daddr; dest = (unsigned short *) daddr;
/* Get DCR output register */ /* Get DCR output register */
grego = in32(PPC405GP_GPIO0_OR); grego = in32(PPC405GP_GPIO0_OR);
/* Reset FPGA */ /* Reset FPGA */
grego &= ~GPIO_XCV_PROG; /* PROG line low */ grego &= ~GPIO_XCV_PROG; /* PROG line low */
out32(PPC405GP_GPIO0_OR, grego);
/* Setup timeout timer */
start = get_timer(0);
/* Wait for FPGA init line */
while(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT) { /* Wait INIT line low */
/* Check for timeout - 100us max, so use 3ms */
if (get_timer(start) > 3) {
printf(" failed to start init.\n");
log_warn(ERR_XINIT0); /* Don't halt */
/* Reset line stays low */
goto done; /* I like gotos... */
}
}
/* Unreset FPGA */
grego |= GPIO_XCV_PROG; /* PROG line high */
out32(PPC405GP_GPIO0_OR, grego);
/* Wait for FPGA end of init period . */
while(!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT)) { /* Wait for INIT hi */
/* Check for timeout */
if (get_timer(start) > 3) {
printf(" failed to exit init.\n");
log_warn(ERR_XINIT1);
/* Reset FPGA */
grego &= ~GPIO_XCV_PROG; /* PROG line low */
out32(PPC405GP_GPIO0_OR, grego);
goto done;
}
}
/* Now program FPGA ... */
ndest = dest;
for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
/* Toggle IRQ/GPIO */
greg = mfdcr(CPC0_CR0); /* get chip ctrl register */
greg |= eirq; /* toggle irq/gpio */
mtdcr(CPC0_CR0, greg); /* ... just do it */
/* turn on open drain for CNFG */
greg = in32(PPC405GP_GPIO0_ODR); /* get open drain register */
greg |= cnfg; /* CNFG open drain */
out32(PPC405GP_GPIO0_ODR, greg); /* .. just do it */
/* Turn output enable on for CNFG */
greg = in32(PPC405GP_GPIO0_TCR); /* get tristate register */
greg |= cnfg; /* CNFG tristate inactive */
out32(PPC405GP_GPIO0_TCR, greg); /* ... just do it */
/* Setup FPGA for programming */
grego &= ~cnfg; /* CONFIG line low */
out32(PPC405GP_GPIO0_OR, grego); out32(PPC405GP_GPIO0_OR, grego);
/* /* Setup timeout timer */
* Program the FPGA start = get_timer(0);
*/
printf("\n destination: 0x%lx ", (unsigned long)ndest);
fpga_img_write(source, length, (unsigned short *)ndest); /* Wait for FPGA init line to go low */
while (in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT) {
/* Check for timeout - 100us max, so use 3ms */
if (get_timer(start) > 3) {
printf(" failed to start init.\n");
log_warn(ERR_XINIT0); /* Don't halt */
/* Done programming */ /* Reset line stays low */
grego |= cnfg; /* CONFIG line high */ goto done; /* I like gotos... */
}
}
/* Unreset FPGA */
grego |= GPIO_XCV_PROG; /* PROG line high */
out32(PPC405GP_GPIO0_OR, grego); out32(PPC405GP_GPIO0_OR, grego);
/* Turn output enable OFF for CNFG */ /* Wait for FPGA end of init period = init line go hi */
greg = in32(PPC405GP_GPIO0_TCR); /* get tristate register */ while (!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT)) {
greg &= ~cnfg; /* CNFG tristate inactive */
out32(PPC405GP_GPIO0_TCR, greg); /* ... just do it */
/* Toggle IRQ/GPIO */ /* Check for timeout */
greg = mfdcr(CPC0_CR0); /* get chip ctrl register */ if (get_timer(start) > 3) {
greg &= ~eirq; /* toggle irq/gpio */ printf(" failed to exit init.\n");
mtdcr(CPC0_CR0, greg); /* ... just do it */ log_warn(ERR_XINIT1);
ndest = (unsigned short *)((char *)ndest + 0x00100000L); /* XXX - Next FPGA addr */ /* Reset FPGA */
cnfg >>= 1; /* XXX - Next */ grego &= ~GPIO_XCV_PROG; /* PROG line low */
eirq >>= 1; out32(PPC405GP_GPIO0_OR, grego);
}
/* Terminate programming with 4 C clocks */ goto done;
ndest = dest; }
for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
val = *ndest;
val = *ndest;
val = *ndest;
val = *ndest;
ndest = (unsigned short *)((char *)ndest + 0x00100000L);
}
/* Setup timer */
start = get_timer(0);
/* Wait for FPGA end of programming period . */
while(!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_DONE)) { /* Test DONE low */
/* Check for timeout */
if (get_timer(start) > 3) {
printf(" done failed to come high.\n");
log_warn(ERR_XDONE1);
/* Reset FPGA */
grego &= ~GPIO_XCV_PROG; /* PROG line low */
out32(PPC405GP_GPIO0_OR, grego);
goto done;
} }
}
printf("\n FPGA load succeeded\n"); /* Now program FPGA ... */
retval = 0; /* Program OK */ ndest = dest;
for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
/* Toggle IRQ/GPIO */
greg = mfdcr(CPC0_CR0); /* get chip ctrl register */
greg |= eirq; /* toggle irq/gpio */
mtdcr(CPC0_CR0, greg); /* ... just do it */
/* turn on open drain for CNFG */
greg = in32(PPC405GP_GPIO0_ODR); /* get open drain register */
greg |= cnfg; /* CNFG open drain */
out32(PPC405GP_GPIO0_ODR, greg); /* .. just do it */
/* Turn output enable on for CNFG */
greg = in32(PPC405GP_GPIO0_TCR); /* get tristate register */
greg |= cnfg; /* CNFG tristate inactive */
out32(PPC405GP_GPIO0_TCR, greg); /* ... just do it */
/* Setup FPGA for programming */
grego &= ~cnfg; /* CONFIG line low */
out32(PPC405GP_GPIO0_OR, grego);
/*
* Program the FPGA
*/
printf("\n destination: 0x%lx ", (unsigned long) ndest);
fpga_img_write(source, length, (unsigned short *) ndest);
/* Done programming */
grego |= cnfg; /* CONFIG line high */
out32(PPC405GP_GPIO0_OR, grego);
/* Turn output enable OFF for CNFG */
greg = in32(PPC405GP_GPIO0_TCR); /* get tristate register */
greg &= ~cnfg; /* CNFG tristate inactive */
out32(PPC405GP_GPIO0_TCR, greg); /* ... just do it */
/* Toggle IRQ/GPIO */
greg = mfdcr(CPC0_CR0); /* get chip ctrl register */
greg &= ~eirq; /* toggle irq/gpio */
mtdcr(CPC0_CR0, greg); /* ... just do it */
/* XXX - Next FPGA addr */
ndest = (unsigned short *) ((char *) ndest + 0x00100000L);
cnfg >>= 1; /* XXX - Next */
eirq >>= 1;
}
/* Terminate programming with 4 C clocks */
ndest = dest;
for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
val = *ndest;
val = *ndest;
val = *ndest;
val = *ndest;
ndest = (unsigned short *) ((char *) ndest + 0x00100000L);
}
/* Setup timer */
start = get_timer(0);
/* Wait for FPGA end of programming period = Test DONE low */
while (!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_DONE)) {
/* Check for timeout */
if (get_timer(start) > 3) {
printf(" done failed to come high.\n");
log_warn(ERR_XDONE1);
/* Reset FPGA */
grego &= ~GPIO_XCV_PROG; /* PROG line low */
out32(PPC405GP_GPIO0_OR, grego);
goto done;
}
}
printf("\n FPGA load succeeded\n");
retval = 0; /* Program OK */
done: done:
return retval; return retval;
} }
/* FPGA image is stored in flash */ /* FPGA image is stored in flash */
extern flash_info_t flash_info[]; extern flash_info_t flash_info[];
int init_fpga(void) int init_fpga(void)
{ {
unsigned int i,j,ptr; /* General purpose */ unsigned int i, j, ptr; /* General purpose */
unsigned char bufchar; /* General purpose character */ unsigned char bufchar; /* General purpose character */
unsigned char *buf; /* Start of image pointer */ unsigned char *buf; /* Start of image pointer */
unsigned long len; /* Length of image */ unsigned long len; /* Length of image */
unsigned char *fn_buf; /* Start of filename string */ unsigned char *fn_buf; /* Start of filename string */
unsigned int fn_len; /* Length of filename string */ unsigned int fn_len; /* Length of filename string */
unsigned char *xcv_buf; /* Pointer to start of image */ unsigned char *xcv_buf; /* Pointer to start of image */
unsigned long xcv_len; /* Length of image */ unsigned long xcv_len; /* Length of image */
unsigned long crc; /* 30bit crc in image */ unsigned long crc; /* 30bit crc in image */
unsigned long calc_crc; /* Calc'd 30bit crc */ unsigned long calc_crc; /* Calc'd 30bit crc */
int retval = -1; int retval = -1;
/* Tell the world what we are doing */ /* Tell the world what we are doing */
printf("FPGA: "); printf("FPGA: ");
/* /*
* Get address of first sector where the FPGA * Get address of first sector where the FPGA
* image is stored. * image is stored.
*/ */
buf = (unsigned char *)flash_info[1].start[0]; buf = (unsigned char *) flash_info[1].start[0];
/* /*
* Get the stored image's CRC & length. * Get the stored image's CRC & length.
*/ */
crc = *(unsigned long *)(buf+4); /* CRC is first long word */ crc = *(unsigned long *) (buf + 4); /* CRC is first long word */
len = *(unsigned long *)(buf+8); /* Image len is next long */ len = *(unsigned long *) (buf + 8); /* Image len is next long */
/* Pedantic */ /* Pedantic */
if ((len < 0x133A4) || (len > 0x80000)) if ((len < 0x133A4) || (len > 0x80000))
goto bad_image; goto bad_image;
/* /*
* Get the file name pointer and length. * Get the file name pointer and length.
*/ * filename length is next short
fn_len = (*(unsigned short *)(buf+12) & 0xff); /* filename length */
is next short */ fn_len = (*(unsigned short *) (buf + 12) & 0xff);
fn_buf = buf + 14; fn_buf = buf + 14;
/* /*
* Get the FPGA image pointer and length length. * Get the FPGA image pointer and length length.
*/ */
xcv_buf = fn_buf + fn_len; /* pointer to fpga image */ xcv_buf = fn_buf + fn_len; /* pointer to fpga image */
xcv_len = len - 14 - fn_len; /* fpga image length */ xcv_len = len - 14 - fn_len; /* fpga image length */
/* Check for uninitialized FLASH */ /* Check for uninitialized FLASH */
if ((strncmp((char *)buf, "w7o", 3)!=0) || (len > 0x0007ffffL) || (len == 0)) if ((strncmp((char *) buf, "w7o", 3) != 0) || (len > 0x0007ffffL)
goto bad_image; || (len == 0))
goto bad_image;
/* /*
* Calculate and Check the image's CRC. * Calculate and Check the image's CRC.
*/ */
calc_crc = crc32(0, xcv_buf, xcv_len); calc_crc = crc32(0, xcv_buf, xcv_len);
if (crc != calc_crc) { if (crc != calc_crc) {
printf("\nfailed - bad CRC\n"); printf("\nfailed - bad CRC\n");
goto done; goto done;
} }
/* Output the file name */ /* Output the file name */
printf("file name : "); printf("file name : ");
for (i=0;i<fn_len;i++) { for (i = 0; i < fn_len; i++) {
bufchar = fn_buf[+i]; bufchar = fn_buf[+i];
if (bufchar<' ' || bufchar>'~') bufchar = '.'; if (bufchar < ' ' || bufchar > '~')
putc(bufchar); bufchar = '.';
} putc(bufchar);
}
/* /*
* find rest of display data * find rest of display data
*/ */
ptr = 15; /* Offset to ncd filename ptr = 15; /* Offset to ncd filename
length in fpga image */ length in fpga image */
j = xcv_buf[ptr]; /* Get len of ncd filename */ j = xcv_buf[ptr]; /* Get len of ncd filename */
if (j > 32) goto bad_image; if (j > 32)
ptr = ptr + j + 3; /* skip ncd filename string + goto bad_image;
3 bytes more bytes */ ptr = ptr + j + 3; /* skip ncd filename string +
3 bytes more bytes */
/* /*
* output target device string * output target device string
*/ */
j = xcv_buf[ptr++] - 1; /* len of targ str less term */ j = xcv_buf[ptr++] - 1; /* len of targ str less term */
if (j > 32) goto bad_image; if (j > 32)
printf("\n target : "); goto bad_image;
for (i = 0; i < j; i++) { printf("\n target : ");
bufchar = (xcv_buf[ptr++]); for (i = 0; i < j; i++) {
if (bufchar<' ' || bufchar>'~') bufchar = '.'; bufchar = (xcv_buf[ptr++]);
putc(bufchar); if (bufchar < ' ' || bufchar > '~')
} bufchar = '.';
putc(bufchar);
}
/* /*
* output compilation date string and time string * output compilation date string and time string
*/ */
ptr += 3; /* skip 2 bytes */ ptr += 3; /* skip 2 bytes */
printf("\n synth time : "); printf("\n synth time : ");
j = (xcv_buf[ptr++] - 1); /* len of date str less term */ j = (xcv_buf[ptr++] - 1); /* len of date str less term */
if (j > 32) goto bad_image; if (j > 32)
for (i = 0; i < j; i++) { goto bad_image;
bufchar = (xcv_buf[ptr++]); for (i = 0; i < j; i++) {
if (bufchar<' ' || bufchar>'~') bufchar = '.'; bufchar = (xcv_buf[ptr++]);
putc(bufchar); if (bufchar < ' ' || bufchar > '~')
} bufchar = '.';
putc(bufchar);
}
ptr += 3; /* Skip 2 bytes */ ptr += 3; /* Skip 2 bytes */
printf(" - "); printf(" - ");
j = (xcv_buf[ptr++] - 1); /* slen = targ dev str len */ j = (xcv_buf[ptr++] - 1); /* slen = targ dev str len */
if (j > 32) goto bad_image; if (j > 32)
for (i = 0; i < j; i++) { goto bad_image;
bufchar = (xcv_buf[ptr++]); for (i = 0; i < j; i++) {
if (bufchar<' ' || bufchar>'~') bufchar = '.'; bufchar = (xcv_buf[ptr++]);
putc(bufchar); if (bufchar < ' ' || bufchar > '~')
} bufchar = '.';
putc(bufchar);
}
/* /*
* output crc and length strings * output crc and length strings
*/ */
printf("\n len & crc : 0x%lx 0x%lx", len, crc); printf("\n len & crc : 0x%lx 0x%lx", len, crc);
/* /*
* Program the FPGA. * Program the FPGA.
*/ */
retval = fpgaDownload((unsigned char*)xcv_buf, xcv_len, retval = fpgaDownload((unsigned char *) xcv_buf, xcv_len,
(unsigned short *)0xfd000000L); (unsigned short *) 0xfd000000L);
return retval; return retval;
bad_image: bad_image:
printf("\n BAD FPGA image format @ %lx\n", flash_info[1].start[0]); printf("\n BAD FPGA image format @ %lx\n",
log_warn(ERR_XIMAGE); flash_info[1].start[0]);
log_warn(ERR_XIMAGE);
done: done:
return retval; return retval;
} }
void test_fpga(unsigned short *daddr) void test_fpga(unsigned short *daddr)
{ {
int i; int i;
volatile unsigned short *ndest = daddr; volatile unsigned short *ndest = daddr;
for (i = 0; i < CONFIG_NUM_FPGAS; i++) { for (i = 0; i < CONFIG_NUM_FPGAS; i++) {
#if defined(CONFIG_W7OLMG) #if defined(CONFIG_W7OLMG)
ndest[0x7e] = 0x55aa; ndest[0x7e] = 0x55aa;
if (ndest[0x7e] != 0x55aa) if (ndest[0x7e] != 0x55aa)
log_warn(ERR_XRW1 + i); log_warn(ERR_XRW1 + i);
ndest[0x7e] = 0xaa55; ndest[0x7e] = 0xaa55;
if (ndest[0x7e] != 0xaa55) if (ndest[0x7e] != 0xaa55)
log_warn(ERR_XRW1 + i); log_warn(ERR_XRW1 + i);
ndest[0x7e] = 0xc318; ndest[0x7e] = 0xc318;
if (ndest[0x7e] != 0xc318) if (ndest[0x7e] != 0xc318)
log_warn(ERR_XRW1 + i); log_warn(ERR_XRW1 + i);
#elif defined(CONFIG_W7OLMC) #elif defined(CONFIG_W7OLMC)
ndest[0x800] = 0x55aa; ndest[0x800] = 0x55aa;
ndest[0x801] = 0xaa55; ndest[0x801] = 0xaa55;
ndest[0x802] = 0xc318; ndest[0x802] = 0xc318;
ndest[0x4800] = 0x55aa; ndest[0x4800] = 0x55aa;
ndest[0x4801] = 0xaa55; ndest[0x4801] = 0xaa55;
ndest[0x4802] = 0xc318; ndest[0x4802] = 0xc318;
if ((ndest[0x800] != 0x55aa) || if ((ndest[0x800] != 0x55aa) ||
(ndest[0x801] != 0xaa55) || (ndest[0x801] != 0xaa55) || (ndest[0x802] != 0xc318))
(ndest[0x802] != 0xc318)) log_warn(ERR_XRW1 + (2 * i)); /* Auto gen error code */
log_warn(ERR_XRW1 + (2 * i)); /* Auto gen error code */ if ((ndest[0x4800] != 0x55aa) ||
if ((ndest[0x4800] != 0x55aa) || (ndest[0x4801] != 0xaa55) || (ndest[0x4802] != 0xc318))
(ndest[0x4801] != 0xaa55) || log_warn(ERR_XRW2 + (2 * i)); /* Auto gen error code */
(ndest[0x4802] != 0xc318))
log_warn(ERR_XRW2 + (2 * i)); /* Auto gen error code */
#else #else
# error "Unknown W7O board configuration" #error "Unknown W7O board configuration"
#endif #endif
} }
printf(" FPGA ready\n"); printf(" FPGA ready\n");
return; return;
} }