diff --git a/include/atmos.h b/include/atmos.h index 489268e70..0fdb1ed91 100644 --- a/include/atmos.h +++ b/include/atmos.h @@ -6,11 +6,11 @@ /* */ /* */ /* */ -/* (C) 2002 Debrune Jérome, */ -/* (C) 2003 Ullrich von Bassewitz */ -/* Roemerstrasse 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ +/* (C) 2002 Debrune Jérome, */ +/* (C) 2003-2004 Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -41,7 +41,7 @@ /* Check for errors */ #if !defined(__ATMOS__) -# error This module may only be used when compiling for the Oric Atmos ! +# error This module may only be used when compiling for the Oric Atmos! #endif @@ -56,6 +56,14 @@ #define COLOR_CYAN 0x06 #define COLOR_WHITE 0x07 + + +/* Define hardware */ +#include <_6522.h> +#define VIA (*(struct __6522*)0x300) + + + /* Character codes */ #define CH_ULCORNER '+' #define CH_URCORNER '+' @@ -69,8 +77,6 @@ - - /* End of atmos.h */ #endif diff --git a/include/pet.h b/include/pet.h index be1eb8b9e..79abbb82a 100644 --- a/include/pet.h +++ b/include/pet.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 1998-2002 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 1998-2004 Ullrich von Bassewitz */ +/* Römerstraße 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -51,6 +51,16 @@ +/* Define hardware */ +#include <_pia.h> +#define PIA1 (*(struct __pia*)0xE810) +#define PIA2 (*(struct __pia*)0xE820) + +#include <_6522.h> +#define VIA (*(struct __6522*)0xE840) + + + /* End of pet.h */ #endif diff --git a/include/vic20.h b/include/vic20.h index 0c4da418e..904278b4f 100644 --- a/include/vic20.h +++ b/include/vic20.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 1998-2001 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 1998-2004 Ullrich von Bassewitz */ +/* Römerstraße 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -81,6 +81,10 @@ #include <_vic.h> #define VIC (*(struct __vic*)0x9000) +#include <_6522.h> +#define VIA1 (*(struct __6522*)0x9110) +#define VIA2 (*(struct __6522*)0x9120) + /* Define special memory areas */