Changeset 1516

Show
Ignore:
Timestamp:
02/15/09 14:47:29 (12 years ago)
Author:
jwoithe
Message:

MOTU: define separate mix control structure for the 896HD by copying the Traveler one. Make SPDIF channels follow the ADAT channels since experimentation shows that the ADAT controls start at 0x0028 on the 896HD. Further tests will be needed to determine whether the current register placement of the AES/EBU and SPDIF controls are correct.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/src/motu/motu_avdevice.cpp

    r1509 r1516  
    409409}; 
    410410 
     411const MatrixMixChannel MixerChannels_896HD[] = { 
     412    {"Analog 1", MOTU_CTRL_STD_CHANNEL, 0x0000, }, 
     413    {"Analog 2", MOTU_CTRL_STD_CHANNEL, 0x0004, }, 
     414    {"Analog 3", MOTU_CTRL_STD_CHANNEL, 0x0008, }, 
     415    {"Analog 4", MOTU_CTRL_STD_CHANNEL, 0x000c, }, 
     416    {"Analog 5", MOTU_CTRL_STD_CHANNEL, 0x0010, }, 
     417    {"Analog 6", MOTU_CTRL_STD_CHANNEL, 0x0014, }, 
     418    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, }, 
     419    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, }, 
     420    {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, 0x0020, }, 
     421    {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, 0x0024, }, 
     422    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0028, }, 
     423    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x002c, }, 
     424    {"ADAT 3", MOTU_CTRL_STD_CHANNEL, 0x0030, }, 
     425    {"ADAT 4", MOTU_CTRL_STD_CHANNEL, 0x0034, }, 
     426    {"ADAT 5", MOTU_CTRL_STD_CHANNEL, 0x0038, }, 
     427    {"ADAT 6", MOTU_CTRL_STD_CHANNEL, 0x003c, }, 
     428    {"ADAT 7", MOTU_CTRL_STD_CHANNEL, 0x0040, }, 
     429    {"ADAT 8", MOTU_CTRL_STD_CHANNEL, 0x0044, }, 
     430    {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, 0x0048, }, 
     431    {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, 0x004c, }, 
     432}; 
     433 
    411434const MixerCtrl MixerCtrls_896HD[] = { 
    412435    {"Mix1/Mix_", "Mix 1 ", "", MOTU_CTRL_STD_MIX, 0x0c20, }, 
     
    462485 
    463486const MotuMixer Mixer_896HD = MOTUMIXER( 
    464     MixerCtrls_896HD, MixerBuses_Traveler, MixerChannels_Traveler); 
     487    MixerCtrls_896HD, MixerBuses_Traveler, MixerChannels_896HD); 
    465488 
    466489/* The order of DevicesProperty entries must match the numeric order of the