diff options
Diffstat (limited to 'include/asm-m68k/amigahw.h')
-rw-r--r-- | include/asm-m68k/amigahw.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-m68k/amigahw.h b/include/asm-m68k/amigahw.h index 3ae5d8d55ba9..a16fe4e5a28a 100644 --- a/include/asm-m68k/amigahw.h +++ b/include/asm-m68k/amigahw.h | |||
@@ -274,7 +274,7 @@ struct CIA { | |||
274 | #define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase) | 274 | #define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase) |
275 | 275 | ||
276 | #define CUSTOM_PHYSADDR (0xdff000) | 276 | #define CUSTOM_PHYSADDR (0xdff000) |
277 | #define custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR))) | 277 | #define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR))) |
278 | 278 | ||
279 | #define CIAA_PHYSADDR (0xbfe001) | 279 | #define CIAA_PHYSADDR (0xbfe001) |
280 | #define CIAB_PHYSADDR (0xbfd000) | 280 | #define CIAB_PHYSADDR (0xbfd000) |
@@ -294,12 +294,12 @@ static inline void amifb_video_off(void) | |||
294 | { | 294 | { |
295 | if (amiga_chipset == CS_ECS || amiga_chipset == CS_AGA) { | 295 | if (amiga_chipset == CS_ECS || amiga_chipset == CS_AGA) { |
296 | /* program Denise/Lisa for a higher maximum play rate */ | 296 | /* program Denise/Lisa for a higher maximum play rate */ |
297 | custom.htotal = 113; /* 31 kHz */ | 297 | amiga_custom.htotal = 113; /* 31 kHz */ |
298 | custom.vtotal = 223; /* 70 Hz */ | 298 | amiga_custom.vtotal = 223; /* 70 Hz */ |
299 | custom.beamcon0 = 0x4390; /* HARDDIS, VAR{BEAM,VSY,HSY,CSY}EN */ | 299 | amiga_custom.beamcon0 = 0x4390; /* HARDDIS, VAR{BEAM,VSY,HSY,CSY}EN */ |
300 | /* suspend the monitor */ | 300 | /* suspend the monitor */ |
301 | custom.hsstrt = custom.hsstop = 116; | 301 | amiga_custom.hsstrt = amiga_custom.hsstop = 116; |
302 | custom.vsstrt = custom.vsstop = 226; | 302 | amiga_custom.vsstrt = amiga_custom.vsstop = 226; |
303 | amiga_audio_min_period = 57; | 303 | amiga_audio_min_period = 57; |
304 | } | 304 | } |
305 | } | 305 | } |