Cleanup whitespaces and style issues.

Removed //-style comments.
Use 80-column lines.
Remove trailing whitespace.
Remove dead code and debug cruft.

1 files changed, 36 insertions, 69 deletions

diff --git a/cpu/mpc86xx/pci.c b/cpu/mpc86xx/pci.c
index 9cf5f7c..05976bd 100644
--- a/cpu/mpc86xx/pci.c
+++ b/cpu/mpc86xx/pci.c
@@ -22,7 +22,7 @@
  */
 
 /*
- * PEX Configuration space access support for MPC85xx PEX Bridge
+ * PEX Configuration space access support for PEX Bridge
  */
 #include <common.h>
 #include <pci.h>
@@ -44,24 +44,25 @@ pci_mpc86xx_init(struct pci_controller *hose)
 
         ulong addr, data;
 
-        
         uint pex1_agent =  (host1_agent == 0) || (host1_agent == 1);
         uint devdisr = gur->devdisr;
         uint io_sel = (gur->pordevsr & MPC86xx_PORDEVSR_IO_SEL) >> 16;
-        
-        if ((io_sel==2 || io_sel==3 || io_sel==5 || io_sel==6 || io_sel==7 || io_sel==0xF ) && !(devdisr & MPC86xx_DEVDISR_PCIEX1)){
+
+        if ((io_sel==2 || io_sel==3 || io_sel==5
+	     || io_sel==6 || io_sel==7 || io_sel==0xF )
+	    && !(devdisr & MPC86xx_DEVDISR_PCIEX1)){
                 printf ("PCI-EXPRESS 1: Configured as %s \n",
                         pex1_agent ? "Agent" : "Host");
                 printf ("               Scanning PCI bus");
                 debug("0x%08x=0x%08x ", &pex1->pme_msg_det,pex1->pme_msg_det);
                 if (pex1->pme_msg_det) {
                         pex1->pme_msg_det = 0xffffffff;
-                        debug (" with errors.  Clearing.  Now 0x%08x",pex1->pme_msg_det);
+                        debug (" with errors.  Clearing.  Now 0x%08x",
+			       pex1->pme_msg_det);
                 }
                 debug ("\n");
         }
-        
-        
+
 	hose->first_busno = 0;
 	hose->last_busno = 0x7f;
 
@@ -88,36 +89,26 @@ pci_mpc86xx_init(struct pci_controller *hose)
 	 */
 	pci_register_hose(hose);
 
-        //#define MPC8548_REV1_PEX12_ERRATA
-#ifdef MPC8548_REV1_PEX12_ERRATA
-	/* can only read/write 4 bytes */
-	pci_read_config_dword (PCI_BDF(0,0,0), PCI_VENDOR_ID, &reg32);
-	printf("pex_mpc85xx_init: pex cr %2x %8x\n",PCI_VENDOR_ID, reg32);
-
-	pci_read_config_word (PCI_BDF(0,0,0), PCI_COMMAND, &reg32);
-	reg32 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
-	pci_write_config_word(PCI_BDF(0,0,0), PCI_COMMAND, reg32);
-#else
 	pci_read_config_word (PCI_BDF(0,0,0), PCI_VENDOR_ID, &reg16);
 	debug("pex_mpc86xx_init: read %2x %4x\n",PCI_VENDOR_ID, reg16);
 	pci_read_config_word (PCI_BDF(0,0,0), PCI_DEVICE_ID, &reg16);
 	debug("pex_mpc86xx_init: read %2x %4x\n",PCI_DEVICE_ID, reg16);
 
 	pci_read_config_word (PCI_BDF(0,0,0), PCI_COMMAND, &reg16);
-	reg16 |= PCI_COMMAND_SERR |  PCI_COMMAND_PARITY | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+	reg16 |= PCI_COMMAND_SERR |  PCI_COMMAND_PARITY \
+		| PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
 	pci_write_config_word(PCI_BDF(0,0,0), PCI_COMMAND, reg16);
 
         pci_read_config_word (PCI_BDF(0,0,0), PCI_COMMAND, &reg16);
 	debug("pex_mpc86xx_init: read %2x %4x\n",PCI_COMMAND, reg16);
 
-        
-#endif
-
 	/*
 	 * Clear non-reserved bits in status register.
 	 */
-	//	pci_write_config_word(PCI_BDF(0,0,0), PCI_STATUS, 0xffff);
-	//	pci_write_config_byte(PCI_BDF(0,0,0), PCI_LATENCY_TIMER,0x80);
+	/*
+	 * pci_write_config_word(PCI_BDF(0,0,0), PCI_STATUS, 0xffff);
+	 * pci_write_config_byte(PCI_BDF(0,0,0), PCI_LATENCY_TIMER,0x80);
+	 */
 
 	pex1->powbar1  = (CFG_PCI1_MEM_BASE >> 12) & 0x000fffff;
 	pex1->powar1   = 0x8004401c;	/* 512M MEM space */
@@ -129,7 +120,6 @@ pci_mpc86xx_init(struct pci_controller *hose)
 	pex1->potar2   = 0x00000000;
 	pex1->potear2  = 0x00000000;
 
-
 	if (!pex1->piwar1) {
 		pex1->pitar1 = 0x00000000;
 		pex1->piwbar1 = (0x80000000 >> 12 ) & 0x000fffff;
@@ -140,57 +130,34 @@ pci_mpc86xx_init(struct pci_controller *hose)
 	pex1->pitar2 = 0x00000000;
         pex1->piwbar2 = (0xe2000000 >> 12 ) & 0x000fffff;
         pex1->piwar2 = 0xa0f5501e;	/* Enable, Prefetch, Local Mem,
-                                           
-
-        
-/* 	if (pex1_host) { */
-/* #ifdef MPC8548_REV1_PEX12_ERRATA */
-/* 		pci_write_config_dword (PCI_BDF(0,0,0), 0x18, 0x00ff0100); */
-/* #else */
-
-
-
-                *(u32 *)(0xf8008000)= 0x80000000;
-                debug("Received data for addr 0x%08lx is 0x%08lx\n", *(u32*)(0xf8008000), *(u32*)(0xf8008004));
-
-
-                pci_write_config_byte(PCI_BDF(0,0,0), PCI_PRIMARY_BUS,0x20);
-                pci_write_config_byte(PCI_BDF(0,0,0), PCI_SECONDARY_BUS,0x00);
-		pci_write_config_byte(PCI_BDF(0,0,0), PCI_SUBORDINATE_BUS,0x1F);
-/* #endif */
-
-
-                *(u32 *)(0xf8008000)= 0x80200000;
-                debug("Received data for addr 0x%08lx is 0x%08lx\n", *(u32*)(0xf8008000), *(u32*)(0xf8008004));
-
-                *(u32 *)(0xf8008000)= 0x80200000;
-                debug("Received data for addr 0x%08lx is 0x%08lx\n", *(u32*)(0xf8008000), *(u32*)(0xf8008004));
-
-                *(u32 *)(0xf8008000)= 0x80200000;
-                debug("Received data for addr 0x%08lx is 0x%08lx\n", *(u32*)(0xf8008000), *(u32*)(0xf8008004));
+						 * Snoop R/W, 2G */
 
+	*(u32 *)(0xf8008000)= 0x80000000;
+	debug("Received data for addr 0x%08lx is 0x%08lx\n",
+	      *(u32*)(0xf8008000), *(u32*)(0xf8008004));
 
-                
-		hose->last_busno = pci_hose_scan(hose);
-                hose->last_busno = 0x21;
-		debug("pex_mpc86xx_init: last_busno %x\n",hose->last_busno);
-                debug("pex_mpc86xx init: current_busno %x\n ",hose->current_busno);
+	pci_write_config_byte(PCI_BDF(0,0,0), PCI_PRIMARY_BUS,0x20);
+	pci_write_config_byte(PCI_BDF(0,0,0), PCI_SECONDARY_BUS,0x00);
+	pci_write_config_byte(PCI_BDF(0,0,0), PCI_SUBORDINATE_BUS,0x1F);
 
+	*(u32 *)(0xf8008000)= 0x80200000;
+	debug("Received data for addr 0x%08lx is 0x%08lx\n",
+	      *(u32*)(0xf8008000), *(u32*)(0xf8008004));
 
-                printf("....PCI scan & enumeration done\n");
+	*(u32 *)(0xf8008000)= 0x80200000;
+	debug("Received data for addr 0x%08lx is 0x%08lx\n",
+	      *(u32*)(0xf8008000), *(u32*)(0xf8008004));
 
-/*                 *(u32 *)(0xf8008000)= 0x80000000 | (0x12 << 11); */
-/*                 printf("Received data for addr 0x%08lx is 0x%08lx\n", *(u32*)(0xf8008000), *(u32*)(0xf8008004)); */
-                
-/* 		if (hose->last_busno < 1) { */
-/* 			hose->last_busno=1;  /\*Hack*\/ */
-/*                 } else { */
-/*                    hose->last_busno = 0; */
-/*                 } */
-/*}*/
-/*         pci_read_config_dword (PCI_BDF(1,0,0), 0x18, &reg32); */
-/*         printf("pex_mpc86xx_init: pex cr %2x %8x\n",0x18, reg32); */
+	*(u32 *)(0xf8008000)= 0x80200000;
+	debug("Received data for addr 0x%08lx is 0x%08lx\n",
+	      *(u32*)(0xf8008000), *(u32*)(0xf8008004));
 
+	hose->last_busno = pci_hose_scan(hose);
+	hose->last_busno = 0x21;
+	debug("pex_mpc86xx_init: last_busno %x\n",hose->last_busno);
+	debug("pex_mpc86xx init: current_busno %x\n ",hose->current_busno);
 
+	printf("....PCI scan & enumeration done\n");
 }
+
 #endif /* CONFIG_PCI */