From 53af0e3bafbd84f80e14d2b2f8dfa6b425afe2e5 Mon Sep 17 00:00:00 2001 From: Josep Torra Valles Date: Tue, 17 Oct 2006 11:04:14 +0000 Subject: gst/nsf/: Fix some things the Forte compiler warns about (#362626). Original commit message from CVS: Patch by: Josep Torra Valles * gst/nsf/fds_snd.c: * gst/nsf/mmc5_snd.c: * gst/nsf/nsf.c: * gst/nsf/vrc7_snd.c: * gst/nsf/vrcvisnd.c: Fix some things the Forte compiler warns about (#362626). --- gst/nsf/fds_snd.c | 12 +++++++++++- gst/nsf/mmc5_snd.c | 13 +++++++++++-- gst/nsf/nsf.c | 13 +++++++++++-- gst/nsf/vrc7_snd.c | 11 ++++++++++- gst/nsf/vrcvisnd.c | 12 +++++++++++- 5 files changed, 54 insertions(+), 7 deletions(-) (limited to 'gst/nsf') diff --git a/gst/nsf/fds_snd.c b/gst/nsf/fds_snd.c index d2cfccb7..6ad0d4e4 100644 --- a/gst/nsf/fds_snd.c +++ b/gst/nsf/fds_snd.c @@ -23,6 +23,7 @@ ** $Id$ */ +#include #include "types.h" #include "nes_apu.h" #include "fds_snd.h" @@ -66,7 +67,7 @@ fds_shutdown (void) static apu_memwrite fds_memwrite[] = { {0x4040, 0x4092, fds_write}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; apuext_t fds_ext = { @@ -80,6 +81,15 @@ apuext_t fds_ext = { /* ** $Log$ +** Revision 1.2 2006/10/17 11:04:14 tpm +** Patch by: Josep Torra Valles +** * gst/nsf/fds_snd.c: +** * gst/nsf/mmc5_snd.c: +** * gst/nsf/nsf.c: +** * gst/nsf/vrc7_snd.c: +** * gst/nsf/vrcvisnd.c: +** Fix some things the Forte compiler warns about (#362626). +** ** Revision 1.1 2006/07/13 15:07:28 wtay ** Based on patches by: Johan Dahlin ** Ronald Bultje diff --git a/gst/nsf/mmc5_snd.c b/gst/nsf/mmc5_snd.c index 7c39af44..49984432 100644 --- a/gst/nsf/mmc5_snd.c +++ b/gst/nsf/mmc5_snd.c @@ -310,13 +310,13 @@ mmc5_shutdown (void) static apu_memread mmc5_memread[] = { {0x5205, 0x5206, mmc5_read}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; static apu_memwrite mmc5_memwrite[] = { {0x5000, 0x5015, mmc5_write}, {0x5205, 0x5206, mmc5_write}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; apuext_t mmc5_ext = { @@ -330,6 +330,15 @@ apuext_t mmc5_ext = { /* ** $Log$ +** Revision 1.2 2006/10/17 11:04:14 tpm +** Patch by: Josep Torra Valles +** * gst/nsf/fds_snd.c: +** * gst/nsf/mmc5_snd.c: +** * gst/nsf/nsf.c: +** * gst/nsf/vrc7_snd.c: +** * gst/nsf/vrcvisnd.c: +** Fix some things the Forte compiler warns about (#362626). +** ** Revision 1.1 2006/07/13 15:07:28 wtay ** Based on patches by: Johan Dahlin ** Ronald Bultje diff --git a/gst/nsf/nsf.c b/gst/nsf/nsf.c index aae9bc83..6fd34bba 100644 --- a/gst/nsf/nsf.c +++ b/gst/nsf/nsf.c @@ -79,14 +79,14 @@ nsf_bankswitch (uint32 address, uint8 value) static nes6502_memread default_readhandler[] = { {0x0800, 0x1FFF, read_mirrored_ram}, {0x4000, 0x4017, apu_read}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; static nes6502_memwrite default_writehandler[] = { {0x0800, 0x1FFF, write_mirrored_ram}, {0x4000, 0x4017, apu_write}, {0x5FF6, 0x5FFF, nsf_bankswitch}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; static uint8 @@ -585,6 +585,15 @@ nsf_setfilter (nsf_t * nsf, int filter_type) /* ** $Log$ +** Revision 1.4 2006/10/17 11:04:14 tpm +** Patch by: Josep Torra Valles +** * gst/nsf/fds_snd.c: +** * gst/nsf/mmc5_snd.c: +** * gst/nsf/nsf.c: +** * gst/nsf/vrc7_snd.c: +** * gst/nsf/vrcvisnd.c: +** Fix some things the Forte compiler warns about (#362626). +** ** Revision 1.3 2006/07/19 11:43:50 tpm ** * gst/nsf/nsf.c: (nsf_load): ** Really fix compilation. Apparently it's not enough to diff --git a/gst/nsf/vrc7_snd.c b/gst/nsf/vrc7_snd.c index 07d27514..3dafb85f 100644 --- a/gst/nsf/vrc7_snd.c +++ b/gst/nsf/vrc7_snd.c @@ -312,7 +312,7 @@ vrc7_process (void) static apu_memwrite vrc7_memwrite[] = { {0x9010, 0x9010, vrc7_write}, {0x9030, 0x9030, vrc7_write}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; apuext_t vrc7_ext = { @@ -326,6 +326,15 @@ apuext_t vrc7_ext = { /* ** $Log$ +** Revision 1.2 2006/10/17 11:04:14 tpm +** Patch by: Josep Torra Valles +** * gst/nsf/fds_snd.c: +** * gst/nsf/mmc5_snd.c: +** * gst/nsf/nsf.c: +** * gst/nsf/vrc7_snd.c: +** * gst/nsf/vrcvisnd.c: +** Fix some things the Forte compiler warns about (#362626). +** ** Revision 1.1 2006/07/13 15:07:28 wtay ** Based on patches by: Johan Dahlin ** Ronald Bultje diff --git a/gst/nsf/vrcvisnd.c b/gst/nsf/vrcvisnd.c index e6b5eb3e..e9652b56 100644 --- a/gst/nsf/vrcvisnd.c +++ b/gst/nsf/vrcvisnd.c @@ -23,6 +23,7 @@ ** $Id$ */ +#include #include "types.h" #include "vrcvisnd.h" #include "nes_apu.h" @@ -174,7 +175,7 @@ static apu_memwrite vrcvi_memwrite[] = { {0x9000, 0x9002, vrcvi_write}, /* vrc6 */ {0xA000, 0xA002, vrcvi_write}, {0xB000, 0xB002, vrcvi_write}, - {-1, -1, NULL} + {(uint32) - 1, (uint32) - 1, NULL} }; apuext_t vrcvi_ext = { @@ -188,6 +189,15 @@ apuext_t vrcvi_ext = { /* ** $Log$ +** Revision 1.2 2006/10/17 11:04:14 tpm +** Patch by: Josep Torra Valles +** * gst/nsf/fds_snd.c: +** * gst/nsf/mmc5_snd.c: +** * gst/nsf/nsf.c: +** * gst/nsf/vrc7_snd.c: +** * gst/nsf/vrcvisnd.c: +** Fix some things the Forte compiler warns about (#362626). +** ** Revision 1.1 2006/07/13 15:07:28 wtay ** Based on patches by: Johan Dahlin ** Ronald Bultje -- cgit v1.2.1