Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0860c1d authored by Greg Ungerer's avatar Greg Ungerer Committed by Geert Uytterhoeven
Browse files

m68k/m68knommu: merge machdep.h files into a single file 



No need to have separate machdep.h files for each of the MMU and non-MMU
cases. Merge them all into a single file.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent ea61bc46

arch/m68k/include/asm/machdep.h

+44 −5
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "machdep_no.h"

#else

#include "machdep_mm.h"

#endif
 
#ifndef _M68K_MACHDEP_H

#define _M68K_MACHDEP_H



#include <linux/seq_file.h>

#include <linux/interrupt.h>



struct pt_regs;

struct mktime;

struct rtc_time;

struct rtc_pll_info;

struct buffer_head;



extern void (*mach_sched_init) (irq_handler_t handler);

/* machine dependent irq functions */

extern void (*mach_init_IRQ) (void);

extern void (*mach_get_model) (char *model);

extern void (*mach_get_hardware_list) (struct seq_file *m);

/* machine dependent timer functions */

extern unsigned long (*mach_gettimeoffset)(void);

extern int (*mach_hwclk)(int, struct rtc_time*);

extern unsigned int (*mach_get_ss)(void);

extern int (*mach_get_rtc_pll)(struct rtc_pll_info *);

extern int (*mach_set_rtc_pll)(struct rtc_pll_info *);

extern int (*mach_set_clock_mmss)(unsigned long);

extern void (*mach_gettod)(int *year, int *mon, int *day, int *hour,

			    int *min, int *sec);

extern void (*mach_reset)( void );

extern void (*mach_halt)( void );

extern void (*mach_power_off)( void );

extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);

extern void (*mach_hd_setup)(char *, int *);

extern long mach_max_dma_address;

extern void (*mach_heartbeat) (int);

extern void (*mach_l2_flush) (int);

extern void (*mach_beep) (unsigned int, unsigned int);



/* Hardware clock functions */

extern void hw_timer_init(void);

extern unsigned long hw_timer_offset(void);

extern irqreturn_t arch_timer_interrupt(int irq, void *dummy);



extern void config_BSP(char *command, int len);



#endif /* _M68K_MACHDEP_H */

arch/m68k/include/asm/machdep_mm.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
#ifndef _M68K_MACHDEP_H

#define _M68K_MACHDEP_H



#include <linux/seq_file.h>

#include <linux/interrupt.h>



struct pt_regs;

struct mktime;

struct rtc_time;

struct rtc_pll_info;

struct buffer_head;



extern void (*mach_sched_init) (irq_handler_t handler);

/* machine dependent irq functions */

extern void (*mach_init_IRQ) (void);

extern void (*mach_get_model) (char *model);

extern void (*mach_get_hardware_list) (struct seq_file *m);

/* machine dependent timer functions */

extern unsigned long (*mach_gettimeoffset)(void);

extern int (*mach_hwclk)(int, struct rtc_time*);

extern unsigned int (*mach_get_ss)(void);

extern int (*mach_get_rtc_pll)(struct rtc_pll_info *);

extern int (*mach_set_rtc_pll)(struct rtc_pll_info *);

extern int (*mach_set_clock_mmss)(unsigned long);

extern void (*mach_reset)( void );

extern void (*mach_halt)( void );

extern void (*mach_power_off)( void );

extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);

extern void (*mach_hd_setup)(char *, int *);

extern long mach_max_dma_address;

extern void (*mach_heartbeat) (int);

extern void (*mach_l2_flush) (int);

extern void (*mach_beep) (unsigned int, unsigned int);



#endif /* _M68K_MACHDEP_H */

arch/m68k/include/asm/machdep_no.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_MACHDEP_H

#define _M68KNOMMU_MACHDEP_H



#include <linux/interrupt.h>



/* Hardware clock functions */

extern void hw_timer_init(void);

extern unsigned long hw_timer_offset(void);



extern irqreturn_t arch_timer_interrupt(int irq, void *dummy);



/* Machine dependent time handling */

extern void (*mach_gettod)(int *year, int *mon, int *day, int *hour,

			   int *min, int *sec);

extern int (*mach_set_clock_mmss)(unsigned long);



/* machine dependent power off functions */

extern void (*mach_reset)( void );

extern void (*mach_halt)( void );

extern void (*mach_power_off)( void );



extern void config_BSP(char *command, int len);



extern void do_IRQ(int irq, struct pt_regs *fp);



#endif /* _M68KNOMMU_MACHDEP_H */