Emulation/cen64
1
0
Fork 0
mirror of https://github.com/n64dev/cen64.git synced 2024-06-22 05:52:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix all build warnings, does not affect functionality

Browse source
This commit is contained in:
Mike Ryan 2016-06-16 19:30:43 -07:00
parent 1d41bb8808
commit 73f4420a4c
13 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ai/context.c
View file

@ -10,8 +10,6 @@
#include "common.h"
#include "ai/context.h"
#include <AL/al.h>
#include <AL/alc.h>
// Creates and initializes an audio context.
int ai_context_create(struct cen64_ai_context *context) {

2
arch/x86_64/rsp/vrcpsq.c
View file

@ -55,7 +55,7 @@ __m128i rsp_vrcp_vrsq(struct rsp *rsp, uint32_t iw, int dp,
// VRSQ
if (iw & 0x4) {
idx = (((unsigned long long) data << shift) & 0x7FC00000U) >> 22;
idx = (idx | 0x200) & 0x3FE | (shift % 2);
idx = ((idx | 0x200) & 0x3FE) | (shift % 2);
result = rsp_reciprocal_rom[idx];
result = ((0x10000 | result) << 14) >> ((31 - shift) >> 1);

2
arch/x86_64/rsp/vrsq.c
View file

@ -65,7 +65,7 @@ __m128i rsp_vrsq(struct rsp *rsp, int dp,
#endif
idx = (((unsigned long long) data << shift) & 0x7FC00000U) >> 22;
idx = (idx | 0x200) & 0x3FE | (shift % 2);
idx = ((idx | 0x200) & 0x3FE) | (shift % 2);
result = rsp_reciprocal_rom[idx];
result = ((0x10000 | result) << 14) >> ((31 - shift) >> 1);

2
bus/controller.c
View file

@ -77,7 +77,7 @@ int bus_init(struct bus_controller *bus) {
bus->ri,
bus->rsp,
bus->rsp,
bus->pi
bus->pi,
};
create_memory_map(&bus->map);

2
cen64.c
View file

@ -33,7 +33,7 @@ cen64_cold static CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque);
// Called when another simulation instance is desired.
int cen64_main(int argc, const char **argv) {
struct controller controller[4] = { { NULL, }, };
struct controller controller[4] = { { 0, }, };
struct cen64_options options = default_cen64_options;
options.controller = controller;
struct rom_file ddipl, ddrom, pifrom, cart;

16
dd/controller.c
View file

@ -390,9 +390,7 @@ int write_dd_ipl_rom(void *opaque, uint32_t address, uint32_t word, uint32_t dqm
}
// Reads a word from the DD C2S/DS buffer.
int read_dd_controller(void *opaque, uint32_t address, uint32_t *word) {
struct dd_controller *dd = (struct dd_controller *) opaque;
int read_dd_controller(void *opaque __attribute__ ((unused)), uint32_t address, uint32_t *word) {
// XXX: Hack to reduce memorymap entries.
if (address >= DD_MS_RAM_ADDRESS)
return read_dd_ms_ram(opaque, address, word);
@ -406,9 +404,7 @@ int read_dd_controller(void *opaque, uint32_t address, uint32_t *word) {
}
// Writes a word to the DD C2S/DS BUFFER.
int write_dd_controller(void *opaque, uint32_t address, uint32_t word, uint32_t dqm) {
struct dd_controller *dd = (struct dd_controller *) opaque;
int write_dd_controller(void *opaque __attribute__ ((unused)), uint32_t address, uint32_t word, uint32_t dqm) {
// XXX: Hack to reduce memorymap entries.
if (address >= DD_MS_RAM_ADDRESS)
return write_dd_ms_ram(opaque, address, word, dqm);
@ -422,17 +418,13 @@ int write_dd_controller(void *opaque, uint32_t address, uint32_t word, uint32_t
}
// Reads a word from the DD MS RAM.
int read_dd_ms_ram(void *opaque, uint32_t address, uint32_t *word) {
struct dd_controller *dd = (struct dd_controller *) opaque;
int read_dd_ms_ram(void *opaque __attribute__ ((unused)), uint32_t address, uint32_t *word) {
debug_mmio_read(dd, "DD_MS_RAM", *word);
return 0;
}
// Writes a word to the DD MS RAM.
int write_dd_ms_ram(void *opaque, uint32_t address, uint32_t word, uint32_t dqm) {
struct dd_controller *dd = (struct dd_controller *) opaque;
int write_dd_ms_ram(void *opaque __attribute__ ((unused)), uint32_t address, uint32_t word, uint32_t dqm) {
debug_mmio_write(dd, "DD_MS_RAM", word, dqm);
return 0;
}

4
device/options.c
View file

@ -24,7 +24,7 @@ const struct cen64_options default_cen64_options = {
0, // eeprom_size
NULL, // sram_path
NULL, // flashram_path
{ { NULL, }, }, // controller
NULL, // controller
#ifdef _WIN32
false, // console
#endif
@ -130,7 +130,7 @@ int parse_options(struct cen64_options *options, int argc, const char *argv[]) {
else if (!strcmp(argv[i], "-controller")) {
int num;
struct controller opt = { NULL, };
struct controller opt = { 0, };
if ((i + 1) >= (argc - 1)) {
printf("-controller requires a controller description.\n\n");

2
device/sha1.c
View file

@ -285,7 +285,7 @@ extern void sha1(data, size, digest)
size_t size;
uint8_t *digest;
{
struct sha1_ctxt ctx = { 0, };
struct sha1_ctxt ctx;
sha1_init(&ctx);
sha1_loop(&ctx, data, size);
sha1_result(&ctx, digest);

4
pi/controller.h
View file

@ -49,8 +49,8 @@ struct pi_controller {
const uint8_t *rom;
size_t rom_size;
struct save_file *sram;
struct save_file *flashram_file;
const struct save_file *sram;
const struct save_file *flashram_file;
struct flashram flashram;
uint64_t counter;

2
si/controller.c
View file

@ -42,7 +42,7 @@ static int eeprom_write(struct eeprom *eeprom, uint8_t *send_buf, uint8_t send_b
// Initializes the SI.
int si_init(struct si_controller *si, struct bus_controller *bus,
const uint8_t *pif_rom, const uint8_t *cart_rom, bool dd_present,
const uint8_t *eeprom, size_t eeprom_size,
uint8_t *eeprom, size_t eeprom_size,
const struct controller *controller) {
uint32_t cic_seed;

2
si/controller.h
View file

@ -46,7 +46,7 @@ struct si_controller {
cen64_cold int si_init(struct si_controller *si, struct bus_controller *bus,
const uint8_t *pif_rom, const uint8_t *cart_rom, bool dd_present,
const uint8_t *eeprom, size_t eeprom_size,
uint8_t *eeprom, size_t eeprom_size,
const struct controller *controller);
int read_pif_rom_and_ram(void *opaque, uint32_t address, uint32_t *word);

14
si/pak.c
View file

@ -68,13 +68,15 @@ int controller_pak_write(struct controller *controller,
else if (controller->pak == PAK_RUMBLE) {
if (address == 0xC000) {
if (send_buf[3] == 0x01)
; // printf("Enable rumble\n");
else
; // printf("Disable rumble\n");
if (send_buf[3] == 0x01) {
// printf("Enable rumble\n");
} else {
// printf("Disable rumble\n");
}
}
else {
// printf("Unknown rumble address\n");
}
else
; // printf("Unknown rumble address\n");
}
else if (controller->pak == PAK_TRANSFER)

2
vi/window.c
View file

@ -19,7 +19,7 @@
// Creates a rendering window/context for the VI controller.
int vi_create_window(struct vi_controller *vi) {
struct cen64_gl_hints hints = cen64_default_gl_hints;
struct cen64_gl_config *config;
cen64_gl_config *config;
int num_matching;
// Create a window for rendering. If we're successful,