Changeset 639 for trunk/libffado/src/fireworks

Timestamp:

09/09/07 12:04:35 (16 years ago)

Author:

ppalmers

Message:

- Introduce a generic infrastructure for FFADODevices to present the clock sources they support and their state
- Implement this infrastructure for BeBoB devices
- Implement this infrastructure for ECHO Fireworks devices

Files:

• trunk/libffado/src/fireworks/audiofire/audiofire_device.h (modified) (1 diff)
• trunk/libffado/src/fireworks/efc/efc_cmd.h (modified) (2 diffs)
• trunk/libffado/src/fireworks/efc/efc_cmds_hardware.cpp (modified) (3 diffs)
• trunk/libffado/src/fireworks/efc/efc_cmds_hardware.h (modified) (1 diff)
• trunk/libffado/src/fireworks/efc/efc_cmds_hardware_ctrl.cpp (added)
• trunk/libffado/src/fireworks/efc/efc_cmds_hardware_ctrl.h (added)
• trunk/libffado/src/fireworks/fireworks_device.cpp (modified) (5 diffs)
• trunk/libffado/src/fireworks/fireworks_device.h (modified) (2 diffs)

trunk/libffado/src/fireworks/audiofire/audiofire_device.h

@@ -33 +33 @@
-
-class AudioFire : public FireWorks::Device {
+
-public:
-    AudioFire( Ieee1394Service& ieee1394Service,

trunk/libffado/src/fireworks/efc/efc_cmd.h

@@ -45 +45 @@
-#define EFC_CAT_COUNT                   10
-
+// Commands for the EFC_CAT_HARDWARE_INFO category
+#define EFC_CMD_HW_HWINFO_GET_CAPS      0
+#define EFC_CMD_HW_GET_POLLED           1
+#define EFC_CMD_HW_SET_EFR_ADDRESS      2
+#define EFC_CMD_HW_READ_SESSION_BLOCK   3
+#define EFC_CMD_HW_GET_DEBUG_INFO       4
+#define EFC_CMD_HW_SET_DEBUG_TRACKING   5
+#define EFC_CMD_HW_COUNT                6
+
+// Commands for the EFC_CAT_HARDWARE_CONTROL category
+#define EFC_CMD_HWCTRL_SET_CLOCK        0
+#define EFC_CMD_HWCTRL_GET_CLOCK        1
+#define EFC_CMD_HWCTRL_BSX_HANDSHAKE    2
+#define EFC_CMD_HWCTRL_CHANGE_FLAGS     3
+#define EFC_CMD_HWCTRL_GET_FLAGS        4
+#define EFC_CMD_HWCTRL_IDENTIFY         5
+#define EFC_CMD_HWCTRL_RECONNECT_PHY    6
+
-// size of the header
-#define EFC_HEADER_LENGTH_QUADLETS      ((sizeof(uint32_t) + sizeof(struct EfcCmd::efc_header))/4)
@@ -53 +71 @@
-      *(__value__)=ntohl(*(__value__)); } \
-
+
+// specifiers for the flags field
+#define EFC_CMD_HW_DYNADDR_SUPPORTED                1
+#define EFC_CMD_HW_MIRRORING_SUPPORTED              2
+#define EFC_CMD_HW_SPDIF_COAX_SUPPORTED             3
+#define EFC_CMD_HW_SPDIF_AESEBUXLR_SUPPORTED        4
+#define EFC_CMD_HW_HAS_DSP                          5
+#define EFC_CMD_HW_HAS_FPGA                         6
+#define EFC_CMD_HW_HAS_PHANTOM                      7
+
+#define EFC_CMD_HW_CHECK_FLAG(__val__,__flag__) \
+    (((__val__) & (1<<(__flag__))) != 0)
+#define EFC_CMD_HW_TO_FLAG(__val__) \
+    (1<<(__val__))
+
+// Clock sources
+#define EFC_CMD_HW_CLOCK_INTERNAL                   0
+#define EFC_CMD_HW_CLOCK_SYTMATCH                   1
+#define EFC_CMD_HW_CLOCK_WORDCLOCK                  2
+#define EFC_CMD_HW_CLOCK_SPDIF                      3
+#define EFC_CMD_HW_CLOCK_ADAT_1                     4
+#define EFC_CMD_HW_CLOCK_ADAT_2                     5
+#define EFC_CMD_HW_CLOCK_COUNT                      6
+
+#define EFC_CMD_HW_CLOCK_UNSPECIFIED       0xFFFFFFFF
+
+// MIDI flags
+#define EFC_CMD_HW_MIDI_IN_1                        8
+#define EFC_CMD_HW_MIDI_OUT_1                       9
+#define EFC_CMD_HW_MIDI_IN_2                       10
+#define EFC_CMD_HW_MIDI_OUT_2                      11
+
+// Channel types
+#define EFC_CMD_HW_CHANNEL_TYPE_ANALOG              0
+#define EFC_CMD_HW_CHANNEL_TYPE_SPDIF               1
+#define EFC_CMD_HW_CHANNEL_TYPE_ADAT                2
+#define EFC_CMD_HW_CHANNEL_TYPE_SPDIF_OR_ADAT       3
+#define EFC_CMD_HW_CHANNEL_TYPE_ANALOG_MIRRORING    4
+#define EFC_CMD_HW_CHANNEL_TYPE_HEADPHONES          5
+#define EFC_CMD_HW_CHANNEL_TYPE_I2S                 6
-
-namespace FireWorks {

trunk/libffado/src/fireworks/efc/efc_cmds_hardware.cpp

@@ -33 +33 @@
-EfcHardwareInfoCmd::EfcHardwareInfoCmd()
-: EfcCmd(EFC_CAT_HARDWARE_INFO, EFC_CMD_HW_HWINFO_GET_CAPS)
+, m_nb_out_groups( 0 )
+, m_nb_in_groups( 0 )
-{}
-
@@ -169 +171 @@
-EfcPolledValuesCmd::EfcPolledValuesCmd()
-: EfcCmd(EFC_CAT_HARDWARE_INFO, EFC_CMD_HW_GET_POLLED)
+, m_nb_output_meters ( 0 )
+, m_nb_input_meters ( 0 )
-{}
-
@@ -195 +199 @@
-    
-    EFC_DESERIALIZE_AND_SWAP(de, &m_detect_spdif, result);
-spdif, result);    
+adat, result);
-    EFC_DESERIALIZE_AND_SWAP(de, &m_reserved3, result);
-    EFC_DESERIALIZE_AND_SWAP(de, &m_reserved4, result);
-
-    EFC_DESERIALIZE_AND_SWAP(de, &m_nb_output_meters, result);
-    
+
-    EFC_DESERIALIZE_AND_SWAP(de, &m_reserved5, result);
-    EFC_DESERIALIZE_AND_SWAP(de, &m_reserved6, result);

trunk/libffado/src/fireworks/efc/efc_cmds_hardware.h

@@ -32 +32 @@
-#define HWINFO_MAX_CAPS_GROUPS      8
-#define POLLED_MAX_NB_METERS        100
-
-// Commands for the EFC_CAT_HARDWARE_INFO category
-#define EFC_CMD_HW_HWINFO_GET_CAPS      0
-#define EFC_CMD_HW_GET_POLLED           1
-#define EFC_CMD_HW_SET_EFR_ADDRESS      2
-#define EFC_CMD_HW_READ_SESSION_BLOCK   3
-#define EFC_CMD_HW_GET_DEBUG_INFO       4
-#define EFC_CMD_HW_SET_DEBUG_TRACKING   5
-#define EFC_CMD_HW_COUNT                6
-
-
-
-class EfcHardwareInfoCmd : public EfcCmd

trunk/libffado/src/fireworks/fireworks_device.cpp

@@ -26 +26 @@
-#include "efc/efc_cmd.h"
-#include "efc/efc_cmds_hardware.h"
+#include "efc/efc_cmds_hardware_ctrl.h"
-
-#include "audiofire/audiofire_device.h"
@@ -40 +41 @@
-                            std::auto_ptr<ConfigRom>( configRom ))
-    : GenericAVC::AvDevice( ieee1394Service, configRom)
+    , m_efc_discovery_done ( false )
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created FireWorks::Device (NodeID %d)\n",
-                 getConfigRom().getNodeId() );
+    pthread_mutex_init( &m_polled_mutex, 0 );
-}
-
@@ -53 +56 @@
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "This is a FireWorks::Device\n");
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    EfcOverAVCCmd cmd( get1394Service() );
-    cmd.setCommandType( AVC::AVCCommand::eCT_Control );
@@ -60 +150 @@
-    cmd.setSubunitType( AVC::eST_Unit  );
-    cmd.setSubunitId( 0xff );
-
+
-    cmd.setVerbose( getDebugLevel() );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        debugError( "EfcOverAVCCmd command failed\n" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        return false;
-    }
@@ -138 +175 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-} // FireWorks

trunk/libffado/src/fireworks/fireworks_device.h

@@ -30 +30 @@
-#include "genericavc/avc_avdevice.h"
-
+#include "efc/efc_cmd.h"
+#include "efc/efc_cmds_hardware.h"
+
+#include <pthread.h>
+
-class ConfigRom;
-class Ieee1394Service;
@@ -47 +52 @@
-
-    virtual void showDevice();
+    
+    virtual ClockSourceVector getSupportedClockSources();
+    virtual bool setActiveClockSource(ClockSource);
+    virtual ClockSource getActiveClockSource();
+
+// Echo specific stuff
+private:
+    bool doEfcOverAVC(EfcCmd& c);
+    
+    bool discoverUsingEFC();
+
+    FFADODevice::ClockSource clockIdToClockSource(uint32_t clockflag);
+    bool isClockValid(uint32_t id);
+    uint32_t getClock();
+    bool setClock(uint32_t);
+
+    uint32_t            m_efc_version;
+
+    EfcHardwareInfoCmd  m_HwInfo;
+
+    bool updatePolledValues();
+    pthread_mutex_t     m_polled_mutex;
+    EfcPolledValuesCmd  m_Polled;
+
+    bool                m_efc_discovery_done;
-
-};