redonkable/remarkable-uboot
redonkable/remarkable-uboot
1
0
Fork 0
Code Releases Activity

board/evb64260/zuma_pbb_mbox.c: CodingStyle cleanup

Browse source 
Make (mostly) checkpatch-clean

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-09 09:29:00 +00:00
parent b191c70162
commit 827320724c
1 changed files with 121 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
board/evb64260/zuma_pbb_mbox.c
View file

@ -18,7 +18,8 @@ static int zuma_mbox_write(struct _zuma_mbox_dev *dev, unsigned int data)
while ((status & OUT_PENDING) && count < 1000) { while ((status & OUT_PENDING) && count < 1000) {
count++; count++;
for(i=0;i<1000;i++); for (i = 0; i < 1000; i++)
;
status = (volatile int) le32_to_cpu(dev->sip->mbox_status); status = (volatile int) le32_to_cpu(dev->sip->mbox_status);
} }
if (count < 1000) { if (count < 1000) {
@ -40,7 +41,8 @@ static int zuma_mbox_read(struct _zuma_mbox_dev *dev, unsigned int *data)
while (!(status & IN_VALID) && count < 1000) { while (!(status & IN_VALID) && count < 1000) {
count++; count++;
for(i=0;i<1000;i++); for (i = 0; i < 1000; i++)
;
status = (volatile int) le32_to_cpu(dev->sip->mbox_status); status = (volatile int) le32_to_cpu(dev->sip->mbox_status);
} }
if (count < 1000) { if (count < 1000) {
@ -56,12 +58,15 @@ static int zuma_mbox_read(struct _zuma_mbox_dev *dev, unsigned int *data)
static int zuma_mbox_do_one_mailbox(unsigned int out, unsigned int *in) static int zuma_mbox_do_one_mailbox(unsigned int out, unsigned int *in)
{ {
int ret; int ret;
ret = zuma_mbox_write(&zuma_mbox_dev, out); ret = zuma_mbox_write(&zuma_mbox_dev, out);
/*printf("write 0x%08x (%d bytes)\n", out, ret); */ /*printf("write 0x%08x (%d bytes)\n", out, ret); */
if(ret!=4) return -1; if (ret != 4)
return -1;
ret = zuma_mbox_read(&zuma_mbox_dev, in); ret = zuma_mbox_read(&zuma_mbox_dev, in);
/*printf("read 0x%08x (%d bytes)\n", *in, ret); */ /*printf("read 0x%08x (%d bytes)\n", *in, ret); */
if(ret!=4) return -1; if (ret != 4)
return -1;
return 0; return 0;
} }
@ -91,9 +96,11 @@ static int zuma_mbox_do_all_mailbox(void)
zuma_console_baud = data_in & 0xffff; zuma_console_baud = data_in & 0xffff;
zuma_debug_baud = data_in >> 16; zuma_debug_baud = data_in >> 16;
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_ENG_PRV_MACL, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox
(ZUMA_MBOXMSG_ENG_PRV_MACL, &data_in));
memcpy(zuma_prv_mac + 2, &data_in, 4); memcpy(zuma_prv_mac + 2, &data_in, 4);
RET_IF_FAILED(zuma_mbox_do_one_mailbox(ZUMA_MBOXMSG_ENG_PRV_MACH, &data_in)); RET_IF_FAILED(zuma_mbox_do_one_mailbox
(ZUMA_MBOXMSG_ENG_PRV_MACH, &data_in));
sdata_in = data_in & 0xffff; sdata_in = data_in & 0xffff;
memcpy(zuma_prv_mac, &sdata_in, 2); memcpy(zuma_prv_mac, &sdata_in, 2);
@ -103,18 +110,19 @@ static int zuma_mbox_do_all_mailbox(void)
} }
static void static void zuma_mbox_dump(void)
zuma_mbox_dump(void)
{ {
printf("ACC MAC=%04x%08x\n",*(unsigned short *)(&zuma_acc_mac),*(unsigned int *)((char *)&zuma_acc_mac+2)); printf("ACC MAC=%04x%08x\n", *(unsigned short *) (&zuma_acc_mac),
printf("PRV MAC=%04x%08x\n",*(unsigned short *)(&zuma_prv_mac),*(unsigned int *)((char *)&zuma_prv_mac+2)); *(unsigned int *) ((char *) &zuma_acc_mac + 2));
printf("slot:bac=%d:%d\n",(zuma_slot_bac>>2)&0xf, zuma_slot_bac & 0x3); printf("PRV MAC=%04x%08x\n", *(unsigned short *) (&zuma_prv_mac),
*(unsigned int *) ((char *) &zuma_prv_mac + 2));
printf("slot:bac=%d:%d\n", (zuma_slot_bac >> 2) & 0xf,
zuma_slot_bac & 0x3);
printf("BAUD1=%d BAUD2=%d\n", zuma_console_baud, zuma_debug_baud); printf("BAUD1=%d BAUD2=%d\n", zuma_console_baud, zuma_debug_baud);
} }
static void static void zuma_mbox_setenv(void)
zuma_mbox_setenv(void)
{ {
char *data, buf[32]; char *data, buf[32];
unsigned char save = 0; unsigned char save = 0;
@ -135,9 +143,7 @@ zuma_mbox_setenv(void)
zuma_prv_mac[0], zuma_prv_mac[0],
zuma_prv_mac[1], zuma_prv_mac[1],
zuma_prv_mac[2], zuma_prv_mac[2],
zuma_prv_mac[3], zuma_prv_mac[3], zuma_prv_mac[4], zuma_prv_mac[5]);
zuma_prv_mac[4],
zuma_prv_mac[5]);
setenv("ethaddr", buf); setenv("ethaddr", buf);
sprintf(buf, "%02x", zuma_slot_bac); sprintf(buf, "%02x", zuma_slot_bac);
@ -154,9 +160,11 @@ zuma_mbox_setenv(void)
int zuma_mbox_init(void) int zuma_mbox_init(void)
{ {
unsigned int iobase; unsigned int iobase;
memset(&zuma_mbox_dev, 0, sizeof(struct _zuma_mbox_dev)); memset(&zuma_mbox_dev, 0, sizeof(struct _zuma_mbox_dev));
zuma_mbox_dev.dev = pci_find_device(VENDOR_ID_ZUMA, DEVICE_ID_ZUMA_PBB, 0); zuma_mbox_dev.dev =
pci_find_device(VENDOR_ID_ZUMA, DEVICE_ID_ZUMA_PBB, 0);
if (zuma_mbox_dev.dev == -1) { if (zuma_mbox_dev.dev == -1) {
printf("no zuma pbb\n"); printf("no zuma pbb\n");