Changeset 1412a184 in mainline for uspace/drv/audio/hdaudio/hdactl.c

Timestamp:

2014-08-16T15:34:44Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a333b7f

Parents:

65b09c1

Message:

Stream management. Attempt some playback.

File:

• uspace/drv/audio/hdaudio/hdactl.c (modified) (7 diffs)

uspace/drv/audio/hdaudio/hdactl.c

@@ -102 +102 @@
         uint8_t sizecap;
         uint8_t selsz;
-        bool ok64bit;
         int rc;
 
@@ -131 +130 @@
         hda->ctl->corb_entries = hda_rb_entries(selsz);
 
-        ddf_msg(LVL_NOTE, "Read GCAP");
-        uint16_t gcap = hda_reg16_read(&hda->regs->gcap);
-        ok64bit = (gcap & BIT_V(uint8_t, gcap_64ok)) != 0;
-        ddf_msg(LVL_NOTE, "GCAP: 0x%x (64OK=%d)", gcap, ok64bit);
 
         /*
@@ -142 +137 @@
         hda->ctl->corb_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(hda->ctl->corb_entries * sizeof(uint32_t),
-            ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
+            hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
             &hda->ctl->corb_phys, &hda->ctl->corb_virt);
 
@@ -178 +173 @@
         uint8_t sizecap;
         uint8_t selsz;
-        bool ok64bit;
         int rc;
 
@@ -207 +201 @@
         hda->ctl->rirb_entries = hda_rb_entries(selsz);
 
-        ddf_msg(LVL_NOTE, "Read GCAP");
-        uint16_t gcap = hda_reg16_read(&hda->regs->gcap);
-        ok64bit = (gcap & BIT_V(uint8_t, gcap_64ok)) != 0;
-        ddf_msg(LVL_NOTE, "GCAP: 0x%x (64OK=%d)", gcap, ok64bit);
-
         /*
          * RIRB must be aligned to 128 bytes. If 64OK is not set,
@@ -218 +207 @@
         hda->ctl->rirb_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(hda->ctl->rirb_entries * sizeof(uint64_t),
-            ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
+            hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
             &hda->ctl->rirb_phys, &hda->ctl->rirb_virt);
 
@@ -434 +423 @@
         ddf_msg(LVL_NOTE, "Controller is out of reset.");
 
+        ddf_msg(LVL_NOTE, "Read GCAP");
+        uint16_t gcap = hda_reg16_read(&hda->regs->gcap);
+        ctl->ok64bit = (gcap & BIT_V(uint16_t, gcap_64ok)) != 0;
+        ctl->oss = BIT_RANGE_EXTRACT(uint16_t, gcap_oss_h, gcap_oss_l, gcap);
+        ctl->iss = BIT_RANGE_EXTRACT(uint16_t, gcap_iss_h, gcap_iss_l, gcap);
+        ctl->bss = BIT_RANGE_EXTRACT(uint16_t, gcap_bss_h, gcap_bss_l, gcap);
+        ddf_msg(LVL_NOTE, "GCAP: 0x%x (64OK=%d)", gcap, ctl->ok64bit);
+
         /* Give codecs enough time to enumerate themselves */
         async_usleep(codec_enum_wait_us);