Skip to content

W
wr2rf-vme
Commit e47e3e78 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

software: remove trailing spaces

parent f2323010
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
software/libwr2rf/board.c
View file @ e47e3e78
......@@ -1138,9 +1138,9 @@ uint32_t libwr2rf_rfnco_read32 (struct libwr2rf_dev *dev, unsigned id, unsigned
{
unsigned addr = 0;
if (id == LIBWR2RF_RF1_CHANNEL_ID)
if (id == LIBWR2RF_RF1_CHANNEL_ID)
addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF1_RFNCO;
else
else
addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF2_RFNCO;
addr = addr + off;
......@@ -1151,9 +1151,9 @@ void libwr2rf_rfnco_write32 (struct libwr2rf_dev *dev, unsigned id, unsigned off
{
unsigned addr = 0;
if (id == LIBWR2RF_RF1_CHANNEL_ID)
if (id == LIBWR2RF_RF1_CHANNEL_ID)
addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF1_RFNCO;
else
else
addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF2_RFNCO;
addr = addr + off;
......@@ -1161,21 +1161,21 @@ void libwr2rf_rfnco_write32 (struct libwr2rf_dev *dev, unsigned id, unsigned off
}
int libwr2rf_nco_lcfg (struct libwr2rf_dev *dev, unsigned lcfg, unsigned long long ftw_rfnco1,
int libwr2rf_nco_lcfg (struct libwr2rf_dev *dev, unsigned lcfg, unsigned long long ftw_rfnco1,
unsigned long long ftw_rfnco2)
{
unsigned control_lcfg = RFNCO_CONTROL_SOFTLOAD;
unsigned control_wrcfg = RFNCO_CONTROL_SELFTWH1 | RFNCO_CONTROL_EXTRESETENABLE | RFNCO_CONTROL_SELLOAD | RFNCO_CONTROL_SELWRFTWH1;
unsigned control_wrcfg = RFNCO_CONTROL_SELFTWH1 | RFNCO_CONTROL_EXTRESETENABLE | RFNCO_CONTROL_SELLOAD | RFNCO_CONTROL_SELWRFTWH1;
unsigned nco1_ftw_addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF1_RFNCO + RFNCO_FTW_H1;
unsigned nco2_ftw_addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF2_RFNCO + RFNCO_FTW_H1;
unsigned nco1_control_addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF1_RFNCO + RFNCO_CONTROL;
unsigned nco2_control_addr = WR2RF_VME_REGS_CTRL + WR2RF_CTRL_REGS_RF2_RFNCO + RFNCO_CONTROL;
printf("nco_ftw_addr=%lx nco_ctrl_addr=%lx\n", RFNCO_FTW_H1, RFNCO_CONTROL);
printf("nco_ftw_addr=%lx nco_ctrl_addr=%lx\n", RFNCO_FTW_H1, RFNCO_CONTROL);
if (lcfg == 0) {
/* Use network as RFNCO source. */
libwr2rf_write16(dev, WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_NCO_LOC_OR_WRS, 0);
libwr2rf_write16(dev, WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_NCO_LOC_OR_WRS, 0);
libwr2rf_16x32_write32(dev, nco1_control_addr, control_wrcfg);
libwr2rf_16x32_write32(dev, nco2_control_addr, control_wrcfg);
......
software/libwr2rf/init.c
View file @ e47e3e78
......@@ -117,7 +117,7 @@ libwr2rf_clock_init (struct libwr2rf_dev *dev)
/* we have to check if the PLL has already been initialised and the clock select set */
ctrl = libwr2rf_read16(dev, WR2RF_VME_REGS_INIT + WR2RF_INIT_REGS_CLOCK_CTRL);
if ((ctrl & WR2RF_INIT_REGS_CLOCK_CTRL_CLK_SEL) == 0)
if ((ctrl & WR2RF_INIT_REGS_CLOCK_CTRL_CLK_SEL) == 0)
{
/* 1. the PLL (ltc6950). */
/* 1.1 the SPI control for the PLL. */
......@@ -127,13 +127,13 @@ libwr2rf_clock_init (struct libwr2rf_dev *dev)
libwr2rf_ltc6950_init (dev);
/* 1.3 sync the PLL */
libwr2rf_ltc6950_sync (dev);
/* 2. FPGA clock. */
libwr2rf_clock_select_dds (dev);
/* 5. WR-Core */
libwr2rf_wrcore_init(dev);
/* 6. IOdelays */
libwr2rf_iodelay_init(dev);
}
......
software/libwr2rf/wr2rf.c
View file @ e47e3e78
......@@ -474,7 +474,7 @@ rf_reset_offset (struct libwr2rf_dev *dev, int argc, char **argv)
ch = 2;
addr += WR2RF_INIT_RF_REGS_RF2;
}
if (ch != 1 && ch != 2)
goto usage;
else if (argc == 3)
......@@ -485,7 +485,7 @@ rf_reset_offset (struct libwr2rf_dev *dev, int argc, char **argv)
if (argc == 3) {
libwr2rf_write16(dev, addr, delay);
}
}
delay = libwr2rf_read16(dev, addr);
printf ("RF%d Reset Delay Offset = %02d cycles (16ns)\n", ch, delay);
......@@ -640,7 +640,7 @@ nco_lcfg (struct libwr2rf_dev *dev, int argc, char **argv)
libwr2rf_16x32_write32(dev, nco_harmonic_addr, harmonic);
libwr2rf_16x32_write32(dev, nco_control_addr, control);
printf("nco_ftw_addr=%x nco_L00_addr=%x nco_LO1_addr=%x nco_harmonic_addr=%x nco_control_addr=%x\n",
printf("nco_ftw_addr=%x nco_L00_addr=%x nco_LO1_addr=%x nco_harmonic_addr=%x nco_control_addr=%x\n",
nco_ftw_addr, nco_LO0_addr, nco_LO1_addr, nco_harmonic_addr, nco_control_addr );
printf("ftw=%08x.%08x LO=%08x.%08x L1=%08x.%08x harmonic=%08x control=%08x \n",
......@@ -703,7 +703,7 @@ nco_wrcfg (struct libwr2rf_dev *dev, int argc, char **argv)
unsigned long long LO1 = 0x1C9BA5E300000;//223.5 MHz
unsigned off = 0;
unsigned harmonic = 4620;
unsigned control = RFNCO_CONTROL_SELFTWH1 | RFNCO_CONTROL_EXTRESETENABLE | RFNCO_CONTROL_SELLOAD |
unsigned control = RFNCO_CONTROL_SELFTWH1 | RFNCO_CONTROL_EXTRESETENABLE | RFNCO_CONTROL_SELLOAD |
RFNCO_CONTROL_SELWRFTWH1;
unsigned nco_harmonic_addr = RFNCO_FTW_H;
unsigned nco_LO0_addr = RFNCO_FTW_LO0;
......@@ -3842,7 +3842,7 @@ api_rfnco_read32 (struct libwr2rf_dev *dev, int argc, char **argv)
unsigned addr_off = 0; // bytes
unsigned max_off = 4096; // max address space for rfnco
if (argc != 3)
if (argc != 3)
goto usage;
rfnco_idx = strtoul(argv[1], NULL, 0);
......@@ -3871,7 +3871,7 @@ api_rfnco_write32 (struct libwr2rf_dev *dev, int argc, char **argv)
unsigned max_off = 4096;
unsigned val = 0;
if (argc != 4)
if (argc != 4)
goto usage;
rfnco_idx = strtoul(argv[1], NULL, 0);
......@@ -3882,10 +3882,10 @@ api_rfnco_write32 (struct libwr2rf_dev *dev, int argc, char **argv)
goto usage;
if (addr_off >= max_off)
goto usage;
libwr2rf_rfnco_write32 (dev, rfnco_idx, addr_off, val);
return;
usage:
printf ("usage: %s rfnco rfnco_addr_in_bytes val\n", argv[0]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment