Changeset 1320
- Timestamp:
- 09/19/08 09:53:09 (16 years ago)
- Files:
-
- branches/libffado-2.0/src/motu/motu_avdevice.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libffado-2.0/src/motu/motu_avdevice.cpp
r1315 r1320 1076 1076 debugOutput(DEBUG_LEVEL_NORMAL, "Preparing MotuDevice...\n" ); 1077 1077 1078 // Explicitly set the optical mode, primarily to ensure that the 1079 // MOTU_REG_OPTICAL_CTRL register is initialised. We need to do this to 1080 // because some interfaces (the Ultralite for example) appear to power 1081 // up without this set to anything sensible. In this case, writes to 1082 // MOTU_REG_ISOCTRL fail more often than not, which is bad. 1083 setOpticalMode(MOTU_DIR_IN, optical_in_mode); 1084 setOpticalMode(MOTU_DIR_OUT, optical_out_mode); 1085 1078 1086 // Allocate bandwidth if not previously done. 1079 1087 // FIXME: The bandwidth allocation calculation can probably be … … 1143 1151 std::string id=std::string("dev?"); 1144 1152 if(!getOption("id", id)) { 1145 debugWarning("Could not retrieve id parameter, defaul ing to 'dev?'\n");1153 debugWarning("Could not retrieve id parameter, defaulting to 'dev?'\n"); 1146 1154 } 1147 1155 … … 1378 1386 opt_ctrl |= 0x00000040; 1379 1387 1380 if ( mode& MOTU_DIR_IN) {1388 if (dir & MOTU_DIR_IN) { 1381 1389 reg &= ~MOTU_OPTICAL_IN_MODE_MASK; 1382 1390 reg |= (mode << 8) & MOTU_OPTICAL_IN_MODE_MASK; … … 1386 1394 opt_ctrl &= ~0x00000080; 1387 1395 } 1388 if ( mode& MOTU_DIR_OUT) {1396 if (dir & MOTU_DIR_OUT) { 1389 1397 reg &= ~MOTU_OPTICAL_OUT_MODE_MASK; 1390 1398 reg |= (mode <<10) & MOTU_OPTICAL_OUT_MODE_MASK;