X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=76c4812eabeb75f0f5ee288c5ea2c4040534aeb5;hb=274fcc35aa20e9777a8e09630a94088757384329;hp=41dc59dc8358842791c67d8f56c10307df3f4f9b;hpb=021e47b37557361ec880c92620c7cc1292d2f2c6;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 41dc59d..76c4812 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -374,9 +374,6 @@ struct PicoSRAM
 };
 
 // MCD
-#include "cd/cd_sys.h"
-#include "cd/LC89510.h"
-
 #define PCM_MIXBUF_LEN ((12500000 / 384) / 50 + 1)
 
 struct mcd_pcm
@@ -417,38 +414,43 @@ struct mcd_misc
 
 typedef struct
 {
-	unsigned char bios[0x20000];			// 000000: 128K
-	union {						// 020000: 512K
-		unsigned char prg_ram[0x80000];
-		unsigned char prg_ram_b[4][0x20000];
-	};
-	union {						// 0a0000: 256K
-		struct {
-			unsigned char word_ram2M[0x40000];
-			unsigned char unused0[0x20000];
-		};
-		struct {
-			unsigned char unused1[0x20000];
-			unsigned char word_ram1M[2][0x20000];
-		};
-	};
-	union {						// 100000: 64K
-		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
-	struct mcd_pcm pcm;				// 112240:
-	_scd_toc TOC;					// not to be saved
-	CDD  cdd;
-	CDC  cdc;
-	_scd scd;
-	int pcm_mixbuf[PCM_MIXBUF_LEN * 2];
-	int pcm_mixpos;
-	char pcm_mixbuf_dirty;
-	char pcm_regs_dirty;
+  unsigned char bios[0x20000];			// 000000: 128K
+  union {					// 020000: 512K
+    unsigned char prg_ram[0x80000];
+    unsigned char prg_ram_b[4][0x20000];
+  };
+  union {					// 0a0000: 256K
+    struct {
+      unsigned char word_ram2M[0x40000];
+      unsigned char unused0[0x20000];
+    };
+    struct {
+      unsigned char unused1[0x20000];
+      unsigned char word_ram1M[2][0x20000];
+    };
+  };
+  union {					// 100000: 64K
+    unsigned char pcm_ram[0x10000];
+    unsigned char pcm_ram_b[0x10][0x1000];
+  };
+  union {
+    unsigned char s68k_regs[0x200];		// 110000: GA, not CPU regs
+    union {
+      struct {
+        unsigned char h;
+        unsigned char l;
+      } byte;
+    } regs[0x200/2];
+  };
+  unsigned char bram[0x2000];			// 110200: 8K
+  struct mcd_misc m;				// 112200: misc
+  struct mcd_pcm pcm;				// 112240:
+  void *cdda_stream;
+  int cdda_type;
+  int pcm_mixbuf[PCM_MIXBUF_LEN * 2];
+  int pcm_mixpos;
+  char pcm_mixbuf_dirty;
+  char pcm_regs_dirty;
 } mcd_state;
 
 // XXX: this will need to be reworked for cart+cd support.
@@ -610,6 +612,31 @@ void PicoWrite16_io(unsigned int a, unsigned int d);
 // pico/memory.c
 PICO_INTERNAL void PicoMemSetupPico(void);
 
+// cd/cdc.c
+void cdc_init(void);
+void cdc_reset(void);
+int  cdc_context_save(unsigned char *state);
+int  cdc_context_load(unsigned char *state);
+int  cdc_context_load_old(unsigned char *state);
+void cdc_dma_update(void);
+int  cdc_decoder_update(unsigned char header[4]);
+void cdc_reg_w(unsigned char data);
+unsigned char  cdc_reg_r(void);
+unsigned short cdc_host_r(void);
+
+// cd/cdd.c
+void cdd_reset(void);
+int cdd_context_save(unsigned char *state);
+int cdd_context_load(unsigned char *state);
+int cdd_context_load_old(unsigned char *state);
+void cdd_read_data(unsigned char *dst);
+void cdd_read_audio(unsigned int samples);
+void cdd_update(void);
+void cdd_process(void);
+
+// cd/cd_image.c
+int load_cd_image(const char *cd_img_name, int *type);
+
 // cd/gfx.c
 void gfx_init(void);
 void gfx_start(unsigned int base);
@@ -664,6 +691,7 @@ enum pcd_event {
 extern unsigned int pcd_event_times[PCD_EVENT_COUNT];
 void pcd_event_schedule(unsigned int now, enum pcd_event event, int after);
 void pcd_event_schedule_s68k(enum pcd_event event, int after);
+void pcd_prepare_frame(void);
 unsigned int pcd_cycles_m68k_to_s68k(unsigned int c);
 int  pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync);
 void pcd_run_cpus(int m68k_cycles);
@@ -705,15 +733,17 @@ void SekTrace(int is_s68k);
 PICO_INTERNAL void SekInitS68k(void);
 PICO_INTERNAL int  SekResetS68k(void);
 PICO_INTERNAL int  SekInterruptS68k(int irq);
+void SekInterruptClearS68k(int irq);
 
 // sound/sound.c
-PICO_INTERNAL void cdda_start_play();
 extern short cdda_out_buffer[2*1152];
 extern int PsndLen_exc_cnt;
 extern int PsndLen_exc_add;
 extern int timer_a_next_oflow, timer_a_step; // in z80 cycles
 extern int timer_b_next_oflow, timer_b_step;
 
+void cdda_start_play(int lba_base, int lba_offset, int lb_len);
+
 void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new);
 void ym2612_pack_state(void);
 void ym2612_unpack_state(void);
@@ -766,9 +796,6 @@ PICO_INTERNAL void z80_exit(void);
 PICO_INTERNAL_ASM void wram_2M_to_1M(unsigned char *m);
 PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);
 
-// cd/buffering.c
-PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba);
-
 // sound/sound.c
 PICO_INTERNAL void PsndReset(void);
 PICO_INTERNAL void PsndDoDAC(int line_to);