Skip to content

W
White Rabbit Switch - Software
Commit 37315c81 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/include: get rid of struct hexp_port_state and hexp_port_list 

also removed typedefs
hexp_port_state_t
hexp_port_list_t
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 3811c851
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 52 deletions
userspace/include/hal/hal_exports.h
View file @ 37315c81
......@@ -73,7 +73,7 @@ typedef struct {
} hexp_pps_params_t;
/* Port modes (hexp_port_state_t.mode) */
/* Port modes (hal_port_state.mode) */
#define HEXP_PORT_MODE_WR_M_AND_S 4
#define HEXP_PORT_MODE_WR_MASTER 1
#define HEXP_PORT_MODE_WR_SLAVE 2
......@@ -85,56 +85,6 @@ typedef struct {
#define HEXP_PORT_TSC_FALLING 2
*/
typedef struct hexp_port_state {
/* When non-zero: port state is valid */
int valid;
/* WR-PTP role of the port (Master, Slave, etc.) */
int mode;
/* TX and RX delays (combined, big Deltas from the link model in the spec) */
uint32_t delta_tx;
uint32_t delta_rx;
/* DDMTD raw phase value in picoseconds */
uint32_t phase_val;
/* When non-zero: phase_val contains a valid phase readout */
int phase_val_valid;
/* When non-zero: link is up */
int up;
/* When non-zero: TX path is calibrated (delta_tx contains valid value) */
int tx_calibrated;
/* When non-zero: RX path is calibrated (delta_rx contains valid value) */
int rx_calibrated;
int tx_tstamp_counter;
int rx_tstamp_counter;
int is_locked;
int lock_priority;
// timestamp linearization paramaters
uint32_t phase_setpoint; // DMPLL phase setpoint (picoseconds)
uint32_t clock_period; // reference lock period in picoseconds
uint32_t t2_phase_transition; // approximate DMTD phase value (on slave port) at which RX timestamp (T2) counter transistion occurs (picoseconds)
uint32_t t4_phase_transition; // approximate phase value (on master port) at which RX timestamp (T4) counter transistion occurs (picoseconds)
uint8_t hw_addr[6];
int hw_index;
int32_t fiber_fix_alpha;
} hexp_port_state_t;
typedef struct hexp_port_list {
int num_ports; /* Number of ports in the list */
int num_physical_ports; /* Number of physical ports compiled into the FPGA bitstream */
char port_names[HAL_MAX_PORTS][16];
} hexp_port_list_t;
typedef struct {
int timing_mode; /* Free-running Master/GM/BC */
int locked_port;
......
ppsi @ 2181324a
Subproject commit 036fd8392ca2fd5925f6dc5d87adbda4f96cd0d7
Subproject commit 2181324ae355f72299abc63b5fa8c9e1fcc742b1
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