minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
board/w7o/fpga.c
View File

@ -37,26 +37,24 @@ fpga_img_write(unsigned long *src, unsigned long len, unsigned short *daddr)
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 */
@ -73,8 +71,8 @@ fpgaDownload(unsigned char *saddr,
/* 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);
@ -86,8 +84,8 @@ fpgaDownload(unsigned char *saddr,
/* Setup timeout timer */ /* Setup timeout timer */
start = get_timer(0); start = get_timer(0);
/* Wait for FPGA init line */ /* Wait for FPGA init line to go low */
while(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT) { /* Wait INIT line low */ while (in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT) {
/* Check for timeout - 100us max, so use 3ms */ /* Check for timeout - 100us max, so use 3ms */
if (get_timer(start) > 3) { if (get_timer(start) > 3) {
printf(" failed to start init.\n"); printf(" failed to start init.\n");
@ -102,8 +100,8 @@ fpgaDownload(unsigned char *saddr,
grego |= GPIO_XCV_PROG; /* PROG line high */ grego |= GPIO_XCV_PROG; /* PROG line high */
out32(PPC405GP_GPIO0_OR, grego); out32(PPC405GP_GPIO0_OR, grego);
/* Wait for FPGA end of init period . */ /* Wait for FPGA end of init period = init line go hi */
while(!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT)) { /* Wait for INIT hi */ while (!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_INIT)) {
/* Check for timeout */ /* Check for timeout */
if (get_timer(start) > 3) { if (get_timer(start) > 3) {
@ -143,9 +141,9 @@ fpgaDownload(unsigned char *saddr,
/* /*
* Program the FPGA * Program the FPGA
*/ */
printf("\n destination: 0x%lx ", (unsigned long)ndest); printf("\n destination: 0x%lx ", (unsigned long) ndest);
fpga_img_write(source, length, (unsigned short *)ndest); fpga_img_write(source, length, (unsigned short *) ndest);
/* Done programming */ /* Done programming */
grego |= cnfg; /* CONFIG line high */ grego |= cnfg; /* CONFIG line high */
@ -161,7 +159,8 @@ fpgaDownload(unsigned char *saddr,
greg &= ~eirq; /* toggle irq/gpio */ greg &= ~eirq; /* toggle irq/gpio */
mtdcr(CPC0_CR0, greg); /* ... just do it */ mtdcr(CPC0_CR0, greg); /* ... just do it */
ndest = (unsigned short *)((char *)ndest + 0x00100000L); /* XXX - Next FPGA addr */ /* XXX - Next FPGA addr */
ndest = (unsigned short *) ((char *) ndest + 0x00100000L);
cnfg >>= 1; /* XXX - Next */ cnfg >>= 1; /* XXX - Next */
eirq >>= 1; eirq >>= 1;
} }
@ -173,14 +172,14 @@ fpgaDownload(unsigned char *saddr,
val = *ndest; val = *ndest;
val = *ndest; val = *ndest;
val = *ndest; val = *ndest;
ndest = (unsigned short *)((char *)ndest + 0x00100000L); ndest = (unsigned short *) ((char *) ndest + 0x00100000L);
} }
/* Setup timer */ /* Setup timer */
start = get_timer(0); start = get_timer(0);
/* Wait for FPGA end of programming period . */ /* Wait for FPGA end of programming period = Test DONE low */
while(!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_DONE)) { /* Test DONE low */ while (!(in32(PPC405GP_GPIO0_IR) & GPIO_XCV_DONE)) {
/* Check for timeout */ /* Check for timeout */
if (get_timer(start) > 3) { if (get_timer(start) > 3) {
@ -207,7 +206,7 @@ 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 */
@ -226,13 +225,13 @@ int init_fpga(void)
* 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))
@ -240,9 +239,9 @@ int init_fpga(void)
/* /*
* 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 fn_len = (*(unsigned short *) (buf + 12) & 0xff);
is next short */
fn_buf = buf + 14; fn_buf = buf + 14;
/* /*
@ -252,7 +251,8 @@ int init_fpga(void)
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)
|| (len == 0))
goto bad_image; goto bad_image;
/* /*
@ -266,9 +266,10 @@ int init_fpga(void)
/* 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 > '~')
bufchar = '.';
putc(bufchar); putc(bufchar);
} }
@ -278,7 +279,8 @@ int init_fpga(void)
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)
goto bad_image;
ptr = ptr + j + 3; /* skip ncd filename string + ptr = ptr + j + 3; /* skip ncd filename string +
3 bytes more bytes */ 3 bytes more bytes */
@ -286,11 +288,13 @@ int init_fpga(void)
* 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)
goto bad_image;
printf("\n target : "); printf("\n target : ");
for (i = 0; i < j; i++) { for (i = 0; i < j; i++) {
bufchar = (xcv_buf[ptr++]); bufchar = (xcv_buf[ptr++]);
if (bufchar<' ' || bufchar>'~') bufchar = '.'; if (bufchar < ' ' || bufchar > '~')
bufchar = '.';
putc(bufchar); putc(bufchar);
} }
@ -300,20 +304,24 @@ int init_fpga(void)
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)
goto bad_image;
for (i = 0; i < j; i++) { for (i = 0; i < j; i++) {
bufchar = (xcv_buf[ptr++]); bufchar = (xcv_buf[ptr++]);
if (bufchar<' ' || bufchar>'~') bufchar = '.'; if (bufchar < ' ' || bufchar > '~')
bufchar = '.';
putc(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)
goto bad_image;
for (i = 0; i < j; i++) { for (i = 0; i < j; i++) {
bufchar = (xcv_buf[ptr++]); bufchar = (xcv_buf[ptr++]);
if (bufchar<' ' || bufchar>'~') bufchar = '.'; if (bufchar < ' ' || bufchar > '~')
bufchar = '.';
putc(bufchar); putc(bufchar);
} }
@ -325,12 +333,13 @@ int init_fpga(void)
/* /*
* 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",
flash_info[1].start[0]);
log_warn(ERR_XIMAGE); log_warn(ERR_XIMAGE);
done: done:
return retval; return retval;
@ -361,16 +370,14 @@ void test_fpga(unsigned short *daddr)
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[0x4801] != 0xaa55) || (ndest[0x4802] != 0xc318))
(ndest[0x4802] != 0xc318))
log_warn(ERR_XRW2 + (2 * i)); /* Auto gen error code */ log_warn(ERR_XRW2 + (2 * i)); /* Auto gen error code */
#else #else
# error "Unknown W7O board configuration" #error "Unknown W7O board configuration"
#endif #endif
} }