m68k: atari - Rename "mfp" to "st_mfp" (3d92e8f3) · Commits · e / devices / android_kernel_teracube_emerald

arch/m68k/atari/ataints.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -187,8 +187,8 @@ __asm__ (__ALIGN_STR "\n" \
	" jbra ret_from_interrupt\n" \		" jbra ret_from_interrupt\n" \
	: : "i" (&kstat_cpu(0).irqs[n+8]), "i" (&irq_handler[n+8]), \		: : "i" (&kstat_cpu(0).irqs[n+8]), "i" (&irq_handler[n+8]), \
	"n" (PT_OFF_SR), "n" (n), \		"n" (PT_OFF_SR), "n" (n), \
	"i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &mfp.int_mk_a) \		"i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &st_mfp.int_mk_a) \
	: (n & 16 ? &tt_mfp.int_mk_b : &mfp.int_mk_b)), \		: (n & 16 ? &tt_mfp.int_mk_b : &st_mfp.int_mk_b)), \
	"m" (preempt_count()), "di" (HARDIRQ_OFFSET) \		"m" (preempt_count()), "di" (HARDIRQ_OFFSET) \
	); \		); \
	for (;;); /* fake noreturn */ \		for (;;); /* fake noreturn */ \
	@@ -366,14 +366,14 @@ void __init atari_init_IRQ(void)
	/* Initialize the MFP(s) */		/* Initialize the MFP(s) */

	#ifdef ATARI_USE_SOFTWARE_EOI		#ifdef ATARI_USE_SOFTWARE_EOI
	mfp.vec_adr = 0x48; /* Software EOI-Mode */		st_mfp.vec_adr = 0x48; /* Software EOI-Mode */
	#else		#else
	mfp.vec_adr = 0x40; /* Automatic EOI-Mode */		st_mfp.vec_adr = 0x40; /* Automatic EOI-Mode */
	#endif		#endif
	mfp.int_en_a = 0x00; /* turn off MFP-Ints */		st_mfp.int_en_a = 0x00; /* turn off MFP-Ints */
	mfp.int_en_b = 0x00;		st_mfp.int_en_b = 0x00;
	mfp.int_mk_a = 0xff; /* no Masking */		st_mfp.int_mk_a = 0xff; /* no Masking */
	mfp.int_mk_b = 0xff;		st_mfp.int_mk_b = 0xff;

	if (ATARIHW_PRESENT(TT_MFP)) {		if (ATARIHW_PRESENT(TT_MFP)) {
	#ifdef ATARI_USE_SOFTWARE_EOI		#ifdef ATARI_USE_SOFTWARE_EOI

arch/m68k/atari/atakeyb.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -609,10 +609,10 @@ int atari_keyb_init(void)
	ACIA_RHTID : 0);		ACIA_RHTID : 0);

	/* make sure the interrupt line is up */		/* 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 */		/* enable ACIA Interrupts */
	mfp.active_edge &= ~0x10;		st_mfp.active_edge &= ~0x10;
	atari_turnon_irq(IRQ_MFP_ACIA);		atari_turnon_irq(IRQ_MFP_ACIA);

	ikbd_self_test = 1;		ikbd_self_test = 1;

arch/m68k/atari/config.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -258,7 +258,7 @@ void __init config_atari(void)
	printk("STND_SHIFTER ");		printk("STND_SHIFTER ");
	}		}
	}		}
	if (hwreg_present(&mfp.par_dt_reg)) {		if (hwreg_present(&st_mfp.par_dt_reg)) {
	ATARIHW_SET(ST_MFP);		ATARIHW_SET(ST_MFP);
	printk("ST_MFP ");		printk("ST_MFP ");
	}		}

arch/m68k/atari/debug.c

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -34,9 +34,9 @@ static struct console atari_console_driver = {

	static inline void ata_mfp_out(char c)		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();		barrier();
	mfp.usart_dta = c;		st_mfp.usart_dta = c;
	}		}

	static void atari_mfp_console_write(struct console co, const char str,		static void atari_mfp_console_write(struct console co, const char str,
	@@ -91,7 +91,7 @@ static int ata_par_out(char c)
	/* This a some-seconds timeout in case no printer is connected */		/* This a some-seconds timeout in case no printer is connected */
	unsigned long i = loops_per_jiffy > 1 ? loops_per_jiffy : 10000000/HZ;		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)		if (!i)
	return 0;		return 0;
	@@ -131,9 +131,9 @@ static void atari_par_console_write(struct console co, const char str,
	#if 0		#if 0
	int atari_mfp_console_wait_key(struct console *co)		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();		barrier();
	return mfp.usart_dta;		return st_mfp.usart_dta;
	}		}

	int atari_scc_console_wait_key(struct console *co)		int atari_scc_console_wait_key(struct console *co)
	@@ -175,12 +175,12 @@ static void __init atari_init_mfp_port(int cflag)
	baud = B9600; /* use default 9600bps for non-implemented rates */		baud = B9600; /* use default 9600bps for non-implemented rates */
	baud -= B1200; /* baud_table[] starts at 1200bps */		baud -= B1200; /* baud_table[] starts at 1200bps */

	mfp.trn_stat &= ~0x01; /* disable TX */		st_mfp.trn_stat &= ~0x01; /* disable TX */
	mfp.usart_ctr = parity \| csize \| 0x88; /* 1:16 clk mode, 1 stop bit */		st_mfp.usart_ctr = parity \| csize \| 0x88; /* 1:16 clk mode, 1 stop bit */
	mfp.tim_ct_cd &= 0x70; /* stop timer D */		st_mfp.tim_ct_cd &= 0x70; /* stop timer D */
	mfp.tim_dt_d = baud_table[baud];		st_mfp.tim_dt_d = baud_table[baud];
	mfp.tim_ct_cd \|= 0x01; /* start timer D, 1:4 */		st_mfp.tim_ct_cd \|= 0x01; /* start timer D, 1:4 */
	mfp.trn_stat \|= 0x01; /* enable TX */		st_mfp.trn_stat \|= 0x01; /* enable TX */
	}		}

	#define SCC_WRITE(reg, val) \		#define SCC_WRITE(reg, val) \

arch/m68k/atari/time.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -27,9 +27,9 @@ void __init
	atari_sched_init(irq_handler_t timer_routine)		atari_sched_init(irq_handler_t timer_routine)
	{		{
	/* set Timer C data Register */		/* set Timer C data Register */
	mfp.tim_dt_c = INT_TICKS;		st_mfp.tim_dt_c = INT_TICKS;
	/* start timer C, div = 1:100 */		/* 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 */		/* install interrupt service routine for MFP Timer C */
	if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW,		if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW,
	"timer", timer_routine))		"timer", timer_routine))
	@@ -46,11 +46,11 @@ unsigned long atari_gettimeoffset (void)
	unsigned long ticks, offset = 0;		unsigned long ticks, offset = 0;

	/* read MFP timer C current value */		/* 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% */		/* The probability of underflow is less than 2% */
	if (ticks > INT_TICKS - INT_TICKS / 50)		if (ticks > INT_TICKS - INT_TICKS / 50)
	/* Check for pending timer interrupt */		/* Check for pending timer interrupt */
	if (mfp.int_pn_b & (1 << 5))		if (st_mfp.int_pn_b & (1 << 5))
	offset = TICK_SIZE;		offset = TICK_SIZE;

	ticks = INT_TICKS - ticks;		ticks = INT_TICKS - ticks;