Skip to content

P
PUAE
Commit a79773ea authored by GnoStiC's avatar GnoStiC
Browse files
Options

puae 2.3.1

parent d2075f37
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 7 deletions
configure.in
View file @ a79773ea
......@@ -557,6 +557,7 @@ WANT_CYCLEEXACT=yes
WANT_CAPS=no
WANT_FDI=yes
WANT_ENFORCER=dunno
WANT_CATWEASEL=no
MATHLIB=-lm
......@@ -629,7 +630,6 @@ dnl
dnl Options
dnl
AC_ARG_ENABLE(profiling, AS_HELP_STRING([--enable-profiling], [Build a profiling (SLOW!) version]), [DO_PROFILING=$enableval],[])
AC_ARG_ENABLE(a2065, AS_HELP_STRING([--enable-a2065], [Enable A2065 Ethernet emulation (default no)]), [WANT_A2065=$enableval],[])
AC_ARG_ENABLE(a2091, AS_HELP_STRING([--enable-a2091], [Enable A2091 SCSI emulation (default no)]), [WANT_A2091=$enableval],[])
AC_ARG_ENABLE(action-replay, AS_HELP_STRING([--enable-action-replay], [Enable Action Replay cartridge emulation (default yes)]), [WANT_ACTION_REPLAY=$enableval],[])
......@@ -638,6 +638,7 @@ AC_ARG_ENABLE(autoconfig, AS_HELP_STRING([--enable-autoconfig], [Enabl
AC_ARG_ENABLE(audio, AS_HELP_STRING([--enable-audio], [Enable audio output (default auto)]), [WANT_AUDIO=$enableval],[])
AC_ARG_ENABLE(amax, AS_HELP_STRING([--enable-amax], [Enable AMAX support (default no)]), [WANT_AMAX=$enableval],[])
AC_ARG_ENABLE(bsdsock, AS_HELP_STRING([--enable-bsdsock], [Enable bsdsocket.library emulation]), [WANT_BSDSOCK=$enableval],[])
AC_ARG_ENABLE(catweasel, AS_HELP_STRING([--enable-catweasel], [Enable Catweasel support (default no)]), [WANT_CATWEASEL=$enableval],[])
AC_ARG_ENABLE(cdtv, AS_HELP_STRING([--enable-cdtv], [Enable CDTV emulation (default no)]), [WANT_CDTV=$enableval],[])
AC_ARG_ENABLE(cd32, AS_HELP_STRING([--enable-cd32], [Enable CD32 emulation (default no)]), [WANT_CD32=$enableval],[])
AC_ARG_ENABLE(compatible-cpu, AS_HELP_STRING([--enable-compatible-cpu], [Enable compatible CPU emulation (default yes)]), [WANT_COMPATIBLE=$enableval],[])
......@@ -646,11 +647,12 @@ AC_ARG_ENABLE(debugger, AS_HELP_STRING([--disable-debugger], [Disab
AC_ARG_ENABLE(dga, AS_HELP_STRING([--enable-dga], [X11 version: Use the DGA extension]), [WANT_DGA=$enableval],[])
AC_ARG_ENABLE(drvsnd, AS_HELP_STRING([--enable-drvsnd], [Enable Floppy Drive Sound Emulation (default no)]), [WANT_DRVSND=$enableval],[])
AC_ARG_ENABLE(enforcer, AS_HELP_STRING([--enable-enforcer], [Enable ersatz Enforcer support (default auto)]), [WANT_ENFORCER=$enableval],[])
AC_ARG_ENABLE(gayle, AS_HELP_STRING([--enable-gayle], [Enable GAYLE IDE emulation (default no)]), [WANT_GAYLE=$enableval],[])
AC_ARG_ENABLE(gccopt, AS_HELP_STRING([--enable-gccopt], [Enable CPU Specific Optimizations (default no)]), [WANT_OPT=$enableval],[])
AC_ARG_ENABLE(fpu, AS_HELP_STRING([--enable-fpu], [Enable FPU emulation (default yes)]), [WANT_FPU=$enableval],[])
AC_ARG_ENABLE(fdi, AS_HELP_STRING([--enable-fdi], [Enable FDI support (default yes)]), [WANT_FDI=$enableval],[])
AC_ARG_ENABLE(gayle, AS_HELP_STRING([--enable-gayle], [Enable GAYLE IDE emulation (default no)]), [WANT_GAYLE=$enableval],[])
AC_ARG_ENABLE(gccopt, AS_HELP_STRING([--enable-gccopt], [Enable CPU Specific Optimizations (default no)]), [WANT_OPT=$enableval],[])
AC_ARG_ENABLE(jit, AS_HELP_STRING([--enable-jit], [Enable JIT compiler (currently x86 only)]), [WANT_JIT=$enableval],[])
AC_ARG_ENABLE(profiling, AS_HELP_STRING([--enable-profiling], [Build a profiling (SLOW!) version]), [DO_PROFILING=$enableval],[])
AC_ARG_ENABLE(natmem, AS_HELP_STRING([--enable-natmem], [Enable JIT direct memory support (default auto)]), [NATMEM=$enableval],[])
AC_ARG_ENABLE(noflags, AS_HELP_STRING([--enable-noflags], [Enable noflags support in JIT (default no)]), [NOFLAGS=$enableval],[])
AC_ARG_ENABLE(ncr, AS_HELP_STRING([--enable-ncr], [Enable NCR SCSI emulation (default no)]), [WANT_NCR=$enableval],[])
......@@ -1456,6 +1458,18 @@ if [[ "x$WANT_SCSIEMU" != "xyes" ]]; then
fi
dnl
dnl Do we want Catweasel support ?
dnl
AC_MSG_CHECKING([whether to have Catweasel support])
if [[ "x$WANT_CATWEASEL" != "xno" ]]; then
AC_MSG_RESULT(yes)
UAE_DEFINES="$UAE_DEFINES -DCATWEASEL"
else
AC_MSG_RESULT(no)
fi
dnl
dnl Do we want CDTV emulation ?
dnl
......
src/catweasel.c
View file @ a79773ea
/*
* PUAE Catweasel support
*
* Copyright
* Copyright 2011 Mustafa TUFAN
*
* some parts inspired or taken from cwfloppy
* Copyright (C) 1998-2009 Michael Krause
*
*/
#include <stdio.h>
......@@ -420,8 +430,70 @@ fail:
int catweasel_detect (void)
{
// static struct cw_controller_struct controllers[2];
int err;
err = pci_register_driver (&cwfloppy_pci_mk3);
if (err && err != -ENODEV)
return err;
err = pci_register_driver (&cwfloppy_pci_mk4);
if (err && err != -ENODEV)
return err;
// if (controllers[0].c.type == CATWEASEL_TYPE_NONE) {
// write_log("No PCI Catweasels found.\n");
// }
pci_unregister_driver(&cwfloppy_pci_mk4);
pci_unregister_driver(&cwfloppy_pci_mk3);
if (detected)
return detected < 0 ? 0 : 1;
}
static int cwfloppy_probe_mk3(struct pci_dev *pcidev, const struct pci_device_id *pciid)
{
return 0;
}
static int cwfloppy_probe_mk4(struct pci_dev *pcidev, const struct pci_device_id *pciid)
{
return 0;
}
#define CATWEASEL_TYPE_NONE -1
#define CATWEASEL_TYPE_MK1 1
#define CATWEASEL_TYPE_MK3 3
#define CATWEASEL_TYPE_MK4 4
/* pci ids */
#define CW_MK4_VENDOR 0xe159
#define CW_MK4_DEVICE 0x0001
static struct pci_device_id id_table_mk3[] = {
{ CW_MK4_VENDOR, CW_MK4_DEVICE, 0x1212, 0x0002, },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, id_table_mk3);
static struct pci_driver cwfloppy_pci_mk3 = {
name: "cwfloppy_mk3",
id_table: id_table_mk3,
probe: cwfloppy_probe_mk3
};
static struct pci_device_id id_table_mk4[] = {
/* The MK4 PCI bridge has a bug where the reported subvendor and
* subdevice IDs may randomly change between various values. */
{ CW_MK4_VENDOR, CW_MK4_DEVICE, 0x5213, 0x0002, },
{ CW_MK4_VENDOR, CW_MK4_DEVICE, 0x5213, 0x0003, },
{ CW_MK4_VENDOR, CW_MK4_DEVICE, 0x5200, 0x0002, },
{ CW_MK4_VENDOR, CW_MK4_DEVICE, 0x5200, 0x0003, },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, id_table_mk4);
static struct pci_driver cwfloppy_pci_mk4 = {
.name = "cwfloppy_mk4",
.id_table = id_table_mk4,
.probe = cwfloppy_probe_mk4,
};
#endif
src/inputdevice.c
View file @ a79773ea
......@@ -220,7 +220,7 @@ static struct input_queue_struct input_queue[INPUT_QUEUE_SIZE];
uae_u8 *restore_input (uae_u8 *src)
{
unsigned int i,j;
unsigned int i, j;
restore_u32 ();
for (i = 0; i < 2; i++) {
for (j = 0; j < 2; j++) {
......@@ -232,7 +232,7 @@ uae_u8 *restore_input (uae_u8 *src)
uae_u8 *save_input (int *len, uae_u8 *dstptr)
{
uae_u8 *dstbak, *dst;
unsigned int i,j;
unsigned int i, j;
if (dstptr)
dstbak = dst = dstptr;
......@@ -581,7 +581,7 @@ static TCHAR *getstring (const TCHAR **pp)
static void reset_inputdevice_settings (struct uae_input_device *uid)
{
unsigned int l, i;
unsigned int l,i;
for (l = 0; l < MAX_INPUT_DEVICE_EVENTS; l++) {
for (i = 0; i < MAX_INPUT_SUB_EVENT; i++) {
uid->eventid[l][i] = 0;
......@@ -4344,7 +4344,7 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
static void disableifempty2 (struct uae_input_device *uid)
{
unsigned int i,j;
unsigned int i, j;
for (i = 0; i < MAX_INPUT_DEVICE_EVENTS; i++) {
for (j = 0; j < MAX_INPUT_SUB_EVENT; j++) {
if (uid->eventid[i][j] > 0 || uid->custom[i][j] != NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment