patch-2.4.22 linux-2.4.22/arch/ppc/platforms/prep_setup.c

• Lines: 216
• Date: 2003-08-25 04:44:40.000000000 -0700
• Orig file: linux-2.4.21/arch/ppc/platforms/prep_setup.c
• Orig date: 2003-06-13 07:51:31.000000000 -0700

diff -urN linux-2.4.21/arch/ppc/platforms/prep_setup.c linux-2.4.22/arch/ppc/platforms/prep_setup.c
@@ -102,7 +102,7 @@
 /* for the mac fs */
 kdev_t boot_dev;
 
-#ifdef CONFIG_SOUND_CS4232 
+#ifdef CONFIG_SOUND_CS4232
 long ppc_cs4232_dma, ppc_cs4232_dma2;
 #endif
 
@@ -111,7 +111,7 @@
 extern int probingmem;
 extern unsigned long loops_per_jiffy;
 
-#ifdef CONFIG_SOUND_CS4232 
+#ifdef CONFIG_SOUND_CS4232
 EXPORT_SYMBOL(ppc_cs4232_dma);
 EXPORT_SYMBOL(ppc_cs4232_dma2);
 #endif
@@ -196,7 +196,7 @@
 
 	/* print info about the SCSI fuse */
 	seq_printf(m, "scsi fuse\t: ");
-	if (equip_reg & PREP_IBM_EQUIPMENT_SCSIFUSE) 
+	if (equip_reg & PREP_IBM_EQUIPMENT_SCSIFUSE)
 		seq_printf(m, "ok");
 	else
 		seq_printf(m, "bad");
@@ -210,8 +210,8 @@
 		for (i = 0; (res->ActualNumMemories) && (i < MAX_MEMS); i++) {
 			if (res->Memories[i].SIMMSize != 0)
 				seq_printf(m, "%d:%ldMiB ", i,
-					(res->Memories[i].SIMMSize > 1024) ? 
-					res->Memories[i].SIMMSize>>20 : 
+					(res->Memories[i].SIMMSize > 1024) ?
+					res->Memories[i].SIMMSize>>20 :
 					res->Memories[i].SIMMSize);
 		}
 		seq_printf(m, "\n");
@@ -374,12 +374,12 @@
 			seq_printf(m, "async, ");
 		else
 			seq_printf(m, "sync burst, ");
-		
+
 		if (l2_reg & 0x4)
 			seq_printf(m, "parity, ");
 		else
 			seq_printf(m, "no parity, ");
-		
+
 		switch (l2_reg & 0x3) {
 			case 0x0:
 				seq_printf(m, "256KiB\n");
@@ -453,8 +453,8 @@
 		for (i = 0; (res->ActualNumMemories) && (i < MAX_MEMS); i++) {
 			if (res->Memories[i].SIMMSize != 0)
 				seq_printf(m, "%d:%ldM ", i,
-					(res->Memories[i].SIMMSize > 1024) ? 
-					res->Memories[i].SIMMSize>>20 : 
+					(res->Memories[i].SIMMSize > 1024) ?
+					res->Memories[i].SIMMSize>>20 :
 					res->Memories[i].SIMMSize);
 		}
 		seq_printf(m, "\n");
@@ -570,7 +570,7 @@
 {
 	/* PREP's without residual data will give incorrect values here */
 	seq_printf(m, "clock\t\t: ");
-#ifdef CONFIG_PREP_RESIDUAL	
+#ifdef CONFIG_PREP_RESIDUAL
 	if (res->ResidualLength)
 		seq_printf(m, "%ldMHz\n",
 			   (res->VitalProductData.ProcessorHz > 1024) ?
@@ -583,7 +583,7 @@
 	return 0;
 }
 
-#ifdef CONFIG_SOUND_CS4232 
+#ifdef CONFIG_SOUND_CS4232
 static long __init masktoint(unsigned int i)
 {
 	int t = -1;
@@ -594,7 +594,7 @@
 
 /*
  * ppc_cs4232_dma and ppc_cs4232_dma2 are used in include/asm/dma.h
- * to distinguish sound dma-channels from others. This is because 
+ * to distinguish sound dma-channels from others. This is because
  * blocksize on 16 bit dma-channels 5,6,7 is 128k, but
  * the cs4232.c uses 64k like on 8 bit dma-channels 0,1,2,3
  */
@@ -605,7 +605,7 @@
 
 	/*
 	 * Get the needed resource informations from residual data.
-	 * 
+	 *
 	 */
 #ifdef CONFIG_PREP_RESIDUAL
 	audiodevice = residual_find_device(~0, NULL, MultimediaController,
@@ -627,7 +627,7 @@
 	/*
 	 * These are the PReP specs' defaults for the cs4231.  We use these
 	 * as fallback incase we don't have residual data.
-	 * At least the IBM Thinkpad 850 with IDE DMA Channels at 6 and 7 
+	 * At least the IBM Thinkpad 850 with IDE DMA Channels at 6 and 7
 	 * will use the other values.
 	 */
 	if (audiodevice == NULL) {
@@ -636,7 +636,7 @@
 			ppc_cs4232_dma = 1;
 			ppc_cs4232_dma2 = -1;
 			break;
-		default: 
+		default:
 			ppc_cs4232_dma = 6;
 			ppc_cs4232_dma2 = 7;
 		}
@@ -659,8 +659,7 @@
 prep_init_vesa(void)
 {
 #if defined(CONFIG_PREP_RESIDUAL) && \
-	(defined(CONFIG_FB_VGA16) || defined(CONFIG_FB_VGA_16_MODULE) || \
-	 defined(CONFIG_FB_VESA))
+	(defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_FB))
 	PPC_DEVICE *vgadev;
 
 	vgadev = residual_find_device(~0, NULL, DisplayController, SVGAController,
@@ -700,10 +699,10 @@
 
 	/* init to some ~sane value until calibrate_delay() runs */
 	loops_per_jiffy = 50000000;
-	
+
 	/* Lookup PCI host bridges */
 	prep_find_bridges();
-	
+
 	/* Set up floppy in PS/2 mode */
 	outb(0x09, SIO_CONFIG_RA);
 	reg = inb(SIO_CONFIG_RD);
@@ -782,7 +781,7 @@
 		break;
 	}
 
-	/* Read in NVRAM data */ 
+	/* Read in NVRAM data */
 	init_prep_nvram();
 
 	/* if no bootargs, look in NVRAM */
@@ -796,7 +795,7 @@
 		}
 	}
 
-#ifdef CONFIG_SOUND_CS4232 
+#ifdef CONFIG_SOUND_CS4232
 	prep_init_sound();
 #endif /* CONFIG_SOUND_CS4232 */
 
@@ -840,7 +839,7 @@
 		tb_ticks_per_jiffy = freq / HZ / divisor;
 		return 0;
 	} else
-#endif	
+#endif
 		return 1;
 }
 
@@ -915,12 +914,12 @@
 	tmp = ppc_md.nvram_read_val(MK48T59_RTC_CONTROLB);
 	if (tmp & MK48T59_RTC_CB_STOP) {
 		printk("Warning: RTC was stopped, date will be wrong.\n");
-		ppc_md.nvram_write_val(MK48T59_RTC_CONTROLB, 
+		ppc_md.nvram_write_val(MK48T59_RTC_CONTROLB,
 					 tmp & ~MK48T59_RTC_CB_STOP);
 		/* Low frequency crystal oscillators may take a very long
 		 * time to startup and stabilize. For now just ignore the
 		 * the issue, but attempting to calibrate the decrementer
-		 * from the RTC just after this wakeup is likely to be very 
+		 * from the RTC just after this wakeup is likely to be very
 		 * inaccurate. Firmware should not allow to load
 		 * the OS with the clock stopped anyway...
 		 */
@@ -944,11 +943,11 @@
 	unsigned char save_control;
 	long i;
 	unsigned char sec;
- 
-		
+
+
 	/* Make sure the time is not stopped. */
 	save_control = ppc_md.nvram_read_val(MK48T59_RTC_CONTROLB);
-	
+
 	ppc_md.nvram_write_val(MK48T59_RTC_CONTROLA,
 			(save_control & (~MK48T59_RTC_CB_STOP)));
 
@@ -1135,7 +1134,7 @@
 prep_init(unsigned long r3, unsigned long r4, unsigned long r5,
 		unsigned long r6, unsigned long r7)
 {
-#ifdef CONFIG_PREP_RESIDUAL	
+#ifdef CONFIG_PREP_RESIDUAL
 	/* make a copy of residual data */
 	if ( r3 ) {
 		memcpy((void *)res,(void *)(r3+KERNELBASE),
@@ -1151,7 +1150,7 @@
 	DMA_MODE_WRITE = 0x48;
 
 	/* figure out what kind of prep workstation we are */
-#ifdef CONFIG_PREP_RESIDUAL	
+#ifdef CONFIG_PREP_RESIDUAL
 	if ( res->ResidualLength != 0 ) {
 		if ( !strncmp(res->VitalProductData.PrintableModel,"IBM",3) )
 			_prep_type = _PREP_IBM;