Skip to content

S
Software for White Rabbit PTP Core
Commit e625cbd9 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

Run ./scripts/Lindent on all .c and .h files 

This is massive: 4k lines changed (but only 840 if you ignore
space-only changes).  In this case "git blame -w" won't always find
the right patch, and it may fall on this patch -- because those
800 lines changed in content too.

This has been done with

   find . -name '*.[ch]' | xargs -n 1 ./scripts/Lindent

Statistics: all changes and ignoring blank space:

   morgana% git diff --stat HEAD~1 | tail -1
    77 files changed, 3774 insertions(+), 3709 deletions(-)
   morgana% git diff -w --stat HEAD~1 | tail -1
    61 files changed, 894 insertions(+), 829 deletions(-)

However, after this step I hand-fixed some very ugly long expressions
(leaving them long: no content change at all is there).
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 1d24ecfb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3741 additions and 3697 deletions
arch/lm32/irq.c
View file @ e625cbd9
...@@ -2,38 +2,36 @@ ...@@ -2,38 +2,36 @@
void disable_irq() void disable_irq()
{ {
unsigned int ie, im; unsigned int ie, im;
unsigned int Mask = ~1; unsigned int Mask = ~1;
/* disable peripheral interrupts in case they were enabled */ /* disable peripheral interrupts in case they were enabled */
asm volatile ("rcsr %0,ie":"=r"(ie)); asm volatile ("rcsr %0,ie":"=r" (ie));
ie &= (~0x1); ie &= (~0x1);
asm volatile ("wcsr ie, %0"::"r"(ie)); asm volatile ("wcsr ie, %0"::"r" (ie));
/* disable mask-bit in im */ /* disable mask-bit in im */
asm volatile ("rcsr %0, im":"=r"(im)); asm volatile ("rcsr %0, im":"=r" (im));
im &= Mask; im &= Mask;
asm volatile ("wcsr im, %0"::"r"(im)); asm volatile ("wcsr im, %0"::"r" (im));
} }
void enable_irq() void enable_irq()
{ {
unsigned int ie, im; unsigned int ie, im;
unsigned int Mask = 1; unsigned int Mask = 1;
/* disable peripheral interrupts in-case they were enabled*/ /* disable peripheral interrupts in-case they were enabled */
asm volatile ("rcsr %0,ie":"=r"(ie)); asm volatile ("rcsr %0,ie":"=r" (ie));
ie &= (~0x1); ie &= (~0x1);
asm volatile ("wcsr ie, %0"::"r"(ie)); asm volatile ("wcsr ie, %0"::"r" (ie));
/* enable mask-bit in im */ /* enable mask-bit in im */
asm volatile ("rcsr %0, im":"=r"(im)); asm volatile ("rcsr %0, im":"=r" (im));
im |= Mask; im |= Mask;
asm volatile ("wcsr im, %0"::"r"(im)); asm volatile ("wcsr im, %0"::"r" (im));
ie |= 0x1; ie |= 0x1;
asm volatile ("wcsr ie, %0"::"r"(ie)); asm volatile ("wcsr ie, %0"::"r" (ie));
} }
boards/arria/board.c
View file @ e625cbd9
...@@ -10,4 +10,4 @@ int board_init() ...@@ -10,4 +10,4 @@ int board_init()
int board_update() int board_update()
{ {
} }
\ No newline at end of file
boards/spec/board.c
View file @ e625cbd9
...@@ -10,4 +10,4 @@ int board_init() ...@@ -10,4 +10,4 @@ int board_init()
int board_update() int board_update()
{ {
} }
\ No newline at end of file
dev/dna.c
View file @ e625cbd9
...@@ -6,44 +6,44 @@ ...@@ -6,44 +6,44 @@
#define DNA_SHIFT 3 #define DNA_SHIFT 3
#define DNA_READ 2 #define DNA_READ 2
void dna_read(uint32_t *lo, uint32_t *hi) void dna_read(uint32_t * lo, uint32_t * hi)
{ {
uint64_t dna = 0; uint64_t dna = 0;
int i; int i;
gpio_out(DNA_DATA, 0); gpio_out(DNA_DATA, 0);
delay(10); delay(10);
gpio_out(DNA_CLK, 0); gpio_out(DNA_CLK, 0);
delay(10); delay(10);
gpio_out(DNA_READ, 1); gpio_out(DNA_READ, 1);
delay(10); delay(10);
gpio_out(DNA_SHIFT, 0); gpio_out(DNA_SHIFT, 0);
delay(10); delay(10);
delay(10); delay(10);
gpio_out(DNA_CLK, 1); gpio_out(DNA_CLK, 1);
delay(10); delay(10);
if(gpio_in(DNA_DATA)) dna |= 1; if (gpio_in(DNA_DATA))
delay(10); dna |= 1;
gpio_out(DNA_CLK, 0); delay(10);
delay(10); gpio_out(DNA_CLK, 0);
gpio_out(DNA_READ, 0); delay(10);
gpio_out(DNA_SHIFT, 1); gpio_out(DNA_READ, 0);
delay(10); gpio_out(DNA_SHIFT, 1);
delay(10);
for (i = 0; i < 57; i++) {
for(i=0;i<57;i++) dna <<= 1;
{ delay(10);
dna <<= 1; delay(10);
delay(10); gpio_out(DNA_CLK, 1);
delay(10); delay(10);
gpio_out(DNA_CLK, 1); if (gpio_in(DNA_DATA))
delay(10); dna |= 1;
if(gpio_in(DNA_DATA)) dna |= 1; delay(10);
delay(10); gpio_out(DNA_CLK, 0);
gpio_out(DNA_CLK, 0); delay(10);
delay(10); }
}
*hi = (uint32_t) (dna >> 32); *hi = (uint32_t) (dna >> 32);
*lo = (uint32_t) dna; *lo = (uint32_t) dna;
......
dev/eeprom.c
View file @ e625cbd9
This diff is collapsed.
dev/endpoint.c
View file @ e625cbd9
...@@ -18,7 +18,6 @@ LGPL 2.1 ...@@ -18,7 +18,6 @@ LGPL 2.1
#include <hw/endpoint_regs.h> #include <hw/endpoint_regs.h>
#include <hw/endpoint_mdio.h> #include <hw/endpoint_mdio.h>
/* Length of a single bit on the gigabit serial link in picoseconds. Used for calculating deltaRx/deltaTx /* Length of a single bit on the gigabit serial link in picoseconds. Used for calculating deltaRx/deltaTx
from the serdes bitslip value */ from the serdes bitslip value */
#define PICOS_PER_SERIAL_BIT 800 #define PICOS_PER_SERIAL_BIT 800
...@@ -33,150 +32,150 @@ volatile struct EP_WB *EP; ...@@ -33,150 +32,150 @@ volatile struct EP_WB *EP;
/* functions for accessing PCS (MDIO) registers */ /* functions for accessing PCS (MDIO) registers */
uint16_t pcs_read(int location) uint16_t pcs_read(int location)
{ {
EP->MDIO_CR = EP_MDIO_CR_ADDR_W(location >> 2); EP->MDIO_CR = EP_MDIO_CR_ADDR_W(location >> 2);
while ((EP->MDIO_ASR & EP_MDIO_ASR_READY) == 0); while ((EP->MDIO_ASR & EP_MDIO_ASR_READY) == 0) ;
return EP_MDIO_ASR_RDATA_R(EP->MDIO_ASR) & 0xffff; return EP_MDIO_ASR_RDATA_R(EP->MDIO_ASR) & 0xffff;
} }
void pcs_write(int location, int value) void pcs_write(int location, int value)
{ {
EP->MDIO_CR = EP_MDIO_CR_ADDR_W(location >> 2) EP->MDIO_CR = EP_MDIO_CR_ADDR_W(location >> 2)
| EP_MDIO_CR_DATA_W(value) | EP_MDIO_CR_DATA_W(value)
| EP_MDIO_CR_RW; | EP_MDIO_CR_RW;
while ((EP->MDIO_ASR & EP_MDIO_ASR_READY) == 0); while ((EP->MDIO_ASR & EP_MDIO_ASR_READY) == 0) ;
} }
/* MAC address setting */ /* MAC address setting */
void set_mac_addr(uint8_t dev_addr[]) void set_mac_addr(uint8_t dev_addr[])
{ {
EP->MACL = ((uint32_t)dev_addr[2] << 24) EP->MACL = ((uint32_t) dev_addr[2] << 24)
| ((uint32_t)dev_addr[3] << 16) | ((uint32_t) dev_addr[3] << 16)
| ((uint32_t)dev_addr[4] << 8) | ((uint32_t) dev_addr[4] << 8)
| ((uint32_t)dev_addr[5]); | ((uint32_t) dev_addr[5]);
EP->MACH = ((uint32_t)dev_addr[0] << 8) EP->MACH = ((uint32_t) dev_addr[0] << 8)
| ((uint32_t)dev_addr[1]); | ((uint32_t) dev_addr[1]);
} }
void get_mac_addr(uint8_t dev_addr[]) void get_mac_addr(uint8_t dev_addr[])
{ {
dev_addr[5] = (EP->MACL & 0x000000ff); dev_addr[5] = (EP->MACL & 0x000000ff);
dev_addr[4] = (EP->MACL & 0x0000ff00) >> 8; dev_addr[4] = (EP->MACL & 0x0000ff00) >> 8;
dev_addr[3] = (EP->MACL & 0x00ff0000) >> 16; dev_addr[3] = (EP->MACL & 0x00ff0000) >> 16;
dev_addr[2] = (EP->MACL & 0xff000000) >> 24; dev_addr[2] = (EP->MACL & 0xff000000) >> 24;
dev_addr[1] = (EP->MACH & 0x000000ff); dev_addr[1] = (EP->MACH & 0x000000ff);
dev_addr[0] = (EP->MACH & 0x0000ff00) >> 8; dev_addr[0] = (EP->MACH & 0x0000ff00) >> 8;
} }
/* Initializes the endpoint and sets its local MAC address */ /* Initializes the endpoint and sets its local MAC address */
void ep_init(uint8_t mac_addr[]) void ep_init(uint8_t mac_addr[])
{ {
EP = (volatile struct EP_WB *) BASE_EP; EP = (volatile struct EP_WB *)BASE_EP;
set_mac_addr(mac_addr); set_mac_addr(mac_addr);
*(unsigned int *)(0x62000) = 0x2; // reset network stuff (cleanup required!) *(unsigned int *)(0x62000) = 0x2; // reset network stuff (cleanup required!)
*(unsigned int *)(0x62000) = 0; *(unsigned int *)(0x62000) = 0;
EP->ECR = 0; /* disable Endpoint */ EP->ECR = 0; /* disable Endpoint */
EP->VCR0 = EP_VCR0_QMODE_W(3); /* disable VLAN unit - not used by WRPC */ EP->VCR0 = EP_VCR0_QMODE_W(3); /* disable VLAN unit - not used by WRPC */
EP->RFCR = EP_RFCR_MRU_W(1518); /* Set the max RX packet size */ EP->RFCR = EP_RFCR_MRU_W(1518); /* Set the max RX packet size */
EP->TSCR = EP_TSCR_EN_TXTS | EP_TSCR_EN_RXTS; /* Enable timestamping */ EP->TSCR = EP_TSCR_EN_TXTS | EP_TSCR_EN_RXTS; /* Enable timestamping */
/* Configure DMTD phase tracking */ /* Configure DMTD phase tracking */
EP->DMCR = EP_DMCR_EN | EP_DMCR_N_AVG_W(DMTD_AVG_SAMPLES); EP->DMCR = EP_DMCR_EN | EP_DMCR_N_AVG_W(DMTD_AVG_SAMPLES);
} }
/* Enables/disables transmission and reception. When autoneg is set to 1, /* Enables/disables transmission and reception. When autoneg is set to 1,
starts up 802.3 autonegotiation process */ starts up 802.3 autonegotiation process */
int ep_enable(int enabled, int autoneg) int ep_enable(int enabled, int autoneg)
{ {
uint16_t mcr; uint16_t mcr;
if(!enabled) if (!enabled) {
{ EP->ECR = 0;
EP->ECR = 0; return 0;
return 0; }
}
/* Disable the endpoint */ /* Disable the endpoint */
EP->ECR = 0; EP->ECR = 0;
mprintf("ID: %x\n", EP->IDCODE); mprintf("ID: %x\n", EP->IDCODE);
/* Load default packet classifier rules - see ep_pfilter.c for details */ /* Load default packet classifier rules - see ep_pfilter.c for details */
pfilter_init_default(); pfilter_init_default();
/* Enable TX/RX paths, reset RMON counters */ /* Enable TX/RX paths, reset RMON counters */
EP->ECR = EP_ECR_TX_EN | EP_ECR_RX_EN | EP_ECR_RST_CNT; EP->ECR = EP_ECR_TX_EN | EP_ECR_RX_EN | EP_ECR_RST_CNT;
autoneg_enabled = autoneg; autoneg_enabled = autoneg;
/* Reset the GTP Transceiver - it's important to do the GTP phase alignment every time /* Reset the GTP Transceiver - it's important to do the GTP phase alignment every time
we start up the software, otherwise the calibration RX/TX deltas may not be correct */ we start up the software, otherwise the calibration RX/TX deltas may not be correct */
pcs_write(MDIO_REG_MCR, MDIO_MCR_PDOWN); /* reset the PHY */ pcs_write(MDIO_REG_MCR, MDIO_MCR_PDOWN); /* reset the PHY */
timer_delay(200); timer_delay(200);
pcs_write(MDIO_REG_MCR, MDIO_MCR_RESET); /* reset the PHY */ pcs_write(MDIO_REG_MCR, MDIO_MCR_RESET); /* reset the PHY */
pcs_write(MDIO_REG_MCR, 0); /* reset the PHY */ pcs_write(MDIO_REG_MCR, 0); /* reset the PHY */
/* Don't advertise anything - we don't want flow control */ /* Don't advertise anything - we don't want flow control */
pcs_write(MDIO_REG_ADVERTISE, 0); pcs_write(MDIO_REG_ADVERTISE, 0);
mcr = MDIO_MCR_SPEED1000_MASK | MDIO_MCR_FULLDPLX_MASK; mcr = MDIO_MCR_SPEED1000_MASK | MDIO_MCR_FULLDPLX_MASK;
if(autoneg) if (autoneg)
mcr |= MDIO_MCR_ANENABLE | MDIO_MCR_ANRESTART; mcr |= MDIO_MCR_ANENABLE | MDIO_MCR_ANRESTART;
pcs_write(MDIO_REG_MCR, mcr); pcs_write(MDIO_REG_MCR, mcr);
return 0; return 0;
} }
/* Checks the link status. If the link is up, returns non-zero /* Checks the link status. If the link is up, returns non-zero
and stores the Link Partner Ability (LPA) autonegotiation register at *lpa */ and stores the Link Partner Ability (LPA) autonegotiation register at *lpa */
int ep_link_up(uint16_t *lpa) int ep_link_up(uint16_t * lpa)
{ {
uint16_t flags = MDIO_MSR_LSTATUS; uint16_t flags = MDIO_MSR_LSTATUS;
volatile uint16_t msr; volatile uint16_t msr;
if(autoneg_enabled) if (autoneg_enabled)
flags |= MDIO_MSR_ANEGCOMPLETE; flags |= MDIO_MSR_ANEGCOMPLETE;
msr = pcs_read(MDIO_REG_MSR); msr = pcs_read(MDIO_REG_MSR);
msr = pcs_read(MDIO_REG_MSR); /* Read this flag twice to make sure the status is updated */ msr = pcs_read(MDIO_REG_MSR); /* Read this flag twice to make sure the status is updated */
if(lpa) *lpa = pcs_read(MDIO_REG_LPA); if (lpa)
*lpa = pcs_read(MDIO_REG_LPA);
return (msr & flags) == flags ? 1 : 0; return (msr & flags) == flags ? 1 : 0;
} }
/* Returns the TX/RX latencies. They are valid only when the link is up. */ /* Returns the TX/RX latencies. They are valid only when the link is up. */
int ep_get_deltas(uint32_t *delta_tx, uint32_t *delta_rx) int ep_get_deltas(uint32_t * delta_tx, uint32_t * delta_rx)
{ {
/* fixme: these values should be stored in calibration block in the EEPROM on the FMC. Also, the TX/RX delays of a particular SFP /* fixme: these values should be stored in calibration block in the EEPROM on the FMC. Also, the TX/RX delays of a particular SFP
should be added here */ should be added here */
*delta_tx = sfp_deltaTx; *delta_tx = sfp_deltaTx;
*delta_rx = sfp_deltaRx + PICOS_PER_SERIAL_BIT * MDIO_WR_SPEC_BSLIDE_R(pcs_read(MDIO_REG_WR_SPEC)); *delta_rx =
sfp_deltaRx +
PICOS_PER_SERIAL_BIT *
MDIO_WR_SPEC_BSLIDE_R(pcs_read(MDIO_REG_WR_SPEC));
return 0; return 0;
} }
int ep_cal_pattern_enable() int ep_cal_pattern_enable()
{ {
uint32_t val; uint32_t val;
val = pcs_read(MDIO_REG_WR_SPEC); val = pcs_read(MDIO_REG_WR_SPEC);
val |= MDIO_WR_SPEC_TX_CAL; val |= MDIO_WR_SPEC_TX_CAL;
pcs_write(MDIO_REG_WR_SPEC, val); pcs_write(MDIO_REG_WR_SPEC, val);
return 0; return 0;
} }
int ep_cal_pattern_disable() int ep_cal_pattern_disable()
{ {
uint32_t val; uint32_t val;
val = pcs_read(MDIO_REG_WR_SPEC); val = pcs_read(MDIO_REG_WR_SPEC);
val &= (~MDIO_WR_SPEC_TX_CAL); val &= (~MDIO_WR_SPEC_TX_CAL);
pcs_write(MDIO_REG_WR_SPEC, val); pcs_write(MDIO_REG_WR_SPEC, val);
return 0; return 0;
} }
dev/ep_pfilter.c
View file @ e625cbd9
This diff is collapsed.
dev/i2c.c
View file @ e625cbd9
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
void mi2c_delay() void mi2c_delay()
{ {
int i; int i;
for(i=0;i<I2C_DELAY;i++) asm volatile ("nop"); for (i = 0; i < I2C_DELAY; i++)
asm volatile ("nop");
} }
#define M_SDA_OUT(i, x) { gpio_out(i2c_if[i].sda, x); mi2c_delay(); } #define M_SDA_OUT(i, x) { gpio_out(i2c_if[i].sda, x); mi2c_delay(); }
...@@ -16,96 +17,92 @@ void mi2c_delay() ...@@ -16,96 +17,92 @@ void mi2c_delay()
void mi2c_start(uint8_t i2cif) void mi2c_start(uint8_t i2cif)
{ {
M_SDA_OUT(i2cif, 0); M_SDA_OUT(i2cif, 0);
M_SCL_OUT(i2cif, 0); M_SCL_OUT(i2cif, 0);
} }
void mi2c_repeat_start(uint8_t i2cif) void mi2c_repeat_start(uint8_t i2cif)
{ {
M_SDA_OUT(i2cif, 1); M_SDA_OUT(i2cif, 1);
M_SCL_OUT(i2cif, 1); M_SCL_OUT(i2cif, 1);
M_SDA_OUT(i2cif, 0); M_SDA_OUT(i2cif, 0);
M_SCL_OUT(i2cif, 0); M_SCL_OUT(i2cif, 0);
} }
void mi2c_stop(uint8_t i2cif) void mi2c_stop(uint8_t i2cif)
{ {
M_SDA_OUT(i2cif, 0); M_SDA_OUT(i2cif, 0);
M_SCL_OUT(i2cif, 1); M_SCL_OUT(i2cif, 1);
M_SDA_OUT(i2cif, 1); M_SDA_OUT(i2cif, 1);
} }
unsigned char mi2c_put_byte(uint8_t i2cif, unsigned char data) unsigned char mi2c_put_byte(uint8_t i2cif, unsigned char data)
{ {
char i; char i;
unsigned char ack; unsigned char ack;
for (i=0;i<8;i++, data<<=1) for (i = 0; i < 8; i++, data <<= 1) {
{ M_SDA_OUT(i2cif, data & 0x80);
M_SDA_OUT(i2cif, data&0x80); M_SCL_OUT(i2cif, 1);
M_SCL_OUT(i2cif, 1); M_SCL_OUT(i2cif, 0);
M_SCL_OUT(i2cif, 0); }
}
M_SDA_OUT(i2cif, 1); M_SDA_OUT(i2cif, 1);
M_SCL_OUT(i2cif, 1); M_SCL_OUT(i2cif, 1);
ack = M_SDA_IN(i2cif); /* ack: sda is pulled low ->success. */ ack = M_SDA_IN(i2cif); /* ack: sda is pulled low ->success. */
M_SCL_OUT(i2cif, 0); M_SCL_OUT(i2cif, 0);
M_SDA_OUT(i2cif, 0); M_SDA_OUT(i2cif, 0);
return ack!=0; return ack != 0;
} }
void mi2c_get_byte(uint8_t i2cif, unsigned char *data, uint8_t last) void mi2c_get_byte(uint8_t i2cif, unsigned char *data, uint8_t last)
{ {
int i; int i;
unsigned char indata = 0; unsigned char indata = 0;
M_SDA_OUT(i2cif, 1); M_SDA_OUT(i2cif, 1);
/* assert: scl is low */ /* assert: scl is low */
M_SCL_OUT(i2cif, 0); M_SCL_OUT(i2cif, 0);
for (i=0;i<8;i++) for (i = 0; i < 8; i++) {
{ M_SCL_OUT(i2cif, 1);
M_SCL_OUT(i2cif, 1); indata <<= 1;
indata <<= 1; if (M_SDA_IN(i2cif))
if ( M_SDA_IN(i2cif) ) indata |= 0x01; indata |= 0x01;
M_SCL_OUT(i2cif, 0); M_SCL_OUT(i2cif, 0);
} }
if(last) if (last) {
{ M_SDA_OUT(i2cif, 1); //noack
M_SDA_OUT(i2cif, 1); //noack M_SCL_OUT(i2cif, 1);
M_SCL_OUT(i2cif, 1); M_SCL_OUT(i2cif, 0);
M_SCL_OUT(i2cif, 0); } else {
} M_SDA_OUT(i2cif, 0); //ack
else M_SCL_OUT(i2cif, 1);
{ M_SCL_OUT(i2cif, 0);
M_SDA_OUT(i2cif, 0); //ack }
M_SCL_OUT(i2cif, 1);
M_SCL_OUT(i2cif, 0); *data = indata;
}
*data= indata;
} }
void mi2c_init(uint8_t i2cif) void mi2c_init(uint8_t i2cif)
{ {
M_SCL_OUT(i2cif, 1); M_SCL_OUT(i2cif, 1);
M_SDA_OUT(i2cif, 1); M_SDA_OUT(i2cif, 1);
} }
uint8_t mi2c_devprobe(uint8_t i2cif, uint8_t i2c_addr) uint8_t mi2c_devprobe(uint8_t i2cif, uint8_t i2c_addr)
{ {
uint8_t ret; uint8_t ret;
mi2c_start(i2cif); mi2c_start(i2cif);
ret = !mi2c_put_byte(i2cif, i2c_addr<<1); ret = !mi2c_put_byte(i2cif, i2c_addr << 1);
mi2c_stop(i2cif); mi2c_stop(i2cif);
return ret; return ret;
} }
//void mi2c_scan(uint8_t i2cif) //void mi2c_scan(uint8_t i2cif)
......
dev/minic.c
View file @ e625cbd9
This diff is collapsed.
dev/onewire.c
View file @ e625cbd9
...@@ -10,106 +10,115 @@ uint8_t found_msk; ...@@ -10,106 +10,115 @@ uint8_t found_msk;
void own_scanbus(uint8_t portnum) void own_scanbus(uint8_t portnum)
{ {
// Find the device(s) // Find the device(s)
found_msk = 0; found_msk = 0;
devsnum = 0; devsnum = 0;
devsnum += FindDevices(portnum, &FamilySN[devsnum], 0x28, MAX_DEV1WIRE - devsnum); /* Temperature 28 sensor (SPEC) */ devsnum += FindDevices(portnum, &FamilySN[devsnum], 0x28, MAX_DEV1WIRE - devsnum); /* Temperature 28 sensor (SPEC) */
if(devsnum>0) found_msk |= FOUND_DS18B20; if (devsnum > 0)
devsnum += FindDevices(portnum, &FamilySN[devsnum], 0x42, MAX_DEV1WIRE - devsnum); /* Temperature 42 sensor (SCU) */ found_msk |= FOUND_DS18B20;
devsnum += FindDevices(portnum, &FamilySN[devsnum], 0x43, MAX_DEV1WIRE - devsnum); /* EEPROM */ devsnum += FindDevices(portnum, &FamilySN[devsnum], 0x42, MAX_DEV1WIRE - devsnum); /* Temperature 42 sensor (SCU) */
devsnum += FindDevices(portnum, &FamilySN[devsnum], 0x43, MAX_DEV1WIRE - devsnum); /* EEPROM */
#if DEBUG_PMAC #if DEBUG_PMAC
mprintf("Found %d onewire devices\n", devsnum); mprintf("Found %d onewire devices\n", devsnum);
#endif #endif
} }
int16_t own_readtemp(uint8_t portnum, int16_t *temp, int16_t *t_frac) int16_t own_readtemp(uint8_t portnum, int16_t * temp, int16_t * t_frac)
{ {
if(!(found_msk & FOUND_DS18B20)) if (!(found_msk & FOUND_DS18B20))
return -1; return -1;
if(ReadTemperature28(portnum, FamilySN[0], temp)) if (ReadTemperature28(portnum, FamilySN[0], temp)) {
{ *t_frac =
*t_frac = 5000*(!!(*temp & 0x08)) + 2500*(!!(*temp & 0x04)) + 1250*(!!(*temp & 0x02)) + 5000 * (! !(*temp & 0x08)) + 2500 * (! !(*temp & 0x04)) +
625*(!!(*temp & 0x01)); 1250 * (! !(*temp & 0x02)) + 625 * (! !(*temp & 0x01));
*t_frac = *t_frac/100 + (*t_frac%100)/50; *t_frac = *t_frac / 100 + (*t_frac % 100) / 50;
*temp >>= 4; *temp >>= 4;
return 0; return 0;
} }
return -1; return -1;
} }
/* 0 = success, -1 = error */ /* 0 = success, -1 = error */
int8_t get_persistent_mac(uint8_t portnum, uint8_t* mac) int8_t get_persistent_mac(uint8_t portnum, uint8_t * mac)
{ {
uint8_t read_buffer[32]; uint8_t read_buffer[32];
uint8_t i; uint8_t i;
int8_t out; int8_t out;
out = -1; out = -1;
if(devsnum == 0) return out; if (devsnum == 0)
return out;
for (i = 0; i < devsnum; ++i) { for (i = 0; i < devsnum; ++i) {
//#if DEBUG_PMAC //#if DEBUG_PMAC
mprintf("Found device: %x:%x:%x:%x:%x:%x:%x:%x\n", mprintf("Found device: %x:%x:%x:%x:%x:%x:%x:%x\n",
FamilySN[i][7], FamilySN[i][6], FamilySN[i][5], FamilySN[i][4], FamilySN[i][7], FamilySN[i][6], FamilySN[i][5], FamilySN[i][4],
FamilySN[i][3], FamilySN[i][2], FamilySN[i][1], FamilySN[i][0]); FamilySN[i][3], FamilySN[i][2], FamilySN[i][1], FamilySN[i][0]);
//#endif //#endif
/* If there is a temperature sensor, use it for the low three MAC values */ /* If there is a temperature sensor, use it for the low three MAC values */
if (FamilySN[i][0] == 0x28 || FamilySN[i][0] == 0x42) { if (FamilySN[i][0] == 0x28 || FamilySN[i][0] == 0x42) {
mac[3] = FamilySN[i][3]; mac[3] = FamilySN[i][3];
mac[4] = FamilySN[i][2]; mac[4] = FamilySN[i][2];
mac[5] = FamilySN[i][1]; mac[5] = FamilySN[i][1];
out = 0; out = 0;
#if DEBUG_PMAC #if DEBUG_PMAC
mprintf("Using temperature ID for MAC\n"); mprintf("Using temperature ID for MAC\n");
#endif #endif
} }
/* If there is an EEPROM, read page 0 for the MAC */ /* If there is an EEPROM, read page 0 for the MAC */
if (FamilySN[i][0] == 0x43) { if (FamilySN[i][0] == 0x43) {
owLevel(portnum, MODE_NORMAL); owLevel(portnum, MODE_NORMAL);
if (ReadMem43(portnum, FamilySN[i], EEPROM_MAC_PAGE, &read_buffer) == TRUE) { if (ReadMem43(portnum, FamilySN[i], EEPROM_MAC_PAGE,
if (read_buffer[0] == 0 && read_buffer[1] == 0 && read_buffer[2] == 0) { &read_buffer) == TRUE) {
/* Skip the EEPROM since it has not been programmed! */ if (read_buffer[0] == 0 && read_buffer[1] == 0
&& read_buffer[2] == 0) {
/* Skip the EEPROM since it has not been programmed! */
#if DEBUG_PMAC #if DEBUG_PMAC
mprintf("EEPROM has not been programmed with a MAC\n"); mprintf("EEPROM has not been "
"programmed with a MAC\n");
#endif #endif
} else { } else {
memcpy(mac, read_buffer, 6); memcpy(mac, read_buffer, 6);
out = 0; out = 0;
#if DEBUG_PMAC #if DEBUG_PMAC
mprintf("Using EEPROM page: %x:%x:%x:%x:%x:%x\n", mprintf("Using EEPROM page: "
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); "%x:%x:%x:%x:%x:%x\n",
mac[0], mac[1], mac[2], mac[3],
mac[4], mac[5]);
#endif #endif
} }
} }
} }
} }
return out; return out;
} }
/* 0 = success, -1 = error */ /* 0 = success, -1 = error */
int8_t set_persistent_mac(uint8_t portnum, uint8_t* mac) int8_t set_persistent_mac(uint8_t portnum, uint8_t * mac)
{ {
uint8_t FamilySN[1][8]; uint8_t FamilySN[1][8];
uint8_t write_buffer[32]; uint8_t write_buffer[32];
// Find the device (only the first one, we won't write MAC to all EEPROMs out there, right?) // Find the device (only the first one, we won't write MAC to all EEPROMs out there, right?)
if( FindDevices(portnum, &FamilySN[0], 0x43, 1) == 0) return -1; if (FindDevices(portnum, &FamilySN[0], 0x43, 1) == 0)
return -1;
memset(write_buffer, 0, sizeof(write_buffer)); memset(write_buffer, 0, sizeof(write_buffer));
memcpy(write_buffer, mac, 6); memcpy(write_buffer, mac, 6);
#if DEBUG_PMAC #if DEBUG_PMAC
mprintf("Writing to EEPROM\n"); mprintf("Writing to EEPROM\n");
#endif #endif
/* Write the last EEPROM with the MAC */ /* Write the last EEPROM with the MAC */
owLevel(portnum, MODE_NORMAL); owLevel(portnum, MODE_NORMAL);
if (Write43(portnum, FamilySN[0], EEPROM_MAC_PAGE, &write_buffer) == TRUE) if (Write43(portnum, FamilySN[0], EEPROM_MAC_PAGE, &write_buffer) ==
return 0; TRUE)
return 0;
return -1; return -1;
} }
dev/pps_gen.c
View file @ e625cbd9
...@@ -24,50 +24,54 @@ int pps_gen_init() ...@@ -24,50 +24,54 @@ int pps_gen_init()
cr = PPSG_CR_CNT_EN | PPSG_CR_PWIDTH_W(PPS_WIDTH); cr = PPSG_CR_CNT_EN | PPSG_CR_PWIDTH_W(PPS_WIDTH);
ppsg_write(CR, cr); ppsg_write(CR, cr);
ppsg_write(ADJ_UTCLO, 0); ppsg_write(ADJ_UTCLO, 0);
ppsg_write(ADJ_UTCHI, 0); ppsg_write(ADJ_UTCHI, 0);
ppsg_write(ADJ_NSEC, 0); ppsg_write(ADJ_NSEC, 0);
ppsg_write(CR, cr | PPSG_CR_CNT_SET); ppsg_write(CR, cr | PPSG_CR_CNT_SET);
ppsg_write(CR, cr); ppsg_write(CR, cr);
ppsg_write(ESCR, 0x6); /* enable PPS output */ ppsg_write(ESCR, 0x6); /* enable PPS output */
} }
/* Adjusts the nanosecond (refclk cycle) counter by atomically adding (how_much) cycles. */ /* Adjusts the nanosecond (refclk cycle) counter by atomically adding (how_much) cycles. */
int pps_gen_adjust(int counter, int64_t how_much) int pps_gen_adjust(int counter, int64_t how_much)
{ {
uint32_t cr; uint32_t cr;
TRACE_DEV("Adjust: counter = %s [%c%d]\n", TRACE_DEV("Adjust: counter = %s [%c%d]\n",
counter == PPSG_ADJUST_SEC ? "seconds" : "nanoseconds", how_much<0?'-':'+', (int32_t)abs(how_much)); counter == PPSG_ADJUST_SEC ? "seconds" : "nanoseconds",
how_much < 0 ? '-' : '+', (int32_t) abs(how_much));
if(counter == PPSG_ADJUST_NSEC) if (counter == PPSG_ADJUST_NSEC) {
{ ppsg_write(ADJ_UTCLO, 0);
ppsg_write(ADJ_UTCLO, 0); ppsg_write(ADJ_UTCHI, 0);
ppsg_write(ADJ_UTCHI, 0); ppsg_write(ADJ_NSEC,
ppsg_write(ADJ_NSEC, (int32_t) ((int64_t) how_much * 1000LL / (int64_t)REF_CLOCK_PERIOD_PS)); (int32_t) ((int64_t) how_much * 1000LL /
(int64_t) REF_CLOCK_PERIOD_PS));
} else { } else {
ppsg_write(ADJ_UTCLO, (uint32_t ) (how_much & 0xffffffffLL)); ppsg_write(ADJ_UTCLO, (uint32_t) (how_much & 0xffffffffLL));
ppsg_write(ADJ_UTCHI, (uint32_t ) (how_much >> 32) & 0xff); ppsg_write(ADJ_UTCHI, (uint32_t) (how_much >> 32) & 0xff);
ppsg_write(ADJ_NSEC, 0); ppsg_write(ADJ_NSEC, 0);
} }
ppsg_write(CR, ppsg_read(CR) | PPSG_CR_CNT_ADJ); ppsg_write(CR, ppsg_read(CR) | PPSG_CR_CNT_ADJ);
return 0; return 0;
} }
/* Sets the current time */ /* Sets the current time */
int pps_gen_set_time(uint64_t seconds, uint32_t nanoseconds) int pps_gen_set_time(uint64_t seconds, uint32_t nanoseconds)
{ {
uint32_t cr; uint32_t cr;
ppsg_write(ADJ_UTCLO, (uint32_t ) (seconds & 0xffffffffLL)); ppsg_write(ADJ_UTCLO, (uint32_t) (seconds & 0xffffffffLL));
ppsg_write(ADJ_UTCHI, (uint32_t ) (seconds >> 32) & 0xff); ppsg_write(ADJ_UTCHI, (uint32_t) (seconds >> 32) & 0xff);
ppsg_write(ADJ_NSEC, (int32_t) ((int64_t) nanoseconds * 1000LL / (int64_t)REF_CLOCK_PERIOD_PS)); ppsg_write(ADJ_NSEC,
(int32_t) ((int64_t) nanoseconds * 1000LL /
(int64_t) REF_CLOCK_PERIOD_PS));
ppsg_write(CR, (ppsg_read(CR) & 0xfffffffb) | PPSG_CR_CNT_SET); ppsg_write(CR, (ppsg_read(CR) & 0xfffffffb) | PPSG_CR_CNT_SET);
return 0; return 0;
} }
...@@ -76,45 +80,51 @@ uint64_t pps_get_utc(void) ...@@ -76,45 +80,51 @@ uint64_t pps_get_utc(void)
uint64_t out; uint64_t out;
uint32_t low, high; uint32_t low, high;
low = ppsg_read(CNTR_UTCLO); low = ppsg_read(CNTR_UTCLO);
high = ppsg_read(CNTR_UTCHI); high = ppsg_read(CNTR_UTCHI);
high &= 0xFF; /* CNTR_UTCHI has only 8 bits defined -- rest are HDL don't care */ high &= 0xFF; /* CNTR_UTCHI has only 8 bits defined -- rest are HDL don't care */
out = (uint64_t)low | (uint64_t)high << 32; out = (uint64_t) low | (uint64_t) high << 32;
return out; return out;
} }
void pps_gen_get_time(uint64_t *seconds, uint32_t *nanoseconds) void pps_gen_get_time(uint64_t * seconds, uint32_t * nanoseconds)
{ {
uint32_t ns_cnt; uint32_t ns_cnt;
uint64_t sec1, sec2; uint64_t sec1, sec2;
do { do {
sec1 = pps_get_utc(); sec1 = pps_get_utc();
ns_cnt = ppsg_read(CNTR_NSEC) & 0xFFFFFFFUL; /* 28-bit wide register */ ns_cnt = ppsg_read(CNTR_NSEC) & 0xFFFFFFFUL; /* 28-bit wide register */
sec2 = pps_get_utc(); sec2 = pps_get_utc();
} while(sec2 != sec1); } while (sec2 != sec1);
if(seconds) *seconds = sec2; if (seconds)
if(nanoseconds) *nanoseconds = (uint32_t) ((int64_t)ns_cnt * (int64_t) REF_CLOCK_PERIOD_PS / 1000LL); *seconds = sec2;
if (nanoseconds)
*nanoseconds =
(uint32_t) ((int64_t) ns_cnt *
(int64_t) REF_CLOCK_PERIOD_PS / 1000LL);
} }
/* Returns 1 when the adjustment operation is not yet finished */ /* Returns 1 when the adjustment operation is not yet finished */
int pps_gen_busy() int pps_gen_busy()
{ {
uint32_t cr = ppsg_read(CR); uint32_t cr = ppsg_read(CR);
return cr & PPSG_CR_CNT_ADJ ? 0 : 1; return cr & PPSG_CR_CNT_ADJ ? 0 : 1;
} }
/* Enables/disables PPS output */ /* Enables/disables PPS output */
int pps_gen_enable_output(int enable) int pps_gen_enable_output(int enable)
{ {
uint32_t escr = ppsg_read(ESCR); uint32_t escr = ppsg_read(ESCR);
if(enable) if (enable)
ppsg_write(ESCR, escr | PPSG_ESCR_PPS_VALID | PPSG_ESCR_TM_VALID); ppsg_write(ESCR,
else escr | PPSG_ESCR_PPS_VALID | PPSG_ESCR_TM_VALID);
ppsg_write(ESCR, escr & ~(PPSG_ESCR_PPS_VALID | PPSG_ESCR_TM_VALID)); else
ppsg_write(ESCR,
escr & ~(PPSG_ESCR_PPS_VALID | PPSG_ESCR_TM_VALID));
return 0; return 0;
} }
dev/sdb.c
View file @ e625cbd9
...@@ -6,123 +6,135 @@ ...@@ -6,123 +6,135 @@
#define SDB_EMPTY 0xFF #define SDB_EMPTY 0xFF
typedef struct pair64 { typedef struct pair64 {
uint32_t high; uint32_t high;
uint32_t low; uint32_t low;
} pair64_t; } pair64_t;
struct sdb_empty { struct sdb_empty {
int8_t reserved[63]; int8_t reserved[63];
uint8_t record_type; uint8_t record_type;
}; };
struct sdb_product { struct sdb_product {
pair64_t vendor_id; pair64_t vendor_id;
uint32_t device_id; uint32_t device_id;
uint32_t version; uint32_t version;
uint32_t date; uint32_t date;
int8_t name[19]; int8_t name[19];
uint8_t record_type; uint8_t record_type;
}; };
struct sdb_component { struct sdb_component {
pair64_t addr_first; pair64_t addr_first;
pair64_t addr_last; pair64_t addr_last;
struct sdb_product product; struct sdb_product product;
}; };
struct sdb_device { struct sdb_device {
uint16_t abi_class; uint16_t abi_class;
uint8_t abi_ver_major; uint8_t abi_ver_major;
uint8_t abi_ver_minor; uint8_t abi_ver_minor;
uint32_t bus_specific; uint32_t bus_specific;
struct sdb_component sdb_component; struct sdb_component sdb_component;
}; };
struct sdb_bridge { struct sdb_bridge {
pair64_t sdb_child; pair64_t sdb_child;
struct sdb_component sdb_component; struct sdb_component sdb_component;
}; };
struct sdb_interconnect { struct sdb_interconnect {
uint32_t sdb_magic; uint32_t sdb_magic;
uint16_t sdb_records; uint16_t sdb_records;
uint8_t sdb_version; uint8_t sdb_version;
uint8_t sdb_bus_type; uint8_t sdb_bus_type;
struct sdb_component sdb_component; struct sdb_component sdb_component;
}; };
typedef union sdb_record { typedef union sdb_record {
struct sdb_empty empty; struct sdb_empty empty;
struct sdb_device device; struct sdb_device device;
struct sdb_bridge bridge; struct sdb_bridge bridge;
struct sdb_interconnect interconnect; struct sdb_interconnect interconnect;
} sdb_record_t; } sdb_record_t;
static unsigned char* find_device_deep(unsigned int base, unsigned int sdb, unsigned int devid) { static unsigned char *find_device_deep(unsigned int base, unsigned int sdb,
sdb_record_t* record = (sdb_record_t*)sdb; unsigned int devid)
int records = record->interconnect.sdb_records; {
int i; sdb_record_t *record = (sdb_record_t *) sdb;
int records = record->interconnect.sdb_records;
for (i = 0; i < records; ++i, ++record) { int i;
if (record->empty.record_type == SDB_BRIDGE) {
unsigned char* out = for (i = 0; i < records; ++i, ++record) {
find_device_deep( if (record->empty.record_type == SDB_BRIDGE) {
base + record->bridge.sdb_component.addr_first.low, unsigned char *out =
record->bridge.sdb_child.low, find_device_deep(base +
devid); record->bridge.sdb_component.
if (out) return out; addr_first.low,
} record->bridge.sdb_child.low,
if (record->empty.record_type == SDB_DEVICE && devid);
record->device.sdb_component.product.device_id == devid) { if (out)
break; return out;
} }
} if (record->empty.record_type == SDB_DEVICE &&
record->device.sdb_component.product.device_id == devid) {
if (i == records) return 0; break;
return (unsigned char*)(base + record->device.sdb_component.addr_first.low); }
}
if (i == records)
return 0;
return (unsigned char *)(base +
record->device.sdb_component.addr_first.low);
} }
static void print_devices_deep(unsigned int base, unsigned int sdb) { static void print_devices_deep(unsigned int base, unsigned int sdb)
sdb_record_t* record = (sdb_record_t*)sdb; {
int records = record->interconnect.sdb_records; sdb_record_t *record = (sdb_record_t *) sdb;
int i; int records = record->interconnect.sdb_records;
char buf[20]; int i;
char buf[20];
for (i = 0; i < records; ++i, ++record) {
if (record->empty.record_type == SDB_BRIDGE) for (i = 0; i < records; ++i, ++record) {
print_devices_deep( if (record->empty.record_type == SDB_BRIDGE)
base + record->bridge.sdb_component.addr_first.low, print_devices_deep(base +
record->bridge.sdb_child.low); record->bridge.sdb_component.
addr_first.low,
if (record->empty.record_type != SDB_DEVICE) continue; record->bridge.sdb_child.low);
memcpy(buf, record->device.sdb_component.product.name, 19); if (record->empty.record_type != SDB_DEVICE)
buf[19] = 0; continue;
mprintf("%8x:%8x 0x%8x %s\n",
record->device.sdb_component.product.vendor_id.low, memcpy(buf, record->device.sdb_component.product.name, 19);
record->device.sdb_component.product.device_id, buf[19] = 0;
base + record->device.sdb_component.addr_first.low, mprintf("%8x:%8x 0x%8x %s\n",
buf); record->device.sdb_component.product.vendor_id.low,
} record->device.sdb_component.product.device_id,
base + record->device.sdb_component.addr_first.low,
buf);
}
} }
static unsigned char* find_device(unsigned int devid) { static unsigned char *find_device(unsigned int devid)
find_device_deep(0, SDB_ADDRESS, devid); {
find_device_deep(0, SDB_ADDRESS, devid);
} }
void sdb_print_devices(void) { void sdb_print_devices(void)
mprintf("SDB memory map:\n"); {
print_devices_deep(0, SDB_ADDRESS); mprintf("SDB memory map:\n");
mprintf("---\n"); print_devices_deep(0, SDB_ADDRESS);
mprintf("---\n");
} }
void sdb_find_devices(void) { void sdb_find_devices(void)
BASE_MINIC = find_device(0xab28633a); {
BASE_EP = find_device(0x650c2d4f); BASE_MINIC = find_device(0xab28633a);
BASE_SOFTPLL = find_device(0x65158dc0); BASE_EP = find_device(0x650c2d4f);
BASE_PPS_GEN = find_device(0xde0d8ced); BASE_SOFTPLL = find_device(0x65158dc0);
BASE_SYSCON = find_device(0xff07fc47); BASE_PPS_GEN = find_device(0xde0d8ced);
BASE_UART = find_device(0xe2d13d04); BASE_SYSCON = find_device(0xff07fc47);
BASE_ONEWIRE = find_device(0x779c5443); BASE_UART = find_device(0xe2d13d04);
BASE_ETHERBONE_CFG = find_device(0x68202b22); BASE_ONEWIRE = find_device(0x779c5443);
BASE_ETHERBONE_CFG = find_device(0x68202b22);
} }
dev/sfp.c
View file @ e625cbd9
...@@ -16,32 +16,31 @@ int sfp_read_part_id(char *part_id) ...@@ -16,32 +16,31 @@ int sfp_read_part_id(char *part_id)
{ {
int i; int i;
uint8_t data, sum; uint8_t data, sum;
mi2c_init(WRPC_SFP_I2C); mi2c_init(WRPC_SFP_I2C);
mi2c_start(WRPC_SFP_I2C); mi2c_start(WRPC_SFP_I2C);
mi2c_put_byte(WRPC_SFP_I2C, 0xA0); mi2c_put_byte(WRPC_SFP_I2C, 0xA0);
mi2c_put_byte(WRPC_SFP_I2C, 0x00); mi2c_put_byte(WRPC_SFP_I2C, 0x00);
mi2c_repeat_start(WRPC_SFP_I2C); mi2c_repeat_start(WRPC_SFP_I2C);
mi2c_put_byte(WRPC_SFP_I2C, 0xA1); mi2c_put_byte(WRPC_SFP_I2C, 0xA1);
mi2c_get_byte(WRPC_SFP_I2C, &data, 1); mi2c_get_byte(WRPC_SFP_I2C, &data, 1);
mi2c_stop(WRPC_SFP_I2C); mi2c_stop(WRPC_SFP_I2C);
sum = data; sum = data;
mi2c_start(WRPC_SFP_I2C); mi2c_start(WRPC_SFP_I2C);
mi2c_put_byte(WRPC_SFP_I2C, 0xA1); mi2c_put_byte(WRPC_SFP_I2C, 0xA1);
for(i=1; i<63; ++i) for (i = 1; i < 63; ++i) {
{ mi2c_get_byte(WRPC_SFP_I2C, &data, 0);
mi2c_get_byte(WRPC_SFP_I2C, &data, 0); sum = (uint8_t) ((uint16_t) sum + data) & 0xff;
sum = (uint8_t) ((uint16_t)sum + data) & 0xff; if (i >= 40 && i <= 55) //Part Number
if(i>=40 && i<=55) //Part Number part_id[i - 40] = data;
part_id[i-40] = data; }
} mi2c_get_byte(WRPC_SFP_I2C, &data, 1); //final word, checksum
mi2c_get_byte(WRPC_SFP_I2C, &data, 1); //final word, checksum mi2c_stop(WRPC_SFP_I2C);
mi2c_stop(WRPC_SFP_I2C);
if (sum == data)
if(sum == data) return 0;
return 0;
return -1;
return -1;
} }
dev/syscon.c
View file @ e625cbd9
#include "syscon.h" #include "syscon.h"
struct s_i2c_if i2c_if[2] = { {SYSC_GPSR_FMC_SCL, SYSC_GPSR_FMC_SDA}, struct s_i2c_if i2c_if[2] = {
{SYSC_GPSR_SFP_SCL, SYSC_GPSR_SFP_SDA} }; {SYSC_GPSR_FMC_SCL, SYSC_GPSR_FMC_SDA},
{SYSC_GPSR_SFP_SCL, SYSC_GPSR_SFP_SDA}
};
volatile struct SYSCON_WB *syscon; volatile struct SYSCON_WB *syscon;
...@@ -10,28 +12,27 @@ volatile struct SYSCON_WB *syscon; ...@@ -10,28 +12,27 @@ volatile struct SYSCON_WB *syscon;
***************************/ ***************************/
void timer_init(uint32_t enable) void timer_init(uint32_t enable)
{ {
syscon = (volatile struct SYSCON_WB *) BASE_SYSCON; syscon = (volatile struct SYSCON_WB *)BASE_SYSCON;
if(enable) if (enable)
syscon->TCR |= SYSC_TCR_ENABLE; syscon->TCR |= SYSC_TCR_ENABLE;
else else
syscon->TCR &= ~SYSC_TCR_ENABLE; syscon->TCR &= ~SYSC_TCR_ENABLE;
} }
uint32_t timer_get_tics() uint32_t timer_get_tics()
{ {
return syscon->TVR; return syscon->TVR;
} }
void timer_delay(uint32_t how_long) void timer_delay(uint32_t how_long)
{ {
uint32_t t_start; uint32_t t_start;
// timer_init(1); // timer_init(1);
do do {
{ t_start = timer_get_tics();
t_start = timer_get_tics(); } while (t_start > UINT32_MAX - how_long); //in case of overflow
} while(t_start > UINT32_MAX - how_long); //in case of overflow
while(t_start + how_long > timer_get_tics()); while (t_start + how_long > timer_get_tics()) ;
} }
dev/timer.c
View file @ e625cbd9
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
uint32_t timer_get_tics() uint32_t timer_get_tics()
{ {
return *(volatile uint32_t *) (BASE_TIMER); return *(volatile uint32_t *)(BASE_TIMER);
} }
void timer_delay(uint32_t how_long) void timer_delay(uint32_t how_long)
{ {
uint32_t t_start; uint32_t t_start;
t_start = timer_get_tics(); t_start = timer_get_tics();
while(t_start + how_long > timer_get_tics()); while (t_start + how_long > timer_get_tics()) ;
} }
dev/uart.c
View file @ e625cbd9
...@@ -13,16 +13,15 @@ volatile struct UART_WB *uart; ...@@ -13,16 +13,15 @@ volatile struct UART_WB *uart;
void uart_init() void uart_init()
{ {
uart = (volatile struct UART_WB *) BASE_UART; uart = (volatile struct UART_WB *)BASE_UART;
uart->BCR = CALC_BAUD(UART_BAUDRATE); uart->BCR = CALC_BAUD(UART_BAUDRATE);
} }
void uart_write_byte(int b) void uart_write_byte(int b)
{ {
if(b == '\n') if (b == '\n')
uart_write_byte('\r'); uart_write_byte('\r');
while(uart->SR & UART_SR_TX_BUSY) while (uart->SR & UART_SR_TX_BUSY) ;
;
uart->TDR = b; uart->TDR = b;
} }
...@@ -34,13 +33,13 @@ void uart_write_string(char *s) ...@@ -34,13 +33,13 @@ void uart_write_string(char *s)
int uart_poll() int uart_poll()
{ {
return uart->SR & UART_SR_RX_RDY; return uart->SR & UART_SR_RX_RDY;
} }
int uart_read_byte() int uart_read_byte()
{ {
if(!uart_poll()) if (!uart_poll())
return -1; return -1;
return uart->RDR & 0xff; return uart->RDR & 0xff;
} }
\ No newline at end of file
include/eeprom.h
View file @ e625cbd9
...@@ -19,28 +19,32 @@ extern int32_t sfp_deltaRx; ...@@ -19,28 +19,32 @@ extern int32_t sfp_deltaRx;
extern uint32_t cal_phase_transition; extern uint32_t cal_phase_transition;
extern uint8_t has_eeprom; extern uint8_t has_eeprom;
struct s_sfpinfo struct s_sfpinfo {
{ char pn[SFP_PN_LEN];
char pn[SFP_PN_LEN]; int32_t alpha;
int32_t alpha; int32_t dTx;
int32_t dTx; int32_t dRx;
int32_t dRx; uint8_t chksum;
uint8_t chksum; } __attribute__ ((__packed__));
} __attribute__((__packed__));
uint8_t eeprom_present(uint8_t i2cif, uint8_t i2c_addr); uint8_t eeprom_present(uint8_t i2cif, uint8_t i2c_addr);
int eeprom_read(uint8_t i2cif, uint8_t i2c_addr, uint32_t offset, uint8_t *buf, size_t size); int eeprom_read(uint8_t i2cif, uint8_t i2c_addr, uint32_t offset, uint8_t * buf,
int eeprom_write(uint8_t i2cif, uint8_t i2c_addr, uint32_t offset, uint8_t *buf, size_t size); size_t size);
int eeprom_write(uint8_t i2cif, uint8_t i2c_addr, uint32_t offset,
uint8_t * buf, size_t size);
int32_t eeprom_sfpdb_erase(uint8_t i2cif, uint8_t i2c_addr); int32_t eeprom_sfpdb_erase(uint8_t i2cif, uint8_t i2c_addr);
int32_t eeprom_sfp_section(uint8_t i2cif, uint8_t i2c_addr, size_t size, uint16_t *section_sz); int32_t eeprom_sfp_section(uint8_t i2cif, uint8_t i2c_addr, size_t size,
int8_t eeprom_match_sfp(uint8_t i2cif, uint8_t i2c_addr, struct s_sfpinfo* sfp); uint16_t * section_sz);
int8_t eeprom_match_sfp(uint8_t i2cif, uint8_t i2c_addr, struct s_sfpinfo *sfp);
int8_t eeprom_phtrans(uint8_t i2cif, uint8_t i2c_addr, uint32_t *val, uint8_t write); int8_t eeprom_phtrans(uint8_t i2cif, uint8_t i2c_addr, uint32_t * val,
uint8_t write);
int8_t eeprom_init_erase(uint8_t i2cif, uint8_t i2c_addr); int8_t eeprom_init_erase(uint8_t i2cif, uint8_t i2c_addr);
int8_t eeprom_init_add(uint8_t i2cif, uint8_t i2c_addr, const char *args[]); int8_t eeprom_init_add(uint8_t i2cif, uint8_t i2c_addr, const char *args[]);
int32_t eeprom_init_show(uint8_t i2cif, uint8_t i2c_addr); int32_t eeprom_init_show(uint8_t i2cif, uint8_t i2c_addr);
int8_t eeprom_init_readcmd(uint8_t i2cif, uint8_t i2c_addr, char* buf, uint8_t bufsize, uint8_t next); int8_t eeprom_init_readcmd(uint8_t i2cif, uint8_t i2c_addr, char *buf,
uint8_t bufsize, uint8_t next);
#endif #endif
include/endpoint.h
View file @ e625cbd9
...@@ -7,23 +7,23 @@ ...@@ -7,23 +7,23 @@
#include <stdint.h> #include <stdint.h>
typedef enum { typedef enum {
AND=0, AND = 0,
NAND=4, NAND = 4,
OR=1, OR = 1,
NOR=5, NOR = 5,
XOR=2, XOR = 2,
XNOR=6, XNOR = 6,
MOV=3, MOV = 3,
NOT=7 NOT = 7
} pfilter_op_t; } pfilter_op_t;
void ep_init(uint8_t mac_addr[]); void ep_init(uint8_t mac_addr[]);
void get_mac_addr(uint8_t dev_addr[]); void get_mac_addr(uint8_t dev_addr[]);
void set_mac_addr(uint8_t dev_addr[]); void set_mac_addr(uint8_t dev_addr[]);
int ep_enable(int enabled, int autoneg); int ep_enable(int enabled, int autoneg);
int ep_link_up(uint16_t *lpa); int ep_link_up(uint16_t * lpa);
int ep_get_deltas(uint32_t *delta_tx, uint32_t *delta_rx); int ep_get_deltas(uint32_t * delta_tx, uint32_t * delta_rx);
int ep_get_psval(int32_t *psval); int ep_get_psval(int32_t * psval);
int ep_cal_pattern_enable(); int ep_cal_pattern_enable();
int ep_cal_pattern_disable(); int ep_cal_pattern_disable();
...@@ -32,7 +32,8 @@ void pfilter_cmp(int offset, int value, int mask, pfilter_op_t op, int rd); ...@@ -32,7 +32,8 @@ void pfilter_cmp(int offset, int value, int mask, pfilter_op_t op, int rd);
void pfilter_btst(int offset, int bit_index, pfilter_op_t op, int rd); void pfilter_btst(int offset, int bit_index, pfilter_op_t op, int rd);
void pfilter_nop(); void pfilter_nop();
void pfilter_logic2(int rd, int ra, pfilter_op_t op, int rb); void pfilter_logic2(int rd, int ra, pfilter_op_t op, int rb);
static void pfilter_logic3(int rd, int ra, pfilter_op_t op, int rb, pfilter_op_t op2, int rc); static void pfilter_logic3(int rd, int ra, pfilter_op_t op, int rb,
pfilter_op_t op2, int rc);
void pfilter_load(); void pfilter_load();
void pfilter_init_default(); void pfilter_init_default();
......
include/hw/endpoint_mdio.h
View file @ e625cbd9
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#define WBGEN2_SIGN_EXTEND(value, bits) (((value) & (1<<bits) ? ~((1<<(bits))-1): 0 ) | (value)) #define WBGEN2_SIGN_EXTEND(value, bits) (((value) & (1<<bits) ? ~((1<<(bits))-1): 0 ) | (value))
#endif #endif
/* definitions for register: MDIO Control Register */ /* definitions for register: MDIO Control Register */
/* definitions for field: Reserved in reg: MDIO Control Register */ /* definitions for field: Reserved in reg: MDIO Control Register */
......
include/hw/memlayout.h
View file @ e625cbd9
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
#define SDB_ADDRESS 0x30000 #define SDB_ADDRESS 0x30000
unsigned char* BASE_MINIC; unsigned char *BASE_MINIC;
unsigned char* BASE_EP; unsigned char *BASE_EP;
unsigned char* BASE_SOFTPLL; unsigned char *BASE_SOFTPLL;
unsigned char* BASE_PPS_GEN; unsigned char *BASE_PPS_GEN;
unsigned char* BASE_SYSCON; unsigned char *BASE_SYSCON;
unsigned char* BASE_UART; unsigned char *BASE_UART;
unsigned char* BASE_ONEWIRE; unsigned char *BASE_ONEWIRE;
unsigned char* BASE_ETHERBONE_CFG; unsigned char *BASE_ETHERBONE_CFG;
#define FMC_EEPROM_ADR 0x50 #define FMC_EEPROM_ADR 0x50
......
include/hw/wb_uart.h
View file @ e625cbd9
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#define WBGEN2_SIGN_EXTEND(value, bits) (((value) & (1<<bits) ? ~((1<<(bits))-1): 0 ) | (value)) #define WBGEN2_SIGN_EXTEND(value, bits) (((value) & (1<<bits) ? ~((1<<(bits))-1): 0 ) | (value))
#endif #endif
/* definitions for register: Status Register */ /* definitions for register: Status Register */
/* definitions for field: TX busy in reg: Status Register */ /* definitions for field: TX busy in reg: Status Register */
...@@ -66,14 +65,14 @@ ...@@ -66,14 +65,14 @@
#define UART_REG_RDR 0x0000000c #define UART_REG_RDR 0x0000000c
PACKED struct UART_WB { PACKED struct UART_WB {
/* [0x0]: REG Status Register */ /* [0x0]: REG Status Register */
uint32_t SR; uint32_t SR;
/* [0x4]: REG Baudrate control register */ /* [0x4]: REG Baudrate control register */
uint32_t BCR; uint32_t BCR;
/* [0x8]: REG Transmit data regsiter */ /* [0x8]: REG Transmit data regsiter */
uint32_t TDR; uint32_t TDR;
/* [0xc]: REG Receive data regsiter */ /* [0xc]: REG Receive data regsiter */
uint32_t RDR; uint32_t RDR;
}; };
#endif #endif
include/hw/wb_vuart.h
View file @ e625cbd9
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#define WBGEN2_SIGN_EXTEND(value, bits) (((value) & (1<<bits) ? ~((1<<(bits))-1): 0 ) | (value)) #define WBGEN2_SIGN_EXTEND(value, bits) (((value) & (1<<bits) ? ~((1<<(bits))-1): 0 ) | (value))
#endif #endif
/* definitions for register: Status Register */ /* definitions for register: Status Register */
/* definitions for field: TX busy in reg: Status Register */ /* definitions for field: TX busy in reg: Status Register */
...@@ -80,18 +79,18 @@ ...@@ -80,18 +79,18 @@
#define UART_DEBUG_CSR_USEDW_R(reg) WBGEN2_GEN_READ(reg, 0, 8) #define UART_DEBUG_CSR_USEDW_R(reg) WBGEN2_GEN_READ(reg, 0, 8)
PACKED struct UART_WB { PACKED struct UART_WB {
/* [0x0]: REG Status Register */ /* [0x0]: REG Status Register */
uint32_t SR; uint32_t SR;
/* [0x4]: REG Baudrate control register */ /* [0x4]: REG Baudrate control register */
uint32_t BCR; uint32_t BCR;
/* [0x8]: REG Transmit data regsiter */ /* [0x8]: REG Transmit data regsiter */
uint32_t TDR; uint32_t TDR;
/* [0xc]: REG Receive data regsiter */ /* [0xc]: REG Receive data regsiter */
uint32_t RDR; uint32_t RDR;
/* [0x10]: REG FIFO 'UART TX FIFO' data output register 0 */ /* [0x10]: REG FIFO 'UART TX FIFO' data output register 0 */
uint32_t DEBUG_R0; uint32_t DEBUG_R0;
/* [0x14]: REG FIFO 'UART TX FIFO' control/status register */ /* [0x14]: REG FIFO 'UART TX FIFO' control/status register */
uint32_t DEBUG_CSR; uint32_t DEBUG_CSR;
}; };
#endif #endif
include/i2c.h
View file @ e625cbd9
#ifndef __I2C_H #ifndef __I2C_H
#define __I2C_H #define __I2C_H
uint8_t mi2c_devprobe(uint8_t i2cif, uint8_t i2c_addr); uint8_t mi2c_devprobe(uint8_t i2cif, uint8_t i2c_addr);
void mi2c_init(uint8_t i2cif); void mi2c_init(uint8_t i2cif);
void mi2c_start(uint8_t i2cif); void mi2c_start(uint8_t i2cif);
......
include/irq.h
View file @ e625cbd9
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
static inline void clear_irq() static inline void clear_irq()
{ {
unsigned int val = 1; unsigned int val = 1;
asm volatile ("wcsr ip, %0"::"r"(val)); asm volatile ("wcsr ip, %0"::"r" (val));
} }
void disable_irq(); void disable_irq();
......
include/minic.h
View file @ e625cbd9
...@@ -11,9 +11,9 @@ void minic_disable(); ...@@ -11,9 +11,9 @@ void minic_disable();
int minic_poll_rx(); int minic_poll_rx();
void minic_get_stats(int *tx_frames, int *rx_frames); void minic_get_stats(int *tx_frames, int *rx_frames);
int minic_rx_frame(uint8_t *hdr, uint8_t *payload, uint32_t buf_size, struct hw_timestamp *hwts); int minic_rx_frame(uint8_t * hdr, uint8_t * payload, uint32_t buf_size,
int minic_tx_frame(uint8_t *hdr, uint8_t *payload, uint32_t size, struct hw_timestamp *hwts); struct hw_timestamp *hwts);
int minic_tx_frame(uint8_t * hdr, uint8_t * payload, uint32_t size,
struct hw_timestamp *hwts);
#endif #endif
include/onewire.h
View file @ e625cbd9
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#define FOUND_DS18B20 0x01 #define FOUND_DS18B20 0x01
void own_scanbus(uint8_t portnum); void own_scanbus(uint8_t portnum);
int16_t own_readtemp(uint8_t portnum, int16_t *temp, int16_t *t_frac); int16_t own_readtemp(uint8_t portnum, int16_t * temp, int16_t * t_frac);
/* 0 = success, -1 = error */ /* 0 = success, -1 = error */
int8_t get_persistent_mac(uint8_t portnum, uint8_t* mac); int8_t get_persistent_mac(uint8_t portnum, uint8_t * mac);
int8_t set_persistent_mac(uint8_t portnum, uint8_t* mac); int8_t set_persistent_mac(uint8_t portnum, uint8_t * mac);
#endif #endif
include/pps_gen.h
View file @ e625cbd9
...@@ -19,10 +19,9 @@ int shw_pps_gen_busy(); ...@@ -19,10 +19,9 @@ int shw_pps_gen_busy();
int shw_pps_gen_enable_output(int enable); int shw_pps_gen_enable_output(int enable);
/* Reads the current time and stores at <seconds,nanoseconds>. */ /* Reads the current time and stores at <seconds,nanoseconds>. */
void shw_pps_gen_get_time(uint64_t *seconds, uint32_t *nanoseconds); void shw_pps_gen_get_time(uint64_t * seconds, uint32_t * nanoseconds);
/* Sets the time to <seconds,nanoseconds>. */ /* Sets the time to <seconds,nanoseconds>. */
void shw_pps_gen_set_time(uint64_t seconds, uint32_t nanoseconds); void shw_pps_gen_set_time(uint64_t seconds, uint32_t nanoseconds);
#endif #endif
include/sfp.h
View file @ e625cbd9
...@@ -12,4 +12,3 @@ int sfp_present(); ...@@ -12,4 +12,3 @@ int sfp_present();
int sfp_read_part_id(char *part_id); int sfp_read_part_id(char *part_id);
#endif #endif
include/shell.h
View file @ e625cbd9
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
extern int wrc_ui_mode; extern int wrc_ui_mode;
const char* fromhex(const char* hex, int* v); const char *fromhex(const char *hex, int *v);
const char* fromdec(const char* dec, int* v); const char *fromdec(const char *dec, int *v);
int cmd_gui(const char *args[]); int cmd_gui(const char *args[]);
int cmd_pll(const char *args[]); int cmd_pll(const char *args[]);
...@@ -25,7 +25,6 @@ int cmd_sdb(const char *args[]); ...@@ -25,7 +25,6 @@ int cmd_sdb(const char *args[]);
int cmd_mac(const char *args[]); int cmd_mac(const char *args[]);
int cmd_init(const char *args[]); int cmd_init(const char *args[]);
int cmd_env(const char *args[]); int cmd_env(const char *args[]);
int cmd_saveenv(const char *args[]); int cmd_saveenv(const char *args[]);
int cmd_set(const char *args[]); int cmd_set(const char *args[]);
...@@ -40,4 +39,3 @@ void shell_interactive(); ...@@ -40,4 +39,3 @@ void shell_interactive();
int shell_boot_script(void); int shell_boot_script(void);
#endif #endif
include/spll_defs.h
View file @ e625cbd9
...@@ -6,7 +6,6 @@ WARNING: These parameters must be in sync with the generics of the HDL instantia ...@@ -6,7 +6,6 @@ WARNING: These parameters must be in sync with the generics of the HDL instantia
*/ */
#include <stdio.h> #include <stdio.h>
/* Reference clock frequency, in [Hz] */ /* Reference clock frequency, in [Hz] */
......
include/syscon.h
View file @ e625cbd9
...@@ -6,14 +6,13 @@ ...@@ -6,14 +6,13 @@
#include "board.h" #include "board.h"
#include <hw/wrc_syscon_regs.h> #include <hw/wrc_syscon_regs.h>
struct SYSCON_WB struct SYSCON_WB {
{ uint32_t RSTR; /*Syscon Reset Register */
uint32_t RSTR; /*Syscon Reset Register*/ uint32_t GPSR; /*GPIO Set/Readback Register */
uint32_t GPSR; /*GPIO Set/Readback Register*/ uint32_t GPCR; /*GPIO Clear Register */
uint32_t GPCR; /*GPIO Clear Register*/ uint32_t HWFR; /*Hardware Feature Register */
uint32_t HWFR; /*Hardware Feature Register*/ uint32_t TCR; /*Timer Control Register */
uint32_t TCR; /*Timer Control Register*/ uint32_t TVR; /*Timer Counter Value Register */
uint32_t TVR; /*Timer Counter Value Register*/
}; };
/*GPIO pins*/ /*GPIO pins*/
...@@ -26,10 +25,9 @@ struct SYSCON_WB ...@@ -26,10 +25,9 @@ struct SYSCON_WB
#define WRPC_FMC_I2C 0 #define WRPC_FMC_I2C 0
#define WRPC_SFP_I2C 1 #define WRPC_SFP_I2C 1
struct s_i2c_if struct s_i2c_if {
{ uint32_t scl;
uint32_t scl; uint32_t sda;
uint32_t sda;
}; };
extern struct s_i2c_if i2c_if[2]; extern struct s_i2c_if i2c_if[2];
...@@ -45,15 +43,15 @@ extern volatile struct SYSCON_WB *syscon; ...@@ -45,15 +43,15 @@ extern volatile struct SYSCON_WB *syscon;
***************************/ ***************************/
static inline void gpio_out(int pin, int val) static inline void gpio_out(int pin, int val)
{ {
if(val) if (val)
syscon->GPSR = pin; syscon->GPSR = pin;
else else
syscon->GPCR = pin; syscon->GPCR = pin;
} }
static inline int gpio_in(int pin) static inline int gpio_in(int pin)
{ {
return syscon->GPSR & pin ? 1: 0; return syscon->GPSR & pin ? 1 : 0;
} }
static inline int sysc_get_memsize() static inline int sysc_get_memsize()
...@@ -62,4 +60,3 @@ static inline int sysc_get_memsize() ...@@ -62,4 +60,3 @@ static inline int sysc_get_memsize()
} }
#endif #endif
include/types.h
View file @ e625cbd9
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
#include <inttypes.h> #include <inttypes.h>
struct hw_timestamp { struct hw_timestamp {
uint8_t valid; uint8_t valid;
int ahead; int ahead;
uint64_t sec; uint64_t sec;
uint32_t nsec; uint32_t nsec;
uint32_t phase; uint32_t phase;
}; };
#endif #endif
lib/arp.c
View file @ e625cbd9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "ipv4.h" #include "ipv4.h"
#include "ptpd_netif.h" #include "ptpd_netif.h"
static wr_socket_t* arp_socket; static wr_socket_t *arp_socket;
#define ARP_HTYPE 0 #define ARP_HTYPE 0
#define ARP_PTYPE (ARP_HTYPE+2) #define ARP_PTYPE (ARP_HTYPE+2)
...@@ -16,67 +16,73 @@ static wr_socket_t* arp_socket; ...@@ -16,67 +16,73 @@ static wr_socket_t* arp_socket;
#define ARP_TPA (ARP_THA+6) #define ARP_TPA (ARP_THA+6)
#define ARP_END (ARP_TPA+4) #define ARP_END (ARP_TPA+4)
void arp_init(const char* if_name) { void arp_init(const char *if_name)
wr_sockaddr_t saddr; {
wr_sockaddr_t saddr;
/* Configure socket filter */ /* Configure socket filter */
memset(&saddr, 0, sizeof(saddr)); memset(&saddr, 0, sizeof(saddr));
strcpy(saddr.if_name, if_name); strcpy(saddr.if_name, if_name);
memset(&saddr.mac, 0xFF, 6); /* Broadcast */ memset(&saddr.mac, 0xFF, 6); /* Broadcast */
saddr.ethertype = htons(0x0806); /* ARP */ saddr.ethertype = htons(0x0806); /* ARP */
saddr.family = PTPD_SOCK_RAW_ETHERNET; saddr.family = PTPD_SOCK_RAW_ETHERNET;
arp_socket = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET, 0, &saddr); arp_socket = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET,
0, &saddr);
} }
static int process_arp(uint8_t* buf, int len) { static int process_arp(uint8_t * buf, int len)
uint8_t hisMAC[6]; {
uint8_t hisIP[4]; uint8_t hisMAC[6];
uint8_t myIP[4]; uint8_t hisIP[4];
uint8_t myIP[4];
if (len < ARP_END) return 0; if (len < ARP_END)
return 0;
/* Is it ARP request targetting our IP? */ /* Is it ARP request targetting our IP? */
getIP(myIP); getIP(myIP);
if (buf[ARP_OPER+0] != 0 || if (buf[ARP_OPER + 0] != 0 ||
buf[ARP_OPER+1] != 1 || buf[ARP_OPER + 1] != 1 || memcmp(buf + ARP_TPA, myIP, 4))
memcmp(buf+ARP_TPA, myIP, 4)) return 0;
return 0;
memcpy(hisMAC, buf+ARP_SHA, 6); memcpy(hisMAC, buf + ARP_SHA, 6);
memcpy(hisIP, buf+ARP_SPA, 4); memcpy(hisIP, buf + ARP_SPA, 4);
// ------------- ARP ------------ // ------------- ARP ------------
// HW ethernet // HW ethernet
buf[ARP_HTYPE+0] = 0; buf[ARP_HTYPE + 0] = 0;
buf[ARP_HTYPE+1] = 1; buf[ARP_HTYPE + 1] = 1;
// proto IP // proto IP
buf[ARP_PTYPE+0] = 8; buf[ARP_PTYPE + 0] = 8;
buf[ARP_PTYPE+1] = 0; buf[ARP_PTYPE + 1] = 0;
// lengths // lengths
buf[ARP_HLEN] = 6; buf[ARP_HLEN] = 6;
buf[ARP_PLEN] = 4; buf[ARP_PLEN] = 4;
// Response // Response
buf[ARP_OPER+0] = 0; buf[ARP_OPER + 0] = 0;
buf[ARP_OPER+1] = 2; buf[ARP_OPER + 1] = 2;
// my MAC+IP // my MAC+IP
get_mac_addr(buf+ARP_SHA); get_mac_addr(buf + ARP_SHA);
memcpy(buf+ARP_SPA, myIP, 4); memcpy(buf + ARP_SPA, myIP, 4);
// his MAC+IP // his MAC+IP
memcpy(buf+ARP_THA, hisMAC, 6); memcpy(buf + ARP_THA, hisMAC, 6);
memcpy(buf+ARP_TPA, hisIP, 4); memcpy(buf + ARP_TPA, hisIP, 4);
return ARP_END; return ARP_END;
} }
void arp_poll(void) { void arp_poll(void)
uint8_t buf[ARP_END+100]; {
wr_sockaddr_t addr; uint8_t buf[ARP_END + 100];
int len; wr_sockaddr_t addr;
int len;
if (needIP) return; /* can't do ARP w/o an address... */ if (needIP)
return; /* can't do ARP w/o an address... */
if ((len = ptpd_netif_recvfrom(arp_socket, &addr, buf, sizeof(buf), 0)) > 0) if ((len = ptpd_netif_recvfrom(arp_socket,
if ((len = process_arp(buf, len)) > 0) &addr, buf, sizeof(buf), 0)) > 0)
ptpd_netif_sendto(arp_socket, &addr, buf, len, 0); if ((len = process_arp(buf, len)) > 0)
ptpd_netif_sendto(arp_socket, &addr, buf, len, 0);
} }
lib/arp.h
View file @ e625cbd9
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
#define ARP_H #define ARP_H
void arp_poll(); void arp_poll();
void arp_init(const char* if_name, uint32_t ip); void arp_init(const char *if_name, uint32_t ip);
#endif #endif
lib/bootp.c
View file @ e625cbd9
...@@ -43,103 +43,113 @@ ...@@ -43,103 +43,113 @@
#define BOOTP_VEND (BOOTP_FILE+128) #define BOOTP_VEND (BOOTP_FILE+128)
#define BOOTP_END (BOOTP_VEND+64) #define BOOTP_END (BOOTP_VEND+64)
int send_bootp(uint8_t* buf, int retry) { int send_bootp(uint8_t * buf, int retry)
unsigned short sum; {
unsigned short sum;
// ----------- BOOTP ------------
buf[BOOTP_OP] = 1; /* bootrequest */ // ----------- BOOTP ------------
buf[BOOTP_HTYPE] = 1; /* ethernet */ buf[BOOTP_OP] = 1; /* bootrequest */
buf[BOOTP_HLEN] = 6; /* MAC length */ buf[BOOTP_HTYPE] = 1; /* ethernet */
buf[BOOTP_HOPS] = 0; buf[BOOTP_HLEN] = 6; /* MAC length */
buf[BOOTP_HOPS] = 0;
/* A unique identifier for the request !!! FIXME */
get_mac_addr(buf+BOOTP_XID); /* A unique identifier for the request !!! FIXME */
buf[BOOTP_XID+0] ^= buf[BOOTP_XID+4]; get_mac_addr(buf + BOOTP_XID);
buf[BOOTP_XID+1] ^= buf[BOOTP_XID+5]; buf[BOOTP_XID + 0] ^= buf[BOOTP_XID + 4];
buf[BOOTP_XID+2] ^= (retry >> 8) & 0xFF; buf[BOOTP_XID + 1] ^= buf[BOOTP_XID + 5];
buf[BOOTP_XID+3] ^= retry & 0xFF; buf[BOOTP_XID + 2] ^= (retry >> 8) & 0xFF;
buf[BOOTP_XID + 3] ^= retry & 0xFF;
buf[BOOTP_SECS] = (retry >> 8) & 0xFF;
buf[BOOTP_SECS+1] = retry & 0xFF; buf[BOOTP_SECS] = (retry >> 8) & 0xFF;
memset(buf+BOOTP_UNUSED, 0, 2); buf[BOOTP_SECS + 1] = retry & 0xFF;
memset(buf + BOOTP_UNUSED, 0, 2);
memset(buf+BOOTP_CIADDR, 0, 4); /* own IP if known */
memset(buf+BOOTP_YIADDR, 0, 4); memset(buf + BOOTP_CIADDR, 0, 4); /* own IP if known */
memset(buf+BOOTP_SIADDR, 0, 4); memset(buf + BOOTP_YIADDR, 0, 4);
memset(buf+BOOTP_GIADDR, 0, 4); memset(buf + BOOTP_SIADDR, 0, 4);
memset(buf + BOOTP_GIADDR, 0, 4);
memset(buf+BOOTP_CHADDR, 0, 16);
get_mac_addr(buf+BOOTP_CHADDR); /* own MAC address */ memset(buf + BOOTP_CHADDR, 0, 16);
get_mac_addr(buf + BOOTP_CHADDR); /* own MAC address */
memset(buf+BOOTP_SNAME, 0, 64); /* desired BOOTP server */
memset(buf+BOOTP_FILE, 0, 128); /* desired BOOTP file */ memset(buf + BOOTP_SNAME, 0, 64); /* desired BOOTP server */
memset(buf+BOOTP_VEND, 0, 64); /* vendor extensions */ memset(buf + BOOTP_FILE, 0, 128); /* desired BOOTP file */
memset(buf + BOOTP_VEND, 0, 64); /* vendor extensions */
// ------------ UDP -------------
memset(buf+UDP_VIRT_SADDR, 0, 4); // ------------ UDP -------------
memset(buf+UDP_VIRT_DADDR, 0xFF, 4); memset(buf + UDP_VIRT_SADDR, 0, 4);
buf[UDP_VIRT_ZEROS] = 0; memset(buf + UDP_VIRT_DADDR, 0xFF, 4);
buf[UDP_VIRT_PROTO] = 0x11; /* UDP */ buf[UDP_VIRT_ZEROS] = 0;
buf[UDP_VIRT_LENGTH] = (BOOTP_END-IP_END) >> 8; buf[UDP_VIRT_PROTO] = 0x11; /* UDP */
buf[UDP_VIRT_LENGTH+1] = (BOOTP_END-IP_END) & 0xff; buf[UDP_VIRT_LENGTH] = (BOOTP_END - IP_END) >> 8;
buf[UDP_VIRT_LENGTH + 1] = (BOOTP_END - IP_END) & 0xff;
buf[UDP_SPORT] = 0;
buf[UDP_SPORT+1] = 68; /* BOOTP client */ buf[UDP_SPORT] = 0;
buf[UDP_DPORT] = 0; buf[UDP_SPORT + 1] = 68; /* BOOTP client */
buf[UDP_DPORT+1] = 67; /* BOOTP server */ buf[UDP_DPORT] = 0;
buf[UDP_LENGTH] = (BOOTP_END-IP_END) >> 8; buf[UDP_DPORT + 1] = 67; /* BOOTP server */
buf[UDP_LENGTH+1] = (BOOTP_END-IP_END) & 0xff; buf[UDP_LENGTH] = (BOOTP_END - IP_END) >> 8;
buf[UDP_CHECKSUM] = 0; buf[UDP_LENGTH + 1] = (BOOTP_END - IP_END) & 0xff;
buf[UDP_CHECKSUM+1] = 0; buf[UDP_CHECKSUM] = 0;
buf[UDP_CHECKSUM + 1] = 0;
sum = ipv4_checksum((unsigned short*)(buf+UDP_VIRT_SADDR), (BOOTP_END-UDP_VIRT_SADDR)/2);
if (sum == 0) sum = 0xFFFF; sum =
ipv4_checksum((unsigned short *)(buf + UDP_VIRT_SADDR),
buf[UDP_CHECKSUM+0] = (sum >> 8); (BOOTP_END - UDP_VIRT_SADDR) / 2);
buf[UDP_CHECKSUM+1] = sum & 0xff; if (sum == 0)
sum = 0xFFFF;
// ------------ IP --------------
buf[IP_VERSION] = 0x45; buf[UDP_CHECKSUM + 0] = (sum >> 8);
buf[IP_TOS] = 0; buf[UDP_CHECKSUM + 1] = sum & 0xff;
buf[IP_LEN+0] = (BOOTP_END) >> 8;
buf[IP_LEN+1] = (BOOTP_END) & 0xff; // ------------ IP --------------
buf[IP_ID+0] = 0; buf[IP_VERSION] = 0x45;
buf[IP_ID+1] = 0; buf[IP_TOS] = 0;
buf[IP_FLAGS+0] = 0; buf[IP_LEN + 0] = (BOOTP_END) >> 8;
buf[IP_FLAGS+1] = 0; buf[IP_LEN + 1] = (BOOTP_END) & 0xff;
buf[IP_TTL] = 63; buf[IP_ID + 0] = 0;
buf[IP_PROTOCOL] = 17; /* UDP */ buf[IP_ID + 1] = 0;
buf[IP_CHECKSUM+0] = 0; buf[IP_FLAGS + 0] = 0;
buf[IP_CHECKSUM+1] = 0; buf[IP_FLAGS + 1] = 0;
memset(buf+IP_SOURCE, 0, 4); buf[IP_TTL] = 63;
memset(buf+IP_DEST, 0xFF, 4); buf[IP_PROTOCOL] = 17; /* UDP */
buf[IP_CHECKSUM + 0] = 0;
sum = ipv4_checksum((unsigned short*)(buf+IP_VERSION), (IP_END-IP_VERSION)/2); buf[IP_CHECKSUM + 1] = 0;
buf[IP_CHECKSUM+0] = sum >> 8; memset(buf + IP_SOURCE, 0, 4);
buf[IP_CHECKSUM+1] = sum & 0xff; memset(buf + IP_DEST, 0xFF, 4);
mprintf("Sending BOOTP request...\n"); sum =
return BOOTP_END; ipv4_checksum((unsigned short *)(buf + IP_VERSION),
(IP_END - IP_VERSION) / 2);
buf[IP_CHECKSUM + 0] = sum >> 8;
buf[IP_CHECKSUM + 1] = sum & 0xff;
mprintf("Sending BOOTP request...\n");
return BOOTP_END;
} }
int process_bootp(uint8_t* buf, int len) int process_bootp(uint8_t * buf, int len)
{ {
uint8_t mac[6]; uint8_t mac[6];
get_mac_addr(mac); get_mac_addr(mac);
if (len != BOOTP_END) return 0; if (len != BOOTP_END)
return 0;
if (buf[IP_VERSION] != 0x45) return 0; if (buf[IP_VERSION] != 0x45)
return 0;
if (buf[IP_PROTOCOL] != 17 || if (buf[IP_PROTOCOL] != 17 ||
buf[UDP_DPORT] != 0 || buf[UDP_DPORT+1] != 68 || buf[UDP_DPORT] != 0 || buf[UDP_DPORT + 1] != 68 ||
buf[UDP_SPORT] != 0 || buf[UDP_SPORT+1] != 67) return 0; buf[UDP_SPORT] != 0 || buf[UDP_SPORT + 1] != 67)
return 0;
if (memcmp(buf+BOOTP_CHADDR, mac, 6)) return 0; if (memcmp(buf + BOOTP_CHADDR, mac, 6))
return 0;
mprintf("Discovered IP address!\n"); mprintf("Discovered IP address!\n");
setIP(buf+BOOTP_YIADDR); setIP(buf + BOOTP_YIADDR);
return 1; return 1;
} }
lib/icmp.c
View file @ e625cbd9
...@@ -20,59 +20,62 @@ ...@@ -20,59 +20,62 @@
#define ICMP_CHECKSUM (ICMP_CODE+1) #define ICMP_CHECKSUM (ICMP_CODE+1)
#define ICMP_END (ICMP_CHECKSUM+2) #define ICMP_END (ICMP_CHECKSUM+2)
int process_icmp(uint8_t* buf, int len) { int process_icmp(uint8_t * buf, int len)
int iplen, hisBodyLen; {
uint8_t hisIP[4]; int iplen, hisBodyLen;
uint8_t myIP[4]; uint8_t hisIP[4];
uint16_t sum; uint8_t myIP[4];
uint16_t sum;
/* Is it IP targetting us? */ /* Is it IP targetting us? */
getIP(myIP); getIP(myIP);
if (buf[IP_VERSION] != 0x45 || if (buf[IP_VERSION] != 0x45 || memcmp(buf + IP_DEST, myIP, 4))
memcmp(buf+IP_DEST, myIP, 4)) return 0;
return 0;
iplen = (buf[IP_LEN+0] << 8 | buf[IP_LEN+1]); iplen = (buf[IP_LEN + 0] << 8 | buf[IP_LEN + 1]);
/* An ICMP ECHO request? */ /* An ICMP ECHO request? */
if (buf[IP_PROTOCOL] != 0x01 || buf[ICMP_TYPE] != 0x08) if (buf[IP_PROTOCOL] != 0x01 || buf[ICMP_TYPE] != 0x08)
return 0; return 0;
hisBodyLen = iplen - 24; hisBodyLen = iplen - 24;
if (hisBodyLen > 64) hisBodyLen = 64; if (hisBodyLen > 64)
hisBodyLen = 64;
memcpy(hisIP, buf+IP_SOURCE, 4); memcpy(hisIP, buf + IP_SOURCE, 4);
// ------------ IP -------------- // ------------ IP --------------
buf[IP_VERSION] = 0x45; buf[IP_VERSION] = 0x45;
buf[IP_TOS] = 0; buf[IP_TOS] = 0;
buf[IP_LEN+0] = (hisBodyLen+24) >> 8; buf[IP_LEN + 0] = (hisBodyLen + 24) >> 8;
buf[IP_LEN+1] = (hisBodyLen+24) & 0xff; buf[IP_LEN + 1] = (hisBodyLen + 24) & 0xff;
buf[IP_ID+0] = 0; buf[IP_ID + 0] = 0;
buf[IP_ID+1] = 0; buf[IP_ID + 1] = 0;
buf[IP_FLAGS+0] = 0; buf[IP_FLAGS + 0] = 0;
buf[IP_FLAGS+1] = 0; buf[IP_FLAGS + 1] = 0;
buf[IP_TTL] = 63; buf[IP_TTL] = 63;
buf[IP_PROTOCOL] = 1; /* ICMP */ buf[IP_PROTOCOL] = 1; /* ICMP */
buf[IP_CHECKSUM+0] = 0; buf[IP_CHECKSUM + 0] = 0;
buf[IP_CHECKSUM+1] = 0; buf[IP_CHECKSUM + 1] = 0;
memcpy(buf+IP_SOURCE, myIP, 4); memcpy(buf + IP_SOURCE, myIP, 4);
memcpy(buf+IP_DEST, hisIP, 4); memcpy(buf + IP_DEST, hisIP, 4);
// ------------ ICMP --------- // ------------ ICMP ---------
buf[ICMP_TYPE] = 0x0; // echo reply buf[ICMP_TYPE] = 0x0; // echo reply
buf[ICMP_CODE] = 0; buf[ICMP_CODE] = 0;
buf[ICMP_CHECKSUM+0] = 0; buf[ICMP_CHECKSUM + 0] = 0;
buf[ICMP_CHECKSUM+1] = 0; buf[ICMP_CHECKSUM + 1] = 0;
// No need to copy payload; we modified things in-place // No need to copy payload; we modified things in-place
sum = ipv4_checksum((unsigned short*)(buf+ICMP_TYPE), (hisBodyLen+4+1)/2); sum =
buf[ICMP_CHECKSUM+0] = sum >> 8; ipv4_checksum((unsigned short *)(buf + ICMP_TYPE),
buf[ICMP_CHECKSUM+1] = sum & 0xff; (hisBodyLen + 4 + 1) / 2);
buf[ICMP_CHECKSUM + 0] = sum >> 8;
buf[ICMP_CHECKSUM + 1] = sum & 0xff;
sum = ipv4_checksum((unsigned short*)(buf+IP_VERSION), 10); sum = ipv4_checksum((unsigned short *)(buf + IP_VERSION), 10);
buf[IP_CHECKSUM+0] = sum >> 8; buf[IP_CHECKSUM + 0] = sum >> 8;
buf[IP_CHECKSUM+1] = sum & 0xff; buf[IP_CHECKSUM + 1] = sum & 0xff;
return 24+hisBodyLen; return 24 + hisBodyLen;
} }
lib/ipv4.c
View file @ e625cbd9
...@@ -8,81 +8,88 @@ ...@@ -8,81 +8,88 @@
int needIP = 1; int needIP = 1;
static uint8_t myIP[4]; static uint8_t myIP[4];
static wr_socket_t* ipv4_socket; static wr_socket_t *ipv4_socket;
unsigned int ipv4_checksum(unsigned short* buf, int shorts) { unsigned int ipv4_checksum(unsigned short *buf, int shorts)
int i; {
unsigned int sum; int i;
unsigned int sum;
sum = 0; sum = 0;
for (i = 0; i < shorts; ++i) for (i = 0; i < shorts; ++i)
sum += buf[i]; sum += buf[i];
sum = (sum >> 16) + (sum & 0xffff); sum = (sum >> 16) + (sum & 0xffff);
sum += (sum >> 16); sum += (sum >> 16);
return (~sum & 0xffff); return (~sum & 0xffff);
} }
void ipv4_init(const char* if_name) { void ipv4_init(const char *if_name)
wr_sockaddr_t saddr; {
wr_sockaddr_t saddr;
/* Configure socket filter */ /* Configure socket filter */
memset(&saddr, 0, sizeof(saddr)); memset(&saddr, 0, sizeof(saddr));
strcpy(saddr.if_name, if_name); strcpy(saddr.if_name, if_name);
get_mac_addr(&saddr.mac[0]); /* Unicast */ get_mac_addr(&saddr.mac[0]); /* Unicast */
saddr.ethertype = htons(0x0800); /* IPv4 */ saddr.ethertype = htons(0x0800); /* IPv4 */
saddr.family = PTPD_SOCK_RAW_ETHERNET; saddr.family = PTPD_SOCK_RAW_ETHERNET;
ipv4_socket = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET, 0, &saddr); ipv4_socket = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET,
0, &saddr);
} }
static int bootp_retry = 0; static int bootp_retry = 0;
static int bootp_timer = 0; static int bootp_timer = 0;
void ipv4_poll(void) { void ipv4_poll(void)
uint8_t buf[400]; {
wr_sockaddr_t addr; uint8_t buf[400];
int len; wr_sockaddr_t addr;
int len;
if ((len = ptpd_netif_recvfrom(ipv4_socket, &addr, buf, sizeof(buf), 0)) > 0) { if ((len = ptpd_netif_recvfrom(ipv4_socket, &addr,
if (needIP) buf, sizeof(buf), 0)) > 0) {
process_bootp(buf, len-14); if (needIP)
process_bootp(buf, len - 14);
if (!needIP && (len = process_icmp(buf, len-14)) > 0) if (!needIP && (len = process_icmp(buf, len - 14)) > 0)
ptpd_netif_sendto(ipv4_socket, &addr, buf, len, 0); ptpd_netif_sendto(ipv4_socket, &addr, buf, len, 0);
} }
if (needIP && bootp_timer == 0) { if (needIP && bootp_timer == 0) {
len = send_bootp(buf, ++bootp_retry); len = send_bootp(buf, ++bootp_retry);
memset(addr.mac, 0xFF, 6); memset(addr.mac, 0xFF, 6);
addr.ethertype = htons(0x0800); /* IPv4 */ addr.ethertype = htons(0x0800); /* IPv4 */
ptpd_netif_sendto(ipv4_socket, &addr, buf, len, 0); ptpd_netif_sendto(ipv4_socket, &addr, buf, len, 0);
} }
if (needIP && ++bootp_timer == 100000) bootp_timer = 0; if (needIP && ++bootp_timer == 100000)
bootp_timer = 0;
} }
void getIP(unsigned char* IP) { void getIP(unsigned char *IP)
memcpy(IP, myIP, 4); {
memcpy(IP, myIP, 4);
} }
void setIP(unsigned char* IP) { void setIP(unsigned char *IP)
volatile unsigned int *eb_ip = {
(unsigned int*)(BASE_ETHERBONE_CFG + EB_IPV4); volatile unsigned int *eb_ip =
unsigned int ip; (unsigned int *)(BASE_ETHERBONE_CFG + EB_IPV4);
unsigned int ip;
memcpy(myIP, IP, 4); memcpy(myIP, IP, 4);
ip = ip = (myIP[0] << 24) | (myIP[1] << 16) | (myIP[2] << 8) | (myIP[3]);
(myIP[0] << 24) | (myIP[1] << 16) | while (*eb_ip != ip)
(myIP[2] << 8) | (myIP[3]); *eb_ip = ip;
while (*eb_ip != ip) *eb_ip = ip;
needIP = (ip == 0); needIP = (ip == 0);
if (!needIP) { if (!needIP) {
bootp_retry = 0; bootp_retry = 0;
bootp_timer = 0; bootp_timer = 0;
} }
} }
lib/ipv4.h
View file @ e625cbd9
#ifndef IPV4_H #ifndef IPV4_H
#define IPV4_H #define IPV4_H
void ipv4_init(const char* if_name); void ipv4_init(const char *if_name);
void ipv4_poll(void); void ipv4_poll(void);
/* Internal to IP stack: */ /* Internal to IP stack: */
unsigned int ipv4_checksum(unsigned short* buf, int shorts); unsigned int ipv4_checksum(unsigned short *buf, int shorts);
void arp_init(const char* if_name); void arp_init(const char *if_name);
void arp_poll(void); void arp_poll(void);
extern int needIP; extern int needIP;
void setIP(unsigned char* IP); void setIP(unsigned char *IP);
void getIP(unsigned char* IP); void getIP(unsigned char *IP);
int process_icmp(uint8_t* buf, int len); int process_icmp(uint8_t * buf, int len);
int process_bootp(uint8_t* buf, int len); /* non-zero if IP was set */ int process_bootp(uint8_t * buf, int len); /* non-zero if IP was set */
int send_bootp(uint8_t* buf, int retry); int send_bootp(uint8_t * buf, int retry);
#endif #endif
lib/mprintf.c
View file @ e625cbd9
...@@ -5,247 +5,226 @@ ...@@ -5,247 +5,226 @@
#include "uart.h" #include "uart.h"
#include "util.h" #include "util.h"
int vprintf(char const *format,va_list ap) int vprintf(char const *format, va_list ap)
{ {
unsigned char scratch[16]; unsigned char scratch[16];
unsigned char format_flag; unsigned char format_flag;
unsigned int u_val=0; unsigned int u_val = 0;
unsigned char base; unsigned char base;
unsigned char *ptr; unsigned char *ptr;
unsigned char width = 0; unsigned char width = 0;
unsigned char fill; unsigned char fill;
while(1) while (1) {
{
width = 0;
width = 0; fill = ' ';
fill = ' '; while ((format_flag = *format++) != '%') {
while ((format_flag = *format++) != '%') if (!format_flag) {
{ va_end(ap);
if (!format_flag) return (0);
{ }
va_end (ap);
return (0); uart_write_byte(format_flag);
} }
uart_write_byte(format_flag);
}
// check for zero pad
format_flag = *format - '0';
if (format_flag == 0) // zero pad
{
fill = '0';
format++;
}
// check for width spec // check for zero pad
format_flag = *format - '0'; format_flag = *format - '0';
if (format_flag > 0 && format_flag <= 9) // width set if (format_flag == 0) // zero pad
{ {
width = format_flag; fill = '0';
format++; format++;
} }
// check for width spec
format_flag = *format - '0';
if (format_flag > 0 && format_flag <= 9) // width set
{
width = format_flag;
format++;
}
switch (format_flag = *format++) switch (format_flag = *format++) {
{
case 'c': case 'c':
format_flag = va_arg(ap,int); format_flag = va_arg(ap, int);
//fall through //fall through
default: default:
uart_write_byte(format_flag); uart_write_byte(format_flag);
continue; continue;
case 'S': case 'S':
case 's': case 's':
ptr = (unsigned char *)va_arg(ap, char *); ptr = (unsigned char *)va_arg(ap, char *);
while (*ptr) while (*ptr)
uart_write_byte(*ptr++); uart_write_byte(*ptr++);
continue; continue;
case 'd': case 'd':
base = 10; base = 10;
goto CONVERSION_LOOP; goto CONVERSION_LOOP;
case 'u': case 'u':
base = 10; base = 10;
goto CONVERSION_LOOP; goto CONVERSION_LOOP;
case 'x': case 'x':
base = 16; base = 16;
CONVERSION_LOOP: CONVERSION_LOOP:
u_val = va_arg(ap,unsigned int); u_val = va_arg(ap, unsigned int);
if((format_flag=='d') && (u_val&0x80000000)) if ((format_flag == 'd') && (u_val & 0x80000000)) {
{ uart_write_byte('-');
uart_write_byte('-'); u_val = -u_val;
u_val=-u_val; }
}
ptr = scratch + 16; ptr = scratch + 16;
*--ptr = 0; *--ptr = 0;
do do {
{ char ch = (u_val % base) + '0';
char ch = (u_val % base) + '0'; if (ch > '9')
if (ch > '9') ch += 'a' - '9' - 1;
ch += 'a' - '9' - 1;
*--ptr = ch; *--ptr = ch;
u_val /= base; u_val /= base;
if (width) if (width)
width--; width--;
} while (u_val>0); } while (u_val > 0);
while (width--) while (width--)
*--ptr = fill; *--ptr = fill;
while (*ptr) while (*ptr)
uart_write_byte(*ptr++); uart_write_byte(*ptr++);
} }
} }
return 0; return 0;
} }
static int _p_vsprintf(char const *format, va_list ap, char *dst)
static int _p_vsprintf(char const *format,va_list ap, char*dst)
{ {
unsigned char scratch[16]; unsigned char scratch[16];
unsigned char format_flag; unsigned char format_flag;
unsigned int u_val=0; unsigned int u_val = 0;
unsigned char base; unsigned char base;
unsigned char *ptr; unsigned char *ptr;
unsigned char width = 0; unsigned char width = 0;
unsigned char fill; unsigned char fill;
while(1) while (1) {
{
width = 0;
width = 0; fill = ' ';
fill = ' '; while ((format_flag = *format++) != '%') {
while ((format_flag = *format++) != '%') if (!format_flag) {
{ va_end(ap);
if (!format_flag) *dst++ = 0;
{ return (0);
va_end (ap); }
*dst++=0;
return (0); *dst++ = format_flag;
} }
*dst++=format_flag;
}
// check for zero pad
format_flag = *format - '0';
if (format_flag == 0) // zero pad
{
fill = '0';
format++;
}
// check for width spec // check for zero pad
format_flag = *format - '0'; format_flag = *format - '0';
if (format_flag > 0 && format_flag <= 9) // width set if (format_flag == 0) // zero pad
{ {
width = format_flag; fill = '0';
format++; format++;
} }
// check for width spec
format_flag = *format - '0';
if (format_flag > 0 && format_flag <= 9) // width set
{
width = format_flag;
format++;
}
switch (format_flag = *format++) switch (format_flag = *format++) {
{
case 'c': case 'c':
format_flag = va_arg(ap,int); format_flag = va_arg(ap, int);
//fall through //fall through
default: default:
*dst++=format_flag; *dst++ = format_flag;
continue; continue;
case 'S': case 'S':
case 's': case 's':
ptr = (unsigned char *)va_arg(ap, char *); ptr = (unsigned char *)va_arg(ap, char *);
while (*ptr) while (*ptr)
*dst++=*ptr++; *dst++ = *ptr++;
continue; continue;
case 'd': case 'd':
case 'u': case 'u':
base = 10; base = 10;
goto CONVERSION_LOOP; goto CONVERSION_LOOP;
case 'x': case 'x':
base = 16; base = 16;
CONVERSION_LOOP: CONVERSION_LOOP:
u_val = va_arg(ap,unsigned int); u_val = va_arg(ap, unsigned int);
ptr = scratch + 16; ptr = scratch + 16;
*--ptr = 0; *--ptr = 0;
do do {
{ char ch = (u_val % base) + '0';
char ch = (u_val % base) + '0'; if (ch > '9')
if (ch > '9') ch += 'a' - '9' - 1;
ch += 'a' - '9' - 1;
*--ptr = ch; *--ptr = ch;
u_val /= base; u_val /= base;
if (width) if (width)
width--; width--;
} while (u_val>0); } while (u_val > 0);
// while (width--) // while (width--)
// *--ptr = fill; // *--ptr = fill;
while (*ptr) while (*ptr)
*dst++=*ptr++; *dst++ = *ptr++;
} }
} }
*dst++=0; *dst++ = 0;
return 0; return 0;
} }
int mprintf(char const *format, ...) int mprintf(char const *format, ...)
{ {
int rval; int rval;
va_list ap; va_list ap;
va_start (ap, format); va_start(ap, format);
rval = vprintf(format,ap); rval = vprintf(format, ap);
va_end(ap); va_end(ap);
return rval; return rval;
} }
int sprintf(char *dst, char const *format, ...) int sprintf(char *dst, char const *format, ...)
{ {
va_list ap; va_list ap;
va_start (ap, format); va_start(ap, format);
int r= _p_vsprintf(format,ap,dst); int r = _p_vsprintf(format, ap, dst);
return r; return r;
} }
lib/util.c
View file @ e625cbd9
...@@ -18,77 +18,77 @@ ...@@ -18,77 +18,77 @@
#define ABB_LEN 3 #define ABB_LEN 3
static const char *_days[] = { static const char *_days[] = {
"Sun", "Mon", "Tue", "Wed", "Sun", "Mon", "Tue", "Wed",
"Thu", "Fri", "Sat" "Thu", "Fri", "Sat"
}; };
static const char *_months[] = { static const char *_months[] = {
"Jan", "Feb", "Mar", "Jan", "Feb", "Mar",
"Apr", "May", "Jun", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Jul", "Aug", "Sep",
"Oct", "Nov", "Dec" "Oct", "Nov", "Dec"
}; };
static const int _ytab[2][12] = { static const int _ytab[2][12] = {
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
}; };
char *format_time(uint64_t sec) char *format_time(uint64_t sec)
{ {
struct tm t; struct tm t;
static char buf[64]; static char buf[64];
unsigned long dayclock, dayno; unsigned long dayclock, dayno;
int year = EPOCH_YR; int year = EPOCH_YR;
dayclock = (unsigned long)sec % SECS_DAY; dayclock = (unsigned long)sec % SECS_DAY;
dayno = (unsigned long)sec / SECS_DAY; dayno = (unsigned long)sec / SECS_DAY;
t.tm_sec = dayclock % 60; t.tm_sec = dayclock % 60;
t.tm_min = (dayclock % 3600) / 60; t.tm_min = (dayclock % 3600) / 60;
t.tm_hour = dayclock / 3600; t.tm_hour = dayclock / 3600;
t.tm_wday = (dayno + 4) % 7; /* day 0 was a thursday */ t.tm_wday = (dayno + 4) % 7; /* day 0 was a thursday */
while (dayno >= YEARSIZE(year)) { while (dayno >= YEARSIZE(year)) {
dayno -= YEARSIZE(year); dayno -= YEARSIZE(year);
year++; year++;
} }
t.tm_year = year - YEAR0; t.tm_year = year - YEAR0;
t.tm_yday = dayno; t.tm_yday = dayno;
t.tm_mon = 0; t.tm_mon = 0;
while (dayno >= _ytab[LEAPYEAR(year)][t.tm_mon]) { while (dayno >= _ytab[LEAPYEAR(year)][t.tm_mon]) {
dayno -= _ytab[LEAPYEAR(year)][t.tm_mon]; dayno -= _ytab[LEAPYEAR(year)][t.tm_mon];
t.tm_mon++; t.tm_mon++;
} }
t.tm_mday = dayno + 1; t.tm_mday = dayno + 1;
t.tm_isdst = 0; t.tm_isdst = 0;
sprintf(buf, "%s, %s %d, %d, %2d:%2d:%2d", _days[t.tm_wday], _months[t.tm_mon], sprintf(buf, "%s, %s %d, %d, %2d:%2d:%2d", _days[t.tm_wday],
t.tm_mday, t.tm_year + YEAR0, t.tm_hour, t.tm_min, t.tm_sec); _months[t.tm_mon], t.tm_mday, t.tm_year + YEAR0, t.tm_hour,
t.tm_min, t.tm_sec);
return buf; return buf;
} }
void cprintf(int color, const char *fmt, ...) void cprintf(int color, const char *fmt, ...)
{ {
va_list ap; va_list ap;
mprintf("\033[0%d;3%dm",color & C_DIM ? 2:1, color&0x7f); mprintf("\033[0%d;3%dm", color & C_DIM ? 2 : 1, color & 0x7f);
va_start(ap, fmt); va_start(ap, fmt);
vprintf(fmt, ap); vprintf(fmt, ap);
va_end(ap); va_end(ap);
} }
void pcprintf(int row, int col, int color, const char *fmt, ...) void pcprintf(int row, int col, int color, const char *fmt, ...)
{ {
va_list ap; va_list ap;
mprintf("\033[%d;%df", row, col); mprintf("\033[%d;%df", row, col);
mprintf("\033[0%d;3%dm",color & C_DIM ? 2:1, color&0x7f); mprintf("\033[0%d;3%dm", color & C_DIM ? 2 : 1, color & 0x7f);
va_start(ap, fmt); va_start(ap, fmt);
vprintf(fmt, ap); vprintf(fmt, ap);
va_end(ap); va_end(ap);
} }
void term_clear() void term_clear()
{ {
mprintf("\033[2J\033[1;1H"); mprintf("\033[2J\033[1;1H");
} }
monitor/monitor.c
View file @ e625cbd9
This diff is collapsed.
shell/cmd_calib.c
View file @ e625cbd9
...@@ -7,34 +7,29 @@ ...@@ -7,34 +7,29 @@
#include "eeprom.h" #include "eeprom.h"
#include "syscon.h" #include "syscon.h"
extern int measure_t24p(int *value); extern int measure_t24p(int *value);
int cmd_calib(const char *args[]) int cmd_calib(const char *args[])
{ {
uint32_t trans; uint32_t trans;
if(args[0] && !strcasecmp(args[0], "force")) if (args[0] && !strcasecmp(args[0], "force")) {
{ if (measure_t24p(&trans) < 0)
if( measure_t24p(&trans)<0 )
return -1; return -1;
return eeprom_phtrans(WRPC_FMC_I2C, FMC_EEPROM_ADR, &trans, 1); return eeprom_phtrans(WRPC_FMC_I2C, FMC_EEPROM_ADR, &trans, 1);
} } else if (!args[0]) {
else if( !args[0] ) if (eeprom_phtrans(WRPC_FMC_I2C, FMC_EEPROM_ADR, &trans, 0) > 0) {
{ mprintf("Found phase transition in EEPROM: %dps\n",
if( eeprom_phtrans(WRPC_FMC_I2C, FMC_EEPROM_ADR, &trans, 0) >0 ) trans);
{
mprintf("Found phase transition in EEPROM: %dps\n", trans);
cal_phase_transition = trans; cal_phase_transition = trans;
return 0; return 0;
} } else {
else
{
mprintf("Measuring t2/t4 phase transition...\n"); mprintf("Measuring t2/t4 phase transition...\n");
if( measure_t24p(&trans)<0 ) if (measure_t24p(&trans) < 0)
return -1; return -1;
cal_phase_transition = trans; cal_phase_transition = trans;
return eeprom_phtrans(WRPC_FMC_I2C, FMC_EEPROM_ADR, &trans, 1); return eeprom_phtrans(WRPC_FMC_I2C, FMC_EEPROM_ADR,
&trans, 1);
} }
} }
......
shell/cmd_init.c
View file @ e625cbd9
...@@ -3,40 +3,28 @@ ...@@ -3,40 +3,28 @@
#include "eeprom.h" #include "eeprom.h"
#include "syscon.h" #include "syscon.h"
int cmd_init(const char *args[]) int cmd_init(const char *args[])
{ {
if( !mi2c_devprobe(WRPC_FMC_I2C, FMC_EEPROM_ADR) ) if (!mi2c_devprobe(WRPC_FMC_I2C, FMC_EEPROM_ADR)) {
{ mprintf("EEPROM not found..\n");
mprintf("EEPROM not found..\n"); return -1;
return -1; }
}
if(args[0] && !strcasecmp(args[0], "erase")) if (args[0] && !strcasecmp(args[0], "erase")) {
{ if (eeprom_init_erase(WRPC_FMC_I2C, FMC_EEPROM_ADR) < 0)
if( eeprom_init_erase(WRPC_FMC_I2C, FMC_EEPROM_ADR) < 0 ) mprintf("Could not erase init script\n");
mprintf("Could not erase init script\n"); } else if (args[0] && !strcasecmp(args[0], "purge")) {
} eeprom_init_purge(WRPC_FMC_I2C, FMC_EEPROM_ADR);
else if(args[0] && !strcasecmp(args[0], "purge")) } else if (args[1] && !strcasecmp(args[0], "add")) {
{ if (eeprom_init_add(WRPC_FMC_I2C, FMC_EEPROM_ADR, args) < 0)
eeprom_init_purge(WRPC_FMC_I2C, FMC_EEPROM_ADR); mprintf("Could not add the command\n");
} else
else if(args[1] && !strcasecmp(args[0], "add")) mprintf("OK.\n");
{ } else if (args[0] && !strcasecmp(args[0], "show")) {
if( eeprom_init_add(WRPC_FMC_I2C, FMC_EEPROM_ADR, args) < 0 ) eeprom_init_show(WRPC_FMC_I2C, FMC_EEPROM_ADR);
mprintf("Could not add the command\n"); } else if (args[0] && !strcasecmp(args[0], "boot")) {
else shell_boot_script();
mprintf("OK.\n"); }
}
else if(args[0] && !strcasecmp(args[0], "show"))
{
eeprom_init_show(WRPC_FMC_I2C, FMC_EEPROM_ADR);
}
else if(args[0] && !strcasecmp(args[0], "boot"))
{
shell_boot_script();
}
return 0; return 0;
} }
shell/cmd_ip.c
View file @ e625cbd9
...@@ -6,34 +6,36 @@ ...@@ -6,34 +6,36 @@
#include "shell.h" #include "shell.h"
#include "../lib/ipv4.h" #include "../lib/ipv4.h"
static decode_ip(const char *str, unsigned char* ip) { static decode_ip(const char *str, unsigned char *ip)
int i, x; {
int i, x;
/* Don't try to detect bad input; need small code */ /* Don't try to detect bad input; need small code */
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
str = fromdec(str, &x); str = fromdec(str, &x);
ip[i] = x; ip[i] = x;
if (*str == '.') ++str; if (*str == '.')
} ++str;
}
} }
int cmd_ip(const char *args[]) int cmd_ip(const char *args[])
{ {
unsigned char ip[4]; unsigned char ip[4];
if (!args[0] || !strcasecmp(args[0], "get")) { if (!args[0] || !strcasecmp(args[0], "get")) {
getIP(ip); getIP(ip);
} else if (!strcasecmp(args[0], "set") && args[1]) { } else if (!strcasecmp(args[0], "set") && args[1]) {
decode_ip(args[1], ip); decode_ip(args[1], ip);
setIP(ip); setIP(ip);
} else { } else {
return -EINVAL; return -EINVAL;
} }
if (needIP) { if (needIP) {
mprintf("IP-address: in training\n"); mprintf("IP-address: in training\n");
} else { } else {
mprintf("IP-address: %d.%d.%d.%d\n", mprintf("IP-address: %d.%d.%d.%d\n",
ip[0], ip[1], ip[2], ip[3]); ip[0], ip[1], ip[2], ip[3]);
} }
} }
shell/cmd_mac.c
View file @ e625cbd9
...@@ -7,39 +7,41 @@ ...@@ -7,39 +7,41 @@
#include "onewire.h" #include "onewire.h"
#include "../lib/ipv4.h" #include "../lib/ipv4.h"
static decode_mac(const char *str, unsigned char* mac) { static decode_mac(const char *str, unsigned char *mac)
int i, x; {
int i, x;
/* Don't try to detect bad input; need small code */ /* Don't try to detect bad input; need small code */
for (i = 0; i < 6; ++i) { for (i = 0; i < 6; ++i) {
str = fromhex(str, &x); str = fromhex(str, &x);
mac[i] = x; mac[i] = x;
if (*str == ':') ++str; if (*str == ':')
} ++str;
}
} }
int cmd_mac(const char *args[]) int cmd_mac(const char *args[])
{ {
unsigned char mac[6]; unsigned char mac[6];
if (!args[0] || !strcasecmp(args[0], "get")) { if (!args[0] || !strcasecmp(args[0], "get")) {
/* get current MAC */ /* get current MAC */
get_mac_addr(mac); get_mac_addr(mac);
} else if (!strcasecmp(args[0], "getp")) { } else if (!strcasecmp(args[0], "getp")) {
/* get persistent MAC */ /* get persistent MAC */
get_mac_addr(mac); get_mac_addr(mac);
get_persistent_mac(ONEWIRE_PORT, mac); get_persistent_mac(ONEWIRE_PORT, mac);
} else if (!strcasecmp(args[0], "set") && args[1]) { } else if (!strcasecmp(args[0], "set") && args[1]) {
decode_mac(args[1], mac); decode_mac(args[1], mac);
set_mac_addr(mac); set_mac_addr(mac);
pfilter_init_default(); pfilter_init_default();
} else if (!strcasecmp(args[0], "setp") && args[1]) { } else if (!strcasecmp(args[0], "setp") && args[1]) {
decode_mac(args[1], mac); decode_mac(args[1], mac);
set_persistent_mac(ONEWIRE_PORT, mac); set_persistent_mac(ONEWIRE_PORT, mac);
} else { } else {
return -EINVAL; return -EINVAL;
} }
mprintf("MAC-address: %x:%x:%x:%x:%x:%x\n", mprintf("MAC-address: %x:%x:%x:%x:%x:%x\n",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
} }
shell/cmd_mode.c
View file @ e625cbd9
...@@ -12,17 +12,18 @@ ...@@ -12,17 +12,18 @@
int cmd_mode(const char *args[]) int cmd_mode(const char *args[])
{ {
int mode; int mode;
static const char *modes[]={"unknown","grandmaster","master","slave"}; static const char *modes[] =
{ "unknown", "grandmaster", "master", "slave" };
if(!strcasecmp(args[0], "gm")) if (!strcasecmp(args[0], "gm"))
mode = WRC_MODE_GM; mode = WRC_MODE_GM;
else if(!strcasecmp(args[0], "master")) else if (!strcasecmp(args[0], "master"))
mode = WRC_MODE_MASTER; mode = WRC_MODE_MASTER;
else if(!strcasecmp(args[0], "slave")) else if (!strcasecmp(args[0], "slave"))
mode = WRC_MODE_SLAVE; mode = WRC_MODE_SLAVE;
else { else {
mprintf("%s\n", modes[wrc_ptp_get_mode()]); mprintf("%s\n", modes[wrc_ptp_get_mode()]);
return 0; return 0;
} }
return wrc_ptp_set_mode(mode); return wrc_ptp_set_mode(mode);
} }
\ No newline at end of file
shell/cmd_pll.c
View file @ e625cbd9
...@@ -9,49 +9,41 @@ int cmd_pll(const char *args[]) ...@@ -9,49 +9,41 @@ int cmd_pll(const char *args[])
{ {
int cur, tgt; int cur, tgt;
if(!strcasecmp(args[0], "init")) if (!strcasecmp(args[0], "init")) {
{ if (!args[3])
if(!args[3])
return -EINVAL; return -EINVAL;
spll_init(atoi(args[1]), atoi(args[2]), atoi(args[3])); spll_init(atoi(args[1]), atoi(args[2]), atoi(args[3]));
} else if (!strcasecmp(args[0], "cl")) } else if (!strcasecmp(args[0], "cl")) {
{ if (!args[1])
if(!args[1])
return -EINVAL; return -EINVAL;
mprintf("%d\n", spll_check_lock(atoi(args[1]))); mprintf("%d\n", spll_check_lock(atoi(args[1])));
} else if (!strcasecmp(args[0], "sps")) } else if (!strcasecmp(args[0], "sps")) {
{ if (!args[2])
if(!args[2])
return -EINVAL; return -EINVAL;
spll_set_phase_shift(atoi(args[1]), atoi(args[2])); spll_set_phase_shift(atoi(args[1]), atoi(args[2]));
} else if (!strcasecmp(args[0], "gps")) } else if (!strcasecmp(args[0], "gps")) {
{ if (!args[1])
if(!args[1])
return -EINVAL; return -EINVAL;
spll_get_phase_shift(atoi(args[1]), &cur, &tgt); spll_get_phase_shift(atoi(args[1]), &cur, &tgt);
printf("%d %d\n", cur, tgt); printf("%d %d\n", cur, tgt);
} else if (!strcasecmp(args[0], "start")) } else if (!strcasecmp(args[0], "start")) {
{ if (!args[1])
if(!args[1])
return -EINVAL; return -EINVAL;
spll_start_channel(atoi(args[1])); spll_start_channel(atoi(args[1]));
} else if (!strcasecmp(args[0], "stop")) } else if (!strcasecmp(args[0], "stop")) {
{ if (!args[1])
if(!args[1])
return -EINVAL; return -EINVAL;
spll_stop_channel(atoi(args[1])); spll_stop_channel(atoi(args[1]));
} else if (!strcasecmp(args[0], "sdac")) } else if (!strcasecmp(args[0], "sdac")) {
{ if (!args[2])
if(!args[2])
return -EINVAL; return -EINVAL;
spll_set_dac(atoi(args[1]), atoi(args[2])); spll_set_dac(atoi(args[1]), atoi(args[2]));
} else if (!strcasecmp(args[0], "gdac")) } else if (!strcasecmp(args[0], "gdac")) {
{ if (!args[1])
if(!args[1])
return -EINVAL; return -EINVAL;
mprintf("%d\n", spll_get_dac(atoi(args[1]))); mprintf("%d\n", spll_get_dac(atoi(args[1])));
} else return -EINVAL; } else
return -EINVAL;
return 0; return 0;
} }
shell/cmd_ptp.c
View file @ e625cbd9
...@@ -8,15 +8,14 @@ ...@@ -8,15 +8,14 @@
#include "shell.h" #include "shell.h"
int cmd_ptp(const char *args[]) int cmd_ptp(const char *args[])
{ {
if(!strcasecmp(args[0], "start")) if (!strcasecmp(args[0], "start"))
return wrc_ptp_start(); return wrc_ptp_start();
else if(!strcasecmp(args[0], "stop")) else if (!strcasecmp(args[0], "stop"))
return wrc_ptp_stop(); return wrc_ptp_stop();
else else
return -EINVAL; return -EINVAL;
return 0; return 0;
} }
\ No newline at end of file
shell/cmd_sdb.c
View file @ e625cbd9
...@@ -8,4 +8,4 @@ int cmd_sdb(const char *args[]) ...@@ -8,4 +8,4 @@ int cmd_sdb(const char *args[])
{ {
sdb_print_devices(); sdb_print_devices();
return 0; return 0;
} }
\ No newline at end of file
shell/cmd_sfp.c
View file @ e625cbd9
...@@ -19,18 +19,17 @@ ...@@ -19,18 +19,17 @@
int cmd_sfp(const char *args[]) int cmd_sfp(const char *args[])
{ {
int8_t sfpcount=1, i, temp; int8_t sfpcount = 1, i, temp;
struct s_sfpinfo sfp; struct s_sfpinfo sfp;
static char pn[SFP_PN_LEN+1] = "\0"; static char pn[SFP_PN_LEN + 1] = "\0";
if(args[0] && !strcasecmp(args[0], "detect")) if (args[0] && !strcasecmp(args[0], "detect")) {
{ if (!sfp_present())
if(!sfp_present())
mprintf("No SFP.\n"); mprintf("No SFP.\n");
else else
sfp_read_part_id(pn); sfp_read_part_id(pn);
pn[16]=0; pn[16] = 0;
mprintf("%s\n",pn); mprintf("%s\n", pn);
return 0; return 0;
} }
// else if (!strcasecmp(args[0], "i2cscan")) // else if (!strcasecmp(args[0], "i2cscan"))
...@@ -38,73 +37,65 @@ int cmd_sfp(const char *args[]) ...@@ -38,73 +37,65 @@ int cmd_sfp(const char *args[])
// mi2c_scan(WRPC_FMC_I2C); // mi2c_scan(WRPC_FMC_I2C);
// return 0; // return 0;
// } // }
else if (!strcasecmp(args[0], "erase")) else if (!strcasecmp(args[0], "erase")) {
{ if (eeprom_sfpdb_erase(WRPC_FMC_I2C, FMC_EEPROM_ADR) ==
if( eeprom_sfpdb_erase(WRPC_FMC_I2C, FMC_EEPROM_ADR) == EE_RET_I2CERR) EE_RET_I2CERR)
mprintf("Could not erase DB\n"); mprintf("Could not erase DB\n");
} } else if (args[4] && !strcasecmp(args[0], "add")) {
else if (args[4] && !strcasecmp(args[0], "add")) if (strlen(args[1]) > 16)
{ temp = 16;
if(strlen( args[1] )>16) temp=16; else
else temp=strlen( args[1] ); temp = strlen(args[1]);
for(i=0; i<temp; ++i) for (i = 0; i < temp; ++i)
sfp.pn[i]=args[1][i]; sfp.pn[i] = args[1][i];
while(i<16) sfp.pn[i++]=' '; //padding while (i < 16)
sfp.dTx = atoi(args[2]); sfp.pn[i++] = ' '; //padding
sfp.dRx = atoi(args[3]); sfp.dTx = atoi(args[2]);
sfp.alpha = atoi(args[4]); sfp.dRx = atoi(args[3]);
temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp, 1, 0); sfp.alpha = atoi(args[4]);
if(temp == EE_RET_DBFULL) temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp, 1, 0);
mprintf("SFP DB is full\n"); if (temp == EE_RET_DBFULL)
else if(temp == EE_RET_I2CERR) mprintf("SFP DB is full\n");
mprintf("I2C error\n"); else if (temp == EE_RET_I2CERR)
else mprintf("I2C error\n");
mprintf("%d SFPs in DB\n", temp); else
mprintf("%d SFPs in DB\n", temp);
} else if (args[0] && !strcasecmp(args[0], "show")) {
for (i = 0; i < sfpcount; ++i) {
temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR,
&sfp, 0, i);
if (!i) {
sfpcount = temp; //only in first round valid sfpcount is returned from eeprom_get_sfp
if (sfpcount == 0 || sfpcount == 0xFF) {
mprintf("SFP database empty...\n");
return 0;
} else if (sfpcount == -1) {
mprintf("SFP database corrupted...\n");
return 0;
}
}
mprintf("%d: PN:", i + 1);
for (temp = 0; temp < 16; ++temp)
mprintf("%c", sfp.pn[temp]);
mprintf(" dTx: %d, dRx: %d, alpha: %d\n", sfp.dTx,
sfp.dRx, sfp.alpha);
}
} else if (args[0] && !strcasecmp(args[0], "match")) {
if (pn[0] == '\0') {
mprintf("Run sfp detect first\n");
return 0;
}
strncpy(sfp.pn, pn, SFP_PN_LEN);
if (eeprom_match_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp) > 0) {
mprintf("SFP matched, dTx=%d, dRx=%d, alpha=%d\n",
sfp.dTx, sfp.dRx, sfp.alpha);
sfp_deltaTx = sfp.dTx;
sfp_deltaRx = sfp.dRx;
sfp_alpha = sfp.alpha;
} else
mprintf("Could not match to DB\n");
return 0;
} }
else if (args[0] && !strcasecmp(args[0], "show"))
{
for(i=0; i<sfpcount; ++i)
{
temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp, 0, i);
if(!i)
{
sfpcount=temp; //only in first round valid sfpcount is returned from eeprom_get_sfp
if(sfpcount == 0 || sfpcount == 0xFF)
{
mprintf("SFP database empty...\n");
return 0;
}
else if(sfpcount == -1)
{
mprintf("SFP database corrupted...\n");
return 0;
}
}
mprintf("%d: PN:", i+1);
for(temp=0; temp<16; ++temp)
mprintf("%c", sfp.pn[temp]);
mprintf(" dTx: %d, dRx: %d, alpha: %d\n", sfp.dTx, sfp.dRx, sfp.alpha);
}
}
else if (args[0] && !strcasecmp(args[0], "match"))
{
if(pn[0]=='\0')
{
mprintf("Run sfp detect first\n");
return 0;
}
strncpy(sfp.pn, pn, SFP_PN_LEN);
if(eeprom_match_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp) > 0)
{
mprintf("SFP matched, dTx=%d, dRx=%d, alpha=%d\n", sfp.dTx, sfp.dRx, sfp.alpha);
sfp_deltaTx = sfp.dTx;
sfp_deltaRx = sfp.dRx;
sfp_alpha = sfp.alpha;
}
else
mprintf("Could not match to DB\n");
return 0;
}
return 0; return 0;
} }
shell/cmd_stat.c
View file @ e625cbd9
...@@ -2,12 +2,10 @@ ...@@ -2,12 +2,10 @@
int cmd_stat(const char *args[]) int cmd_stat(const char *args[])
{ {
if(!strcasecmp(args[0], "cont") ) if (!strcasecmp(args[0], "cont")) {
{ wrc_ui_mode = UI_STAT_MODE;
wrc_ui_mode = UI_STAT_MODE; } else
} wrc_log_stats(1);
else
wrc_log_stats(1);
return 0; return 0;
} }
shell/cmd_time.c
View file @ e625cbd9
This diff is collapsed.
shell/cmd_version.c
View file @ e625cbd9
...@@ -5,6 +5,7 @@ extern const char *build_revision, *build_date; ...@@ -5,6 +5,7 @@ extern const char *build_revision, *build_date;
int cmd_version(const char *args[]) int cmd_version(const char *args[])
{ {
mprintf("WR Core build: %s, compiled on: %s (memory size: %d kB)\n", build_revision, build_date, sysc_get_memsize()); mprintf("WR Core build: %s, compiled on: %s (memory size: %d kB)\n",
build_revision, build_date, sysc_get_memsize());
return 0; return 0;
} }
\ No newline at end of file
shell/environ.c
View file @ e625cbd9
This diff is collapsed.
shell/shell.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/crcutil.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/eep43.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/eep43.h
View file @ e625cbd9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define EEP43_H #define EEP43_H
/* returns TRUE for success */ /* returns TRUE for success */
int Write43(int portnum, uchar *SerialNum, int page, uchar *page_buffer); int Write43(int portnum, uchar * SerialNum, int page, uchar * page_buffer);
int ReadMem43(int portnum, uchar *SerialNum, int page, uchar *page_buffer); int ReadMem43(int portnum, uchar * SerialNum, int page, uchar * page_buffer);
#endif #endif
sockitowm/findtype.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/findtype.h
View file @ e625cbd9
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
// //
//---------------------------------------------------------------------- //----------------------------------------------------------------------
SMALLINT FindDevices(int,uchar FamilySN[][8],SMALLINT,int); SMALLINT FindDevices(int, uchar FamilySN[][8], SMALLINT, int);
sockitowm/owerr.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/owlnk.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/ownet.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/ownet.h
View file @ e625cbd9
This diff is collapsed.
sockitowm/owses.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/owtran.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/temp10.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/temp10.h
View file @ e625cbd9
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
// //
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
int ReadTemperature10(int,uchar *,float *); int ReadTemperature10(int, uchar *, float *);
sockitowm/temp28.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/temp28.h
View file @ e625cbd9
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
// //
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
uint8_t ReadTemperature28(uint8_t , uint8_t *,int16_t *); uint8_t ReadTemperature28(uint8_t, uint8_t *, int16_t *);
sockitowm/temp42.c
View file @ e625cbd9
This diff is collapsed.
sockitowm/temp42.h
View file @ e625cbd9
This diff is collapsed.
tests/measure_t24p.c
View file @ e625cbd9
This diff is collapsed.
tools/genraminit.c
View file @ e625cbd9
This diff is collapsed.
tools/genramvhd.c
View file @ e625cbd9
This diff is collapsed.
wrc_main.c
View file @ e625cbd9
This diff is collapsed.
wrc_ptp.c
View file @ e625cbd9
This diff is collapsed.
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