pacnpal/RASCSI
1
0
Fork 0
mirror of https://github.com/thewesker/RASCSI.git synced 2025-12-22 21:31:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Additional updates

Browse Source
This commit is contained in:
Tony
2020-08-15 19:22:49 -05:00
parent 5fb705a2d8
commit 6737ad93f3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/raspberrypi/disks/cfilesystem.cpp
View File

@@ -76,6 +76,7 @@ static void convert(char const *src, char const *dest,
const char *inbuf, char *outbuf, size_t outsize) const char *inbuf, char *outbuf, size_t outsize)
#endif #endif
{ {
#ifndef __APPLE__
iconv_t cd; iconv_t cd;
size_t in; size_t in;
size_t out; size_t out;
@@ -97,6 +98,7 @@ static void convert(char const *src, char const *dest,
iconv_close(cd); iconv_close(cd);
*outbuf = '\0'; *outbuf = '\0';
#endif //ifndef __macintosh__
} }
#else #else
// Newlibの中にiconvが含まれてなかったので無変換 // Newlibの中にiconvが含まれてなかったので無変換
@@ -4548,7 +4550,7 @@ int CFileSys::Ioctrl(DWORD nUnit, DWORD nFunction, Human68k::ioctrl_t* pIoctrl)
case 2: case 2:
switch (pIoctrl->param) { switch (pIoctrl->param) {
case -1: case (DWORD)-1:
// メディア再認識 // メディア再認識
m_cEntry.isMediaOffline(nUnit); m_cEntry.isMediaOffline(nUnit);
return 0; return 0;
@@ -4560,17 +4562,17 @@ int CFileSys::Ioctrl(DWORD nUnit, DWORD nFunction, Human68k::ioctrl_t* pIoctrl)
} }
break; break;
case -1: case (DWORD)-1:
// 常駐判定 // 常駐判定
memcpy(pIoctrl->buffer, "WindrvXM", 8); memcpy(pIoctrl->buffer, "WindrvXM", 8);
return 0; return 0;
case -2: case (DWORD)-2:
// オプション設定 // オプション設定
SetOption(pIoctrl->param); SetOption(pIoctrl->param);
return 0; return 0;
case -3: case (DWORD)-3:
// オプション獲得 // オプション獲得
pIoctrl->param = GetOption(); pIoctrl->param = GetOption();
return 0; return 0;

6
src/raspberrypi/disks/scsi_host_bridge.cpp
View File

@@ -37,7 +37,7 @@ SCSIBR::SCSIBR() : Disk()
// Host Bridge // Host Bridge
disk.id = MAKEID('S', 'C', 'B', 'R'); disk.id = MAKEID('S', 'C', 'B', 'R');
#if defined(RASCSI) && !defined(BAREMETAL) #if defined(RASCSI) && defined(__linux__) && !defined(BAREMETAL)
// TAP Driver Generation // TAP Driver Generation
tap = new CTapDriver(); tap = new CTapDriver();
m_bTapEnable = tap->Init(); m_bTapEnable = tap->Init();
@@ -1307,7 +1307,7 @@ void FASTCALL SCSIBR::FS_Ioctrl(BYTE *buf)
switch (nFunction) { switch (nFunction) {
case 2: case 2:
case -2: case (DWORD)-2:
pIoctrl->param = htonl(pIoctrl->param); pIoctrl->param = htonl(pIoctrl->param);
break; break;
} }
@@ -1319,7 +1319,7 @@ void FASTCALL SCSIBR::FS_Ioctrl(BYTE *buf)
pIoctrl->media = htons(pIoctrl->media); pIoctrl->media = htons(pIoctrl->media);
break; break;
case 1: case 1:
case -3: case (DWORD)-3:
pIoctrl->param = htonl(pIoctrl->param); pIoctrl->param = htonl(pIoctrl->param);
break; break;
} }