[Qemu-devel] Sound & Win98

[Qemu-devel] Sound & Win98

[Lindsay Mathieson]

Is -enable-audio not working for win98 as a guest ?

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Sat July 24 2004 5:56 pm, Lindsay Mathieson wrote:
> Is -enable-audio not working for win98 as a guest ?

AFAIK, that's correct. There's a patch available that gets 98 to load the sb 
device properly, but for me it always crashes on the 2nd sound event. 
95 and XP work without the patch, but crash in the same manner. With or 
without the patch.

http://www.dad-answers.com/qemu/patches/Audio/6_aqemu.patch.gz

-jm

Re: [Qemu-devel] Sound & Win98

[malc]

On Sat, 24 Jul 2004, Joe Menola wrote:

> On Sat July 24 2004 5:56 pm, Lindsay Mathieson wrote:
> > Is -enable-audio not working for win98 as a guest ?
>
> AFAIK, that's correct. There's a patch available that gets 98 to load the sb
> device properly, but for me it always crashes on the 2nd sound event.
> 95 and XP work without the patch, but crash in the same manner. With or
> without the patch.

I can assure you that it will keep crashing unless people start reporting
bugs (properly and timely).

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Sound & Win98

[Lindsay Mathieson]

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

I applied the patch but get a patch error (both with 0.6 src & latest 
snapshot):
$ patch -p1 < ../6_aqemu.patch
patching file hw/sb16.c
patching file oss.c
Hunk #1 FAILED at 23.
1 out of 19 hunks FAILED -- saving rejects to file oss.c.rej

from oss.c.rej looks to be vl.h

Is this the right place to report bugs ?

malc wrote:

>On Sat, 24 Jul 2004, Joe Menola wrote:
>
>  
>
>>On Sat July 24 2004 5:56 pm, Lindsay Mathieson wrote:
>>    
>>
>>>Is -enable-audio not working for win98 as a guest ?
>>>      
>>>
>>AFAIK, that's correct. There's a patch available that gets 98 to load the sb
>>device properly, but for me it always crashes on the 2nd sound event.
>>95 and XP work without the patch, but crash in the same manner. With or
>>without the patch.
>>    
>>
>
>I can assure you that it will keep crashing unless people start reporting
>bugs (properly and timely).
>
>  
>


[-- Attachment #2: Type: text/html, Size: 1437 bytes --]

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Sun July 25 2004 12:23 am, malc wrote:
> On Sat, 24 Jul 2004, Joe Menola wrote:
> > On Sat July 24 2004 5:56 pm, Lindsay Mathieson wrote:
> > > Is -enable-audio not working for win98 as a guest ?
> >
> > AFAIK, that's correct. There's a patch available that gets 98 to load the
> > sb device properly, but for me it always crashes on the 2nd sound event.
> > 95 and XP work without the patch, but crash in the same manner. With or
> > without the patch.
>
> I can assure you that it will keep crashing unless people start reporting
> bugs (properly and timely).

I assumed this was widely known issue. Anyone here have sound working on 
Windows?
I don't recall seeing the declaration of a proper channel for reporting bugs. 
How/where exactly is this done?

-jm

Re: [Qemu-devel] Sound & Win98

[Nicolas Wu]

I had the same compile error as lindsay, but found this
alternative patch that works:

http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz

most of the time it works with win98, but occasionally crashes; though
it would appear to be sporadic :(

nick



Lindsay Mathieson wrote:
>I applied the patch but get a patch error (both with 0.6 src & latest snapshot)
>$ patch -p1 < ../6_aqemu.patch
>patching file hw/sb16.c
>patching file oss.c
>Hunk #1 FAILED at 23.
>1 out of 19 hunks FAILED -- saving rejects to file oss.c.rej

from oss.c.rej looks to be vl.h

Is this the right place to report bugs ?

On Sun July 25 2004 12:23 am, malc wrote:
> On Sat, 24 Jul 2004, Joe Menola wrote:
> > On Sat July 24 2004 5:56 pm, Lindsay Mathieson wrote:
> > > Is -enable-audio not working for win98 as a guest ?
> >
> > AFAIK, that's correct. There's a patch available that gets 98 to load the
> > sb device properly, but for me it always crashes on the 2nd sound event.
> > 95 and XP work without the patch, but crash in the same manner. With or
> > without the patch.
>
> I can assure you that it will keep crashing unless people start reporting
> bugs (properly and timely).

I assumed this was widely known issue. Anyone here have sound working on 
Windows?
I don't recall seeing the declaration of a proper channel for reporting bugs. 
How/where exactly is this done?

-jm

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Sun July 25 2004 5:25 am, Nicolas Wu wrote:
> I had the same compile error as lindsay, but found this
> alternative patch that works:
>
> http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz
>
> most of the time it works with win98, but occasionally crashes; though
> it would appear to be sporadic :(
>
> nick

I also have not been able to apply cleanly the previous patch I recommended 
since version 0.5.5. The link you provided a patch which applied cleanly.

Tested on WinXP
Sound works but XP crashes on 2nd sound event. Console output:
audio: write audio
system error: Unknown error 2996
Aborted

Win98
Device manager reports that sb is present and working. However, I get no 
sound. Testing from Control Panel>Sounds Properties>Preveiw>play...the play 
button "greys out" and the stop button gets focus. No sound is produced, and 
there's no output to console. It remains in this state until the stop button 
is pushed. Perhaps I missed something in my 98 configuration?

Using cvs updated Sun 25 Jul 2004, 13:49
KDE 3.2.3 with arts set to use OSS audio device.

Re: [Qemu-devel] Sound & Win98

[Lindsay Mathieson]

Joe Menola wrote:

>I also have not been able to apply cleanly the previous patch I recommended 
>since version 0.5.5. The link you provided a patch which applied cleanly.
>  
>
Ditto

>Win98
>Device manager reports that sb is present and working. However, I get no 
>sound. Testing from Control Panel>Sounds Properties>Preveiw>play...the play 
>button "greys out" and the stop button gets focus. No sound is produced, and 
>there's no output to console. It remains in this state until the stop button 
>is pushed. Perhaps 
>  
>
I get the same results with win98, though oddly enough CivII produced a 
burst of mangled sound.

KDE 3.2, arts using OSS

Re: [Qemu-devel] Sound & Win98

[malc]

On Sun, 25 Jul 2004, Joe Menola wrote:

> On Sun July 25 2004 5:25 am, Nicolas Wu wrote:
> > I had the same compile error as lindsay, but found this
> > alternative patch that works:
> >
> > http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz
> >
> > most of the time it works with win98, but occasionally crashes; though
> > it would appear to be sporadic :(
> >
> > nick
>
> I also have not been able to apply cleanly the previous patch I recommended
> since version 0.5.5. The link you provided a patch which applied cleanly.
>
> Tested on WinXP
> Sound works but XP crashes on 2nd sound event. Console output:
> audio: write audio
> system error: Unknown error 2996
> Aborted
>
> Win98
> Device manager reports that sb is present and working. However, I get no
> sound. Testing from Control Panel>Sounds Properties>Preveiw>play...the play
> button "greys out" and the stop button gets focus. No sound is produced, and
> there's no output to console. It remains in this state until the stop button
> is pushed. Perhaps I missed something in my 98 configuration?
>
> Using cvs updated Sun 25 Jul 2004, 13:49
> KDE 3.2.3 with arts set to use OSS audio device.

Thank you for this detailed bug report.

Following patch (which must be applied after qemu-0.6.0-6_aqemu.patch.gz
will definitely workaround 1st problem and might help with 2nd.

It would be interesting to know if "Unknown error 2996" goes away if
vanilla OSS/ALSA is used.

P.S. The only missing information is the name of the soundcard.

--- oss.c	Mon Jul 26 01:00:48 2004
+++ ../qq/oss.c	Mon Jul 26 01:04:45 2004
@@ -796,12 +796,13 @@
         play = MIN (left, bytes);
         written = write (s->fd, (void *) ((uint32_t) s->buf + s->rpos),
play);

-        if (-1 == written) {
+        if (written < 0) {
             if (EAGAIN == errno || EINTR == errno) {
                 return;
             }
             else {
-                ERRFail ("write audio");
+	        fprintf (stderr, "write failed, errno=%d\n", errno);
+		return;
             }
         }

@@ -895,6 +896,9 @@
             elapsed += s->leftover;
         }
     }
+
+    if (elapsed < 1024)
+        return 0;

     if (elapsed > free) {
         lwarn ("audio can not keep up elapsed %d free %d\n", elapsed,
free);

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Sun July 25 2004 8:06 pm, malc wrote:
> On Sun, 25 Jul 2004, Joe Menola wrote:
> > On Sun July 25 2004 5:25 am, Nicolas Wu wrote:
> > > I had the same compile error as lindsay, but found this
> > > alternative patch that works:
> > >
> > > http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz
> > >
> > > most of the time it works with win98, but occasionally crashes; though
> > > it would appear to be sporadic :(
> > >
> > > nick
> >
> > I also have not been able to apply cleanly the previous patch I
> > recommended since version 0.5.5. The link you provided a patch which
> > applied cleanly.
> >
> > Tested on WinXP
> > Sound works but XP crashes on 2nd sound event. Console output:
> > audio: write audio
> > system error: Unknown error 2996
> > Aborted
> >
> > Win98
> > Device manager reports that sb is present and working. However, I get no
> > sound. Testing from Control Panel>Sounds Properties>Preveiw>play...the
> > play button "greys out" and the stop button gets focus. No sound is
> > produced, and there's no output to console. It remains in this state
> > until the stop button is pushed. Perhaps I missed something in my 98
> > configuration?
> >
> > Using cvs updated Sun 25 Jul 2004, 13:49
> > KDE 3.2.3 with arts set to use OSS audio device.
>
> Thank you for this detailed bug report.

My pleasure.

> Following patch (which must be applied after qemu-0.6.0-6_aqemu.patch.gz
> will definitely workaround 1st problem and might help with 2nd.

I copied your text to file sb-sub.patch, but fudged things some how. 
$ patch -p1 < sb-sub.patch
patch: **** Only garbage was found in the patch input.

>
> It would be interesting to know if "Unknown error 2996" goes away if
> vanilla OSS/ALSA is used.

By that you mean disable arts?
>
> P.S. The only missing information is the name of the soundcard.

Physical soundcard?  =SB Live 5.1

> --- oss.c	Mon Jul 26 01:00:48 2004
> +++ ../qq/oss.c	Mon Jul 26 01:04:45 2004
> @@ -796,12 +796,13 @@
>          play = MIN (left, bytes);
>          written = write (s->fd, (void *) ((uint32_t) s->buf + s->rpos),
> play);
>
> -        if (-1 == written) {
> +        if (written < 0) {
>              if (EAGAIN == errno || EINTR == errno) {
>                  return;
>              }
>              else {
> -                ERRFail ("write audio");
> +	        fprintf (stderr, "write failed, errno=%d\n", errno);
> +		return;
>              }
>          }
>
> @@ -895,6 +896,9 @@
>              elapsed += s->leftover;
>          }
>      }
> +
> +    if (elapsed < 1024)
> +        return 0;
>
>      if (elapsed > free) {
>          lwarn ("audio can not keep up elapsed %d free %d\n", elapsed,
> free);

Re: [Qemu-devel] Sound & Win98

[malc]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 806 bytes --]

On Sun, 25 Jul 2004, Joe Menola wrote:

> > Thank you for this detailed bug report.
>
> My pleasure.
>
> > Following patch (which must be applied after qemu-0.6.0-6_aqemu.patch.gz
> > will definitely workaround 1st problem and might help with 2nd.
>
> I copied your text to file sb-sub.patch, but fudged things some how.
> $ patch -p1 < sb-sub.patch
> patch: **** Only garbage was found in the patch input.

Let's try that again:
$ cd /cvs/qemu
$ patch </path/to/patch/oss.c.patch

>
> >
> > It would be interesting to know if "Unknown error 2996" goes away if
> > vanilla OSS/ALSA is used.
>
> By that you mean disable arts?

Yes.

> >
> > P.S. The only missing information is the name of the soundcard.
>
> Physical soundcard?  =SB Live 5.1

Ok. SB Live 5.1 + arts. Thanks.

-- 
mailto:malc@pulsesoft.com

[-- Attachment #2: Type: TEXT/PLAIN, Size: 786 bytes --]

--- oss.c.orig	Mon Jul 26 01:00:48 2004
+++ oss.c	Mon Jul 26 01:04:45 2004
@@ -796,12 +796,13 @@
         play = MIN (left, bytes);
         written = write (s->fd, (void *) ((uint32_t) s->buf + s->rpos), play);
 
-        if (-1 == written) {
+        if (written < 0) {
             if (EAGAIN == errno || EINTR == errno) {
                 return;
             }
             else {
-                ERRFail ("write audio");
+	        fprintf (stderr, "write failed, errno=%d\n", errno);
+		return;
             }
         }
 
@@ -895,6 +896,9 @@
             elapsed += s->leftover;
         }
     }
+
+    if (elapsed < 1024)
+        return 0;
 
     if (elapsed > free) {
         lwarn ("audio can not keep up elapsed %d free %d\n", elapsed, free);

Re: [Qemu-devel] Sound & Win98

[Lindsay Mathieson]

Sorry, still no luck:
patch -p0 < ../oss.c.patch
patching file oss.c
Hunk #1 FAILED at 796.
Hunk #2 FAILED at 896.
2 out of 2 hunks FAILED -- saving rejects to file oss.c.rej

malc wrote:

>On Sun, 25 Jul 2004, Joe Menola wrote:
>
>  
>
>>>Thank you for this detailed bug report.
>>>      
>>>
>>My pleasure.
>>
>>    
>>
>>>Following patch (which must be applied after qemu-0.6.0-6_aqemu.patch.gz
>>>will definitely workaround 1st problem and might help with 2nd.
>>>      
>>>
>>I copied your text to file sb-sub.patch, but fudged things some how.
>>$ patch -p1 < sb-sub.patch
>>patch: **** Only garbage was found in the patch input.
>>    
>>
>
>Let's try that again:
>$ cd /cvs/qemu
>$ patch </path/to/patch/oss.c.patch
>
>  
>
>>>It would be interesting to know if "Unknown error 2996" goes away if
>>>vanilla OSS/ALSA is used.
>>>      
>>>
>>By that you mean disable arts?
>>    
>>
>
>Yes.
>
>  
>
>>>P.S. The only missing information is the name of the soundcard.
>>>      
>>>
>>Physical soundcard?  =SB Live 5.1
>>    
>>
>
>Ok. SB Live 5.1 + arts. Thanks.
>
>  
>
>------------------------------------------------------------------------
>
>--- oss.c.orig	Mon Jul 26 01:00:48 2004
>+++ oss.c	Mon Jul 26 01:04:45 2004
>@@ -796,12 +796,13 @@
>         play = MIN (left, bytes);
>         written = write (s->fd, (void *) ((uint32_t) s->buf + s->rpos), play);
> 
>-        if (-1 == written) {
>+        if (written < 0) {
>             if (EAGAIN == errno || EINTR == errno) {
>                 return;
>             }
>             else {
>-                ERRFail ("write audio");
>+	        fprintf (stderr, "write failed, errno=%d\n", errno);
>+		return;
>             }
>         }
> 
>@@ -895,6 +896,9 @@
>             elapsed += s->leftover;
>         }
>     }
>+
>+    if (elapsed < 1024)
>+        return 0;
> 
>     if (elapsed > free) {
>         lwarn ("audio can not keep up elapsed %d free %d\n", elapsed, free);
>  
>
>------------------------------------------------------------------------
>
>_______________________________________________
>Qemu-devel mailing list
>Qemu-devel@nongnu.org
>http://lists.nongnu.org/mailman/listinfo/qemu-devel
>  
>

Re: [Qemu-devel] Sound & Win98

[Lindsay Mathieson]

Lindsay Mathieson wrote:

>
> Sorry, still no luck:
> patch -p0 < ../oss.c.patch
> patching file oss.c
> Hunk #1 FAILED at 796.
> Hunk #2 FAILED at 896.
> 2 out of 2 hunks FAILED -- saving rejects to file oss.c.rej
>

p.s I'm using the 0.6.0 src, rather than latest cvs

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Mon July 26 2004 4:10 am, malc wrote:
> On Sun, 25 Jul 2004, Joe Menola wrote:
> > > Thank you for this detailed bug report.
> >
> > My pleasure.
> >
> > > Following patch (which must be applied after
> > > qemu-0.6.0-6_aqemu.patch.gz will definitely workaround 1st problem and
> > > might help with 2nd.
> >
> > I copied your text to file sb-sub.patch, but fudged things some how.
> > $ patch -p1 < sb-sub.patch
> > patch: **** Only garbage was found in the patch input.
>
> Let's try that again:
> $ cd /cvs/qemu
> $ patch </path/to/patch/oss.c.patch

Ok, that patches cleanly.

Quick install/test...

With arts disabled, Win98 behaves the same. WinXP now produces a short bleep 
instead of playing the proper wave files. But does not crash any more.
Will play with it more this evening.

-jm

Re: [Qemu-devel] Sound & Win98

[malc]

On Mon, 26 Jul 2004, Joe Menola wrote:

> On Mon July 26 2004 4:10 am, malc wrote:
> > On Sun, 25 Jul 2004, Joe Menola wrote:
> > > > Thank you for this detailed bug report.
> > >
> > > My pleasure.
> > >
> > > > Following patch (which must be applied after
> > > > qemu-0.6.0-6_aqemu.patch.gz will definitely workaround 1st problem and
> > > > might help with 2nd.
> > >
> > > I copied your text to file sb-sub.patch, but fudged things some how.
> > > $ patch -p1 < sb-sub.patch
> > > patch: **** Only garbage was found in the patch input.
> >
> > Let's try that again:
> > $ cd /cvs/qemu
> > $ patch </path/to/patch/oss.c.patch
>
> Ok, that patches cleanly.
>
> Quick install/test...
>
> With arts disabled, Win98 behaves the same. WinXP now produces a short bleep
> instead of playing the proper wave files. But does not crash any more.
> Will play with it more this evening.

If behaves the same implies crashes then i am very surprised.

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Mon July 26 2004 4:06 pm, malc wrote:
> On Mon, 26 Jul 2004, Joe Menola wrote:
> > On Mon July 26 2004 4:10 am, malc wrote:
> > > On Sun, 25 Jul 2004, Joe Menola wrote:
> > > > > Thank you for this detailed bug report.
> > > >
> > > > My pleasure.
> > > >
> > > > > Following patch (which must be applied after
> > > > > qemu-0.6.0-6_aqemu.patch.gz will definitely workaround 1st problem
> > > > > and might help with 2nd.
> > > >
> > > > I copied your text to file sb-sub.patch, but fudged things some how.
> > > > $ patch -p1 < sb-sub.patch
> > > > patch: **** Only garbage was found in the patch input.
> > >
> > > Let's try that again:
> > > $ cd /cvs/qemu
> > > $ patch </path/to/patch/oss.c.patch
> >
> > Ok, that patches cleanly.
> >
> > Quick install/test...
> >
> > With arts disabled, Win98 behaves the same. WinXP now produces a short
> > bleep instead of playing the proper wave files. But does not crash any
> > more. Will play with it more this evening.
>
> If behaves the same implies crashes then i am very surprised.

No, Win98 never had issues with crashing. It simply produced no sound. Which 
it still doesn't, but it trys. But as before, it just sits in play mode going 
no where until it's manually stopped.

WinXP was the one crashing on 2nd sound event, it no longer crashes but wave 
files produce only "beeps n blips" not the proper sounds.

I wanted to try playing a cd, but you guys stole my qemu monitor so I can't 
"change cdrom" lol. And qemu wont boot with a music cd in drive. 
How do I get it back?


-jm

Re: [Qemu-devel] Sound & Win98

[Laurent Amon]

On 26 juil. 04, at 23:51, Joe Menola wrote:
> I wanted to try playing a cd, but you guys stole my qemu monitor so I 
> can't
> "change cdrom" lol. And qemu wont boot with a music cd in drive.
> How do I get it back?
>
Ctrl-Shift-F2 doesn't work?

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Mon July 26 2004 5:29 pm, Laurent Amon wrote:
> On 26 juil. 04, at 23:51, Joe Menola wrote:
> > I wanted to try playing a cd, but you guys stole my qemu monitor so I
> > can't
> > "change cdrom" lol. And qemu wont boot with a music cd in drive.
> > How do I get it back?
>
> Ctrl-Shift-F2 doesn't work?
>
Yes it does, thank you. I searched the docs but couldn't find this info.

One more thing?
How do I get back to my guest os? 

-jm

Re: [Qemu-devel] Sound & Win98

[Laurent Amon]

On 27 juil. 04, at 01:26, Joe Menola wrote:

> On Mon July 26 2004 5:29 pm, Laurent Amon wrote:
>> On 26 juil. 04, at 23:51, Joe Menola wrote:
>>> I wanted to try playing a cd, but you guys stole my qemu monitor so I
>>> can't
>>> "change cdrom" lol. And qemu wont boot with a music cd in drive.
>>> How do I get it back?
>>
>> Ctrl-Shift-F2 doesn't work?
>>
> Yes it does, thank you. I searched the docs but couldn't find this 
> info.
>
> One more thing?
> How do I get back to my guest os?
>
> -jm

Ctrl-Shift-F1

And Ctrl-Shift-F3 for the serial port.

Lga.

Re: [Qemu-devel] Sound & Win98

[malc]

On Mon, 26 Jul 2004, Joe Menola wrote:

> No, Win98 never had issues with crashing. It simply produced no sound. Which
> it still doesn't, but it trys. But as before, it just sits in play mode going
> no where until it's manually stopped.

Strange, just today i did a testdrive with EMU1K and it worked fine. Then
again i used "latest and greatest" audio patches (and i belive the system
was using ALSA's OSS emulation) In any case Win98's sound worked
with 6_aqemu - on, at least, AU8830(ALSA) and some integrated AC'97(ALSA +
the patch more or less like the one i presented yesterday)

>
> WinXP was the one crashing on 2nd sound event, it no longer crashes but wave
> files produce only "beeps n blips" not the proper sounds.
>
> I wanted to try playing a cd, but you guys stole my qemu monitor so I can't
> "change cdrom" lol. And qemu wont boot with a music cd in drive.
> How do I get it back?

C-S-F2 i guess

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Mon July 26 2004 9:41 pm, malc wrote:
> On Mon, 26 Jul 2004, Joe Menola wrote:
> > No, Win98 never had issues with crashing. It simply produced no sound.
> > Which it still doesn't, but it trys. But as before, it just sits in play
> > mode going no where until it's manually stopped.
>
> Strange, just today i did a testdrive with EMU1K and it worked fine. Then
> again i used "latest and greatest" audio patches (and i belive the system
> was using ALSA's OSS emulation) In any case Win98's sound worked
> with 6_aqemu - on, at least, AU8830(ALSA) and some integrated AC'97(ALSA +
> the patch more or less like the one i presented yesterday)

I agree, also strange that some folks report sound (although crashing) with 
orginal patch. I've been over my Win98 countless times and I swear I'm setup 
ok.
Happen to know which driver Win98 in that testdrive?

-jm

Re: [Qemu-devel] Sound & Win98

[Lindsay Mathieson]

malc wrote:

>Following patch (which must be applied after qemu-0.6.0-6_aqemu.patch.gz
>will definitely workaround 1st problem and might help with 2nd.
>free);
>
>  
>
Patch would not apply - I don't have a "../qq/oss.c" for a start off

missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- oss.c      Mon Jul 26 01:00:48 2004
|+++ ../qq/oss.c        Mon Jul 26 01:04:45 2004
--------------------------
File to patch:
[lindsay@c210-49-30-228 qemu-0.6.0]$ ls ../qq
ls: ../qq: No such file or directory

Re: [Qemu-devel] Sound & Win98

[Jim C. Brown]

On Mon, Jul 26, 2004 at 09:22:17AM +1000, Lindsay Mathieson wrote:
> malc wrote:
> 
> >Following patch (which must be applied after qemu-0.6.0-6_aqemu.patch.gz
> >will definitely workaround 1st problem and might help with 2nd.
> >free);
> >
> > 
> >
> Patch would not apply - I don't have a "../qq/oss.c" for a start off
> 
> missing header for unified diff at line 3 of patch
> can't find file to patch at input line 3
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |--- oss.c      Mon Jul 26 01:00:48 2004
> |+++ ../qq/oss.c        Mon Jul 26 01:04:45 2004
> --------------------------
> File to patch:
> [lindsay@c210-49-30-228 qemu-0.6.0]$ ls ../qq
> ls: ../qq: No such file or directory
> 
> 

Maybe patch -R is called for here?

> 
> _______________________________________________
> Qemu-devel mailing list
> Qemu-devel@nongnu.org
> http://lists.nongnu.org/mailman/listinfo/qemu-devel
> 

-- 
Infinite complexity begets infinite beauty.
Infinite precision begets infinite perfection.

Re: [Qemu-devel] Sound & Win98

[Joe Menola]

On Sun July 25 2004 6:22 pm, Lindsay Mathieson wrote:
> Patch would not apply - I don't have a "../qq/oss.c" for a start off
>
> missing header for unified diff at line 3 of patch
> can't find file to patch at input line 3
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
>
> |--- oss.c      Mon Jul 26 01:00:48 2004
> |+++ ../qq/oss.c        Mon Jul 26 01:04:45 2004
>
> --------------------------
> File to patch:
> [lindsay@c210-49-30-228 qemu-0.6.0]$ ls ../qq
> ls: ../qq: No such file or directory

Seems my patch file some how ended up empty. After correcting this and feeding 
"oss.c" to the "File to patch:" prompt, I got this:

$ patch -p1 < sb-sub.patch
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- oss.c       Mon Jul 26 01:00:48 2004
|+++ ../qq/oss.c Mon Jul 26 01:04:45 2004
--------------------------
File to patch: oss.c
patching file oss.c
patch: **** malformed patch at line 4:          play = MIN (left, bytes);

Same result using patch -R

-jm

Re: [Qemu-devel] Sound & Win98

[Johannes Martin]

Hi,

I tested the Win98 sound patch available at
  http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz
with the additional patch posted by malc on July 25.

My setup:
	Debian/GNU Linux 3.0 with some stuff from unstable
	KDE 3.2.3, artsd running
	ALSA with C-Media PCI CMI8738-MC6 (model 55) at 0xec00, irq 5

Before applying the patch:
	Win98 SE reports problems with the sound driver,
		sound does not work
	OS/2 works fine with my earlier patch to fix the "write audio"
		aborts (which is roughly equivalent to malc's patch)

After applying the patch:
	Win98 SE does not report any driver problems,
		sound still does not work though
		(media player works, but there is no sound to be heard)
	OS/2 does not load the SB16 driver any more:
		"incorrect DSP version" when attempting to load driver
	--> This can be fixed by adding the dot after the copyright
	    string in hw/sb16.c (see patch below).

After applying my patch (see below):
	Win98 SE
		no change
	OS/2 does load the SB16 driver again, but there are large
		gaps/interruptions in the sound output


Any hints?

Thanks
	Johannes




------------------------
*** hw/sb16.c.orig      Sun Jul 18 21:31:47 2004
--- hw/sb16.c   Fri Jul 30 12:37:00 2004
***************
*** 46,52 ****
      void name (void *opaque, uint32_t nport, uint32_t val)

  static const char e3[] =
!     "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992\0"
      "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1994-1997";
      /* "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1994."; */

--- 46,52 ----
      void name (void *opaque, uint32_t nport, uint32_t val)

  static const char e3[] =
!     "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.\0"
      "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1994-1997";
      /* "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1994."; */
------------------------

Re: [Qemu-devel] Sound & Win98

[malc]

On Fri, 30 Jul 2004, Johannes Martin wrote:

> Hi,
>
> I tested the Win98 sound patch available at
>   http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz
> with the additional patch posted by malc on July 25.
>

> Any hints?

No. However.

I reworked few things in audio emulation and fixed some deviations from
standard SB16 behavior, that might help. What i have now is hardly
releasable (touches way to many things), but i can cook a dirty patch
for the brave.

-- 
mailto:malc@pulsesoft.com

Re: [Qemu-devel] Sound & Win98

[Johannes Martin]

Hi,

On Fri, 30 Jul 2004, Johannes Martin wrote:
> I tested the Win98 sound patch available at
>   http://www.h7.dion.ne.jp/~qemu-win/download/qemu-0.6.0-6_aqemu.patch.gz
> with the additional patch posted by malc on July 25.
> [in short: Win98 still didn't work, OS/2 & Win95 stopped working]

I found out what the problem was that made OS/2 and Win95 stop working.
The second part of the patch posted by malc on July 25:

--- oss.c       Mon Jul 26 01:00:48 2004
+++ ../qq/oss.c Mon Jul 26 01:04:45 2004
@@ -895,6 +896,9 @@
             elapsed += s->leftover;
         }
     }
+
+    if (elapsed < 1024)
+        return 0;

     if (elapsed > free) {
         lwarn ("audio can not keep up elapsed %d free %d\n", elapsed, free);


If I don't apply that patch, OS/2 and Win95 continue to work (i.e. sound
is not or only mildly distorted).

Johannes