diff --git a/Makefile b/Makefile
index 95ffb6ac526d92929319a3472b70440c930578d7..9431563b88634a7e8bd2c886b26d06a47e37004f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# choose your board here.
+# choose your board here.
BOARD = spec
# 1 enables Etherbone support
@@ -81,8 +81,8 @@ OBJS_PTPD = $(PTP_NOPOSIX)/PTPWRd/arith.o \
$(PTP_NOPOSIX)/libposix/net.o \
$(PTP_NOPOSIX)/softpll/softpll_ng.o
-CFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled
-LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled -nostdlib -T arch/lm32/ram.ld
+CFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled
+LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled -nostdlib -T arch/lm32/ram.ld
OBJS_PLATFORM=arch/lm32/crt0.o arch/lm32/irq.o arch/lm32/debug.o
@@ -96,14 +96,14 @@ CC=$(CROSS_COMPILE)gcc
OBJDUMP=$(CROSS_COMPILE)objdump
OBJCOPY=$(CROSS_COMPILE)objcopy
SIZE=$(CROSS_COMPILE)size
-
+
CFLAGS= $(CFLAGS_PLATFORM) $(CFLAGS_EB) $(CFLAGS_PTPD) $(INCLUDE_DIRS) -ffunction-sections -fdata-sections -Os -Iinclude -include include/trace.h $(PTPD_CFLAGS) -I$(PTP_NOPOSIX)/PTPWRd -I. -Isoftpll
LDFLAGS= $(LDFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Wl,--gc-sections -Os -Iinclude
OBJS=$(OBJS_PLATFORM) $(OBJS_WRC) $(OBJS_PTPD) $(OBJS_SHELL) $(OBJS_TESTS) $(OBJS_LIB) $(OBJS_SOCKITOWM) $(OBJS_SOFTPLL) $(OBJS_DEV)
OUTPUT=wrc
REVISION=$(shell git rev-parse HEAD)
-$(shell ln -sf ../boards/$(BOARD)/board.h include/board.h)
+$(shell ln -sf ../boards/$(BOARD)/board.h include/board.h)
all: tools wrc
@@ -112,14 +112,14 @@ wrc: $(OBJS)
echo "const char *build_date = __DATE__ \" \" __TIME__;" >> revision.c
$(CC) $(CFLAGS) -c revision.c
$(SIZE) -t $(OBJS)
- ${CC} -o $(OUTPUT).elf revision.o $(OBJS) $(LDFLAGS)
+ ${CC} -o $(OUTPUT).elf revision.o $(OBJS) $(LDFLAGS)
${OBJCOPY} -O binary $(OUTPUT).elf $(OUTPUT).bin
${OBJDUMP} -d $(OUTPUT).elf > $(OUTPUT)_disasm.S
cd tools; $(MAKE)
./tools/genraminit $(OUTPUT).bin 0 > $(OUTPUT).ram
./tools/genramvhd -s 90112 $(OUTPUT).bin > $(OUTPUT).vhd
-clean:
+clean:
rm -f $(OBJS) $(OUTPUT).elf $(OUTPUT).bin $(OUTPUT).ram
%.o: %.c
diff --git a/arch/lm32/debug.S b/arch/lm32/debug.S
index 315f69731830a4317426b50c40131bd14ff3c92f..db06ef551694f7d9777f0da72ad641aeecb33af9 100644
--- a/arch/lm32/debug.S
+++ b/arch/lm32/debug.S
@@ -3,7 +3,7 @@
* Load this code anywhere in memory and point DEBA at it.
* When DC=1 it chain loads the exception handlers at EBA.
* User exception handlers must save to the stack.
- *
+ *
* Copyright (C) 2011 by Wesley W. Terpstra <w.terpstra@gsi.de>
*/
@@ -289,7 +289,7 @@ handle_debug_trap:
calli jtag_put_byte
_get_command:
- /* Input: [Wxxxxxxx]
+ /* Input: [Wxxxxxxx]
* W=0, x=0: quit debug trap
* W=1, x=0: report register dump location
* W=0, x>0: read 'x' bytes
@@ -306,7 +306,7 @@ _get_command:
/* Load memory access address */
calli jtag_get_word
mv r11, r1
-
+
/* Either read or write */
bne r10, r0, _read_mem
diff --git a/arch/lm32/ram.ld b/arch/lm32/ram.ld
index a0a4fb87e8382d73399dd4556e30697d36a2f158..76b920d490cf9840044dfcda40f7cc4443582df8 100644
--- a/arch/lm32/ram.ld
+++ b/arch/lm32/ram.ld
@@ -38,7 +38,7 @@ SECTIONS
{
.boot : { *(.boot) } > ram
-
+
/* Code */
.text :
{
@@ -60,26 +60,26 @@ SECTIONS
KEEP (*(.dtors))
KEEP (*(.jcr))
_etext = .;
- } > ram =0
+ } > ram =0
/* Exception handlers */
.eh_frame_hdr : { *(.eh_frame_hdr) } > ram
.eh_frame : { KEEP (*(.eh_frame)) } > ram
.gcc_except_table : { *(.gcc_except_table) *(.gcc_except_table.*) } > ram
-
+
/* Read-only data */
- .rodata :
- {
+ .rodata :
+ {
. = ALIGN(4);
_frodata = .;
_frodata_rom = LOADADDR(.rodata);
- *(.rodata .rodata.* .gnu.linkonce.r.*)
+ *(.rodata .rodata.* .gnu.linkonce.r.*)
*(.rodata1)
_erodata = .;
} > ram
-
+
/* Data */
- .data :
+ .data :
{
. = ALIGN(4);
_fdata = .;
@@ -90,8 +90,8 @@ SECTIONS
_gp = ALIGN(16) + 0x7ff0;
*(.sdata .sdata.* .gnu.linkonce.s.*)
_edata = .;
- } > ram
-
+ } > ram
+
/* BSS */
.bss :
{
@@ -108,10 +108,10 @@ SECTIONS
_end = .;
PROVIDE (end = .);
} > ram
-
+
/* First location in stack is highest address in RAM */
PROVIDE(_fstack = ORIGIN(ram) + LENGTH(ram) - 4);
-
+
/* Stabs debugging sections. */
.stab 0 : { *(.stab) }
.stabstr 0 : { *(.stabstr) }
@@ -120,7 +120,7 @@ SECTIONS
.stab.index 0 : { *(.stab.index) }
.stab.indexstr 0 : { *(.stab.indexstr) }
.comment 0 : { *(.comment) }
-
+
/* DWARF debug sections.
Symbols in the DWARF debugging sections are relative to the beginning
of the section so we begin them at 0. */
diff --git a/dev/dna.c b/dev/dna.c
index 6b53fd1a9becf96eb3b5612734fb7389010ec707..c9514549d08b85fb5dee3e538074fe46753781d7 100644
--- a/dev/dna.c
+++ b/dev/dna.c
@@ -10,7 +10,7 @@ void dna_read(uint32_t *lo, uint32_t *hi)
{
uint64_t dna = 0;
int i;
-
+
gpio_out(DNA_DATA, 0);
delay(10);
gpio_out(DNA_CLK, 0);
@@ -19,7 +19,7 @@ void dna_read(uint32_t *lo, uint32_t *hi)
delay(10);
gpio_out(DNA_SHIFT, 0);
delay(10);
-
+
delay(10);
gpio_out(DNA_CLK, 1);
delay(10);
@@ -31,7 +31,7 @@ void dna_read(uint32_t *lo, uint32_t *hi)
gpio_out(DNA_SHIFT, 1);
delay(10);
-
+
for(i=0;i<57;i++)
{
dna <<= 1;
@@ -44,7 +44,7 @@ void dna_read(uint32_t *lo, uint32_t *hi)
gpio_out(DNA_CLK, 0);
delay(10);
}
-
+
*hi = (uint32_t) (dna >> 32);
*lo = (uint32_t) dna;
}
diff --git a/dev/eeprom.c b/dev/eeprom.c
index 653e6964a90f3337275e000d795abe2613959da0..a687584a45364346f9c58e3bbe19254827ce430e 100644
--- a/dev/eeprom.c
+++ b/dev/eeprom.c
@@ -5,8 +5,8 @@
#include "syscon.h"
/*
- * The SFP section is placed somewhere inside FMC EEPROM and it really does not
- * matter where (can be a binary data inside the Board Info section but can be
+ * The SFP section is placed somewhere inside FMC EEPROM and it really does not
+ * matter where (can be a binary data inside the Board Info section but can be
* placed also outside the FMC standardized EEPROM structure. The only requirement
* is that it starts with 0xdeadbeef pattern. The structure of SFP section is:
*
@@ -23,10 +23,10 @@
* --------------------------------------------------------------------------------------------
*
* Fields description:
- * cal_ph_trans - t2/t4 phase transition value (got from measure_t24p() ), contains
+ * cal_ph_trans - t2/t4 phase transition value (got from measure_t24p() ), contains
* _valid_ bit (MSB) and 31 bits of cal_phase_transition value
* count - how many SFPs are described in the list (binary)
- * SFP(n) part number - SFP PN as read from SFP's EEPROM (e.g. AXGE-1254-0531)
+ * SFP(n) part number - SFP PN as read from SFP's EEPROM (e.g. AXGE-1254-0531)
* (16 ascii chars)
* checksum - low order 8 bits of the sum of all bytes for the SFP(PN,alpha,dTx,dRx)
*
@@ -49,7 +49,7 @@ uint8_t has_eeprom = 0;
uint8_t eeprom_present(uint8_t i2cif, uint8_t i2c_addr)
{
- has_eeprom = 1;
+ has_eeprom = 1;
if( !mi2c_devprobe(i2cif, i2c_addr) )
if( !mi2c_devprobe(i2cif, i2c_addr) )
has_eeprom = 0;
@@ -151,7 +151,7 @@ int32_t eeprom_get_sfp(uint8_t i2cif, uint8_t i2c_addr, struct s_sfpinfo* sfp, u
if(!add)
{
- if( eeprom_read(i2cif, i2c_addr, EE_BASE_SFP + sizeof(sfpcount) + pos*sizeof(struct s_sfpinfo), (uint8_t*)sfp,
+ if( eeprom_read(i2cif, i2c_addr, EE_BASE_SFP + sizeof(sfpcount) + pos*sizeof(struct s_sfpinfo), (uint8_t*)sfp,
sizeof(struct s_sfpinfo)) != sizeof(struct s_sfpinfo) )
return EE_RET_I2CERR;
@@ -184,16 +184,16 @@ int8_t eeprom_match_sfp(uint8_t i2cif, uint8_t i2c_addr, struct s_sfpinfo* sfp)
struct s_sfpinfo dbsfp;
for(i=0; i<sfpcount; ++i)
- {
- temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &dbsfp, 0, i);
- if(!i)
- {
+ {
+ temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &dbsfp, 0, i);
+ if(!i)
+ {
sfpcount=temp; //only in first round valid sfpcount is returned from eeprom_get_sfp
if(sfpcount == 0 || sfpcount == 0xFF)
return 0;
- else if(sfpcount<0)
+ else if(sfpcount<0)
return sfpcount;
- }
+ }
if( !strncmp(dbsfp.pn, sfp->pn, 16) )
{
sfp->dTx = dbsfp.dTx;
@@ -201,7 +201,7 @@ int8_t eeprom_match_sfp(uint8_t i2cif, uint8_t i2c_addr, struct s_sfpinfo* sfp)
sfp->alpha = dbsfp.alpha;
return 1;
}
- }
+ }
return 0;
}
@@ -256,7 +256,7 @@ int8_t eeprom_init_purge(uint8_t i2cif, uint8_t i2c_addr)
return used;
}
-/*
+/*
* Appends a new shell command at the end of boot script
*/
int8_t eeprom_init_add(uint8_t i2cif, uint8_t i2c_addr, const char *args[])
@@ -302,7 +302,7 @@ int32_t eeprom_init_show(uint8_t i2cif, uint8_t i2c_addr)
if( eeprom_read(i2cif, i2c_addr, EE_BASE_INIT, (uint8_t*)&used, sizeof(used)) != sizeof(used) )
return EE_RET_I2CERR;
- if(used==0 || used==0xffff)
+ if(used==0 || used==0xffff)
{
used = 0; //this means the memory is blank
mprintf("Empty init script...\n");
@@ -325,7 +325,7 @@ int8_t eeprom_init_readcmd(uint8_t i2cif, uint8_t i2c_addr, char* buf, uint8_t b
static uint16_t used = 0;
uint8_t i=0;
- if(next == 0)
+ if(next == 0)
{
if( eeprom_read(i2cif, i2c_addr, EE_BASE_INIT, (uint8_t*)&used, sizeof(used)) != sizeof(used) )
return EE_RET_I2CERR;
diff --git a/dev/endpoint.c b/dev/endpoint.c
index 76c1d522b0c992c3129588b15e3294ace6e172f3..1276361f9e7822cf886d329d0c5b252d68ebb7d4 100644
--- a/dev/endpoint.c
+++ b/dev/endpoint.c
@@ -1,6 +1,6 @@
/*
-WR Endpoint (WR-compatible Ethernet MAC driver
+WR Endpoint (WR-compatible Ethernet MAC driver
Tomasz Wlostowski/CERN 2011
@@ -63,8 +63,8 @@ void get_mac_addr(uint8_t dev_addr[])
{
dev_addr[5] = (EP->MACL & 0x000000ff);
dev_addr[4] = (EP->MACL & 0x0000ff00) >> 8;
- dev_addr[3] = (EP->MACL & 0x00ff0000) >> 16;
- dev_addr[2] = (EP->MACL & 0xff000000) >> 24;
+ dev_addr[3] = (EP->MACL & 0x00ff0000) >> 16;
+ dev_addr[2] = (EP->MACL & 0xff000000) >> 24;
dev_addr[1] = (EP->MACH & 0x000000ff);
dev_addr[0] = (EP->MACH & 0x0000ff00) >> 8;
}
@@ -85,7 +85,7 @@ void ep_init(uint8_t mac_addr[])
EP->TSCR = EP_TSCR_EN_TXTS | EP_TSCR_EN_RXTS; /* Enable timestamping */
/* 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,
@@ -153,9 +153,9 @@ int ep_link_up(uint16_t *lpa)
/* 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)
{
- /* 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 */
- *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));
return 0;
}
@@ -164,7 +164,7 @@ int ep_get_deltas(uint32_t *delta_tx, uint32_t *delta_rx)
int ep_cal_pattern_enable()
{
uint32_t val;
- val = pcs_read(MDIO_REG_WR_SPEC);
+ val = pcs_read(MDIO_REG_WR_SPEC);
val |= MDIO_WR_SPEC_TX_CAL;
pcs_write(MDIO_REG_WR_SPEC, val);
diff --git a/dev/ep_pfilter.c b/dev/ep_pfilter.c
index 0f0c2a5b2aff3f372392fb451f9df1df04170d85..c65db2a6b9b2447366f2cc25839a7a50c3d7637a 100644
--- a/dev/ep_pfilter.c
+++ b/dev/ep_pfilter.c
@@ -1,4 +1,4 @@
-/* Endpoint Packet Filter/Classifier driver
+/* Endpoint Packet Filter/Classifier driver
A little explanation: The WR core needs to classify the incoming packets into
two (or more categories):
@@ -6,11 +6,11 @@
- Other packets matching user's provided pattern, which shall go to the external fabric
port - for example to Etherbone, host network controller, etc.
- packets to be dropped (used neither by the WR Core or the user application)
-
+
WR Endpoint (WR MAC) inside the WR Core therefore contains a simple microprogrammable
packet filter/classifier. The classifier processes the incoming packet, and assigns it
- to one of 8 classes (an 8-bit word, where each bit corresponds to a particular class) or
- eventually drops it. Hardware implementation of the unit is a simple VLIW processor with
+ to one of 8 classes (an 8-bit word, where each bit corresponds to a particular class) or
+ eventually drops it. Hardware implementation of the unit is a simple VLIW processor with
32 single-bit registers (0 - 31). The registers are organized as follows:
- 0: don't touch (always 0)
- 1 - 22: general purpose registers
@@ -22,54 +22,54 @@
1. CMP offset, value, mask, oper, Rd:
------------------------------------------
-
+
* Rd = Rd oper ((((uint16_t *)packet) [offset] & mask) == value)
-
+
Examples:
- * CMP 3, 0xcafe, 0xffff, MOV, Rd
+ * CMP 3, 0xcafe, 0xffff, MOV, Rd
will compare the 3rd word of the packet (bytes 6, 7) against 0xcafe and if the words are equal,
1 will be written to Rd register.
-
+
* CMP 4, 0xbabe, 0xffff, AND, Rd
will do the same with the 4th word and write to Rd its previous value ANDed with the result
of the comparison. Effectively, Rd now will be 1 only if bytes [6..9] of the payload contain word
- 0xcafebabe.
-
- Note that the mask value is nibble-granular. That means you can choose a particular
+ 0xcafebabe.
+
+ Note that the mask value is nibble-granular. That means you can choose a particular
set of nibbles within a word to be compared, but not an arbitrary set of bits (e.g. 0xf00f, 0xff00
and 0xf0f0 masks are ok, but 0x8001 is wrong.
-
+
2. BTST offset, bit_number, oper, Rd
------------------------------------------
-
+
* Rd = Rd oper (((uint16_t *)packet) [offset] & (1<<bit_number) ? 1 : 0)
-
+
Examples:
* BTST 3, 10, MOV, 11
will write 1 to reg 11 if the 10th bit in the 3rd word of the packet is set (and 0 if it's clear)
-
+
3. Logic opearations:
-----------------------------------------
* LOGIC2 Rd, Ra, OPER Rb - 2 argument logic (Rd = Ra OPER Rb). If the operation is MOV or NOT, Ra is
taken as the source register.
* LOGIC3 Rd, Ra, OPER Rb, OPER2, Rc - 3 argument logic Rd = (Ra OPER Rb) OPER2 Rc.
-
+
4. Misc
-----------------------------------------
FIN instruction terminates the program.
NOP executes a dummy instruction (LOGIC2 0, 0, AND, 0)
-
-
+
+
IMPORTANT:
- - the program counter is advanved each time a 16-bit words of the packet arrives.
+ - the program counter is advanved each time a 16-bit words of the packet arrives.
- the CPU doesn't have any interlocks to simplify the HW, so you can't compare the
10th word when PC = 2. Max comparison offset is always equal to the address of the instruction.
- Code may contain up to 64 operations, but it must classify shorter packets faster than in
32 instructions (there's no flow throttling)
*/
-
-
+
+
#include <stdio.h>
@@ -79,7 +79,7 @@
#define PFILTER_MAX_CODE_SIZE 32
-#define pfilter_dbg
+#define pfilter_dbg
extern volatile struct EP_WB *EP;
@@ -111,19 +111,19 @@ static void check_reg_range(int val, int minval, int maxval, char *name)
pfilter_dbg("microcode: %s register out of range (%d to %d)", name, minval,maxval);
}
}
-
+
void pfilter_cmp(int offset, int value, int mask, pfilter_op_t op, int rd)
{
uint64_t ir;
check_size();
-
+
if(offset > code_pos)
pfilter_dbg("microcode: comparison offset is bigger than current PC. Insert some nops before comparing");
check_reg_range(rd, 1, 15, "ra/rd");
-
+
ir = (PF_MODE_CMP | ((uint64_t)offset << 7)
| ((mask & 0x1) ? (1ULL<<29) : 0)
| ((mask & 0x10) ? (1ULL<<30) : 0)
@@ -142,19 +142,19 @@ void pfilter_btst(int offset, int bit_index, pfilter_op_t op, int rd)
uint64_t ir;
check_size();
-
+
if(offset > code_pos)
pfilter_dbg("microcode: comparison offset is bigger than current PC. Insert some nops before comparing");
check_reg_range(rd, 1, 15, "ra/rd");
check_reg_range(bit_index, 0, 15, "bit index");
-
+
ir = ((1ULL<<33) | PF_MODE_CMP | ((uint64_t)offset << 7) | ((uint64_t)bit_index << 29) | (uint64_t)op | ((uint64_t)rd << 3));
-
+
code_buf[code_pos++] = ir;
}
-void pfilter_nop()
+void pfilter_nop()
{
uint64_t ir;
check_size();
@@ -191,7 +191,7 @@ static void pfilter_logic3(int rd, int ra, pfilter_op_t op, int rb, pfilter_op_t
code_buf[code_pos++] = ir;
}
-/* Terminates the microcode, loads it to the endpoint and enables the pfilter */
+/* Terminates the microcode, loads it to the endpoint and enables the pfilter */
void pfilter_load()
{
int i;
@@ -204,11 +204,11 @@ void pfilter_load()
uint32_t cr0, cr1;
cr1 = EP_PFCR1_MM_DATA_LSB_W(code_buf[i] & 0xfff);
cr0 = EP_PFCR0_MM_ADDR_W(i) | EP_PFCR0_MM_DATA_MSB_W(code_buf[i]>>12) | EP_PFCR0_MM_WRITE_MASK;
-
+
EP->PFCR1 = cr1;
EP->PFCR0 = cr0;
}
-
+
EP->PFCR0 = EP_PFCR0_ENABLE;
}
@@ -228,34 +228,34 @@ void pfilter_init_default()
pfilter_cmp(0, 0xffff, 0xffff, MOV, 1);
pfilter_cmp(1, 0xffff, 0xffff, AND, 1);
pfilter_cmp(2, 0xffff, 0xffff, AND, 1); /* r1 = 1 when dst mac is broadcast */
- pfilter_cmp(0, 0x011b, 0xffff, MOV, 2);
+ pfilter_cmp(0, 0x011b, 0xffff, MOV, 2);
pfilter_cmp(1, 0x1900, 0xffff, AND, 2);
pfilter_cmp(2, 0x0000, 0xffff, AND, 2); /* r2 = 1 when dst mac is PTP multicast (01:1b:19:00:00:00) */
- pfilter_cmp(0, EP->MACH & 0xffff, 0xffff, MOV, 3);
+ pfilter_cmp(0, EP->MACH & 0xffff, 0xffff, MOV, 3);
pfilter_cmp(1, EP->MACL >> 16, 0xffff, AND, 3);
pfilter_cmp(2, EP->MACL & 0xffff, 0xffff, AND, 3); /* r3 = 1 when the packet is unicast to our own MAC */
- pfilter_cmp(6, 0x0800, 0xffff, MOV, 4); /* r4 = 1 when ethertype = IPv4 */
+ pfilter_cmp(6, 0x0800, 0xffff, MOV, 4); /* r4 = 1 when ethertype = IPv4 */
pfilter_cmp(6, 0x88f7, 0xffff, MOV, 5); /* r5 = 1 when ethertype = PTPv2 */
pfilter_cmp(6, 0x0806, 0xffff, MOV, 6); /* r6 = 1 when ethertype = ARP */
/* Ethernet = 14 bytes, Offset to type in IP: 8 bytes = 22/2 = 11 */
pfilter_cmp(11,0x0001, 0x00ff, MOV, 7); /* r7 = 1 when IP type = ICMP */
pfilter_cmp(11,0x0011, 0x00ff, MOV, 8); /* r8 = 1 when IP type = UDP */
-
+
pfilter_logic3(10, 3, OR, 0, AND, 4); /* r10 = IP(unicast) */
pfilter_logic3(11, 1, OR, 3, AND, 4); /* r11 = IP(unicast+broadcast) */
-
+
pfilter_logic3(14, 1, AND, 6, OR, 5); /* r14 = ARP(broadcast) or PTPv2 */
pfilter_logic3(15, 10, AND, 7, OR, 14); /* r15 = ICMP/IP(unicast) or ARP(broadcast) or PTPv2 */
-
+
/* Ethernet = 14 bytes, IPv4 = 20 bytes, offset to dport: 2 = 36/2 = 18 */
pfilter_cmp(18, 0x0044, 0xffff, MOV, 14); /* r14 = 1 when dport = BOOTPC */
pfilter_logic3(14, 14, AND, 8, AND, 11); /* r14 = BOOTP/UDP/IP(unicast|broadcast) */
pfilter_logic2(15, 14, OR, 15); /* r15 = BOOTP/UDP/IP(unicast|broadcast) or ICMP/IP(unicast) or ARP(broadcast) or PTPv2 */
-
+
pfilter_logic3(20, 11, AND, 8, OR, 15); /* r16 = Something we accept */
pfilter_logic2(R_DROP, 20, NOT, 0); /* None match? drop */
-
+
pfilter_logic2(R_CLASS(7), 11, AND, 8); /* class 7: UDP/IP(unicast|broadcast) => external fabric */
pfilter_logic2(R_CLASS(0), 15, MOV, 0); /* class 0: ICMP/IP(unicast) or ARP(broadcast) or PTPv2 => PTP LM32 core */
@@ -278,5 +278,5 @@ void pfilter_init_default()
pfilter_logic2(R_CLASS(0), 6, MOV, 0); /* class 0: PTPv2 => PTP LM32 core */
pfilter_load();
#endif
-
+
}
\ No newline at end of file
diff --git a/dev/i2c.c b/dev/i2c.c
index c30ffe6e22e1c63ffa723c04f28e5c0946490f4b..9e25f2c8710280fb7278aa356e770b9d72a4963d 100644
--- a/dev/i2c.c
+++ b/dev/i2c.c
@@ -111,14 +111,14 @@ uint8_t mi2c_devprobe(uint8_t i2cif, uint8_t i2c_addr)
//void mi2c_scan(uint8_t i2cif)
//{
// int i;
-//
+//
// //for(i=0;i<0x80;i++)
// for(i=0x50;i<0x51;i++)
// {
// mi2c_start(i2cif);
// if(!mi2c_put_byte(i2cif, i<<1)) mprintf("found : %x\n", i);
// mi2c_stop(i2cif);
-//
-// }
+//
+// }
// mprintf("Nothing more found...\n");
//}
diff --git a/dev/minic.c b/dev/minic.c
index 082725a54e4af0b12843612912cc41dae8663030..946204206a782e9382164ef5e9f04d914701b1e6 100644
--- a/dev/minic.c
+++ b/dev/minic.c
@@ -42,11 +42,11 @@ static volatile uint32_t dma_tx_buf[MINIC_DMA_TX_BUF_SIZE / 4];
static volatile uint32_t dma_rx_buf[MINIC_DMA_RX_BUF_SIZE / 4];
struct wr_minic {
- volatile uint32_t *rx_head, *rx_base;
+ volatile uint32_t *rx_head, *rx_base;
uint32_t rx_avail, rx_size;
volatile uint32_t *tx_head, *tx_base;
uint32_t tx_avail, tx_size;
-
+
int tx_count, rx_count;
};
@@ -127,14 +127,14 @@ static void minic_new_tx_buffer()
minic.tx_head = minic.tx_base;
minic.tx_avail = minic.tx_size;
-
+
minic_writel(MINIC_REG_TX_ADDR, (uint32_t) minic.tx_base);
}
void minic_init()
{
uint32_t lo , hi;
-
+
minic_writel(MINIC_REG_EIC_IDR, MINIC_EIC_IDR_RX);
minic_writel(MINIC_REG_EIC_ISR, MINIC_EIC_ISR_RX);
minic.rx_base = dma_rx_buf;
@@ -143,7 +143,7 @@ void minic_init()
/* FIXME: now we have a temporary HW protection against accidentally overwriting the memory - there's some
very well hidden bug in Minic's RX logic which sometimes causes an overwrite of the memory outside
the buffer. */
-
+
lo = (uint32_t)minic.rx_base >> 2;
hi = ((uint32_t)minic.rx_base >> 2) + (sizeof(dma_rx_buf)>>2) - 1;
@@ -196,16 +196,16 @@ int minic_rx_frame(uint8_t *hdr, uint8_t *payload, uint32_t buf_size, struct hw_
//otherwise, weird !!
mprintf("invalid descriptor @%x = %x\n", (uint32_t)minic.rx_head, desc_hdr);
minic_new_rx_buffer();
- }
+ }
return 0;
}
payload_size = RX_DESC_SIZE(desc_hdr);
num_words = ((payload_size + 3) >> 2) + 1;
- /* valid packet */
+ /* valid packet */
if(!RX_DESC_ERROR(desc_hdr))
- {
+ {
if(RX_DESC_HAS_OOB(desc_hdr) && hwts != NULL)
{
@@ -223,7 +223,7 @@ int minic_rx_frame(uint8_t *hdr, uint8_t *payload, uint32_t buf_size, struct hw_
pps_gen_get_time(&sec, &counter_ppsg);
if(counter_r > 3*REF_CLOCK_FREQ_HZ/4 && counter_ppsg < 250000000)
- sec--;
+ sec--;
hwts->sec = sec & 0x7fffffff ;
@@ -243,8 +243,8 @@ int minic_rx_frame(uint8_t *hdr, uint8_t *payload, uint32_t buf_size, struct hw_
minic_rx_memcpy(hdr, (void*)minic.rx_head + 4, ETH_HEADER_SIZE);
minic_rx_memcpy(payload, (void*)minic.rx_head + 4 + ETH_HEADER_SIZE, n_recvd - ETH_HEADER_SIZE);
- }
- else {
+ }
+ else {
n_recvd = -1;
}
minic_rxbuf_free(num_words);
@@ -288,7 +288,7 @@ int minic_tx_frame(uint8_t *hdr, uint8_t *payload, uint32_t size, struct hw_time
d_hdr = TX_DESC_WITH_OOB | (WRPC_FID<<12);
d_hdr |= TX_DESC_VALID | nwords;
-
+
*(volatile uint32_t *)(minic.tx_head) = d_hdr;
*(volatile uint32_t *)(minic.tx_head + nwords) = 0;
diff --git a/dev/onewire.c b/dev/onewire.c
index 764bc185d1ac3db955e8b016e3009c58c417d74f..939e22385710c34a1552c20baba34feebc841850 100644
--- a/dev/onewire.c
+++ b/dev/onewire.c
@@ -43,14 +43,14 @@ int8_t get_persistent_mac(uint8_t portnum, uint8_t* mac)
uint8_t read_buffer[32];
uint8_t i;
int8_t out;
-
+
out = -1;
if(devsnum == 0) return out;
-
+
for (i = 0; i < devsnum; ++i) {
//#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][3], FamilySN[i][2], FamilySN[i][1], FamilySN[i][0]);
//#endif
@@ -65,7 +65,7 @@ int8_t get_persistent_mac(uint8_t portnum, uint8_t* mac)
mprintf("Using temperature ID for MAC\n");
#endif
}
-
+
/* If there is an EEPROM, read page 0 for the MAC */
if (FamilySN[i][0] == 0x43) {
owLevel(portnum, MODE_NORMAL);
@@ -79,14 +79,14 @@ int8_t get_persistent_mac(uint8_t portnum, uint8_t* mac)
memcpy(mac, read_buffer, 6);
out = 0;
#if DEBUG_PMAC
- mprintf("Using EEPROM page: %x:%x:%x:%x:%x:%x\n",
+ mprintf("Using EEPROM page: %x:%x:%x:%x:%x:%x\n",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
#endif
}
}
}
}
-
+
return out;
}
@@ -98,18 +98,18 @@ int8_t set_persistent_mac(uint8_t portnum, uint8_t* mac)
// 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;
-
+
memset(write_buffer, 0, sizeof(write_buffer));
memcpy(write_buffer, mac, 6);
-
+
#if DEBUG_PMAC
mprintf("Writing to EEPROM\n");
#endif
-
+
/* Write the last EEPROM with the MAC */
owLevel(portnum, MODE_NORMAL);
if (Write43(portnum, FamilySN[0], EEPROM_MAC_PAGE, &write_buffer) == TRUE)
return 0;
-
+
return -1;
}
diff --git a/dev/pps_gen.c b/dev/pps_gen.c
index 8cdd77992f476fb7686d151f69188a5f08a2356f..27a88ddb23027aad1e29a658f6fae1aa722a975a 100644
--- a/dev/pps_gen.c
+++ b/dev/pps_gen.c
@@ -40,7 +40,7 @@ int pps_gen_adjust(int counter, int64_t how_much)
{
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));
if(counter == PPSG_ADJUST_NSEC)
@@ -75,12 +75,12 @@ uint64_t pps_get_utc(void)
{
uint64_t out;
uint32_t low, high;
-
+
low = ppsg_read(CNTR_UTCLO);
high = ppsg_read(CNTR_UTCHI);
-
+
high &= 0xFF; /* CNTR_UTCHI has only 8 bits defined -- rest are HDL don't care */
-
+
out = (uint64_t)low | (uint64_t)high << 32;
return out;
}
@@ -89,7 +89,7 @@ void pps_gen_get_time(uint64_t *seconds, uint32_t *nanoseconds)
{
uint32_t ns_cnt;
uint64_t sec1, sec2;
-
+
do {
sec1 = pps_get_utc();
ns_cnt = ppsg_read(CNTR_NSEC) & 0xFFFFFFFUL; /* 28-bit wide register */
diff --git a/dev/sdb.c b/dev/sdb.c
index dcd6949a24fa7b16445a638a7fdbc86df04fc38b..cbae0ac35a594d2af7a67ca5623ce3a6f1ec6233 100644
--- a/dev/sdb.c
+++ b/dev/sdb.c
@@ -62,22 +62,22 @@ static unsigned char* find_device_deep(unsigned int base, unsigned int sdb, unsi
sdb_record_t* record = (sdb_record_t*)sdb;
int records = record->interconnect.sdb_records;
int i;
-
+
for (i = 0; i < records; ++i, ++record) {
if (record->empty.record_type == SDB_BRIDGE) {
- unsigned char* out =
+ unsigned char* out =
find_device_deep(
base + record->bridge.sdb_component.addr_first.low,
record->bridge.sdb_child.low,
devid);
if (out) return out;
}
- if (record->empty.record_type == SDB_DEVICE &&
+ if (record->empty.record_type == SDB_DEVICE &&
record->device.sdb_component.product.device_id == devid) {
break;
}
}
-
+
if (i == records) return 0;
return (unsigned char*)(base + record->device.sdb_component.addr_first.low);
}
@@ -87,20 +87,20 @@ static void print_devices_deep(unsigned int base, unsigned int sdb) {
int records = record->interconnect.sdb_records;
int i;
char buf[20];
-
+
for (i = 0; i < records; ++i, ++record) {
if (record->empty.record_type == SDB_BRIDGE)
print_devices_deep(
base + record->bridge.sdb_component.addr_first.low,
record->bridge.sdb_child.low);
-
+
if (record->empty.record_type != SDB_DEVICE) continue;
-
+
memcpy(buf, record->device.sdb_component.product.name, 19);
buf[19] = 0;
- mprintf("%8x:%8x 0x%8x %s\n",
+ mprintf("%8x:%8x 0x%8x %s\n",
record->device.sdb_component.product.vendor_id.low,
- record->device.sdb_component.product.device_id,
+ record->device.sdb_component.product.device_id,
base + record->device.sdb_component.addr_first.low,
buf);
}
diff --git a/dev/sfp.c b/dev/sfp.c
index dcf579b60b73ab6abd2e5e6eb4d5012065f76663..92a4f5df6a704104cfbee07b2cf0262906c29453 100644
--- a/dev/sfp.c
+++ b/dev/sfp.c
@@ -21,7 +21,7 @@ int sfp_read_part_id(char *part_id)
mi2c_start(WRPC_SFP_I2C);
mi2c_put_byte(WRPC_SFP_I2C, 0xA0);
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_get_byte(WRPC_SFP_I2C, &data, 1);
mi2c_stop(WRPC_SFP_I2C);
@@ -40,8 +40,8 @@ int sfp_read_part_id(char *part_id)
mi2c_get_byte(WRPC_SFP_I2C, &data, 1); //final word, checksum
mi2c_stop(WRPC_SFP_I2C);
- if(sum == data)
+ if(sum == data)
return 0;
-
+
return -1;
}
diff --git a/dev/syscon.c b/dev/syscon.c
index 5572f601a76e8c2effaa5b5c02dfef4cd712c7e0..912d5be21f9ae9a2941530e6a502cd64ace24955 100644
--- a/dev/syscon.c
+++ b/dev/syscon.c
@@ -1,6 +1,6 @@
#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_FMC_SCL, SYSC_GPSR_FMC_SDA},
{SYSC_GPSR_SFP_SCL, SYSC_GPSR_SFP_SDA} };
volatile struct SYSCON_WB *syscon;
@@ -11,9 +11,9 @@ volatile struct SYSCON_WB *syscon;
void timer_init(uint32_t enable)
{
syscon = (volatile struct SYSCON_WB *) BASE_SYSCON;
-
+
if(enable)
- syscon->TCR |= SYSC_TCR_ENABLE;
+ syscon->TCR |= SYSC_TCR_ENABLE;
else
syscon->TCR &= ~SYSC_TCR_ENABLE;
}
diff --git a/dev/uart.c b/dev/uart.c
index 55ea2bd36d248a1fd7578191d3ba00d98bb29a81..bcd0a63c48141e15f7481bb0bba481c275e8a26b 100644
--- a/dev/uart.c
+++ b/dev/uart.c
@@ -41,6 +41,6 @@ int uart_read_byte()
{
if(!uart_poll())
return -1;
-
+
return uart->RDR & 0xff;
}
\ No newline at end of file
diff --git a/doc/wrpc.in b/doc/wrpc.in
index e624135b82d857706034e84227c7ed4f504a31a6..e75b40b94d4085709a7474effaca82af75512da4 100644
--- a/doc/wrpc.in
+++ b/doc/wrpc.in
@@ -60,19 +60,19 @@
@node Top
@top Introduction
-This is the user manual for the White Rabbit PTP Core developed on
+This is the user manual for the White Rabbit PTP Core developed on
@code{ohwr.org}. It describes the building and running process. If you don't
-want to get your hands dirty and prefer to use the binaries available at
-@uref{http://www.ohwr.org/projects/wr-cores/files} you can skip
-@ref{Building the Core} and move forward directly to
+want to get your hands dirty and prefer to use the binaries available at
+@uref{http://www.ohwr.org/projects/wr-cores/files} you can skip
+@ref{Building the Core} and move forward directly to
@ref{Running and Configuring}.
@menu
-* Software and hardware requirements::
+* Software and hardware requirements::
* Building the Core::
* Running and Configuring
-* Known bugs and missing features::
-* Troubleshooting::
+* Known bugs and missing features::
+* Troubleshooting::
* Questions, reporting bugs::
@end menu
@@ -114,7 +114,7 @@ The code and documentation is distributed in the following places:
@end table
-Other tools useful in building and running WRPC can be fetched from the
+Other tools useful in building and running WRPC can be fetched from the
following locations:
@table @code
@@ -130,10 +130,10 @@ on the set of Manifest files.
@end table
-The repositories containing the WRPC gateware and software (@i{wr-cores},
+The repositories containing the WRPC gateware and software (@i{wr-cores},
@i{wrpc-sw}) are tagged with @code{@value{tagname}} tag. Other tools
used to build the core and load it into SPEC board should be used in their
-newest available versions stored in master branch of an appropriate git
+newest available versions stored in master branch of an appropriate git
repository (unless specified otherwise in this document).
Any official hot fixes, if any, for this release will live in the branch called
@@ -145,9 +145,9 @@ Any official hot fixes, if any, for this release will live in the branch called
The absolutely minimum hardware you need to build and run the White
Rabbit PTP Core is a PC computer with Linux and one Simple PCIe FMC Carrier
-(SPEC) - @uref{http://www.ohwr.org/projects/spec}. However, it is recommended to
+(SPEC) - @uref{http://www.ohwr.org/projects/spec}. However, it is recommended to
use also the DIO FMC card (@uref{http://www.ohwr.org/projects/fmc-dio-5chttla})
-for storing calibration values and configuration in EEPROM(described later).
+for storing calibration values and configuration in EEPROM(described later).
To test the White Rabbit synchronization, you will also need:
@itemize
@item second SPEC board with DIO FMC or White Rabbit Switch;
@@ -162,7 +162,7 @@ Switch.
@chapter Building the Core
Building the White Rabbit PTP Core is a two step process. First you have to
-synthesize the FPGA firmware (gateware). This describes the hardware inside
+synthesize the FPGA firmware (gateware). This describes the hardware inside
FPGA that is later used by LM32 software to perform WR synchronization.
To perform the steps below you will need a computer running Linux.
@@ -176,24 +176,24 @@ To perform the steps below you will need a computer running Linux.
@node HDL synthesis
@section HDL synthesis
-Before running the synthesis process you have to make sure that your
-environment is set correctly. You need the Xilinx ISE Software with free
-WebPack license installed on a PC. It contains the script @i{settings32.sh}
+Before running the synthesis process you have to make sure that your
+environment is set correctly. You need the Xilinx ISE Software with free
+WebPack license installed on a PC. It contains the script @i{settings32.sh}
and @i{settings32.csh} (depending on the shell you use) that sets up all the
-system variables required by Xilinx software. For default installation path the
+system variables required by Xilinx software. For default installation path the
script is located in:
@example
/opt/Xilinx/<version>/ISE_DS/settings32.sh
@end example
-and has to be executed before other tools are used. The easiest way to ensure
+and has to be executed before other tools are used. The easiest way to ensure
that @i{ISE}-related variables are set in the shell is to check if @i{$XILINX}
variable contains the path to your @i{ISE} installation directory.
-@b{Note:} current version of @i{hdlmake} tool developed at CERN requires
-modification of @i{$XILINX} variable after @i{settings32} script execution.
-This (provided that the installation path for @i{ISE} is /opt/Xilinx/<version>)
+@b{Note:} current version of @i{hdlmake} tool developed at CERN requires
+modification of @i{$XILINX} variable after @i{settings32} script execution.
+This (provided that the installation path for @i{ISE} is /opt/Xilinx/<version>)
should look like this:
@example
@@ -205,20 +205,20 @@ Xilinx ISE 14.1. It is recommended to use the newest available version of ISE
software.
@sp 1
-HDL sources for WR PTP Core can be synthesized with nothing more but Xilinx
-ISE software, but using @i{hdlmake} tool developed at CERN is much more
-convenient. It creates a synthesis Makefile and ISE project file based on the
-set of Manifest.py files deployed among directories inside @i{wr-cores}
+HDL sources for WR PTP Core can be synthesized with nothing more but Xilinx
+ISE software, but using @i{hdlmake} tool developed at CERN is much more
+convenient. It creates a synthesis Makefile and ISE project file based on the
+set of Manifest.py files deployed among directories inside @i{wr-cores}
repository.
-First, please clone the @i{hdlmake} repository from its location given in
+First, please clone the @i{hdlmake} repository from its location given in
@ref{Repositories and Releases}:
@example
$ git clone git://ohwr.org/misc/hdl-make.git <your_hdlmake_location>
@end example
-and add the @i{hdlmake} binary location to your @i{$PATH} to be able to call
+and add the @i{hdlmake} binary location to your @i{$PATH} to be able to call
it from any directory:
@example
@@ -227,13 +227,13 @@ it from any directory:
@b{Note:} the @i{hdlmake} usage instructions here are based on version 493ce82.
When there will be newer commits, they can be used but please be aware that its
-execution parameters may change. In that case please refer to @i{hdlmake}
+execution parameters may change. In that case please refer to @i{hdlmake}
documentation.
@sp 1
-Having Xilinx ISE software and @i{hdlmake} you can clone the main WR PTP Core
-git repository and start building the FPGA bitstream. First, please create a
-local copy of the @i{wr-cores} in the preferred location on your system. This
+Having Xilinx ISE software and @i{hdlmake} you can clone the main WR PTP Core
+git repository and start building the FPGA bitstream. First, please create a
+local copy of the @i{wr-cores} in the preferred location on your system. This
release is marked with @value{tagname} tag.
@example
@@ -242,18 +242,18 @@ release is marked with @value{tagname} tag.
$ git checkout wrpc-v2.0
@end example
-@b{Note:} alternatively you can get the release sources from the tarball
+@b{Note:} alternatively you can get the release sources from the tarball
available in @uref{http://www.ohwr.org/projects/wr-cores/files}
@sp 1
-The subdirectory which contains the main synthesis Manifest.py for SPEC board
+The subdirectory which contains the main synthesis Manifest.py for SPEC board
and in which you should perform the whole process is:
@example
$ cd <your_wrpc_location>/syn/spec_1_1/wr_core_demo/
@end example
-Executing @i{hdlmake} without any parameters will fetch other git repositories
+Executing @i{hdlmake} without any parameters will fetch other git repositories
containing submodules essential for WRPC, and store their local copies to:
@example
@@ -266,21 +266,21 @@ After that, the actual synthesis is just the matter of executing the command:
$ make
@end example
-just as in a regular software compilation process. This takes (depending on
-your computer speed) about 15 minutes and if you are lucky (i.e. there were no
-errors) it should create FPGA firmware in two files: @i{spec_top.bit} and
-@i{spec_top.bin}. The former can be downloaded to FPGA using Xilinx software
-(@i{Impact} or @i{Chipscope Pro}) and Xilinx Platform Cable. The latter can be
-used to program the Spartan 6 chip on SPEC using the kernel driver from
+just as in a regular software compilation process. This takes (depending on
+your computer speed) about 15 minutes and if you are lucky (i.e. there were no
+errors) it should create FPGA firmware in two files: @i{spec_top.bit} and
+@i{spec_top.bin}. The former can be downloaded to FPGA using Xilinx software
+(@i{Impact} or @i{Chipscope Pro}) and Xilinx Platform Cable. The latter can be
+used to program the Spartan 6 chip on SPEC using the kernel driver from
@i{spec-sw} repository (usage example in @ref{Running and Configuring}).
@sp 1
-If, on the other hand, you would like to clean-up the repository and rebuild
+If, on the other hand, you would like to clean-up the repository and rebuild
everything from scratch you can use the following commands:
@itemize
@item @i{$ make clean} - removes all synthesis reports and log files;
@item @i{$ make mrproper} - removes spec_top.bin and spec_top.bit files;
-@item @i{$ hdlmake clean} - removes all fetched repositories (modules) from
+@item @i{$ hdlmake clean} - removes all fetched repositories (modules) from
@i{ip_cores} subdirectory.
@end itemize
@@ -288,8 +288,8 @@ everything from scratch you can use the following commands:
@node LM32 software compilation
@section LM32 software compilation
-To compile the LM32 software for White Rabbit PTP Core you will need to
-download and unpack the LM32 toolchain from the location mentioned already in
+To compile the LM32 software for White Rabbit PTP Core you will need to
+download and unpack the LM32 toolchain from the location mentioned already in
@ref{Repositories and Releases}:
@example
@@ -297,8 +297,8 @@ download and unpack the LM32 toolchain from the location mentioned already in
$ tar xJf lm32.tar.xz -C <your_lm32_location>
@end example
-Similar as with @i{hdlmake} in @ref{Building the Core}, you will need to add
-the LM32 toolchain binaries location to you @i{$PATH} to be able to call them
+Similar as with @i{hdlmake} in @ref{Building the Core}, you will need to add
+the LM32 toolchain binaries location to you @i{$PATH} to be able to call them
from any directory:
@example
@@ -314,13 +314,13 @@ repository tagged with @value{tagname} tag:
$ git checkout wrpc-v2.0
@end example
-@b{Note:} alternatively you can get the release sources from the tarball
+@b{Note:} alternatively you can get the release sources from the tarball
available in @uref{http://www.ohwr.org/projects/wr-cores/files}
@sp 1
-The WRPC software repository contains a ptp-nosposix (that contains the WR PTP
-software daemon) in the form of a git submodule. Your fresh local copy cloned
-from @i{ohwr.org} has therefore the @i{ptp-noposix} directory empty. To fetch
+The WRPC software repository contains a ptp-nosposix (that contains the WR PTP
+software daemon) in the form of a git submodule. Your fresh local copy cloned
+from @i{ohwr.org} has therefore the @i{ptp-noposix} directory empty. To fetch
the ptp-noposix you have to execute the following git commands:
@example
@@ -337,19 +337,19 @@ later during the software compilation:
$ cd ..
@end example
-Now you have everything that is needed to build the software for WRPC. Before
-compilation the decision can be made whether to turn on or not the software
-support for Etherbone core that is integrated inside WRPC gateware for SPEC
+Now you have everything that is needed to build the software for WRPC. Before
+compilation the decision can be made whether to turn on or not the software
+support for Etherbone core that is integrated inside WRPC gateware for SPEC
board. By default it is disabled but can be turned on by setting the value of
-@i{WITH_ETHERBONE} variable inside the Makefile. The compilation is made by
+@i{WITH_ETHERBONE} variable inside the Makefile. The compilation is made by
a simple command without any additional parameters:
@example
$ make
@end example
-The resulting binary @i{wrc.bin} can be then used with the loader from
-@i{spec-sw} software package to program the LM32 inside the White Rabbit PTP
+The resulting binary @i{wrc.bin} can be then used with the loader from
+@i{spec-sw} software package to program the LM32 inside the White Rabbit PTP
Core (@ref{Running and Configuring}).
@c ##########################################################################
@@ -367,21 +367,21 @@ Core (@ref{Running and Configuring}).
@node Downloading firmware to SPEC
@section Downloading firmware to SPEC
-There is a Software support for the SPEC board project in @i{ohwr.org}. It
-contains a set of Linux kernel drivers and userspace tools written by
-Alessandro Rubini and Tomasz Wlostowski that are used to communicate with the
-SPEC board plugged into the PCI-Express port of the PC.
+There is a Software support for the SPEC board project in @i{ohwr.org}. It
+contains a set of Linux kernel drivers and userspace tools written by
+Alessandro Rubini and Tomasz Wlostowski that are used to communicate with the
+SPEC board plugged into the PCI-Express port of the PC.
-The instructions in this section are based on commit 27b4ad9 of @i{spec-sw}
-repository and are limited to absolutely minimum required to load WRPC FPGA
-and LM32 firmware. The full manual for @i{spec-sw} can be found on:
-@uref{http://www.ohwr.org/attachments/download/1506/spec-sw-2012-08-08.pdf}.
+The instructions in this section are based on commit 27b4ad9 of @i{spec-sw}
+repository and are limited to absolutely minimum required to load WRPC FPGA
+and LM32 firmware. The full manual for @i{spec-sw} can be found on:
+@uref{http://www.ohwr.org/attachments/download/1506/spec-sw-2012-08-08.pdf}.
If there will be a newer version of SPEC software support you would like to
use, the up-to-date documentation can always be found in @i{doc/} subdirectory
of @i{spec-sw} git repository.
@sp 1
-First, please clone the git repository of SPEC software support package and
+First, please clone the git repository of SPEC software support package and
build the kernel driver and userspace tools:
@example
@@ -402,15 +402,15 @@ name:
@end example
and after that you are ready to load the @i{spec.ko} driver that configures the
-Spartan 6 FPGA on SPEC with a given bitstream (make sure you are in
+Spartan 6 FPGA on SPEC with a given bitstream (make sure you are in
<your_spacsw_location>:
@example
$ sudo insmod kernel/spec.ko name=demo
@end example
-To check if the FPGA firmware file was found by the driver and correctly loaded
-to FPGA the @i{dmesg} Linux command can be called. Among plenty of messages
+To check if the FPGA firmware file was found by the driver and correctly loaded
+to FPGA the @i{dmesg} Linux command can be called. Among plenty of messages
you should be able to find something very similar to:
@example
@@ -420,23 +420,23 @@ you should be able to find something very similar to:
[99883.768248] spec 0000:03:00.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16
[99883.768302] spec 0000:03:00.0: irq 49 for MSI/MSI-X
[99883.768971] spec_load_files
- [99883.774842] spec_load_fpga: got binary file "fmc/spec-demo.bin",
+ [99883.774842] spec_load_fpga: got binary file "fmc/spec-demo.bin",
1485512 (0x16aac8) bytes
[99883.966491] spec_load_submodule: load "fmc/spec-demo": 256
@end example
-If everything went right up to this moment you can write the LM32 binary
+If everything went right up to this moment you can write the LM32 binary
(@i{wrc.bin}) to the SPEC board. For this purpose, there is a @i{spec-cl} tool
-in the @i{spec-sw} repository. Programming is done with the simple command
+in the @i{spec-sw} repository. Programming is done with the simple command
below:
@example
$ sudo tools/spec-cl <your_wrpcsw_location>/wrc.bin
-@end example
+@end example
@sp 1
-Now you should be able to start the Virtual-UART software (also a part of
-@i{spec-sw} package) that will be used to interact with the White Rabbit PTP
+Now you should be able to start the Virtual-UART software (also a part of
+@i{spec-sw} package) that will be used to interact with the White Rabbit PTP
Core Shell:
@example
@@ -451,30 +451,30 @@ and running on your SPEC. Congratulations !
@node Writing EEPROM and calibration
@section Writing EEPROM and calibration
-By default WRPC starts in WR Slave mode, uses the calibration values for
-Axcen AXGE-3454-0531 SFP and for release FPGA bitstream available in
+By default WRPC starts in WR Slave mode, uses the calibration values for
+Axcen AXGE-3454-0531 SFP and for release FPGA bitstream available in
@i{http://www.ohwr.org/projects/wr-cores/files}. This might be fine for running
-White Rabbit PTP Core for the first time and synchronizing it to WR Switch.
-There are however, two mechanisms that are useful when playing more with WRPC
-shell and different settings.
+White Rabbit PTP Core for the first time and synchronizing it to WR Switch.
+There are however, two mechanisms that are useful when playing more with WRPC
+shell and different settings.
-@b{Note:} the examples below describe only a subset of WRPC Shell commands
+@b{Note:} the examples below describe only a subset of WRPC Shell commands
required to make a basic configuration and calibration. A full description of
all supported commands can be found in @ref{WRPC Shell commands}.
@sp 1
-First, before making the configuration changes, it is recommended (but not
+First, before making the configuration changes, it is recommended (but not
obligatory) to stop the PTP daemon. Then, the debug messages from daemon would
not show up to the console while you will interact with the shell.
@example
wrc# ptp stop
@end example
-
+
If your SPEC has any Mezzanine board plugged into the FMC connector (e.g. DIO,
-Fine Delay, TDC...) then you can create a calibration database inside the FMC
-EEPROM. The example below presents the WRPC Shell commands which create an
-empty SFP database and add two Axcen transceivers with deltaTx, deltaRx and
+Fine Delay, TDC...) then you can create a calibration database inside the FMC
+EEPROM. The example below presents the WRPC Shell commands which create an
+empty SFP database and add two Axcen transceivers with deltaTx, deltaRx and
alpha parameters associated with them. Those SFPs are most widely used in WR
development and demonstrations:
@@ -485,7 +485,7 @@ development and demonstrations:
@end example
To check the content of the SFP database you can execute the @i{sfp show} shell
-command.
+command.
The calibration procedure of WRPC is limited to absolutely minimum and is fully
automatized. It measures the t2/t4 phase transition point and stores the value
@@ -554,9 +554,9 @@ master}.
@node Running the Core
@section Running the Core
-Having the SFP database, t2/t4 phase transition point and the init script
-created in @ref{Writing EEPROM and calibration} you can restart the WR PTP Core
-by reprogramming the LM32 software (with @i{spec-cl} tool) or by typing the
+Having the SFP database, t2/t4 phase transition point and the init script
+created in @ref{Writing EEPROM and calibration} you can restart the WR PTP Core
+by reprogramming the LM32 software (with @i{spec-cl} tool) or by typing the
shell command:
@example
@@ -570,7 +570,7 @@ execution:
(...)
executing: ptp stop
executing: sfp detect
-AXGE-3454-0531
+AXGE-3454-0531
executing: sfp match
SFP matched, dTx=46407, dRx=167843, alpha=-73622176
executing: calibration
@@ -598,9 +598,9 @@ The information is presented in a clear, auto-refreshing screen:
@center @image{wrpc_mon, 12cm,,wrpc sync monitor}
@sp 1
-@b{Note:} the @i{Synchronization status} and @i{Timing parameters} in @i{gui}
-are available only in WR Slave mode. When running as WR Master, you would be
-able to see only the current date and time, link status, Tx and Rx packet
+@b{Note:} the @i{Synchronization status} and @i{Timing parameters} in @i{gui}
+are available only in WR Slave mode. When running as WR Master, you would be
+able to see only the current date and time, link status, Tx and Rx packet
counters, lock and calibration status.
@sp 1
@@ -617,7 +617,7 @@ take their delay difference into account in your measurements.
@b{My computer hangs on loading spec.ko driver.}
-This will occur when you try to load the @i{spec.ko} kernel driver while your
+This will occur when you try to load the @i{spec.ko} kernel driver while your
@i{spec-vuart} is running and trying to get messages from Virtual-UART's
registers inside WRPC. Please remember to quit @i{spec-vuart} before reloading
the driver.
@@ -666,10 +666,10 @@ measurement procedure form WRPC Shell:
@c ##########################################################################
-@node Questions, reporting bugs
+@node Questions, reporting bugs
@chapter Questions, reporting bugs
-If you have found a bug, you have problems with White Rabbit PTP Core or one
+If you have found a bug, you have problems with White Rabbit PTP Core or one
of the tools used to build and run it, you can write to our mailing list
@code{white-rabit-dev@@ohwr.org}
@@ -680,7 +680,7 @@ of the tools used to build and run it, you can write to our mailing list
@appendix WRPC Shell Commands
@multitable @columnfractions .5 .5
-@item @code{pll init <mode> <ref_channel> <align_pps>} @tab manually run spll_init()
+@item @code{pll init <mode> <ref_channel> <align_pps>} @tab manually run spll_init()
function to initialize SoftPll
@item @code{pll cl <channel>} @tab check if SoftPLL is locked for the channel
@item @code{pll sps <channel> <picoseconds>} @tab set phase shift for the channel
@@ -733,7 +733,7 @@ function to initialize SoftPll
@end multitable
- * after executing _mode_ command, _ptp start_ is required to start WR PTP
+ * after executing _mode_ command, _ptp start_ is required to start WR PTP
daemon in new mode
** requires running _sfp detect_ first
diff --git a/include/hw/memlayout.h b/include/hw/memlayout.h
index 34a58b449c8e1c51214b8238ddf1ac5a9e07f232..018f90062ebd159190e695d2e23b8e9c2295e1bd 100644
--- a/include/hw/memlayout.h
+++ b/include/hw/memlayout.h
@@ -16,5 +16,5 @@ unsigned char* BASE_ETHERBONE_CFG;
void sdb_find_devices(void);
void sdb_print_devices(void);
-
+
#endif
diff --git a/include/spll_defs.h b/include/spll_defs.h
index 0062675449e4467201859de818266fde3fb36e93..8bc96384733102e664048e9f25a160e9993cb1c9 100644
--- a/include/spll_defs.h
+++ b/include/spll_defs.h
@@ -16,11 +16,11 @@ WARNING: These parameters must be in sync with the generics of the HDL instantia
#define CLOCK_PERIOD_PICOSECONDS 8000
/* optional DMTD clock division to improve FPGA timing closure by avoiding
- clock nets directly driving FD inputs. Must be consistent with the
+ clock nets directly driving FD inputs. Must be consistent with the
g_divide_inputs_by_2 generic. */
#define DIVIDE_DMTD_CLOCKS_BY_2 1
-/* Number of bits in phase tags generated by the DMTDs. Used to sign-extend the tags.
+/* Number of bits in phase tags generated by the DMTDs. Used to sign-extend the tags.
Corresponding VHDL generic: g_tag_bits. */
#define TAG_BITS 22
diff --git a/include/syscon.h b/include/syscon.h
index dc2d8b2fb18a2efe557b84e6a639b90df465e3a1..a229385dae23a519132e1b4ac2366a65cc10972f 100644
--- a/include/syscon.h
+++ b/include/syscon.h
@@ -8,7 +8,7 @@
struct SYSCON_WB
{
- uint32_t RSTR; /*Syscon Reset Register*/
+ uint32_t RSTR; /*Syscon Reset Register*/
uint32_t GPSR; /*GPIO Set/Readback Register*/
uint32_t GPCR; /*GPIO Clear Register*/
uint32_t HWFR; /*Hardware Feature Register*/
@@ -29,7 +29,7 @@ struct SYSCON_WB
struct s_i2c_if
{
uint32_t scl;
- uint32_t sda;
+ uint32_t sda;
};
extern struct s_i2c_if i2c_if[2];
@@ -60,6 +60,6 @@ static inline int sysc_get_memsize()
{
return (SYSC_HWFR_MEMSIZE_R(syscon->HWFR) + 1) * 16;
}
-
+
#endif
-
+
diff --git a/include/types.h b/include/types.h
index e9c8f056c74a58060218220c95b9c7ce394bcca6..29fbdb804e49924d396da0212dddef5d68f18f00 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,7 +1,7 @@
#ifndef __TYPES_H
#define __TYPES_H
-#include <inttypes.h>
+#include <inttypes.h>
struct hw_timestamp {
uint8_t valid;
diff --git a/include/util.h b/include/util.h
index b32b57c36fcdb0868fb83f3365986381c156ddc3..91271f26ee9b729002a887f8d3f30ff8f311d088 100644
--- a/include/util.h
+++ b/include/util.h
@@ -4,10 +4,10 @@
/* Color codes for cprintf()/pcprintf() */
#define C_DIM 0x80
#define C_WHITE 7
-#define C_GREY (C_WHITE | C_DIM)
+#define C_GREY (C_WHITE | C_DIM)
#define C_RED 1
-#define C_GREEN 2
-#define C_BLUE 4
+#define C_GREEN 2
+#define C_BLUE 4
/* Return TAI date/time in human-readable form. Non-reentrant. */
char *format_time(uint64_t sec);
@@ -19,6 +19,6 @@ void cprintf(int color, const char *fmt, ...);
void pcprintf(int row, int col, int color, const char *fmt, ...);
/* Clears the terminal scree. */
-void term_clear();
+void term_clear();
#endif
diff --git a/lib/arp.c b/lib/arp.c
index 37a64281ba7a916fc2d9fceb5cbf750fc7963413..2c388ab08ec1147a87ad8760d1a51497e7ae54c5 100644
--- a/lib/arp.c
+++ b/lib/arp.c
@@ -18,14 +18,14 @@ static wr_socket_t* arp_socket;
void arp_init(const char* if_name) {
wr_sockaddr_t saddr;
-
+
/* Configure socket filter */
memset(&saddr, 0, sizeof(saddr));
strcpy(saddr.if_name, if_name);
memset(&saddr.mac, 0xFF, 6); /* Broadcast */
saddr.ethertype = htons(0x0806); /* ARP */
saddr.family = PTPD_SOCK_RAW_ETHERNET;
-
+
arp_socket = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET, 0, &saddr);
}
@@ -33,9 +33,9 @@ static int process_arp(uint8_t* buf, int len) {
uint8_t hisMAC[6];
uint8_t hisIP[4];
uint8_t myIP[4];
-
+
if (len < ARP_END) return 0;
-
+
/* Is it ARP request targetting our IP? */
getIP(myIP);
if (buf[ARP_OPER+0] != 0 ||
@@ -46,7 +46,7 @@ static int process_arp(uint8_t* buf, int len) {
memcpy(hisMAC, buf+ARP_SHA, 6);
memcpy(hisIP, buf+ARP_SPA, 4);
- // ------------- ARP ------------
+ // ------------- ARP ------------
// HW ethernet
buf[ARP_HTYPE+0] = 0;
buf[ARP_HTYPE+1] = 1;
@@ -65,7 +65,7 @@ static int process_arp(uint8_t* buf, int len) {
// his MAC+IP
memcpy(buf+ARP_THA, hisMAC, 6);
memcpy(buf+ARP_TPA, hisIP, 4);
-
+
return ARP_END;
}
@@ -73,9 +73,9 @@ void arp_poll(void) {
uint8_t buf[ARP_END+100];
wr_sockaddr_t addr;
int len;
-
+
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 = process_arp(buf, len)) > 0)
ptpd_netif_sendto(arp_socket, &addr, buf, len, 0);
diff --git a/lib/bootp.c b/lib/bootp.c
index d2a3d83975bd10381416a3d4b469742fdc9c5cb7..6f5920e44944c448769f72138d988cf72cbedf1b 100644
--- a/lib/bootp.c
+++ b/lib/bootp.c
@@ -45,36 +45,36 @@
int send_bootp(uint8_t* buf, int retry) {
unsigned short sum;
-
+
// ----------- BOOTP ------------
buf[BOOTP_OP] = 1; /* bootrequest */
buf[BOOTP_HTYPE] = 1; /* ethernet */
buf[BOOTP_HLEN] = 6; /* MAC length */
buf[BOOTP_HOPS] = 0;
-
+
/* A unique identifier for the request !!! FIXME */
get_mac_addr(buf+BOOTP_XID);
buf[BOOTP_XID+0] ^= buf[BOOTP_XID+4];
buf[BOOTP_XID+1] ^= buf[BOOTP_XID+5];
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;
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_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_SNAME, 0, 64); /* desired BOOTP server */
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);
memset(buf+UDP_VIRT_DADDR, 0xFF, 4);
@@ -82,7 +82,7 @@ int send_bootp(uint8_t* buf, int retry) {
buf[UDP_VIRT_PROTO] = 0x11; /* UDP */
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_DPORT] = 0;
@@ -91,10 +91,10 @@ int send_bootp(uint8_t* buf, int retry) {
buf[UDP_LENGTH+1] = (BOOTP_END-IP_END) & 0xff;
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;
-
+
buf[UDP_CHECKSUM+0] = (sum >> 8);
buf[UDP_CHECKSUM+1] = sum & 0xff;
@@ -113,33 +113,33 @@ int send_bootp(uint8_t* buf, int retry) {
buf[IP_CHECKSUM+1] = 0;
memset(buf+IP_SOURCE, 0, 4);
memset(buf+IP_DEST, 0xFF, 4);
-
+
sum = 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];
-
+
get_mac_addr(mac);
-
+
if (len != BOOTP_END) return 0;
-
+
if (buf[IP_VERSION] != 0x45) return 0;
-
- if (buf[IP_PROTOCOL] != 17 ||
- buf[UDP_DPORT] != 0 || buf[UDP_DPORT+1] != 68 ||
+
+ if (buf[IP_PROTOCOL] != 17 ||
+ buf[UDP_DPORT] != 0 || buf[UDP_DPORT+1] != 68 ||
buf[UDP_SPORT] != 0 || buf[UDP_SPORT+1] != 67) return 0;
-
+
if (memcmp(buf+BOOTP_CHADDR, mac, 6)) return 0;
-
+
mprintf("Discovered IP address!\n");
setIP(buf+BOOTP_YIADDR);
-
+
return 1;
}
diff --git a/lib/icmp.c b/lib/icmp.c
index 555f1059c986115ee5dd946d79dc9013a7e7ce47..f0498cb4ad9765c23807ab9ad0042c01a5a7dea2 100644
--- a/lib/icmp.c
+++ b/lib/icmp.c
@@ -25,22 +25,22 @@ int process_icmp(uint8_t* buf, int len) {
uint8_t hisIP[4];
uint8_t myIP[4];
uint16_t sum;
-
+
/* Is it IP targetting us? */
getIP(myIP);
if (buf[IP_VERSION] != 0x45 ||
memcmp(buf+IP_DEST, myIP, 4))
return 0;
-
+
iplen = (buf[IP_LEN+0] << 8 | buf[IP_LEN+1]);
-
+
/* An ICMP ECHO request? */
if (buf[IP_PROTOCOL] != 0x01 || buf[ICMP_TYPE] != 0x08)
return 0;
hisBodyLen = iplen - 24;
if (hisBodyLen > 64) hisBodyLen = 64;
-
+
memcpy(hisIP, buf+IP_SOURCE, 4);
// ------------ IP --------------
@@ -58,21 +58,21 @@ int process_icmp(uint8_t* buf, int len) {
buf[IP_CHECKSUM+1] = 0;
memcpy(buf+IP_SOURCE, myIP, 4);
memcpy(buf+IP_DEST, hisIP, 4);
-
+
// ------------ ICMP ---------
buf[ICMP_TYPE] = 0x0; // echo reply
buf[ICMP_CODE] = 0;
buf[ICMP_CHECKSUM+0] = 0;
buf[ICMP_CHECKSUM+1] = 0;
// No need to copy payload; we modified things in-place
-
+
sum = ipv4_checksum((unsigned short*)(buf+ICMP_TYPE), (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);
buf[IP_CHECKSUM+0] = sum >> 8;
buf[IP_CHECKSUM+1] = sum & 0xff;
-
+
return 24+hisBodyLen;
}
diff --git a/lib/ipv4.c b/lib/ipv4.c
index 18f8ccdc1b14ec076a7c9ba7860989259113c9b0..9b5eab0af13d8f75df4c63fb72cb39f647956aac 100644
--- a/lib/ipv4.c
+++ b/lib/ipv4.c
@@ -13,54 +13,54 @@ static wr_socket_t* ipv4_socket;
unsigned int ipv4_checksum(unsigned short* buf, int shorts) {
int i;
unsigned int sum;
-
+
sum = 0;
for (i = 0; i < shorts; ++i)
sum += buf[i];
-
+
sum = (sum >> 16) + (sum & 0xffff);
sum += (sum >> 16);
-
+
return (~sum & 0xffff);
}
void ipv4_init(const char* if_name) {
wr_sockaddr_t saddr;
-
+
/* Configure socket filter */
memset(&saddr, 0, sizeof(saddr));
strcpy(saddr.if_name, if_name);
get_mac_addr(&saddr.mac[0]); /* Unicast */
saddr.ethertype = htons(0x0800); /* IPv4 */
saddr.family = PTPD_SOCK_RAW_ETHERNET;
-
+
ipv4_socket = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET, 0, &saddr);
}
static int bootp_retry = 0;
static int bootp_timer = 0;
-
+
void ipv4_poll(void) {
uint8_t buf[400];
wr_sockaddr_t addr;
int len;
-
+
if ((len = ptpd_netif_recvfrom(ipv4_socket, &addr, buf, sizeof(buf), 0)) > 0) {
if (needIP)
process_bootp(buf, len-14);
-
+
if (!needIP && (len = process_icmp(buf, len-14)) > 0)
ptpd_netif_sendto(ipv4_socket, &addr, buf, len, 0);
}
-
+
if (needIP && bootp_timer == 0) {
len = send_bootp(buf, ++bootp_retry);
-
+
memset(addr.mac, 0xFF, 6);
addr.ethertype = htons(0x0800); /* IPv4 */
ptpd_netif_sendto(ipv4_socket, &addr, buf, len, 0);
}
-
+
if (needIP && ++bootp_timer == 100000) bootp_timer = 0;
}
@@ -69,13 +69,13 @@ void getIP(unsigned char* IP) {
}
void setIP(unsigned char* IP) {
- volatile unsigned int *eb_ip =
+ volatile unsigned int *eb_ip =
(unsigned int*)(BASE_ETHERBONE_CFG + EB_IPV4);
unsigned int ip;
-
+
memcpy(myIP, IP, 4);
-
- ip =
+
+ ip =
(myIP[0] << 24) | (myIP[1] << 16) |
(myIP[2] << 8) | (myIP[3]);
while (*eb_ip != ip) *eb_ip = ip;
diff --git a/lib/lib.mk b/lib/lib.mk
index eca0978b84b3321b95a538dfb43e1cb2c73d8250..571e1c5ac97c5bc97781d82282aa4197e8308c67 100644
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -1,6 +1,6 @@
OBJS_LIB= lib/mprintf.o \
lib/util.o
-
+
ifneq ($(WITH_ETHERBONE), 0)
OBJS_LIB += lib/arp.o lib/icmp.o lib/ipv4.o lib/bootp.o
diff --git a/lib/mprintf.c b/lib/mprintf.c
index 70b08dbc4b765a90d87e7c51b4109fc6fe7aeece..1f7c2b8f56a560936d6a42e3621f63ee807abddd 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -17,49 +17,49 @@ int vprintf(char const *format,va_list ap)
while(1)
{
-
+
width = 0;
fill = ' ';
while ((format_flag = *format++) != '%')
- {
+ {
if (!format_flag)
{
- va_end (ap);
+ va_end (ap);
return (0);
}
-
+
uart_write_byte(format_flag);
}
// check for zero pad
- format_flag = *format - '0';
+ format_flag = *format - '0';
if (format_flag == 0) // zero pad
{
fill = '0';
format++;
}
-
+
// check for width spec
- format_flag = *format - '0';
+ format_flag = *format - '0';
if (format_flag > 0 && format_flag <= 9) // width set
{
width = format_flag;
- format++;
+ format++;
}
-
+
switch (format_flag = *format++)
{
case 'c':
format_flag = va_arg(ap,int);
//fall through
-
+
default:
uart_write_byte(format_flag);
continue;
-
+
case 'S':
case 's':
ptr = (unsigned char *)va_arg(ap, char *);
@@ -77,7 +77,7 @@ int vprintf(char const *format,va_list ap)
case 'u':
base = 10;
goto CONVERSION_LOOP;
-
+
case 'x':
base = 16;
@@ -90,7 +90,7 @@ CONVERSION_LOOP:
u_val=-u_val;
}
-
+
ptr = scratch + 16;
*--ptr = 0;
@@ -107,12 +107,12 @@ CONVERSION_LOOP:
if (width)
width--;
-
+
} while (u_val>0);
while (width--)
- *--ptr = fill;
-
+ *--ptr = fill;
+
while (*ptr)
uart_write_byte(*ptr++);
@@ -134,50 +134,50 @@ static int _p_vsprintf(char const *format,va_list ap, char*dst)
while(1)
{
-
+
width = 0;
fill = ' ';
while ((format_flag = *format++) != '%')
- {
+ {
if (!format_flag)
{
- va_end (ap);
+ va_end (ap);
*dst++=0;
return (0);
}
-
+
*dst++=format_flag;
}
// check for zero pad
- format_flag = *format - '0';
+ format_flag = *format - '0';
if (format_flag == 0) // zero pad
{
fill = '0';
format++;
}
-
+
// check for width spec
- format_flag = *format - '0';
+ format_flag = *format - '0';
if (format_flag > 0 && format_flag <= 9) // width set
{
width = format_flag;
- format++;
+ format++;
}
-
+
switch (format_flag = *format++)
{
case 'c':
format_flag = va_arg(ap,int);
//fall through
-
+
default:
*dst++=format_flag;
continue;
-
+
case 'S':
case 's':
ptr = (unsigned char *)va_arg(ap, char *);
@@ -191,14 +191,14 @@ static int _p_vsprintf(char const *format,va_list ap, char*dst)
case 'u':
base = 10;
goto CONVERSION_LOOP;
-
+
case 'x':
base = 16;
CONVERSION_LOOP:
u_val = va_arg(ap,unsigned int);
-
+
ptr = scratch + 16;
*--ptr = 0;
@@ -215,12 +215,12 @@ CONVERSION_LOOP:
if (width)
width--;
-
+
} while (u_val>0);
// while (width--)
-// *--ptr = fill;
-
+// *--ptr = fill;
+
while (*ptr)
*dst++=*ptr++;
@@ -238,7 +238,7 @@ int mprintf(char const *format, ...)
rval = vprintf(format,ap);
va_end(ap);
return rval;
-
+
}
int sprintf(char *dst, char const *format, ...)
@@ -247,5 +247,5 @@ int sprintf(char *dst, char const *format, ...)
va_start (ap, format);
int r= _p_vsprintf(format,ap,dst);
return r;
-
+
}
diff --git a/lib/util.c b/lib/util.c
index 80a6f18ab92f75dfa7bc289c9e6ec487d321149b..22549bd5c13739d7be1616a015bbf13e853cb3f6 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -40,10 +40,10 @@ char *format_time(uint64_t sec)
static char buf[64];
unsigned long dayclock, dayno;
int year = EPOCH_YR;
-
+
dayclock = (unsigned long)sec % SECS_DAY;
dayno = (unsigned long)sec / SECS_DAY;
-
+
t.tm_sec = dayclock % 60;
t.tm_min = (dayclock % 3600) / 60;
t.tm_hour = dayclock / 3600;
@@ -68,27 +68,27 @@ char *format_time(uint64_t sec)
return buf;
}
-
-void cprintf(int color, const char *fmt, ...)
+
+void cprintf(int color, const char *fmt, ...)
{
- va_list ap;
- mprintf("\033[0%d;3%dm",color & C_DIM ? 2:1, color&0x7f);
+ va_list ap;
+ mprintf("\033[0%d;3%dm",color & C_DIM ? 2:1, color&0x7f);
va_start(ap, fmt);
- vprintf(fmt, ap);
+ vprintf(fmt, 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[0%d;3%dm",color & C_DIM ? 2:1, color&0x7f);
- va_start(ap, fmt);
- vprintf(fmt, ap);
+ mprintf("\033[0%d;3%dm",color & C_DIM ? 2:1, color&0x7f);
+ va_start(ap, fmt);
+ vprintf(fmt, ap);
va_end(ap);
}
-void term_clear()
+void term_clear()
{
- mprintf("\033[2J\033[1;1H");
+ mprintf("\033[2J\033[1;1H");
}
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 44899dea3ab239b48784e3f0bc22bf4c6ea46efa..776897879cf73344349048db4ea73e7a65048bbb 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -24,7 +24,7 @@ int wrc_mon_gui(void)
int aux_stat;
uint64_t sec;
uint32_t nsec;
-
+
if(timer_get_tics() - last < UI_REFRESH_PERIOD)
return 0;
@@ -53,18 +53,18 @@ int wrc_mon_gui(void)
cprintf(C_GREY, "(RX: %d, TX: %d), mode: ", rx, tx);
switch(ps.mode)
- {
+ {
case HEXP_PORT_MODE_WR_MASTER:cprintf(C_WHITE, "WR Master ");break;
case HEXP_PORT_MODE_WR_SLAVE:cprintf(C_WHITE, "WR Slave ");break;
- }
+ }
if(ps.is_locked) cprintf(C_GREEN, "Locked "); else cprintf(C_RED, "NoLock ");
if(ps.rx_calibrated && ps.tx_calibrated) cprintf(C_GREEN, "Calibrated "); else cprintf(C_RED, "Uncalibrated ");
-
-
+
+
/* show_servo */
cprintf(C_BLUE, "\n\nSynchronization status:\n\n");
@@ -72,13 +72,13 @@ int wrc_mon_gui(void)
{
cprintf(C_RED, "Master mode or sync info not valid\n\n");
return;
- }
+ }
cprintf(C_GREY, "Servo state: "); cprintf(C_WHITE, "%s\n", cur_servo_state.slave_servo_state);
cprintf(C_GREY, "Phase tracking: "); if(cur_servo_state.tracking_enabled) cprintf(C_GREEN, "ON\n"); else cprintf(C_RED,"OFF\n");
cprintf(C_GREY, "Synchronization source: "); cprintf(C_WHITE, "%s\n", cur_servo_state.sync_source);
- cprintf(C_GREY, "Aux clock status: ");
+ cprintf(C_GREY, "Aux clock status: ");
aux_stat = spll_get_aux_status(0);
@@ -96,8 +96,8 @@ int wrc_mon_gui(void)
cprintf(C_GREY, "Master PHY delays: "); cprintf(C_WHITE, "TX: %d ps, RX: %d ps\n", (int32_t)cur_servo_state.delta_tx_m, (int32_t)cur_servo_state.delta_rx_m);
cprintf(C_GREY, "Slave PHY delays: "); cprintf(C_WHITE, "TX: %d ps, RX: %d ps\n", (int32_t)cur_servo_state.delta_tx_s, (int32_t)cur_servo_state.delta_rx_s);
cprintf(C_GREY, "Total link asymmetry: "); cprintf(C_WHITE, "%d ps\n", (int32_t)(cur_servo_state.total_asymmetry));
- cprintf(C_GREY, "Cable rtt delay: "); cprintf(C_WHITE, "%d ps\n",
- (int32_t)(cur_servo_state.mu) - (int32_t)cur_servo_state.delta_tx_m - (int32_t)cur_servo_state.delta_rx_m -
+ cprintf(C_GREY, "Cable rtt delay: "); cprintf(C_WHITE, "%d ps\n",
+ (int32_t)(cur_servo_state.mu) - (int32_t)cur_servo_state.delta_tx_m - (int32_t)cur_servo_state.delta_rx_m -
(int32_t)cur_servo_state.delta_tx_s - (int32_t)cur_servo_state.delta_rx_s);
cprintf(C_GREY, "Clock offset: "); cprintf(C_WHITE, "%d ps\n", (int32_t)(cur_servo_state.cur_offset));
cprintf(C_GREY, "Phase setpoint: "); cprintf(C_WHITE, "%d ps\n", (int32_t)(cur_servo_state.cur_setpoint));
@@ -125,7 +125,7 @@ int wrc_log_stats(uint8_t onetime)
uint32_t nsec;
int16_t brd_temp = 0;
int16_t brd_temp_frac = 0;
-
+
if(!onetime && timer_get_tics() - last < UI_REFRESH_PERIOD)
return 0;
@@ -146,8 +146,8 @@ int wrc_log_stats(uint8_t onetime)
mprintf("dtxm:%d drxm:%d ", (int32_t)cur_servo_state.delta_tx_m, (int32_t)cur_servo_state.delta_rx_m);
mprintf("dtxs:%d drxs:%d ", (int32_t)cur_servo_state.delta_tx_s, (int32_t)cur_servo_state.delta_rx_s);
mprintf("asym:%d ", (int32_t)(cur_servo_state.total_asymmetry));
- mprintf("crtt:%d ",
- (int32_t)(cur_servo_state.mu) - (int32_t)cur_servo_state.delta_tx_m - (int32_t)cur_servo_state.delta_rx_m -
+ mprintf("crtt:%d ",
+ (int32_t)(cur_servo_state.mu) - (int32_t)cur_servo_state.delta_tx_m - (int32_t)cur_servo_state.delta_rx_m -
(int32_t)cur_servo_state.delta_tx_s - (int32_t)cur_servo_state.delta_rx_s);
mprintf("cko:%d ", (int32_t)(cur_servo_state.cur_offset));
mprintf("setp:%d ", (int32_t)(cur_servo_state.cur_setpoint));
diff --git a/shell/cmd_calib.c b/shell/cmd_calib.c
index e8b3e0c1f1ec2175a6f202e0e945918a24924603..249e7d2c22ca506ea36b37c77ee71afa462fc7cc 100644
--- a/shell/cmd_calib.c
+++ b/shell/cmd_calib.c
@@ -1,8 +1,8 @@
-/* Command: gui
+/* Command: gui
Arguments: none
-
+
Description: launches the WR Core monitor GUI */
-
+
#include "shell.h"
#include "eeprom.h"
#include "syscon.h"
diff --git a/shell/cmd_gui.c b/shell/cmd_gui.c
index 93afdcec001c433c4649fcb3d824bdf12c5cf3a6..233566125a5820fbd01e43157d0e26b3a990457b 100644
--- a/shell/cmd_gui.c
+++ b/shell/cmd_gui.c
@@ -1,8 +1,8 @@
-/* Command: gui
+/* Command: gui
Arguments: none
-
+
Description: launches the WR Core monitor GUI */
-
+
#include "shell.h"
int cmd_gui(const char *args[])
diff --git a/shell/cmd_ip.c b/shell/cmd_ip.c
index d012161eed563783a4f24af913f45f76278406b3..9a27b31dd07a3fe70208a6cdc64fe739ddd92d77 100644
--- a/shell/cmd_ip.c
+++ b/shell/cmd_ip.c
@@ -8,7 +8,7 @@
static decode_ip(const char *str, unsigned char* ip) {
int i, x;
-
+
/* Don't try to detect bad input; need small code */
for (i = 0; i < 4; ++i) {
str = fromdec(str, &x);
@@ -20,7 +20,7 @@ static decode_ip(const char *str, unsigned char* ip) {
int cmd_ip(const char *args[])
{
unsigned char ip[4];
-
+
if (!args[0] || !strcasecmp(args[0], "get")) {
getIP(ip);
} else if (!strcasecmp(args[0], "set") && args[1]) {
@@ -29,11 +29,11 @@ int cmd_ip(const char *args[])
} else {
return -EINVAL;
}
-
+
if (needIP) {
mprintf("IP-address: in training\n");
} 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]);
}
}
diff --git a/shell/cmd_mac.c b/shell/cmd_mac.c
index f971238af2d6739eeae92c22ac458f6c4ef33e45..7289409358137cc87134b0509e49daae47b9f7ff 100644
--- a/shell/cmd_mac.c
+++ b/shell/cmd_mac.c
@@ -9,7 +9,7 @@
static decode_mac(const char *str, unsigned char* mac) {
int i, x;
-
+
/* Don't try to detect bad input; need small code */
for (i = 0; i < 6; ++i) {
str = fromhex(str, &x);
@@ -21,7 +21,7 @@ static decode_mac(const char *str, unsigned char* mac) {
int cmd_mac(const char *args[])
{
unsigned char mac[6];
-
+
if (!args[0] || !strcasecmp(args[0], "get")) {
/* get current MAC */
get_mac_addr(mac);
@@ -39,7 +39,7 @@ int cmd_mac(const char *args[])
} else {
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]);
}
diff --git a/shell/cmd_mode.c b/shell/cmd_mode.c
index 9883c32a23799118f174eb20cbff9be83089051f..90202e138c13747bc7c0cb827e916b68737ffa3e 100644
--- a/shell/cmd_mode.c
+++ b/shell/cmd_mode.c
@@ -1,6 +1,6 @@
/* Command: mode
Arguments: PTP mode: gm = grandmaster, master = free-running master, slave = slave
-
+
Description: (re)starts/stops the PTP session. */
#include <errno.h>
@@ -13,7 +13,7 @@ int cmd_mode(const char *args[])
{
int mode;
static const char *modes[]={"unknown","grandmaster","master","slave"};
-
+
if(!strcasecmp(args[0], "gm"))
mode = WRC_MODE_GM;
else if(!strcasecmp(args[0], "master"))
diff --git a/shell/cmd_pll.c b/shell/cmd_pll.c
index 6675ab3bdbe73754510b4deeb774edb76d0220f3..7fb94474e8e2493b6447662e24f0f9e2eef7f6b6 100644
--- a/shell/cmd_pll.c
+++ b/shell/cmd_pll.c
@@ -8,50 +8,50 @@
int cmd_pll(const char *args[])
{
int cur, tgt;
-
+
if(!strcasecmp(args[0], "init"))
{
- if(!args[3])
+ if(!args[3])
return -EINVAL;
spll_init(atoi(args[1]), atoi(args[2]), atoi(args[3]));
} else if (!strcasecmp(args[0], "cl"))
{
- if(!args[1])
+ if(!args[1])
return -EINVAL;
mprintf("%d\n", spll_check_lock(atoi(args[1])));
} else if (!strcasecmp(args[0], "sps"))
{
- if(!args[2])
+ if(!args[2])
return -EINVAL;
spll_set_phase_shift(atoi(args[1]), atoi(args[2]));
} else if (!strcasecmp(args[0], "gps"))
{
- if(!args[1])
+ if(!args[1])
return -EINVAL;
spll_get_phase_shift(atoi(args[1]), &cur, &tgt);
printf("%d %d\n", cur, tgt);
} else if (!strcasecmp(args[0], "start"))
{
- if(!args[1])
+ if(!args[1])
return -EINVAL;
spll_start_channel(atoi(args[1]));
} else if (!strcasecmp(args[0], "stop"))
{
- if(!args[1])
+ if(!args[1])
return -EINVAL;
spll_stop_channel(atoi(args[1]));
} else if (!strcasecmp(args[0], "sdac"))
{
- if(!args[2])
+ if(!args[2])
return -EINVAL;
spll_set_dac(atoi(args[1]), atoi(args[2]));
} else if (!strcasecmp(args[0], "gdac"))
{
- if(!args[1])
+ if(!args[1])
return -EINVAL;
mprintf("%d\n", spll_get_dac(atoi(args[1])));
} else return -EINVAL;
-
+
return 0;
}
diff --git a/shell/cmd_ptp.c b/shell/cmd_ptp.c
index aa9bc9712b37ef768caf5dbb58974998ae55f34d..55a3f5a71fa816994318f04640ba3936ef5f8a8b 100644
--- a/shell/cmd_ptp.c
+++ b/shell/cmd_ptp.c
@@ -1,6 +1,6 @@
/* Command: ptp
Arguments: one [start/stop]
-
+
Description: (re)starts/stops the PTP session. */
#include <errno.h>
diff --git a/shell/cmd_sfp.c b/shell/cmd_sfp.c
index cbc199cef59dbba0a4d8c82a6bb47368971cb560..096e7664ad06435073abb08df041cd0c18ae511b 100644
--- a/shell/cmd_sfp.c
+++ b/shell/cmd_sfp.c
@@ -1,14 +1,14 @@
/* Command: sfp
Arguments: subcommand [subcommand-specific args]
-
+
Description: SFP detection/database manipulation.
-
+
Subcommands:
add vendor_type delta_tx delta_rx alpha - adds an SFP to the database, with given alpha/delta_rx/delta_rx values
show - shows the SFP database
match - tries to get calibration parameters from DB for a detected SFP
erase - cleans the SFP database
- detect - detects the transceiver type
+ detect - detects the transceiver type
*/
#include "shell.h"
@@ -32,7 +32,7 @@ int cmd_sfp(const char *args[])
pn[16]=0;
mprintf("%s\n",pn);
return 0;
- }
+ }
// else if (!strcasecmp(args[0], "i2cscan"))
// {
// mi2c_scan(WRPC_FMC_I2C);
@@ -53,7 +53,7 @@ int cmd_sfp(const char *args[])
sfp.dTx = atoi(args[2]);
sfp.dRx = atoi(args[3]);
sfp.alpha = atoi(args[4]);
- temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp, 1, 0);
+ temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp, 1, 0);
if(temp == EE_RET_DBFULL)
mprintf("SFP DB is full\n");
else if(temp == EE_RET_I2CERR)
@@ -66,7 +66,7 @@ int cmd_sfp(const char *args[])
for(i=0; i<sfpcount; ++i)
{
temp = eeprom_get_sfp(WRPC_FMC_I2C, FMC_EEPROM_ADR, &sfp, 0, i);
- if(!i)
+ if(!i)
{
sfpcount=temp; //only in first round valid sfpcount is returned from eeprom_get_sfp
if(sfpcount == 0 || sfpcount == 0xFF)
@@ -105,6 +105,6 @@ int cmd_sfp(const char *args[])
mprintf("Could not match to DB\n");
return 0;
}
-
+
return 0;
}
diff --git a/shell/cmd_time.c b/shell/cmd_time.c
index 7062a2a404560795eac194d3f34950936b86de1e..db50eecf6010df47f6c5449d5d18826ed0110e2a 100644
--- a/shell/cmd_time.c
+++ b/shell/cmd_time.c
@@ -1,9 +1,9 @@
/* Command: time
- Arguments:
+ Arguments:
set UTC NSEC - sets time
raw - dumps raw time
<none> - dumps pretty time
-
+
Description: (re)starts/stops the PTP session. */
#include <errno.h>
@@ -21,7 +21,7 @@ int cmd_time(const char *args[])
uint32_t nsec;
pps_gen_get_time(&sec, &nsec);
-
+
if(args[2] && !strcasecmp(args[0], "set")) {
if(wrc_ptp_get_mode() != WRC_MODE_SLAVE)
{
@@ -36,6 +36,6 @@ int cmd_time(const char *args[])
}
mprintf("%s +%d nanoseconds.\n", format_time(sec), nsec); /* fixme: clock freq is not always 125 MHz */
-
- return 0;
+
+ return 0;
}
diff --git a/shell/environ.c b/shell/environ.c
index 704a118a99862565236665bd1c5be0bb450a26eb..58eb9e842759aef15bfd3e9c9629dc08cfe72567 100644
--- a/shell/environ.c
+++ b/shell/environ.c
@@ -25,16 +25,16 @@ static char *_env_get(const char *var)
i++;
}
-
+
return NULL;
}
char *env_get(const char *var)
{
char *p = _env_get(var);
-
+
if(!p) return NULL;
-
+
return p+2+strlen(p+1);
}
@@ -55,22 +55,22 @@ int env_set(const char *var, const char *value)
{
p=vstart+1;
while(*p != 0xaa && *p != 0xff) p++;
-
+
memmove(vstart, p, SH_ENVIRON_SIZE - (p - env_buf));
}
end = _env_end();
-
+
if ((end + strlen(var) + strlen(value) + 3) >= SH_ENVIRON_SIZE)
return -ENOMEM;
-
+
p = &env_buf[end];
-
+
*p++ = 0xaa;
memcpy(p, var, strlen(var) + 1); p += strlen(var) + 1;
memcpy(p, value, strlen(value) + 1); p += strlen(value) + 1;
*p++ = 0xff;
-
+
p = env_buf;
return 0;
@@ -79,14 +79,14 @@ int env_set(const char *var, const char *value)
int cmd_env(const char *args[])
{
unsigned char *p = env_buf;
-
+
while(*p != 0xff)
{
if(*p==0xaa)
mprintf("%s=%s\n", p+1, p+strlen(p+1)+2);
p++;
}
-
+
return 0;
}
@@ -100,7 +100,7 @@ int cmd_set(const char *args[])
{
if(!args[1])
return -EINVAL;
-
+
return env_set(args[0], args[1]);
}
diff --git a/shell/shell.c b/shell/shell.c
index 5f16af8c42808f8f6aeecd4a6cc55621bb708068..a4d4f7e103fa0c52c4212304130fdde8e854ab3d 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -8,7 +8,7 @@
#include "shell.h"
#include "eeprom.h"
-#define SH_MAX_LINE_LEN 80
+#define SH_MAX_LINE_LEN 80
#define SH_MAX_ARGS 8
#define SH_ENVIRON_SIZE 256
@@ -53,7 +53,7 @@ static const struct shell_cmd cmds_list[] = {
#endif
{ "mac", cmd_mac },
{ "sdb", cmd_sdb },
-
+
{ NULL, NULL }
};
@@ -94,7 +94,7 @@ static int _shell_exec()
int n = 0, i = 0;
memset(tokptr, 0, sizeof(tokptr));
-
+
while(1)
{
if(n >= SH_MAX_ARGS)
@@ -102,13 +102,13 @@ static int _shell_exec()
while(cmd_buf[i] == ' ' && cmd_buf[i]) cmd_buf[i++] = 0;
- if(!cmd_buf[i])
+ if(!cmd_buf[i])
break;
tokptr [n++] = &cmd_buf[i];
while(cmd_buf[i] != ' ' && cmd_buf[i]) i++;
- if(!cmd_buf[i])
+ if(!cmd_buf[i])
break;
}
@@ -122,7 +122,7 @@ static int _shell_exec()
if(!strcasecmp(cmds_list[i].name, tokptr[0]))
{
int rv = cmds_list[i].exec((const char **)tokptr+1);
- if(rv<0)
+ if(rv<0)
mprintf("Err %d\n", rv);
return rv;
}
@@ -160,18 +160,18 @@ void shell_interactive()
case SH_INPUT:
c = uart_read_byte();
-
+
if(c < 0)
return;
if(c == 27 || ((current_key & ESCAPE_FLAG) && c == 91))
current_key = ESCAPE_FLAG;
- else
+ else
current_key |= c;
if(current_key & 0xff)
- {
-
+ {
+
switch(current_key)
{
case KEY_LEFT:
@@ -188,12 +188,12 @@ void shell_interactive()
esc('C');
}
break;
-
+
case KEY_ENTER:
mprintf("\n");
state = SH_EXEC;
break;
-
+
case KEY_DELETE:
if(cmd_pos != cmd_len)
{
@@ -201,7 +201,7 @@ void shell_interactive()
esc('P');
}
break;
-
+
case KEY_BACKSPACE:
if(cmd_pos > 0)
{
@@ -211,10 +211,10 @@ void shell_interactive()
cmd_pos--;
}
break;
-
+
case '\t':
break;
-
+
default:
if(!(current_key & ESCAPE_FLAG) && insert(current_key))
{
@@ -222,12 +222,12 @@ void shell_interactive()
mprintf("%c", current_key);
}
break;
-
+
}
current_key = 0;
}
break;
-
+
case SH_EXEC:
cmd_buf[cmd_len] = 0;
_shell_exec();
@@ -238,7 +238,7 @@ void shell_interactive()
const char* fromhex(const char* hex, int* v) {
int o = 0;
-
+
for (; *hex; ++hex) {
if (*hex >= '0' && *hex <= '9') {
o = (o << 4) + (*hex - '0');
@@ -250,14 +250,14 @@ const char* fromhex(const char* hex, int* v) {
break;
}
}
-
+
*v = o;
return hex;
}
const char* fromdec(const char* dec, int* v) {
int o = 0;
-
+
for (; *dec; ++dec) {
if (*dec >= '0' && *dec <= '9') {
o = (o * 10) + (*dec - '0');
@@ -265,7 +265,7 @@ const char* fromdec(const char* dec, int* v) {
break;
}
}
-
+
*v = o;
return dec;
}
@@ -282,12 +282,12 @@ int shell_boot_script(void)
{
cmd_len = eeprom_init_readcmd(WRPC_FMC_I2C, FMC_EEPROM_ADR, cmd_buf, SH_MAX_LINE_LEN, next);
if(cmd_len <= 0)
- {
+ {
if(next==0) mprintf("Empty init script...\n");
break;
}
cmd_buf[cmd_len-1] = 0;
-
+
mprintf("executing: %s\n", cmd_buf);
_shell_exec();
next = 1;
diff --git a/sockitowm/eep43.c b/sockitowm/eep43.c
index 080c9b200b3f9996d991be6afe472d46f090317e..e531af3981e0d091560938b570744447f87d7556 100644
--- a/sockitowm/eep43.c
+++ b/sockitowm/eep43.c
@@ -21,11 +21,11 @@ int Write43(int portnum, uchar *SerialNum, int page, uchar *page_buffer)
#if DEBUG_EEP43
mprintf(" Writing Scratchpad...\n");
#endif
- if (!owWriteBytePower(portnum, WRITE_SCRATCH_CMD))
+ if (!owWriteBytePower(portnum, WRITE_SCRATCH_CMD))
return FALSE;
setcrc16(portnum, 0);
docrc16(portnum,(ushort)WRITE_SCRATCH_CMD);
-
+
owLevel(portnum, MODE_NORMAL);
owWriteBytePower(portnum, 0x00); //write LSB of target addr
docrc16(portnum,(ushort)0x00);
@@ -34,8 +34,8 @@ int Write43(int portnum, uchar *SerialNum, int page, uchar *page_buffer)
docrc16(portnum,(ushort)0x00);
- for(i = 0; i < 32; i++) //write 32 data bytes to scratchpad
- {
+ for(i = 0; i < 32; i++) //write 32 data bytes to scratchpad
+ {
owLevel(portnum,MODE_NORMAL);
owWriteBytePower(portnum, page_buffer[i]);
lastcrc16 = docrc16(portnum, page_buffer[i]);
@@ -56,7 +56,7 @@ int Write43(int portnum, uchar *SerialNum, int page, uchar *page_buffer)
owLevel(portnum, MODE_NORMAL);
if(Copy2Mem43(portnum, SerialNum))
rt=TRUE;
-
+
}
}
@@ -67,15 +67,15 @@ int Write43(int portnum, uchar *SerialNum, int page, uchar *page_buffer)
int Copy2Mem43(int portnum, uchar *SerialNum)
{
uchar rt=FALSE;
- ushort lastcrc16;
+ ushort lastcrc16;
int i;
uchar read_data;
-
+
owSerialNum(portnum, SerialNum, FALSE);
if(owAccess(portnum))
- {
- if (!owWriteBytePower(portnum, COPY_SCRATCH_CMD))
+ {
+ if (!owWriteBytePower(portnum, COPY_SCRATCH_CMD))
return FALSE;
owLevel(portnum, MODE_NORMAL);
owWriteBytePower(portnum, 0x00); //write LSB of target addr
@@ -85,12 +85,12 @@ int Copy2Mem43(int portnum, uchar *SerialNum)
owWriteBytePower(portnum, 0x1f); //write E/S
usleep(500000);
-
-
- owLevel(portnum,MODE_NORMAL);
+
+
+ owLevel(portnum,MODE_NORMAL);
read_data = owReadBytePower(portnum);
-
- if (read_data == 0xaa)
+
+ if (read_data == 0xaa)
rt=TRUE;
}
@@ -98,7 +98,7 @@ int Copy2Mem43(int portnum, uchar *SerialNum)
return rt;
}
-
+
// routine for reading the scratchpad of a DS28EC20P EEPROM
// 80 pages of 32byte
// 32byte scratchpad
@@ -106,45 +106,45 @@ int Copy2Mem43(int portnum, uchar *SerialNum)
int ReadScratch43(int portnum, uchar *SerialNum, uchar *page_buffer)
{
uchar rt=FALSE;
- ushort lastcrc16;
+ ushort lastcrc16;
int i;
ushort target_addr = 0;
uchar read_data;
-
+
owSerialNum(portnum, SerialNum, FALSE);
if(owAccess(portnum))
- {
+ {
#if DEBUG_EEP43
mprintf(" Reading Scratchpad...\n");
#endif
- if (!owWriteBytePower(portnum, READ_SCRATCH_CMD))
+ if (!owWriteBytePower(portnum, READ_SCRATCH_CMD))
return FALSE;
setcrc16(portnum, 0); //init crc
docrc16(portnum,(ushort)READ_SCRATCH_CMD);
-
-
-
+
+
+
owLevel(portnum,MODE_NORMAL); //read 2 byte address and 1 byte status
read_data = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, read_data);
target_addr = read_data;
-
- owLevel(portnum,MODE_NORMAL);
+
+ owLevel(portnum,MODE_NORMAL);
read_data = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, read_data);
target_addr |= read_data << 8;
- owLevel(portnum,MODE_NORMAL);
+ owLevel(portnum,MODE_NORMAL);
read_data = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, read_data);
#if DEBUG_EEP43
mprintf("E/S: 0x%x\n", read_data);
#endif
- for(i = 0; i < 32; i++)
- {
+ for(i = 0; i < 32; i++)
+ {
owLevel(portnum,MODE_NORMAL);
page_buffer[i] = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, page_buffer[i]);
@@ -152,14 +152,14 @@ int ReadScratch43(int portnum, uchar *SerialNum, uchar *page_buffer)
// mprintf(" CRC16: %x", lastcrc16);
// mprintf(" CRC16i: %x\n", ~lastcrc16);
}
-
+
for(i = 0; i < 2; i++)
{
- owLevel(portnum,MODE_NORMAL);
+ owLevel(portnum,MODE_NORMAL);
read_data = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, read_data);
- }
- if (lastcrc16 == 0xb001)
+ }
+ if (lastcrc16 == 0xb001)
rt=TRUE;
}
@@ -173,30 +173,30 @@ int ReadScratch43(int portnum, uchar *SerialNum, uchar *page_buffer)
int ReadMem43(int portnum, uchar *SerialNum, int page, uchar *page_buffer)
{
uchar rt=FALSE;
- ushort lastcrc16;
+ ushort lastcrc16;
int i;
ushort target_addr = 0;
uchar read_data;
-
+
owSerialNum(portnum, SerialNum, FALSE);
if(owAccess(portnum))
- {
- if (!owWriteBytePower(portnum, E_READ_MEM_CMD))
+ {
+ if (!owWriteBytePower(portnum, E_READ_MEM_CMD))
return FALSE;
setcrc16(portnum, 0); //init crc
docrc16(portnum,(ushort)E_READ_MEM_CMD);
-
+
owLevel(portnum, MODE_NORMAL);
owWriteBytePower(portnum, 0x00); //write LSB of target addr
docrc16(portnum,(ushort)0x00);
owLevel(portnum, MODE_NORMAL);
owWriteBytePower(portnum, 0x00); //write MSB of target addr
docrc16(portnum,(ushort)0x00);
-
- for(i = 0; i < 32; i++)
- {
+
+ for(i = 0; i < 32; i++)
+ {
owLevel(portnum,MODE_NORMAL);
page_buffer[i] = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, page_buffer[i]);
@@ -204,14 +204,14 @@ int ReadMem43(int portnum, uchar *SerialNum, int page, uchar *page_buffer)
// mprintf(" CRC16: %x", lastcrc16);
// mprintf(" CRC16i: %x\n", ~lastcrc16);
}
-
+
for(i = 0; i < 2; i++)
{
- owLevel(portnum,MODE_NORMAL);
+ owLevel(portnum,MODE_NORMAL);
read_data = owReadBytePower(portnum);
lastcrc16 = docrc16(portnum, read_data);
- }
- if (lastcrc16 == 0xb001)
+ }
+ if (lastcrc16 == 0xb001)
rt=TRUE;
}
diff --git a/sockitowm/findtype.c b/sockitowm/findtype.c
index 148f854484005cdd4f17e96742e62ae40e981396..e1ff2d9fcd41fc72d172f018ec69929f21d09443 100644
--- a/sockitowm/findtype.c
+++ b/sockitowm/findtype.c
@@ -64,7 +64,7 @@ SMALLINT FindDevices(int portnum, uchar FamilySN[][8], SMALLINT family_code, int
// perform the search
if (!owNext(portnum,TRUE, FALSE))
break;
-
+
owSerialNum(portnum,FamilySN[NumDevices], TRUE);
if ((FamilySN[NumDevices][0] & 0x7F) == (family_code & 0x7F))
{
diff --git a/sockitowm/owlnk.c b/sockitowm/owlnk.c
index b06d352da3b6f03c3198c7c847bbcccf5c3572c6..cd9f5f75f2079804e6cdb0007d2f5154c7d18d4c 100644
--- a/sockitowm/owlnk.c
+++ b/sockitowm/owlnk.c
@@ -41,8 +41,8 @@
#include "board.h"
-//#define S_OVD 1
-//#define S_PWR 0
+//#define S_OVD 1
+//#define S_PWR 0
#define S_IEN 0
#define S_OVD_E 1
#define CLK_DIV_NOR (CPU_CLOCK/200000-1) //clock divider for normal mode
@@ -74,7 +74,7 @@ int S_PWR = 0;
// init clock divider for SCU board
SMALLINT owInit(void)
{
- IOWR_SOCKIT_OWM_CDR(BASE_ONEWIRE, ((CLK_DIV_NOR & SOCKIT_OWM_CDR_N_MSK) | ((CLK_DIV_OVD << SOCKIT_OWM_CDR_O_OFST) & SOCKIT_OWM_CDR_O_MSK)));
+ IOWR_SOCKIT_OWM_CDR(BASE_ONEWIRE, ((CLK_DIV_NOR & SOCKIT_OWM_CDR_N_MSK) | ((CLK_DIV_OVD << SOCKIT_OWM_CDR_O_OFST) & SOCKIT_OWM_CDR_O_MSK)));
return 0;
}
diff --git a/sockitowm/temp28.c b/sockitowm/temp28.c
index 2a55572ffd6330889316c200c01552c023d1158b..52557f1179d6ca1c76635d880b2c33494bc9e834 100644
--- a/sockitowm/temp28.c
+++ b/sockitowm/temp28.c
@@ -67,7 +67,7 @@ uint8_t ReadTemperature28(uint8_t portnum, uint8_t *SerialNum, int16_t *Temp)
}
}
- if(toggle)
+ if(toggle)
{
if( owAccess(portnum))
{
diff --git a/sockitowm/temp42.c b/sockitowm/temp42.c
index 70d9a4e8bf2df256d59822adc86ac0d4cbc3d134..819f7a7aca3dd9714eee4aa623210f8c49a6a876 100644
--- a/sockitowm/temp42.c
+++ b/sockitowm/temp42.c
@@ -31,7 +31,7 @@
//
#include "ownet.h"
#include "temp42.h"
-
+
//----------------------------------------------------------------------
// Read the temperature of a DS28EA00 (family code 0x42)
//
@@ -54,10 +54,10 @@ int ReadTemperature42(int portnum, uchar *SerialNum, int *Temp, int *frac )
int val_int=0;
int is_neg=FALSE;
-
+
// set the device serial number to the counter device
owSerialNum(portnum,SerialNum,FALSE);
-
+
for (loop = 0; loop < 2; loop ++)
{
// check if the chip is connected to VDD
@@ -65,13 +65,13 @@ int ReadTemperature42(int portnum, uchar *SerialNum, int *Temp, int *frac )
{
owWriteByte(portnum,0xB4);
power = owReadByte(portnum);
- }
-
+ }
+
// access the device
if (owOverdriveAccess(portnum))
{
// send the convert command and if nesessary start power delivery
- // if (power) {
+ // if (power) {
// if (!owWriteBytePower(portnum,0x44))
// return FALSE;
// } else {
@@ -81,11 +81,11 @@ int ReadTemperature42(int portnum, uchar *SerialNum, int *Temp, int *frac )
// sleep for 1 second
msDelay(1000);
// turn off the 1-Wire Net strong pull-up
- if (power) {
+ if (power) {
if (owLevel(portnum,MODE_NORMAL) != MODE_NORMAL)
return FALSE;
}
-
+
// access the device
if (owOverdriveAccess(portnum))
{
@@ -96,7 +96,7 @@ int ReadTemperature42(int portnum, uchar *SerialNum, int *Temp, int *frac )
// now add the read bytes for data bytes and crc8
for (i = 0; i < 9; i++)
send_block[send_cnt++] = 0xFF;
-
+
// now send the block
if (owBlock(portnum,FALSE,send_block,send_cnt))
{
@@ -105,20 +105,20 @@ int ReadTemperature42(int portnum, uchar *SerialNum, int *Temp, int *frac )
// perform the CRC8 on the last 8 bytes of packet
for (i = send_cnt - 9; i < send_cnt; i++)
lastcrc8 = docrc8(portnum,send_block[i]);
-
+
// verify CRC8 is correct
if (lastcrc8 == 0x00)
{
-
+
// calculate the high-res temperature
// from twos complement representation
val_int = send_block[1]; // low byte
val_int |= send_block[2] << 8; // high byte
if (val_int & 0x00001000) { // check sign for negative
val_int = ~val_int + 1;
- is_neg = TRUE;
- }
-
+ is_neg = TRUE;
+ }
+
*Temp = val_int >> 4; // only integer part
*frac = val_int & 0x08; // only 1/2 bit
// success
diff --git a/tests/Makefile b/tests/Makefile
index 21acd72ff9e93bc1443f6990cd9fe80f0760131a..c438ded392bba5e7e44b9cf247004590f3f15108 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -9,15 +9,15 @@ OBJS_TEST = testtool.o
INCLUDE_DIR = -I../include -I../ptp-noposix/PTPWRd
CROSS_COMPILE ?= lm32-elf-
-CFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled
-LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled -nostdlib -T ../target/lm32/ram.ld
+CFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled
+LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled -nostdlib -T ../target/lm32/ram.ld
OBJS_PLATFORM=../target/lm32/crt0.o ../target/lm32/irq.o
CC=$(CROSS_COMPILE)gcc
OBJCOPY=$(CROSS_COMPILE)objcopy
OBJDUMP=$(CROSS_COMPILE)objdump
CFLAGS= $(CFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os -include ../include/trace.h -I../include/ -I../ptp-noposix/libptpnetif -I../ptp-noposix/PTPWRd
-LDFLAGS= $(LDFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os
+LDFLAGS= $(LDFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os
SIZE = $(CROSS_COMPILE)size
OBJS=$(OBJS_PLATFORM) $(OBJS_COMMON) $(OBJS_TEST)
@@ -26,11 +26,11 @@ OUTPUT = testtool
all: $(OBJS)
$(SIZE) -t $(OBJS)
- ${CC} -o $(OUTPUT).elf $(OBJS) $(LDFLAGS)
+ ${CC} -o $(OUTPUT).elf $(OBJS) $(LDFLAGS)
${OBJCOPY} -O binary $(OUTPUT).elf $(OUTPUT).bin
clean:
- rm -f $(OBJS) $(OUTPUT).elf $(OUTPUT).bin
+ rm -f $(OBJS) $(OUTPUT).elf $(OUTPUT).bin
%.o: %.c
${CC} $(CFLAGS) -c $^ -o $@
diff --git a/tests/measure_t24p.c b/tests/measure_t24p.c
index cab2dd0d2844cccd2d7a029d3d99c868b3c8f1aa..e8a64ee8ba7a9d1c3309c6df73119be0746ebcb9 100644
--- a/tests/measure_t24p.c
+++ b/tests/measure_t24p.c
@@ -47,7 +47,7 @@ static int meas_phase_range(wr_socket_t *sock, int phase_min, int phase_max, int
spll_set_phase_shift(SPLL_ALL_CHANNELS, phase_min);
while(spll_shifter_busy(0));
-
+
purge_socket(sock);
i=0;
@@ -58,9 +58,9 @@ static int meas_phase_range(wr_socket_t *sock, int phase_min, int phase_max, int
update_rx_queues();
int n = ptpd_netif_recvfrom(sock, &from, buf, 128, &ts_rx);
-
+
if(n>0)
- {
+ {
msgUnpackHeader(buf, &mhdr);
if(mhdr.messageType == 0)
ts_sync = ts_rx;
@@ -68,14 +68,14 @@ static int meas_phase_range(wr_socket_t *sock, int phase_min, int phase_max, int
{
MsgFollowUp fup;
msgUnpackFollowUp(buf, &fup);
-
+
mprintf("Shift: %d/%dps [step %dps] \r", setpoint,phase_max,phase_step);
results[i].phase = phase;
results[i].phase_sync = ts_sync.phase;
results[i].ahead = ts_sync.raw_ahead;
results[i].delta_ns = fup.preciseOriginTimestamp.nanosecondsField - ts_sync.nsec;
results[i].delta_ns += (fup.preciseOriginTimestamp.secondsField.lsb - ts_sync.sec) * 1000000000;
-
+
setpoint += phase_step;
spll_set_phase_shift(0, setpoint);
while(spll_shifter_busy(0));
@@ -107,7 +107,7 @@ int measure_t24p(int *value)
wr_sockaddr_t sock_addr;
int i, nr;
struct meas_entry results[128];
-
+
spll_enable_ptracker(0, 1);
sock_addr.family = PTPD_SOCK_RAW_ETHERNET; // socket type
@@ -134,7 +134,7 @@ int measure_t24p(int *value)
if(ptpd_netif_init() != 0)
return -1;
-
+
sock = ptpd_netif_create_socket(PTPD_SOCK_RAW_ETHERNET, 0, &sock_addr);
nr=meas_phase_range(sock, 0, 8000, 1000, results);
int tplus = find_transition(results, nr, 1);
@@ -142,31 +142,31 @@ int measure_t24p(int *value)
int approx_plus = results[tplus].phase;
int approx_minus = results[tminus].phase;
-
+
nr=meas_phase_range(sock, approx_plus-1000, approx_plus+1000, 100, results);
tplus = find_transition(results, nr, 1);
int phase_plus = results[tplus].phase;
-
+
nr=meas_phase_range(sock, approx_minus-1000, approx_minus+1000, 100, results);
tminus = find_transition(results, nr, 0);
int phase_minus = results[tminus].phase;
-
+
mprintf("Transitions found: positive @ %d ps, negative @ %d ps.\n", phase_plus, phase_minus);
int ttrans = phase_minus-1000;
if(ttrans < 0) ttrans+=8000;
-
+
mprintf("(t2/t4)_phase_transition = %dps\n", ttrans);
ptpd_netif_set_phase_transition(sock, ttrans);
mprintf("Verification... \n");
nr =meas_phase_range(sock, 0, 16000, 500, results);
-
+
for(i=0;i<nr;i++) mprintf("phase_dmtd: %d delta_ns: %d, phase_sync: %d\n", results[i].phase, results[i].delta_ns, results[i].phase_sync);
-
+
if(value) *value = ttrans;
- return 0;
+ return 0;
}
diff --git a/tools/Makefile b/tools/Makefile
index af3e81fc13a5f5f8b7fe17bac94c728baa44a446..834a49057d428004597c50e75b87fbe4180ccf17 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -22,4 +22,4 @@ genramvhd: genramvhd.o
${CC} -c $^ $(CFLAGS) -O0
clean:
- rm -f $(ALL) *.o
+ rm -f $(ALL) *.o
diff --git a/tools/genraminit.c b/tools/genraminit.c
index a6bf55beec298ce6a2c3400e30571bac745cbe29..e258b85fba24f0f18b14ef3261a31b201bcc7f00 100644
--- a/tools/genraminit.c
+++ b/tools/genraminit.c
@@ -3,9 +3,9 @@
main(int argc, char *argv[])
{
- if(argc < 3) return -1;
+ if(argc < 3) return -1;
FILE *f = fopen(argv[1],"rb");
- if(!f) return -1;
+ if(!f) return -1;
unsigned char x[4];
int i=0;
int n = atoi(argv[2]);
@@ -18,7 +18,7 @@ main(int argc, char *argv[])
for(;i<n;)
{
- printf("write %x %02X%02X%02X%02X\n", i++, 0,0,0,0);
+ printf("write %x %02X%02X%02X%02X\n", i++, 0,0,0,0);
}
fclose(f);
return 0;
diff --git a/tools/genramvhd.c b/tools/genramvhd.c
index 1ffc215000d9eae91697e91878313984da795c8c..03c27bdd755e9fd61d0f9c9bc5a266198032a59b 100644
--- a/tools/genramvhd.c
+++ b/tools/genramvhd.c
@@ -43,7 +43,7 @@ int main(int argc, char **argv) {
unsigned char x[16]; /* Up to 128 bit */
char buf[100];
FILE* f;
-
+
/* Default values */
program = argv[0];
package = 0; /* auto-detect */
@@ -51,7 +51,7 @@ int main(int argc, char **argv) {
bigendian = 1;
verbose = 0;
size = -1; /* file size */
-
+
/* Process the command-line */
while ((opt = getopt(argc, argv, "w:p:s:blvh")) != -1) {
switch (opt) {
@@ -96,56 +96,56 @@ int main(int argc, char **argv) {
return 1;
}
}
-
+
if (optind + 1 != argc) {
fprintf(stderr, "%s: expecting one non-optional argument: <filename>\n", program);
return 1;
}
-
+
filename = argv[optind];
-
+
/* Confirm the filename exists */
if ((f = fopen(filename, "r")) == 0) {
fprintf(stderr, "%s: %s while opening '%s'\n", program, strerror(errno), filename);
return 1;
}
-
+
/* Deduce if it's aligned */
fseek(f, 0, SEEK_END);
elements = ftell(f);
rewind(f);
-
+
if (size == -1) {
size = elements;
}
-
+
if (size < elements) {
fprintf(stderr, "%s: length of initialization file '%s' (%ld) exceeds specified size (%ld)\n", program, filename, elements, size);
return 1;
}
-
+
if (elements % width != 0) {
fprintf(stderr, "%s: initialization file '%s' is not a multiple of %ld bytes\n", program, filename, width);
return 1;
}
elements /= width;
-
+
if (size % width != 0) {
fprintf(stderr, "%s: specified size '%ld' is not a multiple of %ld bytes\n", program, size, width);
return 1;
}
size /= width;
-
+
/* Find a suitable package name */
if (package == 0) {
if (strlen(filename) >= sizeof(buf)-5) {
fprintf(stderr, "%s: filename too long to deduce package name -- '%s'\n", program, filename);
return 1;
}
-
+
/* Find the first alpha character */
while (*filename && !my_isalpha(*filename)) ++filename;
-
+
/* Start copying the filename to the package */
for (i = 0; filename[i]; ++i) {
if (my_isok(filename[i]))
@@ -154,12 +154,12 @@ int main(int argc, char **argv) {
buf[i] = '_';
}
buf[i] = 0;
-
+
if (i == 0) {
fprintf(stderr, "%s: no appropriate characters in filename to use for package name -- '%s'\n", program, filename);
return 1;
}
-
+
package = &buf[0];
} else {
/* Check for valid VHDL identifier */
@@ -174,16 +174,16 @@ int main(int argc, char **argv) {
}
}
}
-
+
/* Find how many digits it takes to fit 'size' */
i_width = 1;
for (i = 10; i <= size; i *= 10)
++i_width;
-
+
/* How wide is an entry of the table? */
entry_width = i_width + 6 + width*2 + 3;
columns = 76 / entry_width;
-
+
printf("-- AUTOGENERATED FILE (from genramvhd.c run on %s) --\n", argv[1]);
printf("library IEEE;\n");
printf("use IEEE.std_logic_1164.all;\n");
@@ -192,13 +192,13 @@ int main(int argc, char **argv) {
printf("library work;\n");
printf("use work.memory_loader_pkg.all;\n");
printf("\n");
-
+
printf("package %s_pkg is\n", package);
printf(" constant %s_init : t_meminit_array(%ld downto 0, %ld downto 0) := (\n", package, size-1, (width*8)-1);
-
+
for (i = 0; i < size; ++i) {
if (i % columns == 0) printf(" ");
-
+
if (i < elements) {
if (fread(x, 1, width, f) != width) {
perror("fread");
@@ -207,7 +207,7 @@ int main(int argc, char **argv) {
} else {
memset(x, 0, sizeof(x));
}
-
+
printf("%*ld => x\"", i_width, i);
if (bigendian) {
for (j = 0; j < width; ++j)
@@ -217,13 +217,13 @@ int main(int argc, char **argv) {
printf("%02x", x[j]);
}
printf("\"");
-
+
if ((i+1) == size) printf(");\n");
else if ((i+1) % columns == 0) printf(",\n");
else printf(", ");
}
fclose(f);
-
+
printf("end %s_pkg;\n", package);
return 0;
diff --git a/wrc_main.c b/wrc_main.c
index 6847d9fe7e6c4169260a84e68d90a986cb4b1f40..b56ad5138d9900094effb048c253e9cc66a639de 100644
--- a/wrc_main.c
+++ b/wrc_main.c
@@ -33,25 +33,25 @@ void wrc_initialize()
int ret, i;
uint8_t mac_addr[6], ds18_id[8] = {0,0,0,0,0,0,0,0};
char sfp_pn[17];
-
+
sdb_find_devices();
uart_init();
-
+
mprintf("WR Core: starting up...\n");
-
+
timer_init(1);
owInit();
-
+
mac_addr[0] = 0x08; //
mac_addr[1] = 0x00; // CERN OUI
- mac_addr[2] = 0x30; //
-
+ mac_addr[2] = 0x30; //
+
own_scanbus(ONEWIRE_PORT);
if (get_persistent_mac(ONEWIRE_PORT, mac_addr) == -1) {
mprintf("Unable to determine MAC address\n");
mac_addr[0] = 0x11; //
- mac_addr[1] = 0x22; //
- mac_addr[2] = 0x33; // fallback MAC if get_persistent_mac fails
+ mac_addr[1] = 0x22; //
+ mac_addr[2] = 0x33; // fallback MAC if get_persistent_mac fails
mac_addr[3] = 0x44; //
mac_addr[4] = 0x55; //
mac_addr[5] = 0x66; //
@@ -65,7 +65,7 @@ void wrc_initialize()
minic_init();
pps_gen_init();
wrc_ptp_init();
-
+
#if WITH_ETHERBONE
ipv4_init("wru1");
arp_init("wru1");
@@ -88,7 +88,7 @@ int wrc_check_link()
TRACE_DEV("Link up.\n");
gpio_out(GPIO_LED_LINK, 1);
rv = LINK_WENT_UP;
- }
+ }
else if(prev_link_state && !link_state)
{
TRACE_DEV("Link down.\n");
@@ -105,14 +105,14 @@ int wrc_extra_debug = 0;
void wrc_debug_printf(int subsys, const char *fmt, ...)
{
va_list ap;
-
+
if(wrc_ui_mode) return;
-
+
va_start(ap, fmt);
-
+
if(wrc_extra_debug || (!wrc_extra_debug && (subsys & TRACE_SERVO)))
vprintf(fmt, ap);
-
+
va_end(ap);
}
@@ -130,7 +130,7 @@ static void ui_update()
{
shell_init();
wrc_ui_mode = UI_SHELL_MODE;
- }
+ }
}
else if(wrc_ui_mode == UI_STAT_MODE)
{
@@ -139,7 +139,7 @@ static void ui_update()
{
shell_init();
wrc_ui_mode = UI_SHELL_MODE;
- }
+ }
}
else
shell_interactive();
@@ -159,7 +159,7 @@ int main(void)
//try to read and execute init script from EEPROM
shell_boot_script();
-
+
for (;;)
{
int l_status = wrc_check_link();
@@ -171,7 +171,7 @@ int main(void)
needIP = 1;
break;
#endif
-
+
case LINK_UP:
update_rx_queues();
#if WITH_ETHERBONE
diff --git a/wrc_ptp.c b/wrc_ptp.c
index ec7a54f96de0c938d1bb6ff508907d6c74452a29..1461b3ef2370e8ca1e831cef6d0aa76e54ec1fed 100644
--- a/wrc_ptp.c
+++ b/wrc_ptp.c
@@ -38,7 +38,7 @@ static RunTimeOpts rtOpts = {
.wrStateTimeout= WR_DEFAULT_STATE_TIMEOUT_MS,
.phyCalibrationRequired = FALSE,
.disableFallbackIfWRFails = TRUE,
-
+
.primarySource = FALSE,
.wrConfig = WR_S_ONLY,
.masterOnly = FALSE,
@@ -53,7 +53,7 @@ static int ptp_enabled = 0, ptp_mode = WRC_MODE_UNKNOWN;
int wrc_ptp_init()
{
Integer16 ret;
-
+
netStartup();
ptpPortDS = ptpdStartup(0, NULL, &ret, &rtOpts, &ptpClockDS);
@@ -65,7 +65,7 @@ int wrc_ptp_init()
PTPD_TRACE(TRACE_WRPC, NULL,"failed to initialize network\n");
return -1;
}
-
+
ptpPortDS->linkUP = FALSE;
ptp_enabled = 0;
return 0;
@@ -79,12 +79,12 @@ int wrc_ptp_set_mode(int mode)
uint32_t start_tics, lock_timeout = 0;
ptp_mode = 0;
-
+
wrc_ptp_stop();
-
+
switch(mode)
{
- case WRC_MODE_GM:
+ case WRC_MODE_GM:
rtOpts.primarySource = TRUE;
rtOpts.wrConfig = WR_M_ONLY;
rtOpts.masterOnly = TRUE;
@@ -103,15 +103,15 @@ int wrc_ptp_set_mode(int mode)
case WRC_MODE_SLAVE:
rtOpts.primarySource = FALSE;
rtOpts.wrConfig = WR_S_ONLY;
- rtOpts.masterOnly = FALSE;
+ rtOpts.masterOnly = FALSE;
spll_init(SPLL_MODE_SLAVE, 0, 1);
break;
}
initDataClock(&rtOpts, &ptpClockDS);
-
+
start_tics = timer_get_tics();
-
+
mprintf("Locking PLL");
pps_gen_enable_output(0);
@@ -130,10 +130,10 @@ int wrc_ptp_set_mode(int mode)
return -EINTR;
}
}
-
+
if(mode == WRC_MODE_MASTER || mode == WRC_MODE_GM)
pps_gen_enable_output(1);
-
+
mprintf("\n");
ptp_mode = mode;
return 0;