Commit d0ff51ba5d0309dbe9e25ea54f8a0285a6d5db90

Authored by Wolfgang Denk
1 parent d7854223c5

Code cleanup: fix old style assignment ambiguities like "=-" etc.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 31 changed files with 65 additions and 65 deletions Side-by-side Diff

board/BuS/EB+MCF-EV123/cfm_flash.c
... ... @@ -173,7 +173,7 @@
173 173 dest = cmf_backdoor_address(addr);
174 174 while ((cnt>=4) && (rc == ERR_OK))
175 175 {
176   - data =*((volatile u32 *) src);
  176 + data = *((volatile u32 *) src);
177 177 *(volatile u32*) dest = data;
178 178 MCFCFM_CMD = MCFCFM_CMD_PGM;
179 179 MCFCFM_USTAT = MCFCFM_USTAT_CBEIF;
board/BuS/EB+MCF-EV123/flash.c
... ... @@ -348,7 +348,7 @@
348 348 dest = addr;
349 349 while ((cnt>=2) && (rc == ERR_OK))
350 350 {
351   - data =*((volatile u16 *) src);
  351 + data = *((volatile u16 *) src);
352 352 rc=amd_write_word (info,dest,data);
353 353 src +=2;
354 354 dest +=2;
board/MAI/AmigaOneG3SE/ps2kbd.c
... ... @@ -229,7 +229,7 @@
229 229 device_t kbddev ;
230 230 char *stdinname = getenv ("stdin");
231 231  
232   - if(isa_kbd_init()==-1)
  232 + if(isa_kbd_init() == -1)
233 233 return -1;
234 234 memset (&kbddev, 0, sizeof(kbddev));
235 235 strcpy(kbddev.name, DEVNAME);
... ... @@ -515,7 +515,7 @@
515 515 int val;
516 516 unsigned char status;
517 517  
518   - val=-1;
  518 + val = -1;
519 519 status = kbd_read_status();
520 520 if (status & KBD_STAT_OBF) {
521 521 val = kbd_read_input();
board/MAI/AmigaOneG3SE/usb_uhci.c
... ... @@ -518,7 +518,7 @@
518 518 uhci_td_t *td,*prevtd;
519 519  
520 520 for(i=0;i<8;i++) {
521   - prevtd=&td_int[i]; /* the first previous td is the skeleton td */
  521 + prevtd = &td_int[i]; /* the first previous td is the skeleton td */
522 522 link=swap_32(td_int[i].link) & 0xfffffff0; /* next in chain */
523 523 td=(uhci_td_t *)link; /* assign it */
524 524 /* all interrupt TDs are finally linked to the td_int[0].
... ... @@ -595,7 +595,7 @@
595 595  
596 596  
597 597 busdevfunc=pci_find_device(USB_UHCI_VEND_ID,USB_UHCI_DEV_ID,0); /* get PCI Device ID */
598   - if(busdevfunc==-1) {
  598 + if(busdevfunc == -1) {
599 599 printf("Error USB UHCI (%04X,%04X) not found\n",USB_UHCI_VEND_ID,USB_UHCI_DEV_ID);
600 600 return -1;
601 601 }
602 602  
... ... @@ -642,12 +642,12 @@
642 642 */
643 643 int usb_lowlevel_stop(void)
644 644 {
645   - if(irqvec==-1)
  645 + if(irqvec == -1)
646 646 return 1;
647 647 irq_free_handler(irqvec);
648 648 irq_free_handler(0);
649 649 reset_hc();
650   - irqvec=-1;
  650 + irqvec = -1;
651 651 return 0;
652 652 }
653 653  
board/esd/cpci750/sdram_init.c
... ... @@ -1570,8 +1570,8 @@
1570 1570 for (cnt = STARTVAL/sizeof(long); cnt < maxsize/sizeof(long); cnt <<= 1) {
1571 1571 addr = base + cnt; /* pointer arith! */
1572 1572  
1573   - save1=*addr; /* save contents of addr */
1574   - save2=*b; /* save contents of base */
  1573 + save1 = *addr; /* save contents of addr */
  1574 + save2 = *b; /* save contents of base */
1575 1575  
1576 1576 *addr=cnt; /* write cnt to addr */
1577 1577 *b=0; /* put null at base */
board/evb64260/eth.c
... ... @@ -163,7 +163,7 @@
163 163 int eth_len=0;
164 164 char *eth_data;
165 165  
166   - eth0_rx_desc_single *rx=&p->eth_rx_desc[(p->rdn)];
  166 + eth0_rx_desc_single *rx = &p->eth_rx_desc[(p->rdn)];
167 167  
168 168 INVALIDATE_DCACHE((unsigned int)rx,(unsigned int)(rx+1));
169 169  
... ... @@ -252,7 +252,7 @@
252 252 #ifdef DEBUG
253 253 unsigned int old_command_stat,old_psr;
254 254 #endif
255   - eth0_tx_desc_single *tx=&dev->eth_tx_desc[dev->tdn];
  255 + eth0_tx_desc_single *tx = &dev->eth_tx_desc[dev->tdn];
256 256  
257 257 /* wait for tx to be ready */
258 258 INVALIDATE_DCACHE((unsigned int)tx,(unsigned int)(tx+1));
board/evb64260/mpsc.c
... ... @@ -259,7 +259,7 @@
259 259 int
260 260 mpsc_test_char(void)
261 261 {
262   - volatile unsigned int *p=&rx_desc_base[rx_desc_index*8];
  262 + volatile unsigned int *p = &rx_desc_base[rx_desc_index*8];
263 263  
264 264 INVALIDATE_DCACHE(&p[1], &p[2]);
265 265  
... ... @@ -222,7 +222,7 @@
222 222 unsigned long long result;
223 223 int rc = ERR_OK;
224 224  
225   - result=*addr;
  225 + result = *addr;
226 226 if ((result & data) != data)
227 227 return ERR_NOT_ERASED;
228 228  
... ... @@ -234,7 +234,7 @@
234 234 eieio();
235 235  
236 236 do {
237   - result=*addr;
  237 + result = *addr;
238 238 } while(~result & BIT_BUSY);
239 239  
240 240 *addr=CMD_READ_ARRAY;
... ... @@ -275,7 +275,7 @@
275 275 }
276 276  
277 277 while(cnt>=8) {
278   - data=*((unsigned long long *)src);
  278 + data = *((unsigned long long *)src);
279 279 if ((rc = write_word(info, wp, data)) != 0)
280 280 return rc;
281 281 src+=8;
board/mpl/common/common_util.c
... ... @@ -357,8 +357,8 @@
357 357 unsigned off;
358 358 uchar *name, *value;
359 359  
360   - name=&name_buf[0];
361   - value=&value_buf[0];
  360 + name = &name_buf[0];
  361 + value = &value_buf[0];
362 362 len=size;
363 363 off = sizeof(long);
364 364 while (len > off) {
... ... @@ -377,8 +377,8 @@
377 377 if(c == '\0')
378 378 break;
379 379 } while(len > off);
380   - name=&name_buf[0];
381   - value=&value_buf[0];
  380 + name = &name_buf[0];
  381 + value = &value_buf[0];
382 382 if(strncmp((char *)name,"baudrate",8)!=0) {
383 383 setenv((char *)name,(char *)value);
384 384 }
385 385  
... ... @@ -636,12 +636,12 @@
636 636 ++s;
637 637 break;
638 638 }
639   - buf[i++]=*s;
  639 + buf[i++] = *s;
640 640 }
641 641 sprintf(&buf[i]," SN ");
642 642 i+=4;
643 643 for (; s < e; ++s) {
644   - buf[i++]=*s;
  644 + buf[i++] = *s;
645 645 }
646 646 buf[i++]=0;
647 647 }
board/mpl/common/flash.c
... ... @@ -160,7 +160,7 @@
160 160 unsigned long size_b1,flashcr,size_reg;
161 161 int mode;
162 162 extern char version_string;
163   - char *p=&version_string;
  163 + char *p = &version_string;
164 164  
165 165 /* Since we are relocated, we can set-up the CS finally */
166 166 setup_cs_reloc();
board/mpl/common/kbd.c
... ... @@ -475,7 +475,7 @@
475 475 int val;
476 476 unsigned char status;
477 477  
478   - val=-1;
  478 + val = -1;
479 479 status = kbd_read_status();
480 480 if (status & KBD_STAT_OBF) {
481 481 val = kbd_read_input();
board/mpl/common/usb_uhci.c
... ... @@ -536,7 +536,7 @@
536 536 uhci_td_t *td,*prevtd;
537 537  
538 538 for(i=0;i<8;i++) {
539   - prevtd=&td_int[i]; /* the first previous td is the skeleton td */
  539 + prevtd = &td_int[i]; /* the first previous td is the skeleton td */
540 540 link=swap_32(td_int[i].link) & 0xfffffff0; /* next in chain */
541 541 td=(uhci_td_t *)link; /* assign it */
542 542 /* all interrupt TDs are finally linked to the td_int[0].
... ... @@ -638,7 +638,7 @@
638 638 return 1;
639 639 irq_free_handler(irqvec);
640 640 reset_hc();
641   - irqvec=-1;
  641 + irqvec = -1;
642 642 return 0;
643 643 }
644 644  
board/tqc/tqm5200/cmd_stk52xx.c
... ... @@ -192,10 +192,10 @@
192 192 psc->command = (PSC_RX_ENABLE | PSC_TX_ENABLE);
193 193  
194 194 for(i = 0;i < (len / 4); i++) {
195   - swapped[3]=*wave_file++;
196   - swapped[2]=*wave_file++;
197   - swapped[1]=*wave_file++;
198   - swapped[0]=*wave_file++;
  195 + swapped[3] = *wave_file++;
  196 + swapped[2] = *wave_file++;
  197 + swapped[1] = *wave_file++;
  198 + swapped[0] = *wave_file++;
199 199 psc->psc_buffer_32 = *((unsigned long*)swapped);
200 200 while (psc->tfnum > 400) {
201 201 if(ctrlc())
... ... @@ -512,7 +512,7 @@
512 512 if(readblk>blocks) /* is end within 1st track */
513 513 readblk=blocks; /* yes, correct it */
514 514 PRINTF("we read %ld blocks start %ld\n",readblk,pCMD->blnr);
515   - bufferw=&buffer[0]; /* setup working buffer */
  515 + bufferw = &buffer[0]; /* setup working buffer */
516 516 do {
517 517 retryrw:
518 518 len=sect_size * readblk;
... ... @@ -566,7 +566,7 @@
566 566 * we need to get the results */
567 567 fdc_terminate(pCMD);
568 568 offset+=(sect_size*readblk); /* set up buffer pointer */
569   - bufferw=&buffer[offset];
  569 + bufferw = &buffer[offset];
570 570 pCMD->blnr+=readblk; /* update current block nr */
571 571 blocks-=readblk; /* update blocks */
572 572 if(blocks==0)
... ... @@ -210,7 +210,7 @@
210 210 s_last [bank] = -1; /* last sector to erase */
211 211 }
212 212  
213   - for (bank=0,info=&flash_info[0];
  213 + for (bank=0,info = &flash_info[0];
214 214 (bank < CFG_MAX_FLASH_BANKS) && (addr_first <= addr_last);
215 215 ++bank, ++info) {
216 216 ulong b_end;
... ... @@ -427,7 +427,7 @@
427 427 s_first, s_last, &planned );
428 428  
429 429 if (planned && (rcode == 0)) {
430   - for (bank=0,info=&flash_info[0];
  430 + for (bank=0,info = &flash_info[0];
431 431 (bank < CFG_MAX_FLASH_BANKS) && (rcode == 0);
432 432 ++bank, ++info) {
433 433 if (s_first[bank]>=0) {
... ... @@ -651,7 +651,7 @@
651 651 protected = 0;
652 652  
653 653 if (planned && (rcode == 0)) {
654   - for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
  654 + for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
655 655 if (info->flash_id == FLASH_UNKNOWN) {
656 656 continue;
657 657 }
... ... @@ -85,7 +85,7 @@
85 85 length = (*dataptr << 8) + *(dataptr+1);
86 86 dataptr+=2;
87 87 for(i=0;i<length;i++)
88   - buffer[i]=*dataptr++;
  88 + buffer[i] = *dataptr++;
89 89  
90 90 printf(" design filename = \"%s\"\n", buffer);
91 91  
... ... @@ -99,7 +99,7 @@
99 99 length = (*dataptr << 8) + *(dataptr+1);
100 100 dataptr+=2;
101 101 for(i=0;i<length;i++)
102   - buffer[i]=*dataptr++;
  102 + buffer[i] = *dataptr++;
103 103 printf(" part number = \"%s\"\n", buffer);
104 104  
105 105 /* get date (identifier, length, string) */
... ... @@ -112,7 +112,7 @@
112 112 length = (*dataptr << 8) + *(dataptr+1);
113 113 dataptr+=2;
114 114 for(i=0;i<length;i++)
115   - buffer[i]=*dataptr++;
  115 + buffer[i] = *dataptr++;
116 116 printf(" date = \"%s\"\n", buffer);
117 117  
118 118 /* get time (identifier, length, string) */
... ... @@ -124,7 +124,7 @@
124 124 length = (*dataptr << 8) + *(dataptr+1);
125 125 dataptr+=2;
126 126 for(i=0;i<length;i++)
127   - buffer[i]=*dataptr++;
  127 + buffer[i] = *dataptr++;
128 128 printf(" time = \"%s\"\n", buffer);
129 129  
130 130 /* get fpga data length (identifier, length) */
... ... @@ -171,7 +171,7 @@
171 171 if(scsi_max_devs>0)
172 172 scsi_curr_dev=0;
173 173 else
174   - scsi_curr_dev=-1;
  174 + scsi_curr_dev = -1;
175 175 }
176 176  
177 177  
... ... @@ -32,7 +32,7 @@
32 32 #include <usb.h>
33 33  
34 34 #ifdef CONFIG_USB_STORAGE
35   -static int usb_stor_curr_dev=-1; /* current device */
  35 +static int usb_stor_curr_dev = -1; /* current device */
36 36 #endif
37 37  
38 38 /* some display routines (info command) */
... ... @@ -125,7 +125,7 @@
125 125 device_t *dev = NULL;
126 126 char temp_names[3][8];
127 127  
128   - dev_index=-1;
  128 + dev_index = -1;
129 129 for (i=1; i<=ListNumItems(devlist); i++) {
130 130 dev = ListGetPtrToItem (devlist, i);
131 131 if(strcmp(dev->name,devname)==0) {
... ... @@ -104,7 +104,7 @@
104 104 flash_info_t *info;
105 105 int i;
106 106  
107   - for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
  107 + for (i=0, info = &flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
108 108 if (info->flash_id != FLASH_UNKNOWN &&
109 109 addr >= info->start[0] &&
110 110 /* WARNING - The '- 1' is needed if the flash
... ... @@ -953,7 +953,7 @@
953 953  
954 954 static int static_get(struct in_str *i)
955 955 {
956   - int ch=*i->p++;
  956 + int ch = *i->p++;
957 957 if (ch=='\0') return EOF;
958 958 return ch;
959 959 }
... ... @@ -1104,7 +1104,7 @@
1104 1104 ch = 0;
1105 1105 /* If there is data waiting, eat it up */
1106 1106 if (i->p && *i->p) {
1107   - ch=*i->p++;
  1107 + ch = *i->p++;
1108 1108 } else {
1109 1109 /* need to double check i->file because we might be doing something
1110 1110 * more complicated by now, like sourcing or substituting. */
... ... @@ -1121,7 +1121,7 @@
1121 1121 i->__promptme = 0;
1122 1122 #endif
1123 1123 if (i->p && *i->p) {
1124   - ch=*i->p++;
  1124 + ch = *i->p++;
1125 1125 }
1126 1126 #ifndef __U_BOOT__
1127 1127 } else {
... ... @@ -728,7 +728,7 @@
728 728 WATCHDOG_RESET();
729 729 for (j = 0; j < width ; j++)
730 730 #if defined(CONFIG_PXA250)
731   - *(fb++)=*(bmap++);
  731 + *(fb++) = *(bmap++);
732 732 #elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200)
733 733 *(fb++)=255-*(bmap++);
734 734 #endif
... ... @@ -252,7 +252,7 @@
252 252  
253 253 for(i=0; i<dev->config.bNumInterfaces;i++) {
254 254 for(ii=0; ii<dev->config.if_desc[i].bNumEndpoints; ii++) {
255   - ep=&dev->config.if_desc[i].ep_desc[ii];
  255 + ep = &dev->config.if_desc[i].ep_desc[ii];
256 256 b=ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
257 257  
258 258 if((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)==USB_ENDPOINT_XFER_CONTROL) { /* Control => bidirectional */
... ... @@ -627,7 +627,7 @@
627 627 if (size <= 0 || !buf || !index)
628 628 return -1;
629 629 buf[0] = 0;
630   - tbuf=&mybuf[0];
  630 + tbuf = &mybuf[0];
631 631  
632 632 /* get langid for strings if it's not yet known */
633 633 if (!dev->have_langid) {
... ... @@ -857,7 +857,7 @@
857 857 /* first make all devices unknown */
858 858 for(i=0;i<USB_MAX_DEVICE;i++) {
859 859 memset(&usb_dev[i],0,sizeof(struct usb_device));
860   - usb_dev[i].devnum=-1;
  860 + usb_dev[i].devnum = -1;
861 861 }
862 862 dev_index=0;
863 863 /* device 0 is always present (root hub, so let it analyze) */
... ... @@ -730,8 +730,8 @@
730 730 return -1;
731 731 }
732 732 printf(" report descriptor (size %u, read %d)\n", len, index);
733   - start=&buffer[0];
734   - end=&buffer[len];
  733 + start = &buffer[0];
  734 + end = &buffer[len];
735 735 i=0;
736 736 do {
737 737 index=fetch_item(start,end,&item);
common/usb_storage.c
... ... @@ -731,7 +731,7 @@
731 731 ccb reqsrb;
732 732 int retry,notready;
733 733  
734   - psrb=&reqsrb;
  734 + psrb = &reqsrb;
735 735 status=USB_STOR_TRANSPORT_GOOD;
736 736 retry=0;
737 737 notready=0;
... ... @@ -776,7 +776,7 @@
776 776 psrb->cmd[1]=srb->lun<<5;
777 777 psrb->cmd[4]=18;
778 778 psrb->datalen=18;
779   - psrb->pdata=&srb->sense_buf[0];
  779 + psrb->pdata = &srb->sense_buf[0];
780 780 psrb->cmdlen=12;
781 781 /* issue the command */
782 782 result=usb_stor_CB_comdat(psrb,us);
... ... @@ -858,7 +858,7 @@
858 858 srb->cmd[1]=srb->lun<<5;
859 859 srb->cmd[4]=18;
860 860 srb->datalen=18;
861   - srb->pdata=&srb->sense_buf[0];
  861 + srb->pdata = &srb->sense_buf[0];
862 862 srb->cmdlen=12;
863 863 ss->transport(srb,ss);
864 864 USB_STOR_PRINTF("Request Sense returned %02X %02X %02X\n",srb->sense_buf[2],srb->sense_buf[12],srb->sense_buf[13]);
cpu/ppc4xx/40x_spd_sdram.c
... ... @@ -126,9 +126,9 @@
126 126  
127 127 int sdram0_pmit=0x07c00000;
128 128 #ifndef CONFIG_405EP /* not on PPC405EP */
129   - int sdram0_besr0=-1;
130   - int sdram0_besr1=-1;
131   - int sdram0_eccesr=-1;
  129 + int sdram0_besr0 = -1;
  130 + int sdram0_besr1 = -1;
  131 + int sdram0_eccesr = -1;
132 132 #endif
133 133 int sdram0_ecccfg;
134 134  
drivers/block/sym53c8xx.c
... ... @@ -784,7 +784,7 @@
784 784 pccb->msgout[0]=SCSI_IDENTIFY;
785 785 transbytes=pccb->trans_bytes;
786 786 tmpptr=pccb->pdata;
787   - pccb->pdata=&pccb->sense_buf[0];
  787 + pccb->pdata = &pccb->sense_buf[0];
788 788 datalen=pccb->datalen;
789 789 pccb->datalen=14;
790 790 tmpstat=pccb->status;
drivers/input/pc_keyb.c
... ... @@ -64,7 +64,7 @@
64 64 int val;
65 65 unsigned char status;
66 66  
67   - val=-1;
  67 + val = -1;
68 68 status = kbd_read_status();
69 69 if (status & KBD_STAT_OBF) {
70 70 val = kbd_read_input();
drivers/pci/fsl_pci_init.c
... ... @@ -59,8 +59,8 @@
59 59 pci_dev_t dev = PCI_BDF(busno,0,0);
60 60  
61 61 /* Initialize ATMU registers based on hose regions and flags */
62   - volatile pot_t *po=&pci->pot[1]; /* skip 0 */
63   - volatile pit_t *pi=&pci->pit[0]; /* ranges from: 3 to 1 */
  62 + volatile pot_t *po = &pci->pot[1]; /* skip 0 */
  63 + volatile pit_t *pi = &pci->pit[0]; /* ranges from: 3 to 1 */
64 64  
65 65 #ifdef DEBUG
66 66 int neg_link_w;
tools/updater/cmd_flash.c
... ... @@ -187,7 +187,7 @@
187 187  
188 188 erased = 0;
189 189  
190   - for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
  190 + for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
191 191 ulong b_end;
192 192 int sect;
193 193  
... ... @@ -366,7 +366,7 @@
366 366  
367 367 protected = 0;
368 368  
369   - for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
  369 + for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
370 370 ulong b_end;
371 371 int sect;
372 372  
tools/updater/flash.c
... ... @@ -93,7 +93,7 @@
93 93 flash_info_t *info;
94 94 int i;
95 95  
96   - for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
  96 + for (i=0, info = &flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
97 97 if (info->flash_id != FLASH_UNKNOWN &&
98 98 addr >= info->start[0] &&
99 99 /* WARNING - The '- 1' is needed if the flash