Skip to content

Some updates for vxWorks #1542

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

Merged
merged 4 commits into from
Oct 10, 2019
Merged

Some updates for vxWorks #1542

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ae217e
Merge pull request #14 from rust-lang/master
BaoshanPang Sep 22, 2019
fbf7d5e
Merge pull request #18 from rust-lang/master
BaoshanPang Sep 26, 2019
a38aa53
Merge pull request #19 from rust-lang/master
BaoshanPang Sep 29, 2019
d07850a
adding FIOGETNAME which is used by ioctl() to get file path
BaoshanPang Oct 7, 2019
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
13 changes: 8 additions & 5 deletions src/vxworks/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ s_no_extra_traits! {
// dirent.h
pub struct dirent {
pub d_ino : ::ino_t,
pub d_name : [::c_char; _PARM_NAME_MAX + 1],
pub d_name : [::c_char; _PARM_NAME_MAX as usize + 1],
}

pub struct sockaddr_un {
Expand All @@ -401,7 +401,7 @@ s_no_extra_traits! {
pub entrAddr : *mut ::c_void,
pub initTaskId: ::TASK_ID,
pub parentId : ::RTP_ID,
pub pathName : [::c_char; VX_RTP_NAME_LENGTH + 1],
pub pathName : [::c_char; VX_RTP_NAME_LENGTH as usize + 1],
pub taskCnt : ::c_int,
pub textStart : *mut ::c_void,
pub textEnd : *mut ::c_void,
Expand Down Expand Up @@ -856,8 +856,11 @@ pub const FIOREADYCHANGE: ::c_int = 11;
pub const FIODISKCHANGE: ::c_int = 13;
pub const FIOCANCEL: ::c_int = 14;
pub const FIOSQUEEZE: ::c_int = 15;
pub const FIOGETNAME: ::c_int = 18;
pub const FIONBIO: ::c_int = 0x90040010;

// limits.h
pub const PATH_MAX: ::c_int = _PARM_PATH_MAX;
pub const _POSIX_PATH_MAX: ::c_int = 256;

// Some poll stuff
Expand Down Expand Up @@ -928,8 +931,8 @@ pub const SI_CHILD: ::c_int = -6;
pub const SI_KILL: ::c_int = SI_USER;

// vxParams.h definitions
pub const _PARM_NAME_MAX: usize = 255;
pub const _PARM_PATH_MAX: usize = 1024;
pub const _PARM_NAME_MAX: ::c_int = 255;
pub const _PARM_PATH_MAX: ::c_int = 1024;

// WAIT STUFF
pub const WNOHANG: ::c_int = 0x01;
Expand Down Expand Up @@ -989,7 +992,7 @@ pub const SEEK_CUR: ::c_int = 1;
pub const SEEK_END: ::c_int = 2;

// rtpLibCommon.h
pub const VX_RTP_NAME_LENGTH: usize = 255;
pub const VX_RTP_NAME_LENGTH: ::c_int = 255;
pub const RTP_ID_ERROR: ::RTP_ID = -1;

// h/public/unistd.h
Expand Down