Commit 24efb6f9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k update (part 26)

Misc Mac/m68k updates
 - Make sure we have one instance of mac_hw_present
 - Kill warning
 - Rename struct SCC to struct mac_SCC to avoid type conflict
parent d2b3bb9b
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
struct mac_booter_data mac_bi_data = {0,}; struct mac_booter_data mac_bi_data = {0,};
int mac_bisize = sizeof mac_bi_data; int mac_bisize = sizeof mac_bi_data;
struct mac_hw_present mac_hw_present;
/* New m68k bootinfo stuff and videobase */ /* New m68k bootinfo stuff and videobase */
extern int m68k_num_memory; extern int m68k_num_memory;
......
...@@ -36,7 +36,7 @@ extern unsigned long mac_videobase; ...@@ -36,7 +36,7 @@ extern unsigned long mac_videobase;
extern unsigned long mac_videodepth; extern unsigned long mac_videodepth;
extern unsigned long mac_rowbytes; extern unsigned long mac_rowbytes;
extern void mac_serial_print(char *); extern void mac_serial_print(const char *);
#define DEBUG_HEADS #define DEBUG_HEADS
#undef DEBUG_SCREEN #undef DEBUG_SCREEN
...@@ -137,7 +137,7 @@ void mac_debugging_long(int pos, long addr) ...@@ -137,7 +137,7 @@ void mac_debugging_long(int pos, long addr)
* TODO: serial debug code * TODO: serial debug code
*/ */
struct SCC struct mac_SCC
{ {
u_char cha_b_ctrl; u_char cha_b_ctrl;
u_char char_dummy1; u_char char_dummy1;
...@@ -148,7 +148,7 @@ struct SCC ...@@ -148,7 +148,7 @@ struct SCC
u_char cha_a_data; u_char cha_a_data;
}; };
# define scc (*((volatile struct SCC*)mac_bi_data.sccbase)) # define scc (*((volatile struct mac_SCC*)mac_bi_data.sccbase))
/* Flag that serial port is already initialized and used */ /* Flag that serial port is already initialized and used */
int mac_SCC_init_done = 0; int mac_SCC_init_done = 0;
......
...@@ -72,7 +72,7 @@ struct MAC_SCC ...@@ -72,7 +72,7 @@ struct MAC_SCC
#define MACHW_SET(name) (mac_hw_present.name = 1) #define MACHW_SET(name) (mac_hw_present.name = 1)
#define MACHW_PRESENT(name) (mac_hw_present.name) #define MACHW_PRESENT(name) (mac_hw_present.name)
struct { struct mac_hw_present {
/* video hardware */ /* video hardware */
/* sound hardware */ /* sound hardware */
/* disk storage interfaces */ /* disk storage interfaces */
...@@ -92,9 +92,9 @@ struct { ...@@ -92,9 +92,9 @@ struct {
MACHW_DECLARE(RBV); /* Versatile Interface Ad. 2+ */ MACHW_DECLARE(RBV); /* Versatile Interface Ad. 2+ */
/* NUBUS */ /* NUBUS */
MACHW_DECLARE(NUBUS); /* NUBUS */ MACHW_DECLARE(NUBUS); /* NUBUS */
} mac_hw_present; };
/* extern struct mac_hw_present mac_hw_present; */ extern struct mac_hw_present mac_hw_present;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment