From nobody Fri May 3 08:28:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517289606700155.9072789419813; Mon, 29 Jan 2018 21:20:06 -0800 (PST) Received: from localhost ([::1]:39562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egOKq-0006L1-Iz for importer@patchew.org; Tue, 30 Jan 2018 00:19:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egOJn-0005zE-1C for qemu-devel@nongnu.org; Tue, 30 Jan 2018 00:18:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egOJj-0000hG-KW for qemu-devel@nongnu.org; Tue, 30 Jan 2018 00:18:51 -0500 Received: from mail-io0-x243.google.com ([2607:f8b0:4001:c06::243]:36443) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1egOJj-0000go-Ca for qemu-devel@nongnu.org; Tue, 30 Jan 2018 00:18:47 -0500 Received: by mail-io0-x243.google.com with SMTP id l17so10076953ioc.3 for ; Mon, 29 Jan 2018 21:18:47 -0800 (PST) Received: from localhost.localdomain (d14-69-20-184.try.wideopenwest.com. [69.14.184.20]) by smtp.gmail.com with ESMTPSA id w125sm6946376itb.31.2018.01.29.21.18.45 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Jan 2018 21:18:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CgZUn5zoeBvngB8rzOYE7ATDj7CIy2xha8smjJX6MWU=; b=MTWa8zECeXsQYhVCb6khG9600BfLhp3DExwMDWHWIk3jTMrRGYhXKXyoaoDknE0X0B AscbimLsihj2tJylYgac8fXQoT3WCTVmS7T9C5raSsuAKiP7vYroocGinG6qeBhPe2Mp VVG4Gj4P2c2qUD2z5x0Z2vSLRSZQzJ17TkgKh83H3WyfrUHjFU+P+8GAeOELGdc0EfJ5 mtffOnvRcWg9FykR50QJ5ZdGsElgw9e3VrhPYvc4fG/R9uiS7QVBxuDNQOBZ5YlYe9XC tTLO5QfnjwhVYG/P/VRl3lB1OMTJWWArGdiIXGpfIZZ3a96k06OITBJu+1do006SrO00 kUCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CgZUn5zoeBvngB8rzOYE7ATDj7CIy2xha8smjJX6MWU=; b=sCuAtsvgHmTjUNzOm9m/6qESbc98QqIhyH69L5Pr3BMSjrdKyvuuMSijS7B9G7mWKV SFmg6OfZ43dtF42vMg8z38ihK/KRaJ1RE9uGi6XnsJtoA1bc4IqPPIERnRnCe2YrtCJz NCZ88RpHNvdeoNPtExtva7jnJyDycFhXkqyL1F/KpUgFFoGiaopWK7UIeWMgWXdsdAaR 9xEPFARk91B7aMvXRqe3ihp6oPHKys6U+jTVnAAAzCn76F4pQUVsmC2c/Jn9813Qbdzg cXUcB5nqf7oTR6hOWGLrPFS32mP9I6HFf9JyEfe5uQFPVTGNgJ2R9+MplPDOztCCHoOX uiBQ== X-Gm-Message-State: AKwxytdzcYqYzU7uUPtzgELe9gkHCf6+TRzsvs7tTWdRS/tpncULpBkG Kn+mbnozsqImvr6K9UPZP7w= X-Google-Smtp-Source: AH8x226JhgS3R3J5oncU0fTNqCqcMtUaG5kSfbWnfyy4kqQGj9EhQaeW9+280VoA1YZW5xoxAa5hZg== X-Received: by 10.107.70.25 with SMTP id t25mr28491310ioa.126.1517289526307; Mon, 29 Jan 2018 21:18:46 -0800 (PST) From: John Arbuckle To: kraxel@redhat.com, qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 00:18:37 -0500 Message-Id: <20180130051837.8725-1-programmingkidx@gmail.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::243 Subject: [Qemu-devel] [PATCH] hw/audio/sb16.c: Convert file to new logging API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Arbuckle Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the qemu_log_mask() function to log messages. Signed-off-by: John Arbuckle --- hw/audio/sb16.c | 221 ++++++++++++++++++++++++++++------------------------= ---- 1 file changed, 112 insertions(+), 109 deletions(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 6ab2f6f89a..bdb79aeafa 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -29,18 +29,12 @@ #include "hw/qdev.h" #include "qemu/timer.h" #include "qemu/host-utils.h" +#include "qemu/log.h" =20 -#define dolog(...) AUD_log ("sb16", __VA_ARGS__) =20 /* #define DEBUG */ /* #define DEBUG_SB16_MOST */ =20 -#ifdef DEBUG -#define ldebug(...) dolog (__VA_ARGS__) -#else -#define ldebug(...) -#endif - static const char e3[] =3D "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992."; =20 #define TYPE_SB16 "sb16" @@ -123,7 +117,7 @@ static int magic_of_irq (int irq) case 10: return 8; default: - dolog ("bad irq %d\n", irq); + qemu_log_mask(LOG_UNIMP, "bad irq %d\n", irq); return 2; } } @@ -140,7 +134,7 @@ static int irq_of_magic (int magic) case 8: return 10; default: - dolog ("bad irq magic %d\n", magic); + qemu_log_mask(LOG_UNIMP, "bad irq magic %d\n", magic); return -1; } } @@ -148,15 +142,16 @@ static int irq_of_magic (int magic) #if 0 static void log_dsp (SB16State *dsp) { - ldebug ("%s:%s:%d:%s:dmasize=3D%d:freq=3D%d:const=3D%d:speaker=3D%d\n", - dsp->fmt_stereo ? "Stereo" : "Mono", - dsp->fmt_signed ? "Signed" : "Unsigned", - dsp->fmt_bits, - dsp->dma_auto ? "Auto" : "Single", - dsp->block_size, - dsp->freq, - dsp->time_const, - dsp->speaker); + qemu_log_mask(LOG_UNIMP, "%s:%s:%d:%s:dmasize=3D%d:freq=3D%d:const=3D%= d:" + "speaker=3D%d\n", + dsp->fmt_stereo ? "Stereo" : "Mono", + dsp->fmt_signed ? "Signed" : "Unsigned", + dsp->fmt_bits, + dsp->dma_auto ? "Auto" : "Single", + dsp->block_size, + dsp->freq, + dsp->time_const, + dsp->speaker); } #endif =20 @@ -173,7 +168,8 @@ static void control (SB16State *s, int hold) IsaDmaClass *k =3D ISADMA_GET_CLASS(isa_dma); s->dma_running =3D hold; =20 - ldebug ("hold %d high %d dma %d\n", hold, s->use_hdma, dma); + qemu_log_mask(LOG_UNIMP, "hold %d high %d dma %d\n", hold, s->use_hdma, + dma); =20 if (hold) { k->hold_DREQ(isa_dma, dma); @@ -258,14 +254,14 @@ static void dma_cmd8 (SB16State *s, int mask, int dma= _len) s->align =3D (1 << s->fmt_stereo) - 1; =20 if (s->block_size & s->align) { - dolog ("warning: misaligned block size %d, alignment %d\n", - s->block_size, s->align + 1); + qemu_log_mask(LOG_UNIMP, "warning: misaligned block size %d, align= ment" + " %d\n", s->block_size, s->align + 1); } =20 - ldebug ("freq %d, stereo %d, sign %d, bits %d, " - "dma %d, auto %d, fifo %d, high %d\n", - s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits, - s->block_size, s->dma_auto, s->fifo, s->highspeed); + qemu_log_mask(LOG_UNIMP, "freq %d, stereo %d, sign %d, bits %d, " + "dma %d, auto %d, fifo %d, high %d\n", + s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits, + s->block_size, s->dma_auto, s->fifo, s->highspeed); =20 continue_dma8 (s); speaker (s, 1); @@ -310,10 +306,10 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8= _t d0, int dma_len) s->block_size <<=3D s->fmt_stereo; } =20 - ldebug ("freq %d, stereo %d, sign %d, bits %d, " - "dma %d, auto %d, fifo %d, high %d\n", - s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits, - s->block_size, s->dma_auto, s->fifo, s->highspeed); + qemu_log_mask(LOG_UNIMP, "freq %d, stereo %d, sign %d, bits %d, " + "dma %d, auto %d, fifo %d, high %d\n", + s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits, + s->block_size, s->dma_auto, s->fifo, s->highspeed); =20 if (16 =3D=3D s->fmt_bits) { if (s->fmt_signed) { @@ -338,8 +334,8 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t= d0, int dma_len) s->highspeed =3D 0; s->align =3D (1 << (s->fmt_stereo + (s->fmt_bits =3D=3D 16))) - 1; if (s->block_size & s->align) { - dolog ("warning: misaligned block size %d, alignment %d\n", - s->block_size, s->align + 1); + qemu_log_mask(LOG_UNIMP, "warning: misaligned block size %d, align= ment" + " %d\n", s->block_size, s->align + 1); } =20 if (s->freq) { @@ -368,7 +364,7 @@ static void dma_cmd (SB16State *s, uint8_t cmd, uint8_t= d0, int dma_len) =20 static inline void dsp_out_data (SB16State *s, uint8_t val) { - ldebug ("outdata %#x\n", val); + qemu_log_mask(LOG_UNIMP, "outdata %#x\n", val); if ((size_t) s->out_data_len < sizeof (s->out_data)) { s->out_data[s->out_data_len++] =3D val; } @@ -380,18 +376,19 @@ static inline uint8_t dsp_get_data (SB16State *s) return s->in2_data[--s->in_index]; } else { - dolog ("buffer underflow\n"); + qemu_log_mask(LOG_UNIMP, "buffer underflow\n"); return 0; } } =20 static void command (SB16State *s, uint8_t cmd) { - ldebug ("command %#x\n", cmd); + qemu_log_mask(LOG_UNIMP, "command %#x\n", cmd); =20 if (cmd > 0xaf && cmd < 0xd0) { if (cmd & 8) { - dolog ("ADC not yet supported (command %#x)\n", cmd); + qemu_log_mask(LOG_UNIMP, "ADC not yet supported (command %#x)\= n", + cmd); } =20 switch (cmd >> 4) { @@ -399,7 +396,7 @@ static void command (SB16State *s, uint8_t cmd) case 12: break; default: - dolog ("%#x wrong bits\n", cmd); + qemu_log_mask(LOG_UNIMP, "%#x wrong bits\n", cmd); } s->needed_bytes =3D 3; } @@ -453,7 +450,7 @@ static void command (SB16State *s, uint8_t cmd) goto warn; =20 case 0x35: - dolog ("0x35 - MIDI command not implemented\n"); + qemu_log_mask(LOG_UNIMP, "0x35 - MIDI command not implemented\= n"); break; =20 case 0x40: @@ -487,34 +484,37 @@ static void command (SB16State *s, uint8_t cmd) =20 case 0x74: s->needed_bytes =3D 2; /* DMA DAC, 4-bit ADPCM */ - dolog ("0x75 - DMA DAC, 4-bit ADPCM not implemented\n"); + qemu_log_mask(LOG_UNIMP, "0x75 - DMA DAC, 4-bit ADPCM not" + " implemented\n"); break; =20 case 0x75: /* DMA DAC, 4-bit ADPCM Reference */ s->needed_bytes =3D 2; - dolog ("0x74 - DMA DAC, 4-bit ADPCM Reference not implemented\= n"); + qemu_log_mask(LOG_UNIMP, "0x74 - DMA DAC, 4-bit ADPCM Referenc= e not" + " implemented\n"); break; =20 case 0x76: /* DMA DAC, 2.6-bit ADPCM */ s->needed_bytes =3D 2; - dolog ("0x74 - DMA DAC, 2.6-bit ADPCM not implemented\n"); + qemu_log_mask(LOG_UNIMP, "0x74 - DMA DAC, 2.6-bit ADPCM not" + " implemented\n"); break; =20 case 0x77: /* DMA DAC, 2.6-bit ADPCM Reference */ s->needed_bytes =3D 2; - dolog ("0x74 - DMA DAC, 2.6-bit ADPCM Reference not implemente= d\n"); + qemu_log_mask(LOG_UNIMP, "0x74 - DMA DAC, 2.6-bit ADPCM Refere= nce" + " not implemented\n"); break; =20 case 0x7d: - dolog ("0x7d - Autio-Initialize DMA DAC, 4-bit ADPCM Reference= \n"); - dolog ("not implemented\n"); + qemu_log_mask(LOG_UNIMP, "0x7d - Autio-Initialize DMA DAC, 4-b= it" + " ADPCM Reference\n"); + qemu_log_mask(LOG_UNIMP, "not implemented\n"); break; =20 case 0x7f: - dolog ( - "0x7d - Autio-Initialize DMA DAC, 2.6-bit ADPCM Reference\= n" - ); - dolog ("not implemented\n"); + qemu_log_mask(LOG_UNIMP, "0x7d - Autio-Initialize DMA DAC, 2.6= -bit" + " ADPCM Reference\nnot implemented\n"); break; =20 case 0x80: @@ -586,7 +586,7 @@ static void command (SB16State *s, uint8_t cmd) break; =20 case 0xe7: - dolog ("Attempt to probe for ESS (0xe7)?\n"); + qemu_log_mask(LOG_UNIMP, "Attempt to probe for ESS (0xe7)?\n"); break; =20 case 0xe8: /* read test reg */ @@ -613,13 +613,13 @@ static void command (SB16State *s, uint8_t cmd) goto warn; =20 default: - dolog ("Unrecognized command %#x\n", cmd); + qemu_log_mask(LOG_UNIMP, "Unrecognized command %#x\n", cmd); break; } } =20 if (!s->needed_bytes) { - ldebug ("\n"); + qemu_log_mask(LOG_UNIMP, "\n"); } =20 exit: @@ -632,8 +632,8 @@ static void command (SB16State *s, uint8_t cmd) return; =20 warn: - dolog ("warning: command %#x,%d is not truly understood yet\n", - cmd, s->needed_bytes); + qemu_log_mask(LOG_UNIMP, "warning: command %#x,%d is not truly underst= ood" + " yet\n", cmd, s->needed_bytes); goto exit; =20 } @@ -655,8 +655,8 @@ static uint16_t dsp_get_hilo (SB16State *s) static void complete (SB16State *s) { int d0, d1, d2; - ldebug ("complete command %#x, in_index %d, needed_bytes %d\n", - s->cmd, s->in_index, s->needed_bytes); + qemu_log_mask(LOG_UNIMP, "complete command %#x, in_index %d, needed_by= tes" + " %d\n", s->cmd, s->in_index, s->needed_bytes); =20 if (s->cmd > 0xaf && s->cmd < 0xd0) { d2 =3D dsp_get_data (s); @@ -664,12 +664,12 @@ static void complete (SB16State *s) d0 =3D dsp_get_data (s); =20 if (s->cmd & 8) { - dolog ("ADC params cmd =3D %#x d0 =3D %d, d1 =3D %d, d2 =3D %d= \n", - s->cmd, d0, d1, d2); + qemu_log_mask(LOG_UNIMP, "ADC params cmd =3D %#x d0 =3D %d, d1= =3D %d," + " d2 =3D %d\n", s->cmd, d0, d1, d2); } else { - ldebug ("cmd =3D %#x d0 =3D %d, d1 =3D %d, d2 =3D %d\n", - s->cmd, d0, d1, d2); + qemu_log_mask(LOG_UNIMP, "cmd =3D %#x d0 =3D %d, d1 =3D %d, d2= =3D %d\n", + s->cmd, d0, d1, d2); dma_cmd (s, s->cmd, d0, d1 + (d2 << 8)); } } @@ -679,23 +679,24 @@ static void complete (SB16State *s) s->csp_mode =3D dsp_get_data (s); s->csp_reg83r =3D 0; s->csp_reg83w =3D 0; - ldebug ("CSP command 0x04: mode=3D%#x\n", s->csp_mode); + qemu_log_mask(LOG_UNIMP, "CSP command 0x04: mode=3D%#x\n", + s->csp_mode); break; =20 case 0x05: s->csp_param =3D dsp_get_data (s); s->csp_value =3D dsp_get_data (s); - ldebug ("CSP command 0x05: param=3D%#x value=3D%#x\n", - s->csp_param, - s->csp_value); + qemu_log_mask(LOG_UNIMP, "CSP command 0x05: param=3D%#x value= =3D%#x\n", + s->csp_param, s->csp_value); break; =20 case 0x0e: d0 =3D dsp_get_data (s); d1 =3D dsp_get_data (s); - ldebug ("write CSP register %d <- %#x\n", d1, d0); + qemu_log_mask(LOG_UNIMP, "write CSP register %d <- %#x\n", d1,= d0); if (d1 =3D=3D 0x83) { - ldebug ("0x83[%d] <- %#x\n", s->csp_reg83r, d0); + qemu_log_mask(LOG_UNIMP, "0x83[%d] <- %#x\n", s->csp_reg83= r, + d0); s->csp_reg83[s->csp_reg83r % 4] =3D d0; s->csp_reg83r +=3D 1; } @@ -706,12 +707,11 @@ static void complete (SB16State *s) =20 case 0x0f: d0 =3D dsp_get_data (s); - ldebug ("read CSP register %#x -> %#x, mode=3D%#x\n", - d0, s->csp_regs[d0], s->csp_mode); + qemu_log_mask(LOG_UNIMP, "read CSP register %#x -> %#x, mode= =3D%#x\n", + d0, s->csp_regs[d0], s->csp_mode); if (d0 =3D=3D 0x83) { - ldebug ("0x83[%d] -> %#x\n", - s->csp_reg83w, - s->csp_reg83[s->csp_reg83w % 4]); + qemu_log_mask(LOG_UNIMP, "0x83[%d] -> %#x\n", + s->csp_reg83w, s->csp_reg83[s->csp_reg83w % = 4]); dsp_out_data (s, s->csp_reg83[s->csp_reg83w % 4]); s->csp_reg83w +=3D 1; } @@ -722,7 +722,7 @@ static void complete (SB16State *s) =20 case 0x10: d0 =3D dsp_get_data (s); - dolog ("cmd 0x10 d0=3D%#x\n", d0); + qemu_log_mask(LOG_UNIMP, "cmd 0x10 d0=3D%#x\n", d0); break; =20 case 0x14: @@ -731,21 +731,22 @@ static void complete (SB16State *s) =20 case 0x40: s->time_const =3D dsp_get_data (s); - ldebug ("set time const %d\n", s->time_const); + qemu_log_mask(LOG_UNIMP, "set time const %d\n", s->time_const); break; =20 case 0x42: /* FT2 sets output freq with this, go figu= re */ #if 0 - dolog ("cmd 0x42 might not do what it think it should\n"); + qemu_log_mask(LOG_UNIMP, "cmd 0x42 might not do what it think = it" + " should\n"); #endif case 0x41: s->freq =3D dsp_get_hilo (s); - ldebug ("set freq %d\n", s->freq); + qemu_log_mask(LOG_UNIMP, "set freq %d\n", s->freq); break; =20 case 0x48: s->block_size =3D dsp_get_lohi (s) + 1; - ldebug ("set dma block len %d\n", s->block_size); + qemu_log_mask(LOG_UNIMP, "set dma block len %d\n", s->block_si= ze); break; =20 case 0x74: @@ -775,21 +776,22 @@ static void complete (SB16State *s) ); } } - ldebug ("mix silence %d %d %" PRId64 "\n", samples, bytes,= ticks); + qemu_log_mask(LOG_UNIMP, "mix silence %d %d %" PRId64 "\n", + samples, bytes, ticks); } break; =20 case 0xe0: d0 =3D dsp_get_data (s); s->out_data_len =3D 0; - ldebug ("E0 data =3D %#x\n", d0); + qemu_log_mask(LOG_UNIMP, "E0 data =3D %#x\n", d0); dsp_out_data (s, ~d0); break; =20 case 0xe2: #ifdef DEBUG d0 =3D dsp_get_data (s); - dolog ("E2 =3D %#x\n", d0); + qemu_log_mask(LOG_UNIMP, "E2 =3D %#x\n", d0); #endif break; =20 @@ -799,7 +801,7 @@ static void complete (SB16State *s) =20 case 0xf9: d0 =3D dsp_get_data (s); - ldebug ("command 0xf9 with %#x\n", d0); + qemu_log_mask(LOG_UNIMP, "command 0xf9 with %#x\n", d0); switch (d0) { case 0x0e: dsp_out_data (s, 0xff); @@ -820,12 +822,13 @@ static void complete (SB16State *s) break; =20 default: - dolog ("complete: unrecognized command %#x\n", s->cmd); + qemu_log_mask(LOG_UNIMP, "complete: unrecognized command %#x\n= ", + s->cmd); return; } } =20 - ldebug ("\n"); + qemu_log_mask(LOG_UNIMP, "\n"); s->cmd =3D -1; } =20 @@ -889,7 +892,7 @@ static void dsp_write(void *opaque, uint32_t nport, uin= t32_t val) =20 iport =3D nport - s->port; =20 - ldebug ("write %#x <- %#x\n", nport, val); + qemu_log_mask(LOG_UNIMP, "write %#x <- %#x\n", nport, val); switch (iport) { case 0x06: switch (val) { @@ -939,7 +942,7 @@ static void dsp_write(void *opaque, uint32_t nport, uin= t32_t val) } else { if (s->in_index =3D=3D sizeof (s->in2_data)) { - dolog ("in data overrun\n"); + qemu_log_mask(LOG_UNIMP, "in data overrun\n"); } else { s->in2_data[s->in_index++] =3D val; @@ -955,7 +958,7 @@ static void dsp_write(void *opaque, uint32_t nport, uin= t32_t val) break; =20 default: - ldebug ("(nport=3D%#x, val=3D%#x)\n", nport, val); + qemu_log_mask(LOG_UNIMP, "(nport=3D%#x, val=3D%#x)\n", nport, val); break; } } @@ -979,8 +982,8 @@ static uint32_t dsp_read(void *opaque, uint32_t nport) } else { if (s->cmd !=3D -1) { - dolog ("empty output buffer for command %#x\n", - s->cmd); + qemu_log_mask(LOG_UNIMP, "empty output buffer for command" + " %#x\n", s->cmd); } retval =3D s->last_read_byte; /* goto error; */ @@ -992,7 +995,7 @@ static uint32_t dsp_read(void *opaque, uint32_t nport) break; =20 case 0x0d: /* timer interrupt clear */ - /* dolog ("timer interrupt clear\n"); */ + /* qemu_log_mask(LOG_UNIMP, "timer interrupt clear\n"); */ retval =3D 0; break; =20 @@ -1019,13 +1022,13 @@ static uint32_t dsp_read(void *opaque, uint32_t npo= rt) } =20 if (!ack) { - ldebug ("read %#x -> %#x\n", nport, retval); + qemu_log_mask(LOG_UNIMP, "read %#x -> %#x\n", nport, retval); } =20 return retval; =20 error: - dolog ("warning: dsp_read %#x error\n", nport); + qemu_log_mask(LOG_UNIMP, "warning: dsp_read %#x error\n", nport); return 0xff; } =20 @@ -1071,7 +1074,7 @@ static void mixer_write_datab(void *opaque, uint32_t = nport, uint32_t val) SB16State *s =3D opaque; =20 (void) nport; - ldebug ("mixer_write [%#x] <- %#x\n", s->mixer_nreg, val); + qemu_log_mask(LOG_UNIMP, "mixer_write [%#x] <- %#x\n", s->mixer_nreg, = val); =20 switch (s->mixer_nreg) { case 0x00: @@ -1081,7 +1084,7 @@ static void mixer_write_datab(void *opaque, uint32_t = nport, uint32_t val) case 0x80: { int irq =3D irq_of_magic (val); - ldebug ("setting irq to %d (val=3D%#x)\n", irq, val); + qemu_log_mask(LOG_UNIMP, "setting irq to %d (val=3D%#x)\n", ir= q, val); if (irq > 0) { s->irq =3D irq; } @@ -1095,10 +1098,9 @@ static void mixer_write_datab(void *opaque, uint32_t= nport, uint32_t val) dma =3D ctz32 (val & 0xf); hdma =3D ctz32 (val & 0xf0); if (dma !=3D s->dma || hdma !=3D s->hdma) { - dolog ( - "attempt to change DMA " - "8bit %d(%d), 16bit %d(%d) (val=3D%#x)\n", - dma, s->dma, hdma, s->hdma, val); + qemu_log_mask(LOG_UNIMP, "attempt to change DMA 8bit %d(%d= )," + " 16bit %d(%d) (val=3D%#x)\n", dma, s->dma, = hdma, + s->hdma, val); } #if 0 s->dma =3D dma; @@ -1108,13 +1110,14 @@ static void mixer_write_datab(void *opaque, uint32_= t nport, uint32_t val) break; =20 case 0x82: - dolog ("attempt to write into IRQ status register (val=3D%#x)\n", - val); + qemu_log_mask(LOG_UNIMP, "attempt to write into IRQ status registe= r" + " (val=3D%#x)\n", val); return; =20 default: if (s->mixer_nreg >=3D 0x80) { - ldebug ("attempt to write mixer[%#x] <- %#x\n", s->mixer_nreg,= val); + qemu_log_mask(LOG_UNIMP, "attempt to write mixer[%#x] <- %#x\n= ", + s->mixer_nreg, val); } break; } @@ -1129,12 +1132,12 @@ static uint32_t mixer_read(void *opaque, uint32_t n= port) (void) nport; #ifndef DEBUG_SB16_MOST if (s->mixer_nreg !=3D 0x82) { - ldebug ("mixer_read[%#x] -> %#x\n", - s->mixer_nreg, s->mixer_regs[s->mixer_nreg]); + qemu_log_mask(LOG_UNIMP, "mixer_read[%#x] -> %#x\n", s->mixer_nreg, + s->mixer_regs[s->mixer_nreg]); } #else - ldebug ("mixer_read[%#x] -> %#x\n", - s->mixer_nreg, s->mixer_regs[s->mixer_nreg]); + qemu_log_mask(LOG_UNIMP, "mixer_read[%#x] -> %#x\n", + s->mixer_nreg, s->mixer_regs[s->mixer_nreg]); #endif return s->mixer_regs[s->mixer_nreg]; } @@ -1181,8 +1184,8 @@ static int SB_read_DMA (void *opaque, int nchan, int = dma_pos, int dma_len) int till, copy, written, free; =20 if (s->block_size <=3D 0) { - dolog ("invalid block size=3D%d nchan=3D%d dma_pos=3D%d dma_len=3D= %d\n", - s->block_size, nchan, dma_pos, dma_len); + qemu_log_mask(LOG_UNIMP, "invalid block size=3D%d nchan=3D%d dma_p= os=3D%d" + " dma_len=3D%d\n", s->block_size, nchan, dma_pos, dm= a_len); return dma_pos; } =20 @@ -1204,8 +1207,8 @@ static int SB_read_DMA (void *opaque, int nchan, int = dma_pos, int dma_len) till =3D s->left_till_irq; =20 #ifdef DEBUG_SB16_MOST - dolog ("pos:%06d %d till:%d len:%d\n", - dma_pos, free, till, dma_len); + qemu_log_mask(LOG_UNIMP, "pos:%06d %d till:%d len:%d\n", dma_pos, free, + till, dma_len); #endif =20 if (till <=3D copy) { @@ -1228,9 +1231,9 @@ static int SB_read_DMA (void *opaque, int nchan, int = dma_pos, int dma_len) } =20 #ifdef DEBUG_SB16_MOST - ldebug ("pos %5d free %5d size %5d till % 5d copy %5d written %5d size= %5d\n", - dma_pos, free, dma_len, s->left_till_irq, copy, written, - s->block_size); + qemu_log_mask(LOG_UNIMP, "pos %5d free %5d size %5d till % 5d copy %5d" + " written %5d size %5d\n", dma_pos, free, dma_len, + s->left_till_irq, copy, written, s->block_size); #endif =20 while (s->left_till_irq <=3D 0) { @@ -1376,7 +1379,7 @@ static void sb16_realizefn (DeviceState *dev, Error *= *errp) reset_mixer (s); s->aux_ts =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, aux_timer, s); if (!s->aux_ts) { - dolog ("warning: Could not create auxiliary timer\n"); + qemu_log_mask(LOG_UNIMP, "warning: Could not create auxiliary time= r\n"); } =20 isa_register_portio_list(isadev, &s->portio_list, s->port, --=20 2.14.3 (Apple Git-98)