m68k: atari - Rename "mfp" to "st_mfp"

http://kisskb.ellerman.id.au/kisskb/buildresult/72115/: | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile' | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed This is caused by | # define mfp ((*(volatile struct MFP*)MFP_BAS)) in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in net/mac80211/ieee80211_i.h. Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

m68k: atari - Rename "mfp" to "st_mfp"
http://kisskb.ellerman.id.au/kisskb/buildresult/72115/: | net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile' | net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token | net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type | distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed This is caused by | # define mfp ((*(volatile struct MFP*)MFP_BAS)) in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in net/mac80211/ieee80211_i.h. Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Geert Uytterhoeven · Linus Torvalds
1 parent adfafefd10
Showing 12 changed files with 56 additions and 56 deletions Side-by-side Diff
arch/m68k/atari/ataints.c
arch/m68k/atari/atakeyb.c
arch/m68k/atari/config.c
arch/m68k/atari/debug.c
arch/m68k/atari/time.c
arch/m68k/include/asm/atarihw.h
arch/m68k/include/asm/atariints.h
drivers/block/ataflop.c
drivers/char/scc.h
drivers/parport/parport_atari.c
drivers/video/atafb.c
sound/oss/dmasound/dmasound_atari.c
@@ -187,8 +187,8 @@
 "	jbra	ret_from_interrupt\n"					   \
 	 : : "i" (&kstat_cpu(0).irqs[n+8]), "i" (&irq_handler[n+8]),	   \
 	     "n" (PT_OFF_SR), "n" (n),					   \
-	     "i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &mfp.int_mk_a)	   \
-		        : (n & 16 ? &tt_mfp.int_mk_b : &mfp.int_mk_b)),	   \
+	     "i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &st_mfp.int_mk_a)   \
+		        : (n & 16 ? &tt_mfp.int_mk_b : &st_mfp.int_mk_b)), \
 	     "m" (preempt_count()), "di" (HARDIRQ_OFFSET)		   \
 );									   \
 	for (;;);			/* fake noreturn */		   \
  
  
@@ -366,14 +366,14 @@
 	/* Initialize the MFP(s) */
  
 #ifdef ATARI_USE_SOFTWARE_EOI
-	mfp.vec_adr  = 0x48;	/* Software EOI-Mode */
+	st_mfp.vec_adr  = 0x48;	/* Software EOI-Mode */
 #else
-	mfp.vec_adr  = 0x40;	/* Automatic EOI-Mode */
+	st_mfp.vec_adr  = 0x40;	/* Automatic EOI-Mode */
 #endif
-	mfp.int_en_a = 0x00;	/* turn off MFP-Ints */
-	mfp.int_en_b = 0x00;
-	mfp.int_mk_a = 0xff;	/* no Masking */
-	mfp.int_mk_b = 0xff;
+	st_mfp.int_en_a = 0x00;	/* turn off MFP-Ints */
+	st_mfp.int_en_b = 0x00;
+	st_mfp.int_mk_a = 0xff;	/* no Masking */
+	st_mfp.int_mk_b = 0xff;
  
 	if (ATARIHW_PRESENT(TT_MFP)) {
 #ifdef ATARI_USE_SOFTWARE_EOI
@@ -609,10 +609,10 @@
 				 ACIA_RHTID : 0);
  
 	/* make sure the interrupt line is up */
-	} while ((mfp.par_dt_reg & 0x10) == 0);
+	} while ((st_mfp.par_dt_reg & 0x10) == 0);
  
 	/* enable ACIA Interrupts */
-	mfp.active_edge &= ~0x10;
+	st_mfp.active_edge &= ~0x10;
 	atari_turnon_irq(IRQ_MFP_ACIA);
  
 	ikbd_self_test = 1;
@@ -258,7 +258,7 @@
 			printk("STND_SHIFTER ");
 		}
 	}
-	if (hwreg_present(&mfp.par_dt_reg)) {
+	if (hwreg_present(&st_mfp.par_dt_reg)) {
 		ATARIHW_SET(ST_MFP);
 		printk("ST_MFP ");
 	}
@@ -34,9 +34,9 @@
  
 static inline void ata_mfp_out(char c)
 {
-	while (!(mfp.trn_stat & 0x80))	/* wait for tx buf empty */
+	while (!(st_mfp.trn_stat & 0x80))	/* wait for tx buf empty */
 		barrier();
-	mfp.usart_dta = c;
+	st_mfp.usart_dta = c;
 }
  
 static void atari_mfp_console_write(struct console *co, const char *str,
@@ -91,7 +91,7 @@
 	/* This a some-seconds timeout in case no printer is connected */
 	unsigned long i = loops_per_jiffy > 1 ? loops_per_jiffy : 10000000/HZ;
  
-	while ((mfp.par_dt_reg & 1) && --i) /* wait for BUSY == L */
+	while ((st_mfp.par_dt_reg & 1) && --i) /* wait for BUSY == L */
 		;
 	if (!i)
 		return 0;
  
@@ -131,9 +131,9 @@
 #if 0
 int atari_mfp_console_wait_key(struct console *co)
 {
-	while (!(mfp.rcv_stat & 0x80))	/* wait for rx buf filled */
+	while (!(st_mfp.rcv_stat & 0x80))	/* wait for rx buf filled */
 		barrier();
-	return mfp.usart_dta;
+	return st_mfp.usart_dta;
 }
  
 int atari_scc_console_wait_key(struct console *co)
@@ -175,12 +175,12 @@
 		baud = B9600;		/* use default 9600bps for non-implemented rates */
 	baud -= B1200;			/* baud_table[] starts at 1200bps */
  
-	mfp.trn_stat &= ~0x01;		/* disable TX */
-	mfp.usart_ctr = parity | csize | 0x88; /* 1:16 clk mode, 1 stop bit */
-	mfp.tim_ct_cd &= 0x70;		/* stop timer D */
-	mfp.tim_dt_d = baud_table[baud];
-	mfp.tim_ct_cd |= 0x01;		/* start timer D, 1:4 */
-	mfp.trn_stat |= 0x01;		/* enable TX */
+	st_mfp.trn_stat &= ~0x01;	/* disable TX */
+	st_mfp.usart_ctr = parity | csize | 0x88; /* 1:16 clk mode, 1 stop bit */
+	st_mfp.tim_ct_cd &= 0x70;	/* stop timer D */
+	st_mfp.tim_dt_d = baud_table[baud];
+	st_mfp.tim_ct_cd |= 0x01;	/* start timer D, 1:4 */
+	st_mfp.trn_stat |= 0x01;	/* enable TX */
 }
  
 #define SCC_WRITE(reg, val)				\
@@ -27,9 +27,9 @@
 atari_sched_init(irq_handler_t timer_routine)
 {
     /* set Timer C data Register */
-    mfp.tim_dt_c = INT_TICKS;
+    st_mfp.tim_dt_c = INT_TICKS;
     /* start timer C, div = 1:100 */
-    mfp.tim_ct_cd = (mfp.tim_ct_cd & 15) | 0x60;
+    st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60;
     /* install interrupt service routine for MFP Timer C */
     if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW,
 		    "timer", timer_routine))
  
@@ -46,11 +46,11 @@
   unsigned long ticks, offset = 0;
  
   /* read MFP timer C current value */
-  ticks = mfp.tim_dt_c;
+  ticks = st_mfp.tim_dt_c;
   /* The probability of underflow is less than 2% */
   if (ticks > INT_TICKS - INT_TICKS / 50)
     /* Check for pending timer interrupt */
-    if (mfp.int_pn_b & (1 << 5))
+    if (st_mfp.int_pn_b & (1 << 5))
       offset = TICK_SIZE;
  
   ticks = INT_TICKS - ticks;
@@ -113,7 +113,7 @@
  * of nops on various machines. Somebody claimed that the tstb takes 600 ns.
  */
 #define	MFPDELAY() \
-	__asm__ __volatile__ ( "tstb %0" : : "m" (mfp.par_dt_reg) : "cc" );
+	__asm__ __volatile__ ( "tstb %0" : : "m" (st_mfp.par_dt_reg) : "cc" );
  
 /* Do cache push/invalidate for DMA read/write. This function obeys the
  * snooping on some machines (Medusa) and processors: The Medusa itself can
@@ -565,7 +565,7 @@
   u_char char_dummy23;
   u_char usart_dta;
  };
-# define mfp ((*(volatile struct MFP*)MFP_BAS))
+# define st_mfp ((*(volatile struct MFP*)MFP_BAS))
  
 /* TT's second MFP */
  
@@ -113,7 +113,7 @@
 {	unsigned char	mask, *reg;
  
 	mask = 1 << (irq & 7);
-	reg = (unsigned char *)&mfp.int_en_a + type*4 +
+	reg = (unsigned char *)&st_mfp.int_en_a + type*4 +
 		  ((irq & 8) >> 2) + (((irq-8) & 16) << 3);
 	return( *reg & mask );
 }
@@ -123,7 +123,7 @@
 {	unsigned char	mask, *reg;
  
 	mask = 1 << (irq & 7);
-	reg = (unsigned char *)&mfp.int_en_a + type*4 +
+	reg = (unsigned char *)&st_mfp.int_en_a + type*4 +
 		  ((irq & 8) >> 2) + (((irq-8) & 16) << 3);
 	__asm__ __volatile__ ( "orb %0,%1"
 			      : : "di" (mask), "m" (*reg) : "memory" );
@@ -134,7 +134,7 @@
 {	unsigned char	mask, *reg;
  
 	mask = ~(1 << (irq & 7));
-	reg = (unsigned char *)&mfp.int_en_a + type*4 +
+	reg = (unsigned char *)&st_mfp.int_en_a + type*4 +
 		  ((irq & 8) >> 2) + (((irq-8) & 16) << 3);
 	if (type == MFP_PENDING || type == MFP_SERVICE)
 		__asm__ __volatile__ ( "moveb %0,%1"
@@ -1730,7 +1730,7 @@
  
 	timeout = jiffies + 2*HZ+HZ/2;
 	while (time_before(jiffies, timeout))
-		if (!(mfp.par_dt_reg & 0x20))
+		if (!(st_mfp.par_dt_reg & 0x20))
 			break;
  
 	status = FDC_READ( FDCREG_STATUS );
@@ -1747,7 +1747,7 @@
 		/* dummy seek command to make WP bit accessible */
 		FDC_WRITE( FDCREG_DATA, 0 );
 		FDC_WRITE( FDCREG_CMD, FDCCMD_SEEK );
-		while( mfp.par_dt_reg & 0x20 )
+		while( st_mfp.par_dt_reg & 0x20 )
 			;
 		status = FDC_READ( FDCREG_STATUS );
 	}
@@ -387,7 +387,7 @@
 /* The SCC needs 3.5 PCLK cycles recovery time between to register
  * accesses. PCLK runs with 8 MHz on an Atari, so this delay is 3.5 *
  * 125 ns = 437.5 ns. This is too short for udelay().
- * 10/16/95: A tstb mfp.par_dt_reg takes 600ns (sure?) and thus should be
+ * 10/16/95: A tstb st_mfp.par_dt_reg takes 600ns (sure?) and thus should be
  * quite right
  */
  
@@ -84,7 +84,7 @@
 static unsigned char
 parport_atari_read_status(struct parport *p)
 {
-	return ((mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) |
+	return ((st_mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) |
 		PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR);
 }
  
  
@@ -193,9 +193,9 @@
 		sound_ym.wd_data = sound_ym.rd_data_reg_sel | (1 << 5);
 		local_irq_restore(flags);
 		/* MFP port I0 as input. */
-		mfp.data_dir &= ~1;
+		st_mfp.data_dir &= ~1;
 		/* MFP port I0 interrupt on high->low edge. */
-		mfp.active_edge &= ~1;
+		st_mfp.active_edge &= ~1;
 		p = parport_register_port((unsigned long)&sound_ym.wd_data,
 					  IRQ_MFP_BUSY, PARPORT_DMA_NONE,
 					  &parport_atari_ops);
@@ -841,7 +841,7 @@
 		tt_dmasnd.ctrl = DMASND_CTRL_OFF;
 		udelay(20);		/* wait a while for things to settle down */
 	}
-	mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+	mono_moni = (st_mfp.par_dt_reg & 0x80) == 0;
  
 	tt_get_par(&par);
 	tt_encode_var(&atafb_predefined[0], &par);
@@ -2035,7 +2035,7 @@
 		tt_dmasnd.ctrl = DMASND_CTRL_OFF;
 		udelay(20);		/* wait a while for things to settle down */
 	}
-	mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+	mono_moni = (st_mfp.par_dt_reg & 0x80) == 0;
  
 	stste_get_par(&par);
 	stste_encode_var(&atafb_predefined[0], &par);
  
  
  
@@ -2086,20 +2086,20 @@
 		return;
 	local_irq_save(flags);
  
-	mfp.tim_ct_b = 0x10;
-	mfp.active_edge |= 8;
-	mfp.tim_ct_b = 0;
-	mfp.tim_dt_b = 0xf0;
-	mfp.tim_ct_b = 8;
-	while (mfp.tim_dt_b > 1)	/* TOS does it this way, don't ask why */
+	st_mfp.tim_ct_b = 0x10;
+	st_mfp.active_edge |= 8;
+	st_mfp.tim_ct_b = 0;
+	st_mfp.tim_dt_b = 0xf0;
+	st_mfp.tim_ct_b = 8;
+	while (st_mfp.tim_dt_b > 1)	/* TOS does it this way, don't ask why */
 		;
-	new = mfp.tim_dt_b;
+	new = st_mfp.tim_dt_b;
 	do {
 		udelay(LINE_DELAY);
 		old = new;
-		new = mfp.tim_dt_b;
+		new = st_mfp.tim_dt_b;
 	} while (old != new);
-	mfp.tim_ct_b = 0x10;
+	st_mfp.tim_ct_b = 0x10;
 	udelay(SYNC_DELAY);
  
 	if (atari_switches & ATARI_SWITCH_OVSC_IKBD)
@@ -847,23 +847,23 @@
 	   of events. So all we need to keep the music playing is
 	   to provide the sound hardware with new data upon
 	   an interrupt from timer A. */
-	mfp.tim_ct_a = 0;	/* ++roman: Stop timer before programming! */
-	mfp.tim_dt_a = 1;	/* Cause interrupt after first event. */
-	mfp.tim_ct_a = 8;	/* Turn on event counting. */
+	st_mfp.tim_ct_a = 0;	/* ++roman: Stop timer before programming! */
+	st_mfp.tim_dt_a = 1;	/* Cause interrupt after first event. */
+	st_mfp.tim_ct_a = 8;	/* Turn on event counting. */
 	/* Register interrupt handler. */
 	if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound",
 			AtaInterrupt))
 		return 0;
-	mfp.int_en_a |= 0x20;	/* Turn interrupt on. */
-	mfp.int_mk_a |= 0x20;
+	st_mfp.int_en_a |= 0x20;	/* Turn interrupt on. */
+	st_mfp.int_mk_a |= 0x20;
 	return 1;
 }
  
 #ifdef MODULE
 static void AtaIrqCleanUp(void)
 {
-	mfp.tim_ct_a = 0;	/* stop timer */
-	mfp.int_en_a &= ~0x20;	/* turn interrupt off */
+	st_mfp.tim_ct_a = 0;		/* stop timer */
+	st_mfp.int_en_a &= ~0x20;	/* turn interrupt off */
 	free_irq(IRQ_MFP_TIMA, AtaInterrupt);
 }
 #endif /* MODULE */
@@ -1599,7 +1599,7 @@
 		is_falcon = 0;
 	    } else
 		return -ENODEV;
-	    if ((mfp.int_en_a & mfp.int_mk_a & 0x20) == 0)
+	    if ((st_mfp.int_en_a & st_mfp.int_mk_a & 0x20) == 0)
 		return dmasound_init();
 	    else {
 		printk("DMA sound driver: Timer A interrupt already in use\n");
...	...	@@ -187,8 +187,8 @@
187	187	" jbra ret_from_interrupt\n" \
188	188	: : "i" (&kstat_cpu(0).irqs[n+8]), "i" (&irq_handler[n+8]), \
189	189	"n" (PT_OFF_SR), "n" (n), \
190		- "i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &mfp.int_mk_a) \
191		- : (n & 16 ? &tt_mfp.int_mk_b : &mfp.int_mk_b)), \
	190	+ "i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &st_mfp.int_mk_a) \
	191	+ : (n & 16 ? &tt_mfp.int_mk_b : &st_mfp.int_mk_b)), \
192	192	"m" (preempt_count()), "di" (HARDIRQ_OFFSET) \
193	193	); \
194	194	for (;;); /* fake noreturn */ \
195	195
196	196
...	...	@@ -366,14 +366,14 @@
366	366	/* Initialize the MFP(s) */
367	367
368	368	#ifdef ATARI_USE_SOFTWARE_EOI
369		- mfp.vec_adr = 0x48; /* Software EOI-Mode */
	369	+ st_mfp.vec_adr = 0x48; /* Software EOI-Mode */
370	370	#else
371		- mfp.vec_adr = 0x40; /* Automatic EOI-Mode */
	371	+ st_mfp.vec_adr = 0x40; /* Automatic EOI-Mode */
372	372	#endif
373		- mfp.int_en_a = 0x00; /* turn off MFP-Ints */
374		- mfp.int_en_b = 0x00;
375		- mfp.int_mk_a = 0xff; /* no Masking */
376		- mfp.int_mk_b = 0xff;
	373	+ st_mfp.int_en_a = 0x00; /* turn off MFP-Ints */
	374	+ st_mfp.int_en_b = 0x00;
	375	+ st_mfp.int_mk_a = 0xff; /* no Masking */
	376	+ st_mfp.int_mk_b = 0xff;
377	377
378	378	if (ATARIHW_PRESENT(TT_MFP)) {
379	379	#ifdef ATARI_USE_SOFTWARE_EOI
...	...	@@ -609,10 +609,10 @@
609	609	ACIA_RHTID : 0);
610	610
611	611	/* make sure the interrupt line is up */
612		- } while ((mfp.par_dt_reg & 0x10) == 0);
	612	+ } while ((st_mfp.par_dt_reg & 0x10) == 0);
613	613
614	614	/* enable ACIA Interrupts */
615		- mfp.active_edge &= ~0x10;
	615	+ st_mfp.active_edge &= ~0x10;
616	616	atari_turnon_irq(IRQ_MFP_ACIA);
617	617
618	618	ikbd_self_test = 1;
...	...	@@ -258,7 +258,7 @@
258	258	printk("STND_SHIFTER ");
259	259	}
260	260	}
261		- if (hwreg_present(&mfp.par_dt_reg)) {
	261	+ if (hwreg_present(&st_mfp.par_dt_reg)) {
262	262	ATARIHW_SET(ST_MFP);
263	263	printk("ST_MFP ");
264	264	}
...	...	@@ -34,9 +34,9 @@
34	34
35	35	static inline void ata_mfp_out(char c)
36	36	{
37		- while (!(mfp.trn_stat & 0x80)) /* wait for tx buf empty */
	37	+ while (!(st_mfp.trn_stat & 0x80)) /* wait for tx buf empty */
38	38	barrier();
39		- mfp.usart_dta = c;
	39	+ st_mfp.usart_dta = c;
40	40	}
41	41
42	42	static void atari_mfp_console_write(struct console co, const char str,
...	...	@@ -91,7 +91,7 @@
91	91	/* This a some-seconds timeout in case no printer is connected */
92	92	unsigned long i = loops_per_jiffy > 1 ? loops_per_jiffy : 10000000/HZ;
93	93
94		- while ((mfp.par_dt_reg & 1) && --i) /* wait for BUSY == L */
	94	+ while ((st_mfp.par_dt_reg & 1) && --i) /* wait for BUSY == L */
95	95	;
96	96	if (!i)
97	97	return 0;
98	98
...	...	@@ -131,9 +131,9 @@
131	131	#if 0
132	132	int atari_mfp_console_wait_key(struct console *co)
133	133	{
134		- while (!(mfp.rcv_stat & 0x80)) /* wait for rx buf filled */
	134	+ while (!(st_mfp.rcv_stat & 0x80)) /* wait for rx buf filled */
135	135	barrier();
136		- return mfp.usart_dta;
	136	+ return st_mfp.usart_dta;
137	137	}
138	138
139	139	int atari_scc_console_wait_key(struct console *co)
...	...	@@ -175,12 +175,12 @@
175	175	baud = B9600; /* use default 9600bps for non-implemented rates */
176	176	baud -= B1200; /* baud_table[] starts at 1200bps */
177	177
178		- mfp.trn_stat &= ~0x01; /* disable TX */
179		- mfp.usart_ctr = parity \| csize \| 0x88; /* 1:16 clk mode, 1 stop bit */
180		- mfp.tim_ct_cd &= 0x70; /* stop timer D */
181		- mfp.tim_dt_d = baud_table[baud];
182		- mfp.tim_ct_cd \|= 0x01; /* start timer D, 1:4 */
183		- mfp.trn_stat \|= 0x01; /* enable TX */
	178	+ st_mfp.trn_stat &= ~0x01; /* disable TX */
	179	+ st_mfp.usart_ctr = parity \| csize \| 0x88; /* 1:16 clk mode, 1 stop bit */
	180	+ st_mfp.tim_ct_cd &= 0x70; /* stop timer D */
	181	+ st_mfp.tim_dt_d = baud_table[baud];
	182	+ st_mfp.tim_ct_cd \|= 0x01; /* start timer D, 1:4 */
	183	+ st_mfp.trn_stat \|= 0x01; /* enable TX */
184	184	}
185	185
186	186	#define SCC_WRITE(reg, val) \
...	...	@@ -27,9 +27,9 @@
27	27	atari_sched_init(irq_handler_t timer_routine)
28	28	{
29	29	/* set Timer C data Register */
30		- mfp.tim_dt_c = INT_TICKS;
	30	+ st_mfp.tim_dt_c = INT_TICKS;
31	31	/* start timer C, div = 1:100 */
32		- mfp.tim_ct_cd = (mfp.tim_ct_cd & 15) \| 0x60;
	32	+ st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) \| 0x60;
33	33	/* install interrupt service routine for MFP Timer C */
34	34	if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW,
35	35	"timer", timer_routine))
36	36
...	...	@@ -46,11 +46,11 @@
46	46	unsigned long ticks, offset = 0;
47	47
48	48	/* read MFP timer C current value */
49		- ticks = mfp.tim_dt_c;
	49	+ ticks = st_mfp.tim_dt_c;
50	50	/* The probability of underflow is less than 2% */
51	51	if (ticks > INT_TICKS - INT_TICKS / 50)
52	52	/* Check for pending timer interrupt */
53		- if (mfp.int_pn_b & (1 << 5))
	53	+ if (st_mfp.int_pn_b & (1 << 5))
54	54	offset = TICK_SIZE;
55	55
56	56	ticks = INT_TICKS - ticks;
...	...	@@ -113,7 +113,7 @@
113	113	* of nops on various machines. Somebody claimed that the tstb takes 600 ns.
114	114	*/
115	115	#define MFPDELAY() \
116		- __asm__ __volatile__ ( "tstb %0" : : "m" (mfp.par_dt_reg) : "cc" );
	116	+ __asm__ __volatile__ ( "tstb %0" : : "m" (st_mfp.par_dt_reg) : "cc" );
117	117
118	118	/* Do cache push/invalidate for DMA read/write. This function obeys the
119	119	* snooping on some machines (Medusa) and processors: The Medusa itself can
...	...	@@ -565,7 +565,7 @@
565	565	u_char char_dummy23;
566	566	u_char usart_dta;
567	567	};
568		-# define mfp (((volatile struct MFP)MFP_BAS))
	568	+# define st_mfp (((volatile struct MFP)MFP_BAS))
569	569
570	570	/* TT's second MFP */
571	571
...	...	@@ -113,7 +113,7 @@
113	113	{ unsigned char mask, *reg;
114	114
115	115	mask = 1 << (irq & 7);
116		- reg = (unsigned char )&mfp.int_en_a + type4 +
	116	+ reg = (unsigned char )&st_mfp.int_en_a + type4 +
117	117	((irq & 8) >> 2) + (((irq-8) & 16) << 3);
118	118	return( *reg & mask );
119	119	}
...	...	@@ -123,7 +123,7 @@
123	123	{ unsigned char mask, *reg;
124	124
125	125	mask = 1 << (irq & 7);
126		- reg = (unsigned char )&mfp.int_en_a + type4 +
	126	+ reg = (unsigned char )&st_mfp.int_en_a + type4 +
127	127	((irq & 8) >> 2) + (((irq-8) & 16) << 3);
128	128	__asm__ __volatile__ ( "orb %0,%1"
129	129	: : "di" (mask), "m" (*reg) : "memory" );
...	...	@@ -134,7 +134,7 @@
134	134	{ unsigned char mask, *reg;
135	135
136	136	mask = ~(1 << (irq & 7));
137		- reg = (unsigned char )&mfp.int_en_a + type4 +
	137	+ reg = (unsigned char )&st_mfp.int_en_a + type4 +
138	138	((irq & 8) >> 2) + (((irq-8) & 16) << 3);
139	139	if (type == MFP_PENDING \|\| type == MFP_SERVICE)
140	140	__asm__ __volatile__ ( "moveb %0,%1"
...	...	@@ -1730,7 +1730,7 @@
1730	1730
1731	1731	timeout = jiffies + 2*HZ+HZ/2;
1732	1732	while (time_before(jiffies, timeout))
1733		- if (!(mfp.par_dt_reg & 0x20))
	1733	+ if (!(st_mfp.par_dt_reg & 0x20))
1734	1734	break;
1735	1735
1736	1736	status = FDC_READ( FDCREG_STATUS );
...	...	@@ -1747,7 +1747,7 @@
1747	1747	/* dummy seek command to make WP bit accessible */
1748	1748	FDC_WRITE( FDCREG_DATA, 0 );
1749	1749	FDC_WRITE( FDCREG_CMD, FDCCMD_SEEK );
1750		- while( mfp.par_dt_reg & 0x20 )
	1750	+ while( st_mfp.par_dt_reg & 0x20 )
1751	1751	;
1752	1752	status = FDC_READ( FDCREG_STATUS );
1753	1753	}
...	...	@@ -387,7 +387,7 @@
387	387	/* The SCC needs 3.5 PCLK cycles recovery time between to register
388	388	* accesses. PCLK runs with 8 MHz on an Atari, so this delay is 3.5 *
389	389	* 125 ns = 437.5 ns. This is too short for udelay().
390		- * 10/16/95: A tstb mfp.par_dt_reg takes 600ns (sure?) and thus should be
	390	+ * 10/16/95: A tstb st_mfp.par_dt_reg takes 600ns (sure?) and thus should be
391	391	* quite right
392	392	*/
393	393
...	...	@@ -84,7 +84,7 @@
84	84	static unsigned char
85	85	parport_atari_read_status(struct parport *p)
86	86	{
87		- return ((mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) \|
	87	+ return ((st_mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) \|
88	88	PARPORT_STATUS_SELECT \| PARPORT_STATUS_ERROR);
89	89	}
90	90
91	91
...	...	@@ -193,9 +193,9 @@
193	193	sound_ym.wd_data = sound_ym.rd_data_reg_sel \| (1 << 5);
194	194	local_irq_restore(flags);
195	195	/* MFP port I0 as input. */
196		- mfp.data_dir &= ~1;
	196	+ st_mfp.data_dir &= ~1;
197	197	/* MFP port I0 interrupt on high->low edge. */
198		- mfp.active_edge &= ~1;
	198	+ st_mfp.active_edge &= ~1;
199	199	p = parport_register_port((unsigned long)&sound_ym.wd_data,
200	200	IRQ_MFP_BUSY, PARPORT_DMA_NONE,
201	201	&parport_atari_ops);