Skip to content

Commit e3fd47e

Browse files
committed
fix parsing problems
1 parent e4742b8 commit e3fd47e

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/unix/linux_like/linux/ioctl.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,13 @@ const _IOC_DIRSHIFT: u32 = _IOC_SIZESHIFT + _IOC_SIZEBITS;
4646
/// Build an ioctl number, analogous to the C macro of the same name.
4747
#[inline(always)]
4848
const fn _IOC(dir: u32, ty: u32, nr: u32, size: usize) -> u32 {
49-
debug_assert!(dir <= _IOC_DIRMASK);
50-
debug_assert!(ty <= _IOC_TYPEMASK);
51-
debug_assert!(nr <= _IOC_NRMASK);
52-
debug_assert!(size <= (_IOC_SIZEMASK as usize));
49+
// TODO the `garando_syntax` crate (used by ctest2 in the CI test suite)
50+
// cannot currently parse these `debug_assert!`s
51+
//
52+
// debug_assert!(dir <= _IOC_DIRMASK);
53+
// debug_assert!(ty <= _IOC_TYPEMASK);
54+
// debug_assert!(nr <= _IOC_NRMASK);
55+
// debug_assert!(size <= (_IOC_SIZEMASK as usize));
5356

5457
(dir << _IOC_DIRSHIFT)
5558
| (ty << _IOC_TYPESHIFT)

src/unix/linux_like/linux/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,8 @@ s! {
820820
pub n_pins: ::c_int,
821821
pub cross_timestamping: ::c_int,
822822
pub adjust_phase: ::c_int,
823-
pub rsv: [::c_int; 12],
823+
pub max_phase_adj: ::c_int,
824+
pub rsv: [::c_int; 11],
824825
}
825826

826827
pub struct ptp_extts_request {
@@ -1069,7 +1070,7 @@ s! {
10691070
pub struct ptp_sys_offset {
10701071
pub n_samples: ::c_uint,
10711072
pub rsv: [::c_uint; 3],
1072-
pub ts: [ptp_clock_time; 2 * PTP_MAX_SAMPLES as usize + 1],
1073+
pub ts: [ptp_clock_time; 51],
10731074
}
10741075

10751076
pub struct ptp_pin_desc {

0 commit comments

Comments
 (0)