Skip to content

Commit

Permalink
[PET] Add missing cc65 headers.
Browse files Browse the repository at this point in the history
  • Loading branch information
asiekierka committed Oct 24, 2023
1 parent 9d8497c commit 0439fe7
Show file tree
Hide file tree
Showing 9 changed files with 348 additions and 30 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion mos-platform/cx16/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if(NOT CMAKE_CROSSCOMPILING)
endif()

install(FILES
_6522.h
../commodore/_6522.h
charset.h
cx16.h
TYPE INCLUDE)
Expand Down
11 changes: 10 additions & 1 deletion mos-platform/pet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,23 @@ if(NOT CMAKE_CROSSCOMPILING)
return()
endif()

install(FILES charset.h TYPE INCLUDE)
install(FILES
../commodore/_6522.h
_6545.h
_6551.h
_pia.h
charset.h
pet.h
TYPE INCLUDE)
install(FILES link.ld TYPE LIB)

add_platform_library(pet-crt0)
merge_libraries(pet-crt0
common-init-stack
)

install(FILES pet.inc DESTINATION ${ASMINCDIR})

add_platform_object_file(pet-basic-header basic-header.o basic-header.S)

add_platform_library(pet-c kernal.S)
Expand Down
39 changes: 12 additions & 27 deletions mos-platform/vic20/_6522.h → mos-platform/pet/_6545.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@

/*****************************************************************************/
/* */
/* _6522.h */
/* _6545.h */
/* */
/* Internal include file, do not use directly */
/* */
/* */
/* */
/* (C) 2004 Stefan Haubenthal <polluks@sdf.lonestar.org> */
/* (C) 1998-2000 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
Expand All @@ -39,38 +42,20 @@



#ifndef __VIA_H
#define __VIA_H
#ifndef __6545_H
#define __6545_H



/* Define a structure with the 6522 register offsets.
** NOTE: The timer registers are not declared as 16 bit registers, because
** the order in which the two 8 bit halves are written is important, and
** the compiler doesn't guarantee any order when writing 16 bit values.
*/
struct __6522 {
unsigned char prb; /* Port register B */
unsigned char pra; /* Port register A */
unsigned char ddrb; /* Data direction register B */
unsigned char ddra; /* Data direction register A */
unsigned char t1_lo; /* Timer 1, low byte */
unsigned char t1_hi; /* Timer 1, high byte */
unsigned char t1l_lo; /* Timer 1 latch, low byte */
unsigned char t1l_hi; /* Timer 1 latch, high byte */
unsigned char t2_lo; /* Timer 2, low byte */
unsigned char t2_hi; /* Timer 2, high byte */
unsigned char sr; /* Shift register */
unsigned char acr; /* Auxiliary control register */
unsigned char pcr; /* Peripheral control register */
unsigned char ifr; /* Interrupt flag register */
unsigned char ier; /* Interrupt enable register */
unsigned char pra2; /* Port register A w/o handshake */
/* Define a structure with the 6545 register offsets */
struct __6545 {
unsigned char ctrl; /* Control register */
unsigned char data; /* Data register */
};



/* End of _6522.h */
/* End of _6545.h */
#endif


Expand Down
64 changes: 64 additions & 0 deletions mos-platform/pet/_6551.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright 2023 LLVM-MOS Project
// Licensed under the Apache License, Version 2.0 with LLVM Exceptions.
// See /~https://github.com/llvm-mos/llvm-mos-sdk/blob/main/LICENSE for license
// information.

// Originally from cc65.

// clang-format off

/*****************************************************************************/
/* */
/* _6551.h */
/* */
/* Internal include file, do not use directly */
/* */
/* */
/* */
/* (C) 1998-2000 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* warranty. In no event will the authors be held liable for any damages */
/* arising from the use of this software. */
/* */
/* Permission is granted to anyone to use this software for any purpose, */
/* including commercial applications, and to alter it and redistribute it */
/* freely, subject to the following restrictions: */
/* */
/* 1. The origin of this software must not be misrepresented; you must not */
/* claim that you wrote the original software. If you use this software */
/* in a product, an acknowledgment in the product documentation would be */
/* appreciated but is not required. */
/* 2. Altered source versions must be plainly marked as such, and must not */
/* be misrepresented as being the original software. */
/* 3. This notice may not be removed or altered from any source */
/* distribution. */
/* */
/*****************************************************************************/



#ifndef __6551_H
#define __6551_H



/* Define a structure with the 6551 register offsets */
struct __6551 {
unsigned char data; /* Data register */
unsigned char status; /* Status register */
unsigned char cmd; /* Command register */
unsigned char ctrl; /* Control register */
};



/* End of _6551.h */
#endif



61 changes: 61 additions & 0 deletions mos-platform/pet/_pia.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2023 LLVM-MOS Project
// Licensed under the Apache License, Version 2.0 with LLVM Exceptions.
// See /~https://github.com/llvm-mos/llvm-mos-sdk/blob/main/LICENSE for license
// information.

// Originally from cc65.

// clang-format off

/*****************************************************************************/
/* */
/* _pia.h */
/* */
/* Internal include file, do not use directly */
/* */
/* The Peripheral Interface Adapter (PIA) chip (a 6520 or 6820) provides */
/* parallel I/O interfacing; it was used in Atari 400/800 and Commodore PET */
/* family of computers, for joystick and some interrupts. */
/* Sources; various + Wikpedia article on "Peripheral Interface Adapter". */
/* */
/* */
/* (C) 2000 Freddy Offenga <taf_offenga@yahoo.com> */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* warranty. In no event will the authors be held liable for any damages */
/* arising from the use of this software. */
/* */
/* Permission is granted to anyone to use this software for any purpose, */
/* including commercial applications, and to alter it and redistribute it */
/* freely, subject to the following restrictions: */
/* */
/* 1. The origin of this software must not be misrepresented; you must not */
/* claim that you wrote the original software. If you use this software */
/* in a product, an acknowledgment in the product documentation would be */
/* appreciated but is not required. */
/* 2. Altered source versions must be plainly marked as such, and must not */
/* be misrepresented as being the original software. */
/* 3. This notice may not be removed or altered from any source */
/* distribution. */
/* */
/*****************************************************************************/



#ifndef __PIA_H
#define __PIA_H


/* Define a structure with the PIA register offsets */
struct __pia {
unsigned char porta; /* port A data r/w */
unsigned char portb; /* port B data r/w */
unsigned char pactl; /* port A control */
unsigned char pbctl; /* port B control */
};

/* (Some specific register values for Atari defined in atari.h) */

/* End of _pia.h */
#endif
93 changes: 93 additions & 0 deletions mos-platform/pet/pet.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
// Copyright 2023 LLVM-MOS Project
// Licensed under the Apache License, Version 2.0 with LLVM Exceptions.
// See /~https://github.com/llvm-mos/llvm-mos-sdk/blob/main/LICENSE for license
// information.

// Originally from cc65. Modified from original version.

// clang-format off

/*****************************************************************************/
/* */
/* pet.h */
/* */
/* PET system specific definitions */
/* */
/* */
/* */
/* (C) 1998-2005 Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* warranty. In no event will the authors be held liable for any damages */
/* arising from the use of this software. */
/* */
/* Permission is granted to anyone to use this software for any purpose, */
/* including commercial applications, and to alter it and redistribute it */
/* freely, subject to the following restrictions: */
/* */
/* 1. The origin of this software must not be misrepresented; you must not */
/* claim that you wrote the original software. If you use this software */
/* in a product, an acknowledgment in the product documentation would be */
/* appreciated but is not required. */
/* 2. Altered source versions must be plainly marked as such, and must not */
/* be misrepresented as being the original software. */
/* 3. This notice may not be removed or altered from any source */
/* distribution. */
/* */
/*****************************************************************************/



#ifndef _PET_H
#define _PET_H



/* Check for errors */
#if !defined(__PET__)
# error This module may only be used when compiling for the CBM PET!
#endif



/*****************************************************************************/
/* Data */
/*****************************************************************************/



/* Color defines */
#define COLOR_BLACK 0x00
#define COLOR_WHITE 0x01

/* Masks for joy_read */
#define JOY_UP_MASK 0x01
#define JOY_DOWN_MASK 0x02
#define JOY_LEFT_MASK 0x04
#define JOY_RIGHT_MASK 0x08
#define JOY_BTN_1_MASK 0x10

/* Define hardware */
#include <_pia.h>
#define PIA1 (*(struct __pia*)0xE810)
#define PIA2 (*(struct __pia*)0xE820)

#include <_6522.h>
#define VIA (*(struct __6522*)0xE840)

/* All models from 40xx and above */
#include <_6545.h>
#define CRTC (*(struct __6545)0xE880)

/* SuperPET only */
#include <_6551.h>
#define ACIA (*(struct __6551*)0xEFF0)



/* End of pet.h */
#endif
Loading

0 comments on commit 0439fe7

Please sign in to comment.