Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 149dd52d in mainline


Ignore:
Timestamp:
2014-08-27T15:52:16Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
3fec817
Parents:
a9be4d2
Message:

Fix 64-bit issues.

Location:
uspace/drv/audio/hdaudio
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/audio/hdaudio/codec.c

    ra9be4d2 r149dd52d  
    6767        int rc = hda_cmd(codec->hda, verb, resp);
    6868
    69         if (resp != NULL) {
     69/*      if (resp != NULL) {
    7070                ddf_msg(LVL_NOTE, "verb 0x%" PRIx32 " -> 0x%" PRIx32, verb,
    7171                    *resp);
     
    7373                ddf_msg(LVL_NOTE, "verb 0x%" PRIx32, verb);
    7474        }
    75 
     75*/
    7676        return rc;
    7777}
     
    250250            ampcaps, offset);
    251251
    252         rc = hda_set_amp_gain_mute(codec, aw, 0xb000 + offset/2);
     252        rc = hda_set_amp_gain_mute(codec, aw, 0xb000 + offset);
    253253        if (rc != EOK)
    254254                goto error;
     
    286286
    287287        for (i = 0; i < 15; i++) {
    288                 rc = hda_set_amp_gain_mute(codec, aw, 0x7000 + (i << 8) + offset/2);
     288                rc = hda_set_amp_gain_mute(codec, aw, 0x7000 + (i << 8) + offset);
    289289                if (rc != EOK)
    290290                        goto error;
     
    466466                ddf_msg(LVL_NOTE, "hda_get_fgrp_type -> %d", rc);
    467467                ddf_msg(LVL_NOTE, "unsol: %d, grptype: %d", unsol, grptype);
     468
     469                rc = hda_power_ctl_init(codec, fg);
     470                if (rc != EOK)
     471                        goto error;
    468472
    469473                rc = hda_get_subnc(codec, fg, &saw, &naw);
  • uspace/drv/audio/hdaudio/hdactl.c

    ra9be4d2 r149dd52d  
    311311static void hda_set_corbwp(hda_t *hda, size_t wp)
    312312{
    313         ddf_msg(LVL_DEBUG2, "Set CORBWP = %d", wp);
     313        ddf_msg(LVL_DEBUG2, "Set CORBWP = %zu", wp);
    314314        hda_reg16_write(&hda->regs->corbwp, wp);
    315315}
     
    391391
    392392        wp = hda_get_rirbwp(hda);
    393         ddf_msg(LVL_DEBUG2, "hda_rirb_read: wp=%d", wp);
     393        ddf_msg(LVL_DEBUG2, "hda_rirb_read: wp=%zu", wp);
    394394        if (hda->ctl->rirb_rp == wp)
    395395                return ENOENT;
     
    637637            hda_reg8_read(&ctl->hda->regs->corbctl),
    638638            hda_reg8_read(&ctl->hda->regs->corbsts));
    639         ddf_msg(LVL_NOTE, "rirbwp=0x%x, soft-rirbrp=0x%x",
     639        ddf_msg(LVL_NOTE, "rirbwp=0x%x, soft-rirbrp=0x%zx",
    640640            hda_reg16_read(&ctl->hda->regs->rirbwp),
    641641            ctl->rirb_rp);
    642         ddf_msg(LVL_NOTE, "solrb_wp=0x%x, solrb_rp=0x%x",
     642        ddf_msg(LVL_NOTE, "solrb_wp=0x%zx, solrb_rp=0x%zx",
    643643            ctl->solrb_wp, ctl->solrb_wp);
    644644}
  • uspace/drv/audio/hdaudio/hdaudio.c

    ra9be4d2 r149dd52d  
    215215        hda->regs = (hda_regs_t *)regs;
    216216
    217         ddf_msg(LVL_NOTE, "IRQs: %d", res.irqs.count);
     217        ddf_msg(LVL_NOTE, "IRQs: %zu", res.irqs.count);
    218218        if (res.irqs.count != 1) {
    219                 ddf_msg(LVL_ERROR, "Unexpected IRQ count %d (!= 1)",
     219                ddf_msg(LVL_ERROR, "Unexpected IRQ count %zu (!= 1)",
    220220                    res.irqs.count);
    221221                goto error;
     
    254254        }
    255255
    256         ddf_msg(LVL_NOTE, "range0.base=%x", hdaudio_irq_pio_ranges[0].base);
     256        ddf_msg(LVL_NOTE, "range0.base=%zu", hdaudio_irq_pio_ranges[0].base);
    257257
    258258        rc = irc_enable_interrupt(res.irqs.irqs[0]);
Note: See TracChangeset for help on using the changeset viewer.