X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=6e4917b33c8ce336e30df934b95cea6d4361a550;hb=8b78786e0f68a1e0e4331dc5f02eac468c99df11;hp=bb8fde7554976e0db85fb81810b48af3ec9f6e85;hpb=0219d379de3e8168a94dc4a5f220af04039868fd;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index bb8fde7..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
@@ -598,7 +607,6 @@ unsigned int PicoRead8_io(unsigned int a);
 unsigned int PicoRead16_io(unsigned int a);
 void PicoWrite8_io(unsigned int a, unsigned int d);
 void PicoWrite16_io(unsigned int a, unsigned int d);
-void p32x_dreq1_trigger(void);
 
 // pico/memory.c
 PICO_INTERNAL void PicoMemSetupPico(void);
@@ -764,6 +772,8 @@ void Pico32xStateLoaded(int is_early);
 void p32x_sync_sh2s(unsigned int m68k_target);
 void p32x_sync_other_sh2(SH2 *sh2, unsigned int m68k_target);
 void p32x_update_irls(SH2 *active_sh2, int m68k_cycles);
+void p32x_trigger_irq(SH2 *sh2, int m68k_cycles, unsigned int mask);
+void p32x_update_cmd_irq(SH2 *sh2, int m68k_cycles);
 void p32x_reset_sh2s(void);
 void p32x_event_schedule(unsigned int now, enum p32x_event event, int after);
 void p32x_event_schedule_sh2(SH2 *sh2, enum p32x_event event, int after);
@@ -804,6 +814,7 @@ void p32x_pwm_update(int *buf32, int length, int stereo);
 void p32x_pwm_ctl_changed(void);
 void p32x_pwm_schedule(unsigned int m68k_now);
 void p32x_pwm_schedule_sh2(SH2 *sh2);
+void p32x_pwm_sync_to_sh2(SH2 *sh2);
 void p32x_pwm_irq_event(unsigned int m68k_now);
 void p32x_pwm_state_loaded(void);