Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

offsetScaledLogVariance: change it to unsigned short (SCA _032 #65) #77

Merged
merged 2 commits into from
Mar 3, 2023
Merged

offsetScaledLogVariance: change it to unsigned short (SCA _032 #65) #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a06af5
offsetScaledLogVariance: change it to unsigned short (SCA _032 #65)
PawelModrzejewski Jan 21, 2021
8d4cfc8
Change printf format string to %u
MarcinMiklas Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/avbts_clock.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct ClockQuality {
unsigned char clockAccuracy; /*!< Clock Accuracy - clause 8.6.2.3.
Indicates the expected time accuracy of
a clock master.*/
int16_t offsetScaledLogVariance; /*!< ::Offset Scaled log variance - Clause 8.6.2.4.
uint16_t offsetScaledLogVariance; /*!< ::Offset Scaled log variance - Clause 8.6.2.4.
Is the scaled, offset representation
of an estimate of the PTP variance. The
PTP variance characterizes the
Expand Down
2 changes: 1 addition & 1 deletion common/avbts_osipc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class OS_IPC {
uint8_t clock_identity[],
uint8_t priority1,
uint8_t clock_class,
int16_t offset_scaled_log_variance,
uint16_t offset_scaled_log_variance,
uint8_t clock_accuracy,
uint8_t priority2,
uint8_t domain_number,
Expand Down
2 changes: 1 addition & 1 deletion common/ipcdef.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ typedef struct {
uint8_t clock_identity[PTP_CLOCK_IDENTITY_LENGTH]; //!< The clock identity of the interface
uint8_t priority1; //!< The priority1 field of the grandmaster functionality of the interface, or 0xFF if not supported
uint8_t clock_class; //!< The clockClass field of the grandmaster functionality of the interface, or 0xFF if not supported
int16_t offset_scaled_log_variance; //!< The offsetScaledLogVariance field of the grandmaster functionality of the interface, or 0x0000 if not supported
uint16_t offset_scaled_log_variance; //!< The offsetScaledLogVariance field of the grandmaster functionality of the interface, or 0x0000 if not supported
uint8_t clock_accuracy; //!< The clockAccuracy field of the grandmaster functionality of the interface, or 0xFF if not supported
uint8_t priority2; //!< The priority2 field of the grandmaster functionality of the interface, or 0xFF if not supported
uint8_t domain_number; //!< The domainNumber field of the grandmaster functionality of the interface, or 0 if not supported
Expand Down
2 changes: 1 addition & 1 deletion linux/shm_test/shm_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ int main(int argc, char *argv[])
(unsigned int) ptpData->clock_identity[6], (unsigned int) ptpData->clock_identity[7]);
fprintf(stdout, "priority1 %u\n", (unsigned int) ptpData->priority1);
fprintf(stdout, "clock_class %u\n", (unsigned int) ptpData->clock_class);
fprintf(stdout, "offset_scaled_log_variance %d\n", (int) ptpData->offset_scaled_log_variance);
fprintf(stdout, "offset_scaled_log_variance %u\n", (unsigned int) ptpData->offset_scaled_log_variance);
fprintf(stdout, "clock_accuracy %u\n", (unsigned int) ptpData->clock_accuracy);
fprintf(stdout, "priority2 %u\n", (unsigned int) ptpData->priority2);
fprintf(stdout, "domain_number %u\n", (unsigned int) ptpData->domain_number);
Expand Down
2 changes: 1 addition & 1 deletion linux/src/linux_hal_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ bool LinuxSharedMemoryIPC::update_network_interface(
uint8_t clock_identity[],
uint8_t priority1,
uint8_t clock_class,
int16_t offset_scaled_log_variance,
uint16_t offset_scaled_log_variance,
uint8_t clock_accuracy,
uint8_t priority2,
uint8_t domain_number,
Expand Down
2 changes: 1 addition & 1 deletion linux/src/linux_hal_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ class LinuxSharedMemoryIPC:public OS_IPC {
uint8_t clock_identity[],
uint8_t priority1,
uint8_t clock_class,
int16_t offset_scaled_log_variance,
uint16_t offset_scaled_log_variance,
uint8_t clock_accuracy,
uint8_t priority2,
uint8_t domain_number,
Expand Down