Merge branch 'wip-crap' into 0.x-dev

diff --combined platforms/amiga/amiga-registers.h
index fdf76f20912092815177dc0d747bcd55f354e518,8da0bc2550f509b97bc5309b41323f4dc77e5187..ea1060b5f2692f9e43da571adeed04e096be2e39
--- 1/platforms/amiga/amiga-registers.h
--- 2/platforms/amiga/amiga-registers.h
+++ b/platforms/amiga/amiga-registers.h
@@@ -1,5 -1,18 +1,18 @@@
  void configure_rtc_emulation_amiga(uint8_t enabled);
  void set_hard_drive_image_file_amiga(uint8_t index, char *filename);
+ int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type);
+ int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type);
+ 
+ void adjust_gayle_4000();
+ void adjust_gayle_1200();
+ 
+ #define GAYLEBASE 0xD80000
+ #define GAYLESIZE 0x070000
+ #define GAYLEMASK 0xDF0000
+ 
+ #define CLOCKBASE 0xDC0000
+ #define CLOCKSIZE 0x010000
+ #define CLOCKMASK 0x00FFFF
  
  /* GARY ADDRESSES */
  #define GARY_REG0 0xDE0000
@@@ -9,9 -22,21 +22,21 @@@
  #define GARY_REG4 0xDE1001
  #define GARY_REG5 0xDE1002
  
+ #define INTENAR 0xDFF01C
+ #define INTREQR 0xDFF01E
+ #define INTENA 0xDFF09A
+ #define INTREQ 0xDFF09C
+ 
+ #define JOY0DAT 0xDFF00A
+ #define JOY1DAT 0xDFF00C
+ #define CIAAPRA 0xBFE001
+ #define CIAADAT 0xBFEC01
+ #define CIAAICR 0xBFED01
+ #define POTGOR  0xDFF016
+ 
  /* RAMSEY ADDRESSES */
  #define RAMSEY_REG 0xDE0003 /* just a nibble, it should return 0x08 for defaults with 16MB */
  #define RAMSEY_ID 0xDE0043  /* Either 0x0D or 0x0F (most recent version) */
  /* RAMSEY TYPES */
  #define RAMSEY_REV4 0x0D
 -#define RAMSEY_REV7 0x0F
 +#define RAMSEY_REV7 0x0F