X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=6e4917b33c8ce336e30df934b95cea6d4361a550;hb=8b78786e0f68a1e0e4331dc5f02eac468c99df11;hp=e71245a8dee75ba1addaef40c45bea8a7993ed28;hpb=9e1fa0a6cf997b9e4ad38a532d6a9628253fefa7;p=picodrive.git diff --git a/pico/pico_int.h b/pico/pico_int.h index e71245a..6e4917b 100644 --- a/pico/pico_int.h +++ b/pico/pico_int.h @@ -441,6 +441,7 @@ typedef struct unsigned char pcm_ram[0x10000]; unsigned char pcm_ram_b[0x10][0x1000]; }; + // FIXME: should be short unsigned char s68k_regs[0x200]; // 110000: GA, not CPU regs unsigned char bram[0x2000]; // 110200: 8K struct mcd_misc m; // 112200: misc @@ -482,8 +483,9 @@ typedef struct #define P32XP_FULL (1<<15) // PWM pulse #define P32XP_EMPTY (1<<14) -#define P32XF_68KCPOLL (1 << 0) -#define P32XF_68KVPOLL (1 << 1) +#define P32XF_68KCPOLL (1 << 0) +#define P32XF_68KVPOLL (1 << 1) +#define P32XF_Z80_32X_IO (1 << 7) // z80 does 32x io #define P32XI_VRES (1 << 14/2) // IRL/2 #define P32XI_VINT (1 << 12/2) @@ -542,12 +544,19 @@ struct Pico32xMem #ifdef DRC_SH2 unsigned short drcblk_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)]; #endif - unsigned char sh2_rom_m[0x800]; - unsigned char sh2_rom_s[0x400]; + union { + unsigned char b[0x800]; + unsigned short w[0x800/2]; + } sh2_rom_m; + union { + unsigned char b[0x400]; + unsigned short w[0x400/2]; + } sh2_rom_s; unsigned short pal[0x100]; unsigned short pal_native[0x100]; // converted to native (for renderer) signed short pwm[2*PWM_BUFF_LEN]; // PWM buffer for current frame - signed short pwm_fifo[2][4]; // [0] - current, others - fifo entries + signed short pwm_current[2]; // current converted samples + unsigned short pwm_fifo[2][4]; // [0] - current raw, others - fifo entries }; // area.c