Changeset 745

Timestamp:

11/29/07 12:24:38 (16 years ago)

Author:

ppalmers

Message:

implement clock source selection for DICE EVM

Files:

• trunk/libffado/src/devicemanager.cpp (modified) (1 diff)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (7 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (1 diff)
• trunk/libffado/src/dice/dice_defines.h (modified) (4 diffs)
• trunk/libffado/src/ffadodevice.cpp (modified) (1 diff)
• trunk/libffado/src/ffadodevice.h (modified) (2 diffs)
• trunk/libffado/src/fireworks/fireworks_device.cpp (modified) (3 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (1 diff)

trunk/libffado/src/devicemanager.cpp

@@ -162 +162 @@
-        {
-            FFADODevice::ClockSource c=*it;
-d, Valid: %d, Active: %
-
+2d, Valid: %1d, Active: %1d, Locked %1d, Slipping: %1
+locked, c.slipping, c.
-        }
-    }

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -282 +282 @@
-DiceAvDevice::getSupportedClockSources() {
-    FFADODevice::ClockSourceVector r;
+
+    quadlet_t clock_caps;
+    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &clock_caps);
+    uint16_t clocks_supported = (clock_caps >> 16) & 0xFFFF;
+    debugOutput(DEBUG_LEVEL_VERBOSE," Clock caps: 0x%08X, supported=0x%04X\n",
+                                    clock_caps, clocks_supported);
+
+    quadlet_t clock_select;
+    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clock_select);
+    byte_t clock_selected = (clock_select) & 0xFF;
+    debugOutput(DEBUG_LEVEL_VERBOSE," Clock select: 0x%08X, selected=0x%04X\n",
+                                    clock_select, clock_selected);
+    quadlet_t extended_status;
+    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &extended_status);
+    uint16_t clock_status = (extended_status) & 0xFFFF;
+    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF;
+    debugOutput(DEBUG_LEVEL_VERBOSE," Clock status: 0x%08X, status=0x%04X, slip=0x%04X\n",
+                                    extended_status, clock_status, clock_slipping);
+
+    diceNameVector names = getClockSourceNameString();
+    if( names.size() < DICE_CLOCKSOURCE_COUNT) {
+        debugError("Not enough clock source names on device\n");
+        return r;
+    }
+    for (unsigned int i=0; i < DICE_CLOCKSOURCE_COUNT; i++) {
+        bool supported = (((clocks_supported >> i) & 0x01) == 1);
+        if (supported) {
+            ClockSource s;
+            s.type = clockIdToType(i);
+            s.id = i;
+            s.valid = true;
+            s.locked = isClockSourceIdLocked(i, extended_status);
+            s.slipping = isClockSourceIdSlipping(i, extended_status);
+            s.active = (clock_selected == i);
+            s.description = names.at(i);
+            r.push_back(s);
+        } else {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "Clock source id %d not supported by device\n", i);
+        }
+    }
-    return r;
-}
-
-bool
+DiceAvDevice::isClockSourceIdLocked(unsigned int id, quadlet_t ext_status_reg) {
+    switch (id) {
+        default: return true;
+        case  DICE_CLOCKSOURCE_AES1:
+                return ext_status_reg & DICE_EXT_STATUS_AES0_LOCKED;
+        case  DICE_CLOCKSOURCE_AES2:
+                return ext_status_reg & DICE_EXT_STATUS_AES1_LOCKED;
+        case  DICE_CLOCKSOURCE_AES3:
+                return ext_status_reg & DICE_EXT_STATUS_AES2_LOCKED;
+        case  DICE_CLOCKSOURCE_AES4:
+                return ext_status_reg & DICE_EXT_STATUS_AES3_LOCKED;
+        case  DICE_CLOCKSOURCE_AES_ANY:
+                return ext_status_reg & DICE_EXT_STATUS_AES_ANY_LOCKED;
+        case  DICE_CLOCKSOURCE_ADAT:
+                return ext_status_reg & DICE_EXT_STATUS_ADAT_LOCKED;
+        case  DICE_CLOCKSOURCE_TDIF:
+                return ext_status_reg & DICE_EXT_STATUS_TDIF_LOCKED;
+        case  DICE_CLOCKSOURCE_ARX1:
+                return ext_status_reg & DICE_EXT_STATUS_ARX1_LOCKED;
+        case  DICE_CLOCKSOURCE_ARX2:
+                return ext_status_reg & DICE_EXT_STATUS_ARX2_LOCKED;
+        case  DICE_CLOCKSOURCE_ARX3:
+                return ext_status_reg & DICE_EXT_STATUS_ARX3_LOCKED;
+        case  DICE_CLOCKSOURCE_ARX4:
+                return ext_status_reg & DICE_EXT_STATUS_ARX4_LOCKED;
+        case  DICE_CLOCKSOURCE_WC:
+                return ext_status_reg & DICE_EXT_STATUS_WC_LOCKED;
+    }
+}
+bool
+DiceAvDevice::isClockSourceIdSlipping(unsigned int id, quadlet_t ext_status_reg) {
+    switch (id) {
+        default: return false;
+        case  DICE_CLOCKSOURCE_AES1:
+                return ext_status_reg & DICE_EXT_STATUS_AES0_SLIP;
+        case  DICE_CLOCKSOURCE_AES2:
+                return ext_status_reg & DICE_EXT_STATUS_AES1_SLIP;
+        case  DICE_CLOCKSOURCE_AES3:
+                return ext_status_reg & DICE_EXT_STATUS_AES2_SLIP;
+        case  DICE_CLOCKSOURCE_AES4:
+                return ext_status_reg & DICE_EXT_STATUS_AES3_SLIP;
+        case  DICE_CLOCKSOURCE_AES_ANY:
+                return false;
+        case  DICE_CLOCKSOURCE_ADAT:
+                return ext_status_reg & DICE_EXT_STATUS_ADAT_SLIP;
+        case  DICE_CLOCKSOURCE_TDIF:
+                return ext_status_reg & DICE_EXT_STATUS_TDIF_SLIP;
+        case  DICE_CLOCKSOURCE_ARX1:
+                return ext_status_reg & DICE_EXT_STATUS_ARX1_SLIP;
+        case  DICE_CLOCKSOURCE_ARX2:
+                return ext_status_reg & DICE_EXT_STATUS_ARX2_SLIP;
+        case  DICE_CLOCKSOURCE_ARX3:
+                return ext_status_reg & DICE_EXT_STATUS_ARX3_SLIP;
+        case  DICE_CLOCKSOURCE_ARX4:
+                return ext_status_reg & DICE_EXT_STATUS_ARX4_SLIP;
+        case  DICE_CLOCKSOURCE_WC: // FIXME: not in driver spec, so non-existant
+                return ext_status_reg & DICE_EXT_STATUS_WC_SLIP;
+    }
+}
+
+enum FFADODevice::eClockSourceType
+DiceAvDevice::clockIdToType(unsigned int id) {
+    switch (id) {
+        default: return eCT_Invalid;
+        case  DICE_CLOCKSOURCE_AES1:
+        case  DICE_CLOCKSOURCE_AES2:
+        case  DICE_CLOCKSOURCE_AES3:
+        case  DICE_CLOCKSOURCE_AES4:
+        case  DICE_CLOCKSOURCE_AES_ANY:
+                return eCT_AES;
+        case  DICE_CLOCKSOURCE_ADAT:
+                return eCT_ADAT;
+        case  DICE_CLOCKSOURCE_TDIF:
+                return eCT_TDIF;
+        case  DICE_CLOCKSOURCE_ARX1:
+        case  DICE_CLOCKSOURCE_ARX2:
+        case  DICE_CLOCKSOURCE_ARX3:
+        case  DICE_CLOCKSOURCE_ARX4:
+                return eCT_SytMatch;
+        case  DICE_CLOCKSOURCE_WC:
+                return eCT_WordClock;
+        case DICE_CLOCKSOURCE_INTERNAL:
+                return eCT_Internal;
+    }
+}
+
+bool
-DiceAvDevice::setActiveClockSource(ClockSource s) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -293 +445 @@
-DiceAvDevice::getActiveClockSource() {
-    ClockSource s;
+    quadlet_t clock_caps;
+    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &clock_caps);
+    uint16_t clocks_supported = (clock_caps >> 16) & 0xFFFF;
+    debugOutput(DEBUG_LEVEL_VERBOSE," Clock caps: 0x%08X, supported=0x%04X\n",
+                                    clock_caps, clocks_supported);
+
+    quadlet_t clock_select;
+    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clock_select);
+    byte_t id = (clock_select) & 0xFF;
+    debugOutput(DEBUG_LEVEL_VERBOSE," Clock select: 0x%08X, selected=0x%04X\n",
+                                    clock_select, id);
+    quadlet_t extended_status;
+    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &extended_status);
+    uint16_t clock_status = (extended_status) & 0xFFFF;
+    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF;
+    debugOutput(DEBUG_LEVEL_VERBOSE," Clock status: 0x%08X, status=0x%04X, slip=0x%04X\n",
+                                    extended_status, clock_status, clock_slipping);
+
+    diceNameVector names = getClockSourceNameString();
+    if( names.size() < DICE_CLOCKSOURCE_COUNT) {
+        debugError("Not enough clock source names on device\n");
+        return s;
+    }
+    bool supported = (((clocks_supported >> id) & 0x01) == 1);
+    if (supported) {
+        s.type = clockIdToType(id);
+        s.id = id;
+        s.valid = true;
+        s.locked = isClockSourceIdLocked(id, extended_status);
+        s.slipping = isClockSourceIdSlipping(id, extended_status);
+        s.active = true;
+        s.description = names.at(id);
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Clock source id %2d not supported by device\n", id);
+    }
-    return s;
-}
@@ -302 +489 @@
-    fb_octlet_t tmp_octlet;
-
-
-
-
+
+
-
-    debugOutput(DEBUG_LEVEL_VERBOSE," DICE Parameter Space info:\n");
@@ -324 +510 @@
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
-VERBOSE
+NORMAL
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &tmp_quadlet);
-VERBOSE
+NORMAL
-        (tmp_quadlet>>8) & 0xFF, tmp_quadlet & 0xFF);
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_ENABLE, &tmp_quadlet);
-VERBOSE
+NORMAL
-        (tmp_quadlet&0x1?"true":"false"));
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_STATUS, &tmp_quadlet);
-VERBOSE
+NORMAL
-        (tmp_quadlet&0x1?"locked":"not locked"), (tmp_quadlet>>8) & 0xFF);
-
@@ -342 +528 @@
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_SAMPLE_RATE, &tmp_quadlet);
-VERBOSE
+NORMAL
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_VERSION, &tmp_quadlet);
-VERBOSE
+NORMAL
-        tmp_quadlet,
-        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_A(tmp_quadlet),
@@ -354 +540 @@
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &tmp_quadlet);
- & 0x1FFF007F
+
-
-    diceNameVector names=getClockSourceNameString();
@@ -425 +611 @@
-        }
-    }
+    flushDebugOutput();
-}
-

trunk/libffado/src/dice/dice_avdevice.h

@@ -132 +132 @@
-    diceNameVector getClockSourceNameString();
-    std::string getDeviceNickName();
+
+    enum eClockSourceType  clockIdToType(unsigned int id);
+    bool isClockSourceIdLocked(unsigned int id, quadlet_t ext_status_reg);
+    bool isClockSourceIdSlipping(unsigned int id, quadlet_t ext_status_reg);
-
-private: // register I/O routines

trunk/libffado/src/dice/dice_defines.h

@@ -185 +185 @@
-#define DICE_CLOCKSOURCE_ARX4           0x0B
-#define DICE_CLOCKSOURCE_INTERNAL       0x0C
+#define DICE_CLOCKSOURCE_COUNT (DICE_CLOCKSOURCE_INTERNAL+1)
-
-#define DICE_CLOCKSOURCE_MASK           0x0000FFFFLU
@@ -223 +224 @@
-#define DICE_EXT_STATUS_AES2_LOCKED         (1UL << 2)
-#define DICE_EXT_STATUS_AES3_LOCKED         (1UL << 3)
+#define DICE_EXT_STATUS_AES_ANY_LOCKED      (    0x0F)
-#define DICE_EXT_STATUS_ADAT_LOCKED         (1UL << 4)
-#define DICE_EXT_STATUS_TDIF_LOCKED         (1UL << 5)
@@ -231 +233 @@
-
-// FIXME: this one is missing in dicedriverExtStatus.h
-ORDCLOCK_LOCKED
+C_LOCKED      
-
-#define DICE_EXT_STATUS_AES0_SLIP           (1UL << 16)
@@ -243 +245 @@
-#define DICE_EXT_STATUS_ARX3_SLIP           (1UL << 24)
-#define DICE_EXT_STATUS_ARX4_SLIP           (1UL << 25)
+
+// FIXME: does this even exist?
+#define DICE_EXT_STATUS_WC_SLIP             (1UL << 26)
-
-//   SAMPLE_RATE register

trunk/libffado/src/ffadodevice.cpp

@@ -151 +151 @@
-                                    s.getPort(), s.getPortName().c_str());
-    debugOutput(DEBUG_LEVEL_NORMAL, "Node...................: %d\n", getNodeId());
+    debugOutput(DEBUG_LEVEL_NORMAL, "Vendor name............: %s\n",
+                                    getConfigRom().getVendorName().c_str());
+    debugOutput(DEBUG_LEVEL_NORMAL, "Model name.............: %s\n",
+                                    getConfigRom().getModelName().c_str());
-    debugOutput(DEBUG_LEVEL_NORMAL, "GUID...................: %s\n",
-                                    getConfigRom().getGuidString().c_str());

trunk/libffado/src/ffadodevice.h

@@ -178 +178 @@
-            , valid( false )
-            , active( false )
+            , locked( true )
+            , slipping( false )
-            , description( "" )
-        {}
@@ -184 +186 @@
-        /// indicated the id of the clock source (e.g. id=1 => clocksource is ADAT_1)
-        unsigned int id;
-
+(i.e. can be selected) 
-        bool valid;
-        /// is the clock source active at this moment?
-        bool active;
+        /// is the clock source locked?
+        bool locked;
+        /// is the clock source slipping?
+        bool slipping;
-        /// description of the clock struct (optional)
-        std::string description;

trunk/libffado/src/fireworks/fireworks_device.cpp

@@ -68 +68 @@
-    }
-    m_HwInfo.showEfcCmd();
-    
-    GenericAVC::AvDevice::showDevice();
-}
@@ -83 +82 @@
-        return vendorModel.isPresent( vendorId, modelId );
-    }
-
-    return false;
-}
@@ -353 +351 @@
-        if (s.type != eCT_Invalid) r.push_back(s);
-    }
-
-    return r;
-}

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -385 +385 @@
-    FFADODevice::showDevice();
-
-    debugOutput(DEBUG_LEVEL_NORMAL,
-        "%s %s\n", m_model.vendor_name.c_str(), m_model.model_name.c_str());
-
-    AVC::Unit::show();
-    flushDebugOutput();