moved endif, fixed sys_command_cd_rawread decl, added decl for encode_l2

diff --git a/blkdev_cdimage.cpp b/blkdev_cdimage.cpp
index 7b0a9408d9477df43a28d48a11831eb099ae1cac..823e1630e5520707392023eb6ce634924c4bfc90 100644 (file)
--- a/blkdev_cdimage.cpp
+++ b/blkdev_cdimage.cpp
@@ -28,6 +28,7 @@
 #include "memory.h"
 #include "audio.h"
 #include "uae.h"
+#include "uae/cdrom.h"
 #ifdef RETROPLATFORM
 #include "rp.h"
 #endif
@@ -1807,8 +1808,8 @@ static int parse_image (struct cdunit *cdu, const TCHAR *img)
                        if (oldcurdir[0])
                                my_setcurrentdir (oldcurdir, NULL);
                        parsechd (cdu, zcue, img);
-               }
 #endif
+               }
 
                if (oldcurdir[0])
                        my_setcurrentdir (oldcurdir, NULL);

diff --git a/include/blkdev.h b/include/blkdev.h
index 0a17b79f709b591274dfb25bbdffd325d3517a8b..fb1df03af3bbf75110c70207c3c560d9f453906a 100644 (file)
--- a/include/blkdev.h
+++ b/include/blkdev.h
@@ -1,6 +1,5 @@
-
-#ifndef BLKDEV_H
-#define BLKDEV_H
+#ifndef UAE_BLKDEV_H
+#define UAE_BLKDEV_H
 
 #define DEVICE_SCSI_BUFSIZE (65536 - 1024)
 
@@ -173,7 +172,7 @@ extern int sys_command_cd_qcode (int unitnum, uae_u8*);
 extern int sys_command_cd_toc (int unitnum, struct cd_toc_head*);
 extern int sys_command_cd_read (int unitnum, uae_u8 *data, int block, int size);
 extern int sys_command_cd_rawread (int unitnum, uae_u8 *data, int sector, int size, int sectorsize);
-extern int sys_command_cd_rawread (int unitnum, uae_u8 *data, int sector, int size, int sectorsize, uae_u8 scsicmd9, uae_u8 subs);
+int sys_command_cd_rawread (int unitnum, uae_u8 *data, int sector, int size, int sectorsize, uae_u8 sectortype, uae_u8 scsicmd9, uae_u8 subs);
 extern int sys_command_read (int unitnum, uae_u8 *data, int block, int size);
 extern int sys_command_write (int unitnum, uae_u8 *data, int block, int size);
 extern int sys_command_scsi_direct_native (int unitnum, int type, struct amigascsi *as);
@@ -223,4 +222,4 @@ extern struct device_functions devicefunc_scsi_ioctl;
 extern struct device_functions devicefunc_scsi_spti;
 extern struct device_functions devicefunc_cdimage;
 
-#endif /* BLKDEV_H */
+#endif /* UAE_BLKDEV_H */

diff --git a/include/uae/cdrom.h b/include/uae/cdrom.h
new file mode 100644 (file)
index 0000000..81f4f6d
--- /dev/null
+++ b/include/uae/cdrom.h
@@ -0,0 +1,6 @@
+#ifndef UAE_CDROM_H
+#define UAE_CDROM_H
+
+void encode_l2(uae_u8 *p, int address);
+
+#endif /* UAE_CDROM_H */