LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Support asm/sockios.h for MIPS."

Browse Source
This commit is contained in:
Andrew Hsieh
2012-08-22 16:38:01 -07:00
committed by android code review
parent a2b32b3422 4cad8d6fdf
commit 51f72cc1bd
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ndk/sources/android/libportable/arch-mips/ioctl.c
View File

@@ -18,6 +18,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <ioctls_portable.h> #include <ioctls_portable.h>
#include <termios.h> #include <termios.h>
#include <linux/sockios.h>
#if FIONREAD_PORTABLE==FIONREAD #if FIONREAD_PORTABLE==FIONREAD
#error Bad build environment #error Bad build environment
@@ -195,6 +196,18 @@ static inline int mips_change_request(int request)
return TIOCGLTC; return TIOCGLTC;
case OTIOCCONS_PORTABLE: case OTIOCCONS_PORTABLE:
return OTIOCCONS; return OTIOCCONS;
case FIOSETOWN_PORTABLE:
return FIOSETOWN;
case SIOCSPGRP_PORTABLE:
return SIOCSPGRP;
case FIOGETOWN_PORTABLE:
return FIOGETOWN;
case SIOCGPGRP_PORTABLE:
return SIOCGPGRP;
case SIOCATMARK_PORTABLE:
return SIOCATMARK;
case SIOCGSTAMP_PORTABLE:
return SIOCGSTAMP;
} }
return request; return request;
} }

9
ndk/sources/android/libportable/common/include/ioctls_portable.h
View File

@@ -171,4 +171,13 @@ struct sgttyb_portable {
#define TIOCGLTC_PORTABLE _IOR_PORTABLE('t',116,struct ltchars_portable)/* get local special chars*/ #define TIOCGLTC_PORTABLE _IOR_PORTABLE('t',116,struct ltchars_portable)/* get local special chars*/
#define OTIOCCONS_PORTABLE _IO_PORTABLE('t', 98) /* for hp300 -- sans int arg */ #define OTIOCCONS_PORTABLE _IO_PORTABLE('t', 98) /* for hp300 -- sans int arg */
/* Derived from development/ndk/platforms/android-3/arch-arm/include/asm/sockios.h */
#define FIOSETOWN_PORTABLE 0x8901
#define SIOCSPGRP_PORTABLE 0x8902
#define FIOGETOWN_PORTABLE 0x8903
#define SIOCGPGRP_PORTABLE 0x8904
#define SIOCATMARK_PORTABLE 0x8905
#define SIOCGSTAMP_PORTABLE 0x8906
#endif /* _IOCTLS_PORTABLE_H */ #endif /* _IOCTLS_PORTABLE_H */

4
ndk/sources/android/libportable/common/include/socket_portable.h
View File

@@ -17,7 +17,7 @@
#ifndef _SOCKET_PORTABLE_H_ #ifndef _SOCKET_PORTABLE_H_
#define _SOCKET_PORTABLE_H_ #define _SOCKET_PORTABLE_H_
/* From ndk/platforms/android-3/include/sys/socket.h */ /* Derived from development/ndk/platforms/android-3/include/sys/socket.h */
#define SOCK_STREAM_PORTABLE 1 #define SOCK_STREAM_PORTABLE 1
#define SOCK_DGRAM_PORTABLE 2 #define SOCK_DGRAM_PORTABLE 2
#define SOCK_RAW_PORTABLE 3 #define SOCK_RAW_PORTABLE 3
@@ -26,7 +26,7 @@
#define SOCK_PACKET_PORTABLE 10 #define SOCK_PACKET_PORTABLE 10
/* Derived from android-3/arch-arm/include/asm/socket.h */ /* Derived from development/ndk/platforms/android-3/arch-arm/include/asm/socket.h */
#define SOL_SOCKET_PORTABLE 1 #define SOL_SOCKET_PORTABLE 1