mirror of
https://github.com/libretro/PUAE.git
synced 2024-11-24 00:09:54 +00:00
syncing 2.3.0
This commit is contained in:
Mustafa 'GnoStiC' TUFAN
parent
cadc4ee615
commit
0ca2fccc7e
@ -6,7 +6,7 @@ dnl Updated and generally mauled 2008 Mustafa Tufan
|
||||
dnl
|
||||
|
||||
AC_PREREQ(2.55)
|
||||
AC_INIT(PUAE, 2.2.0, ,puae)
|
||||
AC_INIT(PUAE, 2.3.0, ,puae)
|
||||
AC_CONFIG_SRCDIR([bootstrap.sh])
|
||||
AM_CONFIG_HEADER([src/sysconfig.h])
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
30
src/disk.c
30
src/disk.c
@ -502,7 +502,7 @@ static int get_floppy_speed2 (drive *drv)
|
||||
}
|
||||
|
||||
#ifdef DEBUG_DRIVE_ID
|
||||
static const char *drive_id_name (drive *drv)
|
||||
static const TCHAR *drive_id_name(drive *drv)
|
||||
{
|
||||
switch(drv->drive_id)
|
||||
{
|
||||
@ -2145,14 +2145,14 @@ void disk_creatediskfile (TCHAR *name, int type, drive_type adftype, TCHAR *disk
|
||||
|
||||
}
|
||||
|
||||
int disk_getwriteprotect (const char *name)
|
||||
int disk_getwriteprotect (const TCHAR *name)
|
||||
{
|
||||
int needwritefile;
|
||||
drive_type drvtype;
|
||||
return diskfile_iswriteprotect (name, &needwritefile, &drvtype);
|
||||
}
|
||||
|
||||
static void diskfile_readonly (const char *name, int readonly)
|
||||
static void diskfile_readonly (const TCHAR *name, bool readonly)
|
||||
{
|
||||
struct stat st;
|
||||
int mode, oldmode;
|
||||
@ -3146,14 +3146,14 @@ void DSKLEN (uae_u16 v, unsigned int hpos)
|
||||
break;
|
||||
}
|
||||
if (dr == 4) {
|
||||
write_log ("disk %s DMA started, drvmask=%x motormask=%x\n",
|
||||
dskdmaen == 3 ? "write" : "read", selected ^ 15, motormask);
|
||||
write_log ("disk %s DMA started, drvmask=%x motormask=%x PC=%08x\n",
|
||||
dskdmaen == 3 ? "write" : "read", selected ^ 15, motormask, M68K_GETPC);
|
||||
noselected = 1;
|
||||
} else {
|
||||
if (disk_debug_logging > 0) {
|
||||
write_log ("disk %s DMA started, drvmask=%x track %d mfmpos %d dmaen=%d\n",
|
||||
write_log ("disk %s DMA started, drvmask=%x track %d mfmpos %d dmaen=%d PC=%08X\n",
|
||||
dskdmaen == 3 ? "write" : "read", selected ^ 15,
|
||||
floppy[dr].cyl * 2 + side, floppy[dr].mfmpos, dma_enable);
|
||||
floppy[dr].cyl * 2 + side, floppy[dr].mfmpos, dma_enable, M68K_GETPC);
|
||||
disk_dma_debugmsg ();
|
||||
}
|
||||
}
|
||||
@ -3494,7 +3494,7 @@ uae_u8 *restore_disk (int num,uae_u8 *src)
|
||||
{
|
||||
drive *drv;
|
||||
int state, dfxtype;
|
||||
char old[MAX_DPATH];
|
||||
TCHAR old[MAX_DPATH];
|
||||
int newis;
|
||||
|
||||
drv = &floppy[num];
|
||||
@ -3645,14 +3645,14 @@ uae_u8 *save_floppy(int *len, uae_u8 *dstptr)
|
||||
#endif /* SAVESTATE */
|
||||
|
||||
#define MAX_DISKENTRIES 4
|
||||
int disk_prevnext_name (char *imgp, int dir)
|
||||
int disk_prevnext_name (TCHAR *imgp, int dir)
|
||||
{
|
||||
char img[MAX_DPATH], *ext, *p, *p2, *ps, *dst[MAX_DISKENTRIES];
|
||||
TCHAR img[MAX_DPATH], *ext, *p, *p2, *ps, *dst[MAX_DISKENTRIES];
|
||||
int num = -1;
|
||||
int cnt, i;
|
||||
char imgl[MAX_DPATH];
|
||||
TCHAR imgl[MAX_DPATH];
|
||||
int ret, gotone, wrapped;
|
||||
char *old;
|
||||
TCHAR *old;
|
||||
|
||||
old = my_strdup (imgp);
|
||||
|
||||
@ -3708,7 +3708,7 @@ retry:
|
||||
ext = _tcsrchr (ps, '.');
|
||||
if (!ext || ext - ps < 4)
|
||||
break;
|
||||
char *ext2 = ext - imgl + img;
|
||||
TCHAR *ext2 = ext - imgl + img;
|
||||
// name_<non numeric character>x.ext
|
||||
if (ext[-3] == '_' && !_istdigit (ext[-2]) && _istdigit (ext[-1])) {
|
||||
num = _tstoi (ext - 1);
|
||||
@ -3755,7 +3755,7 @@ retry:
|
||||
goto end;
|
||||
}
|
||||
if (gotone) { // was (disk x but no match, perhaps there are extra tags..
|
||||
char *old2 = my_strdup (img);
|
||||
TCHAR *old2 = my_strdup (img);
|
||||
for (;;) {
|
||||
ext = _tcsrchr (img, '.');
|
||||
if (!ext)
|
||||
@ -3764,7 +3764,7 @@ retry:
|
||||
break;
|
||||
if (ext[-1] != ']')
|
||||
break;
|
||||
char *t = _tcsrchr (img, '[');
|
||||
TCHAR *t = _tcsrchr (img, '[');
|
||||
if (!t)
|
||||
break;
|
||||
t[0] = 0;
|
||||
|
||||
@ -1503,7 +1503,7 @@ static void recycle_aino (Unit *unit, a_inode *new_aino)
|
||||
#if 0
|
||||
{
|
||||
TCHAR buffer[40];
|
||||
sprintf (buffer, "%d ainos reaped.\n", i);
|
||||
_stprintf (buffer, "%d ainos reaped.\n", i);
|
||||
TRACE ((buffer));
|
||||
}
|
||||
#endif
|
||||
@ -2270,7 +2270,7 @@ static void
|
||||
int ret;
|
||||
|
||||
/* if (unit->volflags & MYVOLUMEINFO_ARCHIVE)
|
||||
ret = 0; //zfile_fs_usage_archive (unit->ui.rootdir, 0, &fsu);
|
||||
ret = zfile_fs_usage_archive (unit->ui.rootdir, 0, &fsu);
|
||||
else*/
|
||||
ret = get_fs_usage (unit->ui.rootdir, 0, &fsu);
|
||||
if (ret != 0) {
|
||||
@ -2542,7 +2542,7 @@ static void
|
||||
for (hash = 0; hash < NOTIFY_HASH_SIZE; hash++) {
|
||||
for (n = unit->notifyhash[hash]; n; n = n->next) {
|
||||
if (n->notifyrequest == nr) {
|
||||
//write_log ("NotifyRequest %08.8X freed\n", n->notifyrequest);
|
||||
//write_log ("NotifyRequest %08X freed\n", n->notifyrequest);
|
||||
xfree (n->fullname);
|
||||
xfree (n->partname);
|
||||
free_notify (unit, hash, n);
|
||||
@ -2551,7 +2551,7 @@ static void
|
||||
}
|
||||
}
|
||||
}
|
||||
//write_log ("Tried to free non-existing NotifyRequest %08.8X\n", nr);
|
||||
//write_log ("Tried to free non-existing NotifyRequest %08X\n", nr);
|
||||
PUT_PCK_RES1 (packet, DOS_TRUE);
|
||||
}
|
||||
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
<key>CFBundleName</key>
|
||||
<string>PUAE</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>2.2.0</string>
|
||||
<string>2.3.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>2.2.0</string>
|
||||
<string>2.3.0</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@ -293,7 +293,7 @@
|
||||
#define PACKAGE_NAME "PUAE"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "PUAE 2.2.0"
|
||||
#define PACKAGE_STRING "PUAE 2.3.0"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "puae"
|
||||
@ -302,7 +302,7 @@
|
||||
#define PACKAGE_URL ""
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "2.2.0"
|
||||
#define PACKAGE_VERSION "2.3.0"
|
||||
|
||||
/* Define to the necessary symbol if this constant uses a non-standard name on
|
||||
your system. */
|
||||
@ -395,7 +395,7 @@
|
||||
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.2.0"
|
||||
#define VERSION "2.3.0"
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
|
||||
@ -445,7 +445,7 @@ configure:4344: $? = 0
|
||||
configure:4344: result: yes
|
||||
configure:4350: checking for _doprnt
|
||||
configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused conftest.c >&5
|
||||
/tmp/ccfiu6rL.o: In function `main':
|
||||
/tmp/ccTFdHnN.o: In function `main':
|
||||
/home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
|
||||
collect2: ld returned 1 exit status
|
||||
configure:4350: $? = 1
|
||||
@ -533,7 +533,7 @@ configure:4364: $? = 0
|
||||
configure:4364: result: yes
|
||||
configure:4364: checking for strcmpi
|
||||
configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused conftest.c >&5
|
||||
/tmp/ccbxgm14.o: In function `main':
|
||||
/tmp/cc2hgaV2.o: In function `main':
|
||||
/home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
|
||||
collect2: ld returned 1 exit status
|
||||
configure:4364: $? = 1
|
||||
@ -613,7 +613,7 @@ configure: failed program was:
|
||||
configure:4364: result: no
|
||||
configure:4364: checking for stricmp
|
||||
configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused conftest.c >&5
|
||||
/tmp/cc9wD849.o: In function `main':
|
||||
/tmp/ccpW3ZCa.o: In function `main':
|
||||
/home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
|
||||
collect2: ld returned 1 exit status
|
||||
configure:4364: $? = 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user