make memcpy32/memset32 take void *

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index d4d6d7d..c85319c 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -374,9 +374,6 @@ struct PicoSRAM
 };\r
 \r
 // MCD\r
-#include "cd/cd_sys.h"\r
-#include "cd/LC89510.h"\r
-\r
 #define PCM_MIXBUF_LEN ((12500000 / 384) / 50 + 1)\r
 \r
 struct mcd_pcm\r
@@ -399,20 +396,21 @@ struct mcd_pcm
 \r
 struct mcd_misc\r
 {\r
-       unsigned short hint_vector;\r
-       unsigned char  busreq;          // not s68k_regs[1]\r
-       unsigned char  s68k_pend_ints;\r
-       unsigned int   state_flags;     // 04\r
-       unsigned int   stopwatch_base_c;\r
-       unsigned short m68k_poll_a;\r
-       unsigned short m68k_poll_cnt;\r
-       unsigned short s68k_poll_a;\r
-       unsigned short s68k_poll_cnt;\r
-       unsigned int   s68k_poll_clk;\r
-       unsigned char  bcram_reg;       // 18: battery-backed RAM cart register\r
-       unsigned char  dmna_ret_2m;\r
-       unsigned short pad3;\r
-       int pad4[9];\r
+  unsigned short hint_vector;\r
+  unsigned char  busreq;          // not s68k_regs[1]\r
+  unsigned char  s68k_pend_ints;\r
+  unsigned int   state_flags;     // 04\r
+  unsigned int   stopwatch_base_c;\r
+  unsigned short m68k_poll_a;\r
+  unsigned short m68k_poll_cnt;\r
+  unsigned short s68k_poll_a;\r
+  unsigned short s68k_poll_cnt;\r
+  unsigned int   s68k_poll_clk;\r
+  unsigned char  bcram_reg;       // 18: battery-backed RAM cart register\r
+  unsigned char  dmna_ret_2m;\r
+  unsigned char  need_sync;\r
+  unsigned char  pad3;\r
+  int pad4[9];\r
 };\r
 \r
 typedef struct\r
@@ -436,21 +434,12 @@ typedef struct
     unsigned char pcm_ram[0x10000];\r
     unsigned char pcm_ram_b[0x10][0x1000];\r
   };\r
-  union {\r
-    unsigned char s68k_regs[0x200];            // 110000: GA, not CPU regs\r
-    union {\r
-      struct {\r
-        unsigned char h;\r
-        unsigned char l;\r
-      } byte;\r
-    } regs[0x200/2];\r
-  };\r
+  unsigned char s68k_regs[0x200];              // 110000: GA, not CPU regs\r
   unsigned char bram[0x2000];                  // 110200: 8K\r
   struct mcd_misc m;                           // 112200: misc\r
   struct mcd_pcm pcm;                          // 112240:\r
-  _scd_toc TOC;                                        // not to be saved\r
-  CDD  cdd;\r
-  _scd scd;\r
+  void *cdda_stream;\r
+  int cdda_type;\r
   int pcm_mixbuf[PCM_MIXBUF_LEN * 2];\r
   int pcm_mixpos;\r
   char pcm_mixbuf_dirty;\r
@@ -628,6 +617,19 @@ void cdc_reg_w(unsigned char data);
 unsigned char  cdc_reg_r(void);\r
 unsigned short cdc_host_r(void);\r
 \r
+// cd/cdd.c\r
+void cdd_reset(void);\r
+int cdd_context_save(unsigned char *state);\r
+int cdd_context_load(unsigned char *state);\r
+int cdd_context_load_old(unsigned char *state);\r
+void cdd_read_data(unsigned char *dst);\r
+void cdd_read_audio(unsigned int samples);\r
+void cdd_update(void);\r
+void cdd_process(void);\r
+\r
+// cd/cd_image.c\r
+int load_cd_image(const char *cd_img_name, int *type);\r
+\r
 // cd/gfx.c\r
 void gfx_init(void);\r
 void gfx_start(unsigned int base);\r
@@ -727,13 +729,14 @@ PICO_INTERNAL int  SekInterruptS68k(int irq);
 void SekInterruptClearS68k(int irq);\r
 \r
 // sound/sound.c\r
-PICO_INTERNAL void cdda_start_play();\r
 extern short cdda_out_buffer[2*1152];\r
 extern int PsndLen_exc_cnt;\r
 extern int PsndLen_exc_add;\r
 extern int timer_a_next_oflow, timer_a_step; // in z80 cycles\r
 extern int timer_b_next_oflow, timer_b_step;\r
 \r
+void cdda_start_play(int lba_base, int lba_offset, int lb_len);\r
+\r
 void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new);\r
 void ym2612_pack_state(void);\r
 void ym2612_unpack_state(void);\r
@@ -767,8 +770,8 @@ extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, u
 // misc.c\r
 PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count);\r
 PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count);\r
-PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count\r
-PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);\r
+PICO_INTERNAL_ASM void memcpy32(void *dest, const void *src, int count); // 32bit word count\r
+PICO_INTERNAL_ASM void memset32(void *dest, int c, int count);\r
 \r
 // eeprom.c\r
 void EEPROM_write8(unsigned int a, unsigned int d);\r
@@ -786,9 +789,6 @@ PICO_INTERNAL void z80_exit(void);
 PICO_INTERNAL_ASM void wram_2M_to_1M(unsigned char *m);\r
 PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);\r
 \r
-// cd/buffering.c\r
-PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba);\r
-\r
 // sound/sound.c\r
 PICO_INTERNAL void PsndReset(void);\r
 PICO_INTERNAL void PsndDoDAC(int line_to);\r