joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Jonathan Campbell 2021-12-05 22:03:48 -08:00
commit d9b5bc587b
1 changed files with 185 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dos/drive_fat.cpp
View File

@ -15,7 +15,11 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* VIM ref for tabbing:
*
* set tabstop=8 | set softtabstop=8 | set shiftwidth=8 | set expandtab
*
*/
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -97,6 +101,7 @@ int MBRAutoChoose_FAT(const std::vector<partTable::partentry_t> &parts,imageDisk
use_ver_min = dos.version.minor = 0; use_ver_min = dos.version.minor = 0;
dos_ver_menu(false); dos_ver_menu(false);
} }
if (use_ver_maj >= 7) /* MS-DOS 7.0 or higher */ if (use_ver_maj >= 7) /* MS-DOS 7.0 or higher */
return (int)i; return (int)i;
else else
@ -220,12 +225,6 @@ public:
bool modified = false; bool modified = false;
bool loadedSector = false; bool loadedSector = false;
fatDrive *myDrive; fatDrive *myDrive;
#if 0/*unused*/
private:
enum { NONE,READ,WRITE } last_action;
uint16_t info;
#endif
}; };
void time_t_to_DOS_DateTime(uint16_t &t,uint16_t &d,time_t unix_time) { void time_t_to_DOS_DateTime(uint16_t &t,uint16_t &d,time_t unix_time) {