Skip to content

S
Software for White Rabbit PTP Core
Commit 4dfb79f6 authored by root's avatar root
Browse files
Options

main module for the demo + new Makfeile

parent 8c720d7c
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 46 deletions
Makefile
View file @ 4dfb79f6
PLATFORM = lm32 PLATFORM = lm32
OBJS_WRC = wrc_main.o dev/uart.o dev/endpoint.o dev/minic.o dev/pps_gen.o dev/timer.o dev/softpll.o lib/mprintf.o OBJS_WRC = wrc_main.o dev/uart.o dev/endpoint.o dev/minic.o dev/pps_gen.o dev/timer.o dev/softpll.o lib/mprintf.o dev/i2c.o monitor/monitor.o
D = ptpd-noposix D = ptp-noposix
PTPD_CFLAGS = -ffreestanding -DPTPD_FREESTANDING -DWRPC_EXTRA_SLIM -DPTPD_MSBF -DPTPD_DBG PTPD_CFLAGS = -ffreestanding -DPTPD_FREESTANDING -DWRPC_EXTRA_SLIM -DPTPD_MSBF -DPTPD_DBG
PTPD_CFLAGS += -Wall -ggdb -I$D/wrsw_hal \ PTPD_CFLAGS += -Wall -ggdb -I$D/wrsw_hal \
-I$D/libptpnetif -I$D/PTPWRd \ -I$D/libptpnetif -I$D/PTPWRd \
...@@ -39,7 +39,7 @@ endif ...@@ -39,7 +39,7 @@ endif
CC=$(CROSS_COMPILE)gcc CC=$(CROSS_COMPILE)gcc
OBJCOPY=$(CROSS_COMPILE)objcopy OBJCOPY=$(CROSS_COMPILE)objcopy
OBJDUMP=$(CROSS_COMPILE)objdump OBJDUMP=$(CROSS_COMPILE)objdump
CFLAGS= $(CFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os -Iinclude -include include/trace.h $(PTPD_CFLAGS) CFLAGS= $(CFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os -Iinclude -include include/trace.h $(PTPD_CFLAGS) -Iptp-noposix/PTPWRd
LDFLAGS= $(LDFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os -Iinclude LDFLAGS= $(LDFLAGS_PLATFORM) -ffunction-sections -fdata-sections -Os -Iinclude
SIZE = $(CROSS_COMPILE)size SIZE = $(CROSS_COMPILE)size
OBJS=$(OBJS_PLATFORM) $(OBJS_WRC) $(OBJS_PTPD) $(OBJS_PTPD_FREE) OBJS=$(OBJS_PLATFORM) $(OBJS_WRC) $(OBJS_PTPD) $(OBJS_PTPD_FREE)
......
wrc_main.c
View file @ 4dfb79f6
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
#include "endpoint.h" #include "endpoint.h"
#include "minic.h" #include "minic.h"
#include "pps_gen.h" #include "pps_gen.h"
#include "ptpd-noposix/PTPWRd/ptpd.h" #include "ptpd.h"
//#include "ptpd-noposix/PTPWRd/datatypes.h"
...@@ -92,10 +91,21 @@ void test_transition() ...@@ -92,10 +91,21 @@ void test_transition()
timer_delay(10); timer_delay(10);
} }
} }
}
int last_btn0;
int button_pressed()
{
int p;
int btn0 = gpio_in(GPIO_PIN_BTN1);
p=!btn0 && last_btn0;
last_btn0 = btn0;
return p;
} }
int enable_tracking = 1;
int main(void) int main(void)
{ {
int rx, tx; int rx, tx;
...@@ -111,55 +121,33 @@ int main(void) ...@@ -111,55 +121,33 @@ int main(void)
ep_enable(1, 0); ep_enable(1, 0);
mprintf("is link up ?\n");
while(!ep_link_up());
mprintf("yes it is\n");
ep_get_deltas(&tx, &rx);
mprintf("delta: tx = %d, rx=%d\n", tx, rx);
minic_init(); minic_init();
//minic_disable();
pps_gen_init(); pps_gen_init();
// test_transition();
netStartup(); netStartup();
ptpclock = ptpdStartup(0, NULL, &ret, &rtOpts); // mi2c_init();
// mi2c_scan();
toState(PTP_INITIALIZING, &rtOpts, ptpclock); gpio_dir(GPIO_PIN_BTN1, 0);
for(;;)
{
//mprintf("\n\n\n");
protocol_nonblock(&rtOpts, ptpclock);
update_rx_queues(); ptpclock = ptpdStartup(0, NULL, &ret, &rtOpts);
timer_delay(10);
} toState(PTP_INITIALIZING, &rtOpts, ptpclock);
for(;;)
{
wr_mon_debug();
if(button_pressed())
{
enable_tracking = 1-enable_tracking;
wr_servo_enable_tracking(enable_tracking);
}
protocol_nonblock(&rtOpts, ptpclock);
update_rx_queues();
timer_delay(10);
}
//(unsigned int *)(0x40000) = 0x1;
// *(unsigned int *)(0x40024) = 0x1;
//for(;;)
// {
// struct hw_timestamp hwts;
// uint32_t utc, nsec;
// uint8_t buf[1024];
// memcpy(hdr, dst_mac_addr, 6);
// hdr[12] = 0x88;
// hdr[13] = 0xf7;
//
// minic_tx_frame(hdr, buf, 500, &hwts);
// mprintf("TxTs: utc %d nsec %d\n", hwts.utc, hwts.nsec);
//
// delay(1000000);
// mprintf("cnt:%d\n", count);
// }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment