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

Merge branch 'svn/trunk' r4293

Browse source
This commit is contained in:
Patryk Obara 2019-11-21 20:53:08 +01:00
commit cdc193170c
7 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/hardware/dma.cpp
View file

@ -50,7 +50,7 @@ static void DMA_BlockRead(PhysPt spage,PhysPt offset,void * data,Bitu size,Bit8u
Bit32u dma_wrap = ((0xffff<<dma16)+dma16) | dma_wrapping;
for ( ; size ; size--, offset++) {
if (offset>(dma_wrapping<<dma16)) {
LOG_MSG("DMA segbound wrapping (read): %x:%x size %x [%x] wrap %x",spage,offset,size,dma16,dma_wrapping);
LOG_MSG("DMA segbound wrapping (read): %x:%x size %" sBitfs(x) " [%x] wrap %x",spage,offset,size,dma16,dma_wrapping);
}
offset &= dma_wrap;
Bitu page = highpart_addr_page+(offset >> 12);
@ -71,7 +71,7 @@ static void DMA_BlockWrite(PhysPt spage,PhysPt offset,void * data,Bitu size,Bit8
Bit32u dma_wrap = ((0xffff<<dma16)+dma16) | dma_wrapping;
for ( ; size ; size--, offset++) {
if (offset>(dma_wrapping<<dma16)) {
LOG_MSG("DMA segbound wrapping (write): %x:%x size %x [%x] wrap %x",spage,offset,size,dma16,dma_wrapping);
LOG_MSG("DMA segbound wrapping (write): %x:%x size %" sBitfs(x) " [%x] wrap %x",spage,offset,size,dma16,dma_wrapping);
}
offset &= dma_wrap;
Bitu page = highpart_addr_page+(offset >> 12);
@ -109,7 +109,7 @@ bool SecondDMAControllerAvailable(void) {
}
static void DMA_Write_Port(Bitu port,Bitu val,Bitu /*iolen*/) {
//LOG(LOG_DMACONTROL,LOG_ERROR)("Write %X %X",port,val);
//LOG(LOG_DMACONTROL,LOG_ERROR)("Write %" sBitfs(X) " %" sBitfs(X),port,val);
if (port<0x10) {
/* write to the first DMA controller (channels 0-3) */
DmaControllers[0]->WriteControllerReg(port,val,1);
@ -132,7 +132,7 @@ static void DMA_Write_Port(Bitu port,Bitu val,Bitu /*iolen*/) {
}
static Bitu DMA_Read_Port(Bitu port,Bitu iolen) {
//LOG(LOG_DMACONTROL,LOG_ERROR)("Read %X",port);
//LOG(LOG_DMACONTROL,LOG_ERROR)("Read %" sBitfs(X),port);
if (port<0x10) {
/* read from the first DMA controller (channels 0-3) */
return DmaControllers[0]->ReadControllerReg(port,iolen);
@ -258,7 +258,7 @@ Bitu DmaController::ReadControllerReg(Bitu reg,Bitu /*len*/) {
}
return ret;
default:
LOG(LOG_DMACONTROL,LOG_NORMAL)("Trying to read undefined DMA port %x",reg);
LOG(LOG_DMACONTROL,LOG_NORMAL)("Trying to read undefined DMA port %" sBitfs(x),reg);
break;
}
return 0xffffffff;

7
src/hardware/mixer.cpp
View file

@ -687,19 +687,18 @@ public:
if (cmd->FindString("MASTER",temp_line,false)) {
MakeVolume((char *)temp_line.c_str(),mixer.mastervol[0],mixer.mastervol[1]);
}
MixerChannel * chan=mixer.channels;
MixerChannel * chan = mixer.channels;
while (chan) {
if (cmd->FindString(chan->name,temp_line,false)) {
MakeVolume((char *)temp_line.c_str(),chan->volmain[0],chan->volmain[1]);
}
chan->UpdateVolume();
chan=chan->next;
chan = chan->next;
}
if (cmd->FindExist("/NOSHOW")) return;
chan=mixer.channels;
WriteOut("Channel Main Main(dB)\n");
ShowVolume("MASTER",mixer.mastervol[0],mixer.mastervol[1]);
for (chan=mixer.channels;chan;chan=chan->next)
for (chan = mixer.channels;chan;chan = chan->next)
ShowVolume(chan->name,chan->volmain[0],chan->volmain[1]);
}
private:

2
src/hardware/sblaster.cpp
View file

@ -707,6 +707,8 @@ static void DSP_DoDMATransfer(DMA_MODES mode,Bitu freq,bool autoinit, bool stere
autoinit ? "Auto-Init" : "Single-Cycle",
freq, sb.dma.rate, sb.dma.left
);
#else
type = type;
#endif
}