Merge branch 'master' of github.com:mossmann/hackrf

This commit is contained in:
Michael Ossmann
2012-08-01 10:37:05 -06:00
4 changed files with 85 additions and 1041 deletions

View File

@ -174,7 +174,7 @@ void configure_sgpio_test_tx() {
(3L << 5) | // QUALIFIER_MODE = 3 (external SGPIO pin)
(0L << 3) | // CLK_SOURCE_SLICE_MODE = X
(0L << 1) | // CLK_SOURCE_PIN_MODE = 0 (SGPIO8)
(1L << 0); // EXT_CLK_ENABLE = 1, external clock signal (slice)
(1L << 0); // EXT_CLK_ENABLE = 1, external clock signal
SGPIO_SLICE_MUX_CFG(SGPIO_SLICE_A) =
(0L << 8) | // INV_QUALIFIER = 0 (use normal qualifier)
@ -254,7 +254,7 @@ void configure_sgpio_test_rx() {
(3L << 5) | // QUALIFIER_MODE = 3 (external SGPIO pin)
(0L << 3) | // CLK_SOURCE_SLICE_MODE = X
(0L << 1) | // CLK_SOURCE_PIN_MODE = 0 (SGPIO8)
(1L << 0); // EXT_CLK_ENABLE = 1, external clock signal (slice)
(1L << 0); // EXT_CLK_ENABLE = 1, external clock signal
SGPIO_SLICE_MUX_CFG(SGPIO_SLICE_A) =
(0L << 8) | // INV_QUALIFIER = 0 (use normal qualifier)
@ -262,7 +262,7 @@ void configure_sgpio_test_rx() {
(0L << 4) | // DATA_CAPTURE_MODE = 0 (detect rising edge)
(0L << 3) | // INV_OUT_CLK = X
(1L << 2) | // CLKGEN_MODE = 1 (use external pin clock)
(0L << 1) | // CLK_CAPTURE_MODE = 0 (use rising clock edge)
(1L << 1) | // CLK_CAPTURE_MODE = 1 (use falling clock edge)
(0L << 0); // MATCH_MODE = 0 (do not match data)
SGPIO_PRESET(SGPIO_SLICE_A) = 0;
@ -314,6 +314,13 @@ int main(void) {
pin_setup();
enable_1v8_power();
cpu_clock_init();
CGU_BASE_PERIPH_CLK = (CGU_BASE_CLK_AUTOBLOCK
| (CGU_SRC_PLL1 << CGU_BASE_CLK_SEL_SHIFT));
CGU_BASE_APB1_CLK = (CGU_BASE_CLK_AUTOBLOCK
| (CGU_SRC_PLL1 << CGU_BASE_CLK_SEL_SHIFT));
ssp1_init();
ssp1_set_mode_max2837();
@ -322,12 +329,6 @@ int main(void) {
max2837_start();
max2837_rx();
CGU_BASE_PERIPH_CLK = (CGU_BASE_CLK_AUTOBLOCK
| (CGU_SRC_PLL1 << CGU_BASE_CLK_SEL_SHIFT));
CGU_BASE_APB1_CLK = (CGU_BASE_CLK_AUTOBLOCK
| (CGU_SRC_PLL1 << CGU_BASE_CLK_SEL_SHIFT));
ssp1_set_mode_max5864();
max5864_xcvr();
configure_sgpio_test_rx();

View File

@ -6,5 +6,5 @@ jtag <<COMMANDSEND
cable jtagkey vid=0x0403 pid=0x6010 interface=0 driver=ftdi-mpsse
bsdl path bsdl/xc2c
detect
svf sgpio_if.svf progress stop
svf default.svf progress stop
COMMANDSEND

View File

@ -18,75 +18,75 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
NET "CODEC_CLK" LOC="23" |FAST |IOSTANDARD=LVCMOS18;
NET "CODEC_X2_CLK" LOC="27" |FAST |IOSTANDARD=LVCMOS18;
#NET "GCLK0" LOC="22" |FAST |IOSTANDARD=LVCMOS18;
NET "CODEC_CLK" LOC="23" |IOSTANDARD=LVCMOS33;
NET "CODEC_X2_CLK" LOC="27" |IOSTANDARD=LVCMOS33;
#NET "GCLK0" LOC="22" |IOSTANDARD=LVCMOS33;
NET "CODEC_X2_CLK" TNM_NET = CODEC_X2_CLK;
TIMESPEC TS_codec_x2_data = PERIOD "CODEC_X2_CLK" 50 ns;
NET "DA<7>" LOC="35" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<6>" LOC="36" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<5>" LOC="37" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<4>" LOC="39" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<3>" LOC="40" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<2>" LOC="41" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<1>" LOC="42" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<0>" LOC="43" |FAST |IOSTANDARD=LVCMOS18;
NET "DA<7>" LOC="35" |IOSTANDARD=LVCMOS33;
NET "DA<6>" LOC="36" |IOSTANDARD=LVCMOS33;
NET "DA<5>" LOC="37" |IOSTANDARD=LVCMOS33;
NET "DA<4>" LOC="39" |IOSTANDARD=LVCMOS33;
NET "DA<3>" LOC="40" |IOSTANDARD=LVCMOS33;
NET "DA<2>" LOC="41" |IOSTANDARD=LVCMOS33;
NET "DA<1>" LOC="42" |IOSTANDARD=LVCMOS33;
NET "DA<0>" LOC="43" |IOSTANDARD=LVCMOS33;
NET "DD<9>" LOC="17" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<8>" LOC="18" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<7>" LOC="19" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<6>" LOC="24" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<5>" LOC="28" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<4>" LOC="29" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<3>" LOC="30" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<2>" LOC="32" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<1>" LOC="33" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<0>" LOC="34" |FAST |IOSTANDARD=LVCMOS18;
NET "DD<9>" LOC="17" |IOSTANDARD=LVCMOS33;
NET "DD<8>" LOC="18" |IOSTANDARD=LVCMOS33;
NET "DD<7>" LOC="19" |IOSTANDARD=LVCMOS33;
NET "DD<6>" LOC="24" |IOSTANDARD=LVCMOS33;
NET "DD<5>" LOC="28" |IOSTANDARD=LVCMOS33;
NET "DD<4>" LOC="29" |IOSTANDARD=LVCMOS33;
NET "DD<3>" LOC="30" |IOSTANDARD=LVCMOS33;
NET "DD<2>" LOC="32" |IOSTANDARD=LVCMOS33;
NET "DD<1>" LOC="33" |IOSTANDARD=LVCMOS33;
NET "DD<0>" LOC="34" |IOSTANDARD=LVCMOS33;
NET "B1AUX<16>" LOC="60" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<15>" LOC="58" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<14>" LOC="56" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<13>" LOC="55" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<12>" LOC="53" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<11>" LOC="52" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<10>" LOC="50" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<9>" LOC="49" |FAST |IOSTANDARD=LVCMOS18;
NET "B1AUX<16>" LOC="60" |IOSTANDARD=LVCMOS33;
NET "B1AUX<15>" LOC="58" |IOSTANDARD=LVCMOS33;
NET "B1AUX<14>" LOC="56" |IOSTANDARD=LVCMOS33;
NET "B1AUX<13>" LOC="55" |IOSTANDARD=LVCMOS33;
NET "B1AUX<12>" LOC="53" |IOSTANDARD=LVCMOS33;
NET "B1AUX<11>" LOC="52" |IOSTANDARD=LVCMOS33;
NET "B1AUX<10>" LOC="50" |IOSTANDARD=LVCMOS33;
NET "B1AUX<9>" LOC="49" |IOSTANDARD=LVCMOS33;
#NET "SGPIO<15>" LOC="78" |FAST |IOSTANDARD=LVCMOS33;
#NET "SGPIO<14>" LOC="81" |FAST |IOSTANDARD=LVCMOS33;
#NET "SGPIO<13>" LOC="90" |FAST |IOSTANDARD=LVCMOS33;
#NET "SGPIO<12>" LOC="70" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DIRECTION" LOC="71" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DISABLE" LOC="76" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_CAPTURE" LOC="91" |FAST |IOSTANDARD=LVCMOS33;
#NET "HOST_CLK" LOC="68" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<7>" LOC="77" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<6>" LOC="61" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<5>" LOC="64" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<4>" LOC="67" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<3>" LOC="72" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<2>" LOC="74" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<1>" LOC="79" |FAST |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<0>" LOC="89" |FAST |IOSTANDARD=LVCMOS33;
#NET "SGPIO<15>" LOC="78" |IOSTANDARD=LVCMOS33;
#NET "SGPIO<14>" LOC="81" |IOSTANDARD=LVCMOS33;
#NET "SGPIO<13>" LOC="90" |IOSTANDARD=LVCMOS33;
#NET "SGPIO<12>" LOC="70" |IOSTANDARD=LVCMOS33;
NET "HOST_DIRECTION" LOC="71" |IOSTANDARD=LVCMOS33;
NET "HOST_DISABLE" LOC="76" |IOSTANDARD=LVCMOS33;
NET "HOST_CAPTURE" LOC="91" |IOSTANDARD=LVCMOS33;
#NET "HOST_CLK" LOC="68" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<7>" LOC="77" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<6>" LOC="61" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<5>" LOC="64" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<4>" LOC="67" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<3>" LOC="72" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<2>" LOC="74" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<1>" LOC="79" |IOSTANDARD=LVCMOS33;
NET "HOST_DATA<0>" LOC="89" |IOSTANDARD=LVCMOS33;
NET "B2AUX<16>" LOC="92" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<15>" LOC="94" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<14>" LOC="97" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<13>" LOC="99" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<12>" LOC="1" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<11>" LOC="2" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<10>" LOC="3" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<9>" LOC="4" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<8>" LOC="6" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<7>" LOC="7" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<6>" LOC="8" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<5>" LOC="9" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<4>" LOC="10" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<3>" LOC="11" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<2>" LOC="12" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<1>" LOC="13" |FAST |IOSTANDARD=LVCMOS33;
NET "B2AUX<16>" LOC="92" |IOSTANDARD=LVCMOS33;
NET "B2AUX<15>" LOC="94" |IOSTANDARD=LVCMOS33;
NET "B2AUX<14>" LOC="97" |IOSTANDARD=LVCMOS33;
NET "B2AUX<13>" LOC="99" |IOSTANDARD=LVCMOS33;
NET "B2AUX<12>" LOC="1" |IOSTANDARD=LVCMOS33;
NET "B2AUX<11>" LOC="2" |IOSTANDARD=LVCMOS33;
NET "B2AUX<10>" LOC="3" |IOSTANDARD=LVCMOS33;
NET "B2AUX<9>" LOC="4" |IOSTANDARD=LVCMOS33;
NET "B2AUX<8>" LOC="6" |IOSTANDARD=LVCMOS33;
NET "B2AUX<7>" LOC="7" |IOSTANDARD=LVCMOS33;
NET "B2AUX<6>" LOC="8" |IOSTANDARD=LVCMOS33;
NET "B2AUX<5>" LOC="9" |IOSTANDARD=LVCMOS33;
NET "B2AUX<4>" LOC="10" |IOSTANDARD=LVCMOS33;
NET "B2AUX<3>" LOC="11" |IOSTANDARD=LVCMOS33;
NET "B2AUX<2>" LOC="12" |IOSTANDARD=LVCMOS33;
NET "B2AUX<1>" LOC="13" |IOSTANDARD=LVCMOS33;
INST "DA<0>" TNM=adc_data;
INST "DA<1>" TNM=adc_data;