From 7a82a78d24160d1256b807c232501366e554d5fd Mon Sep 17 00:00:00 2001
From: Frode Solheim <frode@fs-uae.net>
Date: Fri, 15 May 2015 17:45:12 +0200
Subject: [PATCH] moved endif, fixed sys_command_cd_rawread decl, added decl
 for encode_l2

---
 blkdev_cdimage.cpp  | 3 ++-
 include/blkdev.h    | 9 ++++-----
 include/uae/cdrom.h | 6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 include/uae/cdrom.h

diff --git a/blkdev_cdimage.cpp b/blkdev_cdimage.cpp
index 7b0a9408..823e1630 100644
--- 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 0a17b79f..fb1df03a 100644
--- 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
index 00000000..81f4f6d9
--- /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 */
-- 
2.47.3