m68k/mac: cleanup forward declarations
Move some forward declarations into header files and adjust includes. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Finn Thain
Geert Uytterhoeven
Родитель
30c0527d15
Коммит
ed04c97d51
|
|
@ -29,4 +29,10 @@ struct baboon {
|
|||
*/
|
||||
};
|
||||
|
||||
extern int baboon_present;
|
||||
|
||||
extern void baboon_register_interrupts(void);
|
||||
extern void baboon_irq_enable(int);
|
||||
extern void baboon_irq_disable(int);
|
||||
|
||||
#endif /* __ASSEMBLY **/
|
||||
|
|
|
|||
|
|
@ -159,4 +159,6 @@ extern void iop_upload_code(uint, __u8 *, uint, __u16);
|
|||
extern void iop_download_code(uint, __u8 *, uint, __u16);
|
||||
extern __u8 *iop_compare_code(uint, __u8 *, uint, __u16);
|
||||
|
||||
extern void iop_register_interrupts(void);
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
|
|
|||
|
|
@ -91,4 +91,8 @@ struct mac_oss {
|
|||
extern volatile struct mac_oss *oss;
|
||||
extern int oss_present;
|
||||
|
||||
extern void oss_register_interrupts(void);
|
||||
extern void oss_irq_enable(int);
|
||||
extern void oss_irq_disable(int);
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
|
|
|||
|
|
@ -211,6 +211,10 @@
|
|||
extern volatile __u8 *psc;
|
||||
extern int psc_present;
|
||||
|
||||
extern void psc_register_interrupts(void);
|
||||
extern void psc_irq_enable(int);
|
||||
extern void psc_irq_disable(int);
|
||||
|
||||
/*
|
||||
* Access functions
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -254,6 +254,11 @@
|
|||
extern volatile __u8 *via1,*via2;
|
||||
extern int rbv_present,via_alt_mapping;
|
||||
|
||||
extern void via_register_interrupts(void);
|
||||
extern void via_irq_enable(int);
|
||||
extern void via_irq_disable(int);
|
||||
extern void via1_irq(unsigned int irq, struct irq_desc *desc);
|
||||
extern void via1_set_head(int);
|
||||
extern int via2_scsi_drq_pending(void);
|
||||
|
||||
static inline int rbv_set_video_bpp(int bpp)
|
||||
|
|
|
|||
|
|
@ -15,12 +15,6 @@ extern void mac_init_IRQ(void);
|
|||
extern void mac_irq_enable(struct irq_data *data);
|
||||
extern void mac_irq_disable(struct irq_data *data);
|
||||
|
||||
/*
|
||||
* Floppy driver magic hook - probably shouldn't be here
|
||||
*/
|
||||
|
||||
extern void via1_set_head(int);
|
||||
|
||||
/*
|
||||
* Macintosh Table
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -8,13 +8,8 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/irq.h>
|
||||
|
||||
#include <asm/traps.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/macintosh.h>
|
||||
#include <asm/macints.h>
|
||||
#include <asm/mac_baboon.h>
|
||||
|
|
|
|||
|
|
@ -110,74 +110,26 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/kernel_stat.h>
|
||||
#include <linux/interrupt.h> /* for intr_count */
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/seq_file.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/traps.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/macintosh.h>
|
||||
#include <asm/macints.h>
|
||||
#include <asm/mac_via.h>
|
||||
#include <asm/mac_psc.h>
|
||||
#include <asm/hwtest.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/macints.h>
|
||||
#include <asm/irq_regs.h>
|
||||
#include <asm/mac_oss.h>
|
||||
#include <asm/mac_iop.h>
|
||||
#include <asm/mac_baboon.h>
|
||||
#include <asm/hwtest.h>
|
||||
#include <asm/irq_regs.h>
|
||||
|
||||
#define SHUTUP_SONIC
|
||||
|
||||
/*
|
||||
* VIA/RBV hooks
|
||||
*/
|
||||
|
||||
extern void via_register_interrupts(void);
|
||||
extern void via_irq_enable(int);
|
||||
extern void via_irq_disable(int);
|
||||
extern void via_irq_clear(int);
|
||||
|
||||
/*
|
||||
* OSS hooks
|
||||
*/
|
||||
|
||||
extern void oss_register_interrupts(void);
|
||||
extern void oss_irq_enable(int);
|
||||
extern void oss_irq_disable(int);
|
||||
extern void oss_irq_clear(int);
|
||||
|
||||
/*
|
||||
* PSC hooks
|
||||
*/
|
||||
|
||||
extern void psc_register_interrupts(void);
|
||||
extern void psc_irq_enable(int);
|
||||
extern void psc_irq_disable(int);
|
||||
extern void psc_irq_clear(int);
|
||||
|
||||
/*
|
||||
* IOP hooks
|
||||
*/
|
||||
|
||||
extern void iop_register_interrupts(void);
|
||||
|
||||
/*
|
||||
* Baboon hooks
|
||||
*/
|
||||
|
||||
extern int baboon_present;
|
||||
|
||||
extern void baboon_register_interrupts(void);
|
||||
extern void baboon_irq_enable(int);
|
||||
extern void baboon_irq_disable(int);
|
||||
extern void baboon_irq_clear(int);
|
||||
|
||||
/*
|
||||
* console_loglevel determines NMI handler function
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
int oss_present;
|
||||
volatile struct mac_oss *oss;
|
||||
|
||||
extern void via1_irq(unsigned int irq, struct irq_desc *desc);
|
||||
|
||||
/*
|
||||
* Initialize the OSS
|
||||
*
|
||||
|
|
|
|||
|
|
@ -78,9 +78,6 @@ static int gIER,gIFR,gBufA,gBufB;
|
|||
static u8 nubus_disabled;
|
||||
|
||||
void via_debug_dump(void);
|
||||
void via_irq_enable(int irq);
|
||||
void via_irq_disable(int irq);
|
||||
void via_irq_clear(int irq);
|
||||
|
||||
/*
|
||||
* Initialize the VIAs
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <asm/macintosh.h>
|
||||
#include <asm/mac_via.h>
|
||||
|
||||
#define CARDNAME "swim"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче