[vba-commit] VisualBoyAdvance/src Sound.cpp,1.15,1.16

[Pokemonhacker <pok...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8618

Modified Files:
	Sound.cpp 
Log Message:
- Corrected some small typos in sound.cpp.

Index: Sound.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Sound.cpp	18 Dec 2004 23:09:56 -0000	1.15
--- Sound.cpp	25 Jun 2005 06:16:05 -0000	1.16
***************
*** 1,5 ****
  // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
  // Copyright (C) 1999-2003 Forgotten
! // Copyright (C) 2004 Forgotten and the VBA development team
  
  // This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
  // Copyright (C) 1999-2003 Forgotten
! // Copyright (C) 2005 Forgotten and the VBA development team
  
  // This program is free software; you can redistribute it and/or modify
***************
*** 30,34 ****
  
  extern bool stopState;
- extern bool cpuDmaHack2;
  
  u8 soundWavePattern[4][32] = {
--- 30,33 ----
***************
*** 389,394 ****
        sound2On = 1;
      }
!     break;
!     ioMem[address] = data;    
    case NR30:
      data &= 0xe0;
--- 388,393 ----
        sound2On = 1;
      }
!     ioMem[address] = data;  
!     break;  
    case NR30:
      data &= 0xe0;
***************
*** 543,547 ****
    case SGCNT0_H:
      data &= 0xFF0F;
!     soundControl = data & 0x770F;;
      if(data & 0x0800) {
        soundDSFifoAWriteIndex = 0;
--- 542,546 ----
    case SGCNT0_H:
      data &= 0xFF0F;
!     soundControl = data & 0x770F;
      if(data & 0x0800) {
        soundDSFifoAWriteIndex = 0;
***************
*** 562,566 ****
      soundDSBEnabled = (data & 0x3000) ? true : false;
      soundDSBTimer = (data & 0x4000) ? 1 : 0;
!     *((u16 *)&ioMem[address]) = data;    
      break;
    case FIFOA_L:
--- 561,565 ----
      soundDSBEnabled = (data & 0x3000) ? true : false;
      soundDSBTimer = (data & 0x4000) ? 1 : 0;
!     *((u16 *)&ioMem[address]) = soundControl;    
      break;
    case FIFOA_L:
***************
*** 853,857 ****
    if(soundDSAEnabled) {
      if(soundDSFifoACount <= 16) {
!       cpuDmaHack2 = CPUCheckDMA(3, 2);
        if(soundDSFifoACount <= 16) {
          soundEvent(FIFOA_L, (u16)0);
--- 852,856 ----
    if(soundDSAEnabled) {
      if(soundDSFifoACount <= 16) {
!       CPUCheckDMA(3, 2);
        if(soundDSFifoACount <= 16) {
          soundEvent(FIFOA_L, (u16)0);
***************
*** 882,886 ****
    if(soundDSBEnabled) {
      if(soundDSFifoBCount <= 16) {
!       cpuDmaHack2 = CPUCheckDMA(3, 4);
        if(soundDSFifoBCount <= 16) {
          soundEvent(FIFOB_L, (u16)0);
--- 881,885 ----
    if(soundDSBEnabled) {
      if(soundDSFifoBCount <= 16) {
!       CPUCheckDMA(3, 4);
        if(soundDSFifoBCount <= 16) {
          soundEvent(FIFOB_L, (u16)0);