Skip to content

Commit 2fe5524

Browse files
lancethepantslancethepants
committed
Fix powerpc and some edits.
1 parent 1826597 commit 2fe5524

File tree

2 files changed

+58
-47
lines changed

2 files changed

+58
-47
lines changed

‎src/unix/linux_like/linux/arch/powerpc/mod.rs

+16-6
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,20 @@ pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
9292

9393
// Ioctl Constants
9494

95-
pub const TCGETS: ::Ioctl = 0x402c7413;
96-
pub const TCSETS: ::Ioctl = 0x802c7414;
97-
pub const TCSETSW: ::Ioctl = 0x802c7415;
98-
pub const TCSETSF: ::Ioctl = 0x802c7416;
95+
cfg_if! {
96+
if #[cfg(target_env = "musl")] {
97+
pub const TCGETS: ::Ioctl = 0x402c7413;
98+
pub const TCSETS: ::Ioctl = 0x802c7414;
99+
pub const TCSETSW: ::Ioctl = 0x802c7415;
100+
pub const TCSETSF: ::Ioctl = 0x802c7416;
101+
} else {
102+
pub const TCGETS: ::Ioctl = 0x403c7413;
103+
pub const TCSETS: ::Ioctl = 0x803c7414;
104+
pub const TCSETSW: ::Ioctl = 0x803c7415;
105+
pub const TCSETSF: ::Ioctl = 0x803c7416;
106+
}
107+
}
108+
99109
pub const TCGETA: ::Ioctl = 0x40147417;
100110
pub const TCSETA: ::Ioctl = 0x80147418;
101111
pub const TCSETAW: ::Ioctl = 0x80147419;
@@ -148,7 +158,7 @@ pub const TIOCGPTPEER: ::Ioctl = 0x20005441;
148158
//pub const TIOCSISO7816: ::Ioctl = 0xc0285443;
149159
pub const FIONCLEX: ::Ioctl = 0x20006602;
150160
pub const FIOCLEX: ::Ioctl = 0x20006601;
151-
pub const FIOASYNC: ::Ioctl = 0x8004667e;
161+
pub const FIOASYNC: ::Ioctl = 0x8004667d;
152162
pub const TIOCSERCONFIG: ::Ioctl = 0x5453;
153163
pub const TIOCSERGWILD: ::Ioctl = 0x5454;
154164
pub const TIOCSERSWILD: ::Ioctl = 0x5455;
@@ -160,7 +170,7 @@ pub const TIOCSERGETMULTI: ::Ioctl = 0x545A;
160170
pub const TIOCSERSETMULTI: ::Ioctl = 0x545B;
161171
pub const TIOCMIWAIT: ::Ioctl = 0x545C;
162172
pub const TIOCGICOUNT: ::Ioctl = 0x545D;
163-
pub const FIOQSIZE: ::Ioctl = 0x40086680;
173+
//pub const FIOQSIZE: ::Ioctl = 0x40086680;
164174

165175
pub const TIOCM_LE: ::c_int = 0x001;
166176
pub const TIOCM_DTR: ::c_int = 0x002;

‎src/unix/linux_like/linux/arch/sparc/mod.rs

+42-41
Original file line numberDiff line numberDiff line change
@@ -102,70 +102,65 @@ pub const SCM_TIMESTAMPING: ::c_int = SO_TIMESTAMPING;
102102

103103
// Ioctl Constants
104104

105+
pub const TCGETS: ::Ioctl = 0x40245408;
106+
pub const TCSETS: ::Ioctl = 0x80245409;
107+
pub const TCSETSW: ::Ioctl = 0x8024540a;
108+
pub const TCSETSF: ::Ioctl = 0x8024540b;
105109
pub const TCGETA: ::Ioctl = 0x40125401;
106110
pub const TCSETA: ::Ioctl = 0x80125402;
107111
pub const TCSETAW: ::Ioctl = 0x80125403;
108112
pub const TCSETAF: ::Ioctl = 0x80125404;
109113
pub const TCSBRK: ::Ioctl = 0x20005405;
110114
pub const TCXONC: ::Ioctl = 0x20005406;
111115
pub const TCFLSH: ::Ioctl = 0x20005407;
112-
pub const TCGETS: ::Ioctl = 0x40245408;
113-
pub const TCSETS: ::Ioctl = 0x80245409;
114-
pub const TCSETSW: ::Ioctl = 0x8024540a;
115-
pub const TCSETSF: ::Ioctl = 0x8024540b;
116-
pub const TCGETS2: ::Ioctl = 0x402c540c;
117-
pub const TCSETS2: ::Ioctl = 0x802c540d;
118-
pub const TCSETSW2: ::Ioctl = 0x802c540e;
119-
pub const TCSETSF2: ::Ioctl = 0x802c540f;
120-
pub const TIOCGDEV: ::Ioctl = 0x40045432;
121-
pub const TIOCVHANGUP: ::Ioctl = 0x20005437;
122-
pub const TIOCGPKT: ::Ioctl = 0x40045438;
123-
pub const TIOCGPTLCK: ::Ioctl = 0x40045439;
124-
pub const TIOCGEXCL: ::Ioctl = 0x40045440;
125-
pub const TIOCGRS485: ::Ioctl = 0x40205441;
126-
pub const TIOCSRS485: ::Ioctl = 0xc0205442;
127-
//pub const TIOCGISO7816: ::Ioctl = 0x40285443;
128-
//pub const TIOCSISO7816: ::Ioctl = 0xc0285444;
129-
pub const TIOCGETD: ::Ioctl = 0x40047400;
130-
pub const TIOCSETD: ::Ioctl = 0x80047401;
131116
pub const TIOCEXCL: ::Ioctl = 0x2000740d;
132117
pub const TIOCNXCL: ::Ioctl = 0x2000740e;
133-
pub const TIOCCONS: ::Ioctl = 0x20007424;
134-
pub const TIOCGSOFTCAR: ::Ioctl = 0x40047464;
135-
pub const TIOCSSOFTCAR: ::Ioctl = 0x80047465;
136-
pub const TIOCSWINSZ: ::Ioctl = 0x80087467;
118+
pub const TIOCSCTTY: ::Ioctl = 0x20007484;
119+
pub const TIOCGPGRP: ::Ioctl = 0x40047483;
120+
pub const TIOCSPGRP: ::Ioctl = 0x80047482;
121+
pub const TIOCOUTQ: ::Ioctl = 0x40047473;
122+
pub const TIOCSTI: ::Ioctl = 0x80017472;
137123
pub const TIOCGWINSZ: ::Ioctl = 0x40087468;
124+
pub const TIOCSWINSZ: ::Ioctl = 0x80087467;
138125
pub const TIOCMGET: ::Ioctl = 0x4004746a;
139-
pub const TIOCMBIC: ::Ioctl = 0x8004746b;
140126
pub const TIOCMBIS: ::Ioctl = 0x8004746c;
127+
pub const TIOCMBIC: ::Ioctl = 0x8004746b;
141128
pub const TIOCMSET: ::Ioctl = 0x8004746d;
142-
pub const TIOCSTART: ::Ioctl = 0x2000746e;
143-
pub const TIOCSTOP: ::Ioctl = 0x2000746f;
129+
pub const TIOCGSOFTCAR: ::Ioctl = 0x40047464;
130+
pub const TIOCSSOFTCAR: ::Ioctl = 0x80047465;
131+
pub const FIONREAD: ::Ioctl = 0x4004667f;
132+
pub const TIOCINQ: ::Ioctl = FIONREAD;
133+
pub const TIOCLINUX: ::Ioctl = 0x541C;
134+
pub const TIOCCONS: ::Ioctl = 0x20007424;
135+
pub const TIOCGSERIAL: ::Ioctl = 0x541E;
136+
pub const TIOCSSERIAL: ::Ioctl = 0x541F;
144137
pub const TIOCPKT: ::Ioctl = 0x80047470;
138+
pub const FIONBIO: ::Ioctl = 0x8004667e;
145139
pub const TIOCNOTTY: ::Ioctl = 0x20007471;
146-
pub const TIOCSTI: ::Ioctl = 0x80017472;
147-
pub const TIOCOUTQ: ::Ioctl = 0x40047473;
148-
pub const TIOCCBRK: ::Ioctl = 0x2000747a;
140+
pub const TIOCSETD: ::Ioctl = 0x80047401;
141+
pub const TIOCGETD: ::Ioctl = 0x40047400;
142+
pub const TCSBRKP: ::Ioctl = 0x5425;
149143
pub const TIOCSBRK: ::Ioctl = 0x2000747b;
150-
pub const TIOCSPGRP: ::Ioctl = 0x80047482;
151-
pub const TIOCGPGRP: ::Ioctl = 0x40047483;
152-
pub const TIOCSCTTY: ::Ioctl = 0x20007484;
144+
pub const TIOCCBRK: ::Ioctl = 0x2000747a;
153145
pub const TIOCGSID: ::Ioctl = 0x40047485;
146+
pub const TCGETS2: ::Ioctl = 0x402c540c;
147+
pub const TCSETS2: ::Ioctl = 0x802c540d;
148+
pub const TCSETSW2: ::Ioctl = 0x802c540e;
149+
pub const TCSETSF2: ::Ioctl = 0x802c540f;
150+
pub const TIOCGRS485: ::Ioctl = 0x40205441;
151+
pub const TIOCSRS485: ::Ioctl = 0xc0205442;
154152
pub const TIOCGPTN: ::Ioctl = 0x40047486;
155153
pub const TIOCSPTLCK: ::Ioctl = 0x80047487;
154+
pub const TIOCGDEV: ::Ioctl = 0x40045432;
156155
pub const TIOCSIG: ::Ioctl = 0x80047488;
156+
pub const TIOCVHANGUP: ::Ioctl = 0x20005437;
157+
pub const TIOCGPKT: ::Ioctl = 0x40045438;
158+
pub const TIOCGPTLCK: ::Ioctl = 0x40045439;
159+
pub const TIOCGEXCL: ::Ioctl = 0x40045440;
157160
pub const TIOCGPTPEER: ::Ioctl = 0x20007489;
158-
pub const FIOCLEX: ::Ioctl = 0x20006601;
159161
pub const FIONCLEX: ::Ioctl = 0x20006602;
162+
pub const FIOCLEX: ::Ioctl = 0x20006601;
160163
pub const FIOASYNC: ::Ioctl = 0x4004667d;
161-
pub const FIONBIO: ::Ioctl = 0x8004667e;
162-
pub const FIONREAD: ::Ioctl = 0x4004667f;
163-
pub const TIOCINQ: ::Ioctl = FIONREAD;
164-
pub const FIOQSIZE: ::Ioctl = 0x4004667f;
165-
pub const TIOCLINUX: ::Ioctl = 0x541C;
166-
pub const TIOCGSERIAL: ::Ioctl = 0x541E;
167-
pub const TIOCSSERIAL: ::Ioctl = 0x541F;
168-
pub const TCSBRKP: ::Ioctl = 0x5425;
169164
pub const TIOCSERCONFIG: ::Ioctl = 0x5453;
170165
pub const TIOCSERGWILD: ::Ioctl = 0x5454;
171166
pub const TIOCSERSWILD: ::Ioctl = 0x5455;
@@ -177,6 +172,12 @@ pub const TIOCSERGETMULTI: ::Ioctl = 0x545A;
177172
pub const TIOCSERSETMULTI: ::Ioctl = 0x545B;
178173
pub const TIOCMIWAIT: ::Ioctl = 0x545C;
179174
pub const TIOCGICOUNT: ::Ioctl = 0x545D;
175+
pub const TIOCSTART: ::Ioctl = 0x2000746e;
176+
pub const TIOCSTOP: ::Ioctl = 0x2000746f;
177+
178+
//pub const FIOQSIZE: ::Ioctl = ;
179+
//pub const TIOCGISO7816: ::Ioctl = 0x40285443;
180+
//pub const TIOCSISO7816: ::Ioctl = 0xc0285444;
180181

181182
pub const TIOCM_LE: ::c_int = 0x001;
182183
pub const TIOCM_DTR: ::c_int = 0x002;

0 commit comments

Comments
 (0)