Skip to content

Commit

Permalink
[PATCH] m68k: namespace pollution fix (custom->amiga_custom)
Browse files Browse the repository at this point in the history 
in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent 198a410 commit b4290a2
Show file tree
Hide file tree
Showing 22 changed files with 108 additions and 100 deletions.
46 changes: 23 additions & 23 deletions arch/m68k/amiga/amiints.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ void __init amiga_init_IRQ(void)
gayle.inten = GAYLE_IRQ_IDE;

/* turn off all interrupts and enable the master interrupt bit */
custom.intena = 0x7fff;
custom.intreq = 0x7fff;
custom.intena = IF_SETCLR | IF_INTEN;
amiga_custom.intena = 0x7fff;
amiga_custom.intreq = 0x7fff;
amiga_custom.intena = IF_SETCLR | IF_INTEN;

cia_init_IRQ(&ciaa_base);
cia_init_IRQ(&ciab_base);
Expand Down Expand Up @@ -245,7 +245,7 @@ int amiga_request_irq(unsigned int irq,

/* enable the interrupt */
if (irq < IRQ_AMIGA_PORTS && !ami_ablecount[irq])
custom.intena = IF_SETCLR | amiga_intena_vals[irq];
amiga_custom.intena = IF_SETCLR | amiga_intena_vals[irq];

return error;
}
Expand Down Expand Up @@ -274,7 +274,7 @@ void amiga_free_irq(unsigned int irq, void *dev_id)
amiga_delete_irq(&ami_irq_list[irq], dev_id);
/* if server list empty, disable the interrupt */
if (!ami_irq_list[irq] && irq < IRQ_AMIGA_PORTS)
custom.intena = amiga_intena_vals[irq];
amiga_custom.intena = amiga_intena_vals[irq];
} else {
if (ami_irq_list[irq]->dev_id != dev_id)
printk("%s: removing probably wrong IRQ %d from %s\n",
Expand All @@ -283,7 +283,7 @@ void amiga_free_irq(unsigned int irq, void *dev_id)
ami_irq_list[irq]->flags = 0;
ami_irq_list[irq]->dev_id = NULL;
ami_irq_list[irq]->devname = NULL;
custom.intena = amiga_intena_vals[irq];
amiga_custom.intena = amiga_intena_vals[irq];
}
}

Expand Down Expand Up @@ -327,7 +327,7 @@ void amiga_enable_irq(unsigned int irq)
}

/* enable the interrupt */
custom.intena = IF_SETCLR | amiga_intena_vals[irq];
amiga_custom.intena = IF_SETCLR | amiga_intena_vals[irq];
}

void amiga_disable_irq(unsigned int irq)
Expand Down Expand Up @@ -358,7 +358,7 @@ void amiga_disable_irq(unsigned int irq)
}

/* disable the interrupt */
custom.intena = amiga_intena_vals[irq];
amiga_custom.intena = amiga_intena_vals[irq];
}

inline void amiga_do_irq(int irq, struct pt_regs *fp)
Expand All @@ -373,7 +373,7 @@ void amiga_do_irq_list(int irq, struct pt_regs *fp)

kstat_cpu(0).irqs[SYS_IRQS + irq]++;

custom.intreq = amiga_intena_vals[irq];
amiga_custom.intreq = amiga_intena_vals[irq];

for (node = ami_irq_list[irq]; node; node = node->next)
node->handler(irq, node->dev_id, fp);
Expand All @@ -385,41 +385,41 @@ void amiga_do_irq_list(int irq, struct pt_regs *fp)

static irqreturn_t ami_int1(int irq, void *dev_id, struct pt_regs *fp)
{
unsigned short ints = custom.intreqr & custom.intenar;
unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;

/* if serial transmit buffer empty, interrupt */
if (ints & IF_TBE) {
custom.intreq = IF_TBE;
amiga_custom.intreq = IF_TBE;
amiga_do_irq(IRQ_AMIGA_TBE, fp);
}

/* if floppy disk transfer complete, interrupt */
if (ints & IF_DSKBLK) {
custom.intreq = IF_DSKBLK;
amiga_custom.intreq = IF_DSKBLK;
amiga_do_irq(IRQ_AMIGA_DSKBLK, fp);
}

/* if software interrupt set, interrupt */
if (ints & IF_SOFT) {
custom.intreq = IF_SOFT;
amiga_custom.intreq = IF_SOFT;
amiga_do_irq(IRQ_AMIGA_SOFT, fp);
}
return IRQ_HANDLED;
}

static irqreturn_t ami_int3(int irq, void *dev_id, struct pt_regs *fp)
{
unsigned short ints = custom.intreqr & custom.intenar;
unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;

/* if a blitter interrupt */
if (ints & IF_BLIT) {
custom.intreq = IF_BLIT;
amiga_custom.intreq = IF_BLIT;
amiga_do_irq(IRQ_AMIGA_BLIT, fp);
}

/* if a copper interrupt */
if (ints & IF_COPER) {
custom.intreq = IF_COPER;
amiga_custom.intreq = IF_COPER;
amiga_do_irq(IRQ_AMIGA_COPPER, fp);
}

Expand All @@ -431,37 +431,37 @@ static irqreturn_t ami_int3(int irq, void *dev_id, struct pt_regs *fp)

static irqreturn_t ami_int4(int irq, void *dev_id, struct pt_regs *fp)
{
unsigned short ints = custom.intreqr & custom.intenar;
unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;

/* if audio 0 interrupt */
if (ints & IF_AUD0) {
custom.intreq = IF_AUD0;
amiga_custom.intreq = IF_AUD0;
amiga_do_irq(IRQ_AMIGA_AUD0, fp);
}

/* if audio 1 interrupt */
if (ints & IF_AUD1) {
custom.intreq = IF_AUD1;
amiga_custom.intreq = IF_AUD1;
amiga_do_irq(IRQ_AMIGA_AUD1, fp);
}

/* if audio 2 interrupt */
if (ints & IF_AUD2) {
custom.intreq = IF_AUD2;
amiga_custom.intreq = IF_AUD2;
amiga_do_irq(IRQ_AMIGA_AUD2, fp);
}

/* if audio 3 interrupt */
if (ints & IF_AUD3) {
custom.intreq = IF_AUD3;
amiga_custom.intreq = IF_AUD3;
amiga_do_irq(IRQ_AMIGA_AUD3, fp);
}
return IRQ_HANDLED;
}

static irqreturn_t ami_int5(int irq, void *dev_id, struct pt_regs *fp)
{
unsigned short ints = custom.intreqr & custom.intenar;
unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;

/* if serial receive buffer full interrupt */
if (ints & IF_RBF) {
Expand All @@ -471,7 +471,7 @@ static irqreturn_t ami_int5(int irq, void *dev_id, struct pt_regs *fp)

/* if a disk sync interrupt */
if (ints & IF_DSKSYN) {
custom.intreq = IF_DSKSYN;
amiga_custom.intreq = IF_DSKSYN;
amiga_do_irq(IRQ_AMIGA_DSKSYN, fp);
}
return IRQ_HANDLED;
Expand Down
2 changes: 2 additions & 0 deletions arch/m68k/amiga/amisound.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ static const signed char sine_data[] = {
};
#define DATA_SIZE (sizeof(sine_data)/sizeof(sine_data[0]))

#define custom amiga_custom

/*
* The minimum period for audio may be modified by the frame buffer
* device since it depends on htotal (for OCS/ECS/AGA)
Expand Down
8 changes: 4 additions & 4 deletions arch/m68k/amiga/cia.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ unsigned char cia_set_irq(struct ciabase *base, unsigned char mask)
else
base->icr_data &= ~mask;
if (base->icr_data & base->icr_mask)
custom.intreq = IF_SETCLR | base->int_mask;
amiga_custom.intreq = IF_SETCLR | base->int_mask;
return old & base->icr_mask;
}

Expand Down Expand Up @@ -89,7 +89,7 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
}
}
if (base->icr_data & base->icr_mask)
custom.intreq = IF_SETCLR | base->int_mask;
amiga_custom.intreq = IF_SETCLR | base->int_mask;
return old;
}

Expand Down Expand Up @@ -133,7 +133,7 @@ static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)
mach_irq = base->cia_irq;
irq = SYS_IRQS + mach_irq;
ints = cia_set_irq(base, CIA_ICR_ALL);
custom.intreq = base->int_mask;
amiga_custom.intreq = base->int_mask;
for (i = 0; i < CIA_IRQS; i++, irq++, mach_irq++) {
if (ints & 1) {
kstat_cpu(0).irqs[irq]++;
Expand Down Expand Up @@ -162,7 +162,7 @@ void __init cia_init_IRQ(struct ciabase *base)
/* install CIA handler */
request_irq(base->handler_irq, cia_handler, 0, base->name, base);

custom.intena = IF_SETCLR | base->int_mask;
amiga_custom.intena = IF_SETCLR | base->int_mask;
}

int cia_get_irq_list(struct ciabase *base, struct seq_file *p)
Expand Down
18 changes: 9 additions & 9 deletions arch/m68k/amiga/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ static void __init amiga_identify(void)
case CS_OCS:
case CS_ECS:
case CS_AGA:
switch (custom.deniseid & 0xf) {
switch (amiga_custom.deniseid & 0xf) {
case 0x0c:
AMIGAHW_SET(DENISE_HR);
break;
Expand All @@ -303,7 +303,7 @@ static void __init amiga_identify(void)
AMIGAHW_SET(DENISE);
break;
}
switch ((custom.vposr>>8) & 0x7f) {
switch ((amiga_custom.vposr>>8) & 0x7f) {
case 0x00:
AMIGAHW_SET(AGNUS_PAL);
break;
Expand Down Expand Up @@ -447,9 +447,9 @@ void __init config_amiga(void)
amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */

/* clear all DMA bits */
custom.dmacon = DMAF_ALL;
amiga_custom.dmacon = DMAF_ALL;
/* ensure that the DMA master bit is set */
custom.dmacon = DMAF_SETCLR | DMAF_MASTER;
amiga_custom.dmacon = DMAF_SETCLR | DMAF_MASTER;

/* don't use Z2 RAM as system memory on Z3 capable machines */
if (AMIGAHW_PRESENT(ZORRO3)) {
Expand Down Expand Up @@ -830,8 +830,8 @@ static void amiga_savekmsg_init(void)

static void amiga_serial_putc(char c)
{
custom.serdat = (unsigned char)c | 0x100;
while (!(custom.serdatr & 0x2000))
amiga_custom.serdat = (unsigned char)c | 0x100;
while (!(amiga_custom.serdatr & 0x2000))
;
}

Expand All @@ -855,11 +855,11 @@ int amiga_serial_console_wait_key(struct console *co)
{
int ch;

while (!(custom.intreqr & IF_RBF))
while (!(amiga_custom.intreqr & IF_RBF))
barrier();
ch = custom.serdatr & 0xff;
ch = amiga_custom.serdatr & 0xff;
/* clear the interrupt, so that another character can be read */
custom.intreq = IF_RBF;
amiga_custom.intreq = IF_RBF;
return ch;
}

Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/kernel/asm-offsets.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ int main(void)
DEFINE(TRAP_TRACE, TRAP_TRACE);

/* offsets into the custom struct */
DEFINE(CUSTOMBASE, &custom);
DEFINE(CUSTOMBASE, &amiga_custom);
DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar));
DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr));
DEFINE(C_INTENA, offsetof(struct CUSTOM, intena));
Expand Down
Loading

0 comments on commit b4290a2

Please sign in to comment.