From eec77bddfd9b9169b23717cf3b37d182ca88bbc3 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Thu, 4 Apr 2013 20:46:35 -0500 Subject: [PATCH] First stab at adding translations. Translators needed! :-) --- res/help_fr.html | 287 ++++++++++++++++++++++ res/help_gr.html | 287 ++++++++++++++++++++++ src/eeprom.cpp | 108 +++++++- src/eeprom.h | 1 - src/gui/configdialog.cpp | 4 + src/gui/mainwin.cpp | 17 +- src/gui/virtualjaguar.qrc | 6 + virtualjaguar.pro | 6 +- virtualjaguar_fr.ts | 500 ++++++++++++++++++++++++++++++++++++++ virtualjaguar_gr.ts | 500 ++++++++++++++++++++++++++++++++++++++ 10 files changed, 1690 insertions(+), 26 deletions(-) create mode 100644 res/help_fr.html create mode 100644 res/help_gr.html create mode 100644 virtualjaguar_fr.ts create mode 100644 virtualjaguar_gr.ts diff --git a/res/help_fr.html b/res/help_fr.html new file mode 100644 index 0000000..d23dbb8 --- /dev/null +++ b/res/help_fr.html @@ -0,0 +1,287 @@ + + + +Virtual Jaguar: The Documentation + + + +

Virtual Jaguar: The Documentation

+ +

Virtual Jaguar Quick Start

+ +

Welcome to Virtual Jaguar! If this is your first time using Virtual Jaguar, you can get a feel for what it is and does by doing the following: + +

Select “Insert Cartridge” from the “Jaguar” menu, or press the “Insert Cartridge” toolbar button.
In the dialog that shows up, you will see the pack-in title of Downfall which is brought to you courtesy of Reboot (http://reboot.atari.org).
Click on the Insert button in the lower right hand corner of the dialog or simply press the Enter key on your keyboard.
In a few moments, the Downfall title screen should show in the Virtual Jaguar main window.

+ +

To play, use the left and right keys (mapped to Z and C on your keyboard) and the the B button (mapped to K on your keyboard). You can pause Virtual Jaguar by selecting “Pause” from the “Jaguar” menu, pressing the “Pause” toolbar button, or by pressing the Esc key on your keyboard. You can quit Virtual Jaguar by selecting “Exit” from the “Jaguar” menu, or by pressing Ctrl + Q on your keyboard.

+ +

System Requirements

+ +

Virtual Jaguar should be able to run on most late model computers equipped with an OpenGL compliant video card. It requires a lot of raw oomph in it’s present form to run well; do not be surprised if it doesn’t run at 100% speed with all the options turned on. Certain subsystems of the Jaguar are not optimized yet and as such take more time than they would if they were optimized. To run Virtual Jaguar at full speed with all options on, we recommend using liquid nitrogen. At least until we get it properly optimized. ;-)

+ +

Virtual Jaguar In Depth

+ +

This version of Virtual Jaguar has been redesigned with a modern GUI and as such should be fairly easy to use and understand. However, some options may not do what you expect: What follows is an exhaustive look at what the various toolbar buttons and menu options do.

+ +

The Toolbar

+ +

The main Virtual Jaguar toolbar contains the following buttons:

+ +

Power
Pause
Insert Cartridge
Use CD Unit
Scale x1
Scale x2
Scale x3
NTSC
PAL
Blur
Full Screen

+ +

Here’s what they do.

+ +

Power

+ +

This toolbar button acts just like the power switch on a real Jaguar, complete with untuned tank circuit noise showing on the screen when the emulated Jaguar is turned off. Some options can only be changed after the power has been turned off, such as the NTSC/PAL switches, or the “Use CD Unit” option. The “Use Jaguar BIOS” option in the Configuration dialog will only take effect after the power has been cycled.

+ +

Pause

+ +

Pressing the Pause toolbar button will pause execution of the emulated Jaguar. Note that most games have a pause feature that is built into the game; this feature is separate from and will override any built-in game pause feature. Also, the emulator will go into pause mode if the power is on when you activate the “Insert Cartridge” dialog. Pressing the Esc key will also activate this option. Selecting this option in any of the ways listed above, while in pause mode, will take it out of pause mode.

+ +

Insert Cartridge

+ +

Pressing the Insert Cartridge button will bring up the Insert Cartridge dialog; it can also be launched by pressing Ctrl + I on your keyboard. On the left side of the dialog will be a list of software that Virtual Jaguar recognizes from the directory you tell it to look into (see the “Configure” menu option and the “General” tab, “Software” item for more information). Selecting an item in the list will bring up some information about the software on the right side of the dialog, if Virtual Jaguar knows about it. Pressing the icon in the lower right hand side of the dialog will then cause Virtual Jaguar to attempt to run the selected item. Virtual Jaguar cycles the power when it attempts to run the software you select.

+ +

There are also some keyboard shortcuts that come with the Insert Cartridge dialog: Pressing a letter key will highlight the nearest item in the list that starts with that letter. Pressing more than one letter key in quick succession will narrow in on the item that matches those letter keys pressed. Pressing the Esc key will dismiss the dialog without attempting to load anything, and pressing the Enter key is the same as pressing the icon in the lower right hand side of the dialog.

+ +

Use CD Unit

+ +

Pressing this toolbar button will virtually plug in a Jaguar CD unit into the emulated Jaguar. It can only be toggled with the virtual machine powered off.

+ +

As of the release date for this emulator, this option DOES NOT WORK 100% the way it’s intended to: When it’s working correctly, selecting this option will allow you to insert a Jaguar CD game into your computer’s CD/DVD drive and play it as if it were on a real Jaguar. For now, you can see the CD BIOS make pretty patterns on your screen if you use it.

+ +

Note that once this is working as it should, the DSP will be required to be enabled for it to work properly. It WILL NOT WORK properly without the DSP.

+ +

Scale x1

+ +

Selecting this toolbar button will cause the screen to be displayed with pixels that are sized 1 to 1 with your display; this will give you a very small display.

+ +

Scale x2

+ +

This will cause the screen to be displayed with pixels that are sized 2 to 1 with your display.

+ +

Scale x3

+ +

This will cause the screen to be displayed with pixels that are sized 3 to 1 with your display; this should yield a fairly large display.

+ +

NTSC

+ +

Selecting this item will cause the emulated Jaguar to behave as if it were an NTSC type Jaguar, running at 60 Hz. This option can only be toggled when the virtual machine is powered off.

+ +

PAL

+ +

Selecting this item will cause the emulated Jaguar to behave as if it were an PAL type Jaguar, running at 50 Hz. As an added bonus, you also get a few extra scan lines as compared with NTSC mode; some games will even utilize this extra screen real estate. This option can only be toggled when the virtual machine is powered off.

+ +

Blur

+ +

Normally, the emulated Jaguar’s display shows pixels that are razor sharp and is what you would likely see if the Jaguar was hooked up to a high quality monitor. Selecting this item will cause the emulated Jaguar’s display to be averaged, resulting in a screen that looks slightly blurry—more like what you would expect to see if the Jaguar was hooked up to a television. This is an aesthetic option that some people prefer; you may or may not like it.

+ +

Full Screen

+ +

Selecting this toolbar button will switch the display into full screen mode; selecting it again will switch it back to windowed mode. This option can also be activated by pressing the F9 key on your keyboard. Note that on monitors with a wide aspect ratio that Virtual Jaguar will still display its virtual screen in a 4:3 aspect ratio—this is normal and expected.

+ + +

Jaguar Menu

+ +

This menu has the following options:

+ +

Power
Pause
Frame Advance
Insert Cartridge...
Use CD Unit
Configure
Exit

+ +

Power does the same as the toolbar button; see the “Power” toolbar button description for details.

+ +

Pause does the same as the toolbar button; see the “Pause” toolbar button description for details.

+ +

Frame Advance causes Virtual Jaguar to run for one frame (1/60th of a second for NTSC, 1/50th for PAL), and update the screen. This function can also be activated by pressing the F7 key on your keyboard. This option only works when Virtual Jaguar is paused.

+ +

Insert Cartridge... does the same as the toolbar button; see the “Insert Cartridge” toolbar button description for details.

+ +

Use CD Unit does the same as the toolbar button; see the “Use CD Unit” toolbar button description for details.

+ +

Configure launches the Configure dialog. A full description is given in the “Configure Dialog” section below.

+ +

Exit quits Virtual Jaguar immediately. You can also quit Virtual Jaguar by pressing Ctrl + Q on your keyboard.

+ +

Help Menu

+ +

This menu has the following options:

+ +

Contents
About

+ +

The Contents is what you’re reading right now. The voice you are hearing in your head is probably your own, though we can’t guarantee that. ;-) This dialog can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

The About option shows a credits dialog. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

The Configure Dialog

+ +

The Configure dialog has the following tabs:

+ +

General
Controller #1
Controller #2

+ +

General Tab

+ +

Under the General tab, there are the following options:

+ +

EEPROMs
Software
Enable Jaguar BIOS
Enable GPU
Enable DSP
Show all files in file chooser

+ +

Here’s what they do.

+ +

EEPROMs

+ +

This field holds the location on your filesystem where your EEPROM files will live (see the “EEPROMs” section below for details). The path can be either absolute or relative; if relative, it will be relative to where the Virtual Jaguar executable is located on your filesystem.

+ +

Software

+ +

This field holds the location on your filesystem where your Jaguar software files will live (see the “Software” section below for details). The path can be either absolute or relative; if relative, it will be relative to where the Virtual Jaguar executable is located on your filesystem.

+ +

Enable Jaguar BIOS

+ +

Checking this option will cause the emulated Jaguar to run with the built-in system BIOS upon powering on. This is usually not necessary, but some games will not run correctly without it. Note that this option will only affect cartridge images; it has no effect on Alpine ROMs or homebrew files. Also, it won't take effect until the virtual machine has been power cycled.

+ +

Enable GPU

+ +

The GPU is one of the three main processors in the Jaguar, and checking this option enables it. Most software will not work without this.

+ +

Enable DSP

+ +

The DSP is one of the three main processors in the Jaguar, and checking this option enables it. Much software will work without it, however, there is some software that will not. Note that if the DSP is disabled, there will be no sound.

+ +

Show all files in file chooser

+ +

Normally the “Insert Cartridge...” dialog will ignore any files it encounters that it doesn’t know how to deal with. You can override this behavior by checking this option. However, this will not cause Virtual Jaguar to be able to load such files.

+ +

Controller Tab

+ +

Under the Controller tab, there are the following options:

+ +

A picture of a Jaguar controller showing which inputs are defined
A button labeled “Define All Inputs”

+ +

Hovering over a letter on the picture of the Jaguar controller will highlight it; clicking on the letter will let you redefine that input by pressing a key on the keyboard or button on a connected gamepad. If you prefer, you can define all inputs at once by clicking on the “Define All Inputs” button. It will then step through each input on the controller, one at a time, and wait for you to press the key/button that you wish to set it to. You can exit the key redefinition process at any time by pressing the Esc key on your keyboard.

+ +

NOTE: For gamepads to be detected, they must be connected to the computer before starting Virtual Jaguar.

+ +

EEPROMs

+ +

EEPROMs (Electrically Erasable Programmable Read Only Memory) were typically installed on Jaguar cartridges to save high scores and the like, and Virtual Jaguar emulates this. The EEPROMs are keyed to specific games by making a CRC32 checksum of the game and using this as a filename. If an EEPROM file does not exist, it is created when the emulated Jaguar writes to it. The EEPROM files are stored in the location specified by the “EEPROMs” field of the Configuration dialog, under the “General” tab.

+ +

Software

+ +

Software can be either uncompressed or stored in a ZIP file. Virtual Jaguar looks for software in the location specified by the “Software” field in the Configuration dialog, under the “General” tab.

+ +

Virtual Jaguar is a bit picky about file formats, but tries its best to figure out what you’re trying to feed it. In general, if the file is a ROM image, or an Alpine image, Virtual Jaguar will recognize and utilize it. If it’s a file meant to load into the emulated Jaguar’s RAM space, Virtual Jaguar will load and run it as long as the file contains proper headers. A headerless file of this kind (as opposed to a cartridge or Alpine ROM image) is useless; it contains no information to help Virtual Jaguar know how to load and run it. There is no excuse for this kind of file to exist other than programmer laziness: So, if a file is not recognized by Virtual Jaguar, complain to the author and ask politely for a file with headers. :-)

+ +

Some Issues You May Encounter

+ +

Most of the time Virtual Jaguar tries to do the right thing with what you tell it to do. There are some options, however, that would be more annoying to use if Virtual Jaguar got in the way and forced you to do the right thing, so, in those places where it’s possible to tell Virtual Jaguar to do bad things, it will willingly oblige.

+ +

Some cartridge based games will not work without either the DSP enabled, the BIOS enabled, or both. Virtual Jaguar will let you attempt to run those games with those options disabled, but the result probably won’t be what you want.

+ +

Jaguar Programmer’s Zone

+ +

Virtual Jaguar has a mode available that makes it more convenient for developers to use. In order to use this mode, you must start Virtual Jaguar with the --alpine option.

+ +

When started in this mode, an Alpine tab is made available in the configuration dialog which gives you the following options:

+ +

ROM to load
ABS to load

+ +

ROM to load is the path to a Jaguar executable file that will be loaded into the Jaguar’s cartridge memory space at $800000 (Alpine ROM images will load at $802000). As a convenience to coders, this file can be of any length, as long as it fits into the cartridge memory space (a file of this type is treated as an Alpine ROM and is loaded at $802000). The file thus loaded into memory will not be executed.

+ +

ABS to load is the path to a Jaguar executable file that will be loaded in the Jaguar’s main RAM. This file must have valid headers, otherwise Virtual Jaguar won’t be able to load it. Assuming the file exists and has the correct headers in it, it will be loaded and run when Virtual Jaguar is first run.

+ +

Also, when in Alpine mode, extra toolbar buttons are defined (also found under the extra “Debug” menu):

+ +

Memory Browser
CPU Browser
OP Browser
M68K Disassembly Browser
RISC Disassembly Browser

+ +

Memory Browser

+ +

This window lets you inspect Virtual Jaguar’s emulated memory space. The PgDn key will advance the top of the window’s memory location by 480 bytes, and PgUp will go back by the same amount. The Plus (+) key will advance the top of the window’s memory location by 16 bytes, and Minus (-) will go back by the same amount. Entering a memory location, in hexadecimal, in the edit field and pressing the Go button will display memory from that location. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

CPU Browser

+ +

This window shows the state of the various CPUs in the emulated Jaguar. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

OP Browser

+ +

This window shows the current state of object list that the Object Processor is pointing to. Note that most of the time, this will likely show an object list that has had its objects processed. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

M68K Disassembly Browser

+ +

This window provides a disassembly of 68000 opcodes. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

RISC Disassembly Browser

+ +

This window provides a disassembly of RISC opcodes. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

The aforementioned options will only work when Virtual Jaguar is run in Alpine mode, that is, when the --alpine flag is passed in. If you do not pass in the --alpine flag, Virtual Jaguar will run as it normally does, i.e., as a stock Jaguar, and nothing will be loaded by default.

+ +

For The Curious

+ +

If you’re wondering why some cartridges have labels in the “Insert Cartridge...” dialog and some don’t, read on...

+ +

Virtual Jaguar looks at your ZIP file as a container—if it finds what it expects in the ZIP, it will use it. For example, label images: If you put an image file of a cartridge label in the ZIP file with your ROM image, Virtual Jaguar will use that image in the “Insert Cartridge...” dialog—assuming it’s a valid image file. The image should be 365 x 168 for it to show up on the big cartridge image without any scaling; any bigger is just a waste of space and Virtual Jaguar will scale it down to 365 x 168 anyway.

+ +

Using the ZIP file as a container this way opens up some exciting possibilities: Box art, overlays and documentation can be included and future versions of Virtual Jaguar will be able to utilize them.

+ +

Legal Nigglings

+ +

Or, as it’s more commonly known, the disclaimer: “O liability, I do disclaim thee!”

+ +

Trademarks used in Virtual Jaguar and/or this documentation are the property of their respective owners. The user(s) of Virtual Jaguar assumes all risk associated with using the software; the authors are not responsible for anything the user(s) does with said software or what happens to the user(s) as a result of using this software.

+ +

Virtual Jaguar is Free (as in Libre) software and is licensed under the GPL version 3. You should have received a copy of the license with this software; if you did not, you may view a copy at http://www.gnu.org/licenses. A copy of the source code is available at http://icculus.org/virtualjaguar.

+ +

Downfall is © 2011 Reboot, All Rights Reserved. Distribution of Downfall with Virtual Jaguar has been graciously authorized by Reboot, and may not be distributed as part of any other package.

+ + + diff --git a/res/help_gr.html b/res/help_gr.html new file mode 100644 index 0000000..d23dbb8 --- /dev/null +++ b/res/help_gr.html @@ -0,0 +1,287 @@ + + + +Virtual Jaguar: The Documentation + + + +

Virtual Jaguar: The Documentation

+ +

Virtual Jaguar Quick Start

+ +

Welcome to Virtual Jaguar! If this is your first time using Virtual Jaguar, you can get a feel for what it is and does by doing the following: + +

Select “Insert Cartridge” from the “Jaguar” menu, or press the “Insert Cartridge” toolbar button.
In the dialog that shows up, you will see the pack-in title of Downfall which is brought to you courtesy of Reboot (http://reboot.atari.org).
Click on the Insert button in the lower right hand corner of the dialog or simply press the Enter key on your keyboard.
In a few moments, the Downfall title screen should show in the Virtual Jaguar main window.

+ +

System Requirements

+ +

Virtual Jaguar In Depth

+ +

The Toolbar

+ +

The main Virtual Jaguar toolbar contains the following buttons:

+ +

Power
Pause
Insert Cartridge
Use CD Unit
Scale x1
Scale x2
Scale x3
NTSC
PAL
Blur
Full Screen

+ +

Here’s what they do.

+ +

Power

+ +

Pause

+ +

Insert Cartridge

+ +

Use CD Unit

+ +

Pressing this toolbar button will virtually plug in a Jaguar CD unit into the emulated Jaguar. It can only be toggled with the virtual machine powered off.

+ +

Note that once this is working as it should, the DSP will be required to be enabled for it to work properly. It WILL NOT WORK properly without the DSP.

+ +

Scale x1

+ +

Selecting this toolbar button will cause the screen to be displayed with pixels that are sized 1 to 1 with your display; this will give you a very small display.

+ +

Scale x2

+ +

This will cause the screen to be displayed with pixels that are sized 2 to 1 with your display.

+ +

Scale x3

+ +

This will cause the screen to be displayed with pixels that are sized 3 to 1 with your display; this should yield a fairly large display.

+ +

NTSC

+ +

Selecting this item will cause the emulated Jaguar to behave as if it were an NTSC type Jaguar, running at 60 Hz. This option can only be toggled when the virtual machine is powered off.

+ +

PAL

+ +

Blur

+ +

Full Screen

+ +

+ + +

Jaguar Menu

+ +

This menu has the following options:

+ +

Power
Pause
Frame Advance
Insert Cartridge...
Use CD Unit
Configure
Exit

+ +

Power does the same as the toolbar button; see the “Power” toolbar button description for details.

+ +

Pause does the same as the toolbar button; see the “Pause” toolbar button description for details.

+ +

Insert Cartridge... does the same as the toolbar button; see the “Insert Cartridge” toolbar button description for details.

+ +

Use CD Unit does the same as the toolbar button; see the “Use CD Unit” toolbar button description for details.

+ +

Configure launches the Configure dialog. A full description is given in the “Configure Dialog” section below.

+ +

Exit quits Virtual Jaguar immediately. You can also quit Virtual Jaguar by pressing Ctrl + Q on your keyboard.

+ +

Help Menu

+ +

This menu has the following options:

+ +

Contents
About

+ +

The About option shows a credits dialog. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

The Configure Dialog

+ +

The Configure dialog has the following tabs:

+ +

General
Controller #1
Controller #2

+ +

General Tab

+ +

Under the General tab, there are the following options:

+ +

EEPROMs
Software
Enable Jaguar BIOS
Enable GPU
Enable DSP
Show all files in file chooser

+ +

Here’s what they do.

+ +

EEPROMs

+ +

Software

+ +

Enable Jaguar BIOS

+ +

Enable GPU

+ +

The GPU is one of the three main processors in the Jaguar, and checking this option enables it. Most software will not work without this.

+ +

Enable DSP

+ +

Show all files in file chooser

+ +

Controller Tab

+ +

Under the Controller tab, there are the following options:

+ +

A picture of a Jaguar controller showing which inputs are defined
A button labeled “Define All Inputs”

+ +

NOTE: For gamepads to be detected, they must be connected to the computer before starting Virtual Jaguar.

+ +

EEPROMs

+ +

Software

+ +

Some Issues You May Encounter

+ +

Jaguar Programmer’s Zone

+ +

Virtual Jaguar has a mode available that makes it more convenient for developers to use. In order to use this mode, you must start Virtual Jaguar with the --alpine option.

+ +

When started in this mode, an Alpine tab is made available in the configuration dialog which gives you the following options:

+ +

ROM to load
ABS to load

+ +

Also, when in Alpine mode, extra toolbar buttons are defined (also found under the extra “Debug” menu):

+ +

Memory Browser
CPU Browser
OP Browser
M68K Disassembly Browser
RISC Disassembly Browser

+ +

Memory Browser

+ +

CPU Browser

+ +

OP Browser

+ +

M68K Disassembly Browser

+ +

This window provides a disassembly of 68000 opcodes. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

RISC Disassembly Browser

+ +

This window provides a disassembly of RISC opcodes. It can be dismissed by clicking on the “X” in the upper corner of the dialog, or by pressing the Esc key on your keyboard.

+ +

For The Curious

+ +

If you’re wondering why some cartridges have labels in the “Insert Cartridge...” dialog and some don’t, read on...

+ +

Legal Nigglings

+ +

Or, as it’s more commonly known, the disclaimer: “O liability, I do disclaim thee!”

+ +

+ + + diff --git a/src/eeprom.cpp b/src/eeprom.cpp index 485a2a1..4258a4e 100644 --- a/src/eeprom.cpp +++ b/src/eeprom.cpp @@ -21,9 +21,10 @@ #include "log.h" #include "settings.h" -#define eeprom_LOG +//#define eeprom_LOG static uint16_t eeprom_ram[64]; +static uint16_t cdromEEPROM[64]; // // Private function prototypes @@ -50,12 +51,18 @@ static uint16_t jerry_ee_data = 0; static uint16_t jerry_ee_data_cnt = 16; static uint16_t jerry_writes_enabled = 0; static uint16_t jerry_ee_direct_jump = 0; + static char eeprom_filename[MAX_PATH]; -static bool foundEEPROM = false; +static char cdromEEPROMFilename[MAX_PATH]; +static bool haveEEPROM = false; +static bool haveCDROMEEPROM = false; + void EepromInit(void) { + // Handle regular cartridge EEPROM sprintf(eeprom_filename, "%s%08X.eep", vjs.EEPROMPath, (unsigned int)jaguarMainROMCRC32); + sprintf(cdromEEPROMFilename, "%scdrom.eeprom", vjs.EEPROMPath); FILE * fp = fopen(eeprom_filename, "rb"); if (fp) @@ -63,37 +70,68 @@ void EepromInit(void) fread(eeprom_ram, 1, 128, fp); fclose(fp); WriteLog("EEPROM: Loaded from %s\n", eeprom_filename); - foundEEPROM = true; + haveEEPROM = true; } else WriteLog("EEPROM: Could not open file \"%s\"!\n", eeprom_filename); + + // Handle JagCD EEPROM + fp = fopen(cdromEEPROMFilename, "rb"); + + if (fp) + { + fread(cdromEEPROM, 1, 128, fp); + fclose(fp); + WriteLog("EEPROM: Loaded from cdrom.eeprom\n"); + haveCDROMEEPROM = true; + } + else + WriteLog("EEPROM: Could not open file \"%s\"!\n", cdromEEPROMFilename); } + void EepromReset(void) { - if (!foundEEPROM) + if (!haveEEPROM) memset(eeprom_ram, 0xFF, 64 * sizeof(uint16_t)); + + if (!haveCDROMEEPROM) + memset(cdromEEPROM, 0xFF, 64 * sizeof(uint16_t)); } + void EepromDone(void) { WriteLog("EEPROM: Done.\n"); } + static void EEPROMSave(void) { + // Write out regular cartridge EEPROM data FILE * fp = fopen(eeprom_filename, "wb"); - if (fp == NULL) + if (fp) { - WriteLog("EEPROM: Could not create file \"%s!\"\n", eeprom_filename); - return; + fwrite(eeprom_ram, 1, 128, fp); + fclose(fp); } + else + WriteLog("EEPROM: Could not create file \"%s!\"\n", eeprom_filename); + + // Write out JagCD EEPROM data + fp = fopen(cdromEEPROMFilename, "wb"); - fwrite(eeprom_ram, 1, 128, fp); - fclose(fp); + if (fp) + { + fwrite(cdromEEPROM, 1, 128, fp); + fclose(fp); + } + else + WriteLog("EEPROM: Could not create file \"%s!\"\n", cdromEEPROMFilename); } + uint8_t EepromReadByte(uint32_t offset) { switch (offset) @@ -111,11 +149,13 @@ uint8_t EepromReadByte(uint32_t offset) return 0x00; } + uint16_t EepromReadWord(uint32_t offset) { return ((uint16_t)EepromReadByte(offset + 0) << 8) | EepromReadByte(offset + 1); } + void EepromWriteByte(uint32_t offset, uint8_t data) { switch (offset) @@ -132,12 +172,31 @@ void EepromWriteByte(uint32_t offset, uint8_t data) } } + void EepromWriteWord(uint32_t offset, uint16_t data) { EepromWriteByte(offset + 0, (data >> 8) & 0xFF); EepromWriteByte(offset + 1, data & 0xFF); } + +/* +; +; Commands specific to the National Semiconductor NM93C14 +; +; +; 9-bit commands.. +; 876543210 +eEWDS equ %100000000 ;Erase/Write disable (default) +eWRAL equ %100010000 ;Writes all registers +eERAL equ %100100000 ;Erase all registers +eEWEN equ %100110000 ;Erase/write Enable +eWRITE equ %101000000 ;Write selected register +eREAD equ %110000000 ;read from EEPROM +eERASE equ %111000000 ;Erase selected register +*/ + + static void eeprom_set_di(uint32_t data) { // WriteLog("eeprom: di=%i\n",data); @@ -155,13 +214,19 @@ static void eeprom_set_di(uint32_t data) jerry_ee_op |= data; jerry_ee_direct_jump = 0; // WriteLog("eeprom: opcode %i\n",jerry_ee_op); + switch (jerry_ee_op) { + // Opcode 00: eEWEN, eERAL, eWRAL, eEWNDS case 0: jerry_ee_state = EE_STATE_0; break; + // Opcode 01: eWRITE (Write selected register) case 1: jerry_ee_state = EE_STATE_1; break; + // Opcode 10: eREAD (Read from EEPROM) case 2: jerry_ee_state = EE_STATE_2; break; + // Opcode 11: eERASE (Erase selected register) case 3: jerry_ee_state = EE_STATE_3; break; } + eeprom_set_di(data); break; case EE_STATE_0: @@ -174,11 +239,16 @@ static void eeprom_set_di(uint32_t data) case EE_STATE_0_0: switch ((jerry_ee_address_data >> 4) & 0x03) { + // Opcode 00 00: eEWDS (Erase/Write disable) case 0: jerry_ee_state=EE_STATE_0_0_0; break; + // Opcode 00 01: eWRAL (Write all registers) case 1: jerry_ee_state=EE_STATE_0_0_1; break; + // Opcode 00 10: eERAL (Erase all registers) case 2: jerry_ee_state=EE_STATE_0_0_2; break; + // Opcode 00 11: eEWEN (Erase/Write enable) case 3: jerry_ee_state=EE_STATE_0_0_3; break; } + eeprom_set_di(data); break; case EE_STATE_0_0_0: @@ -198,10 +268,13 @@ static void eeprom_set_di(uint32_t data) case EE_STATE_0_0_1_0: // WriteLog("eeprom: filling eeprom with 0x%.4x\n",data); if (jerry_writes_enabled) + { for(int i=0; i<64; i++) eeprom_ram[i] = jerry_ee_data; - EEPROMSave(); // Save it NOW! + EEPROMSave(); // Save it NOW! + } + //else // WriteLog("eeprom: not writing because read only\n"); jerry_ee_state = EE_STATE_BUSY; @@ -238,9 +311,11 @@ static void eeprom_set_di(uint32_t data) case EE_STATE_1_1: //WriteLog("eeprom: writing 0x%.4x at 0x%.2x\n",jerry_ee_data,jerry_ee_address_data); if (jerry_writes_enabled) + { eeprom_ram[jerry_ee_address_data] = jerry_ee_data; + EEPROMSave(); // Save it NOW! + } - EEPROMSave(); // Save it NOW! jerry_ee_state = EE_STATE_BUSY; break; case EE_STATE_2: @@ -278,6 +353,7 @@ static void eeprom_set_di(uint32_t data) if (jerry_ee_direct_jump) eeprom_set_di(data); } + break; case EE_READ_ADDRESS: jerry_ee_address_data <<= 1; @@ -293,13 +369,15 @@ static void eeprom_set_di(uint32_t data) if (jerry_ee_direct_jump) eeprom_set_di(data); } + break; default: jerry_ee_state = EE_STATE_OP_A; } } -static void eeprom_set_cs(uint32_t state) + +static void eeprom_set_cs(uint32_t /*state*/) { // WriteLog("eeprom: cs=%i\n",state); jerry_ee_state = EE_STATE_START; @@ -312,6 +390,7 @@ static void eeprom_set_cs(uint32_t state) jerry_writes_enabled = 1; } + static uint32_t eeprom_get_do(void) { uint16_t data = 1; @@ -327,7 +406,11 @@ static uint32_t eeprom_get_do(void) break; case EE_STATE_2_0: jerry_ee_data_cnt--; +#if 0 data = (eeprom_ram[jerry_ee_address_data] & (1 << jerry_ee_data_cnt)) >> jerry_ee_data_cnt; +#else + data = (eeprom_ram[jerry_ee_address_data] >> jerry_ee_data_cnt) & 0x01; +#endif if (!jerry_ee_data_cnt) { @@ -340,3 +423,4 @@ static uint32_t eeprom_get_do(void) // WriteLog("eeprom: do=%i\n",data); return data; } + diff --git a/src/eeprom.h b/src/eeprom.h index 0cb41c4..0f89ade 100644 --- a/src/eeprom.h +++ b/src/eeprom.h @@ -10,7 +10,6 @@ void EepromInit(void); void EepromReset(void); void EepromDone(void); -void EepromUpdate(void); uint8_t EepromReadByte(uint32_t offset); uint16_t EepromReadWord(uint32_t offset); diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp index e84cf23..1c89367 100644 --- a/src/gui/configdialog.cpp +++ b/src/gui/configdialog.cpp @@ -56,10 +56,12 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent) // controllerTab2->UpdateLabel(); // Now it's safe to do this... ;-) } + ConfigDialog::~ConfigDialog() { } + void ConfigDialog::LoadDialogFromSettings(void) { // generalTab->edit1->setText(vjs.jagBootPath); @@ -87,6 +89,7 @@ void ConfigDialog::LoadDialogFromSettings(void) } } + void ConfigDialog::UpdateVJSettings(void) { // strcpy(vjs.jagBootPath, generalTab->edit1->text().toAscii().data()); @@ -116,6 +119,7 @@ void ConfigDialog::UpdateVJSettings(void) } } + QString ConfigDialog::CheckForTrailingSlash(QString s) { if (!s.endsWith('/') && !s.endsWith('\\')) diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp index ba2c0dd..43ec937 100644 --- a/src/gui/mainwin.cpp +++ b/src/gui/mainwin.cpp @@ -681,13 +681,14 @@ void MainWin::Timer(void) videoWidget->updateGL(); -#if 1 // FPS handling - // Approach: We use a ring buffer to store timestamps over a given amount - // of frames, then sum them to figure out the FPS. + // Approach: We use a ring buffer to store times (in ms) over a given + // amount of frames, then sum them to figure out the FPS. uint32_t timestamp = SDL_GetTicks(); // This assumes the ring buffer size is a power of 2 - ringBufferPointer = (ringBufferPointer + 1) & (RING_BUFFER_SIZE - 1); +// ringBufferPointer = (ringBufferPointer + 1) & (RING_BUFFER_SIZE - 1); + // Doing it this way is better. Ring buffer size can be arbitrary then. + ringBufferPointer = (ringBufferPointer + 1) % RING_BUFFER_SIZE; ringBuffer[ringBufferPointer] = timestamp - oldTimestamp; uint32_t elapsedTime = 0; @@ -698,18 +699,14 @@ void MainWin::Timer(void) if (elapsedTime == 0) elapsedTime = 1; -#if 0 - float framesPerSecond = ((float)RING_BUFFER_SIZE / (float)elapsedTime) * 1000.0; - statusBar()->showMessage(QString("%1 FPS").arg(framesPerSecond)); -#else // This is in frames per 10 seconds, so we can have 1 decimal uint32_t framesPerSecond = (uint32_t)(((float)RING_BUFFER_SIZE / (float)elapsedTime) * 10000.0); uint32_t fpsIntegerPart = framesPerSecond / 10; uint32_t fpsDecimalPart = framesPerSecond % 10; + // If this is updated too frequently to be useful, we can throttle it down + // so that it only updates every 10th frame or so statusBar()->showMessage(QString("%1.%2 FPS").arg(fpsIntegerPart).arg(fpsDecimalPart)); -#endif oldTimestamp = timestamp; -#endif } diff --git a/src/gui/virtualjaguar.qrc b/src/gui/virtualjaguar.qrc index 5f081ef..3c26d37 100644 --- a/src/gui/virtualjaguar.qrc +++ b/src/gui/virtualjaguar.qrc @@ -37,4 +37,10 @@ ../../res/test-pattern.jpg ../../res/help.html + + ../../res/help_fr.html + + + ../../res/help_gr.html + diff --git a/virtualjaguar.pro b/virtualjaguar.pro index 6e0862f..31bf263 100644 --- a/virtualjaguar.pro +++ b/virtualjaguar.pro @@ -45,9 +45,9 @@ QMAKE_CXXFLAGS += `$(CROSS)sdl-config --cflags` # Need to add libcdio stuffola (checking/including)... -# Translations. None yet. :-( -#TRANSLATIONS = virtualjaguar_fr.ts \ -# virtualjaguar_gr.ts +# Translations. NB: Nobody has stepped up to do any :-P so these are dummy translations +TRANSLATIONS = virtualjaguar_fr.ts \ + virtualjaguar_gr.ts INCLUDEPATH += \ src \ diff --git a/virtualjaguar_fr.ts b/virtualjaguar_fr.ts new file mode 100644 index 0000000..26f7b13 --- /dev/null +++ b/virtualjaguar_fr.ts @@ -0,0 +1,500 @@ + + + + + AboutWindow + + + + + + + + + + About Virtual Jaguar... + + + + + <img src=':/res/vj_title_small.png' style='float: right'><table><tr><td align='right'>Version: </td><td> + + + + + AlpineTab + + + Allow writes to cartridge ROM + + + + + CPUBrowserWindow + + + CPU Browser + + + + + ConfigDialog + + + General + + + + + Controller #1 + + + + + Controller #2 + + + + + Alpine + + + + + Virtual Jaguar Settings + + + + + ControllerTab + + + Define All Keys + + + + + FilePickerWindow + + + <h2>...</h2> + + + + + Type: CRC32: Compatibility: Notes: + + + + + ?MB Cartridge 00000000 ? ? + + + + + + %1MB Cartridge + + + + + + %1MB Alpine ROM + + + + + + *** UNKNOWN *** (%1 bytes) + + + + + %1MB Alpine ROM w/Universal Header + + + + + ABS/COF Executable (%1 bytes) + + + + + Jaguar Server Executable (%1 bytes) + + + + + GeneralTab + + + Enable Jaguar BIOS + + + + + Enable GPU + + + + + Enable DSP + + + + + Start Virtual Jaguar in full screen + + + + + Show all files in file chooser + + + + + KeyGrabber + + + Grab + + + + + Press key for "%1" (ESC to cancel) + + + + + M68KDasmBrowserWindow + + + Go + + + + + M68K Disassembly Browser + + + + + MainWin + + + Virtual Jaguar + + + + + - Alpine Mode + + + + + E&xit + + + + + Ctrl+q + + + + + Quit Virtual Jaguar + + + + + &Power + + + + + Powers Jaguar on/off + + + + + Pause + + + + + Toggles the running state + + + + + Esc + + + + + Zoom 100% + + + + + Set window zoom to 100% + + + + + Zoom 200% + + + + + Set window zoom to 200% + + + + + Zoom 300% + + + + + Set window zoom to 300% + + + + + NTSC + + + + + Sets Jaguar to NTSC mode + + + + + PAL + + + + + Sets Jaguar to PAL mode + + + + + Blur + + + + + Sets OpenGL rendering to GL_NEAREST + + + + + &About... + + + + + Blatant self-promotion + + + + + &Contents... + + + + + Help is available, if you should need it + + + + + &Insert Cartridge... + + + + + Insert a cartridge into Virtual Jaguar + + + + + Ctrl+i + + + + + &Configure + + + + + Configure options for Virtual Jaguar + + + + + Ctrl+c + + + + + &Use CD Unit + + + + + Use Jaguar Virtual CD unit + + + + + &Frame Advance + + + + + F7 + + + + + F&ull Screen + + + + + F9 + + + + + Memory Browser + + + + + Shows the Jaguar memory browser window + + + + + CPU Browser + + + + + Shows the Jaguar CPU browser window + + + + + OP Browser + + + + + Shows the Jaguar OP browser window + + + + + 68K Listing Browser + + + + + Shows the 68K disassembly browser window + + + + + RISC Listing Browser + + + + + Shows the RISC disassembly browser window + + + + + &Jaguar + + + + + + &Debug + + + + + &Help + + + + + Stuff + + + + + Ready + + + + + + Could not load file "%1"! + + + + + MemoryBrowserWindow + + + Go + + + + + Memory Browser + + + + + OPBrowserWindow + + + OP Browser + + + + + RISCDasmBrowserWindow + + + Go + + + + + GPU + + + + + DSP + + + + + RISC Disassembly Browser + + + + diff --git a/virtualjaguar_gr.ts b/virtualjaguar_gr.ts new file mode 100644 index 0000000..a40cce8 --- /dev/null +++ b/virtualjaguar_gr.ts @@ -0,0 +1,500 @@ + + + + + AboutWindow + + + + + + + + + + About Virtual Jaguar... + + + + + <img src=':/res/vj_title_small.png' style='float: right'><table><tr><td align='right'>Version: </td><td> + + + + + AlpineTab + + + Allow writes to cartridge ROM + + + + + CPUBrowserWindow + + + CPU Browser + + + + + ConfigDialog + + + General + + + + + Controller #1 + + + + + Controller #2 + + + + + Alpine + + + + + Virtual Jaguar Settings + + + + + ControllerTab + + + Define All Keys + + + + + FilePickerWindow + + + <h2>...</h2> + + + + + Type: CRC32: Compatibility: Notes: + + + + + ?MB Cartridge 00000000 ? ? + + + + + + %1MB Cartridge + + + + + + %1MB Alpine ROM + + + + + + *** UNKNOWN *** (%1 bytes) + + + + + %1MB Alpine ROM w/Universal Header + + + + + ABS/COF Executable (%1 bytes) + + + + + Jaguar Server Executable (%1 bytes) + + + + + GeneralTab + + + Enable Jaguar BIOS + + + + + Enable GPU + + + + + Enable DSP + + + + + Start Virtual Jaguar in full screen + + + + + Show all files in file chooser + + + + + KeyGrabber + + + Grab + + + + + Press key for "%1" (ESC to cancel) + + + + + M68KDasmBrowserWindow + + + Go + + + + + M68K Disassembly Browser + + + + + MainWin + + + Virtual Jaguar + + + + + - Alpine Mode + + + + + E&xit + + + + + Ctrl+q + + + + + Quit Virtual Jaguar + + + + + &Power + + + + + Powers Jaguar on/off + + + + + Pause + + + + + Toggles the running state + + + + + Esc + + + + + Zoom 100% + + + + + Set window zoom to 100% + + + + + Zoom 200% + + + + + Set window zoom to 200% + + + + + Zoom 300% + + + + + Set window zoom to 300% + + + + + NTSC + + + + + Sets Jaguar to NTSC mode + + + + + PAL + + + + + Sets Jaguar to PAL mode + + + + + Blur + + + + + Sets OpenGL rendering to GL_NEAREST + + + + + &About... + + + + + Blatant self-promotion + + + + + &Contents... + + + + + Help is available, if you should need it + + + + + &Insert Cartridge... + + + + + Insert a cartridge into Virtual Jaguar + + + + + Ctrl+i + + + + + &Configure + + + + + Configure options for Virtual Jaguar + + + + + Ctrl+c + + + + + &Use CD Unit + + + + + Use Jaguar Virtual CD unit + + + + + &Frame Advance + + + + + F7 + + + + + F&ull Screen + + + + + F9 + + + + + Memory Browser + + + + + Shows the Jaguar memory browser window + + + + + CPU Browser + + + + + Shows the Jaguar CPU browser window + + + + + OP Browser + + + + + Shows the Jaguar OP browser window + + + + + 68K Listing Browser + + + + + Shows the 68K disassembly browser window + + + + + RISC Listing Browser + + + + + Shows the RISC disassembly browser window + + + + + &Jaguar + + + + + + &Debug + + + + + &Help + + + + + Stuff + + + + + Ready + + + + + + Could not load file "%1"! + + + + + MemoryBrowserWindow + + + Go + + + + + Memory Browser + + + + + OPBrowserWindow + + + OP Browser + + + + + RISCDasmBrowserWindow + + + Go + + + + + GPU + + + + + DSP + + + + + RISC Disassembly Browser + + + + -- 2.37.2