sdr
/
osmo-sdr
Archived
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.osmocom.org:osmo-sdr

This commit is contained in:
Christian Daniel 2012-01-30 22:28:33 +01:00
parent 4cd82c2369 87fd3c1ff2
commit 0b739924a4
7 changed files with 449 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
firmware/include/si570.h
View File

@ -1,41 +1,60 @@
#ifndef __SI570_H__
#define __SI570_H__
#include <stdint.h>
#define SI570_ADDR 0x55
#define SI570_XTAL 114285000L
struct range {
uint32_t min;
uint32_t max;
};
struct si570_info {
struct range freq_range[3];
uint32_t init_freq;
};
//device-context
struct si570_ctx {
int init;
int lock;
void *i2c;
uint8_t slave_addr;
uint32_t xtal;
const struct si570_info *info;
};
//API
int si570_init(struct si570_ctx *ctx, void *i2c_dev, uint8_t i2c_addr);
int si570_read_calibration(struct si570_ctx *ctx);
int si570_reset(struct si570_ctx *ctx);
//mode of operation
int si570_get_lock(struct si570_ctx *ctx);
//frequency
int si570_set_freq(struct si570_ctx *ctx, uint32_t freq, int trim);
//dump all registers
void si570_regdump(struct si570_ctx *ctx);
#endif //__SI570_H__
#ifndef __SI570_H__
#define __SI570_H__
/* (C) 2005-2011 by maintech GmbH
* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#define SI570_ADDR 0x55
#define SI570_XTAL 114285000L
struct range {
uint32_t min;
uint32_t max;
};
struct si570_info {
struct range freq_range[3];
uint32_t init_freq;
};
//device-context
struct si570_ctx {
int init;
int lock;
void *i2c;
uint8_t slave_addr;
uint32_t xtal;
const struct si570_info *info;
};
//API
int si570_init(struct si570_ctx *ctx, void *i2c_dev, uint8_t i2c_addr);
int si570_read_calibration(struct si570_ctx *ctx);
int si570_reset(struct si570_ctx *ctx);
//mode of operation
int si570_get_lock(struct si570_ctx *ctx);
//frequency
int si570_set_freq(struct si570_ctx *ctx, uint32_t freq, int trim);
//dump all registers
void si570_regdump(struct si570_ctx *ctx);
#endif //__SI570_H__

18
firmware/include/tuner_e4k.h
View File

@ -1,6 +1,24 @@
#ifndef _E4K_TUNER_H
#define _E4K_TUNER_H
/* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
enum e4k_reg {
E4K_REG_MASTER1 = 0x00,
E4K_REG_MASTER2 = 0x01,

20
firmware/src/logging.c
View File

@ -1,3 +1,22 @@
/* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdio.h>
#include <unistd.h>
@ -16,4 +35,5 @@ void logp2(int subsys, unsigned int level, char *file,
va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
fputc("\r", stderr);
}

18
firmware/src/osdr_fpga.c
View File

@ -1,4 +1,22 @@
/* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <pio/pio.h>
static const Pin fon_pin = PIN_FON;

576
firmware/src/si570.c
View File

@ -1,279 +1,297 @@
#include <time.h>
#include <math.h>
#include <stdio.h>
#include <errno.h>
#include <si570.h>
#include <logging.h>
#include <utility/trace.h>
#include <twi/twid.h>
static void udelay(uint32_t usec)
{
uint32_t i, j;
volatile uint32_t k;
for (i = 0; i < usec; i++) {
for (j = 0; j < 0xff; j++) {
k = 0;
}
}
}
static int smbus8_read_bytes(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t *out, uint8_t num)
{
unsigned char rc;
rc = TWID_Read(i2c, addr, reg_nr, 1, out, num, NULL);
if (rc != 0) {
LOGP(DVCO, LOGL_ERROR, "Error %u in TWID_Read\n", rc);
return -EIO;
}
return rc;
}
static int smbus8_read_byte(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t *val)
{
return smbus8_read_bytes(i2c, addr, reg_nr, val, 1);
}
static int smbus8_write_bytes(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t *val, uint8_t num)
{
unsigned char rc;
rc = TWID_Write(i2c, addr, reg_nr, 1, val, num, NULL);
if (rc != 0) {
LOGP(DVCO, LOGL_ERROR, "Error %u in TWID_Write\n", rc);
return -EIO;
}
return rc;
}
static int smbus8_write_byte(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t val)
{
return smbus8_write_bytes(i2c, addr, reg_nr, &val, 1);
}
static const struct si570_info si570_data[2] = {
{.freq_range = {{.min=10000, .max=945000}, {.min=970000, .max=1134000}, {.min=1213000, .max=1417500}}, .init_freq=856000 },
{.freq_range = {{.min=10000, .max=280000}}, .init_freq=100000 },
};
//init module
int si570_init(struct si570_ctx *ctx, void *i2c_dev, uint8_t i2c_addr)
{
ctx->i2c = i2c_dev;
ctx->slave_addr = i2c_addr;
TRACE_DEBUG("si570_init()\r\n");
if (0 != si570_reset(ctx)) {
TRACE_DEBUG("SI570 reset failed.\n");
return -EIO;
}
TRACE_DEBUG("si570_init():2\r\n");
if (0 != si570_read_calibration(ctx)) {
TRACE_DEBUG("SI570 init failed.\n");
return -EIO;
}
TRACE_DEBUG("si570_init():3\r\n");
ctx->init = 1;
return 0;
}
void si570_print_info(struct si570_ctx *ctx)
{
TRACE_DEBUG("SI570 XTAL: %u Hz REF: %u Hz\n", ctx->xtal >> 3, ctx->info->init_freq * 1000);
}
static int hs_to_div(int n1)
{
switch (n1) {
case 0: return 4;
case 1: return 5;
case 2: return 6;
case 3: return 7;
case 5: return 9;
case 7: return 11;
}
return 0;
}
int si570_reset(struct si570_ctx *ctx)
{
TRACE_DEBUG("si570_reset:1\r\n");
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 135, 80);
udelay(1000);
TRACE_DEBUG("si570_reset:2\r\n");
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 135, 01);
udelay(1000);
TRACE_DEBUG("si570_reset:3\r\n");
return 0;
}
int si570_read_calibration(struct si570_ctx *ctx)
{
int n;
int res;
uint8_t data[6];
uint64_t xd, xf;
int n1, hs_div;
TRACE_DEBUG("si570_read_calib:1\r\n");
if (0 != (res = smbus8_read_bytes(ctx->i2c, ctx->slave_addr, 7, data, 6))) {
TRACE_DEBUG ("SI570 calibration read error (%i)\n", res);
return -EINVAL;
}
TRACE_DEBUG("si570_read_calib:2\r\n");
xd = data[1] & 0x3F;
xd <<= 8;
xd |= data[2];
xd <<= 8;
xd |= data[3];
xd <<= 8;
xd |= data[4];
xd <<= 8;
xd |= data[5];
TRACE_DEBUG("si570_read_calib:2b\r\n");
n1 = ((data[0] << 2) & 0x1F) | (data[1] >> 6);
hs_div = (data[0] >> 5);
TRACE_DEBUG("si570_read_calib:2c\r\n");
n = 1; if (xd > 0) {
//for (n=0; n<2; n++) {
TRACE_DEBUG("si570_read_calib:2d\r\n");
xf = si570_data[n].init_freq * 1000;
TRACE_DEBUG("si570_read_calib:2e\r\n");
xf *= hs_to_div(hs_div) * (n1+1);
TRACE_DEBUG("si570_read_calib:2f\r\n");
xf<<=31;
TRACE_DEBUG("si570_read_calib:2g\r\n");
ctx->xtal = (xf + (xd/2)) / xd;
TRACE_DEBUG("si570_read_calib:2h\r\n");
ctx->info = &si570_data[n];
TRACE_DEBUG("si570_read_calib:3\r\n");
return 0;
}
return -EINVAL;
}
//set frequency
int si570_set_freq(struct si570_ctx *ctx, uint32_t freq, int trim)
{
uint32_t dco_min = 4850000ULL;
int mul, hsv, n1;
int freq_in_range = 0;
ctx->lock = 0;
for (mul = (dco_min / freq) + 1; (freq * mul) <= 5670000; mul++) {
for (hsv=7; hsv>=0; hsv--) {
int hsdiv = hs_to_div(hsv);
if (!hsdiv) continue;
if (mul%hsdiv) continue;
n1 = mul / hsdiv;
if (n1 > 128) continue;
if (n1 != 1) {
if (n1 < 1) continue;
if (n1 % 2) continue;
}
goto found_solution;
}
}
TRACE_DEBUG("SI570 no solution\n");
return -EINVAL;
found_solution:
{
uint8_t data[6];
uint64_t xf, xd, xr;
uint32_t n1v;
xf = freq;
xf*= 1000;
xf+= trim;
xd = hs_to_div(hsv) * n1 * xf;
xd<<=31;
xr = (xd + ctx->xtal/2) / ctx->xtal;
n1v= n1 - 1;
data[0] = (hsv << 5) | (n1v>> 2);
data[1] = (n1v << 6) | (xr >> 32);
data[2] = (xr >> 24);
data[3] = (xr >> 16);
data[4] = (xr >> 8);
data[5] = (xr >> 0);
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 137, 0x10);
smbus8_write_bytes(ctx->i2c,ctx->slave_addr, 7, data, 6);
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 137, 0x00);
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 135, 0x40);
ctx->lock = 1;
}
return 0;
}
int si570_get_lock(struct si570_ctx *ctx)
{
return ctx->init && ctx->lock;
}
//dump all registers
void si570_regdump(struct si570_ctx *ctx)
{
uint8_t data[8];
if (!ctx->init) {
TRACE_DEBUG("SI570 not initialized\n");
return;
}
smbus8_read_bytes(ctx->i2c, ctx->slave_addr, 7, data, 6);
smbus8_read_byte(ctx->i2c, ctx->slave_addr, 135, &data[6]);
smbus8_read_byte(ctx->i2c, ctx->slave_addr, 137, &data[7]);
TRACE_DEBUG("SI570 regs: %02X %02X %02X %02X %02X %02X %02X %02X\n",
data[0], data[1], data[2], data[3],
data[4], data[5], data[6], data[7]);
}
/* (C) 2005-2011 by maintech GmbH
* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <time.h>
#include <math.h>
#include <stdio.h>
#include <errno.h>
#include <si570.h>
#include <logging.h>
#include <utility/trace.h>
#include <twi/twid.h>
static void udelay(uint32_t usec)
{
uint32_t i, j;
volatile uint32_t k;
for (i = 0; i < usec; i++) {
for (j = 0; j < 0xff; j++) {
k = 0;
}
}
}
static int smbus8_read_bytes(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t *out, uint8_t num)
{
unsigned char rc;
rc = TWID_Read(i2c, addr, reg_nr, 1, out, num, NULL);
if (rc != 0) {
LOGP(DVCO, LOGL_ERROR, "Error %u in TWID_Read\n", rc);
return -EIO;
}
return rc;
}
static int smbus8_read_byte(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t *val)
{
return smbus8_read_bytes(i2c, addr, reg_nr, val, 1);
}
static int smbus8_write_bytes(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t *val, uint8_t num)
{
unsigned char rc;
rc = TWID_Write(i2c, addr, reg_nr, 1, val, num, NULL);
if (rc != 0) {
LOGP(DVCO, LOGL_ERROR, "Error %u in TWID_Write\n", rc);
return -EIO;
}
return rc;
}
static int smbus8_write_byte(void *i2c, uint8_t addr, uint8_t reg_nr,
uint8_t val)
{
return smbus8_write_bytes(i2c, addr, reg_nr, &val, 1);
}
static const struct si570_info si570_data[2] = {
{.freq_range = {{.min=10000, .max=945000}, {.min=970000, .max=1134000}, {.min=1213000, .max=1417500}}, .init_freq=856000 },
{.freq_range = {{.min=10000, .max=280000}}, .init_freq=100000 },
};
//init module
int si570_init(struct si570_ctx *ctx, void *i2c_dev, uint8_t i2c_addr)
{
ctx->i2c = i2c_dev;
ctx->slave_addr = i2c_addr;
TRACE_DEBUG("si570_init()\r\n");
if (0 != si570_reset(ctx)) {
TRACE_DEBUG("SI570 reset failed.\n");
return -EIO;
}
TRACE_DEBUG("si570_init():2\r\n");
if (0 != si570_read_calibration(ctx)) {
TRACE_DEBUG("SI570 init failed.\n");
return -EIO;
}
TRACE_DEBUG("si570_init():3\r\n");
ctx->init = 1;
return 0;
}
void si570_print_info(struct si570_ctx *ctx)
{
TRACE_DEBUG("SI570 XTAL: %u Hz REF: %u Hz\n", ctx->xtal >> 3, ctx->info->init_freq * 1000);
}
static int hs_to_div(int n1)
{
switch (n1) {
case 0: return 4;
case 1: return 5;
case 2: return 6;
case 3: return 7;
case 5: return 9;
case 7: return 11;
}
return 0;
}
int si570_reset(struct si570_ctx *ctx)
{
TRACE_DEBUG("si570_reset:1\r\n");
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 135, 80);
udelay(1000);
TRACE_DEBUG("si570_reset:2\r\n");
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 135, 01);
udelay(1000);
TRACE_DEBUG("si570_reset:3\r\n");
return 0;
}
int si570_read_calibration(struct si570_ctx *ctx)
{
int n;
int res;
uint8_t data[6];
uint64_t xd, xf;
int n1, hs_div;
TRACE_DEBUG("si570_read_calib:1\r\n");
if (0 != (res = smbus8_read_bytes(ctx->i2c, ctx->slave_addr, 7, data, 6))) {
TRACE_DEBUG ("SI570 calibration read error (%i)\n", res);
return -EINVAL;
}
TRACE_DEBUG("si570_read_calib:2\r\n");
xd = data[1] & 0x3F;
xd <<= 8;
xd |= data[2];
xd <<= 8;
xd |= data[3];
xd <<= 8;
xd |= data[4];
xd <<= 8;
xd |= data[5];
TRACE_DEBUG("si570_read_calib:2b\r\n");
n1 = ((data[0] << 2) & 0x1F) | (data[1] >> 6);
hs_div = (data[0] >> 5);
TRACE_DEBUG("si570_read_calib:2c\r\n");
n = 1; if (xd > 0) {
//for (n=0; n<2; n++) {
TRACE_DEBUG("si570_read_calib:2d\r\n");
xf = si570_data[n].init_freq * 1000;
TRACE_DEBUG("si570_read_calib:2e\r\n");
xf *= hs_to_div(hs_div) * (n1+1);
TRACE_DEBUG("si570_read_calib:2f\r\n");
xf<<=31;
TRACE_DEBUG("si570_read_calib:2g\r\n");
ctx->xtal = (xf + (xd/2)) / xd;
TRACE_DEBUG("si570_read_calib:2h\r\n");
ctx->info = &si570_data[n];
TRACE_DEBUG("si570_read_calib:3\r\n");
return 0;
}
return -EINVAL;
}
//set frequency
int si570_set_freq(struct si570_ctx *ctx, uint32_t freq, int trim)
{
uint32_t dco_min = 4850000ULL;
int mul, hsv, n1;
int freq_in_range = 0;
ctx->lock = 0;
for (mul = (dco_min / freq) + 1; (freq * mul) <= 5670000; mul++) {
for (hsv=7; hsv>=0; hsv--) {
int hsdiv = hs_to_div(hsv);
if (!hsdiv) continue;
if (mul%hsdiv) continue;
n1 = mul / hsdiv;
if (n1 > 128) continue;
if (n1 != 1) {
if (n1 < 1) continue;
if (n1 % 2) continue;
}
goto found_solution;
}
}
TRACE_DEBUG("SI570 no solution\n");
return -EINVAL;
found_solution:
{
uint8_t data[6];
uint64_t xf, xd, xr;
uint32_t n1v;
xf = freq;
xf*= 1000;
xf+= trim;
xd = hs_to_div(hsv) * n1 * xf;
xd<<=31;
xr = (xd + ctx->xtal/2) / ctx->xtal;
n1v= n1 - 1;
data[0] = (hsv << 5) | (n1v>> 2);
data[1] = (n1v << 6) | (xr >> 32);
data[2] = (xr >> 24);
data[3] = (xr >> 16);
data[4] = (xr >> 8);
data[5] = (xr >> 0);
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 137, 0x10);
smbus8_write_bytes(ctx->i2c,ctx->slave_addr, 7, data, 6);
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 137, 0x00);
smbus8_write_byte(ctx->i2c, ctx->slave_addr, 135, 0x40);
ctx->lock = 1;
}
return 0;
}
int si570_get_lock(struct si570_ctx *ctx)
{
return ctx->init && ctx->lock;
}
//dump all registers
void si570_regdump(struct si570_ctx *ctx)
{
uint8_t data[8];
if (!ctx->init) {
TRACE_DEBUG("SI570 not initialized\n");
return;
}
smbus8_read_bytes(ctx->i2c, ctx->slave_addr, 7, data, 6);
smbus8_read_byte(ctx->i2c, ctx->slave_addr, 135, &data[6]);
smbus8_read_byte(ctx->i2c, ctx->slave_addr, 137, &data[7]);
TRACE_DEBUG("SI570 regs: %02X %02X %02X %02X %02X %02X %02X %02X\n",
data[0], data[1], data[2], data[3],
data[4], data[5], data[6], data[7]);
}

18
firmware/src/tuner_e4k.c
View File

@ -1,4 +1,22 @@
/* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <limits.h>
#include <stdint.h>
#include <errno.h>

18
firmware/src/tuner_e4k_transport.c
View File

@ -1,4 +1,22 @@
/* (C) 2011-2012 by Harald Welte <laforge@gnumonks.org>
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <unistd.h>
#include <errno.h>