Changeset 1804

Timestamp:

02/17/10 14:25:46 (5 months ago)

Author:

arnonym

Message:

Less code.

Files:

• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (4 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (1 diff)

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -577 +577 @@
-Device::setNickname( std::string name)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -583 +597 @@
-Device::getNickname()
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -613 +641 @@
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
-DeviceNickN
+Nickn
-
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &tmp_quadlet);
@@ -1555 +1583 @@
-}
-
-std::string
-Device::getDeviceNickName() {
-    char namestring[DICE_NICK_NAME_SIZE+1];
-
-    if (!readGlobalRegBlock(DICE_REGISTER_GLOBAL_NICK_NAME,
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not read nickname string \n");
-        return std::string("(unknown)");
-    }
-
-    // Strings from the device are always little-endian,
-    // so byteswap for big-endian machines
-    #if __BYTE_ORDER == __BIG_ENDIAN
-    byteSwapBlock((quadlet_t *)namestring, DICE_NICK_NAME_SIZE/4);
-    #endif
-    namestring[DICE_NICK_NAME_SIZE]='\0';
-    return std::string(namestring);
-}
-
-bool
-Device::setDeviceNickName(std::string name) {
-    char namestring[DICE_NICK_NAME_SIZE+1];
-    strncpy(namestring, name.c_str(), DICE_NICK_NAME_SIZE);
-
-    // Strings from the device are always little-endian,
-    // so byteswap for big-endian machines
-    #if __BYTE_ORDER == __BIG_ENDIAN
-    byteSwapBlock((quadlet_t *)namestring, DICE_NICK_NAME_SIZE/4);
-    #endif
-
-    if (!writeGlobalRegBlock(DICE_REGISTER_GLOBAL_NICK_NAME,
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not write nickname string \n");
-        return false;
-    }
-    return true;
-}
-
-
-stringlist

trunk/libffado/src/dice/dice_avdevice.h

@@ -153 +153 @@
-    stringlist getRxNameString(unsigned int i);
-    stringlist getClockSourceNameString();
-    std::string getDeviceNickName();
-    bool setDeviceNickName(std::string name);
-
-    enum eClockSourceType  clockIdToType(unsigned int id);