Changeset 1806
- Timestamp:
- 03/17/10 12:34:03 (14 years ago)
- Files:
-
- trunk/libffado/src/dice/dice_avdevice.cpp (modified) (5 diffs)
- trunk/libffado/src/dice/dice_eap.cpp (modified) (5 diffs)
- trunk/libffado/src/dice/dice_eap.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/dice/dice_avdevice.cpp
r1804 r1806 623 623 FFADODevice::showDevice(); 624 624 625 debugOutput(DEBUG_LEVEL_VERBOSE," DICE Parameter Space info:\n");626 debugOutput(DEBUG_LEVEL_VERBOSE," Global : offset=0x%04X size=%04d\n", m_global_reg_offset, m_global_reg_size);627 debugOutput(DEBUG_LEVEL_VERBOSE," TX : offset=0x%04X size=%04d\n", m_tx_reg_offset, m_tx_reg_size);628 debugOutput(DEBUG_LEVEL_VERBOSE," nb=%4d size=%04d\n", m_nb_tx, m_tx_size);629 debugOutput(DEBUG_LEVEL_VERBOSE," RX : offset=0x%04X size=%04d\n", m_rx_reg_offset, m_rx_reg_size);630 debugOutput(DEBUG_LEVEL_VERBOSE," nb=%4d size=%04d\n", m_nb_rx, m_rx_size);631 debugOutput(DEBUG_LEVEL_VERBOSE," UNUSED1 : offset=0x%04X size=%04d\n", m_unused1_reg_offset, m_unused1_reg_size);632 debugOutput(DEBUG_LEVEL_VERBOSE," UNUSED2 : offset=0x%04X size=%04d\n", m_unused2_reg_offset, m_unused2_reg_size);633 634 debugOutput(DEBUG_LEVEL_VERBOSE," Global param space:\n");625 printMessage(" DICE Parameter Space info:\n"); 626 printMessage(" Global : offset=0x%04X size=%04d\n", m_global_reg_offset, m_global_reg_size); 627 printMessage(" TX : offset=0x%04X size=%04d\n", m_tx_reg_offset, m_tx_reg_size); 628 printMessage(" nb=%4d size=%04d\n", m_nb_tx, m_tx_size); 629 printMessage(" RX : offset=0x%04X size=%04d\n", m_rx_reg_offset, m_rx_reg_size); 630 printMessage(" nb=%4d size=%04d\n", m_nb_rx, m_rx_size); 631 printMessage(" UNUSED1 : offset=0x%04X size=%04d\n", m_unused1_reg_offset, m_unused1_reg_size); 632 printMessage(" UNUSED2 : offset=0x%04X size=%04d\n", m_unused2_reg_offset, m_unused2_reg_size); 633 634 printMessage(" Global param space:\n"); 635 635 636 636 readGlobalRegBlock(DICE_REGISTER_GLOBAL_OWNER, reinterpret_cast<fb_quadlet_t *>(&tmp_octlet), sizeof(fb_octlet_t)); 637 debugOutput(DEBUG_LEVEL_VERBOSE," Owner : 0x%016"PRIX64"\n",tmp_octlet);637 printMessage(" Owner : 0x%016"PRIX64"\n",tmp_octlet); 638 638 639 639 readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet); 640 debugOutput(DEBUG_LEVEL_VERBOSE," Notification : 0x%08"PRIX32"\n",tmp_quadlet);640 printMessage(" Notification : 0x%08"PRIX32"\n",tmp_quadlet); 641 641 642 642 readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet); 643 debugOutput(DEBUG_LEVEL_NORMAL," Nick name : %s\n",getNickname().c_str());643 printMessage(" Nick name : %s\n",getNickname().c_str()); 644 644 645 645 readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &tmp_quadlet); 646 debugOutput(DEBUG_LEVEL_NORMAL," Clock Select : 0x%02X 0x%02X\n",646 printMessage(" Clock Select : 0x%02X 0x%02X\n", 647 647 (tmp_quadlet>>8) & 0xFF, tmp_quadlet & 0xFF); 648 648 649 649 readGlobalReg(DICE_REGISTER_GLOBAL_ENABLE, &tmp_quadlet); 650 debugOutput(DEBUG_LEVEL_NORMAL," Enable : %s\n",650 printMessage(" Enable : %s\n", 651 651 (tmp_quadlet&0x1?"true":"false")); 652 652 653 653 readGlobalReg(DICE_REGISTER_GLOBAL_STATUS, &tmp_quadlet); 654 debugOutput(DEBUG_LEVEL_NORMAL," Clock Status : %s 0x%02X\n",654 printMessage(" Clock Status : %s 0x%02X\n", 655 655 (tmp_quadlet&0x1?"locked":"not locked"), (tmp_quadlet>>8) & 0xFF); 656 656 657 657 readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &tmp_quadlet); 658 debugOutput(DEBUG_LEVEL_VERBOSE," Extended Status : 0x%08"PRIX32"\n", tmp_quadlet);658 printMessage(" Extended Status : 0x%08"PRIX32"\n", tmp_quadlet); 659 659 660 660 readGlobalReg(DICE_REGISTER_GLOBAL_SAMPLE_RATE, &tmp_quadlet); 661 debugOutput(DEBUG_LEVEL_NORMAL," Samplerate : 0x%08"PRIX32" (%"PRIu32")\n", tmp_quadlet, tmp_quadlet);661 printMessage(" Samplerate : 0x%08"PRIX32" (%"PRIu32")\n", tmp_quadlet, tmp_quadlet); 662 662 663 663 readGlobalRegBlock(DICE_REGISTER_GLOBAL_VERSION, reinterpret_cast<fb_quadlet_t *>(&tmp_quadlet), sizeof(fb_quadlet_t)); 664 debugOutput(DEBUG_LEVEL_NORMAL," Version : 0x%08"PRIX32"\n", tmp_quadlet);664 printMessage(" Version : 0x%08"PRIX32"\n", tmp_quadlet); 665 665 666 666 readGlobalReg(DICE_REGISTER_GLOBAL_VERSION, &tmp_quadlet); 667 debugOutput(DEBUG_LEVEL_NORMAL," Version : 0x%08"PRIX32" (%u.%u.%u.%u)\n",667 printMessage(" Version : 0x%08"PRIX32" (%u.%u.%u.%u)\n", 668 668 tmp_quadlet, 669 669 DICE_DRIVER_SPEC_VERSION_NUMBER_GET_A(tmp_quadlet), … … 674 674 675 675 readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &tmp_quadlet); 676 debugOutput(DEBUG_LEVEL_VERBOSE," Clock caps : 0x%08"PRIX32"\n", tmp_quadlet);676 printMessage(" Clock caps : 0x%08"PRIX32"\n", tmp_quadlet); 677 677 678 678 stringlist names=getClockSourceNameString(); 679 debugOutput(DEBUG_LEVEL_VERBOSE," Clock sources :\n");679 printMessage(" Clock sources :\n"); 680 680 681 681 for ( stringlist::iterator it = names.begin(); … … 683 683 ++it ) 684 684 { 685 debugOutput(DEBUG_LEVEL_VERBOSE," %s\n", (*it).c_str());686 } 687 688 debugOutput(DEBUG_LEVEL_VERBOSE," TX param space:\n");689 debugOutput(DEBUG_LEVEL_VERBOSE," Nb of xmit : %1d\n", m_nb_tx);685 printMessage(" %s\n", (*it).c_str()); 686 } 687 688 printMessage(" TX param space:\n"); 689 printMessage(" Nb of xmit : %1d\n", m_nb_tx); 690 690 for (unsigned int i=0;i<m_nb_tx;i++) { 691 debugOutput(DEBUG_LEVEL_VERBOSE," Transmitter %d:\n",i);691 printMessage(" Transmitter %d:\n",i); 692 692 693 693 readTxReg(i, DICE_REGISTER_TX_ISOC_BASE, &tmp_quadlet); 694 debugOutput(DEBUG_LEVEL_VERBOSE," ISO channel : %3d\n", tmp_quadlet);694 printMessage(" ISO channel : %3d\n", tmp_quadlet); 695 695 readTxReg(i, DICE_REGISTER_TX_SPEED_BASE, &tmp_quadlet); 696 debugOutput(DEBUG_LEVEL_VERBOSE," ISO speed : %3d\n", tmp_quadlet);696 printMessage(" ISO speed : %3d\n", tmp_quadlet); 697 697 698 698 readTxReg(i, DICE_REGISTER_TX_NB_AUDIO_BASE, &tmp_quadlet); 699 debugOutput(DEBUG_LEVEL_VERBOSE," Nb audio channels : %3d\n", tmp_quadlet);699 printMessage(" Nb audio channels : %3d\n", tmp_quadlet); 700 700 readTxReg(i, DICE_REGISTER_TX_MIDI_BASE, &tmp_quadlet); 701 debugOutput(DEBUG_LEVEL_VERBOSE," Nb midi channels : %3d\n", tmp_quadlet);701 printMessage(" Nb midi channels : %3d\n", tmp_quadlet); 702 702 703 703 readTxReg(i, DICE_REGISTER_TX_AC3_CAPABILITIES_BASE, &tmp_quadlet); 704 debugOutput(DEBUG_LEVEL_VERBOSE," AC3 caps : 0x%08"PRIX32"\n", tmp_quadlet);704 printMessage(" AC3 caps : 0x%08"PRIX32"\n", tmp_quadlet); 705 705 readTxReg(i, DICE_REGISTER_TX_AC3_ENABLE_BASE, &tmp_quadlet); 706 debugOutput(DEBUG_LEVEL_VERBOSE," AC3 enable : 0x%08"PRIX32"\n", tmp_quadlet);706 printMessage(" AC3 enable : 0x%08"PRIX32"\n", tmp_quadlet); 707 707 708 708 stringlist channel_names=getTxNameString(i); 709 debugOutput(DEBUG_LEVEL_VERBOSE," Channel names :\n");709 printMessage(" Channel names :\n"); 710 710 for ( stringlist::iterator it = channel_names.begin(); 711 711 it != channel_names.end(); 712 712 ++it ) 713 713 { 714 debugOutput(DEBUG_LEVEL_VERBOSE," %s\n", (*it).c_str());715 } 716 } 717 718 debugOutput(DEBUG_LEVEL_VERBOSE," RX param space:\n");719 debugOutput(DEBUG_LEVEL_VERBOSE," Nb of recv : %1d\n", m_nb_tx);714 printMessage(" %s\n", (*it).c_str()); 715 } 716 } 717 718 printMessage(" RX param space:\n"); 719 printMessage(" Nb of recv : %1d\n", m_nb_tx); 720 720 for (unsigned int i=0;i<m_nb_rx;i++) { 721 debugOutput(DEBUG_LEVEL_VERBOSE," Receiver %d:\n",i);721 printMessage(" Receiver %d:\n",i); 722 722 723 723 readRxReg(i, DICE_REGISTER_RX_ISOC_BASE, &tmp_quadlet); 724 debugOutput(DEBUG_LEVEL_VERBOSE," ISO channel : %3d\n", tmp_quadlet);724 printMessage(" ISO channel : %3d\n", tmp_quadlet); 725 725 readRxReg(i, DICE_REGISTER_RX_SEQ_START_BASE, &tmp_quadlet); 726 debugOutput(DEBUG_LEVEL_VERBOSE," Sequence start : %3d\n", tmp_quadlet);726 printMessage(" Sequence start : %3d\n", tmp_quadlet); 727 727 728 728 readRxReg(i, DICE_REGISTER_RX_NB_AUDIO_BASE, &tmp_quadlet); 729 debugOutput(DEBUG_LEVEL_VERBOSE," Nb audio channels : %3d\n", tmp_quadlet);729 printMessage(" Nb audio channels : %3d\n", tmp_quadlet); 730 730 readRxReg(i, DICE_REGISTER_RX_MIDI_BASE, &tmp_quadlet); 731 debugOutput(DEBUG_LEVEL_VERBOSE," Nb midi channels : %3d\n", tmp_quadlet);731 printMessage(" Nb midi channels : %3d\n", tmp_quadlet); 732 732 733 733 readRxReg(i, DICE_REGISTER_RX_AC3_CAPABILITIES_BASE, &tmp_quadlet); 734 debugOutput(DEBUG_LEVEL_VERBOSE," AC3 caps : 0x%08"PRIX32"\n", tmp_quadlet);734 printMessage(" AC3 caps : 0x%08"PRIX32"\n", tmp_quadlet); 735 735 readRxReg(i, DICE_REGISTER_RX_AC3_ENABLE_BASE, &tmp_quadlet); 736 debugOutput(DEBUG_LEVEL_VERBOSE," AC3 enable : 0x%08"PRIX32"\n", tmp_quadlet);736 printMessage(" AC3 enable : 0x%08"PRIX32"\n", tmp_quadlet); 737 737 738 738 stringlist channel_names = getRxNameString(i); 739 debugOutput(DEBUG_LEVEL_VERBOSE," Channel names :\n");739 printMessage(" Channel names :\n"); 740 740 for ( stringlist::iterator it = channel_names.begin(); 741 741 it != channel_names.end(); 742 742 ++it ) 743 743 { 744 debugOutput(DEBUG_LEVEL_VERBOSE," %s\n", (*it).c_str());744 printMessage(" %s\n", (*it).c_str()); 745 745 } 746 746 } … … 1671 1671 } 1672 1672 1673 if(!readReg(m_tx_reg_offset + DICE_REGISTER_RX_SZ_RX, &m_rx_size)) { 1674 debugError("Could not initialize m_rx_size\n"); 1675 return false; 1676 } 1677 m_rx_size*=4; 1678 1673 1679 // FIXME: verify this and clean it up. 1674 1680 /* special case for Alesis io14, which announces two receive transmitters, … … 1676 1682 */ 1677 1683 if (FW_VENDORID_ALESIS == getConfigRom().getNodeVendorId()) { 1678 /* we may want to use a switch-case-statement some day... */ 1679 if ((0x00000001 == getConfigRom().getModelId()) || 1680 (0x00000000 == getConfigRom().getModelId())) { 1681 m_nb_rx = 1; 1682 } 1683 } 1684 1685 if(!readReg(m_tx_reg_offset + DICE_REGISTER_RX_SZ_RX, &m_rx_size)) { 1686 debugError("Could not initialize m_rx_size\n"); 1687 return false; 1688 } 1689 m_rx_size*=4; 1684 switch (getConfigRom().getModelId()) { 1685 case 0x00000001: 1686 case 0x00000000: 1687 m_nb_rx = 1; 1688 break; 1689 } 1690 } 1690 1691 1691 1692 debugOutput(DEBUG_LEVEL_VERBOSE,"DICE Parameter Space info:\n"); trunk/libffado/src/dice/dice_eap.cpp
r1787 r1806 28 28 29 29 #include "libutil/SystemTimeSource.h" 30 #include "libutil/ByteSwap.h" 30 31 31 32 #include <cstdio> … … 534 535 } 535 536 536 printMessage("--- Active Router /Stream---\n");537 printMessage("--- Active Router ---\n"); 537 538 RouterConfig *rcfg = getActiveRouterConfig(); 538 539 if(rcfg) { 539 540 rcfg->show(); 540 541 } 542 printMessage("--- Active Stream ---\n"); 541 543 StreamConfig *scfg = getActiveStreamConfig(); 542 544 if(scfg) { … … 1687 1689 EAP::StreamConfig::showConfigBlock(struct ConfigBlock &b) 1688 1690 { 1689 debugOutput(DEBUG_LEVEL_VERBOSE," Channel count : %u audio, %u midi\n", b.nb_audio, b.nb_midi);1690 debugOutput(DEBUG_LEVEL_VERBOSE," AC3 Map : 0x%08X\n", b.ac3_map);1691 printMessage(" Channel count : %u audio, %u midi\n", b.nb_audio, b.nb_midi); 1692 printMessage(" AC3 Map : 0x%08X\n", b.ac3_map); 1691 1693 stringlist channel_names = getNamesForBlock(b); 1692 debugOutput(DEBUG_LEVEL_VERBOSE," Channel names :\n");1694 printMessage(" Channel names :\n"); 1693 1695 for ( stringlist::iterator it = channel_names.begin(); 1694 1696 it != channel_names.end(); 1695 1697 ++it ) 1696 1698 { 1697 debugOutput(DEBUG_LEVEL_VERBOSE," %s\n", (*it).c_str());1699 printMessage(" %s\n", (*it).c_str()); 1698 1700 } 1699 1701 } … … 1703 1705 { 1704 1706 for(unsigned int i=0; i<m_nb_tx; i++) { 1705 debugOutput(DEBUG_LEVEL_VERBOSE,"TX Config block %d\n", i);1707 printMessage("TX Config block %d\n", i); 1706 1708 showConfigBlock(m_tx_configs[i]); 1707 1709 } 1708 1710 for(unsigned int i=0; i<m_nb_rx; i++) { 1709 debugOutput(DEBUG_LEVEL_VERBOSE,"RX Config block %d\n", i);1711 printMessage("RX Config block %d\n", i); 1710 1712 showConfigBlock(m_rx_configs[i]); 1711 1713 } … … 1715 1717 1716 1718 1717 1719 // vim: et trunk/libffado/src/dice/dice_eap.h
r1780 r1806 264 264 265 265 /** 266 the peak space is a special version of a router config266 @brief Description of the peak space in hardware 267 267 */ 268 268 class PeakSpace {