Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213291
b: refs/heads/master
c: b0860c1
h: refs/heads/master
i:
  213289: a72b8c1
  213287: ffaf240
v: v3
  • Loading branch information
Greg Ungerer authored and Geert Uytterhoeven committed Oct 22, 2010
1 parent bdfa094 commit c11578e
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 67 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ea61bc461d09e8d331a307916530aaae808c72a2
refs/heads/master: b0860c1d80016df82b93b926f1cff3110ccb5028
49 changes: 44 additions & 5 deletions trunk/arch/m68k/include/asm/machdep.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
#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 */
35 changes: 0 additions & 35 deletions trunk/arch/m68k/include/asm/machdep_mm.h

This file was deleted.

26 changes: 0 additions & 26 deletions trunk/arch/m68k/include/asm/machdep_no.h

This file was deleted.

0 comments on commit c11578e

Please sign in to comment.