valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Some more const stuff. Silences a few warnings and removes a few casts. Update description of dss.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2886
This commit is contained in:
Peter Veenstra 2007-06-14 08:23:46 +00:00
parent df0f8ee9d6
commit a5ac3216ba
26 changed files with 312 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/hardware/memory.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: memory.cpp,v 1.49 2007-06-12 19:17:43 qbix79 Exp $ */
/* $Id: memory.cpp,v 1.50 2007-06-14 08:23:46 qbix79 Exp $ */
#include "dosbox.h"
#include "mem.h"
@ -157,14 +157,14 @@ void mem_memcpy(PhysPt dest,PhysPt src,Bitu size) {
}
void MEM_BlockRead(PhysPt pt,void * data,Bitu size) {
Bit8u * write=(Bit8u *) data;
Bit8u * write=reinterpret_cast<Bit8u *>(data);
while (size--) {
*write++=mem_readb_inline(pt++);
}
}
void MEM_BlockWrite(PhysPt pt,void * data,Bitu size) {
Bit8u * read=(Bit8u *) data;
void MEM_BlockWrite(PhysPt pt,void const * const data,Bitu size) {
Bit8u const * read = reinterpret_cast<Bit8u const * const>(data);
while (size--) {
mem_writeb_inline(pt++,*read++);
}

8
src/hardware/sblaster.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sblaster.cpp,v 1.63 2007-02-24 21:07:22 c2woody Exp $ */
/* $Id: sblaster.cpp,v 1.64 2007-06-14 08:23:46 qbix79 Exp $ */
#include <iomanip>
#include <sstream>
@ -158,7 +158,7 @@ struct SB_INFO {
static SB_INFO sb;
static char * copyright_string="COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.";
static char const * const copyright_string="COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.";
static Bit8u DSP_cmd_len[256] = {
// 0,0,0,0, 1,2,0,0, 0,0,0,0, 0,0,2,1, // 0x00 for SB16. but breaks sbpro
@ -534,7 +534,7 @@ static void DSP_RaiseIRQEvent(Bitu val) {
}
static void DSP_DoDMATransfer(DMA_MODES mode,Bitu freq,bool stereo) {
char * type;
char const * type;
sb.mode=MODE_DMA_MASKED;
sb.chan->FillUp();
sb.dma.left=sb.dma.total;
@ -847,7 +847,7 @@ static void DSP_DoCommand(void) {
case 0xe3: /* DSP Copyright */
{
DSP_FlushData();
for (Bit32u i=0;i<=strlen(copyright_string);i++) {
for (size_t i=0;i<=strlen(copyright_string);i++) {
DSP_AddData(copyright_string[i]);
}
}