Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From fb10ab134d630705cae0c7be42437cc289af7d32 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 15 Mar 2016 21:36:02 +0000 |
| 4 | Subject: [PATCH] Use __c_ispeed and __c_ospeed on musl |
| 5 | |
| 6 | Original intention of these asserts is to find if termios structure |
| 7 | is mapped correctly to locally define union, the get* APIs for |
| 8 | baudrate would not do the right thing since they do not return the |
| 9 | value from c_ospeed/c_ispeed but the value which is stored in iflag |
| 10 | for baudrate. |
| 11 | |
| 12 | So we check if we are on Linux but not using glibc then we use |
| 13 | __c_ispeed and __c_ospeed as defined in musl, however these are |
| 14 | internal elements of structs it should not have been used this |
| 15 | way. |
| 16 | |
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 18 | |
| 19 | --- |
| 20 | Upstream-Status: Pending |
| 21 | |
| 22 | xioinitialize.c | 7 +++++++ |
| 23 | 1 file changed, 7 insertions(+) |
| 24 | |
| 25 | diff --git a/xioinitialize.c b/xioinitialize.c |
| 26 | index 9f50155..8fb2e4c 100644 |
| 27 | --- a/xioinitialize.c |
| 28 | +++ b/xioinitialize.c |
| 29 | @@ -65,6 +65,12 @@ int xioinitialize(void) { |
| 30 | #if HAVE_TERMIOS_ISPEED && (ISPEED_OFFSET != -1) && (OSPEED_OFFSET != -1) |
| 31 | #if defined(ISPEED_OFFSET) && (ISPEED_OFFSET != -1) |
| 32 | #if defined(OSPEED_OFFSET) && (OSPEED_OFFSET != -1) |
| 33 | +#if defined(__linux__) && !defined(__GLIBC__) |
| 34 | + tdata.termarg.__c_ispeed = 0x56789abc; |
| 35 | + tdata.termarg.__c_ospeed = 0x6789abcd; |
| 36 | + assert(tdata.termarg.__c_ispeed == tdata.speeds[ISPEED_OFFSET]); |
| 37 | + assert(tdata.termarg.__c_ospeed == tdata.speeds[OSPEED_OFFSET]); |
| 38 | +#else |
| 39 | tdata.termarg.c_ispeed = 0x56789abc; |
| 40 | tdata.termarg.c_ospeed = 0x6789abcd; |
| 41 | assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]); |
| 42 | @@ -72,6 +78,7 @@ int xioinitialize(void) { |
| 43 | #endif |
| 44 | #endif |
| 45 | #endif |
| 46 | +#endif |
| 47 | } |
| 48 | #endif |
| 49 | |
| 50 | -- |
| 51 | 2.8.0 |
| 52 | |