• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision49701e13b81175e039b15b61118443aadb0e8b28 (tree)
Zeit2020-02-15 05:22:24
AutorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][SCSI_DEV] .

Ändern Zusammenfassung

Diff

--- a/source/build-cmake/cmake/config_emufmr50.cmake
+++ b/source/build-cmake/cmake/config_emufmr50.cmake
@@ -13,9 +13,9 @@ set(WITH_MOUSE ON)
1313
1414 set(VMFILES
1515 msm58321.cpp
16- scsi_dev.cpp
16+# scsi_dev.cpp
1717 scsi_host.cpp
18- scsi_hdd.cpp
18+# scsi_hdd.cpp
1919 # memory.cpp
2020
2121 # disk.cpp
--- a/source/build-cmake/cmake/config_emupc9801.cmake
+++ b/source/build-cmake/cmake/config_emupc9801.cmake
@@ -103,8 +103,6 @@ elseif(BUILD_PC9801VM)
103103 pcm1bit.cpp
104104 ${VMFILES_LIB}
105105 )
106-# set(FLAG_USE_I286 ON)
107-# set(FLAG_USE_I86 ON)
108106 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc9801vm.qrc)
109107 elseif(BUILD_PC9801VX)
110108 add_definitions(-D_PC9801VX)
@@ -114,8 +112,7 @@ elseif(BUILD_PC9801VX)
114112 pcm1bit.cpp
115113 ${VMFILES_LIB}
116114 )
117-# set(FLAG_USE_I286 ON)
118-# set(FLAG_USE_I86 ON)
115+ set(WITH_SCSI_SASI 1)
119116 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc9801vx.qrc)
120117 elseif(BUILD_PC98XA)
121118 add_definitions(-D_PC98XA)
@@ -125,8 +122,6 @@ elseif(BUILD_PC98XA)
125122 pcm1bit.cpp
126123 ${VMFILES_LIB}
127124 )
128-# set(FLAG_USE_I286 ON)
129-# set(FLAG_USE_I86 ON)
130125 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc98xa.qrc)
131126 elseif(BUILD_PC98XL)
132127 add_definitions(-D_PC98XL)
@@ -136,8 +131,7 @@ elseif(BUILD_PC98XL)
136131 pcm1bit.cpp
137132 ${VMFILES_LIB}
138133 )
139-# set(FLAG_USE_I286 ON)
140-# set(FLAG_USE_I86 ON)
134+ set(WITH_SCSI_SASI 1)
141135 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc98xl.qrc)
142136 elseif(BUILD_PC9801VF)
143137 add_definitions(-D_PC9801VF)
@@ -149,8 +143,6 @@ elseif(BUILD_PC9801VF)
149143 pcm1bit.cpp
150144 ${VMFILES_LIB}
151145 )
152-# set(FLAG_USE_I286 ON)
153-# set(FLAG_USE_I86 ON)
154146 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc9801vf.qrc)
155147 elseif(BUILD_PC9801RA)
156148 add_definitions(-D_PC9801RA)
@@ -161,8 +153,6 @@ elseif(BUILD_PC9801RA)
161153 pcm1bit.cpp
162154 ${VMFILES_LIB}
163155 )
164-# set(FLAG_USE_I286 OFF)
165-# set(FLAG_USE_I86 ON)
166156 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc9801ra.qrc)
167157 elseif(BUILD_PC98RL)
168158 add_definitions(-D_PC98RL)
@@ -172,8 +162,7 @@ elseif(BUILD_PC98RL)
172162 pcm1bit.cpp
173163 ${VMFILES_LIB}
174164 )
175-# set(FLAG_USE_I286 OFF)
176-# set(FLAG_USE_I86 ON)
165+ set(WITH_SCSI_SASI 1)
177166 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc98rl.qrc)
178167 elseif(BUILD_PC98DO)
179168 add_definitions(-D_PC98DO)
--- a/source/build-cmake/cmake/config_mz2500.cmake
+++ b/source/build-cmake/cmake/config_mz2500.cmake
@@ -15,8 +15,8 @@ set(VMFILES_2500
1515 w3100a.cpp
1616
1717 scsi_host.cpp
18- scsi_dev.cpp;
19- scsi_hdd.cpp
18+# scsi_dev.cpp
19+# scsi_hdd.cpp
2020
2121 )
2222 set(VMFILES_LIB_2500
--- a/source/build-cmake/cmake/config_pc8801.cmake
+++ b/source/build-cmake/cmake/config_pc8801.cmake
@@ -98,7 +98,9 @@ elseif(BUILD_PC8801MA)
9898 ym2151.cpp
9999 )
100100 set(VMFILES ${VMFILES}
101- scsi_dev.cpp scsi_cdrom.cpp scsi_host.cpp
101+ #scsi_dev.cpp
102+ #scsi_cdrom.cpp
103+ scsi_host.cpp
102104 )
103105 endif()
104106
--- a/source/build-cmake/cmake/config_x1.cmake
+++ b/source/build-cmake/cmake/config_x1.cmake
@@ -17,8 +17,8 @@ set(VMFILES
1717 mz1p17.cpp
1818
1919 scsi_host.cpp
20- scsi_dev.cpp
21- scsi_hdd.cpp
20+# scsi_dev.cpp
21+# scsi_hdd.cpp
2222 )
2323 set(VMFILES_LIB
2424 ay_3_891x.cpp
--- a/source/build-cmake/pcengine/CMakeLists.txt
+++ b/source/build-cmake/pcengine/CMakeLists.txt
@@ -22,8 +22,8 @@ set(WITH_MOUSE OFF)
2222 set(VMFILES_BASE
2323 huc6280.cpp
2424 scsi_host.cpp
25- scsi_dev.cpp
26- scsi_cdrom.cpp
25+# scsi_dev.cpp
26+# scsi_cdrom.cpp
2727
2828 event.cpp
2929 )
--- a/source/src/vm/fmtowns/towns_cdrom.cpp
+++ b/source/src/vm/fmtowns/towns_cdrom.cpp
@@ -259,9 +259,7 @@ void TOWNS_CDROM::start_command()
259259 set_dat(SCSI_STATUS_CHKCOND);
260260 break;
261261 default:
262- #ifdef _SCSI_DEBUG_LOG
263- this->out_debug_log(_T("[SCSI_DEV:ID=%d] Command: Unknown %02X\n"), scsi_id, command[0]);
264- #endif
262+ out_debug_log(_T("Command: Unknown %02X\n"), command[0]);
265263 set_dat(SCSI_STATUS_GOOD);
266264 set_phase_delay(SCSI_PHASE_STATUS, 10.0);
267265 }
--- a/source/src/vm/scsi_dev.cpp
+++ b/source/src/vm/scsi_dev.cpp
@@ -197,8 +197,8 @@ void SCSI_DEV::write_signal(int id, uint32_t data, uint32_t mask)
197197 buffer->write(data_bus);
198198 break;
199199 }
200-// set_req_delay(0, 0.1);
201- set_req_delay(0, 0.25); // 4MHz
200+ set_req_delay(0, 0.1);
201+// set_req_delay(0, 0.25); // 4MHz
202202 } else if(prev_status && !ack_status) {
203203 // H -> L
204204 if(atn_pending) {
@@ -406,7 +406,7 @@ void SCSI_DEV::set_phase(int value)
406406 selected = false;
407407 } else {
408408 first_req_clock = 0;
409-// set_bsy(1);
409+ set_bsy(1);
410410 set_req(1);
411411 //set_req_delay(0, 800.0);
412412 //set_bsy_delay(0, 800.0);
@@ -529,7 +529,7 @@ void SCSI_DEV::start_command()
529529 set_dat(SCSI_STATUS_GOOD);
530530 set_sense_code(SCSI_SENSE_NOSENSE);
531531 }
532- remain = 0;
532+// remain = 0;
533533 set_phase_delay(SCSI_PHASE_STATUS, 10.0);
534534 break;
535535
Show on old repository browser