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

rename LOG_DMA to LOG_DMACONTROL to remove nameclash with soundblaster dma.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3128
This commit is contained in:
Peter Veenstra 2008-03-19 08:41:45 +00:00
parent 3e5dae2877
commit d7294c6314
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/logging.h
View file

@ -3,7 +3,7 @@
enum LOG_TYPES {
LOG_ALL,
LOG_VGA, LOG_VGAGFX,LOG_VGAMISC,LOG_INT10,
LOG_SB,LOG_DMA,
LOG_SB,LOG_DMACONTROL,
LOG_FPU,LOG_CPU,LOG_PAGING,
LOG_FCB,LOG_FILES,LOG_IOCTL,LOG_EXEC,LOG_DOSMISC,
LOG_PIT,LOG_KEYBOARD,LOG_PIC,

4
src/debug/debug_gui.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: debug_gui.cpp,v 1.33 2008-03-02 08:53:34 qbix79 Exp $ */
/* $Id: debug_gui.cpp,v 1.34 2008-03-19 08:41:45 qbix79 Exp $ */
#include "dosbox.h"
@ -218,7 +218,7 @@ void LOG_StartUp(void) {
loggrp[LOG_VGAMISC].front="VGAMISC";
loggrp[LOG_INT10].front="INT10";
loggrp[LOG_SB].front="SBLASTER";
loggrp[LOG_DMA].front="DMA";
loggrp[LOG_DMACONTROL].front="DMA_CONTROL";
loggrp[LOG_FPU].front="FPU";
loggrp[LOG_CPU].front="CPU";

2
src/hardware/dma.cpp
View file

@ -235,7 +235,7 @@ Bitu DmaController::ReadControllerReg(Bitu reg,Bitu len) {
}
return ret;
default:
LOG(LOG_DMA,LOG_NORMAL)("Trying to read undefined DMA port %x",reg);
LOG(LOG_DMACONTROL,LOG_NORMAL)("Trying to read undefined DMA port %x",reg);
break;
}
return 0xffffffff;