Emulation/cen64
1
0
Fork 0
mirror of https://github.com/n64dev/cen64.git synced 2024-06-21 13:32:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix master

Browse source
This commit is contained in:
peterlemon 2018-09-10 23:15:30 +01:00
parent 6278d46fb7
commit 5ce3772646
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
device/device.c
View file

@ -43,7 +43,7 @@ struct cen64_device *device_create(struct cen64_device *device,
const struct rom_file *ddrom,
const struct rom_file *pifrom, const struct rom_file *cart,
const struct save_file *eeprom, const struct save_file *sram,
const struct save_file *flashram, const struct is_viewer *is,
const struct save_file *flashram, struct is_viewer *is,
const struct controller *controller,
bool no_audio, bool no_video) {

2
device/device.h
View file

@ -60,7 +60,7 @@ cen64_cold struct cen64_device *device_create(struct cen64_device *device,
const struct rom_file *ddrom,
const struct rom_file *pifrom, const struct rom_file *cart,
const struct save_file *eeprom, const struct save_file *sram,
const struct save_file *flashram, const struct is_viewer *is,
const struct save_file *flashram, struct is_viewer *is,
const struct controller *controller,
bool no_audio, bool no_video);

4
pi/controller.h
View file

@ -52,7 +52,7 @@ struct pi_controller {
const struct save_file *sram;
const struct save_file *flashram_file;
struct flashram flashram;
const struct is_viewer *is_viewer;
struct is_viewer *is_viewer;
uint64_t counter;
uint32_t bytes_to_copy;
@ -63,7 +63,7 @@ struct pi_controller {
cen64_cold int pi_init(struct pi_controller *pi, struct bus_controller *bus,
const uint8_t *rom, size_t rom_size, const struct save_file *sram,
const struct save_file *flashram, const struct is_viewer *is);
const struct save_file *flashram, struct is_viewer *is);
// Only invoke pi_cycle_ when the counter has expired (timeout).
void pi_cycle_(struct pi_controller *pi);

8
pi/is_viewer.h
View file

@ -19,9 +19,9 @@ struct is_viewer {
iconv_t cd;
};
int is_viewer_init(const struct is_viewer *is);
int is_viewer_map(const struct is_viewer *is, uint32_t address);
int read_is_viewer(const struct is_viewer *is, uint32_t address, uint32_t *word);
int write_is_viewer(const struct is_viewer *is, uint32_t address, uint32_t word, uint32_t dqm);
int is_viewer_init(struct is_viewer *is);
int is_viewer_map(struct is_viewer *is, uint32_t address);
int read_is_viewer(struct is_viewer *is, uint32_t address, uint32_t *word);
int write_is_viewer(struct is_viewer *is, uint32_t address, uint32_t word, uint32_t dqm);
#endif /* __IS_VIEWER_H__ */

1
rsp/cp0.c
View file

@ -17,6 +17,7 @@
#include "rsp/decoder.h"
#include "rsp/interface.h"
#include "vr4300/interface.h"
#include <windows.h>
static void rsp_status_write(struct rsp *rsp, uint32_t rt);