diff mbox

[1/6] audio: set top level latch for each slot

Message ID 1395566923-5074-1-git-send-email-prasadjoshi.linux@gmail.com
State New
Headers show

Commit Message

Prasad Joshi March 23, 2014, 9:28 a.m. UTC
CSMKeyControll function is supposed to set the top level latch for each
slot. However, at the moment, it incorrectly updates only the first
slot. Patch fixes the problem.

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
---
 hw/audio/fmopl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Hajnoczi March 24, 2014, 1:19 p.m. UTC | #1
On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
> CSMKeyControll function is supposed to set the top level latch for each
> slot. However, at the moment, it incorrectly updates only the first
> slot. Patch fixes the problem.
> 
> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> ---
>  hw/audio/fmopl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.

> diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
> index 290a224..eb60c12 100644
> --- a/hw/audio/fmopl.c
> +++ b/hw/audio/fmopl.c
> @@ -725,7 +725,7 @@ INLINE void CSMKeyControll(OPL_CH *CH)
>  	OPL_KEYOFF(slot2);
>  	/* total level latch */
>  	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
> -	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
> +	slot2->TLL = slot2->TL + (CH->ksl_base>>slot2->ksl);
>  	/* key on */
>  	CH->op1_out[0] = CH->op1_out[1] = 0;
>  	OPL_KEYON(slot1);
> -- 
> 1.8.1.2
>
Peter Maydell March 24, 2014, 1:22 p.m. UTC | #2
On 24 March 2014 13:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
>> CSMKeyControll function is supposed to set the top level latch for each
>> slot. However, at the moment, it incorrectly updates only the first
>> slot. Patch fixes the problem.
>>
>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>> ---
>>  hw/audio/fmopl.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.

I'm currently assuming that bugfixes for 2.0 will appear in
the form of pullrequests marked 'for-2.0' from the appropriate
submaintainers...

thanks
-- PMM
Andreas Färber March 24, 2014, 2:17 p.m. UTC | #3
Am 24.03.2014 14:22, schrieb Peter Maydell:
> On 24 March 2014 13:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
>>> CSMKeyControll function is supposed to set the top level latch for each
>>> slot. However, at the moment, it incorrectly updates only the first
>>> slot. Patch fixes the problem.
>>>
>>> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
>>> ---
>>>  hw/audio/fmopl.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.
> 
> I'm currently assuming that bugfixes for 2.0 will appear in
> the form of pullrequests marked 'for-2.0' from the appropriate
> submaintainers...

I've already picked up the openpic patch earlier today and got
distracted from testing it on PowerKVM for sending out the message...

Regards,
Andreas

P.S. Prasad, please remember to prepend a cover letter 0/6 next time.
Stefan Hajnoczi March 25, 2014, 9 a.m. UTC | #4
On Mon, Mar 24, 2014 at 01:22:56PM +0000, Peter Maydell wrote:
> On 24 March 2014 13:19, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > On Sun, Mar 23, 2014 at 02:58:38PM +0530, Prasad Joshi wrote:
> >> CSMKeyControll function is supposed to set the top level latch for each
> >> slot. However, at the moment, it incorrectly updates only the first
> >> slot. Patch fixes the problem.
> >>
> >> Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
> >> ---
> >>  hw/audio/fmopl.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Peter: This series has some fixes for QEMU 2.0 since they are bug fixes.
> 
> I'm currently assuming that bugfixes for 2.0 will appear in
> the form of pullrequests marked 'for-2.0' from the appropriate
> submaintainers...

Okay, I'll take the relevant ones for the net subsystem and send a pull
request.

Stefan
diff mbox

Patch

diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 290a224..eb60c12 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -725,7 +725,7 @@  INLINE void CSMKeyControll(OPL_CH *CH)
 	OPL_KEYOFF(slot2);
 	/* total level latch */
 	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
-	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
+	slot2->TLL = slot2->TL + (CH->ksl_base>>slot2->ksl);
 	/* key on */
 	CH->op1_out[0] = CH->op1_out[1] = 0;
 	OPL_KEYON(slot1);