ref: 8b523a4ef27ecb854d37e572aafa707f80382488
parent: 9046482bd047ddbc460ad9e4a18f9cc862731fac
author: allkern <lisandroaalarcon@gmail.com>
date: Thu Sep 7 19:59:25 EDT 2023
Cleanup
--- a/psx/dev/cdrom.c
+++ b/psx/dev/cdrom.c
@@ -81,9 +81,9 @@
cdrom->state = CD_STATE_SEND_RESP1;
}
- cdrom->seek_ff = PFIFO_POP;
- cdrom->seek_ss = PFIFO_POP;
- cdrom->seek_mm = PFIFO_POP;
+ cdrom->seek_ff = BTOI(PFIFO_POP);
+ cdrom->seek_ss = BTOI(PFIFO_POP);
+ cdrom->seek_mm = BTOI(PFIFO_POP);
log_fatal("setloc: %02u:%02u:%02u (%08x)",cdrom->seek_mm,
@@ -122,9 +122,9 @@
msf_t msf;
- msf.m = BTOI(cdrom->seek_mm);
- msf.s = BTOI(cdrom->seek_ss);
- msf.f = BTOI(cdrom->seek_ff);
+ msf.m = cdrom->seek_mm;
+ msf.s = cdrom->seek_ss;
+ msf.f = cdrom->seek_ff;
int err = psx_disc_seek(cdrom->disc, msf);
@@ -159,9 +159,9 @@
msf_t msf;
- msf.m = BTOI(cdrom->seek_mm);
- msf.s = BTOI(cdrom->seek_ss);
- msf.f = BTOI(cdrom->seek_ff);
+ msf.m = cdrom->seek_mm;
+ msf.s = cdrom->seek_ss;
+ msf.f = cdrom->seek_ff;
psx_disc_seek(cdrom->disc, msf);
psx_disc_read_sector(cdrom->disc, cdrom->dfifo);
--- a/psx/psx.h
+++ b/psx/psx.h
@@ -1,9 +1,9 @@
#ifndef PSX_H
#define PSX_H
-#include "psx/cpu.h"
-#include "psx/log.h"
-#include "psx/exe.h"
+#include "cpu.h"
+#include "log.h"
+#include "exe.h"
#include <stdint.h>
--
⑨