From 9f65adf2ba3bb15feb8b7a7b3eef788df3fd270e Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 10 Feb 2009 15:43:56 -0800 Subject: [PATCH 1/8] auto import from //branches/cupcake/...@130745 --- libc/Android.mk | 4 + libc/bionic/eabi.c | 5 +- libc/bionic/pthread.c | 15 + libc/bionic/stubs.c | 184 ++++++--- libc/bionic/time64.c | 793 ++++++++++++++++++++++++++++++++++++ libc/bionic/time64_config.h | 75 ++++ libc/docs/OVERVIEW.TXT | 364 +++++++++++++++++ libc/include/pthread.h | 6 + libc/include/string.h | 5 +- libc/include/sys/stat.h | 4 + libc/include/sys/time.h | 2 +- libc/include/sys/types.h | 1 + libc/include/time64.h | 54 +++ libc/include/unistd.h | 4 +- libc/string/strcoll.c | 40 ++ libc/string/strxfrm.c | 47 +++ libdl/dltest.c | 266 ++++++------ linker/arch/arm/begin.S | 28 ++ linker/arch/x86/begin.S | 29 ++ linker/debugger.c | 31 +- linker/linker.c | 28 ++ linker/linker.h | 28 ++ linker/linker_debug.h | 28 ++ linker/rt.c | 28 ++ 24 files changed, 1883 insertions(+), 186 deletions(-) create mode 100644 libc/bionic/time64.c create mode 100644 libc/bionic/time64_config.h create mode 100644 libc/docs/OVERVIEW.TXT create mode 100644 libc/include/time64.h create mode 100755 libc/string/strcoll.c create mode 100755 libc/string/strxfrm.c diff --git a/libc/Android.mk b/libc/Android.mk index f950c7e1b..330802ae5 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -66,6 +66,7 @@ libc_common_src_files := \ unistd/usleep.c \ unistd/wait.c \ stdio/asprintf.c \ + stdio/clrerr.c \ stdio/fclose.c \ stdio/fdopen.c \ stdio/feof.c \ @@ -179,6 +180,7 @@ libc_common_src_files := \ string/strcat.c \ string/strchr.c \ string/strcmp.c \ + string/strcoll.c \ string/strcpy.c \ string/strcspn.c \ string/strdup.c \ @@ -198,6 +200,7 @@ libc_common_src_files := \ string/strstr.c \ string/strtok.c \ string/strtotimeval.c \ + string/strxfrm.c \ inet/bindresvport.c \ inet/inet_addr.c \ inet/inet_aton.c \ @@ -234,6 +237,7 @@ libc_common_src_files := \ bionic/ssp.c \ bionic/stubs.c \ bionic/system_properties.c \ + bionic/time64.c \ bionic/thread_atexit.c \ bionic/utime.c \ bionic/utmp.c \ diff --git a/libc/bionic/eabi.c b/libc/bionic/eabi.c index c491f0504..f212d0556 100644 --- a/libc/bionic/eabi.c +++ b/libc/bionic/eabi.c @@ -30,7 +30,10 @@ void* __dso_handle = 0; -int __aeabi_atexit (void *object, void (*destructor) (void *), void *dso_handle) +/* Make this a weak symbol to avoid a multiple definition error when linking + * with libstdc++-v3. */ +int __attribute__((weak)) +__aeabi_atexit (void *object, void (*destructor) (void *), void *dso_handle) { //return __cxa_atexit(destructor, object, dso_handle); return 0; diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c index 6114f40eb..ec3c459e0 100644 --- a/libc/bionic/pthread.c +++ b/libc/bionic/pthread.c @@ -488,6 +488,21 @@ int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr) return 0; } +int pthread_attr_setscope(pthread_attr_t *attr, int scope) +{ + if (scope == PTHREAD_SCOPE_SYSTEM) + return 0; + if (scope == PTHREAD_SCOPE_PROCESS) + return ENOTSUP; + + return EINVAL; +} + +int pthread_attr_getscope(pthread_attr_t const *attr) +{ + return PTHREAD_SCOPE_SYSTEM; +} + /* CAVEAT: our implementation of pthread_cleanup_push/pop doesn't support C++ exceptions * and thread cancelation diff --git a/libc/bionic/stubs.c b/libc/bionic/stubs.c index 1f76bba15..365f21a2a 100644 --- a/libc/bionic/stubs.c +++ b/libc/bionic/stubs.c @@ -35,6 +35,7 @@ #include #include #include +#include /** Thread-specific state for the stubs functions **/ @@ -95,8 +96,9 @@ __stubs_state(void) return s; } -static struct passwd *android_iinfo_to_passwd( - struct passwd *pw, struct android_id_info *iinfo) +static struct passwd* +android_iinfo_to_passwd( struct passwd *pw, + struct android_id_info *iinfo ) { pw->pw_name = (char*)iinfo->name; pw->pw_uid = iinfo->aid; @@ -106,8 +108,9 @@ static struct passwd *android_iinfo_to_passwd( return pw; } -static struct group *android_iinfo_to_group( - struct group *gr, struct android_id_info *iinfo) +static struct group* +android_iinfo_to_group( struct group *gr, + struct android_id_info *iinfo ) { gr->gr_name = (char*) iinfo->name; gr->gr_gid = iinfo->aid; @@ -116,8 +119,8 @@ static struct group *android_iinfo_to_group( return gr; } -static struct passwd *android_id_to_passwd( - struct passwd *pw, unsigned id) +static struct passwd * +android_id_to_passwd( struct passwd *pw, unsigned id) { struct android_id_info *iinfo = android_ids; unsigned n; @@ -126,11 +129,11 @@ static struct passwd *android_id_to_passwd( return android_iinfo_to_passwd(pw, iinfo + n); } } - return 0; + return NULL; } -static struct passwd *android_name_to_passwd( - struct passwd *pw, const char *name) +static struct passwd* +android_name_to_passwd(struct passwd *pw, const char *name) { struct android_id_info *iinfo = android_ids; unsigned n; @@ -139,11 +142,11 @@ static struct passwd *android_name_to_passwd( return android_iinfo_to_passwd(pw, iinfo + n); } } - return 0; + return NULL; } -static struct group *android_id_to_group( - struct group *gr, unsigned id) +static struct group* +android_id_to_group( struct group *gr, unsigned id ) { struct android_id_info *iinfo = android_ids; unsigned n; @@ -152,11 +155,11 @@ static struct group *android_id_to_group( return android_iinfo_to_group(gr, iinfo + n); } } - return 0; + return NULL; } -static struct group *android_name_to_group( - struct group *gr, const char *name) +static struct group* +android_name_to_group( struct group *gr, const char *name ) { struct android_id_info *iinfo = android_ids; unsigned n; @@ -165,10 +168,92 @@ static struct group *android_name_to_group( return android_iinfo_to_group(gr, iinfo + n); } } + return NULL; +} + +/* translate a user/group name like app_1234 into the + * corresponding user/group id (AID_APP + 1234) + * returns 0 and sets errno to ENOENT in case of error + */ +static unsigned +app_id_from_name( const char* name ) +{ + unsigned long id; + char* end; + + if (memcmp(name, "app_", 4) != 0 || !isdigit(name[4])) + goto FAIL; + + id = strtoul(name+4, &end, 10); + if (id == 0 || *end != '\0') + goto FAIL; + + id += AID_APP; + + /* check for overflow and that the value can be + * stored in our 32-bit uid_t/gid_t */ + if (id < AID_APP || (unsigned)id != id) + goto FAIL; + + return (unsigned)id; + +FAIL: + errno = ENOENT; return 0; } -struct passwd* getpwuid(uid_t uid) +/* translate a uid into the corresponding app_ + * passwd structure (sets errno to ENOENT on failure) + */ +static struct passwd* +app_id_to_passwd(uid_t uid, stubs_state_t* state) +{ + struct passwd* pw = &state->passwd; + + if (uid < AID_APP) { + errno = ENOENT; + return NULL; + } + + snprintf( state->app_name_buffer, sizeof state->app_name_buffer, + "app_%u", uid - AID_APP ); + + pw->pw_name = state->app_name_buffer; + pw->pw_dir = "/data"; + pw->pw_shell = "/system/bin/sh"; + pw->pw_uid = uid; + pw->pw_gid = uid; + + return pw; +} + +/* translate a gid into the corresponding app_ + * group structure (sets errno to ENOENT on failure) + */ +static struct group* +app_id_to_group(gid_t gid, stubs_state_t* state) +{ + struct group* gr = &state->group; + + if (gid < AID_APP) { + errno = ENOENT; + return NULL; + } + + snprintf(state->group_name_buffer, sizeof state->group_name_buffer, + "app_%u", gid - AID_APP); + + gr->gr_name = state->group_name_buffer; + gr->gr_gid = gid; + gr->gr_mem[0] = gr->gr_name; + gr->gr_mem[1] = NULL; + + return gr; +} + + +struct passwd* +getpwuid(uid_t uid) { stubs_state_t* state = __stubs_state(); struct passwd* pw; @@ -181,35 +266,27 @@ struct passwd* getpwuid(uid_t uid) if ( android_id_to_passwd(pw, uid) != NULL ) return pw; - if (uid < AID_APP) { - errno = ENOENT; - return NULL; - } - - snprintf( state->app_name_buffer, sizeof state->app_name_buffer, - "app_%d", uid - AID_APP ); - - pw->pw_name = state->app_name_buffer; - pw->pw_dir = "/data"; - pw->pw_shell = "/system/bin/sh"; - pw->pw_uid = uid; - pw->pw_gid = uid; - - return pw; + return app_id_to_passwd(uid, state); } -struct passwd* getpwnam(const char *login) +struct passwd* +getpwnam(const char *login) { stubs_state_t* state = __stubs_state(); if (state == NULL) return NULL; - return android_name_to_passwd(&state->passwd, login); + if (android_name_to_passwd(&state->passwd, login) != NULL) + return &state->passwd; + + return app_id_to_passwd( app_id_from_name(login), state ); } -int getgrouplist (const char *user, gid_t group, - gid_t *groups, int *ngroups) { +int +getgrouplist (const char *user, gid_t group, + gid_t *groups, int *ngroups) +{ if (*ngroups < 1) { *ngroups = 1; return -1; @@ -218,18 +295,20 @@ int getgrouplist (const char *user, gid_t group, return (*ngroups = 1); } -char* getlogin(void) +char* +getlogin(void) { struct passwd *pw = getpwuid(getuid()); if(pw) { return pw->pw_name; } else { - return 0; + return NULL; } } -struct group* getgrgid(gid_t gid) +struct group* +getgrgid(gid_t gid) { stubs_state_t* state = __stubs_state(); struct group* gr; @@ -241,34 +320,25 @@ struct group* getgrgid(gid_t gid) if (gr != NULL) return gr; - if (gid < AID_APP) { - errno = ENOENT; - return NULL; - } - - snprintf(state->group_name_buffer, sizeof state->group_name_buffer, - "app_%d", gid - AID_APP); - - gr = &state->group; - - gr->gr_name = state->group_name_buffer; - gr->gr_gid = gid; - gr->gr_mem[0] = gr->gr_name; - gr->gr_mem[1] = NULL; - - return gr; + return app_id_to_group(gid, state); } -struct group* getgrnam(const char *name) +struct group* +getgrnam(const char *name) { stubs_state_t* state = __stubs_state(); + unsigned id; if (state == NULL) return NULL; - return android_name_to_group(&state->group, name); + if (android_name_to_group(&state->group, name) != 0) + return &state->group; + + return app_id_to_group( app_id_from_name(name), state ); } + struct netent* getnetbyname(const char *name) { fprintf(stderr, "FIX ME! implement getgrnam() %s:%d\n", __FILE__, __LINE__); @@ -308,5 +378,3 @@ struct protoent *getprotobynumber(int proto) fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); return NULL; } - - diff --git a/libc/bionic/time64.c b/libc/bionic/time64.c new file mode 100644 index 000000000..1e1f88189 --- /dev/null +++ b/libc/bionic/time64.c @@ -0,0 +1,793 @@ +/* + +Copyright (c) 2007-2008 Michael G Schwern + +This software originally derived from Paul Sheer's pivotal_gmtime_r.c. + +The MIT License: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +*/ + +/* See http://code.google.com/p/y2038 for this code's origin */ + +/* + +Programmers who have available to them 64-bit time values as a 'long +long' type can use localtime64_r() and gmtime64_r() which correctly +converts the time even on 32-bit systems. Whether you have 64-bit time +values will depend on the operating system. + +localtime64_r() is a 64-bit equivalent of localtime_r(). + +gmtime64_r() is a 64-bit equivalent of gmtime_r(). + +*/ + +#include +#include +#include +#include +#include +#include +#include "time64.h" + +/* BIONIC_BEGIN */ +/* the following are here to avoid exposing time64_config.h and + * other types in our public time64.h header + */ +#include "time64_config.h" + +/* Not everyone has gm/localtime_r(), provide a replacement */ +#ifdef HAS_LOCALTIME_R +# define LOCALTIME_R(clock, result) localtime_r(clock, result) +#else +# define LOCALTIME_R(clock, result) fake_localtime_r(clock, result) +#endif +#ifdef HAS_GMTIME_R +# define GMTIME_R(clock, result) gmtime_r(clock, result) +#else +# define GMTIME_R(clock, result) fake_gmtime_r(clock, result) +#endif + +typedef int64_t Int64; +typedef time64_t Time64_T; +typedef int64_t Year; +#define TM tm +/* BIONIC_END */ + +/* Spec says except for stftime() and the _r() functions, these + all return static memory. Stabbings! */ +static struct TM Static_Return_Date; +static char Static_Return_String[35]; + +static const int days_in_month[2][12] = { + {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, +}; + +static const int julian_days_by_month[2][12] = { + {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}, + {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335}, +}; + +static char const wday_name[7][3] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" +}; + +static char const mon_name[12][3] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" +}; + +static const int length_of_year[2] = { 365, 366 }; + +/* Some numbers relating to the gregorian cycle */ +static const Year years_in_gregorian_cycle = 400; +#define days_in_gregorian_cycle ((365 * 400) + 100 - 4 + 1) +static const Time64_T seconds_in_gregorian_cycle = days_in_gregorian_cycle * 60LL * 60LL * 24LL; + +/* Year range we can trust the time funcitons with */ +#define MAX_SAFE_YEAR 2037 +#define MIN_SAFE_YEAR 1971 + +/* 28 year Julian calendar cycle */ +#define SOLAR_CYCLE_LENGTH 28 + +/* Year cycle from MAX_SAFE_YEAR down. */ +static const int safe_years_high[SOLAR_CYCLE_LENGTH] = { + 2016, 2017, 2018, 2019, + 2020, 2021, 2022, 2023, + 2024, 2025, 2026, 2027, + 2028, 2029, 2030, 2031, + 2032, 2033, 2034, 2035, + 2036, 2037, 2010, 2011, + 2012, 2013, 2014, 2015 +}; + +/* Year cycle from MIN_SAFE_YEAR up */ +static const int safe_years_low[SOLAR_CYCLE_LENGTH] = { + 1996, 1997, 1998, 1971, + 1972, 1973, 1974, 1975, + 1976, 1977, 1978, 1979, + 1980, 1981, 1982, 1983, + 1984, 1985, 1986, 1987, + 1988, 1989, 1990, 1991, + 1992, 1993, 1994, 1995, +}; + +/* This isn't used, but it's handy to look at */ +static const int dow_year_start[SOLAR_CYCLE_LENGTH] = { + 5, 0, 1, 2, /* 0 2016 - 2019 */ + 3, 5, 6, 0, /* 4 */ + 1, 3, 4, 5, /* 8 1996 - 1998, 1971*/ + 6, 1, 2, 3, /* 12 1972 - 1975 */ + 4, 6, 0, 1, /* 16 */ + 2, 4, 5, 6, /* 20 2036, 2037, 2010, 2011 */ + 0, 2, 3, 4 /* 24 2012, 2013, 2014, 2015 */ +}; + +/* Let's assume people are going to be looking for dates in the future. + Let's provide some cheats so you can skip ahead. + This has a 4x speed boost when near 2008. +*/ +/* Number of days since epoch on Jan 1st, 2008 GMT */ +#define CHEAT_DAYS (1199145600 / 24 / 60 / 60) +#define CHEAT_YEARS 108 + +#define IS_LEAP(n) ((!(((n) + 1900) % 400) || (!(((n) + 1900) % 4) && (((n) + 1900) % 100))) != 0) +#define WRAP(a,b,m) ((a) = ((a) < 0 ) ? ((b)--, (a) + (m)) : (a)) + +#ifdef USE_SYSTEM_LOCALTIME +# define SHOULD_USE_SYSTEM_LOCALTIME(a) ( \ + (a) <= SYSTEM_LOCALTIME_MAX && \ + (a) >= SYSTEM_LOCALTIME_MIN \ +) +#else +# define SHOULD_USE_SYSTEM_LOCALTIME(a) (0) +#endif + +#ifdef USE_SYSTEM_GMTIME +# define SHOULD_USE_SYSTEM_GMTIME(a) ( \ + (a) <= SYSTEM_GMTIME_MAX && \ + (a) >= SYSTEM_GMTIME_MIN \ +) +#else +# define SHOULD_USE_SYSTEM_GMTIME(a) (0) +#endif + +/* Multi varadic macros are a C99 thing, alas */ +#ifdef TIME_64_DEBUG +# define TRACE(format) (fprintf(stderr, format)) +# define TRACE1(format, var1) (fprintf(stderr, format, var1)) +# define TRACE2(format, var1, var2) (fprintf(stderr, format, var1, var2)) +# define TRACE3(format, var1, var2, var3) (fprintf(stderr, format, var1, var2, var3)) +#else +# define TRACE(format) ((void)0) +# define TRACE1(format, var1) ((void)0) +# define TRACE2(format, var1, var2) ((void)0) +# define TRACE3(format, var1, var2, var3) ((void)0) +#endif + + +static int is_exception_century(Year year) +{ + int is_exception = ((year % 100 == 0) && !(year % 400 == 0)); + TRACE1("# is_exception_century: %s\n", is_exception ? "yes" : "no"); + + return(is_exception); +} + + +/* timegm() is not in the C or POSIX spec, but it is such a useful + extension I would be remiss in leaving it out. Also I need it + for localtime64() +*/ +Time64_T timegm64(const struct TM *date) { + Time64_T days = 0; + Time64_T seconds = 0; + Year year; + Year orig_year = (Year)date->tm_year; + int cycles = 0; + + if( orig_year > 100 ) { + cycles = (orig_year - 100) / 400; + orig_year -= cycles * 400; + days += (Time64_T)cycles * days_in_gregorian_cycle; + } + else if( orig_year < -300 ) { + cycles = (orig_year - 100) / 400; + orig_year -= cycles * 400; + days += (Time64_T)cycles * days_in_gregorian_cycle; + } + TRACE3("# timegm/ cycles: %d, days: %lld, orig_year: %lld\n", cycles, days, orig_year); + + if( orig_year > 70 ) { + year = 70; + while( year < orig_year ) { + days += length_of_year[IS_LEAP(year)]; + year++; + } + } + else if ( orig_year < 70 ) { + year = 69; + do { + days -= length_of_year[IS_LEAP(year)]; + year--; + } while( year >= orig_year ); + } + + + days += julian_days_by_month[IS_LEAP(orig_year)][date->tm_mon]; + days += date->tm_mday - 1; + + seconds = days * 60 * 60 * 24; + + seconds += date->tm_hour * 60 * 60; + seconds += date->tm_min * 60; + seconds += date->tm_sec; + + return(seconds); +} + + +static int check_tm(struct TM *tm) +{ + /* Don't forget leap seconds */ + assert(tm->tm_sec >= 0); + assert(tm->tm_sec <= 61); + + assert(tm->tm_min >= 0); + assert(tm->tm_min <= 59); + + assert(tm->tm_hour >= 0); + assert(tm->tm_hour <= 23); + + assert(tm->tm_mday >= 1); + assert(tm->tm_mday <= days_in_month[IS_LEAP(tm->tm_year)][tm->tm_mon]); + + assert(tm->tm_mon >= 0); + assert(tm->tm_mon <= 11); + + assert(tm->tm_wday >= 0); + assert(tm->tm_wday <= 6); + + assert(tm->tm_yday >= 0); + assert(tm->tm_yday <= length_of_year[IS_LEAP(tm->tm_year)]); + +#ifdef HAS_TM_TM_GMTOFF + assert(tm->tm_gmtoff >= -24 * 60 * 60); + assert(tm->tm_gmtoff <= 24 * 60 * 60); +#endif + + return 1; +} + + +/* The exceptional centuries without leap years cause the cycle to + shift by 16 +*/ +static Year cycle_offset(Year year) +{ + const Year start_year = 2000; + Year year_diff = year - start_year; + Year exceptions; + + if( year > start_year ) + year_diff--; + + exceptions = year_diff / 100; + exceptions -= year_diff / 400; + + TRACE3("# year: %lld, exceptions: %lld, year_diff: %lld\n", + year, exceptions, year_diff); + + return exceptions * 16; +} + +/* For a given year after 2038, pick the latest possible matching + year in the 28 year calendar cycle. + + A matching year... + 1) Starts on the same day of the week. + 2) Has the same leap year status. + + This is so the calendars match up. + + Also the previous year must match. When doing Jan 1st you might + wind up on Dec 31st the previous year when doing a -UTC time zone. + + Finally, the next year must have the same start day of week. This + is for Dec 31st with a +UTC time zone. + It doesn't need the same leap year status since we only care about + January 1st. +*/ +static int safe_year(const Year year) +{ + int safe_year = 0; + Year year_cycle; + + if( year >= MIN_SAFE_YEAR && year <= MAX_SAFE_YEAR ) { + return (int)year; + } + + year_cycle = year + cycle_offset(year); + + /* safe_years_low is off from safe_years_high by 8 years */ + if( year < MIN_SAFE_YEAR ) + year_cycle -= 8; + + /* Change non-leap xx00 years to an equivalent */ + if( is_exception_century(year) ) + year_cycle += 11; + + /* Also xx01 years, since the previous year will be wrong */ + if( is_exception_century(year - 1) ) + year_cycle += 17; + + year_cycle %= SOLAR_CYCLE_LENGTH; + if( year_cycle < 0 ) + year_cycle = SOLAR_CYCLE_LENGTH + year_cycle; + + assert( year_cycle >= 0 ); + assert( year_cycle < SOLAR_CYCLE_LENGTH ); + if( year < MIN_SAFE_YEAR ) + safe_year = safe_years_low[year_cycle]; + else if( year > MAX_SAFE_YEAR ) + safe_year = safe_years_high[year_cycle]; + else + assert(0); + + TRACE3("# year: %lld, year_cycle: %lld, safe_year: %d\n", + year, year_cycle, safe_year); + + assert(safe_year <= MAX_SAFE_YEAR && safe_year >= MIN_SAFE_YEAR); + + return safe_year; +} + + +void copy_tm_to_TM(const struct tm *src, struct TM *dest) { + if( src == NULL ) { + memset(dest, 0, sizeof(*dest)); + } + else { +# ifdef USE_TM64 + dest->tm_sec = src->tm_sec; + dest->tm_min = src->tm_min; + dest->tm_hour = src->tm_hour; + dest->tm_mday = src->tm_mday; + dest->tm_mon = src->tm_mon; + dest->tm_year = (Year)src->tm_year; + dest->tm_wday = src->tm_wday; + dest->tm_yday = src->tm_yday; + dest->tm_isdst = src->tm_isdst; + +# ifdef HAS_TM_TM_GMTOFF + dest->tm_gmtoff = src->tm_gmtoff; +# endif + +# ifdef HAS_TM_TM_ZONE + dest->tm_zone = src->tm_zone; +# endif + +# else + /* They're the same type */ + memcpy(dest, src, sizeof(*dest)); +# endif + } +} + + +void copy_TM_to_tm(const struct TM *src, struct tm *dest) { + if( src == NULL ) { + memset(dest, 0, sizeof(*dest)); + } + else { +# ifdef USE_TM64 + dest->tm_sec = src->tm_sec; + dest->tm_min = src->tm_min; + dest->tm_hour = src->tm_hour; + dest->tm_mday = src->tm_mday; + dest->tm_mon = src->tm_mon; + dest->tm_year = (int)src->tm_year; + dest->tm_wday = src->tm_wday; + dest->tm_yday = src->tm_yday; + dest->tm_isdst = src->tm_isdst; + +# ifdef HAS_TM_TM_GMTOFF + dest->tm_gmtoff = src->tm_gmtoff; +# endif + +# ifdef HAS_TM_TM_ZONE + dest->tm_zone = src->tm_zone; +# endif + +# else + /* They're the same type */ + memcpy(dest, src, sizeof(*dest)); +# endif + } +} + + +/* Simulate localtime_r() to the best of our ability */ +struct tm * fake_localtime_r(const time_t *clock, struct tm *result) { + const struct tm *static_result = localtime(clock); + + assert(result != NULL); + + if( static_result == NULL ) { + memset(result, 0, sizeof(*result)); + return NULL; + } + else { + memcpy(result, static_result, sizeof(*result)); + return result; + } +} + + + +/* Simulate gmtime_r() to the best of our ability */ +struct tm * fake_gmtime_r(const time_t *clock, struct tm *result) { + const struct tm *static_result = gmtime(clock); + + assert(result != NULL); + + if( static_result == NULL ) { + memset(result, 0, sizeof(*result)); + return NULL; + } + else { + memcpy(result, static_result, sizeof(*result)); + return result; + } +} + + +static Time64_T seconds_between_years(Year left_year, Year right_year) { + int increment = (left_year > right_year) ? 1 : -1; + Time64_T seconds = 0; + int cycles; + + if( left_year > 2400 ) { + cycles = (left_year - 2400) / 400; + left_year -= cycles * 400; + seconds += cycles * seconds_in_gregorian_cycle; + } + else if( left_year < 1600 ) { + cycles = (left_year - 1600) / 400; + left_year += cycles * 400; + seconds += cycles * seconds_in_gregorian_cycle; + } + + while( left_year != right_year ) { + seconds += length_of_year[IS_LEAP(right_year - 1900)] * 60 * 60 * 24; + right_year += increment; + } + + return seconds * increment; +} + + +Time64_T mktime64(const struct TM *input_date) { + struct tm safe_date; + struct TM date; + Time64_T time; + Year year = input_date->tm_year + 1900; + + if( MIN_SAFE_YEAR <= year && year <= MAX_SAFE_YEAR ) { + copy_TM_to_tm(input_date, &safe_date); + return (Time64_T)mktime(&safe_date); + } + + /* Have to make the year safe in date else it won't fit in safe_date */ + date = *input_date; + date.tm_year = safe_year(year) - 1900; + copy_TM_to_tm(&date, &safe_date); + + time = (Time64_T)mktime(&safe_date); + + time += seconds_between_years(year, (Year)(safe_date.tm_year + 1900)); + + return time; +} + + +/* Because I think mktime() is a crappy name */ +Time64_T timelocal64(const struct TM *date) { + return mktime64(date); +} + + +struct TM *gmtime64_r (const Time64_T *in_time, struct TM *p) +{ + int v_tm_sec, v_tm_min, v_tm_hour, v_tm_mon, v_tm_wday; + Time64_T v_tm_tday; + int leap; + Time64_T m; + Time64_T time = *in_time; + Year year = 70; + int cycles = 0; + + assert(p != NULL); + + /* Use the system gmtime() if time_t is small enough */ + if( SHOULD_USE_SYSTEM_GMTIME(*in_time) ) { + time_t safe_time = *in_time; + struct tm safe_date; + GMTIME_R(&safe_time, &safe_date); + + copy_tm_to_TM(&safe_date, p); + assert(check_tm(p)); + + return p; + } + +#ifdef HAS_TM_TM_GMTOFF + p->tm_gmtoff = 0; +#endif + p->tm_isdst = 0; + +#ifdef HAS_TM_TM_ZONE + p->tm_zone = "UTC"; +#endif + + v_tm_sec = (int)(time % 60); + time /= 60; + v_tm_min = (int)(time % 60); + time /= 60; + v_tm_hour = (int)(time % 24); + time /= 24; + v_tm_tday = time; + + WRAP (v_tm_sec, v_tm_min, 60); + WRAP (v_tm_min, v_tm_hour, 60); + WRAP (v_tm_hour, v_tm_tday, 24); + + v_tm_wday = (int)((v_tm_tday + 4) % 7); + if (v_tm_wday < 0) + v_tm_wday += 7; + m = v_tm_tday; + + if (m >= CHEAT_DAYS) { + year = CHEAT_YEARS; + m -= CHEAT_DAYS; + } + + if (m >= 0) { + /* Gregorian cycles, this is huge optimization for distant times */ + cycles = (int)(m / (Time64_T) days_in_gregorian_cycle); + if( cycles ) { + m -= (cycles * (Time64_T) days_in_gregorian_cycle); + year += (cycles * years_in_gregorian_cycle); + } + + /* Years */ + leap = IS_LEAP (year); + while (m >= (Time64_T) length_of_year[leap]) { + m -= (Time64_T) length_of_year[leap]; + year++; + leap = IS_LEAP (year); + } + + /* Months */ + v_tm_mon = 0; + while (m >= (Time64_T) days_in_month[leap][v_tm_mon]) { + m -= (Time64_T) days_in_month[leap][v_tm_mon]; + v_tm_mon++; + } + } else { + year--; + + /* Gregorian cycles */ + cycles = (int)((m / (Time64_T) days_in_gregorian_cycle) + 1); + if( cycles ) { + m -= (cycles * (Time64_T) days_in_gregorian_cycle); + year += (cycles * years_in_gregorian_cycle); + } + + /* Years */ + leap = IS_LEAP (year); + while (m < (Time64_T) -length_of_year[leap]) { + m += (Time64_T) length_of_year[leap]; + year--; + leap = IS_LEAP (year); + } + + /* Months */ + v_tm_mon = 11; + while (m < (Time64_T) -days_in_month[leap][v_tm_mon]) { + m += (Time64_T) days_in_month[leap][v_tm_mon]; + v_tm_mon--; + } + m += (Time64_T) days_in_month[leap][v_tm_mon]; + } + + p->tm_year = year; + if( p->tm_year != year ) { +#ifdef EOVERFLOW + errno = EOVERFLOW; +#endif + return NULL; + } + + /* At this point m is less than a year so casting to an int is safe */ + p->tm_mday = (int) m + 1; + p->tm_yday = julian_days_by_month[leap][v_tm_mon] + (int)m; + p->tm_sec = v_tm_sec; + p->tm_min = v_tm_min; + p->tm_hour = v_tm_hour; + p->tm_mon = v_tm_mon; + p->tm_wday = v_tm_wday; + + assert(check_tm(p)); + + return p; +} + + +struct TM *localtime64_r (const Time64_T *time, struct TM *local_tm) +{ + time_t safe_time; + struct tm safe_date; + struct TM gm_tm; + Year orig_year; + int month_diff; + + assert(local_tm != NULL); + + /* Use the system localtime() if time_t is small enough */ + if( SHOULD_USE_SYSTEM_LOCALTIME(*time) ) { + safe_time = *time; + + TRACE1("Using system localtime for %lld\n", *time); + + LOCALTIME_R(&safe_time, &safe_date); + + copy_tm_to_TM(&safe_date, local_tm); + assert(check_tm(local_tm)); + + return local_tm; + } + + if( gmtime64_r(time, &gm_tm) == NULL ) { + TRACE1("gmtime64_r returned null for %lld\n", *time); + return NULL; + } + + orig_year = gm_tm.tm_year; + + if (gm_tm.tm_year > (2037 - 1900) || + gm_tm.tm_year < (1970 - 1900) + ) + { + TRACE1("Mapping tm_year %lld to safe_year\n", (Year)gm_tm.tm_year); + gm_tm.tm_year = safe_year((Year)(gm_tm.tm_year + 1900)) - 1900; + } + + safe_time = timegm64(&gm_tm); + if( LOCALTIME_R(&safe_time, &safe_date) == NULL ) { + TRACE1("localtime_r(%d) returned NULL\n", (int)safe_time); + return NULL; + } + + copy_tm_to_TM(&safe_date, local_tm); + + local_tm->tm_year = orig_year; + if( local_tm->tm_year != orig_year ) { + TRACE2("tm_year overflow: tm_year %lld, orig_year %lld\n", + (Year)local_tm->tm_year, (Year)orig_year); + +#ifdef EOVERFLOW + errno = EOVERFLOW; +#endif + return NULL; + } + + + month_diff = local_tm->tm_mon - gm_tm.tm_mon; + + /* When localtime is Dec 31st previous year and + gmtime is Jan 1st next year. + */ + if( month_diff == 11 ) { + local_tm->tm_year--; + } + + /* When localtime is Jan 1st, next year and + gmtime is Dec 31st, previous year. + */ + if( month_diff == -11 ) { + local_tm->tm_year++; + } + + /* GMT is Jan 1st, xx01 year, but localtime is still Dec 31st + in a non-leap xx00. There is one point in the cycle + we can't account for which the safe xx00 year is a leap + year. So we need to correct for Dec 31st comming out as + the 366th day of the year. + */ + if( !IS_LEAP(local_tm->tm_year) && local_tm->tm_yday == 365 ) + local_tm->tm_yday--; + + assert(check_tm(local_tm)); + + return local_tm; +} + + +int valid_tm_wday( const struct TM* date ) { + if( 0 <= date->tm_wday && date->tm_wday <= 6 ) + return 1; + else + return 0; +} + +int valid_tm_mon( const struct TM* date ) { + if( 0 <= date->tm_mon && date->tm_mon <= 11 ) + return 1; + else + return 0; +} + + +char *asctime64_r( const struct TM* date, char *result ) { + /* I figure everything else can be displayed, even hour 25, but if + these are out of range we walk off the name arrays */ + if( !valid_tm_wday(date) || !valid_tm_mon(date) ) + return NULL; + + sprintf(result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", + wday_name[date->tm_wday], + mon_name[date->tm_mon], + date->tm_mday, date->tm_hour, + date->tm_min, date->tm_sec, + 1900 + date->tm_year); + + return result; +} + + +char *ctime64_r( const Time64_T* time, char* result ) { + struct TM date; + + localtime64_r( time, &date ); + return asctime64_r( &date, result ); +} + + +/* Non-thread safe versions of the above */ +struct TM *localtime64(const Time64_T *time) { + return localtime64_r(time, &Static_Return_Date); +} + +struct TM *gmtime64(const Time64_T *time) { + return gmtime64_r(time, &Static_Return_Date); +} + +char *asctime64( const struct TM* date ) { + return asctime64_r( date, Static_Return_String ); +} + +char *ctime64( const Time64_T* time ) { + return asctime64(localtime64(time)); +} diff --git a/libc/bionic/time64_config.h b/libc/bionic/time64_config.h new file mode 100644 index 000000000..53bcecf6b --- /dev/null +++ b/libc/bionic/time64_config.h @@ -0,0 +1,75 @@ +/* Debugging + TIME_64_DEBUG + Define if you want debugging messages +*/ +/* #define TIME_64_DEBUG */ + + +/* INT_64_T + A 64 bit integer type to use to store time and others. + Must be defined. +*/ +#define INT_64_T long long + + +/* USE_TM64 + Should we use a 64 bit safe replacement for tm? This will + let you go past year 2 billion but the struct will be incompatible + with tm. Conversion functions will be provided. +*/ +/* #define USE_TM64 */ + + +/* Availability of system functions. + + HAS_GMTIME_R + Define if your system has gmtime_r() + + HAS_LOCALTIME_R + Define if your system has localtime_r() + + HAS_TIMEGM + Define if your system has timegm(), a GNU extension. +*/ +#define HAS_GMTIME_R +#define HAS_LOCALTIME_R +/*#define HAS_TIMEGM */ + + +/* Details of non-standard tm struct elements. + + HAS_TM_TM_GMTOFF + True if your tm struct has a "tm_gmtoff" element. + A BSD extension. + + HAS_TM_TM_ZONE + True if your tm struct has a "tm_zone" element. + A BSD extension. +*/ +#define HAS_TM_TM_GMTOFF +#define HAS_TM_TM_ZONE + + +/* USE_SYSTEM_LOCALTIME + USE_SYSTEM_GMTIME + Should we use the system functions if the time is inside their range? + Your system localtime() is probably more accurate, but our gmtime() is + fast and safe. +*/ +#define USE_SYSTEM_LOCALTIME +/* #define USE_SYSTEM_GMTIME */ + + +/* SYSTEM_LOCALTIME_MAX + SYSTEM_LOCALTIME_MIN + SYSTEM_GMTIME_MAX + SYSTEM_GMTIME_MIN + Maximum and minimum values your system's gmtime() and localtime() + can handle. We will use your system functions if the time falls + inside these ranges. +*/ +#define SYSTEM_LOCALTIME_MAX 2147483647 +#define SYSTEM_LOCALTIME_MIN -2147483647 +#define SYSTEM_GMTIME_MAX 2147483647 +#define SYSTEM_GMTIME_MIN -2147483647 + diff --git a/libc/docs/OVERVIEW.TXT b/libc/docs/OVERVIEW.TXT new file mode 100644 index 000000000..4d40df6fb --- /dev/null +++ b/libc/docs/OVERVIEW.TXT @@ -0,0 +1,364 @@ +Bionic C Library Overview: +========================== + +Introduction: + +Core Philosophy: + + The core idea behind Bionic's design is: KEEP IT REALLY SIMPLE. + + This implies that the C library should only provide lightweight wrappers around kernel + facilities and not try to be too smart to deal with edge cases. + + The name "Bionic" comes from the fact that it is part-BSD and part-Linux: its source + code consists in a mix of BSD C library pieces with custom Linux-specific bits used + to deal with threads, processes, signals and a few others things. + + All original BSD pieces carry the BSD copyright disclaimer. Bionic-specific bits + carry the Android Open Source Project copyright disclaimer. And everything is released + under the BSD license. + +Architectures: + + Bionic currently supports the ARM and x86 instruction sets. In theory, it should be + possible to support more, but this may require a little work (e.g. adding system + call IDs to SYSCALLS.TXT, described below, or modifying the dynamic linker). + + The ARM-specific code is under arch-arm/ and the x86-specific one is under arch-x86/ + + Note that the x86 version is only meant to run on an x86 Android device. We make + absolutely no claim that you could build and use Bionic on a stock x86 Linux + distribution (though that would be cool, so patches are welcomed :-)) + +Syscall stubs: + + Each system call function is implemented by a tiny assembler source fragment + (called a "syscall stub"), which is generated automatically by tools/gensyscalls.py + which reads the SYSCALLS.TXT file for input. + + SYSCALLS.TXT contains the list of all syscall stubs to generate, along with + the corresponding syscall numeric identifier (which may differ between ARM and x86), + and its signature + + If you modify this file, you may want to use tools/checksyscalls.py which checks + its content against official Linux kernel header files, and will report errors when + invalid syscall ids are used. + + Sometimes, the C library function is really a wrapper that calls the corresponding + syscall with another name. For example, the exit() function is provided by the C + library and calls the _exit() syscall stub. + + See SYSCALLS.TXT for documentation and details. + + +time_t: + + time_t is 32-bit as defined by the kernel on 32-bit CPUs. A 64-bit version would + be preferrable to avoid the Y2038 bug, but the kernel maintainers consider that + this is not needed at the moment. + + Instead, Bionic provides a header that defines a time64_t type, and + related functions like mktime64(), localtime64(), etc... + + +Timezone management: + + The name of the current timezone is taken from the TZ environment variable, if defined. + Otherwise, the system property named 'persist.sys.timezone' is checked instead. + + The zoneinfo timezone database and index files are located under directory + /system/usr/share/zoneinfo, instead of the more Posix path of /usr/share/zoneinfo + + +off_t: + + For similar reasons, off_t is 32-bit. We define loff_t as the 64-bit variant due + to BSD inheritance, but off64_t should be available as a typedef to ease porting of + current Linux-specific code. + + + +Linux kernel headers: + + Bionic comes with its own set of "clean" Linux kernel headers to allow user-space + code to use kernel-specific declarations (e.g. IOCTLs, structure declarations, + constants, etc...). They are located in: + + ./kernel/common, + ./kernel/arch-arm + ./kernel/arch-x86 + + These headers have been generated by a tool (kernel/tools/update-all.py) to only + include the public definitions from the original Linux kernel headers. + + If you want to know why and how this is done, read kernel/README.TXT to get + all the (gory) details. + + +PThread implementation: + + Bionic's C library comes with its own pthread implementation bundled in. This is + different from other historical C libraries which: + + - place it in an external library (-lpthread) + - play linker tricks with weak symbols at dynamic link time + + The support for real-time features (a.k.a. -lrt) is also bundled in the C library. + + The implementation is based on futexes and strives to provide *very* short code paths + for common operations. Notable features are the following: + + - pthread_mutex_t, pthread_cond_t are only 4 bytes each. + + - Normal, recursive and error-check mutexes are supported, and the code path + is heavily optimized for the normal case, which is used most of the time. + + - Process-shared mutexes and condition variables are not supported. + Their implementation requires far more complexity and was absolutely + not needed for Android (which uses other inter-process synchronization + capabilities). + + Note that they could be added in the future without breaking the ABI + by specifying more sophisticated code paths (which may make the common + paths slightly slower though). + + - There is currently no support for read/write locks, priority-ceiling in + mutexes and other more advanced features. Again, the main idea being that + this was not needed for Android at all but could be added in the future. + +pthread_cancel(): + + pthread_cancel() will *not* be supported in Bionic, because doing this would + involve making the C library significantly bigger for very little benefit. + + Consider that: + + - A proper implementation must insert pthread cancellation checks in a lot + of different places of the C library. And conformance is very difficult to + test properly. + + - A proper implementation must also clean up resources, like releasing memory, + or unlocking mutexes, properly if the cancellation happens in a complex + function (e.g. inside gethostbyname() or fprintf() + complex formatting + rules). This tends to slow down the path of many functions. + + - pthread cancellation cannot stop all threads: e.g. it can't do anything + against an infinite loop + + - pthread cancellation itself has short-comings and isn't very portable + (see http://advogato.org/person/slamb/diary.html?start=49 for example). + + All of this is contrary to the Bionic design goals. If your code depends on + thread cancellation, please consider alternatives. + + Note however that Bionic does implement pthread_cleanup_push() and pthread_cleanup_pop(), + which can be used to handle cleanups that happen when a thread voluntarily exits + through pthread_exit() or returning from its main function. + + +pthread_once(): + + Do not call fork() within a callback provided to pthread_once(). Doing this + may result in a deadlock in the child process the next time it calls pthread_once(). + + Also, you can't throw a C++ Exception from the callback (see C++ Exception Support + below). + + The current implementation of pthread_once() lacks the necessary support of + multi-core-safe double-checked-locking (read and write barriers). + + +Thread-specific data + + The thread-specific storage only provides for a bit less than 64 pthread_key_t + objects to each process. The implementation provides 64 real slots but also + uses about 5 of them (exact number may depend on implementation) for its + own use (e.g. two slots are pre-allocated by the C library to speed-up the + Android OpenGL sub-system). + + Note that Posix mandates a minimum of 128 slots, but we do not claim to be + Posix-compliant. + + Except for the main thread, the TLS area is stored at the top of the stack. See + comments in bionic/libc/bionic/pthread.c for details. + + At the moment, thread-local storage defined through the __thread compiler keyword + is not supported by the Bionic C library and dynamic linker. + + +Multi-core support + + At the moment, Bionic does not provide or use read/write memory barriers. + This means that using it on certain multi-core systems might not be supported, + depending on its exact CPU architecture. + + +Android-specific features: + + Bionic provides a small number of Android-specific features to its clients: + + - access to system properties: + + Android provides a simple shared value/key space to all processes on the + system. It stores a liberal number of 'properties', each of them being a + simple size-limited string that can be associated to a size-limited string + value. + + The header can be used to read system properties + and also defines the maximum size of keys and values. + + - Android-specific user/group management: + + There is no /etc/passwd or /etc/groups in Android. By design, it is meant to + be used by a single handset user. On the other hand, Android uses the Linux + user/group management features extensively to secure process permissions, + like access to various filesystem directories. + + In the Android scheme, each installed application gets its own uid_t/gid_t + starting from 10000; lower numerical ids are reserved for system daemons. + + getpwnam() recognizes some hard-coded subsystems names (e.g. "radio") and + will translate them to their low-user-id values. It also recognizes "app_1234" + as the synthetic name of the application that was installed with uid 10000 + 1234, + which is 11234. getgrnam() works similarly + + getgrouplist() will always return a single group for any user name, which is + the one passed as an input parameter. + + getgrgid() will similarly only return a structure that contains a single-element + members list, corresponding to the user with the same numerical value than the + group. + + See bionic/libc/bionic/stubs.c for more details. + + - getservent() + + There is no /etc/services on Android. Instead the C library embeds a constant + list of services in its executable, which is parsed on demand by the various + functions that depend on it. See bionic/libc/netbsd/net/getservent.c and + bionic/libc/netbsd/net/services.h + + The list of services defined internally might change liberally in the future. + This feature is mostly historically and is very rarely used. + + The getservent() returns thread-local data. getservbyport() and getservbyname() + are also implemented in a similar fashion. + + - getprotoent() + + There is no /etc/protocol on Android. Bionic does not currently implement + getprotoent() and related functions. If we add it, it will likely be done + in a way similar to getservent() + +DNS resolver: + + Bionic uses a NetBSD-derived resolver library which has been modified in the following + ways: + + - don't implement the name-server-switch feature (a.k.a. ) + + - read /system/etc/resolv.conf instead of /etc/resolv.conf + + - read the list of servers from system properties. the code looks for + 'net.dns1', 'net.dns2', etc.. Each property should contain the IP address + of a DNS server. + + these properties are set/modified by other parts of the Android system + (e.g. the dhcpd daemon). + + the implementation also supports per-process DNS server list, using the + properties 'net.dns1.', 'net.dns2.', etc... Where stands + for the numerical ID of the current process. + + - when performing a query, use a properly randomized Query ID (instead of + a incremented one), for increased security. + + - when performing a query, bind the local client socket to a random port + for increased security. + + - get rid of *many* unfortunate thread-safety issues in the original code + + Bionic does *not* expose implementation details of its DNS resolver; the content + of is intentionally blank. The resolver implementation might + change completely in the future. + + +PThread Real-Time Timers: + + timer_create(), timer_gettime(), timer_settime() and timer_getoverrun() are + supported. + + Bionic also now supports SIGEV_THREAD real-time timers (see timer_create()). + The implementation simply uses a single thread per timer, unlike GLibc which + uses complex heuristics to try to use the less threads possible when several + timers with compatible properties are used. + + This means that if your code uses a lot of SIGEV_THREAD timers, your program + may consume a lot of memory. However, if your program needs many of these timers, + it'd better handle timeout events directly instead. + + Other timers (e.g. SIGEV_SIGNAL) are handled by the kernel and use much less + system resources. + + +Binary Compatibility: + + Bionic is *not* in any way binary-compatible with the GNU C Library, ucLibc or any + known Linux C library. This means several things: + + - You cannot expect to build something against the GNU C Library headers and have + it dynamically link properly to Bionic later. + + - You should *really* use the Android toolchain to build your program against Bionic. + The toolchain deals with many important details that are crucial to get something + working properly. + + Failure to do so will usually result in the inability to run or link your program, + or even runtime crashes. Several random web pages on the Internet describe how you + can succesfully write a "hello-world" program with the ARM GNU toolchain. These + examples usually work by chance, if anything else, and you should not follow these + instructions unless you want to waste a lot of your time in the process. + + Note however that you *can* generate a binary that is built against the GNU C Library + headers and then statically linked to it. The corresponding executable should be able + to run (if it doesn't use dlopen()/dlsym()) + +Dynamic Linker: + + Bionic comes with its own dynamic linker (just like ld.so on Linux really comes from + GLibc). This linker does not support all the relocations generated by other GCC ARM + toolchains. + +C++ Exceptions Support: + + At the moment, Bionic doesn't support C++ exceptions, what this really means is the + following: + + - If pthread_once() is called with a C++ callback that throws an exception, + then the C library will keep the corresponding pthread_once_t mutex locked. + Any further call to pthread_once() will result in a deadlock. + + A proper implementation should be able to register a C++ exception cleanup + handler before the callback to properly unlock the pthread_once_t. Unfortunately + this requires tricky assembly code that is highly dependent on the compiler. + + This feature is not planned to be supported anytime soon. + + - The same problem may arise if you throw an exception within a callback called + from the C library. Fortunately, these cases are very rare in the real-world, + but any callback you provide to the C library should *not* throw an exception. + + - Bionic lacks a few support functions to have exception support work properly. + +Include Paths: + + The Android build system should automatically provide the necessary include paths + required to build against the C library headers. However, if you want to do that + yourself, you will need to add: + + libc/arch-$ARCH/include + libc/include + libc/kernel/common + libc/kernel/arch-$ARCH + + to your C include path. diff --git a/libc/include/pthread.h b/libc/include/pthread.h index 9c4009996..e3afdaede 100644 --- a/libc/include/pthread.h +++ b/libc/include/pthread.h @@ -97,6 +97,9 @@ typedef volatile int pthread_once_t; #define PTHREAD_PROCESS_PRIVATE 0 #define PTHREAD_PROCESS_SHARED 1 +#define PTHREAD_SCOPE_SYSTEM 0 +#define PTHREAD_SCOPE_PROCESS 1 + /* * Prototypes */ @@ -128,6 +131,9 @@ int pthread_attr_getstack(pthread_attr_t const * attr, void ** stackaddr, size_t int pthread_attr_setguardsize(pthread_attr_t * attr, size_t guard_size); int pthread_attr_getguardsize(pthread_attr_t const * attr, size_t * guard_size); +int pthread_attr_setscope(pthread_attr_t *attr, int scope); +int pthread_attr_getscope(pthread_attr_t const *attr); + int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr); int pthread_create(pthread_t *thread, pthread_attr_t const * attr, diff --git a/libc/include/string.h b/libc/include/string.h index 435923b0b..613dcd78a 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -82,9 +82,8 @@ extern size_t strspn(const char *, const char *); extern char* strsignal(int sig); -/* Just declared to make libstdc++-v3 happy. */ -extern int strcoll (const char *, const char *); -extern size_t strxfrm (char *, const char *, size_t); +extern int strcoll(const char *, const char *); +extern size_t strxfrm(char *, const char *, size_t); __END_DECLS diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h index 5e6363ff4..23ab5aeec 100644 --- a/libc/include/sys/stat.h +++ b/libc/include/sys/stat.h @@ -71,6 +71,10 @@ struct stat { unsigned long long st_ino; }; +extern int chmod(const char *, mode_t); +extern int fchmod(int, mode_t); +extern int mkdir(const char *, mode_t); + extern int stat(const char *, struct stat *); extern int fstat(int, struct stat *); extern int lstat(const char *, struct stat *); diff --git a/libc/include/sys/time.h b/libc/include/sys/time.h index 4dee4dabc..1f010d45e 100644 --- a/libc/include/sys/time.h +++ b/libc/include/sys/time.h @@ -56,7 +56,7 @@ extern int utimes(const char *, const struct timeval *); #define timeradd(a, b, res) \ do { \ (res)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ - (res)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + (res)->tv_usec = (a)->tv_usec + (b)->tv_usec; \ if ((res)->tv_usec >= 1000000) { \ (res)->tv_usec -= 1000000; \ (res)->tv_sec += 1; \ diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h index 92b452c4c..b071ee912 100644 --- a/libc/include/sys/types.h +++ b/libc/include/sys/types.h @@ -65,6 +65,7 @@ typedef __kernel_nlink_t nlink_t; #define _OFF_T_DEFINED_ typedef __kernel_off_t off_t; typedef __kernel_loff_t loff_t; +typedef loff_t off64_t; /* GLibc-specific */ typedef __kernel_pid_t pid_t; diff --git a/libc/include/time64.h b/libc/include/time64.h new file mode 100644 index 000000000..9da4bc702 --- /dev/null +++ b/libc/include/time64.h @@ -0,0 +1,54 @@ +/* + +Copyright (c) 2007-2008 Michael G Schwern + +This software originally derived from Paul Sheer's pivotal_gmtime_r.c. + +The MIT License: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +Origin: http://code.google.com/p/y2038 +Modified for Bionic by the Android Open Source Project + +*/ +#ifndef TIME64_H +#define TIME64_H + +#include +#include + +typedef int64_t time64_t; + +struct tm *gmtime64_r (const time64_t *, struct tm *); +struct tm *localtime64_r (const time64_t *, struct tm *); +struct tm *gmtime64 (const time64_t *); +struct tm *localtime64 (const time64_t *); + +char *asctime64 (const struct tm *); +char *asctime64_r (const struct tm *, char *); + +char *ctime64 (const time64_t*); +char *ctime64_r (const time64_t*, char*); + +time64_t timegm64 (const struct tm *); +time64_t mktime64 (const struct tm *); +time64_t timelocal64 (const struct tm *); + +#endif /* TIME64_H */ diff --git a/libc/include/unistd.h b/libc/include/unistd.h index b6d70cc43..1ada37e51 100644 --- a/libc/include/unistd.h +++ b/libc/include/unistd.h @@ -34,6 +34,7 @@ #include #include #include +#include __BEGIN_DECLS @@ -111,9 +112,6 @@ extern int link(const char *, const char *); extern int unlink(const char *); extern int chdir(const char *); extern int fchdir(int); -extern int chmod(const char *, mode_t); -extern int fchmod(int, mode_t); -extern int mkdir(const char *, mode_t); extern int rmdir(const char *); extern int pipe(int *); extern int chroot(const char *); diff --git a/libc/string/strcoll.c b/libc/string/strcoll.c new file mode 100755 index 000000000..365cad53a --- /dev/null +++ b/libc/string/strcoll.c @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#include + +/* + * Compare strings using the current locale. Since Bionic really does not + * support locales, we assume we always use the C locale and call strcmp. + * + * This function is provided to make libstdc++-v3 usable. + */ +int +strcoll(const char *s1, const char *s2) +{ + return strcmp (s1, s2); +} diff --git a/libc/string/strxfrm.c b/libc/string/strxfrm.c new file mode 100755 index 000000000..f1843b5b1 --- /dev/null +++ b/libc/string/strxfrm.c @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#include + +/* + * Transform string s2 to string s1 using the current locale so that + * strcmp of transformed strings yields the same result as strcoll. + * Since Bionic really does not support locales, we assume we always use + * the C locale. + * + * This function is provided to make libstdc++-v3 usable. + */ +size_t +strxfrm(char *s1, const char *s2, size_t n) +{ + size_t len = strlen(s2) + 1; + + if (len < n) + n = len; + memcpy(s1, s2, n); + return len; +} diff --git a/libdl/dltest.c b/libdl/dltest.c index e84d5a324..14cd854da 100755 --- a/libdl/dltest.c +++ b/libdl/dltest.c @@ -1,119 +1,147 @@ -#include -#include -#include -#include -#include -#include - -extern char *optarg; -extern int optind, opterr, optopt; - -static struct option long_options[] = { - {"library", required_argument, 0, 'l'}, - {"symbol", required_argument, 0, 's'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0}, -}; - -/* This array must parallel long_options[] */ -static const char *descriptions[] = { - "specify a library path to look up symbol", - "specify symbol to look up", - "print this help screen", -}; - -void print_help(const char *name) { - fprintf(stdout, - "invokation:\n" - "\t%s [-l ] -s \n" - "\t%s -h\n\n", name, name); - fprintf(stdout, "options:\n"); - struct option *opt = long_options; - const char **desc = descriptions; - while (opt->name) { - fprintf(stdout, "\t-%c/--%s%s: %s\n", - opt->val, - opt->name, - (opt->has_arg ? " (argument)" : ""), - *desc); - opt++; - desc++; - } -} - -int get_options(int argc, char **argv, char **lib, char **sym) -{ - int c; - - *lib = 0; - *sym = 0; - - while (1) { - /* getopt_long stores the option index here. */ - int option_index = 0; - - c = getopt_long (argc, argv, - "l:s:h", - long_options, - &option_index); - /* Detect the end of the options. */ - if (c == -1) break; - - switch (c) { - case 'l': - *lib = strdup(optarg); - break; - case 's': - *sym = strdup(optarg); - break; - case 'h': print_help(argv[0]); exit(EXIT_FAILURE); break; - case '?': - /* getopt_long already printed an error message. */ - break; - default: - fprintf(stderr, "Unknown option"); - exit(EXIT_FAILURE); - } - } - - return optind; -} - -int main(int argc, char **argv) -{ - char *libname, *symname, *prog = *argv; - - get_options(argc, argv, &libname, &symname); - - if (symname == NULL) { - fprintf(stderr, "You must specify a symbol!\n"); - print_help(prog); - exit(EXIT_FAILURE); - } - - { - const char *dlerr; - void *handle, *symbol; - - printf("opening library [%s]\n", libname); - dlerr = dlerror(); - handle = libname ? dlopen(libname, RTLD_NOW) : RTLD_DEFAULT; - dlerr = dlerror(); - if (dlerr != NULL) fprintf(stderr, "dlopen() error: %s\n", dlerr); - - printf("opening symbol [%s]\n", symname); - symbol = dlsym(handle, symname); - dlerr = dlerror(); - if (dlerr != NULL) fprintf(stderr, "dlsym() error: %s\n", dlerr); - - printf("closing library [%s]\n", libname); - dlclose(handle); - dlerr = dlerror(); - if (dlerr != NULL) fprintf(stderr, "dlclose() error: %s\n", dlerr); - else printf("successfully opened symbol\n"); - } - - if (libname != NULL) free(libname); - if (symname != NULL) free(symname); - return 0; -} +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +extern char *optarg; +extern int optind, opterr, optopt; + +static struct option long_options[] = { + {"library", required_argument, 0, 'l'}, + {"symbol", required_argument, 0, 's'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0}, +}; + +/* This array must parallel long_options[] */ +static const char *descriptions[] = { + "specify a library path to look up symbol", + "specify symbol to look up", + "print this help screen", +}; + +void print_help(const char *name) { + fprintf(stdout, + "invokation:\n" + "\t%s [-l ] -s \n" + "\t%s -h\n\n", name, name); + fprintf(stdout, "options:\n"); + struct option *opt = long_options; + const char **desc = descriptions; + while (opt->name) { + fprintf(stdout, "\t-%c/--%s%s: %s\n", + opt->val, + opt->name, + (opt->has_arg ? " (argument)" : ""), + *desc); + opt++; + desc++; + } +} + +int get_options(int argc, char **argv, char **lib, char **sym) +{ + int c; + + *lib = 0; + *sym = 0; + + while (1) { + /* getopt_long stores the option index here. */ + int option_index = 0; + + c = getopt_long (argc, argv, + "l:s:h", + long_options, + &option_index); + /* Detect the end of the options. */ + if (c == -1) break; + + switch (c) { + case 'l': + *lib = strdup(optarg); + break; + case 's': + *sym = strdup(optarg); + break; + case 'h': print_help(argv[0]); exit(EXIT_FAILURE); break; + case '?': + /* getopt_long already printed an error message. */ + break; + default: + fprintf(stderr, "Unknown option"); + exit(EXIT_FAILURE); + } + } + + return optind; +} + +int main(int argc, char **argv) +{ + char *libname, *symname, *prog = *argv; + + get_options(argc, argv, &libname, &symname); + + if (symname == NULL) { + fprintf(stderr, "You must specify a symbol!\n"); + print_help(prog); + exit(EXIT_FAILURE); + } + + { + const char *dlerr; + void *handle, *symbol; + + printf("opening library [%s]\n", libname); + dlerr = dlerror(); + handle = libname ? dlopen(libname, RTLD_NOW) : RTLD_DEFAULT; + dlerr = dlerror(); + if (dlerr != NULL) fprintf(stderr, "dlopen() error: %s\n", dlerr); + + printf("opening symbol [%s]\n", symname); + symbol = dlsym(handle, symname); + dlerr = dlerror(); + if (dlerr != NULL) fprintf(stderr, "dlsym() error: %s\n", dlerr); + + printf("closing library [%s]\n", libname); + dlclose(handle); + dlerr = dlerror(); + if (dlerr != NULL) fprintf(stderr, "dlclose() error: %s\n", dlerr); + else printf("successfully opened symbol\n"); + } + + if (libname != NULL) free(libname); + if (symname != NULL) free(symname); + return 0; +} diff --git a/linker/arch/arm/begin.S b/linker/arch/arm/begin.S index f9b3bace4..e2599027a 100644 --- a/linker/arch/arm/begin.S +++ b/linker/arch/arm/begin.S @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + .text .align 4 .type _start,#function diff --git a/linker/arch/x86/begin.S b/linker/arch/x86/begin.S index 8f468e6b6..d8a39ca32 100644 --- a/linker/arch/x86/begin.S +++ b/linker/arch/x86/begin.S @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + .text .align 4 .type _start, @function @@ -21,3 +49,4 @@ _start: __CTOR_LIST__: .long -1 + diff --git a/linker/debugger.c b/linker/debugger.c index 542cf8dab..5bb065c6c 100644 --- a/linker/debugger.c +++ b/linker/debugger.c @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #include #include #include @@ -21,7 +49,7 @@ void debugger_signal_handler(int n) signal(SIGUSR1, SIG_IGN); tid = gettid(); - s = socket_local_client("android:debuggerd", + s = socket_local_client("android:debuggerd", ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM); if(s >= 0) { @@ -49,4 +77,5 @@ void debugger_init() signal(SIGFPE, debugger_signal_handler); signal(SIGSEGV, debugger_signal_handler); signal(SIGSTKFLT, debugger_signal_handler); + signal(SIGPIPE, debugger_signal_handler); } diff --git a/linker/linker.c b/linker/linker.c index 8f15f6277..572f1d622 100644 --- a/linker/linker.c +++ b/linker/linker.c @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #include #include diff --git a/linker/linker.h b/linker/linker.h index ab2c38566..3ad510408 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #ifndef _LINKER_H_ #define _LINKER_H_ diff --git a/linker/linker_debug.h b/linker/linker_debug.h index fa2a1a1b1..6e396fd6c 100644 --- a/linker/linker_debug.h +++ b/linker/linker_debug.h @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #ifndef _LINKER_DEBUG_H_ #define _LINKER_DEBUG_H_ diff --git a/linker/rt.c b/linker/rt.c index d0802ceab..30d5a4877 100644 --- a/linker/rt.c +++ b/linker/rt.c @@ -1,3 +1,31 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + /* * This function is an empty stub where GDB locates a breakpoint to get notified * about linker activity. From 2489551343aa89fc539f369f7689c941b78c08d1 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Fri, 13 Feb 2009 12:57:48 -0800 Subject: [PATCH 2/8] auto import from //branches/cupcake/...@131421 --- libc/bionic/logd_write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/bionic/logd_write.c b/libc/bionic/logd_write.c index 6de646d50..7c3608bf7 100644 --- a/libc/bionic/logd_write.c +++ b/libc/bionic/logd_write.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include "logd.h" #include From 6f04a0f4c72acff80dad04828cb69ef67fa609d1 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 19 Feb 2009 10:57:29 -0800 Subject: [PATCH 3/8] auto import from //branches/cupcake/...@132276 --- libc/SYSCALLS.TXT | 16 - libc/arch-arm/syscalls.mk | 11 - libc/arch-arm/syscalls/msgctl.S | 19 - libc/arch-arm/syscalls/msgget.S | 19 - libc/arch-arm/syscalls/msgrcv.S | 21 - libc/arch-arm/syscalls/msgsnd.S | 19 - libc/arch-arm/syscalls/semctl.S | 19 - libc/arch-arm/syscalls/semget.S | 19 - libc/arch-arm/syscalls/semop.S | 19 - libc/arch-arm/syscalls/shmat.S | 19 - libc/arch-arm/syscalls/shmctl.S | 19 - libc/arch-arm/syscalls/shmdt.S | 19 - libc/arch-arm/syscalls/shmget.S | 19 - libc/bionic/malloc_leak.c | 26 +- libc/bionic/pthread-timers.c | 8 +- libc/docs/OVERVIEW.TXT | 312 +++--- libc/docs/SYSV-IPC.TXT | 103 ++ libc/include/sys/linux-syscalls.h | 11 - libc/include/sys/linux-unistd.h | 11 - libc/include/sys/msg.h | 43 - libc/include/sys/shm.h | 43 - libc/kernel/common/linux/msm_audio.h | 4 + libc/netbsd/gethnamaddr.c | 25 - libc/netbsd/resolv/res_cache.c | 1502 +++++++++++++++++++++----- libc/netbsd/resolv/res_send.c | 32 + libc/netbsd/resolv/res_state.c | 15 +- libc/{bionic => private}/logd.h | 0 libc/private/resolv_cache.h | 48 +- linker/linker.c | 18 +- 29 files changed, 1594 insertions(+), 845 deletions(-) delete mode 100644 libc/arch-arm/syscalls/msgctl.S delete mode 100644 libc/arch-arm/syscalls/msgget.S delete mode 100644 libc/arch-arm/syscalls/msgrcv.S delete mode 100644 libc/arch-arm/syscalls/msgsnd.S delete mode 100644 libc/arch-arm/syscalls/semctl.S delete mode 100644 libc/arch-arm/syscalls/semget.S delete mode 100644 libc/arch-arm/syscalls/semop.S delete mode 100644 libc/arch-arm/syscalls/shmat.S delete mode 100644 libc/arch-arm/syscalls/shmctl.S delete mode 100644 libc/arch-arm/syscalls/shmdt.S delete mode 100644 libc/arch-arm/syscalls/shmget.S create mode 100644 libc/docs/SYSV-IPC.TXT delete mode 100644 libc/include/sys/msg.h delete mode 100644 libc/include/sys/shm.h rename libc/{bionic => private}/logd.h (100%) diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 0445fc93b..1ef06d261 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -216,22 +216,6 @@ int sched_get_priority_max(int policy) 159 int sched_get_priority_min(int policy) 160 int sched_rr_get_interval(pid_t pid, struct timespec *interval) 161 -# system-V inter-process communication -# TODO: implement x86 stubs for these functions when needed (when ?) -# -int semctl(int semid, int semnum, int cmd, ...) 300,-1 -int semget(key_t key, int nsems, int semflg) 299,-1 -int semop(int semid, struct sembuf* sops, size_t nsops) 298,-1 -void* shmat(int shmid, const void* shmaddr, int shmflg) 305,-1 -int shmctl(int shmid, int cmd, struct shmid_ds* buf) 308,-1 -int shmdt(const void* shmaddr) 306,-1 -int shmget(key_t key, size_t size, int shmflg) 307,-1 -int msgctl(int msqid, int cmd, struct msqid_ds *buf) 304,-1 -int msgget(key_t key, int msgflg) 303,-1 -int msgrcv(int msqid, void* msgp, size_t msgsz, long int msgtyp, int msgflg) 302,-1 -int msgsnd(int msqid, const void* msgp, size_t msgsz, int msgflg) 301,-1 - - # other int uname(struct utsname *) 122 pid_t __wait4:wait4(pid_t pid, int *status, int options, struct rusage *rusage) 114 diff --git a/libc/arch-arm/syscalls.mk b/libc/arch-arm/syscalls.mk index a140a59c5..706cb0c9b 100644 --- a/libc/arch-arm/syscalls.mk +++ b/libc/arch-arm/syscalls.mk @@ -150,17 +150,6 @@ syscall_src += arch-arm/syscalls/sched_getparam.S syscall_src += arch-arm/syscalls/sched_get_priority_max.S syscall_src += arch-arm/syscalls/sched_get_priority_min.S syscall_src += arch-arm/syscalls/sched_rr_get_interval.S -syscall_src += arch-arm/syscalls/semctl.S -syscall_src += arch-arm/syscalls/semget.S -syscall_src += arch-arm/syscalls/semop.S -syscall_src += arch-arm/syscalls/shmat.S -syscall_src += arch-arm/syscalls/shmctl.S -syscall_src += arch-arm/syscalls/shmdt.S -syscall_src += arch-arm/syscalls/shmget.S -syscall_src += arch-arm/syscalls/msgctl.S -syscall_src += arch-arm/syscalls/msgget.S -syscall_src += arch-arm/syscalls/msgrcv.S -syscall_src += arch-arm/syscalls/msgsnd.S syscall_src += arch-arm/syscalls/uname.S syscall_src += arch-arm/syscalls/__wait4.S syscall_src += arch-arm/syscalls/umask.S diff --git a/libc/arch-arm/syscalls/msgctl.S b/libc/arch-arm/syscalls/msgctl.S deleted file mode 100644 index 5c0bbf596..000000000 --- a/libc/arch-arm/syscalls/msgctl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type msgctl, #function - .globl msgctl - .align 4 - .fnstart - -msgctl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_msgctl - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/msgget.S b/libc/arch-arm/syscalls/msgget.S deleted file mode 100644 index ac1644002..000000000 --- a/libc/arch-arm/syscalls/msgget.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type msgget, #function - .globl msgget - .align 4 - .fnstart - -msgget: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_msgget - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/msgrcv.S b/libc/arch-arm/syscalls/msgrcv.S deleted file mode 100644 index 8db4125c1..000000000 --- a/libc/arch-arm/syscalls/msgrcv.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type msgrcv, #function - .globl msgrcv - .align 4 - .fnstart - -msgrcv: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_msgrcv - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/msgsnd.S b/libc/arch-arm/syscalls/msgsnd.S deleted file mode 100644 index 02c92ec94..000000000 --- a/libc/arch-arm/syscalls/msgsnd.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type msgsnd, #function - .globl msgsnd - .align 4 - .fnstart - -msgsnd: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_msgsnd - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/semctl.S b/libc/arch-arm/syscalls/semctl.S deleted file mode 100644 index a50e4dc3e..000000000 --- a/libc/arch-arm/syscalls/semctl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type semctl, #function - .globl semctl - .align 4 - .fnstart - -semctl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_semctl - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/semget.S b/libc/arch-arm/syscalls/semget.S deleted file mode 100644 index aaabd379d..000000000 --- a/libc/arch-arm/syscalls/semget.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type semget, #function - .globl semget - .align 4 - .fnstart - -semget: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_semget - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/semop.S b/libc/arch-arm/syscalls/semop.S deleted file mode 100644 index 20ef68bba..000000000 --- a/libc/arch-arm/syscalls/semop.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type semop, #function - .globl semop - .align 4 - .fnstart - -semop: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_semop - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/shmat.S b/libc/arch-arm/syscalls/shmat.S deleted file mode 100644 index 8b63bf02e..000000000 --- a/libc/arch-arm/syscalls/shmat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type shmat, #function - .globl shmat - .align 4 - .fnstart - -shmat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_shmat - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/shmctl.S b/libc/arch-arm/syscalls/shmctl.S deleted file mode 100644 index a29caa654..000000000 --- a/libc/arch-arm/syscalls/shmctl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type shmctl, #function - .globl shmctl - .align 4 - .fnstart - -shmctl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_shmctl - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/shmdt.S b/libc/arch-arm/syscalls/shmdt.S deleted file mode 100644 index bee707e4f..000000000 --- a/libc/arch-arm/syscalls/shmdt.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type shmdt, #function - .globl shmdt - .align 4 - .fnstart - -shmdt: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_shmdt - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/shmget.S b/libc/arch-arm/syscalls/shmget.S deleted file mode 100644 index be307049e..000000000 --- a/libc/arch-arm/syscalls/shmget.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type shmget, #function - .globl shmget - .align 4 - .fnstart - -shmget: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_shmget - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/bionic/malloc_leak.c b/libc/bionic/malloc_leak.c index 5ddc91329..a0aa2ae64 100644 --- a/libc/bionic/malloc_leak.c +++ b/libc/bionic/malloc_leak.c @@ -58,6 +58,8 @@ #define SIZE_FLAG_ZYGOTE_CHILD (1<<31) #define SIZE_FLAG_MASK (SIZE_FLAG_ZYGOTE_CHILD) +#define MAX_SIZE_T (~(size_t)0) + /* * In a VM process, this is set to 1 after fork()ing out of zygote. */ @@ -608,8 +610,16 @@ void chk_free(void* mem) void* chk_calloc(size_t n_elements, size_t elem_size) { - size_t size = n_elements * elem_size; - void* ptr = chk_malloc(size); + size_t size; + void* ptr; + + /* Fail on overflow - just to be safe even though this code runs only + * within the debugging C library, not the production one */ + if (n_elements && MAX_SIZE_T / n_elements < elem_size) { + return NULL; + } + size = n_elements * elem_size; + ptr = chk_malloc(size); if (ptr != NULL) { memset(ptr, 0, size); } @@ -763,8 +773,16 @@ void leak_free(void* mem) void* leak_calloc(size_t n_elements, size_t elem_size) { - size_t size = n_elements * elem_size; - void* ptr = leak_malloc(size); + size_t size; + void* ptr; + + /* Fail on overflow - just to be safe even though this code runs only + * within the debugging C library, not the production one */ + if (n_elements && MAX_SIZE_T / n_elements < elem_size) { + return NULL; + } + size = n_elements * elem_size; + ptr = leak_malloc(size); if (ptr != NULL) { memset(ptr, 0, size); } diff --git a/libc/bionic/pthread-timers.c b/libc/bionic/pthread-timers.c index b8f748801..818b47dd8 100644 --- a/libc/bionic/pthread-timers.c +++ b/libc/bionic/pthread-timers.c @@ -469,7 +469,7 @@ timer_settime( timer_t id, } if ( __likely(!TIMER_ID_IS_WRAPPED(id)) ) { - return __timer_gettime( id, ospec ); + return __timer_settime( id, flags, spec, ospec ); } else { thr_timer_t* timer = thr_timer_from_id(id); struct timespec expires, now; @@ -560,11 +560,11 @@ timer_thread_start( void* _arg ) if (timespec_cmp( &expires, &now ) > 0) { /* cool, there was no overrun, so compute the - * relative timeout as 'now - expires', then wait + * relative timeout as 'expires - now', then wait */ int ret; - struct timespec diff = now; - timespec_sub( &diff, &expires ); + struct timespec diff = expires; + timespec_sub( &diff, &now ); ret = __pthread_cond_timedwait_relative( &timer->cond, &timer->mutex, &diff); diff --git a/libc/docs/OVERVIEW.TXT b/libc/docs/OVERVIEW.TXT index 4d40df6fb..4c153b152 100644 --- a/libc/docs/OVERVIEW.TXT +++ b/libc/docs/OVERVIEW.TXT @@ -7,89 +7,93 @@ Core Philosophy: The core idea behind Bionic's design is: KEEP IT REALLY SIMPLE. - This implies that the C library should only provide lightweight wrappers around kernel - facilities and not try to be too smart to deal with edge cases. + This implies that the C library should only provide lightweight wrappers + around kernel facilities and not try to be too smart to deal with edge cases. - The name "Bionic" comes from the fact that it is part-BSD and part-Linux: its source - code consists in a mix of BSD C library pieces with custom Linux-specific bits used - to deal with threads, processes, signals and a few others things. + The name "Bionic" comes from the fact that it is part-BSD and part-Linux: + its source code consists in a mix of BSD C library pieces with custom + Linux-specific bits used to deal with threads, processes, signals and a few + others things. - All original BSD pieces carry the BSD copyright disclaimer. Bionic-specific bits - carry the Android Open Source Project copyright disclaimer. And everything is released - under the BSD license. + All original BSD pieces carry the BSD copyright disclaimer. Bionic-specific + bits carry the Android Open Source Project copyright disclaimer. And + everything is released under the BSD license. Architectures: - Bionic currently supports the ARM and x86 instruction sets. In theory, it should be - possible to support more, but this may require a little work (e.g. adding system - call IDs to SYSCALLS.TXT, described below, or modifying the dynamic linker). + Bionic currently supports the ARM and x86 instruction sets. In theory, it + should be possible to support more, but this may require a little work (e.g. + adding system call IDs to SYSCALLS.TXT, described below, or modifying the + dynamic linker). - The ARM-specific code is under arch-arm/ and the x86-specific one is under arch-x86/ + The ARM-specific code is under arch-arm/ and the x86-specific one is under + arch-x86/ - Note that the x86 version is only meant to run on an x86 Android device. We make - absolutely no claim that you could build and use Bionic on a stock x86 Linux - distribution (though that would be cool, so patches are welcomed :-)) + Note that the x86 version is only meant to run on an x86 Android device. We + make absolutely no claim that you could build and use Bionic on a stock x86 + Linux distribution (though that would be cool, so patches are welcomed :-)) Syscall stubs: Each system call function is implemented by a tiny assembler source fragment - (called a "syscall stub"), which is generated automatically by tools/gensyscalls.py - which reads the SYSCALLS.TXT file for input. + (called a "syscall stub"), which is generated automatically by + tools/gensyscalls.py which reads the SYSCALLS.TXT file for input. SYSCALLS.TXT contains the list of all syscall stubs to generate, along with - the corresponding syscall numeric identifier (which may differ between ARM and x86), - and its signature + the corresponding syscall numeric identifier (which may differ between ARM + and x86), and its signature - If you modify this file, you may want to use tools/checksyscalls.py which checks - its content against official Linux kernel header files, and will report errors when - invalid syscall ids are used. + If you modify this file, you may want to use tools/checksyscalls.py which + checks its content against official Linux kernel header files, and will + report errors when invalid syscall ids are used. - Sometimes, the C library function is really a wrapper that calls the corresponding - syscall with another name. For example, the exit() function is provided by the C - library and calls the _exit() syscall stub. + Sometimes, the C library function is really a wrapper that calls the + corresponding syscall with another name. For example, the exit() function + is provided by the C library and calls the _exit() syscall stub. See SYSCALLS.TXT for documentation and details. time_t: - time_t is 32-bit as defined by the kernel on 32-bit CPUs. A 64-bit version would - be preferrable to avoid the Y2038 bug, but the kernel maintainers consider that - this is not needed at the moment. + time_t is 32-bit as defined by the kernel on 32-bit CPUs. A 64-bit version + would be preferrable to avoid the Y2038 bug, but the kernel maintainers + consider that this is not needed at the moment. - Instead, Bionic provides a header that defines a time64_t type, and - related functions like mktime64(), localtime64(), etc... + Instead, Bionic provides a header that defines a time64_t type, + and related functions like mktime64(), localtime64(), etc... Timezone management: - The name of the current timezone is taken from the TZ environment variable, if defined. - Otherwise, the system property named 'persist.sys.timezone' is checked instead. + The name of the current timezone is taken from the TZ environment variable, + if defined. Otherwise, the system property named 'persist.sys.timezone' is + checked instead. The zoneinfo timezone database and index files are located under directory - /system/usr/share/zoneinfo, instead of the more Posix path of /usr/share/zoneinfo + /system/usr/share/zoneinfo, instead of the more Posix-compliant path of + /usr/share/zoneinfo off_t: - For similar reasons, off_t is 32-bit. We define loff_t as the 64-bit variant due - to BSD inheritance, but off64_t should be available as a typedef to ease porting of - current Linux-specific code. - + For similar reasons, off_t is 32-bit. We define loff_t as the 64-bit variant + due to BSD inheritance, but off64_t should be available as a typedef to ease + porting of current Linux-specific code. Linux kernel headers: - Bionic comes with its own set of "clean" Linux kernel headers to allow user-space - code to use kernel-specific declarations (e.g. IOCTLs, structure declarations, - constants, etc...). They are located in: + Bionic comes with its own set of "clean" Linux kernel headers to allow + user-space code to use kernel-specific declarations (e.g. IOCTLs, structure + declarations, constants, etc...). They are located in: ./kernel/common, ./kernel/arch-arm ./kernel/arch-x86 - These headers have been generated by a tool (kernel/tools/update-all.py) to only - include the public definitions from the original Linux kernel headers. + These headers have been generated by a tool (kernel/tools/update-all.py) to + only include the public definitions from the original Linux kernel headers. If you want to know why and how this is done, read kernel/README.TXT to get all the (gory) details. @@ -97,21 +101,23 @@ Linux kernel headers: PThread implementation: - Bionic's C library comes with its own pthread implementation bundled in. This is - different from other historical C libraries which: + Bionic's C library comes with its own pthread implementation bundled in. + This is different from other historical C libraries which: - place it in an external library (-lpthread) - play linker tricks with weak symbols at dynamic link time - The support for real-time features (a.k.a. -lrt) is also bundled in the C library. + The support for real-time features (a.k.a. -lrt) is also bundled in the + C library. - The implementation is based on futexes and strives to provide *very* short code paths - for common operations. Notable features are the following: + The implementation is based on futexes and strives to provide *very* short + code paths for common operations. Notable features are the following: - pthread_mutex_t, pthread_cond_t are only 4 bytes each. - - Normal, recursive and error-check mutexes are supported, and the code path - is heavily optimized for the normal case, which is used most of the time. + - Normal, recursive and error-check mutexes are supported, and the code + path is heavily optimized for the normal case, which is used most of + the time. - Process-shared mutexes and condition variables are not supported. Their implementation requires far more complexity and was absolutely @@ -123,8 +129,9 @@ PThread implementation: paths slightly slower though). - There is currently no support for read/write locks, priority-ceiling in - mutexes and other more advanced features. Again, the main idea being that - this was not needed for Android at all but could be added in the future. + mutexes and other more advanced features. Again, the main idea being + that this was not needed for Android at all but could be added in the + future. pthread_cancel(): @@ -134,13 +141,13 @@ pthread_cancel(): Consider that: - A proper implementation must insert pthread cancellation checks in a lot - of different places of the C library. And conformance is very difficult to - test properly. + of different places of the C library. And conformance is very difficult + to test properly. - - A proper implementation must also clean up resources, like releasing memory, - or unlocking mutexes, properly if the cancellation happens in a complex - function (e.g. inside gethostbyname() or fprintf() + complex formatting - rules). This tends to slow down the path of many functions. + - A proper implementation must also clean up resources, like releasing + memory, or unlocking mutexes, properly if the cancellation happens in a + complex function (e.g. inside gethostbyname() or fprintf() + complex + formatting rules). This tends to slow down the path of many functions. - pthread cancellation cannot stop all threads: e.g. it can't do anything against an infinite loop @@ -151,18 +158,20 @@ pthread_cancel(): All of this is contrary to the Bionic design goals. If your code depends on thread cancellation, please consider alternatives. - Note however that Bionic does implement pthread_cleanup_push() and pthread_cleanup_pop(), - which can be used to handle cleanups that happen when a thread voluntarily exits - through pthread_exit() or returning from its main function. + Note however that Bionic does implement pthread_cleanup_push() and + pthread_cleanup_pop(), which can be used to handle cleanups that happen when + a thread voluntarily exits through pthread_exit() or returning from its + main function. pthread_once(): Do not call fork() within a callback provided to pthread_once(). Doing this - may result in a deadlock in the child process the next time it calls pthread_once(). + may result in a deadlock in the child process the next time it calls + pthread_once(). - Also, you can't throw a C++ Exception from the callback (see C++ Exception Support - below). + Also, you can't throw a C++ Exception from the callback (see C++ Exception + Support below). The current implementation of pthread_once() lacks the necessary support of multi-core-safe double-checked-locking (read and write barriers). @@ -170,27 +179,27 @@ pthread_once(): Thread-specific data - The thread-specific storage only provides for a bit less than 64 pthread_key_t - objects to each process. The implementation provides 64 real slots but also - uses about 5 of them (exact number may depend on implementation) for its - own use (e.g. two slots are pre-allocated by the C library to speed-up the - Android OpenGL sub-system). + The thread-specific storage only provides for a bit less than 64 + pthread_key_t objects to each process. The implementation provides 64 real + slots but also uses about 5 of them (exact number may depend on + implementation) for its own use (e.g. two slots are pre-allocated by the C + library to speed-up the Android OpenGL sub-system). Note that Posix mandates a minimum of 128 slots, but we do not claim to be Posix-compliant. - Except for the main thread, the TLS area is stored at the top of the stack. See - comments in bionic/libc/bionic/pthread.c for details. + Except for the main thread, the TLS area is stored at the top of the stack. + See comments in bionic/libc/bionic/pthread.c for details. - At the moment, thread-local storage defined through the __thread compiler keyword - is not supported by the Bionic C library and dynamic linker. + At the moment, thread-local storage defined through the __thread compiler + keyword is not supported by the Bionic C library and dynamic linker. Multi-core support At the moment, Bionic does not provide or use read/write memory barriers. - This means that using it on certain multi-core systems might not be supported, - depending on its exact CPU architecture. + This means that using it on certain multi-core systems might not be + supported, depending on its exact CPU architecture. Android-specific features: @@ -201,67 +210,69 @@ Android-specific features: Android provides a simple shared value/key space to all processes on the system. It stores a liberal number of 'properties', each of them being a - simple size-limited string that can be associated to a size-limited string - value. + simple size-limited string that can be associated to a size-limited + string value. - The header can be used to read system properties - and also defines the maximum size of keys and values. + The header can be used to read system + properties and also defines the maximum size of keys and values. - Android-specific user/group management: - There is no /etc/passwd or /etc/groups in Android. By design, it is meant to - be used by a single handset user. On the other hand, Android uses the Linux - user/group management features extensively to secure process permissions, - like access to various filesystem directories. + There is no /etc/passwd or /etc/groups in Android. By design, it is + meant to be used by a single handset user. On the other hand, Android + uses the Linux user/group management features extensively to secure + process permissions, like access to various filesystem directories. - In the Android scheme, each installed application gets its own uid_t/gid_t - starting from 10000; lower numerical ids are reserved for system daemons. + In the Android scheme, each installed application gets its own + uid_t/gid_t starting from 10000; lower numerical ids are reserved for + system daemons. - getpwnam() recognizes some hard-coded subsystems names (e.g. "radio") and - will translate them to their low-user-id values. It also recognizes "app_1234" - as the synthetic name of the application that was installed with uid 10000 + 1234, - which is 11234. getgrnam() works similarly + getpwnam() recognizes some hard-coded subsystems names (e.g. "radio") + and will translate them to their low-user-id values. It also recognizes + "app_1234" as the synthetic name of the application that was installed + with uid 10000 + 1234, which is 11234. getgrnam() works similarly - getgrouplist() will always return a single group for any user name, which is - the one passed as an input parameter. + getgrouplist() will always return a single group for any user name, + which is the one passed as an input parameter. - getgrgid() will similarly only return a structure that contains a single-element - members list, corresponding to the user with the same numerical value than the - group. + getgrgid() will similarly only return a structure that contains a + single-element members list, corresponding to the user with the same + numerical value than the group. See bionic/libc/bionic/stubs.c for more details. - getservent() - There is no /etc/services on Android. Instead the C library embeds a constant - list of services in its executable, which is parsed on demand by the various - functions that depend on it. See bionic/libc/netbsd/net/getservent.c and + There is no /etc/services on Android. Instead the C library embeds a + constant list of services in its executable, which is parsed on demand + by the various functions that depend on it. See + bionic/libc/netbsd/net/getservent.c and bionic/libc/netbsd/net/services.h - The list of services defined internally might change liberally in the future. - This feature is mostly historically and is very rarely used. + The list of services defined internally might change liberally in the + future. This feature is mostly historically and is very rarely used. - The getservent() returns thread-local data. getservbyport() and getservbyname() - are also implemented in a similar fashion. + The getservent() returns thread-local data. getservbyport() and + getservbyname() are also implemented in a similar fashion. - getprotoent() - There is no /etc/protocol on Android. Bionic does not currently implement - getprotoent() and related functions. If we add it, it will likely be done - in a way similar to getservent() + There is no /etc/protocol on Android. Bionic does not currently + implement getprotoent() and related functions. If added, it will + likely be done in a way similar to getservent() DNS resolver: - Bionic uses a NetBSD-derived resolver library which has been modified in the following - ways: + Bionic uses a NetBSD-derived resolver library which has been modified in + the following ways: - don't implement the name-server-switch feature (a.k.a. ) - read /system/etc/resolv.conf instead of /etc/resolv.conf - read the list of servers from system properties. the code looks for - 'net.dns1', 'net.dns2', etc.. Each property should contain the IP address - of a DNS server. + 'net.dns1', 'net.dns2', etc.. Each property should contain the IP + address of a DNS server. these properties are set/modified by other parts of the Android system (e.g. the dhcpd daemon). @@ -278,9 +289,9 @@ DNS resolver: - get rid of *many* unfortunate thread-safety issues in the original code - Bionic does *not* expose implementation details of its DNS resolver; the content - of is intentionally blank. The resolver implementation might - change completely in the future. + Bionic does *not* expose implementation details of its DNS resolver; the + content of is intentionally blank. The resolver + implementation might change completely in the future. PThread Real-Time Timers: @@ -294,8 +305,8 @@ PThread Real-Time Timers: timers with compatible properties are used. This means that if your code uses a lot of SIGEV_THREAD timers, your program - may consume a lot of memory. However, if your program needs many of these timers, - it'd better handle timeout events directly instead. + may consume a lot of memory. However, if your program needs many of these + timers, it'd better handle timeout events directly instead. Other timers (e.g. SIGEV_SIGNAL) are handled by the kernel and use much less system resources. @@ -303,58 +314,71 @@ PThread Real-Time Timers: Binary Compatibility: - Bionic is *not* in any way binary-compatible with the GNU C Library, ucLibc or any - known Linux C library. This means several things: + Bionic is *not* in any way binary-compatible with the GNU C Library, ucLibc + or any known Linux C library. This means several things: - - You cannot expect to build something against the GNU C Library headers and have - it dynamically link properly to Bionic later. + - You cannot expect to build something against the GNU C Library headers and + have it dynamically link properly to Bionic later. - - You should *really* use the Android toolchain to build your program against Bionic. - The toolchain deals with many important details that are crucial to get something - working properly. + - You should *really* use the Android toolchain to build your program against + Bionic. The toolchain deals with many important details that are crucial + to get something working properly. - Failure to do so will usually result in the inability to run or link your program, - or even runtime crashes. Several random web pages on the Internet describe how you - can succesfully write a "hello-world" program with the ARM GNU toolchain. These - examples usually work by chance, if anything else, and you should not follow these - instructions unless you want to waste a lot of your time in the process. + Failure to do so will usually result in the inability to run or link your + program, or even runtime crashes. Several random web pages on the Internet + describe how you can succesfully write a "hello-world" program with the + ARM GNU toolchain. These examples usually work by chance, if anything else, + and you should not follow these instructions unless you want to waste a lot + of your time in the process. + + Note however that you *can* generate a binary that is built against the + GNU C Library headers and then statically linked to it. The corresponding + executable should be able to run (if it doesn't use dlopen()/dlsym()) - Note however that you *can* generate a binary that is built against the GNU C Library - headers and then statically linked to it. The corresponding executable should be able - to run (if it doesn't use dlopen()/dlsym()) Dynamic Linker: - Bionic comes with its own dynamic linker (just like ld.so on Linux really comes from - GLibc). This linker does not support all the relocations generated by other GCC ARM - toolchains. + Bionic comes with its own dynamic linker (just like ld.so on Linux really + comes from GLibc). This linker does not support all the relocations + generated by other GCC ARM toolchains. + C++ Exceptions Support: - At the moment, Bionic doesn't support C++ exceptions, what this really means is the - following: + At the moment, Bionic doesn't support C++ exceptions, what this really means + is the following: - If pthread_once() is called with a C++ callback that throws an exception, - then the C library will keep the corresponding pthread_once_t mutex locked. - Any further call to pthread_once() will result in a deadlock. + then the C library will keep the corresponding pthread_once_t mutex + locked. Any further call to pthread_once() will result in a deadlock. - A proper implementation should be able to register a C++ exception cleanup - handler before the callback to properly unlock the pthread_once_t. Unfortunately - this requires tricky assembly code that is highly dependent on the compiler. + A proper implementation should be able to register a C++ exception + cleanup handler before the callback to properly unlock the + pthread_once_t. Unfortunately this requires tricky assembly code that + is highly dependent on the compiler. This feature is not planned to be supported anytime soon. - - The same problem may arise if you throw an exception within a callback called - from the C library. Fortunately, these cases are very rare in the real-world, - but any callback you provide to the C library should *not* throw an exception. + - The same problem may arise if you throw an exception within a callback + called from the C library. Fortunately, these cases are very rare in the + real-world, but any callback you provide to the C library should *not* + throw an exception. - - Bionic lacks a few support functions to have exception support work properly. + - Bionic lacks a few support functions to have exception support work + properly. + +System V IPCs: + + Bionic intentionally does not provide support for System-V IPCs mechanisms, + like the ones provided by semget(), shmget(), msgget(). The reason for this + is to avoid denial-of-service. For a detailed rationale about this, please + read the file docs/SYSV-IPCS.TXT. Include Paths: - The Android build system should automatically provide the necessary include paths - required to build against the C library headers. However, if you want to do that - yourself, you will need to add: + The Android build system should automatically provide the necessary include + paths required to build against the C library headers. However, if you want + to do that yourself, you will need to add: libc/arch-$ARCH/include libc/include diff --git a/libc/docs/SYSV-IPC.TXT b/libc/docs/SYSV-IPC.TXT new file mode 100644 index 000000000..5a3eef0d7 --- /dev/null +++ b/libc/docs/SYSV-IPC.TXT @@ -0,0 +1,103 @@ +Android does not support System V IPCs, i.e. the facilities provided by the +following standard Posix headers: + + /* SysV semaphores */ + /* SysV shared memory segments */ + /* SysV message queues */ + /* General IPC definitions */ + +The reason for this is due to the fact that, by design, they lead to global +kernel resource leakage. + +For example, there is no way to automatically release a SysV semaphore +allocated in the kernel when: + +- a buggy or malicious process exits +- a non-buggy and non-malicious process crashes or is explicitely killed. + +Killing processes automatically to make room for new ones is an +important part of Android's application lifecycle implementation. This means +that, even assuming only non-buggy and non-malicious code, it is very likely +that over time, the kernel global tables used to implement SysV IPCs will fill +up. + +At that point, strange failures are likely to occur and prevent programs that +use them to run properly until the next reboot of the system. + +And we can't ignore potential malicious applications. As a proof of concept +here is a simple exploit that you can run on a standard Linux box today: + +--------------- cut here ------------------------ +#include +#include +#include +#include +#include +#include + +#define NUM_SEMAPHORES 32 +#define MAX_FAILS 10 + +int main(void) +{ + int counter = 0; + int fails = 0; + + if (counter == IPC_PRIVATE) + counter++; + + printf( "%d (NUM_SEMAPHORES=%d)\n", counter, NUM_SEMAPHORES); + + for (;;) { + int ret = fork(); + int status; + + if (ret < 0) { + perror("fork:"); + break; + } + if (ret == 0) { + /* in the child */ + ret = semget( (key_t)counter, NUM_SEMAPHORES, IPC_CREAT ); + if (ret < 0) { + return errno; + } + return 0; + } + else { + /* in the parent */ + ret = wait(&status); + if (ret < 0) { + perror("waitpid:"); + break; + } + if (status != 0) { + status = WEXITSTATUS(status); + fprintf(stderr, "child %d FAIL at counter=%d: %d\n", ret, + counter, status); + if (++fails >= MAX_FAILS) + break; + } + } + + counter++; + if ((counter % 1000) == 0) { + printf("%d\n", counter); + } + if (counter == IPC_PRIVATE) + counter++; + } + return 0; +} +--------------- cut here ------------------------ + +If you run it on a typical Linux distribution today, you'll discover that it +will quickly fill up the kernel's table of unique key_t values, and that +strange things will happen in some parts of the system, but not all. + +(You can use the "ipcs -u" command to get a summary describing the kernel + tables and their allocations) + +For example, in our experience, anything program launched after that that +calls strerror() will simply crash. The USB sub-system starts spoutting weird +errors to the system console, etc... diff --git a/libc/include/sys/linux-syscalls.h b/libc/include/sys/linux-syscalls.h index bed00ce60..7772f1ec2 100644 --- a/libc/include/sys/linux-syscalls.h +++ b/libc/include/sys/linux-syscalls.h @@ -170,17 +170,6 @@ #define __NR_getsockopt (__NR_SYSCALL_BASE + 295) #define __NR_sendmsg (__NR_SYSCALL_BASE + 296) #define __NR_recvmsg (__NR_SYSCALL_BASE + 297) -#define __NR_semctl (__NR_SYSCALL_BASE + 300) -#define __NR_semget (__NR_SYSCALL_BASE + 299) -#define __NR_semop (__NR_SYSCALL_BASE + 298) -#define __NR_shmat (__NR_SYSCALL_BASE + 305) -#define __NR_shmctl (__NR_SYSCALL_BASE + 308) -#define __NR_shmdt (__NR_SYSCALL_BASE + 306) -#define __NR_shmget (__NR_SYSCALL_BASE + 307) -#define __NR_msgctl (__NR_SYSCALL_BASE + 304) -#define __NR_msgget (__NR_SYSCALL_BASE + 303) -#define __NR_msgrcv (__NR_SYSCALL_BASE + 302) -#define __NR_msgsnd (__NR_SYSCALL_BASE + 301) #define __NR_epoll_create (__NR_SYSCALL_BASE + 250) #define __NR_epoll_ctl (__NR_SYSCALL_BASE + 251) #define __NR_epoll_wait (__NR_SYSCALL_BASE + 252) diff --git a/libc/include/sys/linux-unistd.h b/libc/include/sys/linux-unistd.h index 8539c7b77..789271eef 100644 --- a/libc/include/sys/linux-unistd.h +++ b/libc/include/sys/linux-unistd.h @@ -179,17 +179,6 @@ int sched_getparam (pid_t pid, struct sched_param *param); int sched_get_priority_max (int policy); int sched_get_priority_min (int policy); int sched_rr_get_interval (pid_t pid, struct timespec *interval); -int semctl (int semid, int semnum, int cmd, ...); -int semget (key_t key, int nsems, int semflg); -int semop (int semid, struct sembuf* sops, size_t nsops); -void* shmat (int shmid, const void* shmaddr, int shmflg); -int shmctl (int shmid, int cmd, struct shmid_ds* buf); -int shmdt (const void* shmaddr); -int shmget (key_t key, size_t size, int shmflg); -int msgctl (int msqid, int cmd, struct msqid_ds *buf); -int msgget (key_t key, int msgflg); -int msgrcv (int msqid, void* msgp, size_t msgsz, long int msgtyp, int msgflg); -int msgsnd (int msqid, const void* msgp, size_t msgsz, int msgflg); int uname (struct utsname *); pid_t __wait4 (pid_t pid, int *status, int options, struct rusage *rusage); mode_t umask (mode_t); diff --git a/libc/include/sys/msg.h b/libc/include/sys/msg.h deleted file mode 100644 index dd1b527da..000000000 --- a/libc/include/sys/msg.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_MSG_H -#define _SYS_MSG_H - -#include -#include - -__BEGIN_DECLS - -extern int msgctl(int msqid, int cmd, struct msqid_ds *buf); -extern int msgget(key_t key, int msgflg); -extern int msgrcv(int msqid, void* msgp, size_t msgsz, long int msgtyp, int msgflg); -extern int msgsnd(int msqid, const void* msgp, size_t msgsz, int msgflg); - -__END_DECLS - -#endif /* _SYS_MSG_H */ diff --git a/libc/include/sys/shm.h b/libc/include/sys/shm.h deleted file mode 100644 index 495d33e4e..000000000 --- a/libc/include/sys/shm.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SHM_H -#define _SYS_SHM_H - -#include -#include - -__BEGIN_DECLS - -extern void* shmat(int shmid, const void* shmaddr, int shmflg); -extern int shmctl(int shmid, int cmd, struct shmid_ds* buf); -extern int shmdt(const void* shmaddr); -extern int shmget(key_t key, size_t size, int shmflg); - -__END_DECLS - -#endif /* _SYS_SHM_H */ diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h index 58dc6f3f9..9ac58aaea 100644 --- a/libc/kernel/common/linux/msm_audio.h +++ b/libc/kernel/common/linux/msm_audio.h @@ -29,6 +29,10 @@ #define AUDIO_SET_EQ _IOW(AUDIO_IOCTL_MAGIC, 8, unsigned) #define AUDIO_SET_RX_IIR _IOW(AUDIO_IOCTL_MAGIC, 9, unsigned) #define AUDIO_SET_VOLUME _IOW(AUDIO_IOCTL_MAGIC, 10, unsigned) +#define AUDIO_ENABLE_AUDPRE _IOW(AUDIO_IOCTL_MAGIC, 11, unsigned) +#define AUDIO_SET_AGC _IOW(AUDIO_IOCTL_MAGIC, 12, unsigned) +#define AUDIO_SET_NS _IOW(AUDIO_IOCTL_MAGIC, 13, unsigned) +#define AUDIO_SET_TX_IIR _IOW(AUDIO_IOCTL_MAGIC, 14, unsigned) struct msm_audio_config { uint32_t buffer_size; diff --git a/libc/netbsd/gethnamaddr.c b/libc/netbsd/gethnamaddr.c index e6f919ec2..1c219b2a2 100644 --- a/libc/netbsd/gethnamaddr.c +++ b/libc/netbsd/gethnamaddr.c @@ -626,37 +626,12 @@ gethostbyname_internal(const char *name, int af, res_state res) break; } -#ifdef ANDROID_CHANGES - cache = __get_res_cache(); - if (cache != NULL) { - hp = _resolv_cache_lookup( cache, name, af ); - if (hp == _RESOLV_HOSTENT_NONE) { - h_errno = HOST_NOT_FOUND; - return NULL; - } - if (hp != NULL) { - h_errno = NETDB_SUCCESS; - return hp; - } - } -#endif - hp = NULL; h_errno = NETDB_INTERNAL; if (nsdispatch(&hp, dtab, NSDB_HOSTS, "gethostbyname", default_dns_files, name, strlen(name), af) != NS_SUCCESS) { -#ifdef ANDROID_CHANGES - /* cache negative DNS entry */ - if (h_errno == HOST_NOT_FOUND && cache != NULL) - _resolv_cache_add( cache, name, af, _RESOLV_HOSTENT_NONE ); -#endif return NULL; } -#ifdef ANDROID_CHANGES - if (cache != NULL) { - _resolv_cache_add( cache, name, af, hp ); - } -#endif h_errno = NETDB_SUCCESS; return hp; } diff --git a/libc/netbsd/resolv/res_cache.c b/libc/netbsd/resolv/res_cache.c index 210dfdd72..2c912de41 100644 --- a/libc/netbsd/resolv/res_cache.c +++ b/libc/netbsd/resolv/res_cache.c @@ -28,30 +28,104 @@ #include "resolv_cache.h" #include +#include #include #include "pthread.h" -/* this code implements a small DNS resolver cache for all gethostbyname* functions +/* This code implements a small and *simple* DNS resolver cache. * - * the cache is shared between all threads of the current process, but the result of - * a succesful lookup is always copied to a thread-local variable to honor the persistence - * rules of the gethostbyname*() APIs. + * It is only used to cache DNS answers for a maximum of CONFIG_SECONDS seconds + * in order to reduce DNS traffic. It is not supposed to be a full DNS cache, + * since we plan to implement that in the future in a dedicated process running + * on the system. + * + * Note that its design is kept simple very intentionally, i.e.: + * + * - it takes raw DNS query packet data as input, and returns raw DNS + * answer packet data as output + * + * (this means that two similar queries that encode the DNS name + * differently will be treated distinctly). + * + * - the TTLs of answer RRs are ignored. our DNS resolver library does not use + * them anyway, but it means that records with a TTL smaller than + * CONFIG_SECONDS will be kept in the cache anyway. + * + * this is bad, but we absolutely want to avoid parsing the answer packets + * (and should be solved by the later full DNS cache process). + * + * - the implementation is just a (query-data) => (answer-data) hash table + * with a trivial least-recently-used expiration policy. + * + * Doing this keeps the code simple and avoids to deal with a lot of things + * that a full DNS cache is expected to do. + * + * The API is also very simple: + * + * - the client calls _resolv_cache_get() to obtain a handle to the cache. + * this will initialize the cache on first usage. the result can be NULL + * if the cache is disabled. + * + * - the client calls _resolv_cache_lookup() before performing a query + * + * if the function returns RESOLV_CACHE_FOUND, a copy of the answer data + * has been copied into the client-provided answer buffer. + * + * if the function returns RESOLV_CACHE_NOTFOUND, the client should perform + * a request normally, *then* call _resolv_cache_add() to add the received + * answer to the cache. + * + * if the function returns RESOLV_CACHE_UNSUPPORTED, the client should + * perform a request normally, and *not* call _resolv_cache_add() + * + * note that RESOLV_CACHE_UNSUPPORTED is also returned if the answer buffer + * is too short to accomodate the cached result. + * + * - when network settings change, the cache must be flushed since the list + * of DNS servers probably changed. this is done by calling + * _resolv_cache_reset() + * + * the parameter to this function must be an ever-increasing generation + * number corresponding to the current network settings state. + * + * This is done because several threads could detect the same network + * settings change (but at different times) and will all end up calling the + * same function. Comparing with the last used generation number ensures + * that the cache is only flushed once per network change. */ -/* the name of an environment variable that will be checked the first time this code is called - * if its value is "0", then the resolver cache is disabled. +/* the name of an environment variable that will be checked the first time + * this code is called if its value is "0", then the resolver cache is + * disabled. */ #define CONFIG_ENV "BIONIC_DNSCACHE" -/* entries older than CONFIG_SECONDS seconds are always discarded. otherwise we could keep - * stale addresses in the cache and be oblivious to DNS server changes +/* entries older than CONFIG_SECONDS seconds are always discarded. */ #define CONFIG_SECONDS (60*10) /* 10 minutes */ -/* maximum number of entries kept in the cache. be frugal, this is the C library - * this MUST BE A POWER OF 2 +/* maximum number of entries kept in the cache. This value has been + * determined by browsing through various sites and counting the number + * of corresponding requests. Keep in mind that our framework is currently + * performing two requests per name lookup (one for IPv4, the other for IPv6) + * + * www.google.com 4 + * www.ysearch.com 6 + * www.amazon.com 8 + * www.nytimes.com 22 + * www.espn.com 28 + * www.msn.com 28 + * www.lemonde.fr 35 + * + * (determined in 2009-2-17 from Paris, France, results may vary depending + * on location) + * + * most high-level websites use lots of media/ad servers with different names + * but these are generally reused when browsing through the site. + * + * As such, a valud of 64 should be relatively conformtable at the moment. */ -#define CONFIG_MAX_ENTRIES 128 +#define CONFIG_MAX_ENTRIES 64 /****************************************************************************/ /****************************************************************************/ @@ -61,42 +135,204 @@ /****************************************************************************/ /****************************************************************************/ -#define DEBUG 0 +/* set to 1 to debug cache operations */ +#define DEBUG 0 + +/* set to 1 to debug query data */ +#define DEBUG_DATA 0 #if DEBUG -#include -#include -#include +# include +# define XLOG(...) \ + __libc_android_log_print(ANDROID_LOG_DEBUG,"libc",__VA_ARGS__) + #include -static void -xlog( const char* fmt, ... ) +#include + +/** BOUNDED BUFFER FORMATTING + **/ + +/* technical note: + * + * the following debugging routines are used to append data to a bounded + * buffer they take two parameters that are: + * + * - p : a pointer to the current cursor position in the buffer + * this value is initially set to the buffer's address. + * + * - end : the address of the buffer's limit, i.e. of the first byte + * after the buffer. this address should never be touched. + * + * IMPORTANT: it is assumed that end > buffer_address, i.e. + * that the buffer is at least one byte. + * + * the _bprint_() functions return the new value of 'p' after the data + * has been appended, and also ensure the following: + * + * - the returned value will never be strictly greater than 'end' + * + * - a return value equal to 'end' means that truncation occured + * (in which case, end[-1] will be set to 0) + * + * - after returning from a _bprint_() function, the content of the buffer + * is always 0-terminated, even in the event of truncation. + * + * these conventions allow you to call _bprint_ functions multiple times and + * only check for truncation at the end of the sequence, as in: + * + * char buff[1000], *p = buff, *end = p + sizeof(buff); + * + * p = _bprint_c(p, end, '"'); + * p = _bprint_s(p, end, my_string); + * p = _bprint_c(p, end, '"'); + * + * if (p >= end) { + * // buffer was too small + * } + * + * printf( "%s", buff ); + */ + +/* add a char to a bounded buffer */ +static char* +_bprint_c( char* p, char* end, int c ) { - static int fd = -2; - int ret; - - if (fd == -2) { - do { - fd = open( "/data/dns.log", O_CREAT | O_APPEND | O_WRONLY, 0666 ); - } while (fd < 0 && errno == EINTR); - } - - if (fd >= 0) { - char temp[128]; - va_list args; - va_start(args, fmt); - vsnprintf( temp, sizeof(temp), fmt, args); - va_end(args); - - do { - ret = write( fd, temp, strlen(temp) ); - } while (ret == -1 && errno == EINTR); + if (p < end) { + if (p+1 == end) + *p++ = 0; + else { + *p++ = (char) c; + *p = 0; + } } + return p; } -#define XLOG(...) xlog(__VA_ARGS__) -#else -#define XLOG(...) ((void)0) -#endif +/* add a sequence of bytes to a bounded buffer */ +static char* +_bprint_b( char* p, char* end, const char* buf, int len ) +{ + int avail = end - p; + + if (avail <= 0 || len <= 0) + return p; + + if (avail > len) + avail = len; + + memcpy( p, buf, avail ); + p += avail; + + if (p < end) + p[0] = 0; + else + end[-1] = 0; + + return p; +} + +/* add a string to a bounded buffer */ +static char* +_bprint_s( char* p, char* end, const char* str ) +{ + return _bprint_b(p, end, str, strlen(str)); +} + +/* add a formatted string to a bounded buffer */ +static char* +_bprint( char* p, char* end, const char* format, ... ) +{ + int avail, n; + va_list args; + + avail = end - p; + + if (avail <= 0) + return p; + + va_start(args, format); + n = snprintf( p, avail, format, args); + va_end(args); + + /* certain C libraries return -1 in case of truncation */ + if (n < 0 || n > avail) + n = avail; + + p += n; + /* certain C libraries do not zero-terminate in case of truncation */ + if (p == end) + p[-1] = 0; + + return p; +} + +/* add a hex value to a bounded buffer, up to 8 digits */ +static char* +_bprint_hex( char* p, char* end, unsigned value, int numDigits ) +{ + char text[sizeof(unsigned)*2]; + int nn = 0; + + while (numDigits-- > 0) { + text[nn++] = "0123456789abcdef"[(value >> (numDigits*4)) & 15]; + } + return _bprint_b(p, end, text, nn); +} + +/* add the hexadecimal dump of some memory area to a bounded buffer */ +static char* +_bprint_hexdump( char* p, char* end, const uint8_t* data, int datalen ) +{ + int lineSize = 16; + + while (datalen > 0) { + int avail = datalen; + int nn; + + if (avail > lineSize) + avail = lineSize; + + for (nn = 0; nn < avail; nn++) { + if (nn > 0) + p = _bprint_c(p, end, ' '); + p = _bprint_hex(p, end, data[nn], 2); + } + for ( ; nn < lineSize; nn++ ) { + p = _bprint_s(p, end, " "); + } + p = _bprint_s(p, end, " "); + + for (nn = 0; nn < avail; nn++) { + int c = data[nn]; + + if (c < 32 || c > 127) + c = '.'; + + p = _bprint_c(p, end, c); + } + p = _bprint_c(p, end, '\n'); + + data += avail; + datalen -= avail; + } + return p; +} + +/* dump the content of a query of packet to the log */ +static void +XLOG_BYTES( const void* base, int len ) +{ + char buff[1024]; + char* p = buff, *end = p + sizeof(buff); + + p = _bprint_hexdump(p, end, base, len); + XLOG("%s",buff); +} + +#else /* !DEBUG */ +# define XLOG(...) ((void)0) +# define XLOG_BYTES(a,b) ((void)0) +#endif static time_t _time_now( void ) @@ -107,96 +343,625 @@ _time_now( void ) return tv.tv_sec; } -/****************************************************************************/ -/****************************************************************************/ -/***** *****/ -/***** *****/ -/***** *****/ -/****************************************************************************/ -/****************************************************************************/ - -/* used to define the content of _RESOLV_HOSTENT_NONE +/* reminder: the general format of a DNS packet is the following: + * + * HEADER (12 bytes) + * QUESTION (variable) + * ANSWER (variable) + * AUTHORITY (variable) + * ADDITIONNAL (variable) + * + * the HEADER is made of: + * + * ID : 16 : 16-bit unique query identification field + * + * QR : 1 : set to 0 for queries, and 1 for responses + * Opcode : 4 : set to 0 for queries + * AA : 1 : set to 0 for queries + * TC : 1 : truncation flag, will be set to 0 in queries + * RD : 1 : recursion desired + * + * RA : 1 : recursion available (0 in queries) + * Z : 3 : three reserved zero bits + * RCODE : 4 : response code (always 0=NOERROR in queries) + * + * QDCount: 16 : question count + * ANCount: 16 : Answer count (0 in queries) + * NSCount: 16: Authority Record count (0 in queries) + * ARCount: 16: Additionnal Record count (0 in queries) + * + * the QUESTION is made of QDCount Question Record (QRs) + * the ANSWER is made of ANCount RRs + * the AUTHORITY is made of NSCount RRs + * the ADDITIONNAL is made of ARCount RRs + * + * Each Question Record (QR) is made of: + * + * QNAME : variable : Query DNS NAME + * TYPE : 16 : type of query (A=1, PTR=12, MX=15, AAAA=28, ALL=255) + * CLASS : 16 : class of query (IN=1) + * + * Each Resource Record (RR) is made of: + * + * NAME : variable : DNS NAME + * TYPE : 16 : type of query (A=1, PTR=12, MX=15, AAAA=28, ALL=255) + * CLASS : 16 : class of query (IN=1) + * TTL : 32 : seconds to cache this RR (0=none) + * RDLENGTH: 16 : size of RDDATA in bytes + * RDDATA : variable : RR data (depends on TYPE) + * + * Each QNAME contains a domain name encoded as a sequence of 'labels' + * terminated by a zero. Each label has the following format: + * + * LEN : 8 : lenght of label (MUST be < 64) + * NAME : 8*LEN : label length (must exclude dots) + * + * A value of 0 in the encoding is interpreted as the 'root' domain and + * terminates the encoding. So 'www.android.com' will be encoded as: + * + * <3>www<7>android<3>com<0> + * + * Where represents the byte with value 'n' + * + * Each NAME reflects the QNAME of the question, but has a slightly more + * complex encoding in order to provide message compression. This is achieved + * by using a 2-byte pointer, with format: + * + * TYPE : 2 : 0b11 to indicate a pointer, 0b01 and 0b10 are reserved + * OFFSET : 14 : offset to another part of the DNS packet + * + * The offset is relative to the start of the DNS packet and must point + * A pointer terminates the encoding. + * + * The NAME can be encoded in one of the following formats: + * + * - a sequence of simple labels terminated by 0 (like QNAMEs) + * - a single pointer + * - a sequence of simple labels terminated by a pointer + * + * A pointer shall always point to either a pointer of a sequence of + * labels (which can themselves be terminated by either a 0 or a pointer) + * + * The expanded length of a given domain name should not exceed 255 bytes. + * + * NOTE: we don't parse the answer packets, so don't need to deal with NAME + * records, only QNAMEs. */ -const struct hostent _resolv_hostent_none_cst = { - NULL, - NULL, - AF_INET, - 4, - NULL -}; -struct hostent* -_resolv_hostent_copy( struct hostent* hp ) +#define DNS_HEADER_SIZE 12 + +#define DNS_TYPE_A "\00\01" /* big-endian decimal 1 */ +#define DNS_TYPE_PTR "\00\014" /* big-endian decimal 12 */ +#define DNS_TYPE_MX "\00\017" /* big-endian decimal 15 */ +#define DNS_TYPE_AAAA "\00\034" /* big-endian decimal 28 */ +#define DNS_TYPE_ALL "\00\0377" /* big-endian decimal 255 */ + +#define DNS_CLASS_IN "\00\01" /* big-endian decimal 1 */ + +typedef struct { + const uint8_t* base; + const uint8_t* end; + const uint8_t* cursor; +} DnsPacket; + +static void +_dnsPacket_init( DnsPacket* packet, const uint8_t* buff, int bufflen ) { - struct hostent* dst; - int nn, len; - char* p; - int num_aliases = 0, num_addresses = 0; + packet->base = buff; + packet->end = buff + bufflen; + packet->cursor = buff; +} - if (hp == NULL) - return NULL; +static void +_dnsPacket_rewind( DnsPacket* packet ) +{ + packet->cursor = packet->base; +} - if (hp == _RESOLV_HOSTENT_NONE) - return hp; +static void +_dnsPacket_skip( DnsPacket* packet, int count ) +{ + const uint8_t* p = packet->cursor + count; - len = sizeof(*hp); - len += strlen(hp->h_name) + 1; + if (p > packet->end) + p = packet->end; - if (hp->h_aliases != NULL) { - for (nn = 0; hp->h_aliases[nn] != NULL; nn++) - len += sizeof(char*) + strlen(hp->h_aliases[nn]) + 1; - num_aliases = nn; + packet->cursor = p; +} + +static int +_dnsPacket_readInt16( DnsPacket* packet ) +{ + const uint8_t* p = packet->cursor; + + if (p+2 > packet->end) + return -1; + + packet->cursor = p+2; + return (p[0]<< 8) | p[1]; +} + +/** QUERY CHECKING + **/ + +/* check bytes in a dns packet. returns 1 on success, 0 on failure. + * the cursor is only advanced in the case of success + */ +static int +_dnsPacket_checkBytes( DnsPacket* packet, int numBytes, const void* bytes ) +{ + const uint8_t* p = packet->cursor; + + if (p + numBytes > packet->end) + return 0; + + if (memcmp(p, bytes, numBytes) != 0) + return 0; + + packet->cursor = p + numBytes; + return 1; +} + +/* parse and skip a given QNAME stored in a query packet, + * from the current cursor position. returns 1 on success, + * or 0 for malformed data. + */ +static int +_dnsPacket_checkQName( DnsPacket* packet ) +{ + const uint8_t* p = packet->cursor; + const uint8_t* end = packet->end; + + for (;;) { + int c; + + if (p >= end) + break; + + c = *p++; + + if (c == 0) { + packet->cursor = p; + return 1; + } + + /* we don't expect label compression in QNAMEs */ + if (c >= 64) + break; + + p += c; + /* we rely on the bound check at the start + * of the loop here */ } - len += sizeof(char*); + /* malformed data */ + XLOG("malformed QNAME"); + return 0; +} - for (nn = 0; hp->h_addr_list[nn] != NULL; nn++) { - len += sizeof(char*) + hp->h_length; +/* parse and skip a given QR stored in a packet. + * returns 1 on success, and 0 on failure + */ +static int +_dnsPacket_checkQR( DnsPacket* packet ) +{ + int len; + + if (!_dnsPacket_checkQName(packet)) + return 0; + + /* TYPE must be one of the things we support */ + if (!_dnsPacket_checkBytes(packet, 2, DNS_TYPE_A) && + !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_PTR) && + !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_MX) && + !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_AAAA) && + !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_ALL)) + { + XLOG("unsupported TYPE"); + return 0; } - num_addresses = nn; - len += sizeof(char*); - - dst = malloc( len ); - if (dst == NULL) - return NULL; - - dst->h_aliases = (char**)(dst + 1); - dst->h_addr_list = dst->h_aliases + num_aliases + 1; - dst->h_length = hp->h_length; - dst->h_addrtype = hp->h_addrtype; - - p = (char*)(dst->h_addr_list + num_addresses + 1); - - /* write the addresses first, to help with alignment issues */ - for (nn = 0; nn < num_addresses; nn++) { - dst->h_addr_list[nn] = p; - len = hp->h_length; - memcpy( p, hp->h_addr_list[nn], len ); - p += len; + /* CLASS must be IN */ + if (!_dnsPacket_checkBytes(packet, 2, DNS_CLASS_IN)) { + XLOG("unsupported CLASS"); + return 0; } - dst->h_addr_list[nn] = NULL; - for (nn = 0; nn < num_aliases; nn++) { - dst->h_aliases[nn] = p; - len = strlen(hp->h_aliases[nn]) + 1; - memcpy( p, hp->h_aliases[nn], len ); - p += len; + return 1; +} + +/* check the header of a DNS Query packet, return 1 if it is one + * type of query we can cache, or 0 otherwise + */ +static int +_dnsPacket_checkQuery( DnsPacket* packet ) +{ + const uint8_t* p = packet->base; + int qdCount, anCount, dnCount, arCount; + + if (p + DNS_HEADER_SIZE > packet->end) { + XLOG("query packet too small"); + return 0; } - dst->h_aliases[nn] = NULL; - dst->h_name = p; - len = strlen(hp->h_name) + 1; - memcpy(p, hp->h_name, len); - p += len; + /* QR must be set to 0, opcode must be 0 and AA must be 0 */ + /* RA, Z, and RCODE must be 0 */ + if ((p[2] & 0xFC) != 0 || p[3] != 0) { + XLOG("query packet flags unsupported"); + return 0; + } - return dst; + /* Note that we ignore the TC and RD bits here for the + * following reasons: + * + * - there is no point for a query packet sent to a server + * to have the TC bit set, but the implementation might + * set the bit in the query buffer for its own needs + * between a _resolv_cache_lookup and a + * _resolv_cache_add. We should not freak out if this + * is the case. + * + * - we consider that the result from a RD=0 or a RD=1 + * query might be different, hence that the RD bit + * should be used to differentiate cached result. + * + * this implies that RD is checked when hashing or + * comparing query packets, but not TC + */ + + /* ANCOUNT, DNCOUNT and ARCOUNT must be 0 */ + qdCount = (p[4] << 8) | p[5]; + anCount = (p[6] << 8) | p[7]; + dnCount = (p[8] << 8) | p[9]; + arCount = (p[10]<< 8) | p[11]; + + if (anCount != 0 || dnCount != 0 || arCount != 0) { + XLOG("query packet contains non-query records"); + return 0; + } + + if (qdCount == 0) { + XLOG("query packet doesn't contain query record"); + return 0; + } + + /* Check QDCOUNT QRs */ + packet->cursor = p + DNS_HEADER_SIZE; + + for (;qdCount > 0; qdCount--) + if (!_dnsPacket_checkQR(packet)) + return 0; + + return 1; +} + +/** QUERY DEBUGGING + **/ +#if DEBUG +static char* +_dnsPacket_bprintQName(DnsPacket* packet, char* bp, char* bend) +{ + const uint8_t* p = packet->cursor; + const uint8_t* end = packet->end; + int first = 1; + + for (;;) { + int c; + + if (p >= end) + break; + + c = *p++; + + if (c == 0) { + packet->cursor = p; + return bp; + } + + /* we don't expect label compression in QNAMEs */ + if (c >= 64) + break; + + if (first) + first = 0; + else + bp = _bprint_c(bp, bend, '.'); + + bp = _bprint_b(bp, bend, (const char*)p, c); + + p += c; + /* we rely on the bound check at the start + * of the loop here */ + } + /* malformed data */ + bp = _bprint_s(bp, bend, ""); + return bp; +} + +static char* +_dnsPacket_bprintQR(DnsPacket* packet, char* p, char* end) +{ +#define QQ(x) { DNS_TYPE_##x, #x } + static const struct { + const char* typeBytes; + const char* typeString; + } qTypes[] = + { + QQ(A), QQ(PTR), QQ(MX), QQ(AAAA), QQ(ALL), + { NULL, NULL } + }; + int nn; + const char* typeString = NULL; + + /* dump QNAME */ + p = _dnsPacket_bprintQName(packet, p, end); + + /* dump TYPE */ + p = _bprint_s(p, end, " ("); + + for (nn = 0; qTypes[nn].typeBytes != NULL; nn++) { + if (_dnsPacket_checkBytes(packet, 2, qTypes[nn].typeBytes)) { + typeString = qTypes[nn].typeString; + break; + } + } + + if (typeString != NULL) + p = _bprint_s(p, end, typeString); + else { + int typeCode = _dnsPacket_readInt16(packet); + p = _bprint(p, end, "UNKNOWN-%d", typeCode); + } + + p = _bprint_c(p, end, ')'); + + /* skip CLASS */ + _dnsPacket_skip(packet, 2); + return p; +} + +/* this function assumes the packet has already been checked */ +static char* +_dnsPacket_bprintQuery( DnsPacket* packet, char* p, char* end ) +{ + int qdCount; + + if (packet->base[2] & 0x1) { + p = _bprint_s(p, end, "RECURSIVE "); + } + + _dnsPacket_skip(packet, 4); + qdCount = _dnsPacket_readInt16(packet); + _dnsPacket_skip(packet, 6); + + for ( ; qdCount > 0; qdCount-- ) { + p = _dnsPacket_bprintQR(packet, p, end); + } + return p; +} +#endif + + +/** QUERY HASHING SUPPORT + ** + ** THE FOLLOWING CODE ASSUMES THAT THE INPUT PACKET HAS ALREADY + ** BEEN SUCCESFULLY CHECKED. + **/ + +/* use 32-bit FNV hash function */ +#define FNV_MULT 16777619U +#define FNV_BASIS 2166136261U + +static unsigned +_dnsPacket_hashBytes( DnsPacket* packet, int numBytes, unsigned hash ) +{ + const uint8_t* p = packet->cursor; + const uint8_t* end = packet->end; + + while (numBytes > 0 && p < end) { + hash = hash*FNV_MULT ^ *p++; + } + packet->cursor = p; + return hash; } -void -_resolv_hostent_free( struct hostent* hp ) +static unsigned +_dnsPacket_hashQName( DnsPacket* packet, unsigned hash ) { - if (hp && hp != _RESOLV_HOSTENT_NONE) - free(hp); + const uint8_t* p = packet->cursor; + const uint8_t* end = packet->end; + + for (;;) { + int c; + + if (p >= end) { /* should not happen */ + XLOG("%s: INTERNAL_ERROR: read-overflow !!\n", __FUNCTION__); + break; + } + + c = *p++; + + if (c == 0) + break; + + if (c >= 64) { + XLOG("%s: INTERNAL_ERROR: malformed domain !!\n", __FUNCTION__); + break; + } + if (p + c >= end) { + XLOG("%s: INTERNAL_ERROR: simple label read-overflow !!\n", + __FUNCTION__); + break; + } + while (c > 0) { + hash = hash*FNV_MULT ^ *p++; + c -= 1; + } + } + packet->cursor = p; + return hash; +} + +static unsigned +_dnsPacket_hashQR( DnsPacket* packet, unsigned hash ) +{ + int len; + + hash = _dnsPacket_hashQName(packet, hash); + hash = _dnsPacket_hashBytes(packet, 4, hash); /* TYPE and CLASS */ + return hash; +} + +static unsigned +_dnsPacket_hashQuery( DnsPacket* packet ) +{ + unsigned hash = FNV_BASIS; + int count; + _dnsPacket_rewind(packet); + + /* we ignore the TC bit for reasons explained in + * _dnsPacket_checkQuery(). + * + * however we hash the RD bit to differentiate + * between answers for recursive and non-recursive + * queries. + */ + hash = hash*FNV_MULT ^ (packet->base[2] & 1); + + /* assume: other flags are 0 */ + _dnsPacket_skip(packet, 4); + + /* read QDCOUNT */ + count = _dnsPacket_readInt16(packet); + + /* assume: ANcount, NScount, ARcount are 0 */ + _dnsPacket_skip(packet, 6); + + /* hash QDCOUNT QRs */ + for ( ; count > 0; count-- ) + hash = _dnsPacket_hashQR(packet, hash); + + return hash; +} + + +/** QUERY COMPARISON + ** + ** THE FOLLOWING CODE ASSUMES THAT THE INPUT PACKETS HAVE ALREADY + ** BEEN SUCCESFULLY CHECKED. + **/ + +static int +_dnsPacket_isEqualDomainName( DnsPacket* pack1, DnsPacket* pack2 ) +{ + const uint8_t* p1 = pack1->cursor; + const uint8_t* end1 = pack1->end; + const uint8_t* p2 = pack2->cursor; + const uint8_t* end2 = pack2->end; + + for (;;) { + int c1, c2; + + if (p1 >= end1 || p2 >= end2) { + XLOG("%s: INTERNAL_ERROR: read-overflow !!\n", __FUNCTION__); + break; + } + c1 = *p1++; + c2 = *p2++; + if (c1 != c2) + break; + + if (c1 == 0) { + pack1->cursor = p1; + pack2->cursor = p2; + return 1; + } + if (c1 >= 64) { + XLOG("%s: INTERNAL_ERROR: malformed domain !!\n", __FUNCTION__); + break; + } + if ((p1+c1 > end1) || (p2+c1 > end2)) { + XLOG("%s: INTERNAL_ERROR: simple label read-overflow !!\n", + __FUNCTION__); + break; + } + if (memcmp(p1, p2, c1) != 0) + break; + p1 += c1; + p2 += c1; + /* we rely on the bound checks at the start of the loop */ + } + /* not the same, or one is malformed */ + XLOG("different DN"); + return 0; +} + +static int +_dnsPacket_isEqualBytes( DnsPacket* pack1, DnsPacket* pack2, int numBytes ) +{ + const uint8_t* p1 = pack1->cursor; + const uint8_t* p2 = pack2->cursor; + + if ( p1 + numBytes > pack1->end || p2 + numBytes > pack2->end ) + return 0; + + if ( memcmp(p1, p2, numBytes) != 0 ) + return 0; + + pack1->cursor += numBytes; + pack2->cursor += numBytes; + return 1; +} + +static int +_dnsPacket_isEqualQR( DnsPacket* pack1, DnsPacket* pack2 ) +{ + /* compare domain name encoding + TYPE + CLASS */ + if ( !_dnsPacket_isEqualDomainName(pack1, pack2) || + !_dnsPacket_isEqualBytes(pack1, pack2, 2+2) ) + return 0; + + return 1; +} + +static int +_dnsPacket_isEqualQuery( DnsPacket* pack1, DnsPacket* pack2 ) +{ + int count1, count2; + + /* compare the headers, ignore most fields */ + _dnsPacket_rewind(pack1); + _dnsPacket_rewind(pack2); + + /* compare RD, ignore TC, see comment in _dnsPacket_checkQuery */ + if ((pack1->base[2] & 1) != (pack2->base[2] & 1)) { + XLOG("different RD"); + return 0; + } + + /* assume: other flags are all 0 */ + _dnsPacket_skip(pack1, 4); + _dnsPacket_skip(pack2, 4); + + /* compare QDCOUNT */ + count1 = _dnsPacket_readInt16(pack1); + count2 = _dnsPacket_readInt16(pack2); + if (count1 != count2 || count1 < 0) { + XLOG("different QDCOUNT"); + return 0; + } + + /* assume: ANcount, NScount and ARcount are all 0 */ + _dnsPacket_skip(pack1, 6); + _dnsPacket_skip(pack2, 6); + + /* compare the QDCOUNT QRs */ + for ( ; count1 > 0; count1-- ) { + if (!_dnsPacket_isEqualQR(pack1, pack2)) { + XLOG("different QR"); + return 0; + } + } + return 1; } /****************************************************************************/ @@ -207,15 +972,23 @@ _resolv_hostent_free( struct hostent* hp ) /****************************************************************************/ /****************************************************************************/ +/* cache entry. for simplicity, 'hash' and 'hlink' are inlined in this + * structure though they are conceptually part of the hash table. + * + * similarly, mru_next and mru_prev are part of the global MRU list + */ typedef struct Entry { - unsigned int hash; - const char* name; - short af; - short index; + unsigned int hash; /* hash value */ + struct Entry* hlink; /* next in collision chain */ struct Entry* mru_prev; struct Entry* mru_next; - time_t when; - struct hostent* hp; + + const uint8_t* query; + int querylen; + const uint8_t* answer; + int answerlen; + time_t when; /* time_t when entry was added to table */ + int id; /* for debugging purpose */ } Entry; @@ -224,30 +997,10 @@ entry_free( Entry* e ) { /* everything is allocated in a single memory block */ if (e) { - _resolv_hostent_free(e->hp); free(e); } } -static void -entry_init_key( Entry* e, const char* name, int af ) -{ - unsigned h = 0; - const char* p = name; - - /* compute hash */ - p = name; - while (*p) { - h = h*33 + *p++; - } - h += af*17; - - e->hash = h; - e->name = name; - e->af = (short) af; -} - - static __inline__ void entry_mru_remove( Entry* e ) { @@ -267,46 +1020,75 @@ entry_mru_add( Entry* e, Entry* list ) first->mru_prev = e; } +/* compute the hash of a given entry, this is a hash of most + * data in the query (key) */ +static unsigned +entry_hash( const Entry* e ) +{ + DnsPacket pack[1]; + _dnsPacket_init(pack, e->query, e->querylen); + return _dnsPacket_hashQuery(pack); +} + +/* initialize an Entry as a search key, this also checks the input query packet + * returns 1 on success, or 0 in case of unsupported/malformed data */ +static int +entry_init_key( Entry* e, const void* query, int querylen ) +{ + DnsPacket pack[1]; + + memset(e, 0, sizeof(*e)); + + e->query = query; + e->querylen = querylen; + e->hash = entry_hash(e); + + _dnsPacket_init(pack, query, querylen); + + return _dnsPacket_checkQuery(pack); +} + +/* allocate a new entry as a cache node */ static Entry* -entry_alloc( const char* name, int af, int index, struct hostent* hp ) +entry_alloc( const Entry* init, const void* answer, int answerlen ) { Entry* e; - int num_aliases = 0; - int num_addresses = 0; - char** aliases; - char** addresses; + int size; - /* compute the length of the memory block that will contain everything */ - int len = sizeof(*e) + strlen(name)+1; - - e = malloc(len); + size = sizeof(*e) + init->querylen + answerlen; + e = calloc(size, 1); if (e == NULL) return e; - entry_init_key(e, name, af); + e->hash = init->hash; + e->query = (const uint8_t*)(e+1); + e->querylen = init->querylen; - e->mru_next = e->mru_prev = e; - e->index = (short) index; - e->when = _time_now(); - e->hp = _resolv_hostent_copy(hp); + memcpy( (char*)e->query, init->query, e->querylen ); - if (e->hp == NULL) { - free(e); - return NULL; - } + e->answer = e->query + e->querylen; + e->answerlen = answerlen; + + memcpy( (char*)e->answer, answer, e->answerlen ); + + e->when = _time_now(); - e->name = (char*)(e+1); - len = strlen(name)+1; - memcpy( (char*)e->name, name, len ); return e; } - -static __inline__ int +static int entry_equals( const Entry* e1, const Entry* e2 ) { - return e1->hash == e2->hash && e1->af == e2->af && !strcmp( e1->name, e2->name ); + DnsPacket pack1[1], pack2[1]; + + if (e1->querylen != e2->querylen) { + return 0; + } + _dnsPacket_init(pack1, e1->query, e1->querylen); + _dnsPacket_init(pack2, e2->query, e2->querylen); + + return _dnsPacket_isEqualQuery(pack1, pack2); } /****************************************************************************/ @@ -317,30 +1099,49 @@ entry_equals( const Entry* e1, const Entry* e2 ) /****************************************************************************/ /****************************************************************************/ +/* We use a simple hash table with external collision lists + * for simplicity, the hash-table fields 'hash' and 'hlink' are + * inlined in the Entry structure. + */ #define MAX_HASH_ENTRIES (2*CONFIG_MAX_ENTRIES) typedef struct resolv_cache { - int num_entries; - Entry mru_list; - pthread_mutex_t lock; - int disabled; - Entry* entries[ MAX_HASH_ENTRIES ]; /* hash-table of pointers to entries */ + int num_entries; + Entry mru_list; + pthread_mutex_t lock; + unsigned generation; + int last_id; + Entry* entries[ MAX_HASH_ENTRIES ]; } Cache; -void -_resolv_cache_destroy( struct resolv_cache* cache ) -{ - if (cache != NULL) { - int nn; - for (nn = 0; nn < MAX_HASH_ENTRIES; nn++) { - entry_free(cache->entries[nn]); - } - pthread_mutex_destroy(&cache->lock); - free(cache); - } -} +#define HTABLE_VALID(x) ((x) != NULL && (x) != HTABLE_DELETED) +static void +_cache_flush_locked( Cache* cache ) +{ + int nn; + time_t now = _time_now(); + + for (nn = 0; nn < MAX_HASH_ENTRIES; nn++) + { + Entry** pnode = &cache->entries[nn]; + + while (*pnode != NULL) { + Entry* node = *pnode; + *pnode = node->hlink; + entry_free(node); + } + } + + cache->mru_list.mru_next = cache->mru_list.mru_prev = &cache->mru_list; + cache->num_entries = 0; + cache->last_id = 0; + + XLOG("*************************\n" + "*** DNS CACHE FLUSHED ***\n" + "*************************"); +} struct resolv_cache* _resolv_cache_create( void ) @@ -349,116 +1150,203 @@ _resolv_cache_create( void ) cache = calloc(sizeof(*cache), 1); if (cache) { - const char* env = getenv(CONFIG_ENV); - - if (env && atoi(env) == 0) - cache->disabled = 1; - + cache->generation = ~0U; pthread_mutex_init( &cache->lock, NULL ); cache->mru_list.mru_prev = cache->mru_list.mru_next = &cache->mru_list; - XLOG("%s: cache=%p %s\n", __FUNCTION__, cache, cache->disabled ? "disabled" : "enabled" ); + XLOG("%s: cache created\n", __FUNCTION__); } return cache; } -static int -_resolv_cache_find_index( Cache* cache, - const char* name, - int af ) +#if DEBUG +static void +_dump_query( const uint8_t* query, int querylen ) { - Entry key; - int nn, step, tries; + char temp[256], *p=temp, *end=p+sizeof(temp); + DnsPacket pack[1]; - entry_init_key( &key, name, af ); - - tries = MAX_HASH_ENTRIES; - nn = key.hash % MAX_HASH_ENTRIES; - step = 5; - - while (tries > 0) { - Entry* key2 = cache->entries[nn]; - - if (key2 == NULL) { - return -(nn + 1); - } - - if (entry_equals( &key, key2 ) ) { - return nn; - } - - nn = (nn + step) % MAX_HASH_ENTRIES; - tries -= 1; - } - return -(MAX_HASH_ENTRIES+1); + _dnsPacket_init(pack, query, querylen); + p = _dnsPacket_bprintQuery(pack, p, end); + XLOG("QUERY: %s", temp); } - static void -_resolv_cache_remove( struct resolv_cache* cache, - Entry* e ) +_cache_dump_mru( Cache* cache ) { - XLOG("%s: name='%s' af=%d\n", __FUNCTION__, e->name, e->af); - cache->entries[ e->index ] = NULL; /* remove from hash table */ - entry_mru_remove( e ); - entry_free( e ); + char temp[512], *p=temp, *end=p+sizeof(temp); + Entry* e; + + p = _bprint(temp, end, "MRU LIST (%2d): ", cache->num_entries); + for (e = cache->mru_list.mru_next; e != &cache->mru_list; e = e->mru_next) + p = _bprint(p, end, " %d", e->id); + + XLOG("%s", temp); +} +#endif + +#if DEBUG +# define XLOG_QUERY(q,len) _dump_query((q), (len)) +#else +# define XLOG_QUERY(q,len) ((void)0) +#endif + +/* This function tries to find a key within the hash table + * In case of success, it will return a *pointer* to the hashed key. + * In case of failure, it will return a *pointer* to NULL + * + * So, the caller must check '*result' to check for success/failure. + * + * The main idea is that the result can later be used directly in + * calls to _resolv_cache_add or _resolv_cache_remove as the 'lookup' + * parameter. This makes the code simpler and avoids re-searching + * for the key position in the htable. + * + * The result of a lookup_p is only valid until you alter the hash + * table. + */ +static Entry** +_cache_lookup_p( Cache* cache, + Entry* key ) +{ + int index = key->hash % MAX_HASH_ENTRIES; + Entry** pnode = &cache->entries[ key->hash % MAX_HASH_ENTRIES ]; + + while (*pnode != NULL) { + Entry* node = *pnode; + + if (node == NULL) + break; + + if (node->hash == key->hash && entry_equals(node, key)) + break; + + pnode = &node->hlink; + } + return pnode; +} + +/* Add a new entry to the hash table. 'lookup' must be the + * result of an immediate previous failed _lookup_p() call + * (i.e. with *lookup == NULL), and 'e' is the pointer to the + * newly created entry + */ +static void +_cache_add_p( Cache* cache, + Entry** lookup, + Entry* e ) +{ + *lookup = e; + e->id = ++cache->last_id; + entry_mru_add(e, &cache->mru_list); + cache->num_entries += 1; + + XLOG("%s: entry %d added (count=%d)", __FUNCTION__, + e->id, cache->num_entries); +} + +/* Remove an existing entry from the hash table, + * 'lookup' must be the result of an immediate previous + * and succesful _lookup_p() call. + */ +static void +_cache_remove_p( Cache* cache, + Entry** lookup ) +{ + Entry* e = *lookup; + + XLOG("%s: entry %d removed (count=%d)", __FUNCTION__, + e->id, cache->num_entries-1); + + entry_mru_remove(e); + *lookup = e->hlink; + entry_free(e); cache->num_entries -= 1; } - -struct hostent* -_resolv_cache_lookup( struct resolv_cache* cache, - const char* name, - int af ) +/* Remove the oldest entry from the hash table. + */ +static void +_cache_remove_oldest( Cache* cache ) { - int index; - struct hostent* result = NULL; + Entry* oldest = cache->mru_list.mru_prev; + Entry** lookup = _cache_lookup_p(cache, oldest); - if (cache->disabled) - return NULL; + if (*lookup == NULL) { /* should not happen */ + XLOG("%s: OLDEST NOT IN HTABLE ?", __FUNCTION__); + return; + } + _cache_remove_p(cache, lookup); +} + +ResolvCacheStatus +_resolv_cache_lookup( struct resolv_cache* cache, + const void* query, + int querylen, + void* answer, + int answersize, + int *answerlen ) +{ + DnsPacket pack[1]; + Entry key[1]; + int index; + Entry** lookup; + Entry* e; + time_t now; + + ResolvCacheStatus result = RESOLV_CACHE_NOTFOUND; + + XLOG("%s: lookup", __FUNCTION__); + XLOG_QUERY(query, querylen); + + /* we don't cache malformed queries */ + if (!entry_init_key(key, query, querylen)) { + XLOG("%s: unsupported query", __FUNCTION__); + return RESOLV_CACHE_UNSUPPORTED; + } + /* lookup cache */ pthread_mutex_lock( &cache->lock ); - XLOG( "%s: cache=%p name='%s' af=%d ", __FUNCTION__, cache, name, af ); - index = _resolv_cache_find_index( cache, name, af ); - if (index >= 0) { - Entry* e = cache->entries[index]; - time_t now = _time_now(); - struct hostent** pht; + /* see the description of _lookup_p to understand this. + * the function always return a non-NULL pointer. + */ + lookup = _cache_lookup_p(cache, key); + e = *lookup; - /* ignore stale entries, they will be discarded in _resolv_cache_add */ - if ( (unsigned)(now - e->when) >= CONFIG_SECONDS ) { - XLOG( " OLD\n" ); - goto Exit; - } - - /* bump up this entry to the top of the MRU list */ - if (e != cache->mru_list.mru_next) { - entry_mru_remove( e ); - entry_mru_add( e, &cache->mru_list ); - } - - /* now copy the result into a thread-local variable */ - pht = __get_res_cache_hostent_p(); - if (pht == NULL) { - XLOG( " NOTLS\n" ); /* shouldn't happen */ - goto Exit; - } - - if (pht[0]) { - _resolv_hostent_free( pht[0] ); /* clear previous value */ - pht[0] = NULL; - } - result = _resolv_hostent_copy( e->hp ); - if (result == NULL) { - XLOG( " NOMEM\n" ); /* bummer */ - goto Exit; - } - XLOG( " OK\n" ); - pht[0] = result; + if (e == NULL) { + XLOG( "NOT IN CACHE"); goto Exit; } - XLOG( " KO\n" ); + + now = _time_now(); + + /* remove stale entries here */ + if ( (unsigned)(now - e->when) >= CONFIG_SECONDS ) { + XLOG( " NOT IN CACHE (STALE ENTRY %p DISCARDED)", *lookup ); + _cache_remove_p(cache, lookup); + goto Exit; + } + + *answerlen = e->answerlen; + if (e->answerlen > answersize) { + /* NOTE: we return UNSUPPORTED if the answer buffer is too short */ + result = RESOLV_CACHE_UNSUPPORTED; + XLOG(" ANSWER TOO LONG"); + goto Exit; + } + + memcpy( answer, e->answer, e->answerlen ); + + /* bump up this entry to the top of the MRU list */ + if (e != cache->mru_list.mru_next) { + entry_mru_remove( e ); + entry_mru_add( e, &cache->mru_list ); + } + + XLOG( "FOUND IN CACHE entry=%p", e ); + result = RESOLV_CACHE_FOUND; + Exit: pthread_mutex_unlock( &cache->lock ); return result; @@ -467,42 +1355,59 @@ Exit: void _resolv_cache_add( struct resolv_cache* cache, - const char* name, - int af, - struct hostent* hp ) + const void* query, + int querylen, + const void* answer, + int answerlen ) { + Entry key[1]; Entry* e; - int index; + Entry** lookup; - if (cache->disabled) + /* don't assume that the query has already been cached + */ + if (!entry_init_key( key, query, querylen )) { + XLOG( "%s: passed invalid query ?", __FUNCTION__); return; + } pthread_mutex_lock( &cache->lock ); - XLOG( "%s: cache=%p name='%s' af=%d\n", __FUNCTION__, cache, name, af); + XLOG( "%s: query:", __FUNCTION__ ); + XLOG_QUERY(query,querylen); +#if DEBUG_DATA + XLOG( "answer:"); + XLOG_BYTES(answer,answerlen); +#endif + + lookup = _cache_lookup_p(cache, key); + e = *lookup; + + if (e != NULL) { /* should not happen */ + XLOG("%s: ALREADY IN CACHE (%p) ? IGNORING ADD", + __FUNCTION__, e); + goto Exit; + } - /* get rid of the oldest entry if needed */ if (cache->num_entries >= CONFIG_MAX_ENTRIES) { - Entry* oldest = cache->mru_list.mru_prev; - _resolv_cache_remove( cache, oldest ); + _cache_remove_oldest(cache); + /* need to lookup again */ + lookup = _cache_lookup_p(cache, key); + e = *lookup; + if (e != NULL) { + XLOG("%s: ALREADY IN CACHE (%p) ? IGNORING ADD", + __FUNCTION__, e); + goto Exit; + } } - index = _resolv_cache_find_index( cache, name, af ); - if (index >= 0) { - /* discard stale entry */ - _resolv_cache_remove( cache, cache->entries[index] ); - } else { - index = -(index+1); - if (index >= MAX_HASH_ENTRIES) - goto Exit; /* should not happen */ - } - - e = entry_alloc( name, af, index, hp ); + e = entry_alloc( key, answer, answerlen ); if (e != NULL) { - entry_mru_add( e, &cache->mru_list ); - cache->entries[index] = e; - cache->num_entries += 1; + _cache_add_p(cache, lookup, e); } +#if DEBUG + _cache_dump_mru(cache); +#endif Exit: pthread_mutex_unlock( &cache->lock ); } @@ -521,6 +1426,13 @@ static pthread_once_t _res_cache_once; static void _res_cache_init( void ) { + const char* env = getenv(CONFIG_ENV); + + if (env && atoi(env) == 0) { + /* the cache is disabled */ + return; + } + _res_cache = _resolv_cache_create(); } @@ -531,3 +1443,19 @@ __get_res_cache( void ) pthread_once( &_res_cache_once, _res_cache_init ); return _res_cache; } + +void +_resolv_cache_reset( unsigned generation ) +{ + XLOG("%s: generation=%d", __FUNCTION__, generation); + + if (_res_cache == NULL) + return; + + pthread_mutex_lock( &_res_cache->lock ); + if (_res_cache->generation != generation) { + _cache_flush_locked(_res_cache); + _res_cache->generation = generation; + } + pthread_mutex_unlock( &_res_cache->lock ); +} diff --git a/libc/netbsd/resolv/res_send.c b/libc/netbsd/resolv/res_send.c index 24b740a2c..3aca760fe 100644 --- a/libc/netbsd/resolv/res_send.c +++ b/libc/netbsd/resolv/res_send.c @@ -81,6 +81,9 @@ __RCSID("$NetBSD: res_send.c,v 1.9 2006/01/24 17:41:25 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +/* set to 1 to use our small/simple/limited DNS cache */ +#define USE_RESOLV_CACHE 1 + /* * Send query to name server and wait for reply. */ @@ -111,6 +114,10 @@ __RCSID("$NetBSD: res_send.c,v 1.9 2006/01/24 17:41:25 christos Exp $"); #include +#if USE_RESOLV_CACHE +# include +#endif + #ifndef DE_CONST #define DE_CONST(c,v) v = ((c) ? \ strchr((const void *)(c), *(const char *)(const void *)(c)) : NULL) @@ -344,12 +351,17 @@ res_queriesmatch(const u_char *buf1, const u_char *eom1, return (1); } + int res_nsend(res_state statp, const u_char *buf, int buflen, u_char *ans, int anssiz) { int gotsomewhere, terrno, try, v_circuit, resplen, ns, n; char abuf[NI_MAXHOST]; +#if USE_RESOLV_CACHE + struct resolv_cache* cache; + ResolvCacheStatus cache_status = RESOLV_CACHE_UNSUPPORTED; +#endif if (statp->nscount == 0) { errno = ESRCH; @@ -365,6 +377,20 @@ res_nsend(res_state statp, gotsomewhere = 0; terrno = ETIMEDOUT; +#if USE_RESOLV_CACHE + cache = __get_res_cache(); + if (cache != NULL) { + int anslen = 0; + cache_status = _resolv_cache_lookup( + cache, buf, buflen, + ans, anssiz, &anslen); + + if (cache_status == RESOLV_CACHE_FOUND) { + return anslen; + } + } +#endif + /* * If the ns_addr_list in the resolver context has changed, then * invalidate our cached copy and the associated timing data. @@ -534,6 +560,12 @@ res_nsend(res_state statp, (stdout, "%s", ""), ans, (resplen > anssiz) ? anssiz : resplen); +#if USE_RESOLV_CACHE + if (cache_status == RESOLV_CACHE_NOTFOUND) { + _resolv_cache_add(cache, buf, buflen, + ans, resplen); + } +#endif /* * If we have temporarily opened a virtual circuit, * or if we haven't been asked to keep a socket open, diff --git a/libc/netbsd/resolv/res_state.c b/libc/netbsd/resolv/res_state.c index 8f2851ab0..3a2301d2e 100644 --- a/libc/netbsd/resolv/res_state.c +++ b/libc/netbsd/resolv/res_state.c @@ -46,7 +46,6 @@ typedef struct { struct __res_state _nres[1]; unsigned _serial; struct prop_info* _pi; - struct hostent* _hostent; struct res_static _rstatic[1]; } _res_thread; @@ -66,9 +65,9 @@ _res_thread_alloc(void) if ( res_ninit( rt->_nres ) < 0 ) { free(rt); rt = NULL; + } else { + memset(rt->_rstatic, 0, sizeof rt->_rstatic); } - rt->_hostent = NULL; - memset(rt->_rstatic, 0, sizeof rt->_rstatic); } return rt; } @@ -93,7 +92,6 @@ _res_thread_free( void* _rt ) _res_thread* rt = _rt; _res_static_done(rt->_rstatic); - _resolv_hostent_free(rt->_hostent); res_ndestroy(rt->_nres); free(rt); } @@ -132,6 +130,7 @@ _res_thread_get(void) rt = NULL; pthread_setspecific( _res_key, rt ); } + _resolv_cache_reset(rt->_serial); return rt; } @@ -177,14 +176,6 @@ __res_put_state(res_state res) res=res; } -struct hostent** -__get_res_cache_hostent_p(void) -{ - _res_thread* rt = _res_thread_get(); - - return rt ? &rt->_hostent : NULL; -} - res_static __res_get_static(void) { diff --git a/libc/bionic/logd.h b/libc/private/logd.h similarity index 100% rename from libc/bionic/logd.h rename to libc/private/logd.h diff --git a/libc/private/resolv_cache.h b/libc/private/resolv_cache.h index 8c255836f..cd876fb28 100644 --- a/libc/private/resolv_cache.h +++ b/libc/private/resolv_cache.h @@ -28,31 +28,39 @@ #ifndef _RESOLV_CACHE_H_ #define _RESOLV_CACHE_H_ -#include - -const struct hostent _resolv_hostent_none; -#define _RESOLV_HOSTENT_NONE ((struct hostent*)&_resolv_hostent_none) - struct resolv_cache; /* forward */ + +/* get cache instance, can be NULL if cache is disabled + * (e.g. through an environment variable) */ extern struct resolv_cache* __get_res_cache(void); -extern struct hostent** __get_res_cache_hostent_p(void); -extern struct resolv_cache* _resolv_cache_get( void ); +/* this gets called everytime we detect some changes in the DNS configuration + * and will flush the cache */ +extern void _resolv_cache_reset( unsigned generation ); -extern struct resolv_cache* _resolv_cache_create( void ); +typedef enum { + RESOLV_CACHE_UNSUPPORTED, /* the cache can't handle that kind of queries */ + /* or the answer buffer is too small */ + RESOLV_CACHE_NOTFOUND, /* the cache doesn't know about this query */ + RESOLV_CACHE_FOUND /* the cache found the answer */ +} ResolvCacheStatus; -extern void _resolv_cache_destroy( struct resolv_cache* cache ); +extern ResolvCacheStatus +_resolv_cache_lookup( struct resolv_cache* cache, + const void* query, + int querylen, + void* answer, + int answersize, + int *answerlen ); -extern struct hostent* _resolv_cache_lookup( struct resolv_cache* cache, - const char* name, - int af ); - -extern void _resolv_cache_add( struct resolv_cache* cache, - const char* name, - int af, - struct hostent* hp ); - -extern struct hostent* _resolv_hostent_copy( struct hostent* hp ); -extern void _resolv_hostent_free( struct hostent* hp ); +/* add a (query,answer) to the cache, only call if _resolv_cache_lookup + * did return RESOLV_CACHE_NOTFOUND + */ +extern void +_resolv_cache_add( struct resolv_cache* cache, + const void* query, + int querylen, + const void* answer, + int answerlen ); #endif /* _RESOLV_CACHE_H_ */ diff --git a/linker/linker.c b/linker/linker.c index 572f1d622..7b1983532 100644 --- a/linker/linker.c +++ b/linker/linker.c @@ -1133,13 +1133,25 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count) switch(type){ #if defined(ANDROID_ARM_LINKER) case R_ARM_JUMP_SLOT: + COUNT_RELOC(RELOC_ABSOLUTE); + MARK(rel->r_offset); + TRACE_TYPE(RELO, "%5d RELO JMP_SLOT %08x <- %08x %s\n", pid, + reloc, sym_addr, sym_name); + *((unsigned*)reloc) = sym_addr; + break; case R_ARM_GLOB_DAT: + COUNT_RELOC(RELOC_ABSOLUTE); + MARK(rel->r_offset); + TRACE_TYPE(RELO, "%5d RELO GLOB_DAT %08x <- %08x %s\n", pid, + reloc, sym_addr, sym_name); + *((unsigned*)reloc) = sym_addr; + break; case R_ARM_ABS32: COUNT_RELOC(RELOC_ABSOLUTE); MARK(rel->r_offset); TRACE_TYPE(RELO, "%5d RELO ABS %08x <- %08x %s\n", pid, reloc, sym_addr, sym_name); - *((unsigned*)reloc) = sym_addr; + *((unsigned*)reloc) += sym_addr; break; #elif defined(ANDROID_X86_LINKER) case R_386_JUMP_SLOT: @@ -1591,13 +1603,13 @@ static int link_image(soinfo *si, unsigned wr_offset) } #endif - /* If this is a SETUID programme, dup /dev/null to openned stdin, + /* If this is a SET?ID program, dup /dev/null to opened stdin, stdout and stderr to close a security hole described in: ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:23.stdio.asc */ - if (getuid() != geteuid()) + if (getuid() != geteuid() || getgid() != getegid()) nullify_closed_stdio (); call_constructors(si); notify_gdb_of_load(si); From 7d9dcdc82a871926e5e3a27143908fa3f4181b5f Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Fri, 20 Feb 2009 07:38:28 -0800 Subject: [PATCH 4/8] auto import from //branches/cupcake/...@132569 --- libc/unistd/abort.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libc/unistd/abort.c b/libc/unistd/abort.c index a02bebac3..d4e40e199 100644 --- a/libc/unistd/abort.c +++ b/libc/unistd/abort.c @@ -34,6 +34,11 @@ #include "thread_private.h" #include "atexit.h" +/* temporary, for bug hunting */ +#include "logd.h" +#define debug_log(format, ...) \ + __libc_android_log_print(ANDROID_LOG_DEBUG, "libc-abort", (format), ##__VA_ARGS__ ) + void abort(void) { @@ -48,6 +53,9 @@ abort(void) * any errors -- X311J doesn't allow abort to return anyway. */ sigdelset(&mask, SIGABRT); + /* temporary, so deliberate seg fault can be caught by debuggerd */ + sigdelset(&mask, SIGSEGV); + /* -- */ (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL); /* @@ -64,6 +72,13 @@ abort(void) } } + /* temporary, for bug hunting */ + debug_log("abort() called in pid %d\n", getpid()); + /* seg fault seems to produce better debuggerd results than SIGABRT */ + *((char*)0xdeadbaad) = 39; + debug_log("somehow we're not dead?\n"); + /* -- */ + (void)kill(getpid(), SIGABRT); /* From fe5745033a4f397c62a4e00efd9257ac9f83755c Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Mon, 2 Mar 2009 22:54:14 -0800 Subject: [PATCH 5/8] auto import from //depot/cupcake/@137055 --- libc/bionic/pthread-timers.c | 19 ++-- linker/Android.mk | 7 +- linker/ba.c | 180 +++++++++++++++++++++++++++++++++++ linker/ba.h | 38 ++++++++ linker/linker.c | 157 +++++++++++++++--------------- linker/linker.h | 2 + linker/linker_debug.h | 4 +- 7 files changed, 317 insertions(+), 90 deletions(-) create mode 100644 linker/ba.c create mode 100644 linker/ba.h diff --git a/libc/bionic/pthread-timers.c b/libc/bionic/pthread-timers.c index 818b47dd8..7b9c99e1c 100644 --- a/libc/bionic/pthread-timers.c +++ b/libc/bionic/pthread-timers.c @@ -485,16 +485,19 @@ timer_settime( timer_t id, timer_gettime_internal(timer, ospec ); } - /* compute next expiration time */ + /* compute next expiration time. note that if the + * new it_interval is 0, we should disarm the timer + */ expires = spec->it_value; - clock_gettime( timer->clock, &now ); - if (!(flags & TIMER_ABSTIME)) { - timespec_add(&expires, &now); - } else { - if (timespec_cmp(&expires, &now) < 0) - expires = now; + if (!timespec_is_zero(&expires)) { + clock_gettime( timer->clock, &now ); + if (!(flags & TIMER_ABSTIME)) { + timespec_add(&expires, &now); + } else { + if (timespec_cmp(&expires, &now) < 0) + expires = now; + } } - timer->expires = expires; timer->period = spec->it_interval; thr_timer_unlock( timer ); diff --git a/linker/Android.mk b/linker/Android.mk index 98eceda14..48141bef5 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -6,7 +6,8 @@ LOCAL_SRC_FILES:= \ linker.c \ rt.c \ dlfcn.c \ - debugger.c + debugger.c \ + ba.c LINKER_TEXT_BASE := 0xB0000100 @@ -16,7 +17,9 @@ LINKER_AREA_SIZE := 0x01000000 LOCAL_LDFLAGS := -Wl,-Ttext,$(LINKER_TEXT_BASE) -LOCAL_CFLAGS += -DPRELINK -DLINKER_TEXT_BASE=$(LINKER_TEXT_BASE) -DLINKER_AREA_SIZE=$(LINKER_AREA_SIZE) +LOCAL_CFLAGS += -DPRELINK +LOCAL_CFLAGS += -DLINKER_TEXT_BASE=$(LINKER_TEXT_BASE) +LOCAL_CFLAGS += -DLINKER_AREA_SIZE=$(LINKER_AREA_SIZE) # we need to access the Bionic private header # in the linker diff --git a/linker/ba.c b/linker/ba.c new file mode 100644 index 000000000..bea6f849d --- /dev/null +++ b/linker/ba.c @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "linker.h" +#include "linker_debug.h" +#include "ba.h" + +struct ba_bits { + unsigned allocated:1; /* 1 if allocated, 0 if free */ + unsigned order:7; /* size of the region in ba space */ +}; + +struct ba_info { + /* start address of the ba space */ + unsigned long base; + /* total size of the ba space */ + unsigned long size; + /* number of entries in the ba space */ + int num_entries; + /* the bitmap for the region indicating which entries are allocated + * and which are free */ + struct ba_bits *bitmap; +}; + +#undef min +#define min(a,b) ((a)<(b)?(a):(b)) + +#define BA_MIN_ALLOC LIBINC +#define BA_MAX_ORDER 128 +#define BA_START LIBBASE +#define BA_SIZE (LIBLAST - LIBBASE) + +#define BA_IS_FREE(index) (!(ba.bitmap[index].allocated)) +#define BA_ORDER(index) ba.bitmap[index].order +#define BA_BUDDY_INDEX(index) ((index) ^ (1 << BA_ORDER(index))) +#define BA_NEXT_INDEX(index) ((index) + (1 << BA_ORDER(index))) +#define BA_OFFSET(index) ((index) * BA_MIN_ALLOC) +#define BA_START_ADDR(index) (BA_OFFSET(index) + ba.base) +#define BA_LEN(index) ((1 << BA_ORDER(index)) * BA_MIN_ALLOC) + +static struct ba_bits ba_bitmap[BA_SIZE / BA_MIN_ALLOC]; + +static struct ba_info ba = { + .base = BA_START, + .size = BA_SIZE, + .bitmap = ba_bitmap, + .num_entries = sizeof(ba_bitmap)/sizeof(ba_bitmap[0]), +}; + +void ba_init(void) +{ + int i, index = 0; + for (i = sizeof(ba.num_entries) * 8 - 1; i >= 0; i--) { + if (ba.num_entries & 1<> i == 0) + break; + return i; +} + +int ba_allocate(unsigned long len) +{ + int curr = 0; + int end = ba.num_entries; + int best_fit = -1; + unsigned long order = ba_order(len); + + if (order > BA_MAX_ORDER) + return -1; + + /* look through the bitmap: + * if you find a free slot of the correct order use it + * otherwise, use the best fit (smallest with size > order) slot + */ + while (curr < end) { + if (BA_IS_FREE(curr)) { + if (BA_ORDER(curr) == (unsigned char)order) { + /* set the not free bit and clear others */ + best_fit = curr; + break; + } + if (BA_ORDER(curr) > (unsigned char)order && + (best_fit < 0 || + BA_ORDER(curr) < BA_ORDER(best_fit))) + best_fit = curr; + } + curr = BA_NEXT_INDEX(curr); + } + + /* if best_fit < 0, there are no suitable slots, + * return an error + */ + if (best_fit < 0) + return -1; + + /* now partition the best fit: + * split the slot into 2 buddies of order - 1 + * repeat until the slot is of the correct order + */ + while (BA_ORDER(best_fit) > (unsigned char)order) { + int buddy; + BA_ORDER(best_fit) -= 1; + buddy = BA_BUDDY_INDEX(best_fit); + BA_ORDER(buddy) = BA_ORDER(best_fit); + } + ba.bitmap[best_fit].allocated = 1; + return best_fit; +} + +unsigned long ba_start_addr(int index) +{ + return BA_START_ADDR(index); +} + +unsigned long ba_len(int index) +{ + return BA_LEN(index); +} diff --git a/linker/ba.h b/linker/ba.h new file mode 100644 index 000000000..78f462610 --- /dev/null +++ b/linker/ba.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __LINKER_BA_H +#define __LINKER_BA_H + +extern void ba_init(void); +extern int ba_allocate(unsigned long len); +extern int ba_free(int index); +extern unsigned long ba_start_addr(int index); +extern unsigned long ba_len(int index); + +#endif diff --git a/linker/linker.c b/linker/linker.c index 7b1983532..91435de19 100644 --- a/linker/linker.c +++ b/linker/linker.c @@ -49,6 +49,8 @@ #include "linker.h" #include "linker_debug.h" +#include "ba.h" + #define SO_MAX 64 /* >>> IMPORTANT NOTE - READ ME BEFORE MODIFYING <<< @@ -110,7 +112,8 @@ extern void __attribute__((noinline)) rtld_db_dlactivity(void); extern void sched_yield(void); -static struct r_debug _r_debug = {1, NULL, &rtld_db_dlactivity, RT_CONSISTENT, 0}; +static struct r_debug _r_debug = {1, NULL, &rtld_db_dlactivity, + RT_CONSISTENT, 0}; static struct link_map *r_debug_tail = 0; //static pthread_mutex_t _r_debug_lock = PTHREAD_MUTEX_INITIALIZER; @@ -207,6 +210,7 @@ static soinfo *alloc_info(const char *name) memset(si, 0, sizeof(soinfo)); strcpy((char*) si->name, name); sonext->next = si; + si->ba_index = -1; /* by default, prelinked */ si->next = NULL; si->refcount = 0; sonext = si; @@ -478,8 +482,6 @@ static int open_library(const char *name) return -1; } -static unsigned libbase = LIBBASE; - /* temporary space for holding the first page of the shared lib * which contains the elf header (with the pht). */ static unsigned char __header[PAGE_SIZE]; @@ -625,64 +627,67 @@ get_lib_extents(int fd, const char *name, void *__hdr, unsigned *total_sz) * segments into the correct locations within this memory range. * * Args: - * req_base: The requested base of the allocation. If 0, a sane one will be + * si->base: The requested base of the allocation. If 0, a sane one will be * chosen in the range LIBBASE <= base < LIBLAST. - * sz: The size of the allocation. + * si->size: The size of the allocation. * * Returns: - * NULL on failure, and non-NULL pointer to memory region on success. + * -1 on failure, and 0 on success. On success, si->base will contain + * the virtual address at which the library will be mapped. */ -static void * -alloc_mem_region(const char *name, unsigned req_base, unsigned sz) + +static int reserve_mem_region(soinfo *si) { - void *base; + void *base = mmap((void *)si->base, si->size, PROT_READ | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (base == MAP_FAILED) { + ERROR("%5d can NOT map (%sprelinked) library '%s' at 0x%08x " + "as requested, will try general pool: %d (%s)\n", + pid, (si->base ? "" : "non-"), si->name, si->base, + errno, strerror(errno)); + return -1; + } else if (base != (void *)si->base) { + ERROR("OOPS: %5d %sprelinked library '%s' mapped at 0x%08x, " + "not at 0x%08x\n", pid, (si->base ? "" : "non-"), + si->name, (unsigned)base, si->base); + munmap(base, si->size); + return -1; + } + return 0; +} - if (req_base) { - /* we should probably map it as PROT_NONE, but the init code needs - * to read the phdr, so mark everything as readable. */ - base = mmap((void *)req_base, sz, PROT_READ | PROT_EXEC, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (base == MAP_FAILED) { - WARN("%5d can NOT map (prelinked) library '%s' at 0x%08x " - "as requested, will try general pool: %d (%s)\n", - pid, name, req_base, errno, strerror(errno)); - } else if (base != (void *)req_base) { - ERROR("OOPS: %5d prelinked library '%s' mapped at 0x%08x, " - "not at 0x%08x\n", pid, name, (unsigned)base, req_base); - munmap(base, sz); - return NULL; - } - - /* Here we know that we got a valid allocation. Hooray! */ - return base; +static int +alloc_mem_region(soinfo *si) +{ + if (si->base) { + /* Attempt to mmap a prelinked library. */ + si->ba_index = -1; + return reserve_mem_region(si); } - /* We either did not request a specific base address to map at - * (i.e. not-prelinked) OR we could not map at the requested address. - * Try to find a memory range in our "reserved" area that can be mapped. - */ - while(libbase < LIBLAST) { - base = mmap((void*) libbase, sz, PROT_READ | PROT_EXEC, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - - if(((unsigned)base) == libbase) { - /* success -- got the address we wanted */ - return base; + /* This is not a prelinked library, so we attempt to allocate space + for it from the buddy allocator, which manages the area between + LIBBASE and LIBLAST. + */ + si->ba_index = ba_allocate(si->size); + if(si->ba_index >= 0) { + si->base = ba_start_addr(si->ba_index); + PRINT("%5d mapping library '%s' at %08x (index %d) " \ + "through buddy allocator.\n", + pid, si->name, si->base, si->ba_index); + if (reserve_mem_region(si) < 0) { + ba_free(si->ba_index); + si->ba_index = -1; + si->base = 0; + goto err; } - - /* If we got a different address than requested (rather than - * just a failure), we need to unmap the mismapped library - * before trying again - */ - if(base != MAP_FAILED) - munmap(base, sz); - - libbase += LIBINC; + return 0; } +err: ERROR("OOPS: %5d cannot map library '%s'. no vspace available.\n", - pid, name); - return NULL; + pid, si->name); + return -1; } #define MAYBE_MAP_FLAG(x,from,to) (((x) & (from)) ? (to) : 0) @@ -912,8 +917,7 @@ load_library(const char *name) int cnt; unsigned ext_sz; unsigned req_base; - void *base; - soinfo *si; + soinfo *si = NULL; Elf32_Ehdr *hdr; if(fd == -1) @@ -939,14 +943,6 @@ load_library(const char *name) TRACE("[ %5d - '%s' (%s) wants base=0x%08x sz=0x%08x ]\n", pid, name, (req_base ? "prelinked" : "not pre-linked"), req_base, ext_sz); - /* Carve out a chunk of memory where we will map in the individual - * segments */ - base = alloc_mem_region(name, req_base, ext_sz); - if (base == NULL) - goto fail; - TRACE("[ %5d allocated memory for %s @ %p (0x%08x) ]\n", - pid, name, base, (unsigned) ext_sz); - /* Now configure the soinfo struct where we'll store all of our data * for the ELF object. If the loading fails, we waste the entry, but * same thing would happen if we failed during linking. Configuring the @@ -956,19 +952,31 @@ load_library(const char *name) if (si == NULL) goto fail; - si->base = (unsigned)base; + /* Carve out a chunk of memory where we will map in the individual + * segments */ + si->base = req_base; si->size = ext_sz; si->flags = 0; si->entry = 0; si->dynamic = (unsigned *)-1; + if (alloc_mem_region(si) < 0) + goto fail; + + TRACE("[ %5d allocated memory for %s @ %p (0x%08x) ]\n", + pid, name, (void *)si->base, (unsigned) ext_sz); /* Now actually load the library's segments into right places in memory */ - if (load_segments(fd, &__header[0], si) < 0) + if (load_segments(fd, &__header[0], si) < 0) { + if (si->ba_index >= 0) { + ba_free(si->ba_index); + si->ba_index = -1; + } goto fail; + } /* this might not be right. Technically, we don't even need this info * once we go through 'load_segments'. */ - hdr = (Elf32_Ehdr *)base; + hdr = (Elf32_Ehdr *)si->base; si->phdr = (Elf32_Phdr *)((unsigned char *)si->base + hdr->e_phoff); si->phnum = hdr->e_phnum; /**/ @@ -977,6 +985,7 @@ load_library(const char *name) return si; fail: + if (si) free_info(si); close(fd); return NULL; } @@ -985,8 +994,6 @@ static soinfo * init_library(soinfo *si) { unsigned wr_offset = 0xffffffff; - unsigned libbase_before = 0; - unsigned libbase_after = 0; /* At this point we know that whatever is loaded @ base is a valid ELF * shared library whose segments are properly mapped in. */ @@ -996,24 +1003,10 @@ init_library(soinfo *si) if (si->base < LIBBASE || si->base >= LIBLAST) si->flags |= FLAG_PRELINKED; - /* Adjust libbase for the size of this library, rounded up to - ** LIBINC alignment. Make note of the previous and current - ** value of libbase to allow us to roll back in the event of - ** a link failure. - */ - if (!(si->flags & FLAG_PRELINKED)) { - libbase_before = libbase; - libbase += (si->size + (LIBINC - 1)) & (~(LIBINC - 1)); - libbase_after = libbase; - } - if(link_image(si, wr_offset)) { /* We failed to link. However, we can only restore libbase ** if no additional libraries have moved it since we updated it. */ - if(!(si->flags & FLAG_PRELINKED) && (libbase == libbase_after)) { - libbase = libbase_before; - } munmap((void *)si->base, si->size); return NULL; } @@ -1067,6 +1060,12 @@ unsigned unload_library(soinfo *si) } munmap((char *)si->base, si->size); + if (si->ba_index >= 0) { + PRINT("%5d releasing library '%s' address space at %08x "\ + "through buddy allocator.\n", + pid, si->name, si->base); + ba_free(si->ba_index); + } free_info(si); si->refcount = 0; } @@ -1708,6 +1707,8 @@ unsigned __linker_init(unsigned **elfdata) vecs += 2; } + ba_init(); + si->base = 0; si->dynamic = (unsigned *)-1; si->wrprotect_start = 0xffffffff; diff --git a/linker/linker.h b/linker/linker.h index 3ad510408..d80c7614e 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -95,6 +95,8 @@ struct soinfo unsigned entry; unsigned base; unsigned size; + // buddy-allocator index, negative for prelinked libraries + int ba_index; unsigned *dynamic; diff --git a/linker/linker_debug.h b/linker/linker_debug.h index 6e396fd6c..3cc1343af 100644 --- a/linker/linker_debug.h +++ b/linker/linker_debug.h @@ -35,8 +35,8 @@ * this on when submitting back to repository */ #define LINKER_DEBUG 0 #define TRACE_DEBUG 0 -#define DO_TRACE_LOOKUP 1 -#define DO_TRACE_RELO 1 +#define DO_TRACE_LOOKUP 0 +#define DO_TRACE_RELO 0 #define TIMING 0 #define STATS 0 #define COUNT_PAGES 0 From a799b53f10e5a6fd51fef4436cfb7ec99836a516 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 3 Mar 2009 14:03:51 -0800 Subject: [PATCH 6/8] auto import from //depot/cupcake/@132589 --- libc/bionic/pthread-timers.c | 19 ++-- linker/Android.mk | 7 +- linker/ba.c | 180 ----------------------------------- linker/ba.h | 38 -------- linker/linker.c | 161 ++++++++++++++++--------------- linker/linker.h | 2 - linker/linker_debug.h | 4 +- 7 files changed, 92 insertions(+), 319 deletions(-) delete mode 100644 linker/ba.c delete mode 100644 linker/ba.h diff --git a/libc/bionic/pthread-timers.c b/libc/bionic/pthread-timers.c index 7b9c99e1c..818b47dd8 100644 --- a/libc/bionic/pthread-timers.c +++ b/libc/bionic/pthread-timers.c @@ -485,19 +485,16 @@ timer_settime( timer_t id, timer_gettime_internal(timer, ospec ); } - /* compute next expiration time. note that if the - * new it_interval is 0, we should disarm the timer - */ + /* compute next expiration time */ expires = spec->it_value; - if (!timespec_is_zero(&expires)) { - clock_gettime( timer->clock, &now ); - if (!(flags & TIMER_ABSTIME)) { - timespec_add(&expires, &now); - } else { - if (timespec_cmp(&expires, &now) < 0) - expires = now; - } + clock_gettime( timer->clock, &now ); + if (!(flags & TIMER_ABSTIME)) { + timespec_add(&expires, &now); + } else { + if (timespec_cmp(&expires, &now) < 0) + expires = now; } + timer->expires = expires; timer->period = spec->it_interval; thr_timer_unlock( timer ); diff --git a/linker/Android.mk b/linker/Android.mk index 48141bef5..98eceda14 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -6,8 +6,7 @@ LOCAL_SRC_FILES:= \ linker.c \ rt.c \ dlfcn.c \ - debugger.c \ - ba.c + debugger.c LINKER_TEXT_BASE := 0xB0000100 @@ -17,9 +16,7 @@ LINKER_AREA_SIZE := 0x01000000 LOCAL_LDFLAGS := -Wl,-Ttext,$(LINKER_TEXT_BASE) -LOCAL_CFLAGS += -DPRELINK -LOCAL_CFLAGS += -DLINKER_TEXT_BASE=$(LINKER_TEXT_BASE) -LOCAL_CFLAGS += -DLINKER_AREA_SIZE=$(LINKER_AREA_SIZE) +LOCAL_CFLAGS += -DPRELINK -DLINKER_TEXT_BASE=$(LINKER_TEXT_BASE) -DLINKER_AREA_SIZE=$(LINKER_AREA_SIZE) # we need to access the Bionic private header # in the linker diff --git a/linker/ba.c b/linker/ba.c deleted file mode 100644 index bea6f849d..000000000 --- a/linker/ba.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "linker.h" -#include "linker_debug.h" -#include "ba.h" - -struct ba_bits { - unsigned allocated:1; /* 1 if allocated, 0 if free */ - unsigned order:7; /* size of the region in ba space */ -}; - -struct ba_info { - /* start address of the ba space */ - unsigned long base; - /* total size of the ba space */ - unsigned long size; - /* number of entries in the ba space */ - int num_entries; - /* the bitmap for the region indicating which entries are allocated - * and which are free */ - struct ba_bits *bitmap; -}; - -#undef min -#define min(a,b) ((a)<(b)?(a):(b)) - -#define BA_MIN_ALLOC LIBINC -#define BA_MAX_ORDER 128 -#define BA_START LIBBASE -#define BA_SIZE (LIBLAST - LIBBASE) - -#define BA_IS_FREE(index) (!(ba.bitmap[index].allocated)) -#define BA_ORDER(index) ba.bitmap[index].order -#define BA_BUDDY_INDEX(index) ((index) ^ (1 << BA_ORDER(index))) -#define BA_NEXT_INDEX(index) ((index) + (1 << BA_ORDER(index))) -#define BA_OFFSET(index) ((index) * BA_MIN_ALLOC) -#define BA_START_ADDR(index) (BA_OFFSET(index) + ba.base) -#define BA_LEN(index) ((1 << BA_ORDER(index)) * BA_MIN_ALLOC) - -static struct ba_bits ba_bitmap[BA_SIZE / BA_MIN_ALLOC]; - -static struct ba_info ba = { - .base = BA_START, - .size = BA_SIZE, - .bitmap = ba_bitmap, - .num_entries = sizeof(ba_bitmap)/sizeof(ba_bitmap[0]), -}; - -void ba_init(void) -{ - int i, index = 0; - for (i = sizeof(ba.num_entries) * 8 - 1; i >= 0; i--) { - if (ba.num_entries & 1<> i == 0) - break; - return i; -} - -int ba_allocate(unsigned long len) -{ - int curr = 0; - int end = ba.num_entries; - int best_fit = -1; - unsigned long order = ba_order(len); - - if (order > BA_MAX_ORDER) - return -1; - - /* look through the bitmap: - * if you find a free slot of the correct order use it - * otherwise, use the best fit (smallest with size > order) slot - */ - while (curr < end) { - if (BA_IS_FREE(curr)) { - if (BA_ORDER(curr) == (unsigned char)order) { - /* set the not free bit and clear others */ - best_fit = curr; - break; - } - if (BA_ORDER(curr) > (unsigned char)order && - (best_fit < 0 || - BA_ORDER(curr) < BA_ORDER(best_fit))) - best_fit = curr; - } - curr = BA_NEXT_INDEX(curr); - } - - /* if best_fit < 0, there are no suitable slots, - * return an error - */ - if (best_fit < 0) - return -1; - - /* now partition the best fit: - * split the slot into 2 buddies of order - 1 - * repeat until the slot is of the correct order - */ - while (BA_ORDER(best_fit) > (unsigned char)order) { - int buddy; - BA_ORDER(best_fit) -= 1; - buddy = BA_BUDDY_INDEX(best_fit); - BA_ORDER(buddy) = BA_ORDER(best_fit); - } - ba.bitmap[best_fit].allocated = 1; - return best_fit; -} - -unsigned long ba_start_addr(int index) -{ - return BA_START_ADDR(index); -} - -unsigned long ba_len(int index) -{ - return BA_LEN(index); -} diff --git a/linker/ba.h b/linker/ba.h deleted file mode 100644 index 78f462610..000000000 --- a/linker/ba.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef __LINKER_BA_H -#define __LINKER_BA_H - -extern void ba_init(void); -extern int ba_allocate(unsigned long len); -extern int ba_free(int index); -extern unsigned long ba_start_addr(int index); -extern unsigned long ba_len(int index); - -#endif diff --git a/linker/linker.c b/linker/linker.c index 91435de19..7b1983532 100644 --- a/linker/linker.c +++ b/linker/linker.c @@ -49,8 +49,6 @@ #include "linker.h" #include "linker_debug.h" -#include "ba.h" - #define SO_MAX 64 /* >>> IMPORTANT NOTE - READ ME BEFORE MODIFYING <<< @@ -112,8 +110,7 @@ extern void __attribute__((noinline)) rtld_db_dlactivity(void); extern void sched_yield(void); -static struct r_debug _r_debug = {1, NULL, &rtld_db_dlactivity, - RT_CONSISTENT, 0}; +static struct r_debug _r_debug = {1, NULL, &rtld_db_dlactivity, RT_CONSISTENT, 0}; static struct link_map *r_debug_tail = 0; //static pthread_mutex_t _r_debug_lock = PTHREAD_MUTEX_INITIALIZER; @@ -210,7 +207,6 @@ static soinfo *alloc_info(const char *name) memset(si, 0, sizeof(soinfo)); strcpy((char*) si->name, name); sonext->next = si; - si->ba_index = -1; /* by default, prelinked */ si->next = NULL; si->refcount = 0; sonext = si; @@ -482,6 +478,8 @@ static int open_library(const char *name) return -1; } +static unsigned libbase = LIBBASE; + /* temporary space for holding the first page of the shared lib * which contains the elf header (with the pht). */ static unsigned char __header[PAGE_SIZE]; @@ -627,67 +625,64 @@ get_lib_extents(int fd, const char *name, void *__hdr, unsigned *total_sz) * segments into the correct locations within this memory range. * * Args: - * si->base: The requested base of the allocation. If 0, a sane one will be + * req_base: The requested base of the allocation. If 0, a sane one will be * chosen in the range LIBBASE <= base < LIBLAST. - * si->size: The size of the allocation. + * sz: The size of the allocation. * * Returns: - * -1 on failure, and 0 on success. On success, si->base will contain - * the virtual address at which the library will be mapped. + * NULL on failure, and non-NULL pointer to memory region on success. */ - -static int reserve_mem_region(soinfo *si) +static void * +alloc_mem_region(const char *name, unsigned req_base, unsigned sz) { - void *base = mmap((void *)si->base, si->size, PROT_READ | PROT_EXEC, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (base == MAP_FAILED) { - ERROR("%5d can NOT map (%sprelinked) library '%s' at 0x%08x " - "as requested, will try general pool: %d (%s)\n", - pid, (si->base ? "" : "non-"), si->name, si->base, - errno, strerror(errno)); - return -1; - } else if (base != (void *)si->base) { - ERROR("OOPS: %5d %sprelinked library '%s' mapped at 0x%08x, " - "not at 0x%08x\n", pid, (si->base ? "" : "non-"), - si->name, (unsigned)base, si->base); - munmap(base, si->size); - return -1; - } - return 0; -} + void *base; -static int -alloc_mem_region(soinfo *si) -{ - if (si->base) { - /* Attempt to mmap a prelinked library. */ - si->ba_index = -1; - return reserve_mem_region(si); - } - - /* This is not a prelinked library, so we attempt to allocate space - for it from the buddy allocator, which manages the area between - LIBBASE and LIBLAST. - */ - si->ba_index = ba_allocate(si->size); - if(si->ba_index >= 0) { - si->base = ba_start_addr(si->ba_index); - PRINT("%5d mapping library '%s' at %08x (index %d) " \ - "through buddy allocator.\n", - pid, si->name, si->base, si->ba_index); - if (reserve_mem_region(si) < 0) { - ba_free(si->ba_index); - si->ba_index = -1; - si->base = 0; - goto err; + if (req_base) { + /* we should probably map it as PROT_NONE, but the init code needs + * to read the phdr, so mark everything as readable. */ + base = mmap((void *)req_base, sz, PROT_READ | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (base == MAP_FAILED) { + WARN("%5d can NOT map (prelinked) library '%s' at 0x%08x " + "as requested, will try general pool: %d (%s)\n", + pid, name, req_base, errno, strerror(errno)); + } else if (base != (void *)req_base) { + ERROR("OOPS: %5d prelinked library '%s' mapped at 0x%08x, " + "not at 0x%08x\n", pid, name, (unsigned)base, req_base); + munmap(base, sz); + return NULL; } - return 0; + + /* Here we know that we got a valid allocation. Hooray! */ + return base; + } + + /* We either did not request a specific base address to map at + * (i.e. not-prelinked) OR we could not map at the requested address. + * Try to find a memory range in our "reserved" area that can be mapped. + */ + while(libbase < LIBLAST) { + base = mmap((void*) libbase, sz, PROT_READ | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + if(((unsigned)base) == libbase) { + /* success -- got the address we wanted */ + return base; + } + + /* If we got a different address than requested (rather than + * just a failure), we need to unmap the mismapped library + * before trying again + */ + if(base != MAP_FAILED) + munmap(base, sz); + + libbase += LIBINC; } -err: ERROR("OOPS: %5d cannot map library '%s'. no vspace available.\n", - pid, si->name); - return -1; + pid, name); + return NULL; } #define MAYBE_MAP_FLAG(x,from,to) (((x) & (from)) ? (to) : 0) @@ -917,7 +912,8 @@ load_library(const char *name) int cnt; unsigned ext_sz; unsigned req_base; - soinfo *si = NULL; + void *base; + soinfo *si; Elf32_Ehdr *hdr; if(fd == -1) @@ -943,6 +939,14 @@ load_library(const char *name) TRACE("[ %5d - '%s' (%s) wants base=0x%08x sz=0x%08x ]\n", pid, name, (req_base ? "prelinked" : "not pre-linked"), req_base, ext_sz); + /* Carve out a chunk of memory where we will map in the individual + * segments */ + base = alloc_mem_region(name, req_base, ext_sz); + if (base == NULL) + goto fail; + TRACE("[ %5d allocated memory for %s @ %p (0x%08x) ]\n", + pid, name, base, (unsigned) ext_sz); + /* Now configure the soinfo struct where we'll store all of our data * for the ELF object. If the loading fails, we waste the entry, but * same thing would happen if we failed during linking. Configuring the @@ -952,31 +956,19 @@ load_library(const char *name) if (si == NULL) goto fail; - /* Carve out a chunk of memory where we will map in the individual - * segments */ - si->base = req_base; + si->base = (unsigned)base; si->size = ext_sz; si->flags = 0; si->entry = 0; si->dynamic = (unsigned *)-1; - if (alloc_mem_region(si) < 0) - goto fail; - - TRACE("[ %5d allocated memory for %s @ %p (0x%08x) ]\n", - pid, name, (void *)si->base, (unsigned) ext_sz); /* Now actually load the library's segments into right places in memory */ - if (load_segments(fd, &__header[0], si) < 0) { - if (si->ba_index >= 0) { - ba_free(si->ba_index); - si->ba_index = -1; - } + if (load_segments(fd, &__header[0], si) < 0) goto fail; - } /* this might not be right. Technically, we don't even need this info * once we go through 'load_segments'. */ - hdr = (Elf32_Ehdr *)si->base; + hdr = (Elf32_Ehdr *)base; si->phdr = (Elf32_Phdr *)((unsigned char *)si->base + hdr->e_phoff); si->phnum = hdr->e_phnum; /**/ @@ -985,7 +977,6 @@ load_library(const char *name) return si; fail: - if (si) free_info(si); close(fd); return NULL; } @@ -994,6 +985,8 @@ static soinfo * init_library(soinfo *si) { unsigned wr_offset = 0xffffffff; + unsigned libbase_before = 0; + unsigned libbase_after = 0; /* At this point we know that whatever is loaded @ base is a valid ELF * shared library whose segments are properly mapped in. */ @@ -1003,10 +996,24 @@ init_library(soinfo *si) if (si->base < LIBBASE || si->base >= LIBLAST) si->flags |= FLAG_PRELINKED; + /* Adjust libbase for the size of this library, rounded up to + ** LIBINC alignment. Make note of the previous and current + ** value of libbase to allow us to roll back in the event of + ** a link failure. + */ + if (!(si->flags & FLAG_PRELINKED)) { + libbase_before = libbase; + libbase += (si->size + (LIBINC - 1)) & (~(LIBINC - 1)); + libbase_after = libbase; + } + if(link_image(si, wr_offset)) { /* We failed to link. However, we can only restore libbase ** if no additional libraries have moved it since we updated it. */ + if(!(si->flags & FLAG_PRELINKED) && (libbase == libbase_after)) { + libbase = libbase_before; + } munmap((void *)si->base, si->size); return NULL; } @@ -1060,12 +1067,6 @@ unsigned unload_library(soinfo *si) } munmap((char *)si->base, si->size); - if (si->ba_index >= 0) { - PRINT("%5d releasing library '%s' address space at %08x "\ - "through buddy allocator.\n", - pid, si->name, si->base); - ba_free(si->ba_index); - } free_info(si); si->refcount = 0; } @@ -1707,8 +1708,6 @@ unsigned __linker_init(unsigned **elfdata) vecs += 2; } - ba_init(); - si->base = 0; si->dynamic = (unsigned *)-1; si->wrprotect_start = 0xffffffff; diff --git a/linker/linker.h b/linker/linker.h index d80c7614e..3ad510408 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -95,8 +95,6 @@ struct soinfo unsigned entry; unsigned base; unsigned size; - // buddy-allocator index, negative for prelinked libraries - int ba_index; unsigned *dynamic; diff --git a/linker/linker_debug.h b/linker/linker_debug.h index 3cc1343af..6e396fd6c 100644 --- a/linker/linker_debug.h +++ b/linker/linker_debug.h @@ -35,8 +35,8 @@ * this on when submitting back to repository */ #define LINKER_DEBUG 0 #define TRACE_DEBUG 0 -#define DO_TRACE_LOOKUP 0 -#define DO_TRACE_RELO 0 +#define DO_TRACE_LOOKUP 1 +#define DO_TRACE_RELO 1 #define TIMING 0 #define STATS 0 #define COUNT_PAGES 0 From 1767f908af327fa388b1c66883760ad851267013 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 3 Mar 2009 18:28:13 -0800 Subject: [PATCH 7/8] auto import from //depot/cupcake/@135843 --- Android.mk | 19 - libc/Android.mk | 573 -- libc/CAVEATS | 26 - libc/Jamfile | 441 -- libc/MODULE_LICENSE_BSD | 0 libc/NOTICE | 382 -- libc/README | 53 - libc/SYSCALLS.TXT | 245 - libc/arch-arm/bionic/__get_pc.S | 33 - libc/arch-arm/bionic/__get_sp.S | 33 - .../bionic/_exit_with_stack_teardown.S | 55 - libc/arch-arm/bionic/_setjmp.S | 106 - libc/arch-arm/bionic/atomics_arm.S | 178 - libc/arch-arm/bionic/clone.S | 74 - libc/arch-arm/bionic/crtbegin_dynamic.S | 92 - libc/arch-arm/bionic/crtbegin_static.S | 92 - libc/arch-arm/bionic/crtend.S | 40 - libc/arch-arm/bionic/exidx_dynamic.c | 47 - libc/arch-arm/bionic/exidx_static.c | 45 - libc/arch-arm/bionic/ffs.S | 82 - libc/arch-arm/bionic/kill.S | 53 - libc/arch-arm/bionic/memcmp.S | 285 - libc/arch-arm/bionic/memcmp16.S | 236 - libc/arch-arm/bionic/memcpy.S | 387 -- libc/arch-arm/bionic/memset.S | 117 - libc/arch-arm/bionic/setjmp.S | 136 - libc/arch-arm/bionic/sigsetjmp.S | 62 - libc/arch-arm/bionic/strlen.c | 129 - libc/arch-arm/bionic/syscall.S | 71 - libc/arch-arm/bionic/tkill.S | 53 - libc/arch-arm/include/endian.h | 10 - libc/arch-arm/include/machine/_types.h | 127 - libc/arch-arm/include/machine/asm.h | 130 - libc/arch-arm/include/machine/cdefs.h | 19 - libc/arch-arm/include/machine/cpu-features.h | 164 - libc/arch-arm/include/machine/exec.h | 50 - libc/arch-arm/include/machine/ieee.h | 191 - .../arch-arm/include/machine/internal_types.h | 10 - libc/arch-arm/include/machine/kernel.h | 42 - libc/arch-arm/include/machine/limits.h | 63 - libc/arch-arm/include/machine/setjmp.h | 87 - libc/arch-arm/syscalls.mk | 170 - libc/arch-arm/syscalls/__brk.S | 19 - libc/arch-arm/syscalls/__clone.S | 19 - libc/arch-arm/syscalls/__fcntl.S | 19 - libc/arch-arm/syscalls/__fcntl64.S | 19 - libc/arch-arm/syscalls/__fork.S | 19 - libc/arch-arm/syscalls/__getcwd.S | 19 - libc/arch-arm/syscalls/__getpriority.S | 19 - libc/arch-arm/syscalls/__ioctl.S | 19 - libc/arch-arm/syscalls/__llseek.S | 21 - libc/arch-arm/syscalls/__mmap2.S | 21 - libc/arch-arm/syscalls/__open.S | 19 - libc/arch-arm/syscalls/__openat.S | 19 - libc/arch-arm/syscalls/__pread64.S | 21 - libc/arch-arm/syscalls/__ptrace.S | 19 - libc/arch-arm/syscalls/__pwrite64.S | 21 - libc/arch-arm/syscalls/__reboot.S | 19 - libc/arch-arm/syscalls/__rt_sigaction.S | 19 - libc/arch-arm/syscalls/__rt_sigprocmask.S | 19 - libc/arch-arm/syscalls/__rt_sigtimedwait.S | 19 - libc/arch-arm/syscalls/__set_tls.S | 19 - libc/arch-arm/syscalls/__sigsuspend.S | 19 - libc/arch-arm/syscalls/__statfs64.S | 19 - libc/arch-arm/syscalls/__syslog.S | 19 - libc/arch-arm/syscalls/__timer_create.S | 19 - libc/arch-arm/syscalls/__timer_delete.S | 19 - libc/arch-arm/syscalls/__timer_getoverrun.S | 19 - libc/arch-arm/syscalls/__timer_gettime.S | 19 - libc/arch-arm/syscalls/__timer_settime.S | 19 - libc/arch-arm/syscalls/__wait4.S | 19 - libc/arch-arm/syscalls/_exit.S | 19 - libc/arch-arm/syscalls/_exit_thread.S | 19 - libc/arch-arm/syscalls/accept.S | 19 - libc/arch-arm/syscalls/access.S | 19 - libc/arch-arm/syscalls/acct.S | 19 - libc/arch-arm/syscalls/bind.S | 19 - libc/arch-arm/syscalls/cacheflush.S | 19 - libc/arch-arm/syscalls/capget.S | 19 - libc/arch-arm/syscalls/capset.S | 19 - libc/arch-arm/syscalls/chdir.S | 19 - libc/arch-arm/syscalls/chmod.S | 19 - libc/arch-arm/syscalls/chown.S | 19 - libc/arch-arm/syscalls/chroot.S | 19 - libc/arch-arm/syscalls/clock_getres.S | 19 - libc/arch-arm/syscalls/clock_gettime.S | 19 - libc/arch-arm/syscalls/clock_nanosleep.S | 19 - libc/arch-arm/syscalls/clock_settime.S | 19 - libc/arch-arm/syscalls/close.S | 19 - libc/arch-arm/syscalls/connect.S | 19 - libc/arch-arm/syscalls/delete_module.S | 19 - libc/arch-arm/syscalls/dup.S | 19 - libc/arch-arm/syscalls/dup2.S | 19 - libc/arch-arm/syscalls/epoll_create.S | 19 - libc/arch-arm/syscalls/epoll_ctl.S | 19 - libc/arch-arm/syscalls/epoll_wait.S | 19 - libc/arch-arm/syscalls/execve.S | 19 - libc/arch-arm/syscalls/fchdir.S | 19 - libc/arch-arm/syscalls/fchmod.S | 19 - libc/arch-arm/syscalls/fchmodat.S | 19 - libc/arch-arm/syscalls/fchown.S | 19 - libc/arch-arm/syscalls/fchownat.S | 21 - libc/arch-arm/syscalls/flock.S | 19 - libc/arch-arm/syscalls/fstat.S | 19 - libc/arch-arm/syscalls/fstatat.S | 19 - libc/arch-arm/syscalls/fstatfs.S | 19 - libc/arch-arm/syscalls/fsync.S | 19 - libc/arch-arm/syscalls/ftruncate.S | 19 - libc/arch-arm/syscalls/futex.S | 21 - libc/arch-arm/syscalls/getdents.S | 19 - libc/arch-arm/syscalls/getegid.S | 19 - libc/arch-arm/syscalls/geteuid.S | 19 - libc/arch-arm/syscalls/getgid.S | 19 - libc/arch-arm/syscalls/getgroups.S | 19 - libc/arch-arm/syscalls/getitimer.S | 19 - libc/arch-arm/syscalls/getpeername.S | 19 - libc/arch-arm/syscalls/getpgid.S | 19 - libc/arch-arm/syscalls/getpid.S | 19 - libc/arch-arm/syscalls/getppid.S | 19 - libc/arch-arm/syscalls/getresgid.S | 19 - libc/arch-arm/syscalls/getresuid.S | 19 - libc/arch-arm/syscalls/getrlimit.S | 19 - libc/arch-arm/syscalls/getrusage.S | 19 - libc/arch-arm/syscalls/getsockname.S | 19 - libc/arch-arm/syscalls/getsockopt.S | 21 - libc/arch-arm/syscalls/gettid.S | 19 - libc/arch-arm/syscalls/gettimeofday.S | 19 - libc/arch-arm/syscalls/getuid.S | 19 - libc/arch-arm/syscalls/init_module.S | 19 - libc/arch-arm/syscalls/inotify_add_watch.S | 19 - libc/arch-arm/syscalls/inotify_init.S | 19 - libc/arch-arm/syscalls/inotify_rm_watch.S | 19 - libc/arch-arm/syscalls/klogctl.S | 19 - libc/arch-arm/syscalls/lchown.S | 19 - libc/arch-arm/syscalls/link.S | 19 - libc/arch-arm/syscalls/listen.S | 19 - libc/arch-arm/syscalls/lseek.S | 19 - libc/arch-arm/syscalls/lstat.S | 19 - libc/arch-arm/syscalls/madvise.S | 19 - libc/arch-arm/syscalls/mincore.S | 19 - libc/arch-arm/syscalls/mkdir.S | 19 - libc/arch-arm/syscalls/mkdirat.S | 19 - libc/arch-arm/syscalls/mknod.S | 19 - libc/arch-arm/syscalls/mlock.S | 19 - libc/arch-arm/syscalls/mount.S | 21 - libc/arch-arm/syscalls/mprotect.S | 19 - libc/arch-arm/syscalls/mremap.S | 19 - libc/arch-arm/syscalls/msync.S | 19 - libc/arch-arm/syscalls/munlock.S | 19 - libc/arch-arm/syscalls/munmap.S | 19 - libc/arch-arm/syscalls/nanosleep.S | 19 - libc/arch-arm/syscalls/pause.S | 19 - libc/arch-arm/syscalls/pipe.S | 19 - libc/arch-arm/syscalls/poll.S | 19 - libc/arch-arm/syscalls/prctl.S | 21 - libc/arch-arm/syscalls/read.S | 19 - libc/arch-arm/syscalls/readlink.S | 19 - libc/arch-arm/syscalls/readv.S | 19 - libc/arch-arm/syscalls/recvfrom.S | 21 - libc/arch-arm/syscalls/recvmsg.S | 19 - libc/arch-arm/syscalls/rename.S | 19 - libc/arch-arm/syscalls/renameat.S | 19 - libc/arch-arm/syscalls/rmdir.S | 19 - .../syscalls/sched_get_priority_max.S | 19 - .../syscalls/sched_get_priority_min.S | 19 - libc/arch-arm/syscalls/sched_getparam.S | 19 - libc/arch-arm/syscalls/sched_getscheduler.S | 19 - .../arch-arm/syscalls/sched_rr_get_interval.S | 19 - libc/arch-arm/syscalls/sched_setparam.S | 19 - libc/arch-arm/syscalls/sched_setscheduler.S | 19 - libc/arch-arm/syscalls/sched_yield.S | 19 - libc/arch-arm/syscalls/select.S | 21 - libc/arch-arm/syscalls/sendfile.S | 19 - libc/arch-arm/syscalls/sendmsg.S | 19 - libc/arch-arm/syscalls/sendto.S | 21 - libc/arch-arm/syscalls/setgid.S | 19 - libc/arch-arm/syscalls/setgroups.S | 19 - libc/arch-arm/syscalls/setitimer.S | 19 - libc/arch-arm/syscalls/setpgid.S | 19 - libc/arch-arm/syscalls/setpriority.S | 19 - libc/arch-arm/syscalls/setregid.S | 19 - libc/arch-arm/syscalls/setresgid.S | 19 - libc/arch-arm/syscalls/setresuid.S | 19 - libc/arch-arm/syscalls/setreuid.S | 19 - libc/arch-arm/syscalls/setrlimit.S | 19 - libc/arch-arm/syscalls/setsid.S | 19 - libc/arch-arm/syscalls/setsockopt.S | 21 - libc/arch-arm/syscalls/settimeofday.S | 19 - libc/arch-arm/syscalls/setuid.S | 19 - libc/arch-arm/syscalls/shutdown.S | 19 - libc/arch-arm/syscalls/sigaction.S | 19 - libc/arch-arm/syscalls/sigpending.S | 19 - libc/arch-arm/syscalls/sigprocmask.S | 19 - libc/arch-arm/syscalls/socket.S | 19 - libc/arch-arm/syscalls/socketpair.S | 19 - libc/arch-arm/syscalls/stat.S | 19 - libc/arch-arm/syscalls/symlink.S | 19 - libc/arch-arm/syscalls/sync.S | 19 - libc/arch-arm/syscalls/times.S | 19 - libc/arch-arm/syscalls/truncate.S | 19 - libc/arch-arm/syscalls/umask.S | 19 - libc/arch-arm/syscalls/umount2.S | 19 - libc/arch-arm/syscalls/uname.S | 19 - libc/arch-arm/syscalls/unlink.S | 19 - libc/arch-arm/syscalls/unlinkat.S | 19 - libc/arch-arm/syscalls/utimes.S | 19 - libc/arch-arm/syscalls/vfork.S | 19 - libc/arch-arm/syscalls/waitid.S | 21 - libc/arch-arm/syscalls/write.S | 19 - libc/arch-arm/syscalls/writev.S | 19 - libc/arch-x86/bionic/__get_sp.S | 35 - libc/arch-x86/bionic/__get_tls.c | 37 - libc/arch-x86/bionic/__set_tls.c | 95 - .../bionic/_exit_with_stack_teardown.S | 34 - libc/arch-x86/bionic/_setjmp.S | 71 - libc/arch-x86/bionic/atomics_x86.S | 140 - libc/arch-x86/bionic/atomics_x86.c | 104 - libc/arch-x86/bionic/clone.S | 50 - libc/arch-x86/bionic/crtbegin_dynamic.S | 96 - libc/arch-x86/bionic/crtbegin_so.S | 29 - libc/arch-x86/bionic/crtbegin_static.S | 95 - libc/arch-x86/bionic/crtend.S | 13 - libc/arch-x86/bionic/crtend_so.S | 47 - libc/arch-x86/bionic/dl_iterate_phdr_static.c | 74 - libc/arch-x86/bionic/setjmp.S | 93 - libc/arch-x86/bionic/vfork.S | 30 - libc/arch-x86/include/endian.h | 70 - libc/arch-x86/include/machine/_types.h | 123 - libc/arch-x86/include/machine/asm.h | 124 - libc/arch-x86/include/machine/cdefs.h | 24 - libc/arch-x86/include/machine/exec.h | 51 - libc/arch-x86/include/machine/ieee.h | 133 - .../arch-x86/include/machine/internal_types.h | 6 - libc/arch-x86/include/machine/kernel.h | 41 - libc/arch-x86/include/machine/limits.h | 63 - libc/arch-x86/include/machine/setjmp.h | 8 - libc/arch-x86/string/bcmp.S | 32 - libc/arch-x86/string/bcopy.S | 93 - libc/arch-x86/string/bzero.S | 43 - libc/arch-x86/string/fss.S | 17 - libc/arch-x86/string/index.S | 26 - libc/arch-x86/string/memchr.S | 26 - libc/arch-x86/string/memcmp.S | 43 - libc/arch-x86/string/memcpy.S | 3 - libc/arch-x86/string/memmove.S | 3 - libc/arch-x86/string/memset.S | 55 - libc/arch-x86/string/rindex.S | 29 - libc/arch-x86/string/strcat.S | 73 - libc/arch-x86/string/strchr.S | 3 - libc/arch-x86/string/strcmp.S | 81 - libc/arch-x86/string/strcpy.S | 63 - libc/arch-x86/string/strlen.S | 20 - libc/arch-x86/string/strncmp.S | 113 - libc/arch-x86/string/strrchr.S | 3 - libc/arch-x86/string/swab.S | 67 - libc/arch-x86/syscalls.mk | 171 - libc/arch-x86/syscalls/__brk.S | 23 - libc/arch-x86/syscalls/__clone.S | 32 - libc/arch-x86/syscalls/__fcntl.S | 29 - libc/arch-x86/syscalls/__fcntl64.S | 29 - libc/arch-x86/syscalls/__fork.S | 23 - libc/arch-x86/syscalls/__getcwd.S | 26 - libc/arch-x86/syscalls/__getpriority.S | 26 - libc/arch-x86/syscalls/__ioctl.S | 29 - libc/arch-x86/syscalls/__llseek.S | 35 - libc/arch-x86/syscalls/__mmap2.S | 38 - libc/arch-x86/syscalls/__open.S | 29 - libc/arch-x86/syscalls/__openat.S | 32 - libc/arch-x86/syscalls/__pread64.S | 35 - libc/arch-x86/syscalls/__ptrace.S | 32 - libc/arch-x86/syscalls/__pwrite64.S | 35 - libc/arch-x86/syscalls/__reboot.S | 32 - libc/arch-x86/syscalls/__rt_sigaction.S | 32 - libc/arch-x86/syscalls/__rt_sigprocmask.S | 32 - libc/arch-x86/syscalls/__rt_sigtimedwait.S | 32 - libc/arch-x86/syscalls/__set_thread_area.S | 23 - libc/arch-x86/syscalls/__sigsuspend.S | 29 - libc/arch-x86/syscalls/__statfs64.S | 29 - libc/arch-x86/syscalls/__syslog.S | 29 - libc/arch-x86/syscalls/__timer_create.S | 29 - libc/arch-x86/syscalls/__timer_delete.S | 23 - libc/arch-x86/syscalls/__timer_getoverrun.S | 23 - libc/arch-x86/syscalls/__timer_gettime.S | 26 - libc/arch-x86/syscalls/__timer_settime.S | 32 - libc/arch-x86/syscalls/__wait4.S | 32 - libc/arch-x86/syscalls/_exit.S | 23 - libc/arch-x86/syscalls/_exit_thread.S | 23 - libc/arch-x86/syscalls/_waitpid.S | 32 - libc/arch-x86/syscalls/accept.S | 27 - libc/arch-x86/syscalls/access.S | 26 - libc/arch-x86/syscalls/acct.S | 23 - libc/arch-x86/syscalls/bind.S | 27 - libc/arch-x86/syscalls/capget.S | 26 - libc/arch-x86/syscalls/capset.S | 26 - libc/arch-x86/syscalls/chdir.S | 23 - libc/arch-x86/syscalls/chmod.S | 26 - libc/arch-x86/syscalls/chown.S | 29 - libc/arch-x86/syscalls/chroot.S | 23 - libc/arch-x86/syscalls/clock_getres.S | 26 - libc/arch-x86/syscalls/clock_gettime.S | 26 - libc/arch-x86/syscalls/clock_nanosleep.S | 26 - libc/arch-x86/syscalls/clock_settime.S | 26 - libc/arch-x86/syscalls/close.S | 23 - libc/arch-x86/syscalls/connect.S | 27 - libc/arch-x86/syscalls/delete_module.S | 26 - libc/arch-x86/syscalls/dup.S | 23 - libc/arch-x86/syscalls/dup2.S | 26 - libc/arch-x86/syscalls/epoll_create.S | 23 - libc/arch-x86/syscalls/epoll_ctl.S | 32 - libc/arch-x86/syscalls/epoll_wait.S | 32 - libc/arch-x86/syscalls/execve.S | 29 - libc/arch-x86/syscalls/fchdir.S | 23 - libc/arch-x86/syscalls/fchmod.S | 26 - libc/arch-x86/syscalls/fchmodat.S | 32 - libc/arch-x86/syscalls/fchown.S | 29 - libc/arch-x86/syscalls/fchownat.S | 35 - libc/arch-x86/syscalls/flock.S | 26 - libc/arch-x86/syscalls/fstat.S | 26 - libc/arch-x86/syscalls/fstatat.S | 32 - libc/arch-x86/syscalls/fstatfs.S | 29 - libc/arch-x86/syscalls/fsync.S | 23 - libc/arch-x86/syscalls/ftruncate.S | 26 - libc/arch-x86/syscalls/futex.S | 38 - libc/arch-x86/syscalls/getdents.S | 29 - libc/arch-x86/syscalls/getegid.S | 20 - libc/arch-x86/syscalls/geteuid.S | 20 - libc/arch-x86/syscalls/getgid.S | 20 - libc/arch-x86/syscalls/getgroups.S | 26 - libc/arch-x86/syscalls/getitimer.S | 26 - libc/arch-x86/syscalls/getpeername.S | 27 - libc/arch-x86/syscalls/getpgid.S | 23 - libc/arch-x86/syscalls/getpid.S | 20 - libc/arch-x86/syscalls/getppid.S | 20 - libc/arch-x86/syscalls/getresgid.S | 20 - libc/arch-x86/syscalls/getresuid.S | 20 - libc/arch-x86/syscalls/getrlimit.S | 26 - libc/arch-x86/syscalls/getrusage.S | 26 - libc/arch-x86/syscalls/getsockname.S | 27 - libc/arch-x86/syscalls/getsockopt.S | 27 - libc/arch-x86/syscalls/gettid.S | 20 - libc/arch-x86/syscalls/gettimeofday.S | 26 - libc/arch-x86/syscalls/getuid.S | 20 - libc/arch-x86/syscalls/init_module.S | 29 - libc/arch-x86/syscalls/inotify_add_watch.S | 29 - libc/arch-x86/syscalls/inotify_init.S | 23 - libc/arch-x86/syscalls/inotify_rm_watch.S | 26 - libc/arch-x86/syscalls/kill.S | 26 - libc/arch-x86/syscalls/klogctl.S | 29 - libc/arch-x86/syscalls/lchown.S | 29 - libc/arch-x86/syscalls/link.S | 26 - libc/arch-x86/syscalls/listen.S | 27 - libc/arch-x86/syscalls/lseek.S | 29 - libc/arch-x86/syscalls/lstat.S | 26 - libc/arch-x86/syscalls/madvise.S | 29 - libc/arch-x86/syscalls/mincore.S | 29 - libc/arch-x86/syscalls/mkdir.S | 26 - libc/arch-x86/syscalls/mkdirat.S | 29 - libc/arch-x86/syscalls/mknod.S | 29 - libc/arch-x86/syscalls/mlock.S | 26 - libc/arch-x86/syscalls/mount.S | 35 - libc/arch-x86/syscalls/mprotect.S | 29 - libc/arch-x86/syscalls/mremap.S | 32 - libc/arch-x86/syscalls/msync.S | 29 - libc/arch-x86/syscalls/munlock.S | 26 - libc/arch-x86/syscalls/munmap.S | 26 - libc/arch-x86/syscalls/nanosleep.S | 26 - libc/arch-x86/syscalls/pause.S | 20 - libc/arch-x86/syscalls/pipe.S | 23 - libc/arch-x86/syscalls/poll.S | 29 - libc/arch-x86/syscalls/prctl.S | 35 - libc/arch-x86/syscalls/read.S | 29 - libc/arch-x86/syscalls/readlink.S | 29 - libc/arch-x86/syscalls/readv.S | 29 - libc/arch-x86/syscalls/recvfrom.S | 27 - libc/arch-x86/syscalls/recvmsg.S | 27 - libc/arch-x86/syscalls/rename.S | 26 - libc/arch-x86/syscalls/renameat.S | 32 - libc/arch-x86/syscalls/rmdir.S | 23 - .../syscalls/sched_get_priority_max.S | 23 - .../syscalls/sched_get_priority_min.S | 23 - libc/arch-x86/syscalls/sched_getparam.S | 26 - libc/arch-x86/syscalls/sched_getscheduler.S | 23 - .../arch-x86/syscalls/sched_rr_get_interval.S | 26 - libc/arch-x86/syscalls/sched_setparam.S | 26 - libc/arch-x86/syscalls/sched_setscheduler.S | 29 - libc/arch-x86/syscalls/sched_yield.S | 23 - libc/arch-x86/syscalls/select.S | 35 - libc/arch-x86/syscalls/sendfile.S | 32 - libc/arch-x86/syscalls/sendmsg.S | 27 - libc/arch-x86/syscalls/sendto.S | 27 - libc/arch-x86/syscalls/setgid.S | 23 - libc/arch-x86/syscalls/setgroups.S | 26 - libc/arch-x86/syscalls/setitimer.S | 29 - libc/arch-x86/syscalls/setpgid.S | 26 - libc/arch-x86/syscalls/setpriority.S | 29 - libc/arch-x86/syscalls/setregid.S | 26 - libc/arch-x86/syscalls/setresgid.S | 29 - libc/arch-x86/syscalls/setresuid.S | 29 - libc/arch-x86/syscalls/setreuid.S | 26 - libc/arch-x86/syscalls/setrlimit.S | 26 - libc/arch-x86/syscalls/setsid.S | 20 - libc/arch-x86/syscalls/setsockopt.S | 27 - libc/arch-x86/syscalls/settimeofday.S | 26 - libc/arch-x86/syscalls/setuid.S | 23 - libc/arch-x86/syscalls/shutdown.S | 27 - libc/arch-x86/syscalls/sigaction.S | 29 - libc/arch-x86/syscalls/sigpending.S | 23 - libc/arch-x86/syscalls/sigprocmask.S | 29 - libc/arch-x86/syscalls/socket.S | 27 - libc/arch-x86/syscalls/socketpair.S | 27 - libc/arch-x86/syscalls/stat.S | 26 - libc/arch-x86/syscalls/symlink.S | 26 - libc/arch-x86/syscalls/sync.S | 23 - libc/arch-x86/syscalls/times.S | 23 - libc/arch-x86/syscalls/tkill.S | 26 - libc/arch-x86/syscalls/truncate.S | 26 - libc/arch-x86/syscalls/umask.S | 23 - libc/arch-x86/syscalls/umount2.S | 26 - libc/arch-x86/syscalls/uname.S | 23 - libc/arch-x86/syscalls/unlink.S | 23 - libc/arch-x86/syscalls/unlinkat.S | 29 - libc/arch-x86/syscalls/utimes.S | 26 - libc/arch-x86/syscalls/waitid.S | 35 - libc/arch-x86/syscalls/write.S | 29 - libc/arch-x86/syscalls/writev.S | 29 - libc/bionic/__errno.c | 34 - libc/bionic/__set_errno.c | 55 - libc/bionic/_rand48.c | 47 - libc/bionic/arc4random.c | 308 - libc/bionic/atomics_x86.c | 95 - libc/bionic/basename.c | 49 - libc/bionic/basename_r.c | 82 - libc/bionic/dirname.c | 50 - libc/bionic/dirname_r.c | 88 - libc/bionic/dlmalloc.c | 5377 ----------------- libc/bionic/dlmalloc.h | 640 -- libc/bionic/drand48.c | 24 - libc/bionic/eabi.c | 96 - libc/bionic/erand48.c | 25 - libc/bionic/fork.c | 48 - libc/bionic/hash.h | 68 - libc/bionic/if_indextoname.c | 63 - libc/bionic/if_nametoindex.c | 58 - libc/bionic/ioctl.c | 43 - libc/bionic/ldexp.c | 122 - libc/bionic/libc_init_common.c | 122 - libc/bionic/libc_init_common.h | 47 - libc/bionic/libc_init_dynamic.c | 66 - libc/bionic/libc_init_static.c | 76 - libc/bionic/logd_write.c | 166 - libc/bionic/malloc_leak.c | 900 --- libc/bionic/md5.c | 275 - libc/bionic/md5.h | 50 - libc/bionic/pthread-timers.c | 636 -- libc/bionic/pthread.c | 1587 ----- libc/bionic/pthread_internal.h | 115 - libc/bionic/ptrace.c | 63 - libc/bionic/pututline.c | 64 - libc/bionic/rand48.h | 32 - libc/bionic/realpath.c | 166 - libc/bionic/rules.jam | 1 - libc/bionic/semaphore.c | 212 - libc/bionic/sha1.c | 270 - libc/bionic/ssp.c | 100 - libc/bionic/stubs.c | 380 -- libc/bionic/system_properties.c | 171 - libc/bionic/thread_atexit.c | 45 - libc/bionic/time64.c | 793 --- libc/bionic/time64_config.h | 75 - libc/bionic/utime.c | 55 - libc/bionic/utmp.c | 93 - libc/docs/OVERVIEW.TXT | 388 -- libc/docs/SYSV-IPC.TXT | 103 - libc/include/alloca.h | 34 - libc/include/arpa/inet.h | 55 - libc/include/arpa/nameser.h | 41 - libc/include/assert.h | 65 - libc/include/byteswap.h | 37 - libc/include/ctype.h | 203 - libc/include/dirent.h | 79 - libc/include/dlfcn.h | 55 - libc/include/elf.h | 58 - libc/include/endian.h | 33 - libc/include/err.h | 0 libc/include/errno.h | 55 - libc/include/fcntl.h | 50 - libc/include/features.h | 58 - libc/include/fnmatch.h | 52 - libc/include/getopt.h | 85 - libc/include/grp.h | 82 - libc/include/inttypes.h | 258 - libc/include/lastlog.h | 0 libc/include/libgen.h | 57 - libc/include/limits.h | 96 - libc/include/locale.h | 60 - libc/include/malloc.h | 104 - libc/include/memory.h | 0 libc/include/mntent.h | 52 - libc/include/net/ethertypes.h | 313 - libc/include/net/if.h | 42 - libc/include/net/if_arp.h | 1 - libc/include/net/if_dl.h | 87 - libc/include/net/if_ether.h | 217 - libc/include/net/if_ieee1394.h | 127 - libc/include/net/if_packet.h | 1 - libc/include/net/if_types.h | 267 - libc/include/net/route.h | 1 - libc/include/netdb.h | 253 - libc/include/netinet/ether.h | 28 - libc/include/netinet/if_ether.h | 33 - libc/include/netinet/in.h | 44 - libc/include/netinet/in6.h | 93 - libc/include/netinet/in_systm.h | 59 - libc/include/netinet/ip.h | 275 - libc/include/netinet/ip_icmp.h | 214 - libc/include/netinet/tcp.h | 34 - libc/include/netinet/udp.h | 55 - libc/include/netpacket/packet.h | 1 - libc/include/nsswitch.h | 236 - libc/include/pathconf.h | 58 - libc/include/paths.h | 74 - libc/include/poll.h | 43 - libc/include/pthread.h | 243 - libc/include/pwd.h | 125 - libc/include/resolv.h | 54 - libc/include/sched.h | 77 - libc/include/semaphore.h | 58 - libc/include/setjmp.h | 63 - libc/include/sgtty.h | 48 - libc/include/sha1.h | 31 - libc/include/signal.h | 125 - libc/include/stdint.h | 262 - libc/include/stdio.h | 437 -- libc/include/stdlib.h | 177 - libc/include/string.h | 90 - libc/include/strings.h | 55 - libc/include/sys/_errdefs.h | 172 - libc/include/sys/_sigdefs.h | 65 - libc/include/sys/_system_properties.h | 108 - libc/include/sys/_types.h | 77 - libc/include/sys/atomics.h | 46 - libc/include/sys/cdefs.h | 376 -- libc/include/sys/cdefs_elf.h | 152 - libc/include/sys/dirent.h | 49 - libc/include/sys/endian.h | 273 - libc/include/sys/epoll.h | 66 - libc/include/sys/errno.h | 1 - libc/include/sys/exec_elf.h | 625 -- libc/include/sys/file.h | 38 - libc/include/sys/fsuid.h | 41 - libc/include/sys/inotify.h | 43 - libc/include/sys/ioctl.h | 43 - libc/include/sys/ioctl_compat.h | 168 - libc/include/sys/ipc.h | 41 - libc/include/sys/klog.h | 51 - libc/include/sys/limits.h | 179 - libc/include/sys/linux-syscalls.h | 223 - libc/include/sys/linux-unistd.h | 204 - libc/include/sys/mman.h | 66 - libc/include/sys/mount.h | 99 - libc/include/sys/param.h | 40 - libc/include/sys/poll.h | 1 - libc/include/sys/prctl.h | 41 - libc/include/sys/ptrace.h | 45 - libc/include/sys/reboot.h | 49 - libc/include/sys/resource.h | 53 - libc/include/sys/select.h | 43 - libc/include/sys/sendfile.h | 40 - libc/include/sys/socket.h | 87 - libc/include/sys/socketcalls.h | 51 - libc/include/sys/stat.h | 101 - libc/include/sys/statfs.h | 1 - libc/include/sys/syscall.h | 42 - libc/include/sys/sysconf.h | 135 - libc/include/sys/sysinfo.h | 40 - libc/include/sys/syslimits.h | 0 libc/include/sys/sysmacros.h | 52 - libc/include/sys/system_properties.h | 79 - libc/include/sys/time.h | 78 - libc/include/sys/timeb.h | 46 - libc/include/sys/times.h | 41 - libc/include/sys/ttychars.h | 0 libc/include/sys/ttydev.h | 0 libc/include/sys/types.h | 125 - libc/include/sys/uio.h | 42 - libc/include/sys/un.h | 33 - libc/include/sys/utime.h | 33 - libc/include/sys/utsname.h | 50 - libc/include/sys/vfs.h | 102 - libc/include/sys/vt.h | 28 - libc/include/sys/wait.h | 54 - libc/include/syslog.h | 116 - libc/include/termios.h | 113 - libc/include/time.h | 113 - libc/include/time64.h | 54 - libc/include/unistd.h | 190 - libc/include/util.h | 0 libc/include/utime.h | 42 - libc/include/utmp.h | 90 - libc/include/wchar.h | 155 - libc/include/wctype.h | 1 - libc/inet/bindresvport.c | 72 - libc/inet/inet_addr.c | 72 - libc/inet/inet_aton.c | 157 - libc/inet/inet_ntoa.c | 51 - libc/inet/inet_ntop.c | 197 - libc/inet/inet_pton.c | 212 - libc/kernel/README.TXT | 276 - libc/kernel/arch-arm/asm/a.out.h | 42 - .../kernel/arch-arm/asm/arch/board-perseus2.h | 27 - libc/kernel/arch-arm/asm/arch/board.h | 163 - libc/kernel/arch-arm/asm/arch/cpu.h | 57 - libc/kernel/arch-arm/asm/arch/dma.h | 318 - libc/kernel/arch-arm/asm/arch/fpga.h | 160 - libc/kernel/arch-arm/asm/arch/gpio-switch.h | 37 - libc/kernel/arch-arm/asm/arch/gpio.h | 49 - libc/kernel/arch-arm/asm/arch/hardware.h | 157 - libc/kernel/arch-arm/asm/arch/io.h | 54 - libc/kernel/arch-arm/asm/arch/irqs.h | 242 - libc/kernel/arch-arm/asm/arch/mcbsp.h | 185 - libc/kernel/arch-arm/asm/arch/memory.h | 19 - libc/kernel/arch-arm/asm/arch/mtd-xip.h | 31 - libc/kernel/arch-arm/asm/arch/mux.h | 391 -- libc/kernel/arch-arm/asm/arch/omap24xx.h | 30 - libc/kernel/arch-arm/asm/arch/serial.h | 21 - libc/kernel/arch-arm/asm/arch/timex.h | 17 - libc/kernel/arch-arm/asm/arch/vmalloc.h | 13 - libc/kernel/arch-arm/asm/atomic.h | 21 - libc/kernel/arch-arm/asm/auxvec.h | 15 - libc/kernel/arch-arm/asm/bitops.h | 15 - libc/kernel/arch-arm/asm/byteorder.h | 51 - libc/kernel/arch-arm/asm/cache.h | 18 - libc/kernel/arch-arm/asm/cacheflush.h | 107 - libc/kernel/arch-arm/asm/cputime.h | 17 - libc/kernel/arch-arm/asm/delay.h | 22 - libc/kernel/arch-arm/asm/div64.h | 27 - libc/kernel/arch-arm/asm/dma-mapping.h | 15 - libc/kernel/arch-arm/asm/dma.h | 45 - libc/kernel/arch-arm/asm/domain.h | 32 - libc/kernel/arch-arm/asm/dyntick.h | 17 - libc/kernel/arch-arm/asm/elf.h | 63 - libc/kernel/arch-arm/asm/errno.h | 17 - libc/kernel/arch-arm/asm/fcntl.h | 22 - libc/kernel/arch-arm/asm/fpstate.h | 68 - libc/kernel/arch-arm/asm/glue.h | 11 - libc/kernel/arch-arm/asm/hardirq.h | 38 - libc/kernel/arch-arm/asm/hardware.h | 17 - libc/kernel/arch-arm/asm/hw_irq.h | 17 - libc/kernel/arch-arm/asm/ide.h | 15 - libc/kernel/arch-arm/asm/io.h | 15 - libc/kernel/arch-arm/asm/ioctl.h | 12 - libc/kernel/arch-arm/asm/ioctls.h | 88 - libc/kernel/arch-arm/asm/ipcbuf.h | 30 - libc/kernel/arch-arm/asm/irq.h | 45 - libc/kernel/arch-arm/asm/linkage.h | 18 - libc/kernel/arch-arm/asm/local.h | 12 - libc/kernel/arch-arm/asm/locks.h | 55 - libc/kernel/arch-arm/asm/mc146818rtc.h | 26 - libc/kernel/arch-arm/asm/memory.h | 95 - libc/kernel/arch-arm/asm/mman.h | 28 - libc/kernel/arch-arm/asm/module.h | 26 - libc/kernel/arch-arm/asm/msgbuf.h | 32 - libc/kernel/arch-arm/asm/mtd-xip.h | 20 - libc/kernel/arch-arm/asm/page.h | 19 - libc/kernel/arch-arm/asm/param.h | 25 - libc/kernel/arch-arm/asm/percpu.h | 17 - libc/kernel/arch-arm/asm/pgalloc.h | 23 - libc/kernel/arch-arm/asm/pgtable-hwdef.h | 70 - libc/kernel/arch-arm/asm/pgtable.h | 20 - libc/kernel/arch-arm/asm/poll.h | 36 - libc/kernel/arch-arm/asm/posix_types.h | 70 - libc/kernel/arch-arm/asm/proc-fns.h | 15 - libc/kernel/arch-arm/asm/processor.h | 17 - libc/kernel/arch-arm/asm/procinfo.h | 51 - libc/kernel/arch-arm/asm/ptrace.h | 95 - libc/kernel/arch-arm/asm/resource.h | 17 - libc/kernel/arch-arm/asm/scatterlist.h | 28 - libc/kernel/arch-arm/asm/semaphore.h | 36 - libc/kernel/arch-arm/asm/sembuf.h | 26 - libc/kernel/arch-arm/asm/shmbuf.h | 43 - libc/kernel/arch-arm/asm/shmparam.h | 19 - libc/kernel/arch-arm/asm/sigcontext.h | 39 - libc/kernel/arch-arm/asm/siginfo.h | 17 - libc/kernel/arch-arm/asm/signal.h | 103 - libc/kernel/arch-arm/asm/sizes.h | 39 - libc/kernel/arch-arm/asm/smp.h | 34 - libc/kernel/arch-arm/asm/socket.h | 61 - libc/kernel/arch-arm/asm/sockios.h | 22 - libc/kernel/arch-arm/asm/spinlock.h | 27 - libc/kernel/arch-arm/asm/spinlock_types.h | 31 - libc/kernel/arch-arm/asm/stat.h | 93 - libc/kernel/arch-arm/asm/statfs.h | 43 - libc/kernel/arch-arm/asm/suspend.h | 15 - libc/kernel/arch-arm/asm/system.h | 15 - libc/kernel/arch-arm/asm/termbits.h | 174 - libc/kernel/arch-arm/asm/termios.h | 67 - libc/kernel/arch-arm/asm/thread_info.h | 15 - libc/kernel/arch-arm/asm/timex.h | 19 - libc/kernel/arch-arm/asm/tlbflush.h | 17 - libc/kernel/arch-arm/asm/topology.h | 17 - libc/kernel/arch-arm/asm/types.h | 36 - libc/kernel/arch-arm/asm/uaccess.h | 77 - libc/kernel/arch-arm/asm/unaligned.h | 38 - libc/kernel/arch-arm/asm/unistd.h | 359 -- libc/kernel/arch-arm/asm/user.h | 61 - libc/kernel/arch-arm/asm/vga.h | 23 - libc/kernel/arch-x86/asm/a.out.h | 31 - libc/kernel/arch-x86/asm/acpi.h | 19 - libc/kernel/arch-x86/asm/acpi_32.h | 15 - libc/kernel/arch-x86/asm/alternative.h | 12 - libc/kernel/arch-x86/asm/alternative_32.h | 38 - libc/kernel/arch-x86/asm/apic.h | 12 - libc/kernel/arch-x86/asm/apic_32.h | 31 - libc/kernel/arch-x86/asm/apicdef.h | 12 - libc/kernel/arch-x86/asm/apicdef_32.h | 372 -- libc/kernel/arch-x86/asm/atomic.h | 12 - libc/kernel/arch-x86/asm/atomic_32.h | 39 - libc/kernel/arch-x86/asm/auxvec.h | 20 - libc/kernel/arch-x86/asm/bitops.h | 12 - libc/kernel/arch-x86/asm/bitops_32.h | 30 - libc/kernel/arch-x86/asm/bug.h | 16 - libc/kernel/arch-x86/asm/byteorder.h | 70 - libc/kernel/arch-x86/asm/cache.h | 20 - libc/kernel/arch-x86/asm/cacheflush.h | 34 - libc/kernel/arch-x86/asm/cmpxchg.h | 12 - libc/kernel/arch-x86/asm/cmpxchg_32.h | 31 - libc/kernel/arch-x86/asm/cpufeature.h | 12 - libc/kernel/arch-x86/asm/cpufeature_32.h | 151 - libc/kernel/arch-x86/asm/cputime.h | 12 - libc/kernel/arch-x86/asm/current.h | 12 - libc/kernel/arch-x86/asm/current_32.h | 21 - libc/kernel/arch-x86/asm/delay.h | 19 - libc/kernel/arch-x86/asm/desc.h | 12 - libc/kernel/arch-x86/asm/desc_32.h | 65 - libc/kernel/arch-x86/asm/desc_defs.h | 70 - libc/kernel/arch-x86/asm/div64.h | 17 - libc/kernel/arch-x86/asm/dma-mapping.h | 12 - libc/kernel/arch-x86/asm/dma-mapping_32.h | 28 - libc/kernel/arch-x86/asm/dma.h | 12 - libc/kernel/arch-x86/asm/dma_32.h | 90 - libc/kernel/arch-x86/asm/dwarf2.h | 12 - libc/kernel/arch-x86/asm/dwarf2_32.h | 33 - libc/kernel/arch-x86/asm/e820.h | 36 - libc/kernel/arch-x86/asm/elf.h | 74 - libc/kernel/arch-x86/asm/errno.h | 12 - libc/kernel/arch-x86/asm/fcntl.h | 12 - libc/kernel/arch-x86/asm/fixmap.h | 12 - libc/kernel/arch-x86/asm/fixmap_32.h | 55 - libc/kernel/arch-x86/asm/genapic.h | 12 - libc/kernel/arch-x86/asm/genapic_32.h | 73 - libc/kernel/arch-x86/asm/hardirq.h | 12 - libc/kernel/arch-x86/asm/hardirq_32.h | 36 - libc/kernel/arch-x86/asm/highmem.h | 15 - libc/kernel/arch-x86/asm/hw_irq.h | 12 - libc/kernel/arch-x86/asm/hw_irq_32.h | 24 - libc/kernel/arch-x86/asm/i387.h | 12 - libc/kernel/arch-x86/asm/i387_32.h | 33 - libc/kernel/arch-x86/asm/i8253.h | 19 - libc/kernel/arch-x86/asm/i8259.h | 19 - libc/kernel/arch-x86/asm/ia32_unistd.h | 22 - libc/kernel/arch-x86/asm/io.h | 12 - libc/kernel/arch-x86/asm/io_32.h | 27 - libc/kernel/arch-x86/asm/io_apic.h | 12 - libc/kernel/arch-x86/asm/io_apic_32.h | 96 - libc/kernel/arch-x86/asm/ioctl.h | 12 - libc/kernel/arch-x86/asm/ioctls.h | 95 - libc/kernel/arch-x86/asm/ipcbuf.h | 30 - libc/kernel/arch-x86/asm/irq.h | 12 - libc/kernel/arch-x86/asm/irq_32.h | 23 - libc/kernel/arch-x86/asm/irqflags.h | 12 - libc/kernel/arch-x86/asm/irqflags_32.h | 33 - libc/kernel/arch-x86/asm/ist.h | 24 - libc/kernel/arch-x86/asm/kmap_types.h | 36 - libc/kernel/arch-x86/asm/ldt.h | 41 - libc/kernel/arch-x86/asm/linkage.h | 12 - libc/kernel/arch-x86/asm/linkage_32.h | 21 - libc/kernel/arch-x86/asm/local.h | 12 - libc/kernel/arch-x86/asm/local_32.h | 51 - libc/kernel/arch-x86/asm/math_emu.h | 40 - libc/kernel/arch-x86/asm/mc146818rtc.h | 12 - libc/kernel/arch-x86/asm/mc146818rtc_32.h | 44 - libc/kernel/arch-x86/asm/mman.h | 30 - libc/kernel/arch-x86/asm/mmsegment.h | 19 - libc/kernel/arch-x86/asm/mmu.h | 25 - libc/kernel/arch-x86/asm/module.h | 12 - libc/kernel/arch-x86/asm/module_32.h | 29 - libc/kernel/arch-x86/asm/mpspec.h | 12 - libc/kernel/arch-x86/asm/mpspec_32.h | 52 - libc/kernel/arch-x86/asm/mpspec_def.h | 171 - libc/kernel/arch-x86/asm/msgbuf.h | 38 - libc/kernel/arch-x86/asm/msr-index.h | 283 - libc/kernel/arch-x86/asm/msr.h | 54 - libc/kernel/arch-x86/asm/page.h | 16 - libc/kernel/arch-x86/asm/page_32.h | 22 - libc/kernel/arch-x86/asm/param.h | 26 - libc/kernel/arch-x86/asm/paravirt.h | 15 - libc/kernel/arch-x86/asm/pda.h | 65 - libc/kernel/arch-x86/asm/percpu.h | 12 - libc/kernel/arch-x86/asm/percpu_32.h | 36 - libc/kernel/arch-x86/asm/pgalloc.h | 12 - libc/kernel/arch-x86/asm/pgalloc_32.h | 30 - .../kernel/arch-x86/asm/pgtable-2level-defs.h | 22 - libc/kernel/arch-x86/asm/pgtable-2level.h | 39 - libc/kernel/arch-x86/asm/pgtable.h | 12 - libc/kernel/arch-x86/asm/pgtable_32.h | 175 - libc/kernel/arch-x86/asm/poll.h | 12 - libc/kernel/arch-x86/asm/posix_types.h | 16 - libc/kernel/arch-x86/asm/posix_types_32.h | 70 - libc/kernel/arch-x86/asm/prctl.h | 20 - libc/kernel/arch-x86/asm/processor-flags.h | 79 - libc/kernel/arch-x86/asm/processor.h | 12 - libc/kernel/arch-x86/asm/processor_32.h | 324 - libc/kernel/arch-x86/asm/ptrace-abi.h | 88 - libc/kernel/arch-x86/asm/ptrace.h | 74 - libc/kernel/arch-x86/asm/required-features.h | 44 - libc/kernel/arch-x86/asm/resource.h | 12 - libc/kernel/arch-x86/asm/rwlock.h | 18 - libc/kernel/arch-x86/asm/scatterlist.h | 12 - libc/kernel/arch-x86/asm/scatterlist_32.h | 31 - libc/kernel/arch-x86/asm/sections.h | 12 - libc/kernel/arch-x86/asm/segment.h | 12 - libc/kernel/arch-x86/asm/segment_32.h | 89 - libc/kernel/arch-x86/asm/semaphore.h | 12 - libc/kernel/arch-x86/asm/semaphore_32.h | 17 - libc/kernel/arch-x86/asm/sembuf.h | 26 - libc/kernel/arch-x86/asm/setup.h | 17 - libc/kernel/arch-x86/asm/shmbuf.h | 49 - libc/kernel/arch-x86/asm/shmparam.h | 17 - libc/kernel/arch-x86/asm/sigcontext.h | 132 - libc/kernel/arch-x86/asm/siginfo.h | 21 - libc/kernel/arch-x86/asm/signal.h | 127 - libc/kernel/arch-x86/asm/smp.h | 12 - libc/kernel/arch-x86/asm/smp_32.h | 34 - libc/kernel/arch-x86/asm/socket.h | 63 - libc/kernel/arch-x86/asm/sockios.h | 23 - libc/kernel/arch-x86/asm/spinlock.h | 12 - libc/kernel/arch-x86/asm/spinlock_32.h | 29 - libc/kernel/arch-x86/asm/spinlock_types.h | 31 - libc/kernel/arch-x86/asm/stat.h | 120 - libc/kernel/arch-x86/asm/statfs.h | 62 - libc/kernel/arch-x86/asm/string.h | 12 - libc/kernel/arch-x86/asm/string_32.h | 15 - libc/kernel/arch-x86/asm/swiotlb.h | 19 - libc/kernel/arch-x86/asm/system.h | 12 - libc/kernel/arch-x86/asm/system_32.h | 33 - libc/kernel/arch-x86/asm/termbits.h | 201 - libc/kernel/arch-x86/asm/termios.h | 50 - libc/kernel/arch-x86/asm/thread_info.h | 12 - libc/kernel/arch-x86/asm/thread_info_32.h | 15 - libc/kernel/arch-x86/asm/tlbflush.h | 12 - libc/kernel/arch-x86/asm/tlbflush_32.h | 43 - libc/kernel/arch-x86/asm/tsc.h | 22 - libc/kernel/arch-x86/asm/types.h | 40 - libc/kernel/arch-x86/asm/uaccess.h | 12 - libc/kernel/arch-x86/asm/uaccess_32.h | 83 - libc/kernel/arch-x86/asm/unaligned.h | 19 - libc/kernel/arch-x86/asm/unistd.h | 16 - libc/kernel/arch-x86/asm/unistd_32.h | 341 -- libc/kernel/arch-x86/asm/user.h | 16 - libc/kernel/arch-x86/asm/user32.h | 73 - libc/kernel/arch-x86/asm/user_32.h | 81 - libc/kernel/arch-x86/asm/vm86.h | 113 - libc/kernel/arch-x86/asm/voyager.h | 437 -- libc/kernel/arch-x86/asm/vsyscall.h | 27 - libc/kernel/arch-x86/asm/xen/hypercall.h | 34 - libc/kernel/common/asm-generic/4level-fixup.h | 42 - .../common/asm-generic/audit_dir_write.h | 11 - libc/kernel/common/asm-generic/bitops/__ffs.h | 19 - .../kernel/common/asm-generic/bitops/atomic.h | 23 - libc/kernel/common/asm-generic/bitops/ffz.h | 17 - libc/kernel/common/asm-generic/bitops/find.h | 18 - libc/kernel/common/asm-generic/bitops/fls.h | 15 - libc/kernel/common/asm-generic/bitops/fls64.h | 17 - libc/kernel/common/asm-generic/bitops/le.h | 53 - .../common/asm-generic/bitops/non-atomic.h | 20 - libc/kernel/common/asm-generic/bug.h | 33 - libc/kernel/common/asm-generic/cputime.h | 60 - .../common/asm-generic/emergency-restart.h | 15 - libc/kernel/common/asm-generic/errno-base.h | 50 - libc/kernel/common/asm-generic/errno.h | 119 - libc/kernel/common/asm-generic/fcntl.h | 148 - libc/kernel/common/asm-generic/futex.h | 15 - libc/kernel/common/asm-generic/ioctl.h | 58 - libc/kernel/common/asm-generic/ipc.h | 37 - libc/kernel/common/asm-generic/local.h | 51 - libc/kernel/common/asm-generic/memory_model.h | 15 - libc/kernel/common/asm-generic/mman.h | 46 - libc/kernel/common/asm-generic/mutex-xchg.h | 16 - libc/kernel/common/asm-generic/percpu.h | 29 - .../kernel/common/asm-generic/pgtable-nopud.h | 39 - libc/kernel/common/asm-generic/pgtable.h | 95 - libc/kernel/common/asm-generic/poll.h | 46 - libc/kernel/common/asm-generic/resource.h | 57 - libc/kernel/common/asm-generic/sections.h | 15 - libc/kernel/common/asm-generic/siginfo.h | 213 - libc/kernel/common/asm-generic/signal.h | 39 - libc/kernel/common/asm-generic/tlb.h | 37 - libc/kernel/common/asm-generic/topology.h | 35 - libc/kernel/common/asm-generic/xor.h | 14 - libc/kernel/common/linux/a.out.h | 220 - libc/kernel/common/linux/aio_abi.h | 64 - libc/kernel/common/linux/akm8976.h | 89 - libc/kernel/common/linux/android_alarm.h | 50 - libc/kernel/common/linux/android_pmem.h | 52 - libc/kernel/common/linux/android_power.h | 55 - libc/kernel/common/linux/apm_bios.h | 94 - libc/kernel/common/linux/ashmem.h | 46 - libc/kernel/common/linux/ata.h | 265 - libc/kernel/common/linux/atm.h | 161 - libc/kernel/common/linux/atmapi.h | 24 - libc/kernel/common/linux/atmdev.h | 161 - libc/kernel/common/linux/atmioc.h | 40 - libc/kernel/common/linux/atmppp.h | 26 - libc/kernel/common/linux/atmsap.h | 117 - .../kernel/common/linux/attribute_container.h | 34 - libc/kernel/common/linux/auto_fs.h | 56 - libc/kernel/common/linux/autoconf.h | 17 - libc/kernel/common/linux/auxvec.h | 40 - libc/kernel/common/linux/backing-dev.h | 53 - libc/kernel/common/linux/binder.h | 186 - libc/kernel/common/linux/binfmts.h | 23 - libc/kernel/common/linux/bio.h | 171 - libc/kernel/common/linux/bitmap.h | 24 - libc/kernel/common/linux/bitops.h | 18 - libc/kernel/common/linux/blkdev.h | 461 -- libc/kernel/common/linux/blkpg.h | 41 - libc/kernel/common/linux/blockgroup_lock.h | 29 - .../common/linux/byteorder/big_endian.h | 67 - libc/kernel/common/linux/byteorder/generic.h | 15 - .../common/linux/byteorder/little_endian.h | 67 - libc/kernel/common/linux/byteorder/swab.h | 72 - libc/kernel/common/linux/byteorder/swabb.h | 52 - libc/kernel/common/linux/cache.h | 54 - libc/kernel/common/linux/calc64.h | 22 - libc/kernel/common/linux/capability.h | 95 - libc/kernel/common/linux/capi.h | 88 - libc/kernel/common/linux/cdev.h | 14 - libc/kernel/common/linux/cdrom.h | 718 --- libc/kernel/common/linux/circ_buf.h | 29 - libc/kernel/common/linux/clk.h | 23 - libc/kernel/common/linux/coda.h | 594 -- libc/kernel/common/linux/coda_fs_i.h | 15 - libc/kernel/common/linux/compat.h | 15 - libc/kernel/common/linux/compiler-gcc.h | 22 - libc/kernel/common/linux/compiler.h | 38 - libc/kernel/common/linux/completion.h | 32 - libc/kernel/common/linux/config.h | 17 - libc/kernel/common/linux/console_struct.h | 121 - libc/kernel/common/linux/cpu.h | 36 - libc/kernel/common/linux/cpumask.h | 87 - libc/kernel/common/linux/ctype.h | 43 - libc/kernel/common/linux/dccp.h | 135 - libc/kernel/common/linux/debug_locks.h | 26 - libc/kernel/common/linux/delay.h | 29 - libc/kernel/common/linux/device.h | 222 - libc/kernel/common/linux/dirent.h | 30 - libc/kernel/common/linux/dm-ioctl.h | 146 - libc/kernel/common/linux/dma-mapping.h | 48 - libc/kernel/common/linux/dmaengine.h | 15 - libc/kernel/common/linux/efs_dir.h | 45 - libc/kernel/common/linux/efs_fs_i.h | 63 - libc/kernel/common/linux/efs_fs_sb.h | 61 - libc/kernel/common/linux/elevator.h | 109 - libc/kernel/common/linux/elf-em.h | 51 - libc/kernel/common/linux/elf.h | 361 -- libc/kernel/common/linux/err.h | 23 - libc/kernel/common/linux/errno.h | 17 - libc/kernel/common/linux/errqueue.h | 33 - libc/kernel/common/linux/etherdevice.h | 19 - libc/kernel/common/linux/ext2_fs.h | 378 -- libc/kernel/common/linux/ext3_fs.h | 448 -- libc/kernel/common/linux/fadvise.h | 28 - libc/kernel/common/linux/fb.h | 347 -- libc/kernel/common/linux/fcntl.h | 35 - libc/kernel/common/linux/fd.h | 258 - libc/kernel/common/linux/file.h | 64 - libc/kernel/common/linux/filter.h | 104 - libc/kernel/common/linux/fs.h | 162 - libc/kernel/common/linux/ftape.h | 51 - libc/kernel/common/linux/futex.h | 61 - libc/kernel/common/linux/genhd.h | 55 - libc/kernel/common/linux/gfp.h | 76 - libc/kernel/common/linux/hardirq.h | 73 - libc/kernel/common/linux/hdlc/ioctl.h | 57 - libc/kernel/common/linux/hdreg.h | 432 -- libc/kernel/common/linux/hdsmart.h | 114 - libc/kernel/common/linux/highmem.h | 31 - libc/kernel/common/linux/hil.h | 256 - libc/kernel/common/linux/i2c.h | 95 - libc/kernel/common/linux/icmp.h | 81 - libc/kernel/common/linux/if.h | 176 - libc/kernel/common/linux/if_arcnet.h | 94 - libc/kernel/common/linux/if_arp.h | 119 - libc/kernel/common/linux/if_bridge.h | 100 - libc/kernel/common/linux/if_ether.h | 81 - libc/kernel/common/linux/if_fc.h | 35 - libc/kernel/common/linux/if_fddi.h | 83 - libc/kernel/common/linux/if_hippi.h | 99 - libc/kernel/common/linux/if_packet.h | 96 - libc/kernel/common/linux/if_ppp.h | 116 - libc/kernel/common/linux/if_tr.h | 76 - libc/kernel/common/linux/if_tun.h | 45 - libc/kernel/common/linux/if_vlan.h | 52 - libc/kernel/common/linux/in.h | 211 - libc/kernel/common/linux/in6.h | 158 - libc/kernel/common/linux/init.h | 137 - libc/kernel/common/linux/inotify.h | 53 - libc/kernel/common/linux/input.h | 715 --- libc/kernel/common/linux/interrupt.h | 121 - libc/kernel/common/linux/ioctl.h | 18 - libc/kernel/common/linux/ioport.h | 95 - libc/kernel/common/linux/ioprio.h | 44 - libc/kernel/common/linux/ip.h | 118 - libc/kernel/common/linux/ipc.h | 48 - libc/kernel/common/linux/ipmi_msgdefs.h | 69 - libc/kernel/common/linux/ipmi_smi.h | 79 - libc/kernel/common/linux/ipx.h | 78 - libc/kernel/common/linux/irq.h | 100 - libc/kernel/common/linux/irq_cpustat.h | 24 - libc/kernel/common/linux/irqflags.h | 34 - libc/kernel/common/linux/irqreturn.h | 21 - libc/kernel/common/linux/jbd.h | 118 - libc/kernel/common/linux/jiffies.h | 115 - libc/kernel/common/linux/kd.h | 176 - libc/kernel/common/linux/kdev_t.h | 18 - libc/kernel/common/linux/kernel.h | 39 - libc/kernel/common/linux/kernel_stat.h | 42 - libc/kernel/common/linux/kernelcapi.h | 41 - libc/kernel/common/linux/kexec.h | 17 - libc/kernel/common/linux/key.h | 21 - libc/kernel/common/linux/keyboard.h | 446 -- libc/kernel/common/linux/keychord.h | 30 - libc/kernel/common/linux/klist.h | 41 - libc/kernel/common/linux/kmod.h | 23 - libc/kernel/common/linux/kobject.h | 15 - libc/kernel/common/linux/kref.h | 15 - libc/kernel/common/linux/ktime.h | 52 - libc/kernel/common/linux/limits.h | 33 - libc/kernel/common/linux/linkage.h | 66 - libc/kernel/common/linux/list.h | 16 - libc/kernel/common/linux/lockd/nlm.h | 50 - libc/kernel/common/linux/lockd/xdr.h | 73 - libc/kernel/common/linux/lockdep.h | 52 - libc/kernel/common/linux/loop.h | 77 - libc/kernel/common/linux/magic.h | 55 - libc/kernel/common/linux/major.h | 175 - libc/kernel/common/linux/mc146818rtc.h | 79 - libc/kernel/common/linux/mca.h | 74 - libc/kernel/common/linux/mempolicy.h | 32 - libc/kernel/common/linux/mempool.h | 34 - libc/kernel/common/linux/miscdevice.h | 57 - libc/kernel/common/linux/mm.h | 19 - libc/kernel/common/linux/mmc/card.h | 100 - libc/kernel/common/linux/mmc/host.h | 120 - libc/kernel/common/linux/mmc/mmc.h | 99 - libc/kernel/common/linux/mmzone.h | 15 - libc/kernel/common/linux/mod_devicetable.h | 209 - libc/kernel/common/linux/module.h | 114 - libc/kernel/common/linux/moduleparam.h | 101 - libc/kernel/common/linux/mount.h | 14 - libc/kernel/common/linux/msdos_fs.h | 180 - libc/kernel/common/linux/msg.h | 68 - libc/kernel/common/linux/msm_adsp.h | 57 - libc/kernel/common/linux/msm_audio.h | 85 - libc/kernel/common/linux/msm_mdp.h | 82 - libc/kernel/common/linux/mt9t013.h | 110 - libc/kernel/common/linux/mtd/bbm.h | 75 - libc/kernel/common/linux/mtd/blktrans.h | 63 - libc/kernel/common/linux/mtd/cfi.h | 187 - libc/kernel/common/linux/mtd/cfi_endian.h | 45 - libc/kernel/common/linux/mtd/compatmac.h | 15 - libc/kernel/common/linux/mtd/flashchip.h | 68 - libc/kernel/common/linux/mtd/map.h | 102 - libc/kernel/common/linux/mtd/mtd.h | 153 - libc/kernel/common/linux/mtd/nand.h | 319 - libc/kernel/common/linux/mtd/nand_ecc.h | 17 - libc/kernel/common/linux/mtd/nftl.h | 55 - libc/kernel/common/linux/mtd/onenand_regs.h | 143 - libc/kernel/common/linux/mtd/partitions.h | 40 - libc/kernel/common/linux/mtio.h | 259 - libc/kernel/common/linux/mutex-debug.h | 22 - libc/kernel/common/linux/mutex.h | 46 - libc/kernel/common/linux/ncp.h | 193 - libc/kernel/common/linux/ncp_mount.h | 69 - libc/kernel/common/linux/ncp_no.h | 29 - libc/kernel/common/linux/net.h | 51 - libc/kernel/common/linux/netdevice.h | 69 - libc/kernel/common/linux/netfilter.h | 36 - .../linux/netfilter/nf_conntrack_common.h | 114 - .../common/linux/netfilter/nf_conntrack_ftp.h | 27 - .../linux/netfilter/nf_conntrack_sctp.h | 37 - .../common/linux/netfilter/nf_conntrack_tcp.h | 36 - .../netfilter/nf_conntrack_tuple_common.h | 24 - .../kernel/common/linux/netfilter/nfnetlink.h | 84 - .../linux/netfilter/nfnetlink_conntrack.h | 146 - libc/kernel/common/linux/netfilter/x_tables.h | 125 - .../common/linux/netfilter/xt_CLASSIFY.h | 19 - .../common/linux/netfilter/xt_CONNMARK.h | 27 - .../common/linux/netfilter/xt_CONNSECMARK.h | 24 - libc/kernel/common/linux/netfilter/xt_MARK.h | 30 - .../common/linux/netfilter/xt_NFQUEUE.h | 19 - .../common/linux/netfilter/xt_SECMARK.h | 30 - .../common/linux/netfilter/xt_comment.h | 21 - .../common/linux/netfilter/xt_connbytes.h | 36 - .../common/linux/netfilter/xt_connmark.h | 20 - .../common/linux/netfilter/xt_conntrack.h | 66 - libc/kernel/common/linux/netfilter/xt_dccp.h | 34 - libc/kernel/common/linux/netfilter/xt_esp.h | 24 - .../kernel/common/linux/netfilter/xt_helper.h | 19 - .../kernel/common/linux/netfilter/xt_length.h | 20 - libc/kernel/common/linux/netfilter/xt_limit.h | 27 - libc/kernel/common/linux/netfilter/xt_mac.h | 19 - libc/kernel/common/linux/netfilter/xt_mark.h | 20 - .../common/linux/netfilter/xt_multiport.h | 40 - .../common/linux/netfilter/xt_physdev.h | 31 - .../common/linux/netfilter/xt_pkttype.h | 19 - libc/kernel/common/linux/netfilter/xt_quota.h | 27 - libc/kernel/common/linux/netfilter/xt_realm.h | 21 - libc/kernel/common/linux/netfilter/xt_sctp.h | 68 - libc/kernel/common/linux/netfilter/xt_state.h | 24 - .../common/linux/netfilter/xt_statistic.h | 43 - .../kernel/common/linux/netfilter/xt_string.h | 29 - .../kernel/common/linux/netfilter/xt_tcpmss.h | 20 - .../kernel/common/linux/netfilter/xt_tcpudp.h | 42 - libc/kernel/common/linux/netfilter_arp.h | 24 - .../common/linux/netfilter_arp/arp_tables.h | 159 - libc/kernel/common/linux/netfilter_bridge.h | 30 - libc/kernel/common/linux/netfilter_ipv4.h | 73 - .../linux/netfilter_ipv4/ip_conntrack.h | 17 - .../linux/netfilter_ipv4/ip_conntrack_tuple.h | 81 - .../common/linux/netfilter_ipv4/ip_nat.h | 55 - .../common/linux/netfilter_ipv4/ip_nat_rule.h | 18 - .../common/linux/netfilter_ipv4/ip_queue.h | 65 - .../common/linux/netfilter_ipv4/ip_tables.h | 180 - .../linux/netfilter_ipv4/ipt_CLASSIFY.h | 18 - .../common/linux/netfilter_ipv4/ipt_DSCP.h | 20 - .../common/linux/netfilter_ipv4/ipt_ECN.h | 34 - .../common/linux/netfilter_ipv4/ipt_LOG.h | 28 - .../common/linux/netfilter_ipv4/ipt_NFQUEUE.h | 19 - .../common/linux/netfilter_ipv4/ipt_REJECT.h | 31 - .../common/linux/netfilter_ipv4/ipt_TCPMSS.h | 21 - .../common/linux/netfilter_ipv4/ipt_TOS.h | 23 - .../common/linux/netfilter_ipv4/ipt_TTL.h | 28 - .../common/linux/netfilter_ipv4/ipt_ULOG.h | 48 - .../linux/netfilter_ipv4/ipt_addrtype.h | 22 - .../common/linux/netfilter_ipv4/ipt_ah.h | 24 - .../common/linux/netfilter_ipv4/ipt_comment.h | 21 - .../linux/netfilter_ipv4/ipt_connbytes.h | 29 - .../common/linux/netfilter_ipv4/ipt_dccp.h | 26 - .../common/linux/netfilter_ipv4/ipt_dscp_.h | 24 - .../common/linux/netfilter_ipv4/ipt_esp.h | 21 - .../linux/netfilter_ipv4/ipt_hashlimit.h | 45 - .../common/linux/netfilter_ipv4/ipt_helper.h | 18 - .../common/linux/netfilter_ipv4/ipt_iprange.h | 33 - .../common/linux/netfilter_ipv4/ipt_length.h | 18 - .../common/linux/netfilter_ipv4/ipt_mac.h | 18 - .../common/linux/netfilter_ipv4/ipt_owner.h | 30 - .../common/linux/netfilter_ipv4/ipt_physdev.h | 26 - .../common/linux/netfilter_ipv4/ipt_pkttype.h | 18 - .../common/linux/netfilter_ipv4/ipt_realm.h | 18 - .../common/linux/netfilter_ipv4/ipt_recent.h | 38 - .../common/linux/netfilter_ipv4/ipt_sctp.h | 66 - .../common/linux/netfilter_ipv4/ipt_state.h | 24 - .../common/linux/netfilter_ipv4/ipt_string.h | 21 - .../common/linux/netfilter_ipv4/ipt_tos_.h | 24 - libc/kernel/common/linux/netfilter_ipv6.h | 67 - .../common/linux/netfilter_ipv6/ip6_tables.h | 178 - .../common/linux/netfilter_ipv6/ip6t_HL.h | 28 - .../common/linux/netfilter_ipv6/ip6t_LOG.h | 28 - .../common/linux/netfilter_ipv6/ip6t_REJECT.h | 29 - .../common/linux/netfilter_ipv6/ip6t_ah.h | 31 - .../common/linux/netfilter_ipv6/ip6t_esp.h | 21 - .../common/linux/netfilter_ipv6/ip6t_frag.h | 34 - .../common/linux/netfilter_ipv6/ip6t_hl.h | 27 - .../linux/netfilter_ipv6/ip6t_ipv6header.h | 31 - .../common/linux/netfilter_ipv6/ip6t_length.h | 19 - .../common/linux/netfilter_ipv6/ip6t_mac.h | 18 - .../common/linux/netfilter_ipv6/ip6t_opts.h | 33 - .../common/linux/netfilter_ipv6/ip6t_owner.h | 28 - .../linux/netfilter_ipv6/ip6t_physdev.h | 26 - .../common/linux/netfilter_ipv6/ip6t_rt.h | 41 - libc/kernel/common/linux/netlink.h | 119 - libc/kernel/common/linux/nfs.h | 124 - libc/kernel/common/linux/nfs2.h | 75 - libc/kernel/common/linux/nfs3.h | 108 - libc/kernel/common/linux/nfs4.h | 99 - libc/kernel/common/linux/nfs_xdr.h | 556 -- libc/kernel/common/linux/nfsacl.h | 32 - libc/kernel/common/linux/nfsd/auth.h | 15 - libc/kernel/common/linux/nfsd/const.h | 24 - libc/kernel/common/linux/nfsd/debug.h | 34 - libc/kernel/common/linux/nfsd/export.h | 38 - libc/kernel/common/linux/nfsd/interface.h | 15 - libc/kernel/common/linux/nfsd/nfsfh.h | 62 - libc/kernel/common/linux/nfsd/stats.h | 38 - libc/kernel/common/linux/nfsd/xdr.h | 141 - libc/kernel/common/linux/node.h | 23 - libc/kernel/common/linux/nodemask.h | 89 - libc/kernel/common/linux/notifier.h | 50 - libc/kernel/common/linux/numa.h | 19 - libc/kernel/common/linux/nvram.h | 24 - libc/kernel/common/linux/omap_csmi.h | 23 - libc/kernel/common/linux/pagemap.h | 33 - libc/kernel/common/linux/param.h | 17 - libc/kernel/common/linux/patchkey.h | 31 - libc/kernel/common/linux/pci.h | 29 - libc/kernel/common/linux/pci_ids.h | 2270 ------- libc/kernel/common/linux/pci_regs.h | 422 -- libc/kernel/common/linux/percpu.h | 30 - libc/kernel/common/linux/percpu_counter.h | 25 - libc/kernel/common/linux/personality.h | 83 - libc/kernel/common/linux/pfkeyv2.h | 306 - libc/kernel/common/linux/pkt_cls.h | 372 -- libc/kernel/common/linux/pkt_sched.h | 405 -- libc/kernel/common/linux/platform_device.h | 39 - libc/kernel/common/linux/plist.h | 44 - libc/kernel/common/linux/pm.h | 15 - libc/kernel/common/linux/pnp.h | 15 - libc/kernel/common/linux/poll.h | 17 - libc/kernel/common/linux/posix_acl.h | 47 - libc/kernel/common/linux/posix_types.h | 43 - libc/kernel/common/linux/ppdev.h | 71 - libc/kernel/common/linux/ppp_defs.h | 121 - libc/kernel/common/linux/prctl.h | 61 - libc/kernel/common/linux/preempt.h | 31 - libc/kernel/common/linux/proc_fs.h | 77 - libc/kernel/common/linux/ptrace.h | 55 - libc/kernel/common/linux/qic117.h | 123 - libc/kernel/common/linux/qnxtypes.h | 29 - libc/kernel/common/linux/quota.h | 87 - libc/kernel/common/linux/raid/md.h | 49 - libc/kernel/common/linux/raid/md_k.h | 184 - libc/kernel/common/linux/raid/md_p.h | 135 - libc/kernel/common/linux/raid/md_u.h | 104 - libc/kernel/common/linux/raid/xor.h | 32 - libc/kernel/common/linux/random.h | 35 - libc/kernel/common/linux/rbtree.h | 45 - libc/kernel/common/linux/rcupdate.h | 15 - libc/kernel/common/linux/reboot.h | 30 - libc/kernel/common/linux/relay.h | 91 - libc/kernel/common/linux/resource.h | 60 - libc/kernel/common/linux/route.h | 49 - libc/kernel/common/linux/rtc.h | 72 - libc/kernel/common/linux/rtnetlink.h | 723 --- libc/kernel/common/linux/rwsem.h | 17 - libc/kernel/common/linux/sched.h | 41 - libc/kernel/common/linux/sem.h | 82 - libc/kernel/common/linux/seq_file.h | 14 - libc/kernel/common/linux/seqlock.h | 42 - libc/kernel/common/linux/serial_core.h | 95 - libc/kernel/common/linux/serial_reg.h | 249 - libc/kernel/common/linux/serio.h | 60 - libc/kernel/common/linux/shm.h | 74 - libc/kernel/common/linux/signal.h | 18 - libc/kernel/common/linux/skbuff.h | 164 - libc/kernel/common/linux/slab.h | 15 - libc/kernel/common/linux/smb.h | 61 - libc/kernel/common/linux/smp.h | 26 - libc/kernel/common/linux/smp_lock.h | 21 - libc/kernel/common/linux/socket.h | 227 - libc/kernel/common/linux/sockios.h | 107 - libc/kernel/common/linux/soundcard.h | 831 --- libc/kernel/common/linux/spinlock.h | 112 - libc/kernel/common/linux/spinlock_api_smp.h | 21 - libc/kernel/common/linux/spinlock_api_up.h | 69 - libc/kernel/common/linux/spinlock_types.h | 46 - libc/kernel/common/linux/spinlock_types_up.h | 29 - libc/kernel/common/linux/spinlock_up.h | 30 - libc/kernel/common/linux/stacktrace.h | 18 - libc/kernel/common/linux/stat.h | 54 - libc/kernel/common/linux/statfs.h | 33 - libc/kernel/common/linux/stddef.h | 31 - libc/kernel/common/linux/string.h | 15 - libc/kernel/common/linux/stringify.h | 18 - libc/kernel/common/linux/sunrpc/auth.h | 15 - libc/kernel/common/linux/sunrpc/auth_gss.h | 16 - libc/kernel/common/linux/sunrpc/clnt.h | 103 - libc/kernel/common/linux/sunrpc/debug.h | 42 - libc/kernel/common/linux/sunrpc/gss_api.h | 16 - libc/kernel/common/linux/sunrpc/gss_asn1.h | 35 - libc/kernel/common/linux/sunrpc/gss_err.h | 15 - libc/kernel/common/linux/sunrpc/msg_prot.h | 15 - libc/kernel/common/linux/sunrpc/sched.h | 182 - libc/kernel/common/linux/sunrpc/stats.h | 49 - libc/kernel/common/linux/sunrpc/svc.h | 82 - libc/kernel/common/linux/sunrpc/svcauth.h | 15 - libc/kernel/common/linux/sunrpc/timer.h | 24 - libc/kernel/common/linux/sunrpc/types.h | 22 - libc/kernel/common/linux/sunrpc/xdr.h | 15 - libc/kernel/common/linux/sunrpc/xprt.h | 172 - libc/kernel/common/linux/swap.h | 39 - libc/kernel/common/linux/sysctl.h | 824 --- libc/kernel/common/linux/sysdev.h | 60 - libc/kernel/common/linux/sysfs.h | 76 - libc/kernel/common/linux/taskstats.h | 72 - libc/kernel/common/linux/taskstats_kern.h | 19 - libc/kernel/common/linux/tcp.h | 147 - libc/kernel/common/linux/telephony.h | 172 - libc/kernel/common/linux/termios.h | 18 - libc/kernel/common/linux/textsearch.h | 15 - libc/kernel/common/linux/thread_info.h | 23 - libc/kernel/common/linux/threads.h | 23 - libc/kernel/common/linux/time.h | 69 - libc/kernel/common/linux/timer.h | 41 - libc/kernel/common/linux/times.h | 24 - libc/kernel/common/linux/timex.h | 108 - libc/kernel/common/linux/tiocl.h | 47 - libc/kernel/common/linux/transport_class.h | 48 - libc/kernel/common/linux/tty.h | 15 - libc/kernel/common/linux/types.h | 37 - libc/kernel/common/linux/udp.h | 30 - libc/kernel/common/linux/ufs_fs_i.h | 33 - libc/kernel/common/linux/ufs_fs_sb.h | 35 - libc/kernel/common/linux/uio.h | 27 - libc/kernel/common/linux/un.h | 22 - libc/kernel/common/linux/unistd.h | 17 - libc/kernel/common/linux/usb.h | 21 - libc/kernel/common/linux/usb_ch9.h | 388 -- libc/kernel/common/linux/usbdevice_fs.h | 123 - libc/kernel/common/linux/user.h | 12 - libc/kernel/common/linux/utime.h | 20 - libc/kernel/common/linux/utsname.h | 44 - libc/kernel/common/linux/version.h | 13 - libc/kernel/common/linux/vfs.h | 17 - libc/kernel/common/linux/videodev.h | 327 - libc/kernel/common/linux/videodev2.h | 963 --- libc/kernel/common/linux/vmalloc.h | 40 - libc/kernel/common/linux/vt.h | 68 - libc/kernel/common/linux/vt_buffer.h | 30 - libc/kernel/common/linux/wait.h | 30 - libc/kernel/common/linux/wanrouter.h | 356 -- libc/kernel/common/linux/wireless.h | 542 -- libc/kernel/common/linux/workqueue.h | 45 - libc/kernel/common/linux/xattr.h | 43 - libc/kernel/common/linux/zconf.h | 38 - libc/kernel/common/linux/zlib.h | 80 - libc/kernel/common/linux/zorro_ids.h | 549 -- libc/kernel/common/mtd/mtd-abi.h | 133 - libc/kernel/common/mtd/mtd-user.h | 25 - libc/kernel/tools/clean_header.py | 148 - libc/kernel/tools/cpp.py | 2180 ------- libc/kernel/tools/defaults.py | 101 - libc/kernel/tools/find_headers.py | 175 - libc/kernel/tools/find_users.py | 63 - libc/kernel/tools/kernel.py | 338 -- libc/kernel/tools/update_all.py | 83 - libc/kernel/tools/utils.py | 397 -- libc/netbsd/gethnamaddr.c | 1210 ---- libc/netbsd/inet/nsap_addr.c | 121 - libc/netbsd/isc/ev_streams.c | 311 - libc/netbsd/isc/ev_timers.c | 504 -- libc/netbsd/isc/eventlib_p.h | 233 - libc/netbsd/nameser/ns_name.c | 970 --- libc/netbsd/nameser/ns_netint.c | 59 - libc/netbsd/nameser/ns_parse.c | 209 - libc/netbsd/nameser/ns_print.c | 915 --- libc/netbsd/nameser/ns_samedomain.c | 211 - libc/netbsd/nameser/ns_ttl.c | 164 - libc/netbsd/net/base64.c | 340 -- libc/netbsd/net/getaddrinfo.c | 1792 ------ libc/netbsd/net/getnameinfo.c | 519 -- libc/netbsd/net/getservbyname.c | 54 - libc/netbsd/net/getservbyname_r.c | 76 - libc/netbsd/net/getservbyport.c | 53 - libc/netbsd/net/getservbyport_r.c | 65 - libc/netbsd/net/getservent.c | 124 - libc/netbsd/net/getservent_r.c | 151 - libc/netbsd/net/nsdispatch.c | 152 - libc/netbsd/net/reentrant.h | 268 - libc/netbsd/net/servent.h | 44 - libc/netbsd/net/services.h | 480 -- libc/netbsd/resolv/__dn_comp.c | 38 - libc/netbsd/resolv/__res_close.c | 33 - libc/netbsd/resolv/__res_send.c | 37 - libc/netbsd/resolv/herror.c | 133 - libc/netbsd/resolv/res_cache.c | 1461 ----- libc/netbsd/resolv/res_comp.c | 259 - libc/netbsd/resolv/res_compat.c | 87 - libc/netbsd/resolv/res_data.c | 332 - libc/netbsd/resolv/res_debug.c | 1174 ---- libc/netbsd/resolv/res_debug.h | 36 - libc/netbsd/resolv/res_init.c | 863 --- libc/netbsd/resolv/res_mkquery.c | 276 - libc/netbsd/resolv/res_private.h | 22 - libc/netbsd/resolv/res_query.c | 415 -- libc/netbsd/resolv/res_random.c | 275 - libc/netbsd/resolv/res_send.c | 1168 ---- libc/netbsd/resolv/res_state.c | 185 - libc/private/arpa_nameser.h | 569 -- libc/private/arpa_nameser_compat.h | 236 - libc/private/bionic_tls.h | 94 - libc/private/ctype_private.h | 7 - libc/private/isc/assertions.h | 124 - libc/private/isc/dst.h | 182 - libc/private/isc/eventlib.h | 204 - libc/private/isc/heap.h | 49 - libc/private/isc/list.h | 114 - libc/private/isc/memcluster.h | 51 - libc/private/logd.h | 47 - libc/private/nsswitch.h | 237 - libc/private/rand48.h | 32 - libc/private/resolv_cache.h | 66 - libc/private/resolv_private.h | 499 -- libc/private/resolv_static.h | 32 - libc/private/syscommon.h | 32 - libc/private/thread_private.h | 162 - libc/stdio/asprintf.c | 60 - libc/stdio/clrerr.c | 43 - libc/stdio/fclose.c | 65 - libc/stdio/fdopen.c | 76 - libc/stdio/feof.c | 45 - libc/stdio/ferror.c | 45 - libc/stdio/fflush.c | 82 - libc/stdio/fgetc.c | 40 - libc/stdio/fgetln.c | 150 - libc/stdio/fgetpos.c | 43 - libc/stdio/fgets.c | 97 - libc/stdio/fileext.h | 54 - libc/stdio/fileno.c | 45 - libc/stdio/findfp.c | 181 - libc/stdio/flags.c | 82 - libc/stdio/floatio.h | 42 - libc/stdio/flockfile.c | 212 - libc/stdio/fopen.c | 76 - libc/stdio/fprintf.c | 47 - libc/stdio/fpurge.c | 58 - libc/stdio/fputc.c | 46 - libc/stdio/fputs.c | 54 - libc/stdio/fread.c | 158 - libc/stdio/freopen.c | 158 - libc/stdio/fscanf.c | 47 - libc/stdio/fseek.c | 252 - libc/stdio/fsetpos.c | 43 - libc/stdio/ftell.c | 97 - libc/stdio/funopen.c | 68 - libc/stdio/fvwrite.c | 208 - libc/stdio/fvwrite.h | 48 - libc/stdio/fwalk.c | 52 - libc/stdio/fwrite.c | 62 - libc/stdio/getc.c | 61 - libc/stdio/getchar.c | 58 - libc/stdio/gets.c | 55 - libc/stdio/glue.h | 45 - libc/stdio/local.h | 91 - libc/stdio/makebuf.c | 107 - libc/stdio/mktemp.c | 184 - libc/stdio/printf.c | 47 - libc/stdio/putc.c | 67 - libc/stdio/putchar.c | 59 - libc/stdio/puts.c | 56 - libc/stdio/putw.c | 48 - libc/stdio/refill.c | 121 - libc/stdio/remove.c | 49 - libc/stdio/rewind.c | 43 - libc/stdio/rget.c | 51 - libc/stdio/scanf.c | 47 - libc/stdio/setbuf.c | 41 - libc/stdio/setbuffer.c | 51 - libc/stdio/setvbuf.c | 151 - libc/stdio/snprintf.c | 67 - libc/stdio/sprintf.c | 63 - libc/stdio/sscanf.c | 65 - libc/stdio/stdio.c | 89 - libc/stdio/tempnam.c | 84 - libc/stdio/tmpfile.c | 81 - libc/stdio/tmpnam.c | 55 - libc/stdio/ungetc.c | 141 - libc/stdio/vasprintf.c | 58 - libc/stdio/vfprintf.c | 1313 ---- libc/stdio/vfscanf.c | 791 --- libc/stdio/vprintf.c | 40 - libc/stdio/vscanf.c | 41 - libc/stdio/vsnprintf.c | 64 - libc/stdio/vsprintf.c | 59 - libc/stdio/vsscanf.c | 59 - libc/stdio/wbuf.c | 84 - libc/stdio/wcio.h | 57 - libc/stdio/wsetup.c | 86 - libc/stdlib/_rand48.c | 47 - libc/stdlib/assert.c | 54 - libc/stdlib/atexit.c | 209 - libc/stdlib/atexit.h | 51 - libc/stdlib/atoi.c | 33 - libc/stdlib/atol.c | 33 - libc/stdlib/atoll.c | 33 - libc/stdlib/bsearch.c | 67 - libc/stdlib/ctype_.c | 158 - libc/stdlib/div.c | 71 - libc/stdlib/exit.c | 59 - libc/stdlib/getenv.c | 80 - libc/stdlib/jrand48.c | 22 - libc/stdlib/ldiv.c | 50 - libc/stdlib/lldiv.c | 50 - libc/stdlib/locale.c | 34 - libc/stdlib/lrand48.c | 24 - libc/stdlib/mrand48.c | 24 - libc/stdlib/nrand48.c | 22 - libc/stdlib/putenv.c | 50 - libc/stdlib/qsort.c | 161 - libc/stdlib/seed48.c | 37 - libc/stdlib/setenv.c | 105 - libc/stdlib/setjmperr.c | 46 - libc/stdlib/sha1hash.c | 317 - libc/stdlib/srand48.c | 31 - libc/stdlib/strntoimax.c | 34 - libc/stdlib/strntoumax.c | 95 - libc/stdlib/strtod.c | 2590 -------- libc/stdlib/strtoimax.c | 171 - libc/stdlib/strtol.c | 140 - libc/stdlib/strtoll.c | 50 - libc/stdlib/strtoul.c | 102 - libc/stdlib/strtoull.c | 49 - libc/stdlib/strtoumax.c | 115 - libc/stdlib/tolower_.c | 57 - libc/stdlib/toupper_.c | 58 - libc/stdlib/wchar.c | 438 -- libc/string/bcopy.c | 128 - libc/string/index.c | 43 - libc/string/memccpy.c | 56 - libc/string/memchr.c | 46 - libc/string/memcmp.c | 51 - libc/string/memcpy.c | 29 - libc/string/memmem.c | 64 - libc/string/memmove.c | 72 - libc/string/memrchr.c | 47 - libc/string/memset.c | 44 - libc/string/memswap.c | 43 - libc/string/strcasecmp.c | 105 - libc/string/strcasestr.c | 60 - libc/string/strcat.c | 51 - libc/string/strchr.c | 43 - libc/string/strcmp.c | 51 - libc/string/strcoll.c | 40 - libc/string/strcpy.c | 41 - libc/string/strcspn.c | 58 - libc/string/strdup.c | 49 - libc/string/strerror.c | 41 - libc/string/strerror_r.c | 163 - libc/string/strlcat.c | 55 - libc/string/strlcpy.c | 51 - libc/string/strlen.c | 47 - libc/string/strncat.c | 57 - libc/string/strncmp.c | 51 - libc/string/strncpy.c | 62 - libc/string/strndup.c | 42 - libc/string/strnlen.c | 38 - libc/string/strpbrk.c | 48 - libc/string/strrchr.c | 45 - libc/string/strsep.c | 71 - libc/string/strspn.c | 51 - libc/string/strstr.c | 56 - libc/string/strtok.c | 86 - libc/string/strtotimeval.c | 63 - libc/string/strxfrm.c | 47 - libc/tools/bionic_utils.py | 306 - libc/tools/checksyscalls.py | 175 - libc/tools/genserv.py | 76 - libc/tools/gensyscalls.py | 506 -- libc/tzcode/asctime.c | 138 - libc/tzcode/difftime.c | 65 - libc/tzcode/localtime.c | 2132 ------- libc/tzcode/private.h | 368 -- libc/tzcode/strftime.c | 872 --- libc/tzcode/strptime.c | 430 -- libc/tzcode/tzfile.h | 180 - libc/unistd/abort.c | 101 - libc/unistd/alarm.c | 58 - libc/unistd/brk.c | 45 - libc/unistd/creat.c | 34 - libc/unistd/daemon.c | 68 - libc/unistd/exec.c | 244 - libc/unistd/fcntl.c | 43 - libc/unistd/fnmatch.c | 205 - libc/unistd/ftime.c | 49 - libc/unistd/ftok.c | 40 - libc/unistd/getcwd.c | 35 - libc/unistd/getdtablesize.c | 39 - libc/unistd/gethostname.c | 51 - libc/unistd/getopt_long.c | 537 -- libc/unistd/getpgrp.c | 33 - libc/unistd/getpriority.c | 37 - libc/unistd/getpt.c | 34 - libc/unistd/initgroups.c | 58 - libc/unistd/isatty.c | 39 - libc/unistd/issetugid.c | 35 - libc/unistd/lseek64.c | 40 - libc/unistd/mmap.c | 43 - libc/unistd/nice.c | 35 - libc/unistd/open.c | 53 - libc/unistd/openat.c | 53 - libc/unistd/opendir.c | 267 - libc/unistd/pathconf.c | 273 - libc/unistd/perror.c | 44 - libc/unistd/popen.c | 167 - libc/unistd/pread.c | 34 - libc/unistd/pselect.c | 59 - libc/unistd/ptsname.c | 44 - libc/unistd/ptsname_r.c | 56 - libc/unistd/pwrite.c | 37 - libc/unistd/raise.c | 34 - libc/unistd/reboot.c | 34 - libc/unistd/recv.c | 34 - libc/unistd/sbrk.c | 60 - libc/unistd/send.c | 34 - libc/unistd/setegid.c | 33 - libc/unistd/seteuid.c | 33 - libc/unistd/setpgrp.c | 33 - libc/unistd/sigblock.c | 49 - libc/unistd/siginterrupt.c | 45 - libc/unistd/siglist.c | 33 - libc/unistd/signal.c | 57 - libc/unistd/sigsetmask.c | 47 - libc/unistd/sigsuspend.c | 37 - libc/unistd/sigwait.c | 74 - libc/unistd/sleep.c | 52 - libc/unistd/socketcalls.c | 259 - libc/unistd/statfs.c | 35 - libc/unistd/strsignal.c | 38 - libc/unistd/sysconf.c | 434 -- libc/unistd/syslog.c | 368 -- libc/unistd/system.c | 74 - libc/unistd/tcgetpgrp.c | 34 - libc/unistd/tcsetpgrp.c | 33 - libc/unistd/time.c | 62 - libc/unistd/umount.c | 35 - libc/unistd/unlockpt.c | 36 - libc/unistd/usleep.c | 52 - libc/unistd/wait.c | 46 - libc/zoneinfo/Android.mk | 14 - libc/zoneinfo/zoneinfo.dat | Bin 169880 -> 0 bytes libc/zoneinfo/zoneinfo.idx | Bin 29016 -> 0 bytes libc/zoneinfo/zoneinfo.version | 1 - libdl/Android.mk | 58 - libdl/MODULE_LICENSE_BSD | 0 libdl/NOTICE | 26 - libdl/dltest.c | 147 - libdl/libdl.c | 34 - libm/Android.mk | 211 - libm/MODULE_LICENSE_BSD_LIKE | 0 libm/Makefile-orig | 158 - libm/NOTICE | 357 -- libm/alpha/Makefile.inc | 10 - libm/alpha/_fpmath.h | 49 - libm/alpha/fenv.c | 144 - libm/alpha/fenv.h | 185 - libm/alpha/s_copysign.S | 45 - libm/alpha/s_copysignf.S | 45 - libm/amd64/Makefile.inc | 5 - libm/amd64/_fpmath.h | 50 - libm/amd64/e_sqrt.S | 33 - libm/amd64/e_sqrtf.S | 32 - libm/amd64/fenv.c | 148 - libm/amd64/fenv.h | 203 - libm/amd64/s_llrint.S | 6 - libm/amd64/s_llrintf.S | 6 - libm/amd64/s_lrint.S | 36 - libm/amd64/s_lrintf.S | 36 - libm/amd64/s_remquo.S | 65 - libm/amd64/s_remquof.S | 65 - libm/amd64/s_scalbn.S | 39 - libm/amd64/s_scalbnf.S | 42 - libm/amd64/s_scalbnl.S | 19 - libm/arm/Makefile.inc | 3 - libm/arm/_fpmath.h | 55 - libm/arm/fenv.c | 35 - libm/arm/fenv.h | 217 - libm/bsdsrc/b_exp.c | 177 - libm/bsdsrc/b_log.c | 473 -- libm/bsdsrc/b_tgamma.c | 316 - libm/bsdsrc/mathimpl.h | 74 - libm/fpclassify.c | 94 - libm/i386/_fpmath.h | 49 - libm/i387/Makefile.inc | 18 - libm/i387/e_exp.S | 98 - libm/i387/e_fmod.S | 48 - libm/i387/e_log.S | 44 - libm/i387/e_log10.S | 44 - libm/i387/e_log10f.S | 15 - libm/i387/e_logf.S | 15 - libm/i387/e_remainder.S | 48 - libm/i387/e_remainderf.S | 19 - libm/i387/e_scalb.S | 45 - libm/i387/e_scalbf.S | 15 - libm/i387/e_sqrt.S | 43 - libm/i387/e_sqrtf.S | 14 - libm/i387/fenv.c | 211 - libm/i387/fenv.h | 240 - libm/i387/npx.h | 160 - libm/i387/s_ceil.S | 58 - libm/i387/s_ceilf.S | 29 - libm/i387/s_ceill.S | 27 - libm/i387/s_copysign.S | 48 - libm/i387/s_copysignf.S | 19 - libm/i387/s_copysignl.S | 17 - libm/i387/s_cos.S | 56 - libm/i387/s_finite.S | 46 - libm/i387/s_floor.S | 58 - libm/i387/s_floorf.S | 29 - libm/i387/s_floorl.S | 27 - libm/i387/s_llrint.S | 36 - libm/i387/s_llrintf.S | 36 - libm/i387/s_logb.S | 44 - libm/i387/s_logbf.S | 15 - libm/i387/s_lrint.S | 35 - libm/i387/s_lrintf.S | 35 - libm/i387/s_remquo.S | 62 - libm/i387/s_remquof.S | 62 - libm/i387/s_rint.S | 43 - libm/i387/s_rintf.S | 14 - libm/i387/s_scalbn.S | 45 - libm/i387/s_scalbnf.S | 19 - libm/i387/s_scalbnl.S | 19 - libm/i387/s_significand.S | 44 - libm/i387/s_significandf.S | 15 - libm/i387/s_sin.S | 56 - libm/i387/s_tan.S | 58 - libm/i387/s_trunc.S | 26 - libm/i387/s_truncf.S | 26 - libm/i387/s_truncl.S | 26 - libm/ia64/Makefile.inc | 4 - libm/ia64/_fpmath.h | 71 - libm/ia64/fenv.c | 49 - libm/ia64/fenv.h | 242 - libm/ia64/s_fma.S | 34 - libm/ia64/s_fmaf.S | 34 - libm/ia64/s_fmal.S | 34 - libm/include/alpha/fenv.h | 185 - libm/include/amd64/fenv.h | 203 - libm/include/arm/fenv.h | 217 - libm/include/i387/fenv.h | 240 - libm/include/ia64/fenv.h | 242 - libm/include/math.h | 486 -- libm/include/powerpc/fenv.h | 263 - libm/include/sparc64/fenv.h | 254 - libm/isinf.c | 69 - libm/man/acos.3 | 92 - libm/man/acosh.3 | 82 - libm/man/asin.3 | 94 - libm/man/asinh.3 | 78 - libm/man/atan.3 | 84 - libm/man/atan2.3 | 187 - libm/man/atanh.3 | 85 - libm/man/ceil.3 | 82 - libm/man/cimag.3 | 96 - libm/man/copysign.3 | 90 - libm/man/cos.3 | 83 - libm/man/cosh.3 | 72 - libm/man/erf.3 | 97 - libm/man/exp.3 | 236 - libm/man/fabs.3 | 87 - libm/man/fdim.3 | 86 - libm/man/feclearexcept.3 | 139 - libm/man/feenableexcept.3 | 98 - libm/man/fegetenv.3 | 113 - libm/man/fegetround.3 | 83 - libm/man/fenv.3 | 289 - libm/man/floor.3 | 82 - libm/man/fma.3 | 116 - libm/man/fmax.3 | 97 - libm/man/fmod.3 | 87 - libm/man/hypot.3 | 134 - libm/man/ieee.3 | 448 -- libm/man/ieee_test.3 | 93 - libm/man/ilogb.3 | 127 - libm/man/j0.3 | 142 - libm/man/lgamma.3 | 185 - libm/man/lrint.3 | 94 - libm/man/lround.3 | 112 - libm/man/math.3 | 242 - libm/man/nextafter.3 | 100 - libm/man/remainder.3 | 146 - libm/man/rint.3 | 103 - libm/man/round.3 | 80 - libm/man/scalbn.3 | 95 - libm/man/signbit.3 | 57 - libm/man/sin.3 | 82 - libm/man/sinh.3 | 71 - libm/man/sqrt.3 | 100 - libm/man/tan.3 | 81 - libm/man/tanh.3 | 80 - libm/man/trunc.3 | 80 - libm/powerpc/Makefile.inc | 3 - libm/powerpc/_fpmath.h | 49 - libm/powerpc/fenv.c | 31 - libm/powerpc/fenv.h | 263 - libm/sparc64/Makefile.inc | 4 - libm/sparc64/_fpmath.h | 52 - libm/sparc64/e_sqrt.S | 33 - libm/sparc64/e_sqrtf.S | 33 - libm/sparc64/fenv.c | 36 - libm/sparc64/fenv.h | 254 - libm/src/e_acos.c | 104 - libm/src/e_acosf.c | 81 - libm/src/e_acosh.c | 63 - libm/src/e_acoshf.c | 49 - libm/src/e_asin.c | 113 - libm/src/e_asinf.c | 84 - libm/src/e_atan2.c | 124 - libm/src/e_atan2f.c | 97 - libm/src/e_atanh.c | 63 - libm/src/e_atanhf.c | 46 - libm/src/e_cosh.c | 86 - libm/src/e_coshf.c | 63 - libm/src/e_exp.c | 159 - libm/src/e_expf.c | 95 - libm/src/e_fmod.c | 133 - libm/src/e_fmodf.c | 105 - libm/src/e_gamma.c | 34 - libm/src/e_gamma_r.c | 33 - libm/src/e_gammaf.c | 35 - libm/src/e_gammaf_r.c | 34 - libm/src/e_hypot.c | 125 - libm/src/e_hypotf.c | 83 - libm/src/e_j0.c | 382 -- libm/src/e_j0f.c | 338 -- libm/src/e_j1.c | 377 -- libm/src/e_j1f.c | 334 - libm/src/e_jn.c | 266 - libm/src/e_jnf.c | 196 - libm/src/e_ldexpf.c | 22 - libm/src/e_lgamma.c | 34 - libm/src/e_lgamma_r.c | 297 - libm/src/e_lgammaf.c | 35 - libm/src/e_lgammaf_r.c | 231 - libm/src/e_log.c | 135 - libm/src/e_log10.c | 87 - libm/src/e_log10f.c | 55 - libm/src/e_logf.c | 83 - libm/src/e_pow.c | 304 - libm/src/e_powf.c | 247 - libm/src/e_rem_pio2.c | 168 - libm/src/e_rem_pio2f.c | 98 - libm/src/e_remainder.c | 73 - libm/src/e_remainderf.c | 65 - libm/src/e_scalb.c | 48 - libm/src/e_scalbf.c | 46 - libm/src/e_sinh.c | 79 - libm/src/e_sinhf.c | 60 - libm/src/e_sqrt.c | 446 -- libm/src/e_sqrtf.c | 89 - libm/src/fpmath.h | 72 - libm/src/k_cos.c | 79 - libm/src/k_cosf.c | 47 - libm/src/k_rem_pio2.c | 304 - libm/src/k_rem_pio2f.c | 197 - libm/src/k_sin.c | 70 - libm/src/k_sinf.c | 47 - libm/src/k_tan.c | 133 - libm/src/k_tanf.c | 67 - libm/src/math_private.h | 273 - libm/src/s_asinh.c | 57 - libm/src/s_asinhf.c | 49 - libm/src/s_atan.c | 119 - libm/src/s_atanf.c | 99 - libm/src/s_cbrt.c | 92 - libm/src/s_cbrtf.c | 79 - libm/src/s_ceil.c | 72 - libm/src/s_ceilf.c | 53 - libm/src/s_ceill.c | 102 - libm/src/s_cimag.c | 35 - libm/src/s_cimagf.c | 35 - libm/src/s_cimagl.c | 35 - libm/src/s_conj.c | 35 - libm/src/s_conjf.c | 35 - libm/src/s_conjl.c | 35 - libm/src/s_copysign.c | 34 - libm/src/s_copysignf.c | 37 - libm/src/s_copysignl.c | 42 - libm/src/s_cos.c | 82 - libm/src/s_cosf.c | 84 - libm/src/s_creal.c | 35 - libm/src/s_crealf.c | 35 - libm/src/s_creall.c | 35 - libm/src/s_erf.c | 302 - libm/src/s_erff.c | 211 - libm/src/s_exp2.c | 389 -- libm/src/s_exp2f.c | 141 - libm/src/s_expm1.c | 220 - libm/src/s_expm1f.c | 125 - libm/src/s_fabs.c | 31 - libm/src/s_fabsf.c | 34 - libm/src/s_fabsl.c | 43 - libm/src/s_fdim.c | 46 - libm/src/s_finite.c | 30 - libm/src/s_finitef.c | 33 - libm/src/s_floor.c | 73 - libm/src/s_floorf.c | 62 - libm/src/s_floorl.c | 102 - libm/src/s_fma.c | 202 - libm/src/s_fmaf.c | 47 - libm/src/s_fmal.c | 182 - libm/src/s_fmax.c | 53 - libm/src/s_fmaxf.c | 53 - libm/src/s_fmaxl.c | 55 - libm/src/s_fmin.c | 53 - libm/src/s_fminf.c | 53 - libm/src/s_fminl.c | 55 - libm/src/s_frexp.c | 58 - libm/src/s_frexpf.c | 44 - libm/src/s_frexpl.c | 62 - libm/src/s_ilogb.c | 49 - libm/src/s_ilogbf.c | 41 - libm/src/s_ilogbl.c | 54 - libm/src/s_isfinite.c | 58 - libm/src/s_isnan.c | 62 - libm/src/s_isnormal.c | 58 - libm/src/s_llrint.c | 9 - libm/src/s_llrintf.c | 9 - libm/src/s_llround.c | 11 - libm/src/s_llroundf.c | 11 - libm/src/s_llroundl.c | 11 - libm/src/s_log1p.c | 168 - libm/src/s_log1pf.c | 107 - libm/src/s_logb.c | 44 - libm/src/s_logbf.c | 41 - libm/src/s_lrint.c | 58 - libm/src/s_lrintf.c | 9 - libm/src/s_lround.c | 66 - libm/src/s_lroundf.c | 11 - libm/src/s_lroundl.c | 11 - libm/src/s_modf.c | 75 - libm/src/s_modff.c | 56 - libm/src/s_nearbyint.c | 54 - libm/src/s_nextafter.c | 85 - libm/src/s_nextafterf.c | 67 - libm/src/s_nextafterl.c | 82 - libm/src/s_nexttoward.c | 73 - libm/src/s_nexttowardf.c | 60 - libm/src/s_remquo.c | 152 - libm/src/s_remquof.c | 121 - libm/src/s_rint.c | 87 - libm/src/s_rintf.c | 52 - libm/src/s_round.c | 51 - libm/src/s_roundf.c | 51 - libm/src/s_roundl.c | 51 - libm/src/s_scalbln.c | 76 - libm/src/s_scalbn.c | 79 - libm/src/s_scalbnf.c | 58 - libm/src/s_scalbnl.c | 71 - libm/src/s_signbit.c | 58 - libm/src/s_signgam.c | 3 - libm/src/s_significand.c | 30 - libm/src/s_significandf.c | 27 - libm/src/s_sin.c | 82 - libm/src/s_sinf.c | 82 - libm/src/s_tan.c | 76 - libm/src/s_tanf.c | 69 - libm/src/s_tanh.c | 78 - libm/src/s_tanhf.c | 56 - libm/src/s_trunc.c | 61 - libm/src/s_truncf.c | 53 - libm/src/s_truncl.c | 68 - libm/src/w_cabs.c | 28 - libm/src/w_cabsf.c | 23 - libm/src/w_drem.c | 15 - libm/src/w_dremf.c | 16 - libstdc++/Android.mk | 28 - libstdc++/MODULE_LICENSE_BSD | 0 libstdc++/NOTICE | 26 - libstdc++/include/cstddef | 0 libstdc++/include/new | 29 - libstdc++/include/stl_pair.h | 122 - libstdc++/include/typeinfo | 28 - libstdc++/include/utility | 38 - libstdc++/src/new.cpp | 65 - libstdc++/src/one_time_construction.cpp | 50 - libstdc++/src/pure_virtual.cpp | 10 - libstdc++/src/typeinfo.cpp | 32 - libthread_db/Android.mk | 33 - libthread_db/MODULE_LICENSE_BSD | 0 libthread_db/NOTICE | 26 - libthread_db/include/thread_db.h | 143 - libthread_db/libthread_db.c | 183 - linker/Android.mk | 72 - linker/MODULE_LICENSE_APACHE2 | 0 linker/NOTICE | 190 - linker/arch/arm/begin.S | 45 - linker/arch/x86/begin.S | 52 - linker/debugger.c | 81 - linker/dlfcn.c | 212 - linker/linker.c | 1760 ------ linker/linker.h | 213 - linker/linker_debug.h | 141 - linker/rt.c | 36 - 1984 files changed, 177630 deletions(-) delete mode 100644 Android.mk delete mode 100644 libc/Android.mk delete mode 100644 libc/CAVEATS delete mode 100644 libc/Jamfile delete mode 100644 libc/MODULE_LICENSE_BSD delete mode 100644 libc/NOTICE delete mode 100644 libc/README delete mode 100644 libc/SYSCALLS.TXT delete mode 100644 libc/arch-arm/bionic/__get_pc.S delete mode 100644 libc/arch-arm/bionic/__get_sp.S delete mode 100644 libc/arch-arm/bionic/_exit_with_stack_teardown.S delete mode 100644 libc/arch-arm/bionic/_setjmp.S delete mode 100644 libc/arch-arm/bionic/atomics_arm.S delete mode 100644 libc/arch-arm/bionic/clone.S delete mode 100644 libc/arch-arm/bionic/crtbegin_dynamic.S delete mode 100644 libc/arch-arm/bionic/crtbegin_static.S delete mode 100644 libc/arch-arm/bionic/crtend.S delete mode 100644 libc/arch-arm/bionic/exidx_dynamic.c delete mode 100644 libc/arch-arm/bionic/exidx_static.c delete mode 100644 libc/arch-arm/bionic/ffs.S delete mode 100644 libc/arch-arm/bionic/kill.S delete mode 100644 libc/arch-arm/bionic/memcmp.S delete mode 100644 libc/arch-arm/bionic/memcmp16.S delete mode 100644 libc/arch-arm/bionic/memcpy.S delete mode 100644 libc/arch-arm/bionic/memset.S delete mode 100644 libc/arch-arm/bionic/setjmp.S delete mode 100644 libc/arch-arm/bionic/sigsetjmp.S delete mode 100644 libc/arch-arm/bionic/strlen.c delete mode 100644 libc/arch-arm/bionic/syscall.S delete mode 100644 libc/arch-arm/bionic/tkill.S delete mode 100644 libc/arch-arm/include/endian.h delete mode 100644 libc/arch-arm/include/machine/_types.h delete mode 100644 libc/arch-arm/include/machine/asm.h delete mode 100644 libc/arch-arm/include/machine/cdefs.h delete mode 100644 libc/arch-arm/include/machine/cpu-features.h delete mode 100644 libc/arch-arm/include/machine/exec.h delete mode 100644 libc/arch-arm/include/machine/ieee.h delete mode 100644 libc/arch-arm/include/machine/internal_types.h delete mode 100644 libc/arch-arm/include/machine/kernel.h delete mode 100644 libc/arch-arm/include/machine/limits.h delete mode 100644 libc/arch-arm/include/machine/setjmp.h delete mode 100644 libc/arch-arm/syscalls.mk delete mode 100644 libc/arch-arm/syscalls/__brk.S delete mode 100644 libc/arch-arm/syscalls/__clone.S delete mode 100644 libc/arch-arm/syscalls/__fcntl.S delete mode 100644 libc/arch-arm/syscalls/__fcntl64.S delete mode 100644 libc/arch-arm/syscalls/__fork.S delete mode 100644 libc/arch-arm/syscalls/__getcwd.S delete mode 100644 libc/arch-arm/syscalls/__getpriority.S delete mode 100644 libc/arch-arm/syscalls/__ioctl.S delete mode 100644 libc/arch-arm/syscalls/__llseek.S delete mode 100644 libc/arch-arm/syscalls/__mmap2.S delete mode 100644 libc/arch-arm/syscalls/__open.S delete mode 100644 libc/arch-arm/syscalls/__openat.S delete mode 100644 libc/arch-arm/syscalls/__pread64.S delete mode 100644 libc/arch-arm/syscalls/__ptrace.S delete mode 100644 libc/arch-arm/syscalls/__pwrite64.S delete mode 100644 libc/arch-arm/syscalls/__reboot.S delete mode 100644 libc/arch-arm/syscalls/__rt_sigaction.S delete mode 100644 libc/arch-arm/syscalls/__rt_sigprocmask.S delete mode 100644 libc/arch-arm/syscalls/__rt_sigtimedwait.S delete mode 100644 libc/arch-arm/syscalls/__set_tls.S delete mode 100644 libc/arch-arm/syscalls/__sigsuspend.S delete mode 100644 libc/arch-arm/syscalls/__statfs64.S delete mode 100644 libc/arch-arm/syscalls/__syslog.S delete mode 100644 libc/arch-arm/syscalls/__timer_create.S delete mode 100644 libc/arch-arm/syscalls/__timer_delete.S delete mode 100644 libc/arch-arm/syscalls/__timer_getoverrun.S delete mode 100644 libc/arch-arm/syscalls/__timer_gettime.S delete mode 100644 libc/arch-arm/syscalls/__timer_settime.S delete mode 100644 libc/arch-arm/syscalls/__wait4.S delete mode 100644 libc/arch-arm/syscalls/_exit.S delete mode 100644 libc/arch-arm/syscalls/_exit_thread.S delete mode 100644 libc/arch-arm/syscalls/accept.S delete mode 100644 libc/arch-arm/syscalls/access.S delete mode 100644 libc/arch-arm/syscalls/acct.S delete mode 100644 libc/arch-arm/syscalls/bind.S delete mode 100644 libc/arch-arm/syscalls/cacheflush.S delete mode 100644 libc/arch-arm/syscalls/capget.S delete mode 100644 libc/arch-arm/syscalls/capset.S delete mode 100644 libc/arch-arm/syscalls/chdir.S delete mode 100644 libc/arch-arm/syscalls/chmod.S delete mode 100644 libc/arch-arm/syscalls/chown.S delete mode 100644 libc/arch-arm/syscalls/chroot.S delete mode 100644 libc/arch-arm/syscalls/clock_getres.S delete mode 100644 libc/arch-arm/syscalls/clock_gettime.S delete mode 100644 libc/arch-arm/syscalls/clock_nanosleep.S delete mode 100644 libc/arch-arm/syscalls/clock_settime.S delete mode 100644 libc/arch-arm/syscalls/close.S delete mode 100644 libc/arch-arm/syscalls/connect.S delete mode 100644 libc/arch-arm/syscalls/delete_module.S delete mode 100644 libc/arch-arm/syscalls/dup.S delete mode 100644 libc/arch-arm/syscalls/dup2.S delete mode 100644 libc/arch-arm/syscalls/epoll_create.S delete mode 100644 libc/arch-arm/syscalls/epoll_ctl.S delete mode 100644 libc/arch-arm/syscalls/epoll_wait.S delete mode 100644 libc/arch-arm/syscalls/execve.S delete mode 100644 libc/arch-arm/syscalls/fchdir.S delete mode 100644 libc/arch-arm/syscalls/fchmod.S delete mode 100644 libc/arch-arm/syscalls/fchmodat.S delete mode 100644 libc/arch-arm/syscalls/fchown.S delete mode 100644 libc/arch-arm/syscalls/fchownat.S delete mode 100644 libc/arch-arm/syscalls/flock.S delete mode 100644 libc/arch-arm/syscalls/fstat.S delete mode 100644 libc/arch-arm/syscalls/fstatat.S delete mode 100644 libc/arch-arm/syscalls/fstatfs.S delete mode 100644 libc/arch-arm/syscalls/fsync.S delete mode 100644 libc/arch-arm/syscalls/ftruncate.S delete mode 100644 libc/arch-arm/syscalls/futex.S delete mode 100644 libc/arch-arm/syscalls/getdents.S delete mode 100644 libc/arch-arm/syscalls/getegid.S delete mode 100644 libc/arch-arm/syscalls/geteuid.S delete mode 100644 libc/arch-arm/syscalls/getgid.S delete mode 100644 libc/arch-arm/syscalls/getgroups.S delete mode 100644 libc/arch-arm/syscalls/getitimer.S delete mode 100644 libc/arch-arm/syscalls/getpeername.S delete mode 100644 libc/arch-arm/syscalls/getpgid.S delete mode 100644 libc/arch-arm/syscalls/getpid.S delete mode 100644 libc/arch-arm/syscalls/getppid.S delete mode 100644 libc/arch-arm/syscalls/getresgid.S delete mode 100644 libc/arch-arm/syscalls/getresuid.S delete mode 100644 libc/arch-arm/syscalls/getrlimit.S delete mode 100644 libc/arch-arm/syscalls/getrusage.S delete mode 100644 libc/arch-arm/syscalls/getsockname.S delete mode 100644 libc/arch-arm/syscalls/getsockopt.S delete mode 100644 libc/arch-arm/syscalls/gettid.S delete mode 100644 libc/arch-arm/syscalls/gettimeofday.S delete mode 100644 libc/arch-arm/syscalls/getuid.S delete mode 100644 libc/arch-arm/syscalls/init_module.S delete mode 100644 libc/arch-arm/syscalls/inotify_add_watch.S delete mode 100644 libc/arch-arm/syscalls/inotify_init.S delete mode 100644 libc/arch-arm/syscalls/inotify_rm_watch.S delete mode 100644 libc/arch-arm/syscalls/klogctl.S delete mode 100644 libc/arch-arm/syscalls/lchown.S delete mode 100644 libc/arch-arm/syscalls/link.S delete mode 100644 libc/arch-arm/syscalls/listen.S delete mode 100644 libc/arch-arm/syscalls/lseek.S delete mode 100644 libc/arch-arm/syscalls/lstat.S delete mode 100644 libc/arch-arm/syscalls/madvise.S delete mode 100644 libc/arch-arm/syscalls/mincore.S delete mode 100644 libc/arch-arm/syscalls/mkdir.S delete mode 100644 libc/arch-arm/syscalls/mkdirat.S delete mode 100644 libc/arch-arm/syscalls/mknod.S delete mode 100644 libc/arch-arm/syscalls/mlock.S delete mode 100644 libc/arch-arm/syscalls/mount.S delete mode 100644 libc/arch-arm/syscalls/mprotect.S delete mode 100644 libc/arch-arm/syscalls/mremap.S delete mode 100644 libc/arch-arm/syscalls/msync.S delete mode 100644 libc/arch-arm/syscalls/munlock.S delete mode 100644 libc/arch-arm/syscalls/munmap.S delete mode 100644 libc/arch-arm/syscalls/nanosleep.S delete mode 100644 libc/arch-arm/syscalls/pause.S delete mode 100644 libc/arch-arm/syscalls/pipe.S delete mode 100644 libc/arch-arm/syscalls/poll.S delete mode 100644 libc/arch-arm/syscalls/prctl.S delete mode 100644 libc/arch-arm/syscalls/read.S delete mode 100644 libc/arch-arm/syscalls/readlink.S delete mode 100644 libc/arch-arm/syscalls/readv.S delete mode 100644 libc/arch-arm/syscalls/recvfrom.S delete mode 100644 libc/arch-arm/syscalls/recvmsg.S delete mode 100644 libc/arch-arm/syscalls/rename.S delete mode 100644 libc/arch-arm/syscalls/renameat.S delete mode 100644 libc/arch-arm/syscalls/rmdir.S delete mode 100644 libc/arch-arm/syscalls/sched_get_priority_max.S delete mode 100644 libc/arch-arm/syscalls/sched_get_priority_min.S delete mode 100644 libc/arch-arm/syscalls/sched_getparam.S delete mode 100644 libc/arch-arm/syscalls/sched_getscheduler.S delete mode 100644 libc/arch-arm/syscalls/sched_rr_get_interval.S delete mode 100644 libc/arch-arm/syscalls/sched_setparam.S delete mode 100644 libc/arch-arm/syscalls/sched_setscheduler.S delete mode 100644 libc/arch-arm/syscalls/sched_yield.S delete mode 100644 libc/arch-arm/syscalls/select.S delete mode 100644 libc/arch-arm/syscalls/sendfile.S delete mode 100644 libc/arch-arm/syscalls/sendmsg.S delete mode 100644 libc/arch-arm/syscalls/sendto.S delete mode 100644 libc/arch-arm/syscalls/setgid.S delete mode 100644 libc/arch-arm/syscalls/setgroups.S delete mode 100644 libc/arch-arm/syscalls/setitimer.S delete mode 100644 libc/arch-arm/syscalls/setpgid.S delete mode 100644 libc/arch-arm/syscalls/setpriority.S delete mode 100644 libc/arch-arm/syscalls/setregid.S delete mode 100644 libc/arch-arm/syscalls/setresgid.S delete mode 100644 libc/arch-arm/syscalls/setresuid.S delete mode 100644 libc/arch-arm/syscalls/setreuid.S delete mode 100644 libc/arch-arm/syscalls/setrlimit.S delete mode 100644 libc/arch-arm/syscalls/setsid.S delete mode 100644 libc/arch-arm/syscalls/setsockopt.S delete mode 100644 libc/arch-arm/syscalls/settimeofday.S delete mode 100644 libc/arch-arm/syscalls/setuid.S delete mode 100644 libc/arch-arm/syscalls/shutdown.S delete mode 100644 libc/arch-arm/syscalls/sigaction.S delete mode 100644 libc/arch-arm/syscalls/sigpending.S delete mode 100644 libc/arch-arm/syscalls/sigprocmask.S delete mode 100644 libc/arch-arm/syscalls/socket.S delete mode 100644 libc/arch-arm/syscalls/socketpair.S delete mode 100644 libc/arch-arm/syscalls/stat.S delete mode 100644 libc/arch-arm/syscalls/symlink.S delete mode 100644 libc/arch-arm/syscalls/sync.S delete mode 100644 libc/arch-arm/syscalls/times.S delete mode 100644 libc/arch-arm/syscalls/truncate.S delete mode 100644 libc/arch-arm/syscalls/umask.S delete mode 100644 libc/arch-arm/syscalls/umount2.S delete mode 100644 libc/arch-arm/syscalls/uname.S delete mode 100644 libc/arch-arm/syscalls/unlink.S delete mode 100644 libc/arch-arm/syscalls/unlinkat.S delete mode 100644 libc/arch-arm/syscalls/utimes.S delete mode 100644 libc/arch-arm/syscalls/vfork.S delete mode 100644 libc/arch-arm/syscalls/waitid.S delete mode 100644 libc/arch-arm/syscalls/write.S delete mode 100644 libc/arch-arm/syscalls/writev.S delete mode 100644 libc/arch-x86/bionic/__get_sp.S delete mode 100755 libc/arch-x86/bionic/__get_tls.c delete mode 100755 libc/arch-x86/bionic/__set_tls.c delete mode 100644 libc/arch-x86/bionic/_exit_with_stack_teardown.S delete mode 100644 libc/arch-x86/bionic/_setjmp.S delete mode 100644 libc/arch-x86/bionic/atomics_x86.S delete mode 100644 libc/arch-x86/bionic/atomics_x86.c delete mode 100644 libc/arch-x86/bionic/clone.S delete mode 100644 libc/arch-x86/bionic/crtbegin_dynamic.S delete mode 100644 libc/arch-x86/bionic/crtbegin_so.S delete mode 100644 libc/arch-x86/bionic/crtbegin_static.S delete mode 100644 libc/arch-x86/bionic/crtend.S delete mode 100644 libc/arch-x86/bionic/crtend_so.S delete mode 100644 libc/arch-x86/bionic/dl_iterate_phdr_static.c delete mode 100644 libc/arch-x86/bionic/setjmp.S delete mode 100644 libc/arch-x86/bionic/vfork.S delete mode 100644 libc/arch-x86/include/endian.h delete mode 100644 libc/arch-x86/include/machine/_types.h delete mode 100644 libc/arch-x86/include/machine/asm.h delete mode 100644 libc/arch-x86/include/machine/cdefs.h delete mode 100644 libc/arch-x86/include/machine/exec.h delete mode 100644 libc/arch-x86/include/machine/ieee.h delete mode 100644 libc/arch-x86/include/machine/internal_types.h delete mode 100644 libc/arch-x86/include/machine/kernel.h delete mode 100644 libc/arch-x86/include/machine/limits.h delete mode 100644 libc/arch-x86/include/machine/setjmp.h delete mode 100644 libc/arch-x86/string/bcmp.S delete mode 100644 libc/arch-x86/string/bcopy.S delete mode 100644 libc/arch-x86/string/bzero.S delete mode 100644 libc/arch-x86/string/fss.S delete mode 100644 libc/arch-x86/string/index.S delete mode 100644 libc/arch-x86/string/memchr.S delete mode 100644 libc/arch-x86/string/memcmp.S delete mode 100644 libc/arch-x86/string/memcpy.S delete mode 100644 libc/arch-x86/string/memmove.S delete mode 100644 libc/arch-x86/string/memset.S delete mode 100644 libc/arch-x86/string/rindex.S delete mode 100644 libc/arch-x86/string/strcat.S delete mode 100644 libc/arch-x86/string/strchr.S delete mode 100644 libc/arch-x86/string/strcmp.S delete mode 100644 libc/arch-x86/string/strcpy.S delete mode 100644 libc/arch-x86/string/strlen.S delete mode 100644 libc/arch-x86/string/strncmp.S delete mode 100644 libc/arch-x86/string/strrchr.S delete mode 100644 libc/arch-x86/string/swab.S delete mode 100644 libc/arch-x86/syscalls.mk delete mode 100644 libc/arch-x86/syscalls/__brk.S delete mode 100644 libc/arch-x86/syscalls/__clone.S delete mode 100644 libc/arch-x86/syscalls/__fcntl.S delete mode 100644 libc/arch-x86/syscalls/__fcntl64.S delete mode 100644 libc/arch-x86/syscalls/__fork.S delete mode 100644 libc/arch-x86/syscalls/__getcwd.S delete mode 100644 libc/arch-x86/syscalls/__getpriority.S delete mode 100644 libc/arch-x86/syscalls/__ioctl.S delete mode 100644 libc/arch-x86/syscalls/__llseek.S delete mode 100644 libc/arch-x86/syscalls/__mmap2.S delete mode 100644 libc/arch-x86/syscalls/__open.S delete mode 100644 libc/arch-x86/syscalls/__openat.S delete mode 100644 libc/arch-x86/syscalls/__pread64.S delete mode 100644 libc/arch-x86/syscalls/__ptrace.S delete mode 100644 libc/arch-x86/syscalls/__pwrite64.S delete mode 100644 libc/arch-x86/syscalls/__reboot.S delete mode 100644 libc/arch-x86/syscalls/__rt_sigaction.S delete mode 100644 libc/arch-x86/syscalls/__rt_sigprocmask.S delete mode 100644 libc/arch-x86/syscalls/__rt_sigtimedwait.S delete mode 100644 libc/arch-x86/syscalls/__set_thread_area.S delete mode 100644 libc/arch-x86/syscalls/__sigsuspend.S delete mode 100644 libc/arch-x86/syscalls/__statfs64.S delete mode 100644 libc/arch-x86/syscalls/__syslog.S delete mode 100644 libc/arch-x86/syscalls/__timer_create.S delete mode 100644 libc/arch-x86/syscalls/__timer_delete.S delete mode 100644 libc/arch-x86/syscalls/__timer_getoverrun.S delete mode 100644 libc/arch-x86/syscalls/__timer_gettime.S delete mode 100644 libc/arch-x86/syscalls/__timer_settime.S delete mode 100644 libc/arch-x86/syscalls/__wait4.S delete mode 100644 libc/arch-x86/syscalls/_exit.S delete mode 100644 libc/arch-x86/syscalls/_exit_thread.S delete mode 100644 libc/arch-x86/syscalls/_waitpid.S delete mode 100644 libc/arch-x86/syscalls/accept.S delete mode 100644 libc/arch-x86/syscalls/access.S delete mode 100644 libc/arch-x86/syscalls/acct.S delete mode 100644 libc/arch-x86/syscalls/bind.S delete mode 100644 libc/arch-x86/syscalls/capget.S delete mode 100644 libc/arch-x86/syscalls/capset.S delete mode 100644 libc/arch-x86/syscalls/chdir.S delete mode 100644 libc/arch-x86/syscalls/chmod.S delete mode 100644 libc/arch-x86/syscalls/chown.S delete mode 100644 libc/arch-x86/syscalls/chroot.S delete mode 100644 libc/arch-x86/syscalls/clock_getres.S delete mode 100644 libc/arch-x86/syscalls/clock_gettime.S delete mode 100644 libc/arch-x86/syscalls/clock_nanosleep.S delete mode 100644 libc/arch-x86/syscalls/clock_settime.S delete mode 100644 libc/arch-x86/syscalls/close.S delete mode 100644 libc/arch-x86/syscalls/connect.S delete mode 100644 libc/arch-x86/syscalls/delete_module.S delete mode 100644 libc/arch-x86/syscalls/dup.S delete mode 100644 libc/arch-x86/syscalls/dup2.S delete mode 100644 libc/arch-x86/syscalls/epoll_create.S delete mode 100644 libc/arch-x86/syscalls/epoll_ctl.S delete mode 100644 libc/arch-x86/syscalls/epoll_wait.S delete mode 100644 libc/arch-x86/syscalls/execve.S delete mode 100644 libc/arch-x86/syscalls/fchdir.S delete mode 100644 libc/arch-x86/syscalls/fchmod.S delete mode 100644 libc/arch-x86/syscalls/fchmodat.S delete mode 100644 libc/arch-x86/syscalls/fchown.S delete mode 100644 libc/arch-x86/syscalls/fchownat.S delete mode 100644 libc/arch-x86/syscalls/flock.S delete mode 100644 libc/arch-x86/syscalls/fstat.S delete mode 100644 libc/arch-x86/syscalls/fstatat.S delete mode 100644 libc/arch-x86/syscalls/fstatfs.S delete mode 100644 libc/arch-x86/syscalls/fsync.S delete mode 100644 libc/arch-x86/syscalls/ftruncate.S delete mode 100644 libc/arch-x86/syscalls/futex.S delete mode 100644 libc/arch-x86/syscalls/getdents.S delete mode 100644 libc/arch-x86/syscalls/getegid.S delete mode 100644 libc/arch-x86/syscalls/geteuid.S delete mode 100644 libc/arch-x86/syscalls/getgid.S delete mode 100644 libc/arch-x86/syscalls/getgroups.S delete mode 100644 libc/arch-x86/syscalls/getitimer.S delete mode 100644 libc/arch-x86/syscalls/getpeername.S delete mode 100644 libc/arch-x86/syscalls/getpgid.S delete mode 100644 libc/arch-x86/syscalls/getpid.S delete mode 100644 libc/arch-x86/syscalls/getppid.S delete mode 100644 libc/arch-x86/syscalls/getresgid.S delete mode 100644 libc/arch-x86/syscalls/getresuid.S delete mode 100644 libc/arch-x86/syscalls/getrlimit.S delete mode 100644 libc/arch-x86/syscalls/getrusage.S delete mode 100644 libc/arch-x86/syscalls/getsockname.S delete mode 100644 libc/arch-x86/syscalls/getsockopt.S delete mode 100644 libc/arch-x86/syscalls/gettid.S delete mode 100644 libc/arch-x86/syscalls/gettimeofday.S delete mode 100644 libc/arch-x86/syscalls/getuid.S delete mode 100644 libc/arch-x86/syscalls/init_module.S delete mode 100644 libc/arch-x86/syscalls/inotify_add_watch.S delete mode 100644 libc/arch-x86/syscalls/inotify_init.S delete mode 100644 libc/arch-x86/syscalls/inotify_rm_watch.S delete mode 100644 libc/arch-x86/syscalls/kill.S delete mode 100644 libc/arch-x86/syscalls/klogctl.S delete mode 100644 libc/arch-x86/syscalls/lchown.S delete mode 100644 libc/arch-x86/syscalls/link.S delete mode 100644 libc/arch-x86/syscalls/listen.S delete mode 100644 libc/arch-x86/syscalls/lseek.S delete mode 100644 libc/arch-x86/syscalls/lstat.S delete mode 100644 libc/arch-x86/syscalls/madvise.S delete mode 100644 libc/arch-x86/syscalls/mincore.S delete mode 100644 libc/arch-x86/syscalls/mkdir.S delete mode 100644 libc/arch-x86/syscalls/mkdirat.S delete mode 100644 libc/arch-x86/syscalls/mknod.S delete mode 100644 libc/arch-x86/syscalls/mlock.S delete mode 100644 libc/arch-x86/syscalls/mount.S delete mode 100644 libc/arch-x86/syscalls/mprotect.S delete mode 100644 libc/arch-x86/syscalls/mremap.S delete mode 100644 libc/arch-x86/syscalls/msync.S delete mode 100644 libc/arch-x86/syscalls/munlock.S delete mode 100644 libc/arch-x86/syscalls/munmap.S delete mode 100644 libc/arch-x86/syscalls/nanosleep.S delete mode 100644 libc/arch-x86/syscalls/pause.S delete mode 100644 libc/arch-x86/syscalls/pipe.S delete mode 100644 libc/arch-x86/syscalls/poll.S delete mode 100644 libc/arch-x86/syscalls/prctl.S delete mode 100644 libc/arch-x86/syscalls/read.S delete mode 100644 libc/arch-x86/syscalls/readlink.S delete mode 100644 libc/arch-x86/syscalls/readv.S delete mode 100644 libc/arch-x86/syscalls/recvfrom.S delete mode 100644 libc/arch-x86/syscalls/recvmsg.S delete mode 100644 libc/arch-x86/syscalls/rename.S delete mode 100644 libc/arch-x86/syscalls/renameat.S delete mode 100644 libc/arch-x86/syscalls/rmdir.S delete mode 100644 libc/arch-x86/syscalls/sched_get_priority_max.S delete mode 100644 libc/arch-x86/syscalls/sched_get_priority_min.S delete mode 100644 libc/arch-x86/syscalls/sched_getparam.S delete mode 100644 libc/arch-x86/syscalls/sched_getscheduler.S delete mode 100644 libc/arch-x86/syscalls/sched_rr_get_interval.S delete mode 100644 libc/arch-x86/syscalls/sched_setparam.S delete mode 100644 libc/arch-x86/syscalls/sched_setscheduler.S delete mode 100644 libc/arch-x86/syscalls/sched_yield.S delete mode 100644 libc/arch-x86/syscalls/select.S delete mode 100644 libc/arch-x86/syscalls/sendfile.S delete mode 100644 libc/arch-x86/syscalls/sendmsg.S delete mode 100644 libc/arch-x86/syscalls/sendto.S delete mode 100644 libc/arch-x86/syscalls/setgid.S delete mode 100644 libc/arch-x86/syscalls/setgroups.S delete mode 100644 libc/arch-x86/syscalls/setitimer.S delete mode 100644 libc/arch-x86/syscalls/setpgid.S delete mode 100644 libc/arch-x86/syscalls/setpriority.S delete mode 100644 libc/arch-x86/syscalls/setregid.S delete mode 100644 libc/arch-x86/syscalls/setresgid.S delete mode 100644 libc/arch-x86/syscalls/setresuid.S delete mode 100644 libc/arch-x86/syscalls/setreuid.S delete mode 100644 libc/arch-x86/syscalls/setrlimit.S delete mode 100644 libc/arch-x86/syscalls/setsid.S delete mode 100644 libc/arch-x86/syscalls/setsockopt.S delete mode 100644 libc/arch-x86/syscalls/settimeofday.S delete mode 100644 libc/arch-x86/syscalls/setuid.S delete mode 100644 libc/arch-x86/syscalls/shutdown.S delete mode 100644 libc/arch-x86/syscalls/sigaction.S delete mode 100644 libc/arch-x86/syscalls/sigpending.S delete mode 100644 libc/arch-x86/syscalls/sigprocmask.S delete mode 100644 libc/arch-x86/syscalls/socket.S delete mode 100644 libc/arch-x86/syscalls/socketpair.S delete mode 100644 libc/arch-x86/syscalls/stat.S delete mode 100644 libc/arch-x86/syscalls/symlink.S delete mode 100644 libc/arch-x86/syscalls/sync.S delete mode 100644 libc/arch-x86/syscalls/times.S delete mode 100644 libc/arch-x86/syscalls/tkill.S delete mode 100644 libc/arch-x86/syscalls/truncate.S delete mode 100644 libc/arch-x86/syscalls/umask.S delete mode 100644 libc/arch-x86/syscalls/umount2.S delete mode 100644 libc/arch-x86/syscalls/uname.S delete mode 100644 libc/arch-x86/syscalls/unlink.S delete mode 100644 libc/arch-x86/syscalls/unlinkat.S delete mode 100644 libc/arch-x86/syscalls/utimes.S delete mode 100644 libc/arch-x86/syscalls/waitid.S delete mode 100644 libc/arch-x86/syscalls/write.S delete mode 100644 libc/arch-x86/syscalls/writev.S delete mode 100644 libc/bionic/__errno.c delete mode 100644 libc/bionic/__set_errno.c delete mode 100644 libc/bionic/_rand48.c delete mode 100644 libc/bionic/arc4random.c delete mode 100644 libc/bionic/atomics_x86.c delete mode 100644 libc/bionic/basename.c delete mode 100644 libc/bionic/basename_r.c delete mode 100644 libc/bionic/dirname.c delete mode 100644 libc/bionic/dirname_r.c delete mode 100644 libc/bionic/dlmalloc.c delete mode 100644 libc/bionic/dlmalloc.h delete mode 100644 libc/bionic/drand48.c delete mode 100644 libc/bionic/eabi.c delete mode 100644 libc/bionic/erand48.c delete mode 100644 libc/bionic/fork.c delete mode 100644 libc/bionic/hash.h delete mode 100644 libc/bionic/if_indextoname.c delete mode 100644 libc/bionic/if_nametoindex.c delete mode 100644 libc/bionic/ioctl.c delete mode 100644 libc/bionic/ldexp.c delete mode 100644 libc/bionic/libc_init_common.c delete mode 100644 libc/bionic/libc_init_common.h delete mode 100644 libc/bionic/libc_init_dynamic.c delete mode 100644 libc/bionic/libc_init_static.c delete mode 100644 libc/bionic/logd_write.c delete mode 100644 libc/bionic/malloc_leak.c delete mode 100644 libc/bionic/md5.c delete mode 100644 libc/bionic/md5.h delete mode 100644 libc/bionic/pthread-timers.c delete mode 100644 libc/bionic/pthread.c delete mode 100644 libc/bionic/pthread_internal.h delete mode 100644 libc/bionic/ptrace.c delete mode 100644 libc/bionic/pututline.c delete mode 100644 libc/bionic/rand48.h delete mode 100644 libc/bionic/realpath.c delete mode 100644 libc/bionic/rules.jam delete mode 100644 libc/bionic/semaphore.c delete mode 100644 libc/bionic/sha1.c delete mode 100644 libc/bionic/ssp.c delete mode 100644 libc/bionic/stubs.c delete mode 100644 libc/bionic/system_properties.c delete mode 100644 libc/bionic/thread_atexit.c delete mode 100644 libc/bionic/time64.c delete mode 100644 libc/bionic/time64_config.h delete mode 100644 libc/bionic/utime.c delete mode 100644 libc/bionic/utmp.c delete mode 100644 libc/docs/OVERVIEW.TXT delete mode 100644 libc/docs/SYSV-IPC.TXT delete mode 100644 libc/include/alloca.h delete mode 100644 libc/include/arpa/inet.h delete mode 100644 libc/include/arpa/nameser.h delete mode 100644 libc/include/assert.h delete mode 100644 libc/include/byteswap.h delete mode 100644 libc/include/ctype.h delete mode 100644 libc/include/dirent.h delete mode 100644 libc/include/dlfcn.h delete mode 100644 libc/include/elf.h delete mode 100644 libc/include/endian.h delete mode 100644 libc/include/err.h delete mode 100644 libc/include/errno.h delete mode 100644 libc/include/fcntl.h delete mode 100644 libc/include/features.h delete mode 100644 libc/include/fnmatch.h delete mode 100644 libc/include/getopt.h delete mode 100644 libc/include/grp.h delete mode 100644 libc/include/inttypes.h delete mode 100644 libc/include/lastlog.h delete mode 100644 libc/include/libgen.h delete mode 100644 libc/include/limits.h delete mode 100644 libc/include/locale.h delete mode 100644 libc/include/malloc.h delete mode 100644 libc/include/memory.h delete mode 100644 libc/include/mntent.h delete mode 100644 libc/include/net/ethertypes.h delete mode 100644 libc/include/net/if.h delete mode 100644 libc/include/net/if_arp.h delete mode 100644 libc/include/net/if_dl.h delete mode 100644 libc/include/net/if_ether.h delete mode 100644 libc/include/net/if_ieee1394.h delete mode 100644 libc/include/net/if_packet.h delete mode 100644 libc/include/net/if_types.h delete mode 100644 libc/include/net/route.h delete mode 100644 libc/include/netdb.h delete mode 100644 libc/include/netinet/ether.h delete mode 100644 libc/include/netinet/if_ether.h delete mode 100644 libc/include/netinet/in.h delete mode 100644 libc/include/netinet/in6.h delete mode 100644 libc/include/netinet/in_systm.h delete mode 100644 libc/include/netinet/ip.h delete mode 100644 libc/include/netinet/ip_icmp.h delete mode 100644 libc/include/netinet/tcp.h delete mode 100644 libc/include/netinet/udp.h delete mode 100644 libc/include/netpacket/packet.h delete mode 100644 libc/include/nsswitch.h delete mode 100644 libc/include/pathconf.h delete mode 100644 libc/include/paths.h delete mode 100644 libc/include/poll.h delete mode 100644 libc/include/pthread.h delete mode 100644 libc/include/pwd.h delete mode 100644 libc/include/resolv.h delete mode 100644 libc/include/sched.h delete mode 100644 libc/include/semaphore.h delete mode 100644 libc/include/setjmp.h delete mode 100644 libc/include/sgtty.h delete mode 100644 libc/include/sha1.h delete mode 100644 libc/include/signal.h delete mode 100644 libc/include/stdint.h delete mode 100644 libc/include/stdio.h delete mode 100644 libc/include/stdlib.h delete mode 100644 libc/include/string.h delete mode 100644 libc/include/strings.h delete mode 100644 libc/include/sys/_errdefs.h delete mode 100644 libc/include/sys/_sigdefs.h delete mode 100644 libc/include/sys/_system_properties.h delete mode 100644 libc/include/sys/_types.h delete mode 100644 libc/include/sys/atomics.h delete mode 100644 libc/include/sys/cdefs.h delete mode 100644 libc/include/sys/cdefs_elf.h delete mode 100644 libc/include/sys/dirent.h delete mode 100644 libc/include/sys/endian.h delete mode 100644 libc/include/sys/epoll.h delete mode 100644 libc/include/sys/errno.h delete mode 100644 libc/include/sys/exec_elf.h delete mode 100644 libc/include/sys/file.h delete mode 100644 libc/include/sys/fsuid.h delete mode 100644 libc/include/sys/inotify.h delete mode 100644 libc/include/sys/ioctl.h delete mode 100644 libc/include/sys/ioctl_compat.h delete mode 100644 libc/include/sys/ipc.h delete mode 100644 libc/include/sys/klog.h delete mode 100644 libc/include/sys/limits.h delete mode 100644 libc/include/sys/linux-syscalls.h delete mode 100644 libc/include/sys/linux-unistd.h delete mode 100644 libc/include/sys/mman.h delete mode 100644 libc/include/sys/mount.h delete mode 100644 libc/include/sys/param.h delete mode 100644 libc/include/sys/poll.h delete mode 100644 libc/include/sys/prctl.h delete mode 100644 libc/include/sys/ptrace.h delete mode 100644 libc/include/sys/reboot.h delete mode 100644 libc/include/sys/resource.h delete mode 100644 libc/include/sys/select.h delete mode 100644 libc/include/sys/sendfile.h delete mode 100644 libc/include/sys/socket.h delete mode 100644 libc/include/sys/socketcalls.h delete mode 100644 libc/include/sys/stat.h delete mode 100644 libc/include/sys/statfs.h delete mode 100644 libc/include/sys/syscall.h delete mode 100644 libc/include/sys/sysconf.h delete mode 100644 libc/include/sys/sysinfo.h delete mode 100644 libc/include/sys/syslimits.h delete mode 100644 libc/include/sys/sysmacros.h delete mode 100644 libc/include/sys/system_properties.h delete mode 100644 libc/include/sys/time.h delete mode 100644 libc/include/sys/timeb.h delete mode 100644 libc/include/sys/times.h delete mode 100644 libc/include/sys/ttychars.h delete mode 100644 libc/include/sys/ttydev.h delete mode 100644 libc/include/sys/types.h delete mode 100644 libc/include/sys/uio.h delete mode 100644 libc/include/sys/un.h delete mode 100644 libc/include/sys/utime.h delete mode 100644 libc/include/sys/utsname.h delete mode 100644 libc/include/sys/vfs.h delete mode 100644 libc/include/sys/vt.h delete mode 100644 libc/include/sys/wait.h delete mode 100644 libc/include/syslog.h delete mode 100644 libc/include/termios.h delete mode 100644 libc/include/time.h delete mode 100644 libc/include/time64.h delete mode 100644 libc/include/unistd.h delete mode 100644 libc/include/util.h delete mode 100644 libc/include/utime.h delete mode 100644 libc/include/utmp.h delete mode 100644 libc/include/wchar.h delete mode 100644 libc/include/wctype.h delete mode 100644 libc/inet/bindresvport.c delete mode 100644 libc/inet/inet_addr.c delete mode 100644 libc/inet/inet_aton.c delete mode 100644 libc/inet/inet_ntoa.c delete mode 100644 libc/inet/inet_ntop.c delete mode 100644 libc/inet/inet_pton.c delete mode 100644 libc/kernel/README.TXT delete mode 100644 libc/kernel/arch-arm/asm/a.out.h delete mode 100644 libc/kernel/arch-arm/asm/arch/board-perseus2.h delete mode 100644 libc/kernel/arch-arm/asm/arch/board.h delete mode 100644 libc/kernel/arch-arm/asm/arch/cpu.h delete mode 100644 libc/kernel/arch-arm/asm/arch/dma.h delete mode 100644 libc/kernel/arch-arm/asm/arch/fpga.h delete mode 100644 libc/kernel/arch-arm/asm/arch/gpio-switch.h delete mode 100644 libc/kernel/arch-arm/asm/arch/gpio.h delete mode 100644 libc/kernel/arch-arm/asm/arch/hardware.h delete mode 100644 libc/kernel/arch-arm/asm/arch/io.h delete mode 100644 libc/kernel/arch-arm/asm/arch/irqs.h delete mode 100644 libc/kernel/arch-arm/asm/arch/mcbsp.h delete mode 100644 libc/kernel/arch-arm/asm/arch/memory.h delete mode 100644 libc/kernel/arch-arm/asm/arch/mtd-xip.h delete mode 100644 libc/kernel/arch-arm/asm/arch/mux.h delete mode 100644 libc/kernel/arch-arm/asm/arch/omap24xx.h delete mode 100644 libc/kernel/arch-arm/asm/arch/serial.h delete mode 100644 libc/kernel/arch-arm/asm/arch/timex.h delete mode 100644 libc/kernel/arch-arm/asm/arch/vmalloc.h delete mode 100644 libc/kernel/arch-arm/asm/atomic.h delete mode 100644 libc/kernel/arch-arm/asm/auxvec.h delete mode 100644 libc/kernel/arch-arm/asm/bitops.h delete mode 100644 libc/kernel/arch-arm/asm/byteorder.h delete mode 100644 libc/kernel/arch-arm/asm/cache.h delete mode 100644 libc/kernel/arch-arm/asm/cacheflush.h delete mode 100644 libc/kernel/arch-arm/asm/cputime.h delete mode 100644 libc/kernel/arch-arm/asm/delay.h delete mode 100644 libc/kernel/arch-arm/asm/div64.h delete mode 100644 libc/kernel/arch-arm/asm/dma-mapping.h delete mode 100644 libc/kernel/arch-arm/asm/dma.h delete mode 100644 libc/kernel/arch-arm/asm/domain.h delete mode 100644 libc/kernel/arch-arm/asm/dyntick.h delete mode 100644 libc/kernel/arch-arm/asm/elf.h delete mode 100644 libc/kernel/arch-arm/asm/errno.h delete mode 100644 libc/kernel/arch-arm/asm/fcntl.h delete mode 100644 libc/kernel/arch-arm/asm/fpstate.h delete mode 100644 libc/kernel/arch-arm/asm/glue.h delete mode 100644 libc/kernel/arch-arm/asm/hardirq.h delete mode 100644 libc/kernel/arch-arm/asm/hardware.h delete mode 100644 libc/kernel/arch-arm/asm/hw_irq.h delete mode 100644 libc/kernel/arch-arm/asm/ide.h delete mode 100644 libc/kernel/arch-arm/asm/io.h delete mode 100644 libc/kernel/arch-arm/asm/ioctl.h delete mode 100644 libc/kernel/arch-arm/asm/ioctls.h delete mode 100644 libc/kernel/arch-arm/asm/ipcbuf.h delete mode 100644 libc/kernel/arch-arm/asm/irq.h delete mode 100644 libc/kernel/arch-arm/asm/linkage.h delete mode 100644 libc/kernel/arch-arm/asm/local.h delete mode 100644 libc/kernel/arch-arm/asm/locks.h delete mode 100644 libc/kernel/arch-arm/asm/mc146818rtc.h delete mode 100644 libc/kernel/arch-arm/asm/memory.h delete mode 100644 libc/kernel/arch-arm/asm/mman.h delete mode 100644 libc/kernel/arch-arm/asm/module.h delete mode 100644 libc/kernel/arch-arm/asm/msgbuf.h delete mode 100644 libc/kernel/arch-arm/asm/mtd-xip.h delete mode 100644 libc/kernel/arch-arm/asm/page.h delete mode 100644 libc/kernel/arch-arm/asm/param.h delete mode 100644 libc/kernel/arch-arm/asm/percpu.h delete mode 100644 libc/kernel/arch-arm/asm/pgalloc.h delete mode 100644 libc/kernel/arch-arm/asm/pgtable-hwdef.h delete mode 100644 libc/kernel/arch-arm/asm/pgtable.h delete mode 100644 libc/kernel/arch-arm/asm/poll.h delete mode 100644 libc/kernel/arch-arm/asm/posix_types.h delete mode 100644 libc/kernel/arch-arm/asm/proc-fns.h delete mode 100644 libc/kernel/arch-arm/asm/processor.h delete mode 100644 libc/kernel/arch-arm/asm/procinfo.h delete mode 100644 libc/kernel/arch-arm/asm/ptrace.h delete mode 100644 libc/kernel/arch-arm/asm/resource.h delete mode 100644 libc/kernel/arch-arm/asm/scatterlist.h delete mode 100644 libc/kernel/arch-arm/asm/semaphore.h delete mode 100644 libc/kernel/arch-arm/asm/sembuf.h delete mode 100644 libc/kernel/arch-arm/asm/shmbuf.h delete mode 100644 libc/kernel/arch-arm/asm/shmparam.h delete mode 100644 libc/kernel/arch-arm/asm/sigcontext.h delete mode 100644 libc/kernel/arch-arm/asm/siginfo.h delete mode 100644 libc/kernel/arch-arm/asm/signal.h delete mode 100644 libc/kernel/arch-arm/asm/sizes.h delete mode 100644 libc/kernel/arch-arm/asm/smp.h delete mode 100644 libc/kernel/arch-arm/asm/socket.h delete mode 100644 libc/kernel/arch-arm/asm/sockios.h delete mode 100644 libc/kernel/arch-arm/asm/spinlock.h delete mode 100644 libc/kernel/arch-arm/asm/spinlock_types.h delete mode 100644 libc/kernel/arch-arm/asm/stat.h delete mode 100644 libc/kernel/arch-arm/asm/statfs.h delete mode 100644 libc/kernel/arch-arm/asm/suspend.h delete mode 100644 libc/kernel/arch-arm/asm/system.h delete mode 100644 libc/kernel/arch-arm/asm/termbits.h delete mode 100644 libc/kernel/arch-arm/asm/termios.h delete mode 100644 libc/kernel/arch-arm/asm/thread_info.h delete mode 100644 libc/kernel/arch-arm/asm/timex.h delete mode 100644 libc/kernel/arch-arm/asm/tlbflush.h delete mode 100644 libc/kernel/arch-arm/asm/topology.h delete mode 100644 libc/kernel/arch-arm/asm/types.h delete mode 100644 libc/kernel/arch-arm/asm/uaccess.h delete mode 100644 libc/kernel/arch-arm/asm/unaligned.h delete mode 100644 libc/kernel/arch-arm/asm/unistd.h delete mode 100644 libc/kernel/arch-arm/asm/user.h delete mode 100644 libc/kernel/arch-arm/asm/vga.h delete mode 100644 libc/kernel/arch-x86/asm/a.out.h delete mode 100644 libc/kernel/arch-x86/asm/acpi.h delete mode 100644 libc/kernel/arch-x86/asm/acpi_32.h delete mode 100644 libc/kernel/arch-x86/asm/alternative.h delete mode 100644 libc/kernel/arch-x86/asm/alternative_32.h delete mode 100644 libc/kernel/arch-x86/asm/apic.h delete mode 100644 libc/kernel/arch-x86/asm/apic_32.h delete mode 100644 libc/kernel/arch-x86/asm/apicdef.h delete mode 100644 libc/kernel/arch-x86/asm/apicdef_32.h delete mode 100644 libc/kernel/arch-x86/asm/atomic.h delete mode 100644 libc/kernel/arch-x86/asm/atomic_32.h delete mode 100644 libc/kernel/arch-x86/asm/auxvec.h delete mode 100644 libc/kernel/arch-x86/asm/bitops.h delete mode 100644 libc/kernel/arch-x86/asm/bitops_32.h delete mode 100644 libc/kernel/arch-x86/asm/bug.h delete mode 100644 libc/kernel/arch-x86/asm/byteorder.h delete mode 100644 libc/kernel/arch-x86/asm/cache.h delete mode 100644 libc/kernel/arch-x86/asm/cacheflush.h delete mode 100644 libc/kernel/arch-x86/asm/cmpxchg.h delete mode 100644 libc/kernel/arch-x86/asm/cmpxchg_32.h delete mode 100644 libc/kernel/arch-x86/asm/cpufeature.h delete mode 100644 libc/kernel/arch-x86/asm/cpufeature_32.h delete mode 100644 libc/kernel/arch-x86/asm/cputime.h delete mode 100644 libc/kernel/arch-x86/asm/current.h delete mode 100644 libc/kernel/arch-x86/asm/current_32.h delete mode 100644 libc/kernel/arch-x86/asm/delay.h delete mode 100644 libc/kernel/arch-x86/asm/desc.h delete mode 100644 libc/kernel/arch-x86/asm/desc_32.h delete mode 100644 libc/kernel/arch-x86/asm/desc_defs.h delete mode 100644 libc/kernel/arch-x86/asm/div64.h delete mode 100644 libc/kernel/arch-x86/asm/dma-mapping.h delete mode 100644 libc/kernel/arch-x86/asm/dma-mapping_32.h delete mode 100644 libc/kernel/arch-x86/asm/dma.h delete mode 100644 libc/kernel/arch-x86/asm/dma_32.h delete mode 100644 libc/kernel/arch-x86/asm/dwarf2.h delete mode 100644 libc/kernel/arch-x86/asm/dwarf2_32.h delete mode 100644 libc/kernel/arch-x86/asm/e820.h delete mode 100644 libc/kernel/arch-x86/asm/elf.h delete mode 100644 libc/kernel/arch-x86/asm/errno.h delete mode 100644 libc/kernel/arch-x86/asm/fcntl.h delete mode 100644 libc/kernel/arch-x86/asm/fixmap.h delete mode 100644 libc/kernel/arch-x86/asm/fixmap_32.h delete mode 100644 libc/kernel/arch-x86/asm/genapic.h delete mode 100644 libc/kernel/arch-x86/asm/genapic_32.h delete mode 100644 libc/kernel/arch-x86/asm/hardirq.h delete mode 100644 libc/kernel/arch-x86/asm/hardirq_32.h delete mode 100644 libc/kernel/arch-x86/asm/highmem.h delete mode 100644 libc/kernel/arch-x86/asm/hw_irq.h delete mode 100644 libc/kernel/arch-x86/asm/hw_irq_32.h delete mode 100644 libc/kernel/arch-x86/asm/i387.h delete mode 100644 libc/kernel/arch-x86/asm/i387_32.h delete mode 100644 libc/kernel/arch-x86/asm/i8253.h delete mode 100644 libc/kernel/arch-x86/asm/i8259.h delete mode 100644 libc/kernel/arch-x86/asm/ia32_unistd.h delete mode 100644 libc/kernel/arch-x86/asm/io.h delete mode 100644 libc/kernel/arch-x86/asm/io_32.h delete mode 100644 libc/kernel/arch-x86/asm/io_apic.h delete mode 100644 libc/kernel/arch-x86/asm/io_apic_32.h delete mode 100644 libc/kernel/arch-x86/asm/ioctl.h delete mode 100644 libc/kernel/arch-x86/asm/ioctls.h delete mode 100644 libc/kernel/arch-x86/asm/ipcbuf.h delete mode 100644 libc/kernel/arch-x86/asm/irq.h delete mode 100644 libc/kernel/arch-x86/asm/irq_32.h delete mode 100644 libc/kernel/arch-x86/asm/irqflags.h delete mode 100644 libc/kernel/arch-x86/asm/irqflags_32.h delete mode 100644 libc/kernel/arch-x86/asm/ist.h delete mode 100644 libc/kernel/arch-x86/asm/kmap_types.h delete mode 100644 libc/kernel/arch-x86/asm/ldt.h delete mode 100644 libc/kernel/arch-x86/asm/linkage.h delete mode 100644 libc/kernel/arch-x86/asm/linkage_32.h delete mode 100644 libc/kernel/arch-x86/asm/local.h delete mode 100644 libc/kernel/arch-x86/asm/local_32.h delete mode 100644 libc/kernel/arch-x86/asm/math_emu.h delete mode 100644 libc/kernel/arch-x86/asm/mc146818rtc.h delete mode 100644 libc/kernel/arch-x86/asm/mc146818rtc_32.h delete mode 100644 libc/kernel/arch-x86/asm/mman.h delete mode 100644 libc/kernel/arch-x86/asm/mmsegment.h delete mode 100644 libc/kernel/arch-x86/asm/mmu.h delete mode 100644 libc/kernel/arch-x86/asm/module.h delete mode 100644 libc/kernel/arch-x86/asm/module_32.h delete mode 100644 libc/kernel/arch-x86/asm/mpspec.h delete mode 100644 libc/kernel/arch-x86/asm/mpspec_32.h delete mode 100644 libc/kernel/arch-x86/asm/mpspec_def.h delete mode 100644 libc/kernel/arch-x86/asm/msgbuf.h delete mode 100644 libc/kernel/arch-x86/asm/msr-index.h delete mode 100644 libc/kernel/arch-x86/asm/msr.h delete mode 100644 libc/kernel/arch-x86/asm/page.h delete mode 100644 libc/kernel/arch-x86/asm/page_32.h delete mode 100644 libc/kernel/arch-x86/asm/param.h delete mode 100644 libc/kernel/arch-x86/asm/paravirt.h delete mode 100644 libc/kernel/arch-x86/asm/pda.h delete mode 100644 libc/kernel/arch-x86/asm/percpu.h delete mode 100644 libc/kernel/arch-x86/asm/percpu_32.h delete mode 100644 libc/kernel/arch-x86/asm/pgalloc.h delete mode 100644 libc/kernel/arch-x86/asm/pgalloc_32.h delete mode 100644 libc/kernel/arch-x86/asm/pgtable-2level-defs.h delete mode 100644 libc/kernel/arch-x86/asm/pgtable-2level.h delete mode 100644 libc/kernel/arch-x86/asm/pgtable.h delete mode 100644 libc/kernel/arch-x86/asm/pgtable_32.h delete mode 100644 libc/kernel/arch-x86/asm/poll.h delete mode 100644 libc/kernel/arch-x86/asm/posix_types.h delete mode 100644 libc/kernel/arch-x86/asm/posix_types_32.h delete mode 100644 libc/kernel/arch-x86/asm/prctl.h delete mode 100644 libc/kernel/arch-x86/asm/processor-flags.h delete mode 100644 libc/kernel/arch-x86/asm/processor.h delete mode 100644 libc/kernel/arch-x86/asm/processor_32.h delete mode 100644 libc/kernel/arch-x86/asm/ptrace-abi.h delete mode 100644 libc/kernel/arch-x86/asm/ptrace.h delete mode 100644 libc/kernel/arch-x86/asm/required-features.h delete mode 100644 libc/kernel/arch-x86/asm/resource.h delete mode 100644 libc/kernel/arch-x86/asm/rwlock.h delete mode 100644 libc/kernel/arch-x86/asm/scatterlist.h delete mode 100644 libc/kernel/arch-x86/asm/scatterlist_32.h delete mode 100644 libc/kernel/arch-x86/asm/sections.h delete mode 100644 libc/kernel/arch-x86/asm/segment.h delete mode 100644 libc/kernel/arch-x86/asm/segment_32.h delete mode 100644 libc/kernel/arch-x86/asm/semaphore.h delete mode 100644 libc/kernel/arch-x86/asm/semaphore_32.h delete mode 100644 libc/kernel/arch-x86/asm/sembuf.h delete mode 100644 libc/kernel/arch-x86/asm/setup.h delete mode 100644 libc/kernel/arch-x86/asm/shmbuf.h delete mode 100644 libc/kernel/arch-x86/asm/shmparam.h delete mode 100644 libc/kernel/arch-x86/asm/sigcontext.h delete mode 100644 libc/kernel/arch-x86/asm/siginfo.h delete mode 100644 libc/kernel/arch-x86/asm/signal.h delete mode 100644 libc/kernel/arch-x86/asm/smp.h delete mode 100644 libc/kernel/arch-x86/asm/smp_32.h delete mode 100644 libc/kernel/arch-x86/asm/socket.h delete mode 100644 libc/kernel/arch-x86/asm/sockios.h delete mode 100644 libc/kernel/arch-x86/asm/spinlock.h delete mode 100644 libc/kernel/arch-x86/asm/spinlock_32.h delete mode 100644 libc/kernel/arch-x86/asm/spinlock_types.h delete mode 100644 libc/kernel/arch-x86/asm/stat.h delete mode 100644 libc/kernel/arch-x86/asm/statfs.h delete mode 100644 libc/kernel/arch-x86/asm/string.h delete mode 100644 libc/kernel/arch-x86/asm/string_32.h delete mode 100644 libc/kernel/arch-x86/asm/swiotlb.h delete mode 100644 libc/kernel/arch-x86/asm/system.h delete mode 100644 libc/kernel/arch-x86/asm/system_32.h delete mode 100644 libc/kernel/arch-x86/asm/termbits.h delete mode 100644 libc/kernel/arch-x86/asm/termios.h delete mode 100644 libc/kernel/arch-x86/asm/thread_info.h delete mode 100644 libc/kernel/arch-x86/asm/thread_info_32.h delete mode 100644 libc/kernel/arch-x86/asm/tlbflush.h delete mode 100644 libc/kernel/arch-x86/asm/tlbflush_32.h delete mode 100644 libc/kernel/arch-x86/asm/tsc.h delete mode 100644 libc/kernel/arch-x86/asm/types.h delete mode 100644 libc/kernel/arch-x86/asm/uaccess.h delete mode 100644 libc/kernel/arch-x86/asm/uaccess_32.h delete mode 100644 libc/kernel/arch-x86/asm/unaligned.h delete mode 100644 libc/kernel/arch-x86/asm/unistd.h delete mode 100644 libc/kernel/arch-x86/asm/unistd_32.h delete mode 100644 libc/kernel/arch-x86/asm/user.h delete mode 100644 libc/kernel/arch-x86/asm/user32.h delete mode 100644 libc/kernel/arch-x86/asm/user_32.h delete mode 100644 libc/kernel/arch-x86/asm/vm86.h delete mode 100644 libc/kernel/arch-x86/asm/voyager.h delete mode 100644 libc/kernel/arch-x86/asm/vsyscall.h delete mode 100644 libc/kernel/arch-x86/asm/xen/hypercall.h delete mode 100644 libc/kernel/common/asm-generic/4level-fixup.h delete mode 100644 libc/kernel/common/asm-generic/audit_dir_write.h delete mode 100644 libc/kernel/common/asm-generic/bitops/__ffs.h delete mode 100644 libc/kernel/common/asm-generic/bitops/atomic.h delete mode 100644 libc/kernel/common/asm-generic/bitops/ffz.h delete mode 100644 libc/kernel/common/asm-generic/bitops/find.h delete mode 100644 libc/kernel/common/asm-generic/bitops/fls.h delete mode 100644 libc/kernel/common/asm-generic/bitops/fls64.h delete mode 100644 libc/kernel/common/asm-generic/bitops/le.h delete mode 100644 libc/kernel/common/asm-generic/bitops/non-atomic.h delete mode 100644 libc/kernel/common/asm-generic/bug.h delete mode 100644 libc/kernel/common/asm-generic/cputime.h delete mode 100644 libc/kernel/common/asm-generic/emergency-restart.h delete mode 100644 libc/kernel/common/asm-generic/errno-base.h delete mode 100644 libc/kernel/common/asm-generic/errno.h delete mode 100644 libc/kernel/common/asm-generic/fcntl.h delete mode 100644 libc/kernel/common/asm-generic/futex.h delete mode 100644 libc/kernel/common/asm-generic/ioctl.h delete mode 100644 libc/kernel/common/asm-generic/ipc.h delete mode 100644 libc/kernel/common/asm-generic/local.h delete mode 100644 libc/kernel/common/asm-generic/memory_model.h delete mode 100644 libc/kernel/common/asm-generic/mman.h delete mode 100644 libc/kernel/common/asm-generic/mutex-xchg.h delete mode 100644 libc/kernel/common/asm-generic/percpu.h delete mode 100644 libc/kernel/common/asm-generic/pgtable-nopud.h delete mode 100644 libc/kernel/common/asm-generic/pgtable.h delete mode 100644 libc/kernel/common/asm-generic/poll.h delete mode 100644 libc/kernel/common/asm-generic/resource.h delete mode 100644 libc/kernel/common/asm-generic/sections.h delete mode 100644 libc/kernel/common/asm-generic/siginfo.h delete mode 100644 libc/kernel/common/asm-generic/signal.h delete mode 100644 libc/kernel/common/asm-generic/tlb.h delete mode 100644 libc/kernel/common/asm-generic/topology.h delete mode 100644 libc/kernel/common/asm-generic/xor.h delete mode 100644 libc/kernel/common/linux/a.out.h delete mode 100644 libc/kernel/common/linux/aio_abi.h delete mode 100644 libc/kernel/common/linux/akm8976.h delete mode 100644 libc/kernel/common/linux/android_alarm.h delete mode 100644 libc/kernel/common/linux/android_pmem.h delete mode 100644 libc/kernel/common/linux/android_power.h delete mode 100644 libc/kernel/common/linux/apm_bios.h delete mode 100644 libc/kernel/common/linux/ashmem.h delete mode 100644 libc/kernel/common/linux/ata.h delete mode 100644 libc/kernel/common/linux/atm.h delete mode 100644 libc/kernel/common/linux/atmapi.h delete mode 100644 libc/kernel/common/linux/atmdev.h delete mode 100644 libc/kernel/common/linux/atmioc.h delete mode 100644 libc/kernel/common/linux/atmppp.h delete mode 100644 libc/kernel/common/linux/atmsap.h delete mode 100644 libc/kernel/common/linux/attribute_container.h delete mode 100644 libc/kernel/common/linux/auto_fs.h delete mode 100644 libc/kernel/common/linux/autoconf.h delete mode 100644 libc/kernel/common/linux/auxvec.h delete mode 100644 libc/kernel/common/linux/backing-dev.h delete mode 100644 libc/kernel/common/linux/binder.h delete mode 100644 libc/kernel/common/linux/binfmts.h delete mode 100644 libc/kernel/common/linux/bio.h delete mode 100644 libc/kernel/common/linux/bitmap.h delete mode 100644 libc/kernel/common/linux/bitops.h delete mode 100644 libc/kernel/common/linux/blkdev.h delete mode 100644 libc/kernel/common/linux/blkpg.h delete mode 100644 libc/kernel/common/linux/blockgroup_lock.h delete mode 100644 libc/kernel/common/linux/byteorder/big_endian.h delete mode 100644 libc/kernel/common/linux/byteorder/generic.h delete mode 100644 libc/kernel/common/linux/byteorder/little_endian.h delete mode 100644 libc/kernel/common/linux/byteorder/swab.h delete mode 100644 libc/kernel/common/linux/byteorder/swabb.h delete mode 100644 libc/kernel/common/linux/cache.h delete mode 100644 libc/kernel/common/linux/calc64.h delete mode 100644 libc/kernel/common/linux/capability.h delete mode 100644 libc/kernel/common/linux/capi.h delete mode 100644 libc/kernel/common/linux/cdev.h delete mode 100644 libc/kernel/common/linux/cdrom.h delete mode 100644 libc/kernel/common/linux/circ_buf.h delete mode 100644 libc/kernel/common/linux/clk.h delete mode 100644 libc/kernel/common/linux/coda.h delete mode 100644 libc/kernel/common/linux/coda_fs_i.h delete mode 100644 libc/kernel/common/linux/compat.h delete mode 100644 libc/kernel/common/linux/compiler-gcc.h delete mode 100644 libc/kernel/common/linux/compiler.h delete mode 100644 libc/kernel/common/linux/completion.h delete mode 100644 libc/kernel/common/linux/config.h delete mode 100644 libc/kernel/common/linux/console_struct.h delete mode 100644 libc/kernel/common/linux/cpu.h delete mode 100644 libc/kernel/common/linux/cpumask.h delete mode 100644 libc/kernel/common/linux/ctype.h delete mode 100644 libc/kernel/common/linux/dccp.h delete mode 100644 libc/kernel/common/linux/debug_locks.h delete mode 100644 libc/kernel/common/linux/delay.h delete mode 100644 libc/kernel/common/linux/device.h delete mode 100644 libc/kernel/common/linux/dirent.h delete mode 100644 libc/kernel/common/linux/dm-ioctl.h delete mode 100644 libc/kernel/common/linux/dma-mapping.h delete mode 100644 libc/kernel/common/linux/dmaengine.h delete mode 100644 libc/kernel/common/linux/efs_dir.h delete mode 100644 libc/kernel/common/linux/efs_fs_i.h delete mode 100644 libc/kernel/common/linux/efs_fs_sb.h delete mode 100644 libc/kernel/common/linux/elevator.h delete mode 100644 libc/kernel/common/linux/elf-em.h delete mode 100644 libc/kernel/common/linux/elf.h delete mode 100644 libc/kernel/common/linux/err.h delete mode 100644 libc/kernel/common/linux/errno.h delete mode 100644 libc/kernel/common/linux/errqueue.h delete mode 100644 libc/kernel/common/linux/etherdevice.h delete mode 100644 libc/kernel/common/linux/ext2_fs.h delete mode 100644 libc/kernel/common/linux/ext3_fs.h delete mode 100644 libc/kernel/common/linux/fadvise.h delete mode 100644 libc/kernel/common/linux/fb.h delete mode 100644 libc/kernel/common/linux/fcntl.h delete mode 100644 libc/kernel/common/linux/fd.h delete mode 100644 libc/kernel/common/linux/file.h delete mode 100644 libc/kernel/common/linux/filter.h delete mode 100644 libc/kernel/common/linux/fs.h delete mode 100644 libc/kernel/common/linux/ftape.h delete mode 100644 libc/kernel/common/linux/futex.h delete mode 100644 libc/kernel/common/linux/genhd.h delete mode 100644 libc/kernel/common/linux/gfp.h delete mode 100644 libc/kernel/common/linux/hardirq.h delete mode 100644 libc/kernel/common/linux/hdlc/ioctl.h delete mode 100644 libc/kernel/common/linux/hdreg.h delete mode 100644 libc/kernel/common/linux/hdsmart.h delete mode 100644 libc/kernel/common/linux/highmem.h delete mode 100644 libc/kernel/common/linux/hil.h delete mode 100644 libc/kernel/common/linux/i2c.h delete mode 100644 libc/kernel/common/linux/icmp.h delete mode 100644 libc/kernel/common/linux/if.h delete mode 100644 libc/kernel/common/linux/if_arcnet.h delete mode 100644 libc/kernel/common/linux/if_arp.h delete mode 100644 libc/kernel/common/linux/if_bridge.h delete mode 100644 libc/kernel/common/linux/if_ether.h delete mode 100644 libc/kernel/common/linux/if_fc.h delete mode 100644 libc/kernel/common/linux/if_fddi.h delete mode 100644 libc/kernel/common/linux/if_hippi.h delete mode 100644 libc/kernel/common/linux/if_packet.h delete mode 100644 libc/kernel/common/linux/if_ppp.h delete mode 100644 libc/kernel/common/linux/if_tr.h delete mode 100644 libc/kernel/common/linux/if_tun.h delete mode 100644 libc/kernel/common/linux/if_vlan.h delete mode 100644 libc/kernel/common/linux/in.h delete mode 100644 libc/kernel/common/linux/in6.h delete mode 100644 libc/kernel/common/linux/init.h delete mode 100644 libc/kernel/common/linux/inotify.h delete mode 100644 libc/kernel/common/linux/input.h delete mode 100644 libc/kernel/common/linux/interrupt.h delete mode 100644 libc/kernel/common/linux/ioctl.h delete mode 100644 libc/kernel/common/linux/ioport.h delete mode 100644 libc/kernel/common/linux/ioprio.h delete mode 100644 libc/kernel/common/linux/ip.h delete mode 100644 libc/kernel/common/linux/ipc.h delete mode 100644 libc/kernel/common/linux/ipmi_msgdefs.h delete mode 100644 libc/kernel/common/linux/ipmi_smi.h delete mode 100644 libc/kernel/common/linux/ipx.h delete mode 100644 libc/kernel/common/linux/irq.h delete mode 100644 libc/kernel/common/linux/irq_cpustat.h delete mode 100644 libc/kernel/common/linux/irqflags.h delete mode 100644 libc/kernel/common/linux/irqreturn.h delete mode 100644 libc/kernel/common/linux/jbd.h delete mode 100644 libc/kernel/common/linux/jiffies.h delete mode 100644 libc/kernel/common/linux/kd.h delete mode 100644 libc/kernel/common/linux/kdev_t.h delete mode 100644 libc/kernel/common/linux/kernel.h delete mode 100644 libc/kernel/common/linux/kernel_stat.h delete mode 100644 libc/kernel/common/linux/kernelcapi.h delete mode 100644 libc/kernel/common/linux/kexec.h delete mode 100644 libc/kernel/common/linux/key.h delete mode 100644 libc/kernel/common/linux/keyboard.h delete mode 100644 libc/kernel/common/linux/keychord.h delete mode 100644 libc/kernel/common/linux/klist.h delete mode 100644 libc/kernel/common/linux/kmod.h delete mode 100644 libc/kernel/common/linux/kobject.h delete mode 100644 libc/kernel/common/linux/kref.h delete mode 100644 libc/kernel/common/linux/ktime.h delete mode 100644 libc/kernel/common/linux/limits.h delete mode 100644 libc/kernel/common/linux/linkage.h delete mode 100644 libc/kernel/common/linux/list.h delete mode 100644 libc/kernel/common/linux/lockd/nlm.h delete mode 100644 libc/kernel/common/linux/lockd/xdr.h delete mode 100644 libc/kernel/common/linux/lockdep.h delete mode 100644 libc/kernel/common/linux/loop.h delete mode 100644 libc/kernel/common/linux/magic.h delete mode 100644 libc/kernel/common/linux/major.h delete mode 100644 libc/kernel/common/linux/mc146818rtc.h delete mode 100644 libc/kernel/common/linux/mca.h delete mode 100644 libc/kernel/common/linux/mempolicy.h delete mode 100644 libc/kernel/common/linux/mempool.h delete mode 100644 libc/kernel/common/linux/miscdevice.h delete mode 100644 libc/kernel/common/linux/mm.h delete mode 100644 libc/kernel/common/linux/mmc/card.h delete mode 100644 libc/kernel/common/linux/mmc/host.h delete mode 100644 libc/kernel/common/linux/mmc/mmc.h delete mode 100644 libc/kernel/common/linux/mmzone.h delete mode 100644 libc/kernel/common/linux/mod_devicetable.h delete mode 100644 libc/kernel/common/linux/module.h delete mode 100644 libc/kernel/common/linux/moduleparam.h delete mode 100644 libc/kernel/common/linux/mount.h delete mode 100644 libc/kernel/common/linux/msdos_fs.h delete mode 100644 libc/kernel/common/linux/msg.h delete mode 100644 libc/kernel/common/linux/msm_adsp.h delete mode 100644 libc/kernel/common/linux/msm_audio.h delete mode 100644 libc/kernel/common/linux/msm_mdp.h delete mode 100644 libc/kernel/common/linux/mt9t013.h delete mode 100644 libc/kernel/common/linux/mtd/bbm.h delete mode 100644 libc/kernel/common/linux/mtd/blktrans.h delete mode 100644 libc/kernel/common/linux/mtd/cfi.h delete mode 100644 libc/kernel/common/linux/mtd/cfi_endian.h delete mode 100644 libc/kernel/common/linux/mtd/compatmac.h delete mode 100644 libc/kernel/common/linux/mtd/flashchip.h delete mode 100644 libc/kernel/common/linux/mtd/map.h delete mode 100644 libc/kernel/common/linux/mtd/mtd.h delete mode 100644 libc/kernel/common/linux/mtd/nand.h delete mode 100644 libc/kernel/common/linux/mtd/nand_ecc.h delete mode 100644 libc/kernel/common/linux/mtd/nftl.h delete mode 100644 libc/kernel/common/linux/mtd/onenand_regs.h delete mode 100644 libc/kernel/common/linux/mtd/partitions.h delete mode 100644 libc/kernel/common/linux/mtio.h delete mode 100644 libc/kernel/common/linux/mutex-debug.h delete mode 100644 libc/kernel/common/linux/mutex.h delete mode 100644 libc/kernel/common/linux/ncp.h delete mode 100644 libc/kernel/common/linux/ncp_mount.h delete mode 100644 libc/kernel/common/linux/ncp_no.h delete mode 100644 libc/kernel/common/linux/net.h delete mode 100644 libc/kernel/common/linux/netdevice.h delete mode 100644 libc/kernel/common/linux/netfilter.h delete mode 100644 libc/kernel/common/linux/netfilter/nf_conntrack_common.h delete mode 100644 libc/kernel/common/linux/netfilter/nf_conntrack_ftp.h delete mode 100644 libc/kernel/common/linux/netfilter/nf_conntrack_sctp.h delete mode 100644 libc/kernel/common/linux/netfilter/nf_conntrack_tcp.h delete mode 100644 libc/kernel/common/linux/netfilter/nf_conntrack_tuple_common.h delete mode 100644 libc/kernel/common/linux/netfilter/nfnetlink.h delete mode 100644 libc/kernel/common/linux/netfilter/nfnetlink_conntrack.h delete mode 100644 libc/kernel/common/linux/netfilter/x_tables.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_CLASSIFY.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_CONNMARK.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_CONNSECMARK.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_MARK.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_NFQUEUE.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_SECMARK.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_comment.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_connbytes.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_connmark.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_conntrack.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_dccp.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_esp.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_helper.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_length.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_limit.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_mac.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_mark.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_multiport.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_physdev.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_pkttype.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_quota.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_realm.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_sctp.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_state.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_statistic.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_string.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_tcpmss.h delete mode 100644 libc/kernel/common/linux/netfilter/xt_tcpudp.h delete mode 100644 libc/kernel/common/linux/netfilter_arp.h delete mode 100644 libc/kernel/common/linux/netfilter_arp/arp_tables.h delete mode 100644 libc/kernel/common/linux/netfilter_bridge.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ip_conntrack.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ip_conntrack_tuple.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ip_nat.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ip_nat_rule.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ip_queue.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ip_tables.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_CLASSIFY.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_DSCP.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_ECN.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_LOG.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_NFQUEUE.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_REJECT.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_TCPMSS.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_TOS.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_TTL.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_ULOG.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_addrtype.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_ah.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_comment.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_connbytes.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_dccp.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_dscp_.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_esp.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_hashlimit.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_helper.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_iprange.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_length.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_mac.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_owner.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_physdev.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_pkttype.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_realm.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_recent.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_sctp.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_state.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_string.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv4/ipt_tos_.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_HL.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_LOG.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_REJECT.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_ah.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_esp.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_frag.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_hl.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_ipv6header.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_length.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_mac.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_opts.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_owner.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_physdev.h delete mode 100644 libc/kernel/common/linux/netfilter_ipv6/ip6t_rt.h delete mode 100644 libc/kernel/common/linux/netlink.h delete mode 100644 libc/kernel/common/linux/nfs.h delete mode 100644 libc/kernel/common/linux/nfs2.h delete mode 100644 libc/kernel/common/linux/nfs3.h delete mode 100644 libc/kernel/common/linux/nfs4.h delete mode 100644 libc/kernel/common/linux/nfs_xdr.h delete mode 100644 libc/kernel/common/linux/nfsacl.h delete mode 100644 libc/kernel/common/linux/nfsd/auth.h delete mode 100644 libc/kernel/common/linux/nfsd/const.h delete mode 100644 libc/kernel/common/linux/nfsd/debug.h delete mode 100644 libc/kernel/common/linux/nfsd/export.h delete mode 100644 libc/kernel/common/linux/nfsd/interface.h delete mode 100644 libc/kernel/common/linux/nfsd/nfsfh.h delete mode 100644 libc/kernel/common/linux/nfsd/stats.h delete mode 100644 libc/kernel/common/linux/nfsd/xdr.h delete mode 100644 libc/kernel/common/linux/node.h delete mode 100644 libc/kernel/common/linux/nodemask.h delete mode 100644 libc/kernel/common/linux/notifier.h delete mode 100644 libc/kernel/common/linux/numa.h delete mode 100644 libc/kernel/common/linux/nvram.h delete mode 100644 libc/kernel/common/linux/omap_csmi.h delete mode 100644 libc/kernel/common/linux/pagemap.h delete mode 100644 libc/kernel/common/linux/param.h delete mode 100644 libc/kernel/common/linux/patchkey.h delete mode 100644 libc/kernel/common/linux/pci.h delete mode 100644 libc/kernel/common/linux/pci_ids.h delete mode 100644 libc/kernel/common/linux/pci_regs.h delete mode 100644 libc/kernel/common/linux/percpu.h delete mode 100644 libc/kernel/common/linux/percpu_counter.h delete mode 100644 libc/kernel/common/linux/personality.h delete mode 100644 libc/kernel/common/linux/pfkeyv2.h delete mode 100644 libc/kernel/common/linux/pkt_cls.h delete mode 100644 libc/kernel/common/linux/pkt_sched.h delete mode 100644 libc/kernel/common/linux/platform_device.h delete mode 100644 libc/kernel/common/linux/plist.h delete mode 100644 libc/kernel/common/linux/pm.h delete mode 100644 libc/kernel/common/linux/pnp.h delete mode 100644 libc/kernel/common/linux/poll.h delete mode 100644 libc/kernel/common/linux/posix_acl.h delete mode 100644 libc/kernel/common/linux/posix_types.h delete mode 100644 libc/kernel/common/linux/ppdev.h delete mode 100644 libc/kernel/common/linux/ppp_defs.h delete mode 100644 libc/kernel/common/linux/prctl.h delete mode 100644 libc/kernel/common/linux/preempt.h delete mode 100644 libc/kernel/common/linux/proc_fs.h delete mode 100644 libc/kernel/common/linux/ptrace.h delete mode 100644 libc/kernel/common/linux/qic117.h delete mode 100644 libc/kernel/common/linux/qnxtypes.h delete mode 100644 libc/kernel/common/linux/quota.h delete mode 100644 libc/kernel/common/linux/raid/md.h delete mode 100644 libc/kernel/common/linux/raid/md_k.h delete mode 100644 libc/kernel/common/linux/raid/md_p.h delete mode 100644 libc/kernel/common/linux/raid/md_u.h delete mode 100644 libc/kernel/common/linux/raid/xor.h delete mode 100644 libc/kernel/common/linux/random.h delete mode 100644 libc/kernel/common/linux/rbtree.h delete mode 100644 libc/kernel/common/linux/rcupdate.h delete mode 100644 libc/kernel/common/linux/reboot.h delete mode 100644 libc/kernel/common/linux/relay.h delete mode 100644 libc/kernel/common/linux/resource.h delete mode 100644 libc/kernel/common/linux/route.h delete mode 100644 libc/kernel/common/linux/rtc.h delete mode 100644 libc/kernel/common/linux/rtnetlink.h delete mode 100644 libc/kernel/common/linux/rwsem.h delete mode 100644 libc/kernel/common/linux/sched.h delete mode 100644 libc/kernel/common/linux/sem.h delete mode 100644 libc/kernel/common/linux/seq_file.h delete mode 100644 libc/kernel/common/linux/seqlock.h delete mode 100644 libc/kernel/common/linux/serial_core.h delete mode 100644 libc/kernel/common/linux/serial_reg.h delete mode 100644 libc/kernel/common/linux/serio.h delete mode 100644 libc/kernel/common/linux/shm.h delete mode 100644 libc/kernel/common/linux/signal.h delete mode 100644 libc/kernel/common/linux/skbuff.h delete mode 100644 libc/kernel/common/linux/slab.h delete mode 100644 libc/kernel/common/linux/smb.h delete mode 100644 libc/kernel/common/linux/smp.h delete mode 100644 libc/kernel/common/linux/smp_lock.h delete mode 100644 libc/kernel/common/linux/socket.h delete mode 100644 libc/kernel/common/linux/sockios.h delete mode 100644 libc/kernel/common/linux/soundcard.h delete mode 100644 libc/kernel/common/linux/spinlock.h delete mode 100644 libc/kernel/common/linux/spinlock_api_smp.h delete mode 100644 libc/kernel/common/linux/spinlock_api_up.h delete mode 100644 libc/kernel/common/linux/spinlock_types.h delete mode 100644 libc/kernel/common/linux/spinlock_types_up.h delete mode 100644 libc/kernel/common/linux/spinlock_up.h delete mode 100644 libc/kernel/common/linux/stacktrace.h delete mode 100644 libc/kernel/common/linux/stat.h delete mode 100644 libc/kernel/common/linux/statfs.h delete mode 100644 libc/kernel/common/linux/stddef.h delete mode 100644 libc/kernel/common/linux/string.h delete mode 100644 libc/kernel/common/linux/stringify.h delete mode 100644 libc/kernel/common/linux/sunrpc/auth.h delete mode 100644 libc/kernel/common/linux/sunrpc/auth_gss.h delete mode 100644 libc/kernel/common/linux/sunrpc/clnt.h delete mode 100644 libc/kernel/common/linux/sunrpc/debug.h delete mode 100644 libc/kernel/common/linux/sunrpc/gss_api.h delete mode 100644 libc/kernel/common/linux/sunrpc/gss_asn1.h delete mode 100644 libc/kernel/common/linux/sunrpc/gss_err.h delete mode 100644 libc/kernel/common/linux/sunrpc/msg_prot.h delete mode 100644 libc/kernel/common/linux/sunrpc/sched.h delete mode 100644 libc/kernel/common/linux/sunrpc/stats.h delete mode 100644 libc/kernel/common/linux/sunrpc/svc.h delete mode 100644 libc/kernel/common/linux/sunrpc/svcauth.h delete mode 100644 libc/kernel/common/linux/sunrpc/timer.h delete mode 100644 libc/kernel/common/linux/sunrpc/types.h delete mode 100644 libc/kernel/common/linux/sunrpc/xdr.h delete mode 100644 libc/kernel/common/linux/sunrpc/xprt.h delete mode 100644 libc/kernel/common/linux/swap.h delete mode 100644 libc/kernel/common/linux/sysctl.h delete mode 100644 libc/kernel/common/linux/sysdev.h delete mode 100644 libc/kernel/common/linux/sysfs.h delete mode 100644 libc/kernel/common/linux/taskstats.h delete mode 100644 libc/kernel/common/linux/taskstats_kern.h delete mode 100644 libc/kernel/common/linux/tcp.h delete mode 100644 libc/kernel/common/linux/telephony.h delete mode 100644 libc/kernel/common/linux/termios.h delete mode 100644 libc/kernel/common/linux/textsearch.h delete mode 100644 libc/kernel/common/linux/thread_info.h delete mode 100644 libc/kernel/common/linux/threads.h delete mode 100644 libc/kernel/common/linux/time.h delete mode 100644 libc/kernel/common/linux/timer.h delete mode 100644 libc/kernel/common/linux/times.h delete mode 100644 libc/kernel/common/linux/timex.h delete mode 100644 libc/kernel/common/linux/tiocl.h delete mode 100644 libc/kernel/common/linux/transport_class.h delete mode 100644 libc/kernel/common/linux/tty.h delete mode 100644 libc/kernel/common/linux/types.h delete mode 100644 libc/kernel/common/linux/udp.h delete mode 100644 libc/kernel/common/linux/ufs_fs_i.h delete mode 100644 libc/kernel/common/linux/ufs_fs_sb.h delete mode 100644 libc/kernel/common/linux/uio.h delete mode 100644 libc/kernel/common/linux/un.h delete mode 100644 libc/kernel/common/linux/unistd.h delete mode 100644 libc/kernel/common/linux/usb.h delete mode 100644 libc/kernel/common/linux/usb_ch9.h delete mode 100644 libc/kernel/common/linux/usbdevice_fs.h delete mode 100644 libc/kernel/common/linux/user.h delete mode 100644 libc/kernel/common/linux/utime.h delete mode 100644 libc/kernel/common/linux/utsname.h delete mode 100644 libc/kernel/common/linux/version.h delete mode 100644 libc/kernel/common/linux/vfs.h delete mode 100644 libc/kernel/common/linux/videodev.h delete mode 100644 libc/kernel/common/linux/videodev2.h delete mode 100644 libc/kernel/common/linux/vmalloc.h delete mode 100644 libc/kernel/common/linux/vt.h delete mode 100644 libc/kernel/common/linux/vt_buffer.h delete mode 100644 libc/kernel/common/linux/wait.h delete mode 100644 libc/kernel/common/linux/wanrouter.h delete mode 100644 libc/kernel/common/linux/wireless.h delete mode 100644 libc/kernel/common/linux/workqueue.h delete mode 100644 libc/kernel/common/linux/xattr.h delete mode 100644 libc/kernel/common/linux/zconf.h delete mode 100644 libc/kernel/common/linux/zlib.h delete mode 100644 libc/kernel/common/linux/zorro_ids.h delete mode 100644 libc/kernel/common/mtd/mtd-abi.h delete mode 100644 libc/kernel/common/mtd/mtd-user.h delete mode 100755 libc/kernel/tools/clean_header.py delete mode 100644 libc/kernel/tools/cpp.py delete mode 100644 libc/kernel/tools/defaults.py delete mode 100755 libc/kernel/tools/find_headers.py delete mode 100755 libc/kernel/tools/find_users.py delete mode 100644 libc/kernel/tools/kernel.py delete mode 100755 libc/kernel/tools/update_all.py delete mode 100644 libc/kernel/tools/utils.py delete mode 100644 libc/netbsd/gethnamaddr.c delete mode 100644 libc/netbsd/inet/nsap_addr.c delete mode 100644 libc/netbsd/isc/ev_streams.c delete mode 100644 libc/netbsd/isc/ev_timers.c delete mode 100644 libc/netbsd/isc/eventlib_p.h delete mode 100644 libc/netbsd/nameser/ns_name.c delete mode 100644 libc/netbsd/nameser/ns_netint.c delete mode 100644 libc/netbsd/nameser/ns_parse.c delete mode 100644 libc/netbsd/nameser/ns_print.c delete mode 100644 libc/netbsd/nameser/ns_samedomain.c delete mode 100644 libc/netbsd/nameser/ns_ttl.c delete mode 100644 libc/netbsd/net/base64.c delete mode 100644 libc/netbsd/net/getaddrinfo.c delete mode 100644 libc/netbsd/net/getnameinfo.c delete mode 100644 libc/netbsd/net/getservbyname.c delete mode 100644 libc/netbsd/net/getservbyname_r.c delete mode 100644 libc/netbsd/net/getservbyport.c delete mode 100644 libc/netbsd/net/getservbyport_r.c delete mode 100644 libc/netbsd/net/getservent.c delete mode 100644 libc/netbsd/net/getservent_r.c delete mode 100644 libc/netbsd/net/nsdispatch.c delete mode 100644 libc/netbsd/net/reentrant.h delete mode 100644 libc/netbsd/net/servent.h delete mode 100644 libc/netbsd/net/services.h delete mode 100644 libc/netbsd/resolv/__dn_comp.c delete mode 100644 libc/netbsd/resolv/__res_close.c delete mode 100644 libc/netbsd/resolv/__res_send.c delete mode 100644 libc/netbsd/resolv/herror.c delete mode 100644 libc/netbsd/resolv/res_cache.c delete mode 100644 libc/netbsd/resolv/res_comp.c delete mode 100644 libc/netbsd/resolv/res_compat.c delete mode 100644 libc/netbsd/resolv/res_data.c delete mode 100644 libc/netbsd/resolv/res_debug.c delete mode 100644 libc/netbsd/resolv/res_debug.h delete mode 100644 libc/netbsd/resolv/res_init.c delete mode 100644 libc/netbsd/resolv/res_mkquery.c delete mode 100644 libc/netbsd/resolv/res_private.h delete mode 100644 libc/netbsd/resolv/res_query.c delete mode 100644 libc/netbsd/resolv/res_random.c delete mode 100644 libc/netbsd/resolv/res_send.c delete mode 100644 libc/netbsd/resolv/res_state.c delete mode 100644 libc/private/arpa_nameser.h delete mode 100644 libc/private/arpa_nameser_compat.h delete mode 100644 libc/private/bionic_tls.h delete mode 100644 libc/private/ctype_private.h delete mode 100644 libc/private/isc/assertions.h delete mode 100644 libc/private/isc/dst.h delete mode 100644 libc/private/isc/eventlib.h delete mode 100644 libc/private/isc/heap.h delete mode 100644 libc/private/isc/list.h delete mode 100644 libc/private/isc/memcluster.h delete mode 100644 libc/private/logd.h delete mode 100644 libc/private/nsswitch.h delete mode 100644 libc/private/rand48.h delete mode 100644 libc/private/resolv_cache.h delete mode 100644 libc/private/resolv_private.h delete mode 100644 libc/private/resolv_static.h delete mode 100644 libc/private/syscommon.h delete mode 100644 libc/private/thread_private.h delete mode 100644 libc/stdio/asprintf.c delete mode 100644 libc/stdio/clrerr.c delete mode 100644 libc/stdio/fclose.c delete mode 100644 libc/stdio/fdopen.c delete mode 100644 libc/stdio/feof.c delete mode 100644 libc/stdio/ferror.c delete mode 100644 libc/stdio/fflush.c delete mode 100644 libc/stdio/fgetc.c delete mode 100644 libc/stdio/fgetln.c delete mode 100644 libc/stdio/fgetpos.c delete mode 100644 libc/stdio/fgets.c delete mode 100644 libc/stdio/fileext.h delete mode 100644 libc/stdio/fileno.c delete mode 100644 libc/stdio/findfp.c delete mode 100644 libc/stdio/flags.c delete mode 100644 libc/stdio/floatio.h delete mode 100644 libc/stdio/flockfile.c delete mode 100644 libc/stdio/fopen.c delete mode 100644 libc/stdio/fprintf.c delete mode 100644 libc/stdio/fpurge.c delete mode 100644 libc/stdio/fputc.c delete mode 100644 libc/stdio/fputs.c delete mode 100644 libc/stdio/fread.c delete mode 100644 libc/stdio/freopen.c delete mode 100644 libc/stdio/fscanf.c delete mode 100644 libc/stdio/fseek.c delete mode 100644 libc/stdio/fsetpos.c delete mode 100644 libc/stdio/ftell.c delete mode 100644 libc/stdio/funopen.c delete mode 100644 libc/stdio/fvwrite.c delete mode 100644 libc/stdio/fvwrite.h delete mode 100644 libc/stdio/fwalk.c delete mode 100644 libc/stdio/fwrite.c delete mode 100644 libc/stdio/getc.c delete mode 100644 libc/stdio/getchar.c delete mode 100644 libc/stdio/gets.c delete mode 100644 libc/stdio/glue.h delete mode 100644 libc/stdio/local.h delete mode 100644 libc/stdio/makebuf.c delete mode 100644 libc/stdio/mktemp.c delete mode 100644 libc/stdio/printf.c delete mode 100644 libc/stdio/putc.c delete mode 100644 libc/stdio/putchar.c delete mode 100644 libc/stdio/puts.c delete mode 100644 libc/stdio/putw.c delete mode 100644 libc/stdio/refill.c delete mode 100644 libc/stdio/remove.c delete mode 100644 libc/stdio/rewind.c delete mode 100644 libc/stdio/rget.c delete mode 100644 libc/stdio/scanf.c delete mode 100644 libc/stdio/setbuf.c delete mode 100644 libc/stdio/setbuffer.c delete mode 100644 libc/stdio/setvbuf.c delete mode 100644 libc/stdio/snprintf.c delete mode 100644 libc/stdio/sprintf.c delete mode 100644 libc/stdio/sscanf.c delete mode 100644 libc/stdio/stdio.c delete mode 100644 libc/stdio/tempnam.c delete mode 100644 libc/stdio/tmpfile.c delete mode 100644 libc/stdio/tmpnam.c delete mode 100644 libc/stdio/ungetc.c delete mode 100644 libc/stdio/vasprintf.c delete mode 100644 libc/stdio/vfprintf.c delete mode 100644 libc/stdio/vfscanf.c delete mode 100644 libc/stdio/vprintf.c delete mode 100644 libc/stdio/vscanf.c delete mode 100644 libc/stdio/vsnprintf.c delete mode 100644 libc/stdio/vsprintf.c delete mode 100644 libc/stdio/vsscanf.c delete mode 100644 libc/stdio/wbuf.c delete mode 100644 libc/stdio/wcio.h delete mode 100644 libc/stdio/wsetup.c delete mode 100644 libc/stdlib/_rand48.c delete mode 100644 libc/stdlib/assert.c delete mode 100644 libc/stdlib/atexit.c delete mode 100644 libc/stdlib/atexit.h delete mode 100644 libc/stdlib/atoi.c delete mode 100644 libc/stdlib/atol.c delete mode 100644 libc/stdlib/atoll.c delete mode 100644 libc/stdlib/bsearch.c delete mode 100644 libc/stdlib/ctype_.c delete mode 100644 libc/stdlib/div.c delete mode 100644 libc/stdlib/exit.c delete mode 100644 libc/stdlib/getenv.c delete mode 100644 libc/stdlib/jrand48.c delete mode 100644 libc/stdlib/ldiv.c delete mode 100644 libc/stdlib/lldiv.c delete mode 100644 libc/stdlib/locale.c delete mode 100644 libc/stdlib/lrand48.c delete mode 100644 libc/stdlib/mrand48.c delete mode 100644 libc/stdlib/nrand48.c delete mode 100644 libc/stdlib/putenv.c delete mode 100644 libc/stdlib/qsort.c delete mode 100644 libc/stdlib/seed48.c delete mode 100644 libc/stdlib/setenv.c delete mode 100644 libc/stdlib/setjmperr.c delete mode 100644 libc/stdlib/sha1hash.c delete mode 100644 libc/stdlib/srand48.c delete mode 100644 libc/stdlib/strntoimax.c delete mode 100644 libc/stdlib/strntoumax.c delete mode 100644 libc/stdlib/strtod.c delete mode 100644 libc/stdlib/strtoimax.c delete mode 100644 libc/stdlib/strtol.c delete mode 100644 libc/stdlib/strtoll.c delete mode 100644 libc/stdlib/strtoul.c delete mode 100644 libc/stdlib/strtoull.c delete mode 100644 libc/stdlib/strtoumax.c delete mode 100644 libc/stdlib/tolower_.c delete mode 100644 libc/stdlib/toupper_.c delete mode 100644 libc/stdlib/wchar.c delete mode 100644 libc/string/bcopy.c delete mode 100644 libc/string/index.c delete mode 100644 libc/string/memccpy.c delete mode 100644 libc/string/memchr.c delete mode 100644 libc/string/memcmp.c delete mode 100644 libc/string/memcpy.c delete mode 100644 libc/string/memmem.c delete mode 100644 libc/string/memmove.c delete mode 100644 libc/string/memrchr.c delete mode 100644 libc/string/memset.c delete mode 100644 libc/string/memswap.c delete mode 100644 libc/string/strcasecmp.c delete mode 100644 libc/string/strcasestr.c delete mode 100644 libc/string/strcat.c delete mode 100644 libc/string/strchr.c delete mode 100644 libc/string/strcmp.c delete mode 100755 libc/string/strcoll.c delete mode 100644 libc/string/strcpy.c delete mode 100644 libc/string/strcspn.c delete mode 100644 libc/string/strdup.c delete mode 100644 libc/string/strerror.c delete mode 100644 libc/string/strerror_r.c delete mode 100644 libc/string/strlcat.c delete mode 100644 libc/string/strlcpy.c delete mode 100644 libc/string/strlen.c delete mode 100644 libc/string/strncat.c delete mode 100644 libc/string/strncmp.c delete mode 100644 libc/string/strncpy.c delete mode 100644 libc/string/strndup.c delete mode 100644 libc/string/strnlen.c delete mode 100644 libc/string/strpbrk.c delete mode 100644 libc/string/strrchr.c delete mode 100644 libc/string/strsep.c delete mode 100644 libc/string/strspn.c delete mode 100644 libc/string/strstr.c delete mode 100644 libc/string/strtok.c delete mode 100644 libc/string/strtotimeval.c delete mode 100755 libc/string/strxfrm.c delete mode 100644 libc/tools/bionic_utils.py delete mode 100755 libc/tools/checksyscalls.py delete mode 100755 libc/tools/genserv.py delete mode 100755 libc/tools/gensyscalls.py delete mode 100644 libc/tzcode/asctime.c delete mode 100644 libc/tzcode/difftime.c delete mode 100644 libc/tzcode/localtime.c delete mode 100644 libc/tzcode/private.h delete mode 100644 libc/tzcode/strftime.c delete mode 100644 libc/tzcode/strptime.c delete mode 100644 libc/tzcode/tzfile.h delete mode 100644 libc/unistd/abort.c delete mode 100644 libc/unistd/alarm.c delete mode 100644 libc/unistd/brk.c delete mode 100644 libc/unistd/creat.c delete mode 100644 libc/unistd/daemon.c delete mode 100644 libc/unistd/exec.c delete mode 100644 libc/unistd/fcntl.c delete mode 100644 libc/unistd/fnmatch.c delete mode 100644 libc/unistd/ftime.c delete mode 100644 libc/unistd/ftok.c delete mode 100644 libc/unistd/getcwd.c delete mode 100644 libc/unistd/getdtablesize.c delete mode 100644 libc/unistd/gethostname.c delete mode 100644 libc/unistd/getopt_long.c delete mode 100644 libc/unistd/getpgrp.c delete mode 100644 libc/unistd/getpriority.c delete mode 100644 libc/unistd/getpt.c delete mode 100644 libc/unistd/initgroups.c delete mode 100644 libc/unistd/isatty.c delete mode 100644 libc/unistd/issetugid.c delete mode 100644 libc/unistd/lseek64.c delete mode 100644 libc/unistd/mmap.c delete mode 100644 libc/unistd/nice.c delete mode 100644 libc/unistd/open.c delete mode 100644 libc/unistd/openat.c delete mode 100644 libc/unistd/opendir.c delete mode 100644 libc/unistd/pathconf.c delete mode 100644 libc/unistd/perror.c delete mode 100644 libc/unistd/popen.c delete mode 100644 libc/unistd/pread.c delete mode 100644 libc/unistd/pselect.c delete mode 100644 libc/unistd/ptsname.c delete mode 100644 libc/unistd/ptsname_r.c delete mode 100644 libc/unistd/pwrite.c delete mode 100644 libc/unistd/raise.c delete mode 100644 libc/unistd/reboot.c delete mode 100644 libc/unistd/recv.c delete mode 100644 libc/unistd/sbrk.c delete mode 100644 libc/unistd/send.c delete mode 100644 libc/unistd/setegid.c delete mode 100644 libc/unistd/seteuid.c delete mode 100644 libc/unistd/setpgrp.c delete mode 100644 libc/unistd/sigblock.c delete mode 100644 libc/unistd/siginterrupt.c delete mode 100644 libc/unistd/siglist.c delete mode 100644 libc/unistd/signal.c delete mode 100644 libc/unistd/sigsetmask.c delete mode 100644 libc/unistd/sigsuspend.c delete mode 100644 libc/unistd/sigwait.c delete mode 100644 libc/unistd/sleep.c delete mode 100644 libc/unistd/socketcalls.c delete mode 100644 libc/unistd/statfs.c delete mode 100644 libc/unistd/strsignal.c delete mode 100644 libc/unistd/sysconf.c delete mode 100644 libc/unistd/syslog.c delete mode 100644 libc/unistd/system.c delete mode 100644 libc/unistd/tcgetpgrp.c delete mode 100644 libc/unistd/tcsetpgrp.c delete mode 100644 libc/unistd/time.c delete mode 100644 libc/unistd/umount.c delete mode 100644 libc/unistd/unlockpt.c delete mode 100644 libc/unistd/usleep.c delete mode 100644 libc/unistd/wait.c delete mode 100644 libc/zoneinfo/Android.mk delete mode 100644 libc/zoneinfo/zoneinfo.dat delete mode 100644 libc/zoneinfo/zoneinfo.idx delete mode 100644 libc/zoneinfo/zoneinfo.version delete mode 100644 libdl/Android.mk delete mode 100644 libdl/MODULE_LICENSE_BSD delete mode 100644 libdl/NOTICE delete mode 100755 libdl/dltest.c delete mode 100644 libdl/libdl.c delete mode 100644 libm/Android.mk delete mode 100644 libm/MODULE_LICENSE_BSD_LIKE delete mode 100644 libm/Makefile-orig delete mode 100644 libm/NOTICE delete mode 100644 libm/alpha/Makefile.inc delete mode 100644 libm/alpha/_fpmath.h delete mode 100644 libm/alpha/fenv.c delete mode 100644 libm/alpha/fenv.h delete mode 100644 libm/alpha/s_copysign.S delete mode 100644 libm/alpha/s_copysignf.S delete mode 100644 libm/amd64/Makefile.inc delete mode 100644 libm/amd64/_fpmath.h delete mode 100644 libm/amd64/e_sqrt.S delete mode 100644 libm/amd64/e_sqrtf.S delete mode 100644 libm/amd64/fenv.c delete mode 100644 libm/amd64/fenv.h delete mode 100644 libm/amd64/s_llrint.S delete mode 100644 libm/amd64/s_llrintf.S delete mode 100644 libm/amd64/s_lrint.S delete mode 100644 libm/amd64/s_lrintf.S delete mode 100644 libm/amd64/s_remquo.S delete mode 100644 libm/amd64/s_remquof.S delete mode 100644 libm/amd64/s_scalbn.S delete mode 100644 libm/amd64/s_scalbnf.S delete mode 100644 libm/amd64/s_scalbnl.S delete mode 100644 libm/arm/Makefile.inc delete mode 100644 libm/arm/_fpmath.h delete mode 100644 libm/arm/fenv.c delete mode 100644 libm/arm/fenv.h delete mode 100644 libm/bsdsrc/b_exp.c delete mode 100644 libm/bsdsrc/b_log.c delete mode 100644 libm/bsdsrc/b_tgamma.c delete mode 100644 libm/bsdsrc/mathimpl.h delete mode 100644 libm/fpclassify.c delete mode 100644 libm/i386/_fpmath.h delete mode 100644 libm/i387/Makefile.inc delete mode 100644 libm/i387/e_exp.S delete mode 100644 libm/i387/e_fmod.S delete mode 100644 libm/i387/e_log.S delete mode 100644 libm/i387/e_log10.S delete mode 100644 libm/i387/e_log10f.S delete mode 100644 libm/i387/e_logf.S delete mode 100644 libm/i387/e_remainder.S delete mode 100644 libm/i387/e_remainderf.S delete mode 100644 libm/i387/e_scalb.S delete mode 100644 libm/i387/e_scalbf.S delete mode 100644 libm/i387/e_sqrt.S delete mode 100644 libm/i387/e_sqrtf.S delete mode 100644 libm/i387/fenv.c delete mode 100644 libm/i387/fenv.h delete mode 100644 libm/i387/npx.h delete mode 100644 libm/i387/s_ceil.S delete mode 100644 libm/i387/s_ceilf.S delete mode 100644 libm/i387/s_ceill.S delete mode 100644 libm/i387/s_copysign.S delete mode 100644 libm/i387/s_copysignf.S delete mode 100644 libm/i387/s_copysignl.S delete mode 100644 libm/i387/s_cos.S delete mode 100644 libm/i387/s_finite.S delete mode 100644 libm/i387/s_floor.S delete mode 100644 libm/i387/s_floorf.S delete mode 100644 libm/i387/s_floorl.S delete mode 100644 libm/i387/s_llrint.S delete mode 100644 libm/i387/s_llrintf.S delete mode 100644 libm/i387/s_logb.S delete mode 100644 libm/i387/s_logbf.S delete mode 100644 libm/i387/s_lrint.S delete mode 100644 libm/i387/s_lrintf.S delete mode 100644 libm/i387/s_remquo.S delete mode 100644 libm/i387/s_remquof.S delete mode 100644 libm/i387/s_rint.S delete mode 100644 libm/i387/s_rintf.S delete mode 100644 libm/i387/s_scalbn.S delete mode 100644 libm/i387/s_scalbnf.S delete mode 100644 libm/i387/s_scalbnl.S delete mode 100644 libm/i387/s_significand.S delete mode 100644 libm/i387/s_significandf.S delete mode 100644 libm/i387/s_sin.S delete mode 100644 libm/i387/s_tan.S delete mode 100644 libm/i387/s_trunc.S delete mode 100644 libm/i387/s_truncf.S delete mode 100644 libm/i387/s_truncl.S delete mode 100644 libm/ia64/Makefile.inc delete mode 100644 libm/ia64/_fpmath.h delete mode 100644 libm/ia64/fenv.c delete mode 100644 libm/ia64/fenv.h delete mode 100644 libm/ia64/s_fma.S delete mode 100644 libm/ia64/s_fmaf.S delete mode 100644 libm/ia64/s_fmal.S delete mode 100644 libm/include/alpha/fenv.h delete mode 100644 libm/include/amd64/fenv.h delete mode 100644 libm/include/arm/fenv.h delete mode 100644 libm/include/i387/fenv.h delete mode 100644 libm/include/ia64/fenv.h delete mode 100644 libm/include/math.h delete mode 100644 libm/include/powerpc/fenv.h delete mode 100644 libm/include/sparc64/fenv.h delete mode 100644 libm/isinf.c delete mode 100644 libm/man/acos.3 delete mode 100644 libm/man/acosh.3 delete mode 100644 libm/man/asin.3 delete mode 100644 libm/man/asinh.3 delete mode 100644 libm/man/atan.3 delete mode 100644 libm/man/atan2.3 delete mode 100644 libm/man/atanh.3 delete mode 100644 libm/man/ceil.3 delete mode 100644 libm/man/cimag.3 delete mode 100644 libm/man/copysign.3 delete mode 100644 libm/man/cos.3 delete mode 100644 libm/man/cosh.3 delete mode 100644 libm/man/erf.3 delete mode 100644 libm/man/exp.3 delete mode 100644 libm/man/fabs.3 delete mode 100644 libm/man/fdim.3 delete mode 100644 libm/man/feclearexcept.3 delete mode 100644 libm/man/feenableexcept.3 delete mode 100644 libm/man/fegetenv.3 delete mode 100644 libm/man/fegetround.3 delete mode 100644 libm/man/fenv.3 delete mode 100644 libm/man/floor.3 delete mode 100644 libm/man/fma.3 delete mode 100644 libm/man/fmax.3 delete mode 100644 libm/man/fmod.3 delete mode 100644 libm/man/hypot.3 delete mode 100644 libm/man/ieee.3 delete mode 100644 libm/man/ieee_test.3 delete mode 100644 libm/man/ilogb.3 delete mode 100644 libm/man/j0.3 delete mode 100644 libm/man/lgamma.3 delete mode 100644 libm/man/lrint.3 delete mode 100644 libm/man/lround.3 delete mode 100644 libm/man/math.3 delete mode 100644 libm/man/nextafter.3 delete mode 100644 libm/man/remainder.3 delete mode 100644 libm/man/rint.3 delete mode 100644 libm/man/round.3 delete mode 100644 libm/man/scalbn.3 delete mode 100644 libm/man/signbit.3 delete mode 100644 libm/man/sin.3 delete mode 100644 libm/man/sinh.3 delete mode 100644 libm/man/sqrt.3 delete mode 100644 libm/man/tan.3 delete mode 100644 libm/man/tanh.3 delete mode 100644 libm/man/trunc.3 delete mode 100644 libm/powerpc/Makefile.inc delete mode 100644 libm/powerpc/_fpmath.h delete mode 100644 libm/powerpc/fenv.c delete mode 100644 libm/powerpc/fenv.h delete mode 100644 libm/sparc64/Makefile.inc delete mode 100644 libm/sparc64/_fpmath.h delete mode 100644 libm/sparc64/e_sqrt.S delete mode 100644 libm/sparc64/e_sqrtf.S delete mode 100644 libm/sparc64/fenv.c delete mode 100644 libm/sparc64/fenv.h delete mode 100644 libm/src/e_acos.c delete mode 100644 libm/src/e_acosf.c delete mode 100644 libm/src/e_acosh.c delete mode 100644 libm/src/e_acoshf.c delete mode 100644 libm/src/e_asin.c delete mode 100644 libm/src/e_asinf.c delete mode 100644 libm/src/e_atan2.c delete mode 100644 libm/src/e_atan2f.c delete mode 100644 libm/src/e_atanh.c delete mode 100644 libm/src/e_atanhf.c delete mode 100644 libm/src/e_cosh.c delete mode 100644 libm/src/e_coshf.c delete mode 100644 libm/src/e_exp.c delete mode 100644 libm/src/e_expf.c delete mode 100644 libm/src/e_fmod.c delete mode 100644 libm/src/e_fmodf.c delete mode 100644 libm/src/e_gamma.c delete mode 100644 libm/src/e_gamma_r.c delete mode 100644 libm/src/e_gammaf.c delete mode 100644 libm/src/e_gammaf_r.c delete mode 100644 libm/src/e_hypot.c delete mode 100644 libm/src/e_hypotf.c delete mode 100644 libm/src/e_j0.c delete mode 100644 libm/src/e_j0f.c delete mode 100644 libm/src/e_j1.c delete mode 100644 libm/src/e_j1f.c delete mode 100644 libm/src/e_jn.c delete mode 100644 libm/src/e_jnf.c delete mode 100644 libm/src/e_ldexpf.c delete mode 100644 libm/src/e_lgamma.c delete mode 100644 libm/src/e_lgamma_r.c delete mode 100644 libm/src/e_lgammaf.c delete mode 100644 libm/src/e_lgammaf_r.c delete mode 100644 libm/src/e_log.c delete mode 100644 libm/src/e_log10.c delete mode 100644 libm/src/e_log10f.c delete mode 100644 libm/src/e_logf.c delete mode 100644 libm/src/e_pow.c delete mode 100644 libm/src/e_powf.c delete mode 100644 libm/src/e_rem_pio2.c delete mode 100644 libm/src/e_rem_pio2f.c delete mode 100644 libm/src/e_remainder.c delete mode 100644 libm/src/e_remainderf.c delete mode 100644 libm/src/e_scalb.c delete mode 100644 libm/src/e_scalbf.c delete mode 100644 libm/src/e_sinh.c delete mode 100644 libm/src/e_sinhf.c delete mode 100644 libm/src/e_sqrt.c delete mode 100644 libm/src/e_sqrtf.c delete mode 100644 libm/src/fpmath.h delete mode 100644 libm/src/k_cos.c delete mode 100644 libm/src/k_cosf.c delete mode 100644 libm/src/k_rem_pio2.c delete mode 100644 libm/src/k_rem_pio2f.c delete mode 100644 libm/src/k_sin.c delete mode 100644 libm/src/k_sinf.c delete mode 100644 libm/src/k_tan.c delete mode 100644 libm/src/k_tanf.c delete mode 100644 libm/src/math_private.h delete mode 100644 libm/src/s_asinh.c delete mode 100644 libm/src/s_asinhf.c delete mode 100644 libm/src/s_atan.c delete mode 100644 libm/src/s_atanf.c delete mode 100644 libm/src/s_cbrt.c delete mode 100644 libm/src/s_cbrtf.c delete mode 100644 libm/src/s_ceil.c delete mode 100644 libm/src/s_ceilf.c delete mode 100644 libm/src/s_ceill.c delete mode 100644 libm/src/s_cimag.c delete mode 100644 libm/src/s_cimagf.c delete mode 100644 libm/src/s_cimagl.c delete mode 100644 libm/src/s_conj.c delete mode 100644 libm/src/s_conjf.c delete mode 100644 libm/src/s_conjl.c delete mode 100644 libm/src/s_copysign.c delete mode 100644 libm/src/s_copysignf.c delete mode 100644 libm/src/s_copysignl.c delete mode 100644 libm/src/s_cos.c delete mode 100644 libm/src/s_cosf.c delete mode 100644 libm/src/s_creal.c delete mode 100644 libm/src/s_crealf.c delete mode 100644 libm/src/s_creall.c delete mode 100644 libm/src/s_erf.c delete mode 100644 libm/src/s_erff.c delete mode 100644 libm/src/s_exp2.c delete mode 100644 libm/src/s_exp2f.c delete mode 100644 libm/src/s_expm1.c delete mode 100644 libm/src/s_expm1f.c delete mode 100644 libm/src/s_fabs.c delete mode 100644 libm/src/s_fabsf.c delete mode 100644 libm/src/s_fabsl.c delete mode 100644 libm/src/s_fdim.c delete mode 100644 libm/src/s_finite.c delete mode 100644 libm/src/s_finitef.c delete mode 100644 libm/src/s_floor.c delete mode 100644 libm/src/s_floorf.c delete mode 100644 libm/src/s_floorl.c delete mode 100644 libm/src/s_fma.c delete mode 100644 libm/src/s_fmaf.c delete mode 100644 libm/src/s_fmal.c delete mode 100644 libm/src/s_fmax.c delete mode 100644 libm/src/s_fmaxf.c delete mode 100644 libm/src/s_fmaxl.c delete mode 100644 libm/src/s_fmin.c delete mode 100644 libm/src/s_fminf.c delete mode 100644 libm/src/s_fminl.c delete mode 100644 libm/src/s_frexp.c delete mode 100644 libm/src/s_frexpf.c delete mode 100644 libm/src/s_frexpl.c delete mode 100644 libm/src/s_ilogb.c delete mode 100644 libm/src/s_ilogbf.c delete mode 100644 libm/src/s_ilogbl.c delete mode 100644 libm/src/s_isfinite.c delete mode 100644 libm/src/s_isnan.c delete mode 100644 libm/src/s_isnormal.c delete mode 100644 libm/src/s_llrint.c delete mode 100644 libm/src/s_llrintf.c delete mode 100644 libm/src/s_llround.c delete mode 100644 libm/src/s_llroundf.c delete mode 100644 libm/src/s_llroundl.c delete mode 100644 libm/src/s_log1p.c delete mode 100644 libm/src/s_log1pf.c delete mode 100644 libm/src/s_logb.c delete mode 100644 libm/src/s_logbf.c delete mode 100644 libm/src/s_lrint.c delete mode 100644 libm/src/s_lrintf.c delete mode 100644 libm/src/s_lround.c delete mode 100644 libm/src/s_lroundf.c delete mode 100644 libm/src/s_lroundl.c delete mode 100644 libm/src/s_modf.c delete mode 100644 libm/src/s_modff.c delete mode 100644 libm/src/s_nearbyint.c delete mode 100644 libm/src/s_nextafter.c delete mode 100644 libm/src/s_nextafterf.c delete mode 100644 libm/src/s_nextafterl.c delete mode 100644 libm/src/s_nexttoward.c delete mode 100644 libm/src/s_nexttowardf.c delete mode 100644 libm/src/s_remquo.c delete mode 100644 libm/src/s_remquof.c delete mode 100644 libm/src/s_rint.c delete mode 100644 libm/src/s_rintf.c delete mode 100644 libm/src/s_round.c delete mode 100644 libm/src/s_roundf.c delete mode 100644 libm/src/s_roundl.c delete mode 100644 libm/src/s_scalbln.c delete mode 100644 libm/src/s_scalbn.c delete mode 100644 libm/src/s_scalbnf.c delete mode 100644 libm/src/s_scalbnl.c delete mode 100644 libm/src/s_signbit.c delete mode 100644 libm/src/s_signgam.c delete mode 100644 libm/src/s_significand.c delete mode 100644 libm/src/s_significandf.c delete mode 100644 libm/src/s_sin.c delete mode 100644 libm/src/s_sinf.c delete mode 100644 libm/src/s_tan.c delete mode 100644 libm/src/s_tanf.c delete mode 100644 libm/src/s_tanh.c delete mode 100644 libm/src/s_tanhf.c delete mode 100644 libm/src/s_trunc.c delete mode 100644 libm/src/s_truncf.c delete mode 100644 libm/src/s_truncl.c delete mode 100644 libm/src/w_cabs.c delete mode 100644 libm/src/w_cabsf.c delete mode 100644 libm/src/w_drem.c delete mode 100644 libm/src/w_dremf.c delete mode 100644 libstdc++/Android.mk delete mode 100644 libstdc++/MODULE_LICENSE_BSD delete mode 100644 libstdc++/NOTICE delete mode 100644 libstdc++/include/cstddef delete mode 100644 libstdc++/include/new delete mode 100644 libstdc++/include/stl_pair.h delete mode 100644 libstdc++/include/typeinfo delete mode 100644 libstdc++/include/utility delete mode 100644 libstdc++/src/new.cpp delete mode 100644 libstdc++/src/one_time_construction.cpp delete mode 100644 libstdc++/src/pure_virtual.cpp delete mode 100644 libstdc++/src/typeinfo.cpp delete mode 100644 libthread_db/Android.mk delete mode 100644 libthread_db/MODULE_LICENSE_BSD delete mode 100644 libthread_db/NOTICE delete mode 100644 libthread_db/include/thread_db.h delete mode 100644 libthread_db/libthread_db.c delete mode 100644 linker/Android.mk delete mode 100644 linker/MODULE_LICENSE_APACHE2 delete mode 100644 linker/NOTICE delete mode 100644 linker/arch/arm/begin.S delete mode 100644 linker/arch/x86/begin.S delete mode 100644 linker/debugger.c delete mode 100644 linker/dlfcn.c delete mode 100644 linker/linker.c delete mode 100644 linker/linker.h delete mode 100644 linker/linker_debug.h delete mode 100644 linker/rt.c diff --git a/Android.mk b/Android.mk deleted file mode 100644 index fcc8b96a7..000000000 --- a/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -ifneq ($(TARGET_SIMULATOR),true) - include $(call all-subdir-makefiles) -endif diff --git a/libc/Android.mk b/libc/Android.mk deleted file mode 100644 index 330802ae5..000000000 --- a/libc/Android.mk +++ /dev/null @@ -1,573 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk -libc_common_src_files := \ - $(syscall_src) \ - unistd/abort.c \ - unistd/alarm.c \ - unistd/brk.c \ - unistd/creat.c \ - unistd/daemon.c \ - unistd/exec.c \ - unistd/fcntl.c \ - unistd/fnmatch.c \ - unistd/ftime.c \ - unistd/ftok.c \ - unistd/getcwd.c \ - unistd/getdtablesize.c \ - unistd/gethostname.c \ - unistd/getopt_long.c \ - unistd/getpgrp.c \ - unistd/getpriority.c \ - unistd/getpt.c \ - unistd/initgroups.c \ - unistd/isatty.c \ - unistd/issetugid.c \ - unistd/lseek64.c \ - unistd/mmap.c \ - unistd/nice.c \ - unistd/open.c \ - unistd/openat.c \ - unistd/opendir.c \ - unistd/pathconf.c \ - unistd/perror.c \ - unistd/popen.c \ - unistd/pread.c \ - unistd/pselect.c \ - unistd/ptsname.c \ - unistd/ptsname_r.c \ - unistd/pwrite.c \ - unistd/raise.c \ - unistd/reboot.c \ - unistd/recv.c \ - unistd/sbrk.c \ - unistd/send.c \ - unistd/setegid.c \ - unistd/seteuid.c \ - unistd/setpgrp.c \ - unistd/sigblock.c \ - unistd/siginterrupt.c \ - unistd/siglist.c \ - unistd/signal.c \ - unistd/sigsetmask.c \ - unistd/sigsuspend.c \ - unistd/sigwait.c \ - unistd/sleep.c \ - unistd/statfs.c \ - unistd/strsignal.c \ - unistd/sysconf.c \ - unistd/syslog.c \ - unistd/system.c \ - unistd/tcgetpgrp.c \ - unistd/tcsetpgrp.c \ - unistd/time.c \ - unistd/umount.c \ - unistd/unlockpt.c \ - unistd/usleep.c \ - unistd/wait.c \ - stdio/asprintf.c \ - stdio/clrerr.c \ - stdio/fclose.c \ - stdio/fdopen.c \ - stdio/feof.c \ - stdio/ferror.c \ - stdio/fflush.c \ - stdio/fgetc.c \ - stdio/fgetln.c \ - stdio/fgetpos.c \ - stdio/fgets.c \ - stdio/fileno.c \ - stdio/findfp.c \ - stdio/flags.c \ - stdio/flockfile.c \ - stdio/fopen.c \ - stdio/fprintf.c \ - stdio/fpurge.c \ - stdio/fputc.c \ - stdio/fputs.c \ - stdio/fread.c \ - stdio/freopen.c \ - stdio/fscanf.c \ - stdio/fseek.c \ - stdio/fsetpos.c \ - stdio/ftell.c \ - stdio/funopen.c \ - stdio/fvwrite.c \ - stdio/fwalk.c \ - stdio/fwrite.c \ - stdio/getc.c \ - stdio/getchar.c \ - stdio/gets.c \ - stdio/makebuf.c \ - stdio/mktemp.c \ - stdio/printf.c \ - stdio/putc.c \ - stdio/putchar.c \ - stdio/puts.c \ - stdio/putw.c \ - stdio/refill.c \ - stdio/remove.c \ - stdio/rewind.c \ - stdio/rget.c \ - stdio/scanf.c \ - stdio/setbuf.c \ - stdio/setbuffer.c \ - stdio/setvbuf.c \ - stdio/snprintf.c\ - stdio/sprintf.c \ - stdio/sscanf.c \ - stdio/stdio.c \ - stdio/tempnam.c \ - stdio/tmpfile.c \ - stdio/tmpnam.c \ - stdio/ungetc.c \ - stdio/vasprintf.c \ - stdio/vfprintf.c \ - stdio/vfscanf.c \ - stdio/vprintf.c \ - stdio/vsnprintf.c \ - stdio/vsprintf.c \ - stdio/vscanf.c \ - stdio/vsscanf.c \ - stdio/wbuf.c \ - stdio/wsetup.c \ - stdlib/_rand48.c \ - stdlib/assert.c \ - stdlib/atexit.c \ - stdlib/atoi.c \ - stdlib/atol.c \ - stdlib/atoll.c \ - stdlib/bsearch.c \ - stdlib/ctype_.c \ - stdlib/div.c \ - stdlib/exit.c \ - stdlib/getenv.c \ - stdlib/jrand48.c \ - stdlib/ldiv.c \ - stdlib/lldiv.c \ - stdlib/locale.c \ - stdlib/lrand48.c \ - stdlib/mrand48.c \ - stdlib/nrand48.c \ - stdlib/putenv.c \ - stdlib/qsort.c \ - stdlib/seed48.c \ - stdlib/setenv.c \ - stdlib/setjmperr.c \ - stdlib/srand48.c \ - stdlib/strntoimax.c \ - stdlib/strntoumax.c \ - stdlib/strtod.c \ - stdlib/strtoimax.c \ - stdlib/strtol.c \ - stdlib/strtoll.c \ - stdlib/strtoul.c \ - stdlib/strtoull.c \ - stdlib/strtoumax.c \ - stdlib/tolower_.c \ - stdlib/toupper_.c \ - stdlib/wchar.c \ - string/bcopy.c \ - string/index.c \ - string/memccpy.c \ - string/memchr.c \ - string/memmem.c \ - string/memmove.c.arm \ - string/memrchr.c \ - string/memswap.c \ - string/strcasecmp.c \ - string/strcasestr.c \ - string/strcat.c \ - string/strchr.c \ - string/strcmp.c \ - string/strcoll.c \ - string/strcpy.c \ - string/strcspn.c \ - string/strdup.c \ - string/strerror.c \ - string/strerror_r.c \ - string/strlcat.c \ - string/strlcpy.c \ - string/strncat.c \ - string/strncmp.c \ - string/strncpy.c \ - string/strndup.c \ - string/strnlen.c \ - string/strpbrk.c \ - string/strrchr.c \ - string/strsep.c \ - string/strspn.c \ - string/strstr.c \ - string/strtok.c \ - string/strtotimeval.c \ - string/strxfrm.c \ - inet/bindresvport.c \ - inet/inet_addr.c \ - inet/inet_aton.c \ - inet/inet_ntoa.c \ - inet/inet_ntop.c \ - inet/inet_pton.c \ - tzcode/asctime.c \ - tzcode/difftime.c \ - tzcode/localtime.c \ - tzcode/strftime.c \ - tzcode/strptime.c \ - bionic/__errno.c \ - bionic/__set_errno.c \ - bionic/_rand48.c \ - bionic/arc4random.c \ - bionic/basename.c \ - bionic/basename_r.c \ - bionic/dirname.c \ - bionic/dirname_r.c \ - bionic/drand48.c \ - bionic/erand48.c \ - bionic/fork.c \ - bionic/if_nametoindex.c \ - bionic/if_indextoname.c \ - bionic/ioctl.c \ - bionic/ldexp.c \ - bionic/libc_init_common.c \ - bionic/logd_write.c \ - bionic/md5.c \ - bionic/pututline.c \ - bionic/realpath.c \ - bionic/semaphore.c \ - bionic/sha1.c \ - bionic/ssp.c \ - bionic/stubs.c \ - bionic/system_properties.c \ - bionic/time64.c \ - bionic/thread_atexit.c \ - bionic/utime.c \ - bionic/utmp.c \ - netbsd/gethnamaddr.c \ - netbsd/isc/ev_timers.c \ - netbsd/isc/ev_streams.c \ - netbsd/inet/nsap_addr.c \ - netbsd/resolv/__dn_comp.c \ - netbsd/resolv/__res_close.c \ - netbsd/resolv/__res_send.c \ - netbsd/resolv/herror.c \ - netbsd/resolv/res_comp.c \ - netbsd/resolv/res_data.c \ - netbsd/resolv/res_debug.c \ - netbsd/resolv/res_init.c \ - netbsd/resolv/res_mkquery.c \ - netbsd/resolv/res_query.c \ - netbsd/resolv/res_send.c \ - netbsd/resolv/res_state.c.arm \ - netbsd/resolv/res_cache.c \ - netbsd/net/nsdispatch.c \ - netbsd/net/getaddrinfo.c \ - netbsd/net/getnameinfo.c \ - netbsd/net/getservbyname.c \ - netbsd/net/getservent.c \ - netbsd/net/base64.c \ - netbsd/net/getservbyport.c \ - netbsd/nameser/ns_name.c \ - netbsd/nameser/ns_parse.c \ - netbsd/nameser/ns_ttl.c \ - netbsd/nameser/ns_netint.c \ - netbsd/nameser/ns_print.c \ - netbsd/nameser/ns_samedomain.c - -ifeq ($(TARGET_ARCH),arm) -libc_common_src_files += \ - bionic/eabi.c \ - arch-arm/bionic/__get_pc.S \ - arch-arm/bionic/__get_sp.S \ - arch-arm/bionic/_exit_with_stack_teardown.S \ - arch-arm/bionic/_setjmp.S \ - arch-arm/bionic/atomics_arm.S \ - arch-arm/bionic/clone.S \ - arch-arm/bionic/ffs.S \ - arch-arm/bionic/kill.S \ - arch-arm/bionic/tkill.S \ - arch-arm/bionic/memcmp.S \ - arch-arm/bionic/memcmp16.S \ - arch-arm/bionic/memcpy.S \ - arch-arm/bionic/memset.S \ - arch-arm/bionic/setjmp.S \ - arch-arm/bionic/sigsetjmp.S \ - arch-arm/bionic/strlen.c.arm \ - arch-arm/bionic/syscall.S \ - unistd/socketcalls.c - -# These files need to be arm so that gdbserver -# can set breakpoints in them without messing -# up any thumb code. -libc_common_src_files += \ - bionic/pthread.c.arm \ - bionic/pthread-timers.c.arm \ - bionic/ptrace.c.arm -else # !arm - -ifeq ($(TARGET_ARCH),x86) -libc_common_src_files += \ - arch-x86/bionic/__get_sp.S \ - arch-x86/bionic/__get_tls.c \ - arch-x86/bionic/__set_tls.c \ - arch-x86/bionic/atomics_x86.S \ - arch-x86/bionic/clone.S \ - arch-x86/bionic/_exit_with_stack_teardown.S \ - arch-x86/bionic/setjmp.S \ - arch-x86/bionic/_setjmp.S \ - arch-x86/bionic/vfork.S \ - arch-x86/string/bzero.S \ - arch-x86/string/memset.S \ - arch-x86/string/memcmp.S \ - arch-x86/string/memcpy.S \ - arch-x86/string/strlen.S \ - bionic/pthread.c \ - bionic/pthread-timers.c \ - bionic/ptrace.c -endif # x86 - -endif # !arm - -libc_common_cflags := \ - -DWITH_ERRLIST \ - -DANDROID_CHANGES \ - -DUSE_LOCKS \ - -DREALLOC_ZERO_BYTES_FREES \ - -D_LIBC=1 \ - -DSOFTFLOAT \ - -DFLOATING_POINT \ - -DNEED_PSELECT=1 \ - -DINET6 \ - -I$(LOCAL_PATH)/private \ - -ifeq ($(TARGET_BUILD_TYPE),debug) - libc_common_cflags += -DDEBUG -endif - -ifeq ($(TARGET_ARCH),arm) - libc_common_cflags += -fstrict-aliasing -endif - -libc_common_c_includes := \ - $(LOCAL_PATH)/stdlib \ - $(LOCAL_PATH)/string \ - $(LOCAL_PATH)/stdio - -# libc_common.a -# ======================================================== - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(libc_common_src_files) -LOCAL_CFLAGS := $(libc_common_cflags) -DUSE_DL_PREFIX -LOCAL_C_INCLUDES := $(libc_common_c_includes) - -ifneq ($(TARGET_SIMULATOR),true) - ifeq ($(TARGET_ARCH),arm) - crtend_target_cflags := -mthumb-interwork - else - ifeq ($(TARGET_ARCH),x86) - crtend_target_cflags := -m32 - endif - endif -# We rename crtend.o to crtend_android.o to avoid a -# name clash between gcc and bionic. -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend.S - @mkdir -p $(dir $@) - $(TARGET_CC) $(crtend_target_cflags) -o $@ -c $< -ALL_GENERATED_SOURCES += $(GEN) -endif - - -# crtbegin_so.o/crtend_so.o -# These are needed for building the shared libs. -ifneq ($(TARGET_SIMULATOR),true) - -ifeq ($(TARGET_ARCH),x86) - -crt_begin_end_so_target_cflags := -m32 - -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.S - @mkdir -p $(dir $@) - $(TARGET_CC) $(crt_begin_end_so_target_cflags) -o $@ -c $< -ALL_GENERATED_SOURCES += $(GEN) - -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend_so.S - @mkdir -p $(dir $@) - $(TARGET_CC) $(crt_begin_end_so_target_cflags) -o $@ -c $< -ALL_GENERATED_SOURCES += $(GEN) - -endif # TARGET_ARCH == x86 - -endif # !TARGET_SIMULATOR - - -LOCAL_MODULE := libc_common -LOCAL_SYSTEM_SHARED_LIBRARIES := - -include $(BUILD_STATIC_LIBRARY) - - -# libc.a -# ======================================================== - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk - -# To enable malloc leak check for statically linked programs, add -# "WITH_MALLOC_CHECK_LIBC_A := true" to device/buildspec.mk -WITH_MALLOC_CHECK_LIBC_A := $(strip $(WITH_MALLOC_CHECK_LIBC_A)) - -LOCAL_SRC_FILES := \ - $(libc_common_src_files) \ - bionic/dlmalloc.c \ - bionic/libc_init_static.c - -ifeq ($(WITH_MALLOC_CHECK_LIBC_A),true) - LOCAL_SRC_FILES += bionic/malloc_leak.c.arm -endif - -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += \ - arch-arm/bionic/exidx_static.c - -else # TARGET_ARCH != arm - -ifeq ($(TARGET_ARCH),x86) -LOCAL_SRC_FILES += \ - arch-x86/bionic/dl_iterate_phdr_static.c -endif - -endif - -ifneq ($(TARGET_SIMULATOR),true) - ifeq ($(TARGET_ARCH),arm) - crtbegin_static_target_cflags := -mthumb-interwork - else - ifeq ($(TARGET_ARCH),x86) - crtbegin_static_target_cflags := -m32 - endif - endif -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_static.S - @mkdir -p $(dir $@) - $(TARGET_CC) $(crtbegin_static_target_cflags) -o $@ -c $< -ALL_GENERATED_SOURCES += $(GEN) -endif - -LOCAL_CFLAGS := $(libc_common_cflags) - -LOCAL_C_INCLUDES := $(libc_common_c_includes) - -ifeq ($(WITH_MALLOC_CHECK_LIBC_A),true) - LOCAL_CFLAGS += -DUSE_DL_PREFIX -DMALLOC_LEAK_CHECK -endif - -LOCAL_WHOLE_STATIC_LIBRARIES := libc_common -LOCAL_MODULE:= libc -LOCAL_SYSTEM_SHARED_LIBRARIES := - -include $(BUILD_STATIC_LIBRARY) - - -# libc.so -# ======================================================== - -include $(CLEAR_VARS) - -LOCAL_CFLAGS := $(libc_common_cflags) - -LOCAL_CFLAGS += -DUSE_DL_PREFIX - -LOCAL_C_INCLUDES := $(libc_common_c_includes) - -LOCAL_SRC_FILES := \ - bionic/dlmalloc.c \ - bionic/malloc_leak.c.arm \ - bionic/libc_init_dynamic.c - -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += \ - arch-arm/bionic/exidx_dynamic.c -endif - -LOCAL_MODULE:= libc - -# WARNING: The only library libc.so should depend on is libdl.so! If you add other libraries, -# make sure to add -Wl,--exclude-libs=libgcc.a to the LOCAL_LDFLAGS for those libraries. This -# ensures that symbols that are pulled into those new libraries from libgcc.a are not declared -# external; if that were the case, then libc would not pull those symbols from libgcc.a as it -# should, instead relying on the external symbols from the dependent libraries. That would -# create an "cloaked" dependency on libgcc.a in libc though the libraries, which is not what -# you wanted! - -LOCAL_SHARED_LIBRARIES := libdl -LOCAL_WHOLE_STATIC_LIBRARIES := libc_common -LOCAL_SYSTEM_SHARED_LIBRARIES := - -ifneq ($(TARGET_SIMULATOR),true) - ifeq ($(TARGET_ARCH),arm) - crtbegin_dynamic_target_cflags := -mthumb-interwork - else - ifeq ($(TARGET_ARCH),x86) - crtbegin_dynamic_target_cflags := -m32 - endif - endif -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_dynamic.S - @mkdir -p $(dir $@) - $(TARGET_CC) $(crtbegin_dynamic_target_cflags) -o $@ -c $< -ALL_GENERATED_SOURCES += $(GEN) -endif - -include $(BUILD_SHARED_LIBRARY) - - -# libc_debug.so -# ======================================================== - -include $(CLEAR_VARS) - -LOCAL_CFLAGS := $(libc_common_cflags) - -LOCAL_CFLAGS += -DUSE_DL_PREFIX -DMALLOC_LEAK_CHECK - -LOCAL_C_INCLUDES := $(libc_common_c_includes) - -LOCAL_SRC_FILES := \ - bionic/dlmalloc.c \ - bionic/malloc_leak.c.arm \ - bionic/libc_init_dynamic.c - -ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += \ - arch-arm/bionic/exidx_dynamic.c -endif - -LOCAL_MODULE:= libc_debug - -# WARNING: The only library libc.so should depend on is libdl.so! If you add other libraries, -# make sure to add -Wl,--exclude-libs=libgcc.a to the LOCAL_LDFLAGS for those libraries. This -# ensures that symbols that are pulled into those new libraries from libgcc.a are not declared -# external; if that were the case, then libc would not pull those symbols from libgcc.a as it -# should, instead relying on the external symbols from the dependent libraries. That would -# create an "cloaked" dependency on libgcc.a in libc though the libraries, which is not what -# you wanted! - -LOCAL_SHARED_LIBRARIES := libdl -LOCAL_WHOLE_STATIC_LIBRARIES := libc_common -LOCAL_SYSTEM_SHARED_LIBRARIES := -# Don't prelink -LOCAL_PRELINK_MODULE := false -# Don't install on release build -LOCAL_MODULE_TAGS := eng - -GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o -ALL_GENERATED_SOURCES += $(GEN) - -include $(BUILD_SHARED_LIBRARY) - -# ======================================================== -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libc/CAVEATS b/libc/CAVEATS deleted file mode 100644 index 72281a010..000000000 --- a/libc/CAVEATS +++ /dev/null @@ -1,26 +0,0 @@ -Bionic is a very small C library because we have decided to *not* implement various features -of the POSIX standard. we only add functions on a as-needed basis, and there are a few things -we wish we'll never put in there. - -this file is here to document explicitely what we don't want to support in Bionic: - -- C++ exceptions are not supported. on embedded systems, they lead to extremely larger and - slower code for no good reason (even when so-called zero-cost exception schemes are - implemented, they enforce very large numbers of registers spills to the stack, even - in functions that do not throw an exception themselves). - -- pthread cancellation is *not* supported. this seemingly simple "feature" is the source - of much bloat and complexity in a C library. Besides, you'd better write correct - multi-threaded code instead of relying on this stuff. - -- pthread_once() doesn't support C++ exceptions thrown from the init function, or the init - function doing a fork(). - -- locales and wide characters are not supported. we use ICU for all this i18n stuff, which - is much better than the ill-designed related C libraries functions. - -- at the moment, several user-account-related functions like getpwd are stubbed and return - the values corresponding to root. this will be fixed when we'll be able to have distinct - users on the Android filesystem. :-( - - see bionic/stubs.c for the details diff --git a/libc/Jamfile b/libc/Jamfile deleted file mode 100644 index a65be5dbf..000000000 --- a/libc/Jamfile +++ /dev/null @@ -1,441 +0,0 @@ -# This file is used to build the Bionic library with the Jam build -# tool. For info, see www.perforce.com/jam/jam.html -# - -BIONIC_TOP ?= $(DOT) ; - -DEBUG = 1 ; - -# pattern used for automatic heade inclusion detection -HDRPATTERN = "^[ ]*#[ ]*include[ ]*[<\"]([^\">]*)[\">].*$" ; - - -# debugging support, simply define the DEBUG variable to activate verbose output -rule Debug -{ - if $(DEBUG) { - Echo $(1) ; - } -} - -# return all elements from $(1) that are not in $(2) -rule Filter list : filter -{ - local result = ; - local item ; - for item in $(list) { - if ! $(item) in $(filter) { - result += $(item) ; - } - } - return $(result) ; -} - - -# reverse a list of elements -rule Reverse list -{ - local result = ; - local item ; - - for item in $(list) { - result = $(item) $(result) ; - } - return $(result) ; -} - - -# decompose a path into a list of elements -rule PathDecompose dir -{ - local result ; - - while $(dir:D) - { - if ! $(dir:BS) { # for rooted paths like "/foo" - break ; - } - result = $(dir:BS) $(result) ; - dir = $(dir:D) ; - } - result = $(dir) $(result) ; - return $(result) ; -} - - -# simply a file path, i.e. get rid of . or .. when possible -rule _PathSimplify dir -{ - local result = ; - local dir2 d ; - - dir = [ PathDecompose $(dir) ] ; - - # get rid of any single dot - dir2 = ; - for d in $(dir) { - if $(d) = "." { - continue ; - } - dir2 += $(d) ; - } - - # get rid of .. when possible - for d in $(dir2) { - if $(d) = ".." && $(result) { - result = $(result[2-]) ; - } - else - result = $(d) $(result) ; - } - - # now invert the result - result = [ Reverse $(result) ] ; - if ! $(result) { - result = "." ; - } - return $(result:J="/") ; -} - - -rule PathSimplify dirs -{ - local result ; - local d ; - for d in $(dirs) { - result += [ _PathSimplify $(d) ] ; - } - return $(result) ; -} - - -# retrieve list of subdirectories -rule ListSubDirs paths -{ - local result = ; - local entry ; - for entry in [ Glob $(paths) : * ] { - if ! $(entry:S) { - result += $(entry) ; - } - } - return [ PathSimplify $(result) ] ; -} - - -# retrieve list of sources in a given directory -rule ListSources path -{ - return [ Glob $(path) : *.S *.c ] ; -} - - -# find the prebuilt directory -# -if ! $(TOP) { - Echo "Please define TOP as the root of your device build tree" ; - Exit ; -} - -Debug "OS is" $(OS) ; -Debug "CPU is" $(CPU) ; - -if $(OS) = LINUX -{ - PREBUILT = $(TOP)/prebuilt/Linux ; -} -else if $(OS) = MACOSX -{ - switch $(CPU) { - case i386 : PREBUILT = $(TOP)/prebuilt/darwin-x86 ; break ; - case ppc : PREBUILT = $(TOP)/prebuilt/darwin-ppc ; break ; - case * : Echo "unsupported CPU" "$(CPU) !!" ; - Echo "Please contact digit@google.com for help" ; - Exit ; - } -} -else -{ - Echo "Unsupported operating system" $(OS) ; - Echo "Please contact digit@google.com for help" ; - Exit ; -} - -Debug "TOP is" $(TOP) ; -Debug "PREBUILT is" $(PREBUILT) ; - - -# check architectures and setup toolchain variables -# -SUPPORTED_ARCHS = x86 arm ; - -ARCH ?= $(SUPPORTED_ARCHS) ; - -if ! $(ARCH) in $(SUPPORTED_ARCHS) { - Echo "The variable ARCH contains an unsupported value, use one or more of these instead" ; - Echo "separated by spaces:" $(SUPPORTED_ARCHS) ; - Exit ; -} - -x86_TOOLSET_PREFIX ?= "" ; -arm_TOOLSET_PREFIX ?= $(TOP)/prebuilt/Linux/toolchain-4.1.1/bin/arm-elf- ; - -for arch in $(ARCH) { - CC_$(arch) = $($(arch)_TOOLSET_PREFIX)gcc ; - C++_$(arch) = $($(arch)_TOOLSET_PREFIX)g++ ; - AR_$(arch) = $($(arch)_TOOLSET_PREFIX)ar ; -} - - -# the list of arch-independent source subdirectories -BIONIC_SRC_SUBDIRS = string ; -BIONIC_x86_SUBDIRS = ; -BIONIC_arm_SUBDIRS = ; - -CFLAGS = -O0 -g -W ; - - - -# find sources in a given list of subdirectories -rule FindSources dirs -{ - local dir ; - - for dir in $(dirs) - { - local LOCAL_SRC NO_LOCAL_SRC ; - - if [ Glob $(dir) : rules.jam ] { - include $(dir)/rules.jam ; - if $(LOCAL_SRC) { - _sources = $(LOCAL_SRC) ; - } - else { - _sources = [ Glob $(dir) : *.S *.c ] ; - _sources = $(_sources:BS) ; - } - if $(NO_LOCAL_SRC) { - _sources = [ Filter $(_sources) : $(NO_LOCAL_SRC) ] ; - } - sources += $(dir)/$(_sources) ; - } - else - sources += [ ListSources $(dir) ] ; - } -} - -# Compile a given object file from a source -rule Compile object : source -{ - Depends $(object) : $(source) ; - Depends bionic : $(object) ; - Clean clean : $(object) ; - - MakeLocate $(object) : $(OUT) ; - - - CC on $(object) = $(CC_$(arch)) ; - CFLAGS on $(object) = $(CFLAGS) ; - INCLUDES on $(object) = $(INCLUDES) ; - DEFINES on $(object) = $(DEFINES) ; - - HDRRULE on $(>) = HdrRule ; - HDRSCAN on $(>) = $(HDRPATTERN) ; - HDRSEARCH on $(>) = $(INCLUDES) ; - HDRGRIST on $(>) = $(HDRGRIST) ; -} - - -actions Compile -{ - $(CC) -c -o $(1) $(CFLAGS) -I$(INCLUDES) -D$(DEFINES) $(2) -} - - -rule RmTemps -{ - Temporary $(2) ; -} - -actions quietly updated piecemeal together RmTemps -{ - rm -f $(2) -} - -actions Archive -{ - $(AR) ru $(1) $(2) -} - -rule Library library : objects -{ - local obj ; - - if ! $(library:S) { - library = $(library:S=.a) ; - } - library = $(library:G=<$(arch)>) ; - - Depends all : $(library) ; - - if ! $(library:D) { - MakeLocate $(library) $(library)($(objects:BS)) : $(OUT) ; - } - - Depends $(library) : $(library)($(objects:BS)) ; - for obj in $(objects) { - Depends $(library)($(obj:BS)) : $(obj) ; - } - - Clean clean : $(library) ; - - AR on $(library) = $(AR_$(arch)) ; - Archive $(library) : $(objects) ; - - RmTemps $(library) : $(objects) ; -} - - -rule ProcessDir -{ - local CFLAGS = $(CFLAGS) ; - local DEFINES = $(DEFINES) ; - local INCLUDES = $(INCLUDES) ; - local local_rules = [ Glob $(1) : rules.jam ] ; - local source sources ; - - if $(local_rules) { - local LOCAL_CFLAGS LOCAL_DEFINES LOCAL_INCLUDES LOCAL_SRC NO_LOCAL_SRC ; - - include $(local_rules) ; - CFLAGS += $(LOCAL_CFLAGS) ; - DEFINES += $(LOCAL_DEFINES) ; - INCLUDES += $(LOCAL_INCLUDES) ; - - if $(LOCAL_SRC) { - sources = $(LOCAL_SRC) ; - } - else { - sources = [ Glob $(1) : *.S *.c ] ; - sources = $(sources:BS) ; - } - - if $(NO_LOCAL_SRC) { - sources = [ Filter $(sources) : $(NO_LOCAL_SRC) ] ; - } - - sources = $(1)/$(sources) ; - } - else - sources = [ Glob $(1) : *.S *.c ] ; - - for source in $(sources) { - local name = $(source:B) ; - - if $(source:S) = ".S" { - # record the list of assembler sources - ASSEMBLER_SOURCES += $(name) ; - } - else if $(source:S) = ".c" && $(name) in $(ASSEMBLER_SOURCES) { - # skip C source file if corresponding assembler exists - continue ; - } - - objname = <$(arch)>$(name).o ; - - Compile $(objname) : $(source) ; - ALL_OBJECTS += $(objname) ; - } -} - -rule ProcessDirs -{ - local dir ; - for dir in $(1) { - ProcessDir $(dir) ; - } -} - -INCLUDES_x86 = /usr/src/linux/include ; - -INCLUDES_arm = ../kernel_headers - include/arch/arm - include/bits32 - ; - -INCLUDES = include stdio string stdlib . - ../msun/include - ; - -DEFINES = ANDROID_CHANGES - USE_LOCKS - REALLOC_ZERO_BYTES_FREES - _LIBC=1 - SOFTFLOAT - FLOATING_POINT - NEED_PSELECT=1 - ANDROID - ; - -CFLAGS_x86 = ; - - -for arch in $(ARCH) -{ - local ARCH_DIR = $(BIONIC_TOP)/arch-$(arch) ; - local INCLUDES = $(INCLUDES_$(arch)) $(ARCH_DIR)/include $(INCLUDES) ; - local DEFINES = $(DEFINES_$(arch)) $(DEFINES) ARCH=$(arch) ; - local CFLAGS = $(CFLAGS) $(CFLAGS_$(arch)) ; - local OUT = out/$(arch) ; - local ASSEMBLER_SOURCES ALL_OBJECTS ; - - ProcessDirs [ ListSubDirs $(ARCH_DIR) ] ; - ProcessDirs stdlib stdio unistd string tzcode inet ; - ProcessDirs [ ListSubDirs netbsd ] ; - ProcessDirs bionic ; - - Library bionic : $(ALL_OBJECTS) ; -} - -BIONIC_SEARCH = $(BIONIC_TOP)/include ; - - - -# /HdrRule source : headers ; -# -# Arranges the proper dependencies when the file _source_ includes the files -# _headers_ through the #include C preprocessor directive -# -# this rule is not intendend to be called explicitely. It is called -# automatically during header scanning on sources handled by the @Object -# rule (e.g. sources in @Main or @Library rules) -# -rule HdrRule -{ - # HdrRule source : headers ; - - # N.B. This rule is called during binding, potentially after - # the fate of many targets has been determined, and must be - # used with caution: don't add dependencies to unrelated - # targets, and don't set variables on $(<). - - # Tell Jam that anything depending on $(<) also depends on $(>), - # set SEARCH so Jam can find the headers, but then say we don't - # care if we can't actually find the headers (they may have been - # within ifdefs), - - local s = $(>:G=$(HDRGRIST:E)) ; - - Includes $(<) : $(s) ; - SEARCH on $(s) = $(HDRSEARCH) ; - NoCare $(s) ; - - # Propagate on $(<) to $(>) - - HDRSEARCH on $(s) = $(HDRSEARCH) ; - HDRSCAN on $(s) = $(HDRSCAN) ; - HDRRULE on $(s) = $(HDRRULE) ; - HDRGRIST on $(s) = $(HDRGRIST) ; -} - - diff --git a/libc/MODULE_LICENSE_BSD b/libc/MODULE_LICENSE_BSD deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/NOTICE b/libc/NOTICE deleted file mode 100644 index e8076b5cc..000000000 --- a/libc/NOTICE +++ /dev/null @@ -1,382 +0,0 @@ - -Copyright (c) 2005-2008, The Android Open Source Project -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of The Android Open Source Project nor the names - of its contributors may be used to endorse or promote products - derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - - -Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") -Copyright (c) 1995,1996,1999 by Internet Software Consortium. - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -Portions Copyright (c) 1995 by International Business Machines, Inc. - -International Business Machines, Inc. (hereinafter called IBM) grants -permission under its copyrights to use, copy, modify, and distribute this -Software with or without fee, provided that the above copyright notice and -all paragraphs of this notice appear in all copies, and that the name of IBM -not be used in connection with the marketing of any product incorporating -the Software or modifications thereof, without specific, written prior -permission. - -To the extent it has a right to do so, IBM grants an immunity from suit -under its patents, if any, for the use, sale or manufacture of products to -the extent that such products are used for performing Domain Name System -dynamic updates in TCP/IP networks by means of the Software. No immunity is -granted for any product per se or for any other function of any product. - -THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, -DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING -OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN -IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. - -Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. -All rights reserved. - -This code is derived from software contributed to The NetBSD Foundation -by Luke Mewburn; and by Jason R. Thorpe. -This code is derived from software contributed to The NetBSD Foundation -by Christos Zoulas. - -Copyright (c) 1993 Christopher G. Demetriou -Copyright (c) 1983, 1985, 1993 The Regents of the University of California. All rights reserved. -Copyright (c) 2000 Ben Harris. -Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the project nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -Copyright (c) 2003 Networks Associates Technology, Inc. -All rights reserved. - -Portions of this software were developed for the FreeBSD Project by -Jacques A. Vidrine, Safeport Network Services, and Network -Associates Laboratories, the Security Research Division of Network -Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 -("CBOSS"), as part of the DARPA CHATS research program. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -Portions Copyright (c) 1993 by Digital Equipment Corporation. - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies, and that -the name of Digital Equipment Corporation not be used in advertising or -publicity pertaining to distribution of the document or software without -specific, written prior permission. - -THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - - -Copyright (c) 1997 Mark Brinicombe -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by Mark Brinicombe -4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - - -Copyright (c) 1993 Martin Birgmeier -All rights reserved. - -You may redistribute unmodified or modified versions of this source -code provided that the above copyright notice and this and the -following conditions are retained. - -This software is provided ``as is'', and comes with no warranties -of any kind. I shall in no event be liable for anything that happens -to anyone/anything when using this software. - - -Arc4 random number generator for OpenBSD. -Copyright 1996 David Mazieres . - -Modification and redistribution in source and binary forms is -permitted provided that due credit is given to the author and the -OpenBSD project by leaving this copyright notice intact. - - -Copyright (c) 1999 Kungliga Tekniska Högskolan -(Royal Institute of Technology, Stockholm, Sweden). -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of KTH nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - - -==================================================== -Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - -Developed at SunPro, a Sun Microsystems, Inc. business. -Permission to use, copy, modify, and distribute this -software is freely granted, provided that this notice -is preserved. -==================================================== - - -Copyright (c) 1997, 2005 Todd C. Miller - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -Copyright (c) 1989, 1993 - The Regents of the University of California. All rights reserved. -(c) UNIX System Laboratories, Inc. -All or some portions of this file are derived from material licensed -to the University of California by American Telephone and Telegraph -Co. or Unix System Laboratories, Inc. and are reproduced herein with -the permission of UNIX System Laboratories, Inc. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - - -Copyright (c) 1995, 1996 Carnegie-Mellon University. -All rights reserved. - -Author: Chris G. Demetriou - -Permission to use, copy, modify and distribute this software and -its documentation is hereby granted, provided that both the copyright -notice and this permission notice appear in all copies of the -software, derivative works or modified versions, and any portions -thereof, and that both notices appear in supporting documentation. - -CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" -CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND -FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - -Carnegie Mellon requests users of this software to return to - - Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - School of Computer Science - Carnegie Mellon University - Pittsburgh PA 15213-3890 - -any improvements or extensions that they make and grant Carnegie the -rights to redistribute these changes. - - -Copyright (c) 1995, 1996 Carnegie-Mellon University. -All rights reserved. - -Author: Chris G. Demetriou - -Permission to use, copy, modify and distribute this software and -its documentation is hereby granted, provided that both the copyright -notice and this permission notice appear in all copies of the -software, derivative works or modified versions, and any portions -thereof, and that both notices appear in supporting documentation. - -CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" -CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND -FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - -Carnegie Mellon requests users of this software to return to - - Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - School of Computer Science - Carnegie Mellon University - Pittsburgh PA 15213-3890 - -any improvements or extensions that they make and grant Carnegie the -rights to redistribute these changes. - - -Copyright (c) 2003 Networks Associates Technology, Inc. -All rights reserved. - -Portions of this software were developed for the FreeBSD Project by -Jacques A. Vidrine, Safeport Network Services, and Network -Associates Laboratories, the Security Research Division of Network -Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 -("CBOSS"), as part of the DARPA CHATS research program. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - - diff --git a/libc/README b/libc/README deleted file mode 100644 index 4e29f1216..000000000 --- a/libc/README +++ /dev/null @@ -1,53 +0,0 @@ -Welcome to Bionic, Android small and custom C library for the Android platform - -Bionic is mainly a port of the BSD C library to our Linux kernel with the -following additions/changes: - -- no support for locales -- no support for wide chars (i.e. multi-byte characters) -- its own smallish implementation of pthreads based on Linux futexes -- support for x86, ARM and ARM thumb CPU instruction sets and kernel interfaces - -Bionic is released under the standard 3-clause BSD License - -Bionic doesn't want to implement all features of a traditional C library, we only -add features to it as we need them, and we try to keep things as simple and small -as possible. Our goal is not to support scaling to thousands of concurrent threads -on multi-processors machines; we're running this on cell-phones, damnit !! - -Note that Bionic doesn't provide a libthread_db or a libm implementation. - - -Adding new syscalls: -==================== - -Bionic provides the gensyscalls.py Python script to automatically generate syscall -stubs from the list defined in the file SYSCALLS.TXT. You can thus add a new syscall -by doing the following: - -- edit SYSCALLS.TXT -- add a new line describing your syscall, it should look like: - - return_type syscall_name(parameters) syscall_number - -- in the event where you want to differentiate the syscall function from its entry name, - use the alternate: - - return_type funcname:syscall_name(parameters) syscall_number - -- additionally, if the syscall number is different between ARM and x86, use: - - return_type funcname[:syscall_name](parameters) arm_number,x86_number - -- a syscall number can be -1 to indicate that the syscall is not implemented on - a given platform, for example: - - void __set_tls(void*) arm_number,-1 - - -the comments in SYSCALLS.TXT contain more information about the line format - -You can also use the 'checksyscalls.py' script to check that all the syscall -numbers you entered are correct. It does so by looking at the values defined in -your Linux kernel headers. The script indicates where the values are incorrect -and what is expected instead. diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT deleted file mode 100644 index 1ef06d261..000000000 --- a/libc/SYSCALLS.TXT +++ /dev/null @@ -1,245 +0,0 @@ -# this file is used to list all the syscalls that will be supported by -# the Bionic C library. It is used to automatically generate the syscall -# stubs, the list of syscall constants (__NR_xxxx) and the content of -# -# each non comment line has the following format: -# -# return_type func_name[:syscall_name[:call_id]]([parameter_list]) (#syscall_number|stub) -# -# note that: -# - syscall_name correspond to the name of the syscall, which may differ from -# the exported function name (example: the exit syscall is implemented by the _exit() -# function, which is not the same as the standard C exit() function which calls it) -# The call_id parameter, given that func_name and syscall_name have -# been provided, allows the user to specify dispatch style syscalls. -# For example, socket() syscall on i386 actually becomes: -# socketcall(__NR_socket, 1, *(rest of args on stack)). -# -# - each parameter type is assumed to be stored on 32 bits, there is no plan to support -# 64-bit architectures at the moment -# -# - it there is "stub" instead of a syscall number, the tool will not generate any -# assembler template for the syscall; it's up to the bionic implementation to provide -# a relevant C stub -# -# the file is processed by a python script named gensyscalls.py -# - -# process management -void _exit:exit_group (int) 248,252 -void _exit_thread:exit (int) 1 -pid_t __fork:fork (void) 2 -pid_t _waitpid:waitpid (pid_t, int*, int, struct rusage*) -1,7 -int waitid(int, pid_t, struct siginfo_t*, int,void*) 280,284 -pid_t __clone:clone(int (*fn)(void*), void *child_stack, int flags, void *arg) 120 -int execve (const char*, char* const*, char* const*) 11 - -int setuid:setuid32 (uid_t) 213 -uid_t getuid:getuid32 () 199 -gid_t getgid:getgid32 () 200 -uid_t geteuid:geteuid32 () 201 -gid_t getegid:getegid32 () 202 -uid_t getresuid:getresuid32 () 209 -gid_t getresgid:getresgid32 () 211 -pid_t gettid() 224 -int getgroups:getgroups32(int, gid_t *) 205 -pid_t getpgid(pid_t) 132 -pid_t getppid() 64 -pid_t setsid() 66 -int setgid:setgid32(gid_t) 214 -int seteuid:seteuid32(uid_t) stub -int setreuid:setreuid32(uid_t, uid_t) 203 -int setresuid:setresuid32(uid_t, uid_t, uid_t) 208 -int setresgid:setresgid32(gid_t, gid_t, gid_t) 210 -void* __brk:brk(void*) 45 -# see comments in arch-arm/bionic/kill.S to understand why we don't generate an ARM stub for kill/tkill -int kill(pid_t, int) -1,37 -int tkill(pid_t tid, int sig) -1,238 -int __ptrace:ptrace(int request, int pid, void* addr, void* data) 26 -int __set_thread_area:set_thread_area(void* user_desc) -1,243 -int __getpriority:getpriority(int, int) 96 -int setpriority(int, int, int) 97 -int setrlimit(int resource, const struct rlimit *rlp) 75 -int getrlimit:ugetrlimit(int resource, struct rlimit *rlp) 191 -int getrusage(int who, struct rusage* r_usage) 77 -int setgroups:setgroups32(int, const gid_t *) 206 -pid_t getpgrp(void) stub -int setpgid(pid_t, pid_t) 57 -pid_t vfork(void) 190,-1 -int setregid:setregid32(gid_t, gid_t) 204 -int chroot(const char *) 61 -int prctl(int option, unsigned int arg2, unsigned int arg3, unsigned int arg4, unsigned int arg5) 172 -int capget(cap_user_header_t header, cap_user_data_t data) 184 -int capset(cap_user_header_t header, const cap_user_data_t data) 185 -int acct(const char* filepath) 51 - -# file descriptors -ssize_t read (int, void*, size_t) 3 -ssize_t write (int, const void*, size_t) 4 -ssize_t __pread64:pread64 (int, void *, size_t, off_t, off_t) 180 -ssize_t __pwrite64:pwrite64 (int, void *, size_t, off_t, off_t) 181 -int __open:open (const char*, int, mode_t) 5 -int __openat:openat (int, const char*, int, mode_t) 322,295 -int close (int) 6 -int creat(const char*, mode_t) stub -off_t lseek(int, off_t, int) 19 -int __llseek:_llseek (int, unsigned long, unsigned long, loff_t*, int) 140 -pid_t getpid () 20 -void * mmap(void *, size_t, int, int, int, long) stub -void * __mmap2:mmap2(void*, size_t, int, int, int, long) 192 -int munmap(void *, size_t) 91 -void * mremap(void *, size_t, size_t, unsigned long) 163 -int msync(const void *, size_t, int) 144 -int mprotect(const void *, size_t, int) 125 -int madvise(const void *, size_t, int) 220,219 -int mlock(const void *addr, size_t len) 150 -int munlock(const void *addr, size_t len) 151 -int mincore(void* start, size_t length, unsigned char* vec) 219,218 -int __ioctl:ioctl(int, int, void *) 54 -int readv(int, const struct iovec *, int) 145 -int writev(int, const struct iovec *, int) 146 -int __fcntl:fcntl(int, int, void*) 55 -int flock(int, int) 143 -int fchmod(int, mode_t) 94 -int dup(int) 41 -int pipe(int *) 42 -int dup2(int, int) 63 -int select:_newselect(int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *) 142 -int ftruncate(int, off_t) 93 -int getdents:getdents64(unsigned int, struct dirent *, unsigned int) 217,220 -int fsync(int) 118 -int fchown:fchown32(int, uid_t, gid_t) 207 -void sync(void) 36 -int __fcntl64:fcntl64(int, int, void *) 221 -int fstatfs:fstatfs64(int, size_t, struct statfs *) 267,269 -ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count) 187 -int fstatat:fstatat64(int dirfd, const char *path, struct stat *buf, int flags) 327,300 -int mkdirat(int dirfd, const char *pathname, mode_t mode) 323,296 -int fchownat(int dirfd, const char *path, uid_t owner, gid_t group, int flags) 325,298 -int fchmodat(int dirfd, const char *path, mode_t mode, int flags) 333,306 -int renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) 329,302 - -# file system -int link (const char*, const char*) 9 -int unlink (const char*) 10 -int unlinkat (int, const char *, int) 328,301 -int chdir (const char*) 12 -int mknod (const char*, mode_t, dev_t) 14 -int chmod (const char*,mode_t) 15 -int chown:chown32(const char *, uid_t, gid_t) 212 -int lchown:lchown32 (const char*, uid_t, gid_t) 198 -int mount (const char*, const char*, const char*, unsigned long, const void*) 21 -int umount(const char*) stub -int umount2 (const char*, int) 52 -int fstat:fstat64(int, struct stat*) 197 -int stat:stat64(const char *, struct stat *) 195 -int lstat:lstat64(const char *, struct stat *) 196 -int mkdir(const char *, mode_t) 39 -int readlink(const char *, char *, size_t) 85 -int rmdir(const char *) 40 -int rename(const char *, const char *) 38 -int __getcwd:getcwd(char * buf, size_t size) 183 -int access(const char *, int) 33 -int symlink(const char *, const char *) 83 -int fchdir(int) 133 -int truncate(const char*, off_t) 92 -int __statfs64:statfs64(const char *, size_t, struct statfs *) 266,268 -# time -int pause () 29 -int gettimeofday(struct timeval*, struct timezone*) 78 -int settimeofday(const struct timeval*, const struct timezone*) 79 -clock_t times(struct tms *) 43 -int nanosleep(const struct timespec *, struct timespec *) 162 -int clock_gettime(clockid_t clk_id, struct timespec *tp) 263,265 -int clock_settime(clockid_t clk_id, const struct timespec *tp) 262,264 -int clock_getres(clockid_t clk_id, struct timespec *res) 264,266 -int clock_nanosleep(const struct timespec *req, struct timespec *rem) 265,267 -int getitimer(int, const struct itimerval *) 105 -int setitimer(int, const struct itimerval *, struct itimerval *) 104 -int __timer_create:timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid) 257,259 -int __timer_settime:timer_settime(timer_t, int, const struct itimerspec*, struct itimerspec*) 258,260 -int __timer_gettime:timer_gettime(timer_t, struct itimerspec*) 259,261 -int __timer_getoverrun:timer_getoverrun(timer_t) 260,262 -int __timer_delete:timer_delete(timer_t) 261,263 -int utimes(const char*, const struct timeval tvp[2]) 269, 271 - -# signals -int sigaction(int, const struct sigaction *, struct sigaction *) 67 -int sigprocmask(int, const sigset_t *, sigset_t *) 126 -int __sigsuspend:sigsuspend(int unused1, int unused2, unsigned mask) 72 -int __rt_sigaction:rt_sigaction (int sig, const struct sigaction *act, struct sigaction *oact, size_t sigsetsize) 174 -int __rt_sigprocmask:rt_sigprocmask (int how, const sigset_t *set, sigset_t *oset, size_t sigsetsize) 175 -int __rt_sigtimedwait:rt_sigtimedwait(const sigset_t *set, struct siginfo_t *info, struct timespec_t *timeout, size_t sigset_size) 177 -int sigpending(sigset_t *) 73 - -# sockets -int socket(int, int, int) 281,-1 -int socketpair(int, int, int, int*) 288,-1 -int bind(int, struct sockaddr *, int) 282,-1 -int connect(int, struct sockaddr *, socklen_t) 283,-1 -int listen(int, int) 284,-1 -int accept(int, struct sockaddr *, socklen_t *) 285,-1 -int getsockname(int, struct sockaddr *, socklen_t *) 286,-1 -int getpeername(int, struct sockaddr *, socklen_t *) 287,-1 -int sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t) 290,-1 -int recvfrom(int, void *, size_t, unsigned int, struct sockaddr *, socklen_t *) 292,-1 -int shutdown(int, int) 293,-1 -int setsockopt(int, int, int, const void *, socklen_t) 294,-1 -int getsockopt(int, int, int, void *, socklen_t *) 295,-1 -int sendmsg(int, const struct msghdr *, unsigned int) 296,-1 -int recvmsg(int, struct msghdr *, unsigned int) 297,-1 - -# sockets for x86. These are done as an "indexed" call to socketcall syscall. -int socket:socketcall:1 (int, int, int) -1,102 -int bind:socketcall:2 (int, struct sockaddr *, int) -1,102 -int connect:socketcall:3(int, struct sockaddr *, socklen_t) -1,102 -int listen:socketcall:4(int, int) -1,102 -int accept:socketcall:5(int, struct sockaddr *, socklen_t *) -1,102 -int getsockname:socketcall:6(int, struct sockaddr *, socklen_t *) -1,102 -int getpeername:socketcall:7(int, struct sockaddr *, socklen_t *) -1,102 -int socketpair:socketcall:8(int, int, int, int*) -1,102 -int sendto:socketcall:11(int, const void *, size_t, int, const struct sockaddr *, socklen_t) -1,102 -int recvfrom:socketcall:12(int, void *, size_t, unsigned int, struct sockaddr *, socklen_t *) -1,102 -int shutdown:socketcall:13(int, int) -1,102 -int setsockopt:socketcall:14(int, int, int, const void *, socklen_t) -1,102 -int getsockopt:socketcall:15(int, int, int, void *, socklen_t *) -1,102 -int sendmsg:socketcall:16(int, const struct msghdr *, unsigned int) -1,102 -int recvmsg:socketcall:17(int, struct msghdr *, unsigned int) -1,102 - -# scheduler & real-time -int sched_setscheduler(pid_t pid, int policy, const struct sched_param *param) 156 -int sched_getscheduler(pid_t pid) 157 -int sched_yield(void) 158 -int sched_setparam(pid_t pid, const struct sched_param *param) 154 -int sched_getparam(pid_t pid, struct sched_param *param) 155 -int sched_get_priority_max(int policy) 159 -int sched_get_priority_min(int policy) 160 -int sched_rr_get_interval(pid_t pid, struct timespec *interval) 161 - -# other -int uname(struct utsname *) 122 -pid_t __wait4:wait4(pid_t pid, int *status, int options, struct rusage *rusage) 114 -mode_t umask(mode_t) 60 -int __reboot:reboot(int, int, int, void *) 88 -int __syslog:syslog(int, char *, int) 103 -int init_module(void *, unsigned long, const char *) 128 -int delete_module(const char*, unsigned int) 129 -int klogctl:syslog(int, char *, int) 103 - -# futex -int futex(void *, int, int, void *, void *, int) 240 - -# epoll -int epoll_create(int size) 250,254 -int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) 251,255 -int epoll_wait(int epfd, struct epoll_event *events, int max, int timeout) 252,256 - -int inotify_init(void) 316,291 -int inotify_add_watch(int, const char *, unsigned int) 317,292 -int inotify_rm_watch(int, unsigned int) 318,293 - -int poll(struct pollfd *, unsigned int, long) 168 - -# ARM-specific ARM_NR_BASE == 0x0f0000 == 983040 -int __set_tls:ARM_set_tls(void*) 983045,-1 -int cacheflush:ARM_cacheflush(long start, long end, long flags) 983042,-1 diff --git a/libc/arch-arm/bionic/__get_pc.S b/libc/arch-arm/bionic/__get_pc.S deleted file mode 100644 index d1377c7ec..000000000 --- a/libc/arch-arm/bionic/__get_pc.S +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -.global __get_pc - -__get_pc: - mov r0, pc - bx lr - diff --git a/libc/arch-arm/bionic/__get_sp.S b/libc/arch-arm/bionic/__get_sp.S deleted file mode 100644 index 9acaf3da5..000000000 --- a/libc/arch-arm/bionic/__get_sp.S +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -.global __get_sp - -__get_sp: - mov r0, sp - bx lr - diff --git a/libc/arch-arm/bionic/_exit_with_stack_teardown.S b/libc/arch-arm/bionic/_exit_with_stack_teardown.S deleted file mode 100644 index 89f6c90ed..000000000 --- a/libc/arch-arm/bionic/_exit_with_stack_teardown.S +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -.text -.type _exit_with_stack_teardown, #function -.globl _exit_with_stack_teardown -.align 4 - -@ void _exit_with_stack_teardown(void * stackBase, int stackSize, int retCode) - -_exit_with_stack_teardown: - -#if __ARM_EABI__ - mov lr, r2 - ldr r7, =__NR_munmap - swi #0 @ the stack is destroyed by this call - mov r0, lr - ldr r7, =__NR_exit - swi #0 -#else - mov lr, r2 - swi # __NR_munmap @ the stack is destroyed by this call - mov r0, lr - swi # __NR_exit -#endif - - @ exit() should never return, cause a crash if it does - mov r0, #0 - ldr r0, [r0] diff --git a/libc/arch-arm/bionic/_setjmp.S b/libc/arch-arm/bionic/_setjmp.S deleted file mode 100644 index 6a27af24d..000000000 --- a/libc/arch-arm/bionic/_setjmp.S +++ /dev/null @@ -1,106 +0,0 @@ -/* $OpenBSD: _setjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */ -/* $NetBSD: _setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $ */ - -/* - * Copyright (c) 1997 Mark Brinicombe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Brinicombe - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -/* - * C library -- _setjmp, _longjmp - * - * _longjmp(a,v) - * will generate a "return(v)" from the last call to - * _setjmp(a) - * by restoring registers from the stack. - * The previous signal state is NOT restored. - * - * Note: r0 is the return value - * r1-r3 are scratch registers in functions - */ - -ENTRY(_setjmp) - ldr r1, .L_setjmp_magic - str r1, [r0], #4 -#ifdef SOFTFLOAT - add r0, r0, #52 -#else - /* Store fp registers */ - sfm f4, 4, [r0], #48 - /* Store fpsr */ - rfs r1 - str r1, [r0], #0x0004 -#endif /* SOFTFLOAT */ - /* Store integer registers */ - stmia r0, {r4-r14} - - mov r0, #0x00000000 - bx lr - -.L_setjmp_magic: - .word _JB_MAGIC__SETJMP - -ENTRY(_longjmp) - ldr r2, .L_setjmp_magic - ldr r3, [r0], #4 - teq r2, r3 - bne botch - -#ifdef SOFTFLOAT - add r0, r0, #52 -#else - /* Restore fp registers */ - lfm f4, 4, [r0], #48 - /* Restore fpsr */ - ldr r4, [r0], #0x0004 - wfs r4 -#endif /* SOFTFLOAT */ - /* Restore integer registers */ - ldmia r0, {r4-r14} - - /* Validate sp and r14 */ - teq sp, #0 - teqne r14, #0 - beq botch - - /* Set return value */ - mov r0, r1 - teq r0, #0x00000000 - moveq r0, #0x00000001 - bx lr - - /* validation failed, die die die. */ -botch: - bl PIC_SYM(_C_LABEL(longjmperror), PLT) - bl PIC_SYM(_C_LABEL(abort), PLT) - b . - 8 /* Cannot get here */ diff --git a/libc/arch-arm/bionic/atomics_arm.S b/libc/arch-arm/bionic/atomics_arm.S deleted file mode 100644 index b2da09f07..000000000 --- a/libc/arch-arm/bionic/atomics_arm.S +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -.global __atomic_cmpxchg -.global __atomic_swap -.global __atomic_dec -.global __atomic_inc -.global __futex_wait -.global __futex_wake - -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 - -#if 1 - .equ kernel_cmpxchg, 0xFFFF0FC0 - .equ kernel_atomic_base, 0xFFFF0FFF -__atomic_dec: - stmdb sp!, {r4, lr} - mov r2, r0 -1: @ atomic_dec - ldr r0, [r2] - mov r3, #kernel_atomic_base - add lr, pc, #4 - sub r1, r0, #1 - add pc, r3, #(kernel_cmpxchg - kernel_atomic_base) - bcc 1b - add r0, r1, #1 - ldmia sp!, {r4, lr} - bx lr - -__atomic_inc: - stmdb sp!, {r4, lr} - mov r2, r0 -1: @ atomic_inc - ldr r0, [r2] - mov r3, #kernel_atomic_base - add lr, pc, #4 - add r1, r0, #1 - add pc, r3, #(kernel_cmpxchg - kernel_atomic_base) - bcc 1b - sub r0, r1, #1 - ldmia sp!, {r4, lr} - bx lr - -/* r0(old) r1(new) r2(addr) -> r0(zero_if_succeeded) */ -__atomic_cmpxchg: - stmdb sp!, {r4, lr} - mov r4, r0 /* r4 = save oldvalue */ -1: @ atomic_cmpxchg - mov r3, #kernel_atomic_base - add lr, pc, #4 - mov r0, r4 /* r0 = oldvalue */ - add pc, r3, #(kernel_cmpxchg - kernel_atomic_base) - bcs 2f /* swap was made. we're good, return. */ - ldr r3, [r2] /* swap not made, see if it's because *ptr!=oldvalue */ - cmp r3, r4 - beq 1b -2: @ atomic_cmpxchg - ldmia sp!, {r4, lr} - bx lr -#else -#define KUSER_CMPXCHG 0xffffffc0 - -/* r0(old) r1(new) r2(addr) -> r0(zero_if_succeeded) */ -__atomic_cmpxchg: - stmdb sp!, {r4, lr} - mov r4, r0 /* r4 = save oldvalue */ -1: add lr, pc, #4 - mov r0, r4 /* r0 = oldvalue */ - mov pc, #KUSER_CMPXCHG - bcs 2f /* swap was made. we're good, return. */ - ldr r3, [r2] /* swap not made, see if it's because *ptr!=oldvalue */ - cmp r3, r4 - beq 1b -2: ldmia sp!, {r4, lr} - bx lr - -/* r0(addr) -> r0(old) */ -__atomic_dec: - stmdb sp!, {r4, lr} - mov r2, r0 /* address */ -1: ldr r0, [r2] /* oldvalue */ - add lr, pc, #4 - sub r1, r0, #1 /* newvalue = oldvalue - 1 */ - mov pc, #KUSER_CMPXCHG - bcc 1b /* no swap, try again until we get it right */ - mov r0, ip /* swapped, return the old value */ - ldmia sp!, {r4, lr} - bx lr - -/* r0(addr) -> r0(old) */ -__atomic_inc: - stmdb sp!, {r4, lr} - mov r2, r0 /* address */ -1: ldr r0, [r2] /* oldvalue */ - add lr, pc, #4 - add r1, r0, #1 /* newvalue = oldvalue + 1 */ - mov pc, #KUSER_CMPXCHG - bcc 1b /* no swap, try again until we get it right */ - mov r0, ip /* swapped, return the old value */ - ldmia sp!, {r4, lr} - bx lr -#endif - -/* r0(new) r1(addr) -> r0(old) */ -__atomic_swap: - swp r0, r0, [r1] - bx lr - -/* __futex_wait(*ftx, val, *timespec) */ -/* __futex_syscall(*ftx, op, val, *timespec, *addr2, val3) */ - -#if __ARM_EABI__ - -__futex_wait: - .fnstart - stmdb sp!, {r4, r7} - .save {r4, r7} - mov r3, r2 - mov r2, r1 - mov r1, #FUTEX_WAIT - ldr r7, =__NR_futex - swi #0 - ldmia sp!, {r4, r7} - bx lr - .fnend - -__futex_wake: - stmdb sp!, {r4, r7} - mov r2, r1 - mov r1, #FUTEX_WAKE - ldr r7, =__NR_futex - swi #0 - ldmia sp!, {r4, r7} - bx lr - -#else - -__futex_wait: - mov r3, r2 - mov r2, r1 - mov r1, #FUTEX_WAIT - swi #__NR_futex - bx lr - -__futex_wake: - mov r2, r1 - mov r1, #FUTEX_WAKE - swi #__NR_futex - bx lr - -#endif diff --git a/libc/arch-arm/bionic/clone.S b/libc/arch-arm/bionic/clone.S deleted file mode 100644 index 791c73d28..000000000 --- a/libc/arch-arm/bionic/clone.S +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - - .text - .type __pthread_clone, #function - .global __pthread_clone - .align 4 - -__pthread_clone: - @ insert the args onto the new stack - str r0, [r1, #-4] - str r3, [r1, #-8] - - @ do the system call - @ get flags - - mov r0, r2 - - @ new sp is already in r1 - -#if __ARM_EABI__ - stmfd sp!, {r4, r7} - ldr r7, =__NR_clone - swi #0 -#else - swi #__NR_clone -#endif - - movs r0, r0 -#if __ARM_EABI__ - ldmnefd sp!, {r4, r7} -#endif - blt __error - bxne lr - - - @ pick the function arg and call address off the stack and jump - @ to the C __thread_entry function which does some setup and then - @ calls the thread's start function - - ldr r0, [sp, #-4] - ldr r1, [sp, #-8] - mov r2, sp @ __thread_entry needs the TLS pointer - b __thread_entry - -__error: - mov r0, #-1 - bx lr diff --git a/libc/arch-arm/bionic/crtbegin_dynamic.S b/libc/arch-arm/bionic/crtbegin_dynamic.S deleted file mode 100644 index e26592317..000000000 --- a/libc/arch-arm/bionic/crtbegin_dynamic.S +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - .text - .align 4 - .type _start,#function - .globl _start - -# this is the small startup code that is first run when -# any executable that is statically-linked with Bionic -# runs. -# -# it's purpose is to call __libc_init with appropriate -# arguments, which are: -# -# - the address of the raw data block setup by the Linux -# kernel ELF loader -# -# - address of an "onexit" function, not used on any -# platform supported by Bionic -# -# - address of the "main" function of the program. We -# can't hard-code it in the adr pseudo instruction -# so we use a tiny trampoline that will get relocated -# by the dynamic linker before this code runs -# -# - address of the constructor list -# -_start: - mov r0, sp - mov r1, #0 - adr r2, 0f - adr r3, 1f - b __libc_init - -0: b main - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - -# the .ctors section contains a list of pointers to "constructor" -# functions that need to be called in order during C library initialization, -# just before the program is being run. This is a C++ requirement -# -# the last entry shall be 0, and is defined in crtend.S -# - .section .preinit_array, "aw" - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - - .section .ctors, "aw" - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - diff --git a/libc/arch-arm/bionic/crtbegin_static.S b/libc/arch-arm/bionic/crtbegin_static.S deleted file mode 100644 index e26592317..000000000 --- a/libc/arch-arm/bionic/crtbegin_static.S +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - .text - .align 4 - .type _start,#function - .globl _start - -# this is the small startup code that is first run when -# any executable that is statically-linked with Bionic -# runs. -# -# it's purpose is to call __libc_init with appropriate -# arguments, which are: -# -# - the address of the raw data block setup by the Linux -# kernel ELF loader -# -# - address of an "onexit" function, not used on any -# platform supported by Bionic -# -# - address of the "main" function of the program. We -# can't hard-code it in the adr pseudo instruction -# so we use a tiny trampoline that will get relocated -# by the dynamic linker before this code runs -# -# - address of the constructor list -# -_start: - mov r0, sp - mov r1, #0 - adr r2, 0f - adr r3, 1f - b __libc_init - -0: b main - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - -# the .ctors section contains a list of pointers to "constructor" -# functions that need to be called in order during C library initialization, -# just before the program is being run. This is a C++ requirement -# -# the last entry shall be 0, and is defined in crtend.S -# - .section .preinit_array, "aw" - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - - .section .ctors, "aw" - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - diff --git a/libc/arch-arm/bionic/crtend.S b/libc/arch-arm/bionic/crtend.S deleted file mode 100644 index 2f3b1ede3..000000000 --- a/libc/arch-arm/bionic/crtend.S +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - .section .preinit_array, "aw" - .long 0 - - .section .init_array, "aw" - .long 0 - - .section .fini_array, "aw" - .long 0 - - .section .ctors, "aw" - .long 0 - diff --git a/libc/arch-arm/bionic/exidx_dynamic.c b/libc/arch-arm/bionic/exidx_dynamic.c deleted file mode 100644 index 962606f87..000000000 --- a/libc/arch-arm/bionic/exidx_dynamic.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -typedef long unsigned int *_Unwind_Ptr; - -/* Stubbed out in libdl and defined in the dynamic linker. - * Same semantics as __gnu_Unwind_Find_exidx(). - */ -extern _Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr pc, int *pcount); - -/* For a given PC, find the .so that it belongs to. - * Returns the base address of the .ARM.exidx section - * for that .so, and the number of 8-byte entries - * in that section (via *pcount). - * - * libgcc declares __gnu_Unwind_Find_exidx() as a weak symbol, with - * the expectation that libc will define it and call through to - * a differently-named function in the dynamic linker. - */ -_Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr pc, int *pcount) -{ - return dl_unwind_find_exidx(pc, pcount); -} diff --git a/libc/arch-arm/bionic/exidx_static.c b/libc/arch-arm/bionic/exidx_static.c deleted file mode 100644 index e79e9516d..000000000 --- a/libc/arch-arm/bionic/exidx_static.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -typedef long unsigned int *_Unwind_Ptr; - -/* Find the .ARM.exidx section (which in the case of a static executable - * can be identified through its start and end symbols), and return its - * beginning and numbe of entries to the caller. Note that for static - * executables we do not need to use the value of the PC to find the - * EXIDX section. - */ - -extern unsigned __exidx_end; -extern unsigned __exidx_start; - -_Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr pc __attribute__((unused)), - int *pcount) -{ - *pcount = (__exidx_end-__exidx_start)/8; - return (_Unwind_Ptr)__exidx_start; -} diff --git a/libc/arch-arm/bionic/ffs.S b/libc/arch-arm/bionic/ffs.S deleted file mode 100644 index f11141c97..000000000 --- a/libc/arch-arm/bionic/ffs.S +++ /dev/null @@ -1,82 +0,0 @@ -/* $NetBSD: ffs.S,v 1.5 2003/04/05 23:08:52 bjh21 Exp $ */ -/* - * Copyright (c) 2001 Christopher Gilbert - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the company nor the name of the author may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -/* - * ffs - find first set bit, this algorithm isolates the first set - * bit, then multiplies the number by 0x0450fbaf which leaves the top - * 6 bits as an index into the table. This algorithm should be a win - * over the checking each bit in turn as per the C compiled version. - * - * under ARMv5 there's an instruction called CLZ (count leading Zero's) that - * could be used - * - * This is the ffs algorithm devised by d.seal and posted to comp.sys.arm on - * 16 Feb 1994. - */ - -ENTRY(ffs) - /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */ - rsb r1, r0, #0 - ands r0, r0, r1 -#ifndef __ARM_ARCH_5__ - /* - * now r0 has at most one set bit, call this X - * if X = 0, all further instructions are skipped - */ - adrne r2, .L_ffs_table - orrne r0, r0, r0, lsl #4 /* r0 = X * 0x11 */ - orrne r0, r0, r0, lsl #6 /* r0 = X * 0x451 */ - rsbne r0, r0, r0, lsl #16 /* r0 = X * 0x0450fbaf */ - - /* now lookup in table indexed on top 6 bits of r0 */ - ldrneb r0, [ r2, r0, lsr #26 ] - - bx lr - -.text; -.type .L_ffs_table, _ASM_TYPE_OBJECT; -.L_ffs_table: -/* 0 1 2 3 4 5 6 7 */ - .byte 0, 1, 2, 13, 3, 7, 0, 14 /* 0- 7 */ - .byte 4, 0, 8, 0, 0, 0, 0, 15 /* 8-15 */ - .byte 11, 5, 0, 0, 9, 0, 0, 26 /* 16-23 */ - .byte 0, 0, 0, 0, 0, 22, 28, 16 /* 24-31 */ - .byte 32, 12, 6, 0, 0, 0, 0, 0 /* 32-39 */ - .byte 10, 0, 0, 25, 0, 0, 21, 27 /* 40-47 */ - .byte 31, 0, 0, 0, 0, 24, 0, 20 /* 48-55 */ - .byte 30, 0, 23, 19, 29, 18, 17, 0 /* 56-63 */ -#else - clzne r0, r0 - rsbne r0, r0, #32 - bx lr -#endif - diff --git a/libc/arch-arm/bionic/kill.S b/libc/arch-arm/bionic/kill.S deleted file mode 100644 index 29540919f..000000000 --- a/libc/arch-arm/bionic/kill.S +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* unlike our auto-generated syscall stubs, this code saves lr - on the stack, as well as a few other registers. this makes - our stack unwinder happy, when we generate debug stack - traces after the C library or other parts of the system - abort due to a fatal runtime error (e.g. detection - of a corrupted malloc heap). -*/ -#include - -#ifndef __NR_kill -#define __NR_kill 37 -#endif - - .text - .type kill, #function - .globl kill - .align 4 - -kill: - stmfd sp!, {r4-r7, ip, lr} - ldr r7, =__NR_kill - swi #0 - ldmfd sp!, {r4-r7, ip, lr} - movs r0, r0 - bxpl lr - b __set_syscall_errno diff --git a/libc/arch-arm/bionic/memcmp.S b/libc/arch-arm/bionic/memcmp.S deleted file mode 100644 index f45b56bc3..000000000 --- a/libc/arch-arm/bionic/memcmp.S +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - - .text - - .global memcmp - .type memcmp, %function - .align 4 - -/* - * Optimized memcmp() for ARM9. - * This would not be optimal on XScale or ARM11, where more prefetching - * and use of PLD will be needed. - * The 2 major optimzations here are - * (1) The main loop compares 16 bytes at a time - * (2) The loads are scheduled in a way they won't stall - */ - -memcmp: - PLD (r0, #0) - PLD (r1, #0) - - /* take of the case where length is 0 or the buffers are the same */ - cmp r0, r1 - cmpne r2, #0 - moveq r0, #0 - bxeq lr - - /* save registers */ - stmfd sp!, {r4, lr} - - PLD (r0, #32) - PLD (r1, #32) - - /* since r0 hold the result, move the first source - * pointer somewhere else - */ - - mov r4, r0 - - /* make sure we have at least 8+4 bytes, this simplify things below - * and avoid some overhead for small blocks - */ - cmp r2, #(8+4) - bmi 8f - - /* align first pointer to word boundary - * offset = -src & 3 - */ - rsb r3, r4, #0 - ands r3, r3, #3 - beq 0f - - /* align first pointer */ - sub r2, r2, r3 -1: ldrb r0, [r4], #1 - ldrb ip, [r1], #1 - subs r0, r0, ip - bne 9f - subs r3, r3, #1 - bne 1b - - -0: /* here the first pointer is aligned, and we have at least 4 bytes - * to process. - */ - - /* see if the pointers are congruent */ - eor r0, r4, r1 - ands r0, r0, #3 - bne 5f - - /* congruent case, 32 bytes per iteration - * We need to make sure there are at least 32+4 bytes left - * because we effectively read ahead one word, and we could - * read past the buffer (and segfault) if we're not careful. - */ - - ldr ip, [r1] - subs r2, r2, #(32 + 4) - bmi 1f - -0: PLD (r4, #64) - PLD (r1, #64) - ldr r0, [r4], #4 - ldr lr, [r1, #4]! - eors r0, r0, ip - ldreq r0, [r4], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - ldreq r0, [r4], #4 - ldreq lr, [r1, #4]! - eoreqs r0, r0, ip - ldreq r0, [r4], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - ldreq r0, [r4], #4 - ldreq lr, [r1, #4]! - eoreqs r0, r0, ip - ldreq r0, [r4], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - ldreq r0, [r4], #4 - ldreq lr, [r1, #4]! - eoreqs r0, r0, ip - ldreq r0, [r4], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - bne 2f - subs r2, r2, #32 - bhs 0b - - /* do we have at least 4 bytes left? */ -1: adds r2, r2, #(32 - 4 + 4) - bmi 4f - - /* finish off 4 bytes at a time */ -3: ldr r0, [r4], #4 - ldr ip, [r1], #4 - eors r0, r0, ip - bne 2f - subs r2, r2, #4 - bhs 3b - - /* are we done? */ -4: adds r2, r2, #4 - moveq r0, #0 - beq 9f - - /* finish off the remaining bytes */ - b 8f - -2: /* the last 4 bytes are different, restart them */ - sub r4, r4, #4 - sub r1, r1, #4 - mov r2, #4 - - /* process the last few bytes */ -8: ldrb r0, [r4], #1 - ldrb ip, [r1], #1 - // stall - subs r0, r0, ip - bne 9f - subs r2, r2, #1 - bne 8b - -9: /* restore registers and return */ - ldmfd sp!, {r4, lr} - bx lr - - - - - -5: /*************** non-congruent case ***************/ - and r0, r1, #3 - cmp r0, #2 - bne 4f - - /* here, offset is 2 (16-bits aligned, special cased) */ - - /* make sure we have at least 16 bytes to process */ - subs r2, r2, #16 - addmi r2, r2, #16 - bmi 8b - - /* align the unaligned pointer */ - bic r1, r1, #3 - ldr lr, [r1], #4 - -6: PLD (r1, #64) - PLD (r4, #64) - mov ip, lr, lsr #16 - ldr lr, [r1], #4 - ldr r0, [r4], #4 - orr ip, ip, lr, lsl #16 - eors r0, r0, ip - moveq ip, lr, lsr #16 - ldreq lr, [r1], #4 - ldreq r0, [r4], #4 - orreq ip, ip, lr, lsl #16 - eoreqs r0, r0, ip - moveq ip, lr, lsr #16 - ldreq lr, [r1], #4 - ldreq r0, [r4], #4 - orreq ip, ip, lr, lsl #16 - eoreqs r0, r0, ip - moveq ip, lr, lsr #16 - ldreq lr, [r1], #4 - ldreq r0, [r4], #4 - orreq ip, ip, lr, lsl #16 - eoreqs r0, r0, ip - bne 7f - subs r2, r2, #16 - bhs 6b - sub r1, r1, #2 - /* are we done? */ - adds r2, r2, #16 - moveq r0, #0 - beq 9b - /* finish off the remaining bytes */ - b 8b - -7: /* fix up the 2 pointers and fallthrough... */ - sub r1, r1, #(4+2) - sub r4, r4, #4 - mov r2, #4 - b 8b - - -4: /*************** offset is 1 or 3 (less optimized) ***************/ - - stmfd sp!, {r5, r6, r7} - - // r5 = rhs - // r6 = lhs - // r7 = scratch - - mov r5, r0, lsl #3 /* r5 = right shift */ - rsb r6, r5, #32 /* r6 = left shift */ - - /* align the unaligned pointer */ - bic r1, r1, #3 - ldr r7, [r1], #4 - sub r2, r2, #8 - -6: mov ip, r7, lsr r5 - ldr r7, [r1], #4 - ldr r0, [r4], #4 - orr ip, ip, r7, lsl r6 - eors r0, r0, ip - moveq ip, r7, lsr r5 - ldreq r7, [r1], #4 - ldreq r0, [r4], #4 - orreq ip, ip, r7, lsl r6 - eoreqs r0, r0, ip - bne 7f - subs r2, r2, #8 - bhs 6b - - sub r1, r1, r6, lsr #3 - ldmfd sp!, {r5, r6, r7} - - /* are we done? */ - adds r2, r2, #8 - moveq r0, #0 - beq 9b - - /* finish off the remaining bytes */ - b 8b - -7: /* fix up the 2 pointers and fallthrough... */ - sub r1, r1, #4 - sub r1, r1, r6, lsr #3 - sub r4, r4, #4 - mov r2, #4 - ldmfd sp!, {r5, r6, r7} - b 8b diff --git a/libc/arch-arm/bionic/memcmp16.S b/libc/arch-arm/bionic/memcmp16.S deleted file mode 100644 index 38d8b6232..000000000 --- a/libc/arch-arm/bionic/memcmp16.S +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - - .text - - .global __memcmp16 - .type __memcmp16, %function - .align 4 - -/* - * Optimized memcmp16() for ARM9. - * This would not be optimal on XScale or ARM11, where more prefetching - * and use of PLD will be needed. - * The 2 major optimzations here are - * (1) The main loop compares 16 bytes at a time - * (2) The loads are scheduled in a way they won't stall - */ - -__memcmp16: - PLD (r0, #0) - PLD (r1, #0) - - /* take of the case where length is nul or the buffers are the same */ - cmp r0, r1 - cmpne r2, #0 - moveq r0, #0 - bxeq lr - - /* since r0 hold the result, move the first source - * pointer somewhere else - */ - - mov r3, r0 - - /* make sure we have at least 12 words, this simplify things below - * and avoid some overhead for small blocks - */ - - cmp r2, #12 - bpl 0f - - /* small blocks (less then 12 words) */ - PLD (r0, #32) - PLD (r1, #32) - -1: ldrh r0, [r3], #2 - ldrh ip, [r1], #2 - subs r0, r0, ip - bxne lr - subs r2, r2, #1 - bne 1b - bx lr - - - /* save registers */ -0: stmfd sp!, {r4, lr} - - /* align first pointer to word boundary */ - tst r3, #2 - beq 0f - - ldrh r0, [r3], #2 - ldrh ip, [r1], #2 - sub r2, r2, #1 - subs r0, r0, ip - /* restore registers and return */ - ldmnefd sp!, {r4, lr} - bxne lr - - - -0: /* here the first pointer is aligned, and we have at least 3 words - * to process. - */ - - /* see if the pointers are congruent */ - eor r0, r3, r1 - ands r0, r0, #2 - bne 5f - - /* congruent case, 16 half-words per iteration - * We need to make sure there are at least 16+2 words left - * because we effectively read ahead one long word, and we could - * read past the buffer (and segfault) if we're not careful. - */ - - ldr ip, [r1] - subs r2, r2, #(16 + 2) - bmi 1f - -0: - PLD (r3, #64) - PLD (r1, #64) - ldr r0, [r3], #4 - ldr lr, [r1, #4]! - eors r0, r0, ip - ldreq r0, [r3], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - ldreq r0, [r3], #4 - ldreq lr, [r1, #4]! - eoreqs r0, r0, ip - ldreq r0, [r3], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - ldreq r0, [r3], #4 - ldreq lr, [r1, #4]! - eoreqs r0, r0, ip - ldreq r0, [r3], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - ldreq r0, [r3], #4 - ldreq lr, [r1, #4]! - eoreqs r0, r0, ip - ldreq r0, [r3], #4 - ldreq ip, [r1, #4]! - eoreqs r0, r0, lr - bne 2f - subs r2, r2, #16 - bhs 0b - - /* do we have at least 2 words left? */ -1: adds r2, r2, #(16 - 2 + 2) - bmi 4f - - /* finish off 2 words at a time */ -3: ldr r0, [r3], #4 - ldr ip, [r1], #4 - eors r0, r0, ip - bne 2f - subs r2, r2, #2 - bhs 3b - - /* are we done? */ -4: adds r2, r2, #2 - bne 8f - /* restore registers and return */ - mov r0, #0 - ldmfd sp!, {r4, lr} - bx lr - -2: /* the last 2 words are different, restart them */ - ldrh r0, [r3, #-4] - ldrh ip, [r1, #-4] - subs r0, r0, ip - ldreqh r0, [r3, #-2] - ldreqh ip, [r1, #-2] - subeqs r0, r0, ip - /* restore registers and return */ - ldmfd sp!, {r4, lr} - bx lr - - /* process the last few words */ -8: ldrh r0, [r3], #2 - ldrh ip, [r1], #2 - subs r0, r0, ip - bne 9f - subs r2, r2, #1 - bne 8b - -9: /* restore registers and return */ - ldmfd sp!, {r4, lr} - bx lr - - -5: /*************** non-congruent case ***************/ - - /* align the unaligned pointer */ - bic r1, r1, #3 - ldr lr, [r1], #4 - sub r2, r2, #8 - -6: - PLD (r3, #64) - PLD (r1, #64) - mov ip, lr, lsr #16 - ldr lr, [r1], #4 - ldr r0, [r3], #4 - orr ip, ip, lr, lsl #16 - eors r0, r0, ip - moveq ip, lr, lsr #16 - ldreq lr, [r1], #4 - ldreq r0, [r3], #4 - orreq ip, ip, lr, lsl #16 - eoreqs r0, r0, ip - moveq ip, lr, lsr #16 - ldreq lr, [r1], #4 - ldreq r0, [r3], #4 - orreq ip, ip, lr, lsl #16 - eoreqs r0, r0, ip - moveq ip, lr, lsr #16 - ldreq lr, [r1], #4 - ldreq r0, [r3], #4 - orreq ip, ip, lr, lsl #16 - eoreqs r0, r0, ip - bne 7f - subs r2, r2, #8 - bhs 6b - sub r1, r1, #2 - /* are we done? */ - adds r2, r2, #8 - moveq r0, #0 - beq 9b - /* finish off the remaining bytes */ - b 8b - -7: /* fix up the 2 pointers and fallthrough... */ - sub r1, r1, #2 - b 2b diff --git a/libc/arch-arm/bionic/memcpy.S b/libc/arch-arm/bionic/memcpy.S deleted file mode 100644 index fcb58cd19..000000000 --- a/libc/arch-arm/bionic/memcpy.S +++ /dev/null @@ -1,387 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - - .text - - .global memcpy - .type memcpy, %function - .align 4 - - /* - * Optimized memcpy() for ARM. - * - * note that memcpy() always returns the destination pointer, - * so we have to preserve R0. - */ - -memcpy: - /* The stack must always be 64-bits aligned to be compliant with the - * ARM ABI. Since we have to save R0, we might as well save R4 - * which we can use for better pipelining of the reads below - */ - .fnstart - .save {r0, r4, lr} - stmfd sp!, {r0, r4, lr} - /* Making room for r5-r11 which will be spilled later */ - .pad #28 - sub sp, sp, #28 - - // preload the destination because we'll align it to a cache line - // with small writes. Also start the source "pump". - PLD (r0, #0) - PLD (r1, #0) - PLD (r1, #32) - - /* it simplifies things to take care of len<4 early */ - cmp r2, #4 - blo copy_last_3_and_return - - /* compute the offset to align the source - * offset = (4-(src&3))&3 = -src & 3 - */ - rsb r3, r1, #0 - ands r3, r3, #3 - beq src_aligned - - /* align source to 32 bits. We need to insert 2 instructions between - * a ldr[b|h] and str[b|h] because byte and half-word instructions - * stall 2 cycles. - */ - movs r12, r3, lsl #31 - sub r2, r2, r3 /* we know that r3 <= r2 because r2 >= 4 */ - ldrmib r3, [r1], #1 - ldrcsb r4, [r1], #1 - ldrcsb r12,[r1], #1 - strmib r3, [r0], #1 - strcsb r4, [r0], #1 - strcsb r12,[r0], #1 - -src_aligned: - - /* see if src and dst are aligned together (congruent) */ - eor r12, r0, r1 - tst r12, #3 - bne non_congruent - - /* Use post-incriment mode for stm to spill r5-r11 to reserved stack - * frame. Don't update sp. - */ - stmea sp, {r5-r11} - - /* align the destination to a cache-line */ - rsb r3, r0, #0 - ands r3, r3, #0x1C - beq congruent_aligned32 - cmp r3, r2 - andhi r3, r2, #0x1C - - /* conditionnaly copies 0 to 7 words (length in r3) */ - movs r12, r3, lsl #28 - ldmcsia r1!, {r4, r5, r6, r7} /* 16 bytes */ - ldmmiia r1!, {r8, r9} /* 8 bytes */ - stmcsia r0!, {r4, r5, r6, r7} - stmmiia r0!, {r8, r9} - tst r3, #0x4 - ldrne r10,[r1], #4 /* 4 bytes */ - strne r10,[r0], #4 - sub r2, r2, r3 - -congruent_aligned32: - /* - * here source is aligned to 32 bytes. - */ - -cached_aligned32: - subs r2, r2, #32 - blo less_than_32_left - - /* - * We preload a cache-line up to 64 bytes ahead. On the 926, this will - * stall only until the requested world is fetched, but the linefill - * continues in the the background. - * While the linefill is going, we write our previous cache-line - * into the write-buffer (which should have some free space). - * When the linefill is done, the writebuffer will - * start dumping its content into memory - * - * While all this is going, we then load a full cache line into - * 8 registers, this cache line should be in the cache by now - * (or partly in the cache). - * - * This code should work well regardless of the source/dest alignment. - * - */ - - // Align the preload register to a cache-line because the cpu does - // "critical word first" (the first word requested is loaded first). - bic r12, r1, #0x1F - add r12, r12, #64 - -1: ldmia r1!, { r4-r11 } - PLD (r12, #64) - subs r2, r2, #32 - - // NOTE: if r12 is more than 64 ahead of r1, the following ldrhi - // for ARM9 preload will not be safely guarded by the preceding subs. - // When it is safely guarded the only possibility to have SIGSEGV here - // is because the caller overstates the length. - ldrhi r3, [r12], #32 /* cheap ARM9 preload */ - stmia r0!, { r4-r11 } - bhs 1b - - add r2, r2, #32 - - - - -less_than_32_left: - /* - * less than 32 bytes left at this point (length in r2) - */ - - /* skip all this if there is nothing to do, which should - * be a common case (if not executed the code below takes - * about 16 cycles) - */ - tst r2, #0x1F - beq 1f - - /* conditionnaly copies 0 to 31 bytes */ - movs r12, r2, lsl #28 - ldmcsia r1!, {r4, r5, r6, r7} /* 16 bytes */ - ldmmiia r1!, {r8, r9} /* 8 bytes */ - stmcsia r0!, {r4, r5, r6, r7} - stmmiia r0!, {r8, r9} - movs r12, r2, lsl #30 - ldrcs r3, [r1], #4 /* 4 bytes */ - ldrmih r4, [r1], #2 /* 2 bytes */ - strcs r3, [r0], #4 - strmih r4, [r0], #2 - tst r2, #0x1 - ldrneb r3, [r1] /* last byte */ - strneb r3, [r0] - - /* we're done! restore everything and return */ -1: ldmfd sp!, {r5-r11} - ldmfd sp!, {r0, r4, lr} - bx lr - - /********************************************************************/ - -non_congruent: - /* - * here source is aligned to 4 bytes - * but destination is not. - * - * in the code below r2 is the number of bytes read - * (the number of bytes written is always smaller, because we have - * partial words in the shift queue) - */ - cmp r2, #4 - blo copy_last_3_and_return - - /* Use post-incriment mode for stm to spill r5-r11 to reserved stack - * frame. Don't update sp. - */ - stmea sp, {r5-r11} - - /* compute shifts needed to align src to dest */ - rsb r5, r0, #0 - and r5, r5, #3 /* r5 = # bytes in partial words */ - mov r12, r5, lsl #3 /* r12 = right */ - rsb lr, r12, #32 /* lr = left */ - - /* read the first word */ - ldr r3, [r1], #4 - sub r2, r2, #4 - - /* write a partial word (0 to 3 bytes), such that destination - * becomes aligned to 32 bits (r5 = nb of words to copy for alignment) - */ - movs r5, r5, lsl #31 - strmib r3, [r0], #1 - movmi r3, r3, lsr #8 - strcsb r3, [r0], #1 - movcs r3, r3, lsr #8 - strcsb r3, [r0], #1 - movcs r3, r3, lsr #8 - - cmp r2, #4 - blo partial_word_tail - - /* Align destination to 32 bytes (cache line boundary) */ -1: tst r0, #0x1c - beq 2f - ldr r5, [r1], #4 - sub r2, r2, #4 - orr r4, r3, r5, lsl lr - mov r3, r5, lsr r12 - str r4, [r0], #4 - cmp r2, #4 - bhs 1b - blo partial_word_tail - - /* copy 32 bytes at a time */ -2: subs r2, r2, #32 - blo less_than_thirtytwo - - /* Use immediate mode for the shifts, because there is an extra cycle - * for register shifts, which could account for up to 50% of - * performance hit. - */ - - cmp r12, #24 - beq loop24 - cmp r12, #8 - beq loop8 - -loop16: - ldr r12, [r1], #4 -1: mov r4, r12 - ldmia r1!, { r5,r6,r7, r8,r9,r10,r11} - PLD (r1, #64) - subs r2, r2, #32 - ldrhs r12, [r1], #4 - orr r3, r3, r4, lsl #16 - mov r4, r4, lsr #16 - orr r4, r4, r5, lsl #16 - mov r5, r5, lsr #16 - orr r5, r5, r6, lsl #16 - mov r6, r6, lsr #16 - orr r6, r6, r7, lsl #16 - mov r7, r7, lsr #16 - orr r7, r7, r8, lsl #16 - mov r8, r8, lsr #16 - orr r8, r8, r9, lsl #16 - mov r9, r9, lsr #16 - orr r9, r9, r10, lsl #16 - mov r10, r10, lsr #16 - orr r10, r10, r11, lsl #16 - stmia r0!, {r3,r4,r5,r6, r7,r8,r9,r10} - mov r3, r11, lsr #16 - bhs 1b - b less_than_thirtytwo - -loop8: - ldr r12, [r1], #4 -1: mov r4, r12 - ldmia r1!, { r5,r6,r7, r8,r9,r10,r11} - PLD (r1, #64) - subs r2, r2, #32 - ldrhs r12, [r1], #4 - orr r3, r3, r4, lsl #24 - mov r4, r4, lsr #8 - orr r4, r4, r5, lsl #24 - mov r5, r5, lsr #8 - orr r5, r5, r6, lsl #24 - mov r6, r6, lsr #8 - orr r6, r6, r7, lsl #24 - mov r7, r7, lsr #8 - orr r7, r7, r8, lsl #24 - mov r8, r8, lsr #8 - orr r8, r8, r9, lsl #24 - mov r9, r9, lsr #8 - orr r9, r9, r10, lsl #24 - mov r10, r10, lsr #8 - orr r10, r10, r11, lsl #24 - stmia r0!, {r3,r4,r5,r6, r7,r8,r9,r10} - mov r3, r11, lsr #8 - bhs 1b - b less_than_thirtytwo - -loop24: - ldr r12, [r1], #4 -1: mov r4, r12 - ldmia r1!, { r5,r6,r7, r8,r9,r10,r11} - PLD (r1, #64) - subs r2, r2, #32 - ldrhs r12, [r1], #4 - orr r3, r3, r4, lsl #8 - mov r4, r4, lsr #24 - orr r4, r4, r5, lsl #8 - mov r5, r5, lsr #24 - orr r5, r5, r6, lsl #8 - mov r6, r6, lsr #24 - orr r6, r6, r7, lsl #8 - mov r7, r7, lsr #24 - orr r7, r7, r8, lsl #8 - mov r8, r8, lsr #24 - orr r8, r8, r9, lsl #8 - mov r9, r9, lsr #24 - orr r9, r9, r10, lsl #8 - mov r10, r10, lsr #24 - orr r10, r10, r11, lsl #8 - stmia r0!, {r3,r4,r5,r6, r7,r8,r9,r10} - mov r3, r11, lsr #24 - bhs 1b - - -less_than_thirtytwo: - /* copy the last 0 to 31 bytes of the source */ - rsb r12, lr, #32 /* we corrupted r12, recompute it */ - add r2, r2, #32 - cmp r2, #4 - blo partial_word_tail - -1: ldr r5, [r1], #4 - sub r2, r2, #4 - orr r4, r3, r5, lsl lr - mov r3, r5, lsr r12 - str r4, [r0], #4 - cmp r2, #4 - bhs 1b - -partial_word_tail: - /* we have a partial word in the input buffer */ - movs r5, lr, lsl #(31-3) - strmib r3, [r0], #1 - movmi r3, r3, lsr #8 - strcsb r3, [r0], #1 - movcs r3, r3, lsr #8 - strcsb r3, [r0], #1 - - /* Refill spilled registers from the stack. Don't update sp. */ - ldmfd sp, {r5-r11} - -copy_last_3_and_return: - movs r2, r2, lsl #31 /* copy remaining 0, 1, 2 or 3 bytes */ - ldrmib r2, [r1], #1 - ldrcsb r3, [r1], #1 - ldrcsb r12,[r1] - strmib r2, [r0], #1 - strcsb r3, [r0], #1 - strcsb r12,[r0] - - /* we're done! restore sp and spilled registers and return */ - add sp, sp, #28 - ldmfd sp!, {r0, r4, lr} - bx lr - .fnend - diff --git a/libc/arch-arm/bionic/memset.S b/libc/arch-arm/bionic/memset.S deleted file mode 100644 index d52d6224b..000000000 --- a/libc/arch-arm/bionic/memset.S +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - .text - - .global memset - .type memset, %function - - .global bzero - .type bzero, %function - - .align - - /* - * Optimized memset() for ARM. - * - * memset() returns its first argument. - */ - -bzero: - mov r2, r1 - mov r1, #0 - -memset: - /* compute the offset to align the destination - * offset = (4-(src&3))&3 = -src & 3 - */ - .fnstart - .save {r0, r4-r7, lr} - stmfd sp!, {r0, r4-r7, lr} - rsb r3, r0, #0 - ands r3, r3, #3 - cmp r3, r2 - movhi r3, r2 - - /* splat r1 */ - mov r1, r1, lsl #24 - orr r1, r1, r1, lsr #8 - orr r1, r1, r1, lsr #16 - - movs r12, r3, lsl #31 - strcsb r1, [r0], #1 /* can't use strh (alignment unknown) */ - strcsb r1, [r0], #1 - strmib r1, [r0], #1 - subs r2, r2, r3 - ldmlsfd sp!, {r0, r4-r7, lr} /* return */ - bxls lr - - /* align the destination to a cache-line */ - mov r12, r1 - mov lr, r1 - mov r4, r1 - mov r5, r1 - mov r6, r1 - mov r7, r1 - - rsb r3, r0, #0 - ands r3, r3, #0x1C - beq aligned32 - cmp r3, r2 - andhi r3, r2, #0x1C - sub r2, r2, r3 - - /* conditionnaly writes 0 to 7 words (length in r3) */ - movs r3, r3, lsl #28 - stmcsia r0!, {r1, lr} - stmcsia r0!, {r1, lr} - stmmiia r0!, {r1, lr} - movs r3, r3, lsl #2 - strcs r1, [r0], #4 - -aligned32: - subs r2, r2, #32 - mov r3, r1 - bmi 2f -1: subs r2, r2, #32 - stmia r0!, {r1,r3,r4,r5,r6,r7,r12,lr} - bhs 1b -2: add r2, r2, #32 - - /* conditionnaly stores 0 to 31 bytes */ - movs r2, r2, lsl #28 - stmcsia r0!, {r1,r3,r12,lr} - stmmiia r0!, {r1, lr} - movs r2, r2, lsl #2 - strcs r1, [r0], #4 - strmih r1, [r0], #2 - movs r2, r2, lsl #2 - strcsb r1, [r0] - ldmfd sp!, {r0, r4-r7, lr} - bx lr - .fnend - diff --git a/libc/arch-arm/bionic/setjmp.S b/libc/arch-arm/bionic/setjmp.S deleted file mode 100644 index a9f6ea4c1..000000000 --- a/libc/arch-arm/bionic/setjmp.S +++ /dev/null @@ -1,136 +0,0 @@ -/* $OpenBSD: setjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */ -/* $NetBSD: setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $ */ - -/* - * Copyright (c) 1997 Mark Brinicombe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Brinicombe - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -/* - * C library -- setjmp, longjmp - * - * longjmp(a,v) - * will generate a "return(v)" from the last call to - * setjmp(a) - * by restoring registers from the stack. - * The previous signal state is restored. - */ - -ENTRY(setjmp) - /* Block all signals and retrieve the old signal mask */ - stmfd sp!, {r0, r14} - mov r0, #0x00000000 - - bl PIC_SYM(_C_LABEL(sigblock), PLT) - mov r1, r0 - - ldmfd sp!, {r0, r14} - - /* Store signal mask */ - str r1, [r0, #(25 * 4)] - - ldr r1, .Lsetjmp_magic - str r1, [r0], #4 - -#ifdef SOFTFLOAT - add r0, r0, #52 -#else - /* Store fp registers */ - sfm f4, 4, [r0], #48 - /* Store fpsr */ - rfs r1 - str r1, [r0], #0x0004 -#endif /*SOFTFLOAT*/ - /* Store integer registers */ - stmia r0, {r4-r14} - mov r0, #0x00000000 - bx lr - -.Lsetjmp_magic: - .word _JB_MAGIC_SETJMP - - -ENTRY(longjmp) - ldr r2, .Lsetjmp_magic - ldr r3, [r0] - teq r2, r3 - bne botch - - /* Fetch signal mask */ - ldr r2, [r0, #(25 * 4)] - - /* Set signal mask */ - stmfd sp!, {r0, r1, r14} - sub sp, sp, #4 /* align the stack */ - - mov r0, r2 - bl PIC_SYM(_C_LABEL(sigsetmask), PLT) - - add sp, sp, #4 /* unalign the stack */ - ldmfd sp!, {r0, r1, r14} - - add r0, r0, #4 -#ifdef SOFTFLOAT - add r0, r0, #52 -#else - /* Restore fp registers */ - lfm f4, 4, [r0], #48 - /* Restore FPSR */ - ldr r4, [r0], #0x0004 - wfs r4 -#endif /* SOFTFLOAT */ - /* Restore integer registers */ - ldmia r0, {r4-r14} - - /* Validate sp and r14 */ - teq sp, #0 - teqne r14, #0 - beq botch - - /* Set return value */ - - mov r0, r1 - teq r0, #0x00000000 - moveq r0, #0x00000001 - bx lr -#ifdef __ARM_26__ - mov r15, r14 -#else - mov r15, r14 -#endif - - /* validation failed, die die die. */ -botch: - bl PIC_SYM(_C_LABEL(longjmperror), PLT) - bl PIC_SYM(_C_LABEL(abort), PLT) - b . - 8 /* Cannot get here */ diff --git a/libc/arch-arm/bionic/sigsetjmp.S b/libc/arch-arm/bionic/sigsetjmp.S deleted file mode 100644 index 50e642979..000000000 --- a/libc/arch-arm/bionic/sigsetjmp.S +++ /dev/null @@ -1,62 +0,0 @@ -/* $OpenBSD: sigsetjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */ -/* $NetBSD: sigsetjmp.S,v 1.3 2002/08/17 19:54:30 thorpej Exp $ */ - -/* - * Copyright (c) 1997 Mark Brinicombe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Brinicombe - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -/* - * C library -- sigsetjmp, siglongjmp - * - * longjmp(a,v) - * will generate a "return(v)" from the last call to - * setjmp(a, m) - * by restoring registers from the stack. - * The previous signal state is restored. - */ - -ENTRY(sigsetjmp) - teq r1, #0 - beq PIC_SYM(_C_LABEL(_setjmp), PLT) - b PIC_SYM(_C_LABEL(setjmp), PLT) - -.L_setjmp_magic: - .word _JB_MAGIC__SETJMP - -ENTRY(siglongjmp) - ldr r2, .L_setjmp_magic - ldr r3, [r0] - teq r2, r3 - beq PIC_SYM(_C_LABEL(_longjmp), PLT) - b PIC_SYM(_C_LABEL(longjmp), PLT) diff --git a/libc/arch-arm/bionic/strlen.c b/libc/arch-arm/bionic/strlen.c deleted file mode 100644 index 01632e33d..000000000 --- a/libc/arch-arm/bionic/strlen.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include - -size_t strlen(const char *s) -{ - __builtin_prefetch(s); - __builtin_prefetch(s+32); - - union { - const char *b; - const uint32_t *w; - uintptr_t i; - } u; - - // these are some scratch variables for the asm code below - uint32_t v, t; - - // initialize the string length to zero - size_t l = 0; - - // align the pointer to a 32-bit word boundary - u.b = s; - while (u.i & 0x3) { - if (__builtin_expect(*u.b++ == 0, 0)) { - goto done; - } - l++; - } - - // loop for each word, testing if it contains a zero byte - // if so, exit the loop and update the length. - // We need to process 32 bytes per loop to schedule PLD properly - // and achieve the maximum bus speed. - asm( - "ldr %[v], [ %[s] ], #4 \n" - "sub %[l], %[l], %[s] \n" - "0: \n" -#if __ARM_HAVE_PLD - "pld [ %[s], #64 ] \n" -#endif - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" -#if !defined(__OPTIMIZE_SIZE__) - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" - "bne 1f \n" - "sub %[t], %[v], %[mask], lsr #7\n" - "and %[t], %[t], %[mask] \n" - "bics %[t], %[t], %[v] \n" - "ldreq %[v], [ %[s] ], #4 \n" -#endif - "beq 0b \n" - "1: \n" - "add %[l], %[l], %[s] \n" - "tst %[v], #0xFF \n" - "beq 2f \n" - "add %[l], %[l], #1 \n" - "tst %[v], #0xFF00 \n" - "beq 2f \n" - "add %[l], %[l], #1 \n" - "tst %[v], #0xFF0000 \n" - "addne %[l], %[l], #1 \n" - "2: \n" - : [l]"=&r"(l), [v]"=&r"(v), [t]"=&r"(t), [s]"=&r"(u.b) - : "%[l]"(l), "%[s]"(u.b), [mask]"r"(0x80808080UL) - : "cc" - ); - -done: - return l; -} diff --git a/libc/arch-arm/bionic/syscall.S b/libc/arch-arm/bionic/syscall.S deleted file mode 100644 index ada12a652..000000000 --- a/libc/arch-arm/bionic/syscall.S +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - - - .text - .align 4 - .type syscall,#function - .globl syscall - - .text - .align - -#if __ARM_EABI__ - -syscall: - mov ip, sp - stmfd sp!, {r4, r5, r6, r7} - mov r7, r0 - mov r0, r1 - mov r1, r2 - mov r2, r3 - ldmfd ip, {r3, r4, r5, r6} - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - -#else - -#ifndef __NR_syscall -#define __NR_syscall 113 -#endif - -syscall: - stmfd sp!, {r4, r5, lr} - ldr r4, [sp, #12] - ldr r5, [sp, #16] - swi __NR_syscall - ldmfd sp!, {r4, r5, lr} - movs r0, r0 - bxpl lr - b __set_syscall_errno - -#endif diff --git a/libc/arch-arm/bionic/tkill.S b/libc/arch-arm/bionic/tkill.S deleted file mode 100644 index 7b3301a02..000000000 --- a/libc/arch-arm/bionic/tkill.S +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* unlike our auto-generated syscall stubs, this code saves lr - on the stack, as well as a few other registers. this makes - our stack unwinder happy, when we generate debug stack - traces after the C library or other parts of the system - abort due to a fatal runtime error (e.g. detection - of a corrupted malloc heap). -*/ -#include - -#ifndef __NR_tkill -#define __NR_tkill 238 -#endif - - .text - .type tkill, #function - .globl tkill - .align 4 - -tkill: - stmfd sp!, {r4-r7, ip, lr} - ldr r7, =__NR_tkill - swi #0 - ldmfd sp!, {r4-r7, ip, lr} - movs r0, r0 - bxpl lr - b __set_syscall_errno diff --git a/libc/arch-arm/include/endian.h b/libc/arch-arm/include/endian.h deleted file mode 100644 index 04204ed4c..000000000 --- a/libc/arch-arm/include/endian.h +++ /dev/null @@ -1,10 +0,0 @@ -/* $OpenBSD: endian.h,v 1.3 2005/12/13 00:35:23 millert Exp $ */ - -#ifdef __ARMEB__ -#define _BYTE_ORDER _BIG_ENDIAN -#else -#define _BYTE_ORDER _LITTLE_ENDIAN -#endif -#define __STRICT_ALIGNMENT -#include -#include diff --git a/libc/arch-arm/include/machine/_types.h b/libc/arch-arm/include/machine/_types.h deleted file mode 100644 index 6d10e12b4..000000000 --- a/libc/arch-arm/include/machine/_types.h +++ /dev/null @@ -1,127 +0,0 @@ -/* $OpenBSD: _types.h,v 1.3 2006/02/14 18:12:58 miod Exp $ */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)types.h 8.3 (Berkeley) 1/5/94 - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _ARM__TYPES_H_ -#define _ARM__TYPES_H_ - - -#if !defined(__ARM_EABI__) -/* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ -#define _SIZE_T -#define _SSIZE_T -#define _PTRDIFF_T -typedef unsigned long size_t; -typedef long ssize_t; -typedef long ptrdiff_t; -#endif - -//#include - -/* 7.18.1.1 Exact-width integer types */ -typedef __signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short __int16_t; -typedef unsigned short __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; -/* LONGLONG */ -typedef long long __int64_t; -/* LONGLONG */ -typedef unsigned long long __uint64_t; - -/* 7.18.1.2 Minimum-width integer types */ -typedef __int8_t __int_least8_t; -typedef __uint8_t __uint_least8_t; -typedef __int16_t __int_least16_t; -typedef __uint16_t __uint_least16_t; -typedef __int32_t __int_least32_t; -typedef __uint32_t __uint_least32_t; -typedef __int64_t __int_least64_t; -typedef __uint64_t __uint_least64_t; - -/* 7.18.1.3 Fastest minimum-width integer types */ -typedef __int32_t __int_fast8_t; -typedef __uint32_t __uint_fast8_t; -typedef __int32_t __int_fast16_t; -typedef __uint32_t __uint_fast16_t; -typedef __int32_t __int_fast32_t; -typedef __uint32_t __uint_fast32_t; -typedef __int64_t __int_fast64_t; -typedef __uint64_t __uint_fast64_t; - -/* 7.18.1.4 Integer types capable of holding object pointers */ -typedef int __intptr_t; -typedef unsigned int __uintptr_t; - -/* 7.18.1.5 Greatest-width integer types */ -typedef __int64_t __intmax_t; -typedef __uint64_t __uintmax_t; - -/* Register size */ -typedef __int32_t __register_t; - -/* VM system types */ -typedef unsigned long __vaddr_t; -typedef unsigned long __paddr_t; -typedef unsigned long __vsize_t; -typedef unsigned long __psize_t; - -/* Standard system types */ -typedef int __clock_t; -typedef int __clockid_t; -typedef long __ptrdiff_t; -typedef int __time_t; -typedef int __timer_t; -#if defined(__GNUC__) && __GNUC__ >= 3 -typedef __builtin_va_list __va_list; -#else -typedef char * __va_list; -#endif - -/* Wide character support types */ -#ifndef __cplusplus -typedef int __wchar_t; -#endif -typedef int __wint_t; -typedef int __rune_t; -typedef void * __wctrans_t; -typedef void * __wctype_t; - -#ifdef __ARMEB__ -#define _BYTE_ORDER _BIG_ENDIAN -#else -#define _BYTE_ORDER _LITTLE_ENDIAN -#endif - -#endif /* _ARM__TYPES_H_ */ diff --git a/libc/arch-arm/include/machine/asm.h b/libc/arch-arm/include/machine/asm.h deleted file mode 100644 index c7bd017aa..000000000 --- a/libc/arch-arm/include/machine/asm.h +++ /dev/null @@ -1,130 +0,0 @@ -/* $OpenBSD: asm.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ -/* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */ - -/* - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 - */ - -#ifndef _ARM32_ASM_H_ -#define _ARM32_ASM_H_ - -#ifdef __ELF__ -# define _C_LABEL(x) x -#else -# ifdef __STDC__ -# define _C_LABEL(x) _ ## x -# else -# define _C_LABEL(x) _/**/x -# endif -#endif -#define _ASM_LABEL(x) x - -#ifdef __STDC__ -# define __CONCAT(x,y) x ## y -# define __STRING(x) #x -#else -# define __CONCAT(x,y) x/**/y -# define __STRING(x) "x" -#endif - -#ifndef _ALIGN_TEXT -# define _ALIGN_TEXT .align 0 -#endif - -/* - * gas/arm uses @ as a single comment character and thus cannot be used here - * Instead it recognised the # instead of an @ symbols in .type directives - * We define a couple of macros so that assembly code will not be dependant - * on one or the other. - */ -#define _ASM_TYPE_FUNCTION #function -#define _ASM_TYPE_OBJECT #object -#define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: - -#ifdef GPROF -# ifdef __ELF__ -# define _PROF_PROLOGUE \ - mov ip, lr; bl __mcount -# else -# define _PROF_PROLOGUE \ - mov ip,lr; bl mcount -# endif -#else -# define _PROF_PROLOGUE -#endif - -#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE -#define ENTRY_NP(y) _ENTRY(_C_LABEL(y)) -#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE -#define ASENTRY_NP(y) _ENTRY(_ASM_LABEL(y)) - -#define ASMSTR .asciz - -#if defined(__ELF__) && defined(PIC) -#ifdef __STDC__ -#define PIC_SYM(x,y) x ## ( ## y ## ) -#else -#define PIC_SYM(x,y) x/**/(/**/y/**/) -#endif -#else -#define PIC_SYM(x,y) x -#endif - -#ifdef __ELF__ -#define RCSID(x) .section ".ident"; .asciz x -#else -#define RCSID(x) .text; .asciz x -#endif - -#ifdef __ELF__ -#define WEAK_ALIAS(alias,sym) \ - .weak alias; \ - alias = sym -#endif - -#ifdef __STDC__ -#define WARN_REFERENCES(sym,msg) \ - .stabs msg ## ,30,0,0,0 ; \ - .stabs __STRING(_C_LABEL(sym)) ## ,1,0,0,0 -#elif defined(__ELF__) -#define WARN_REFERENCES(sym,msg) \ - .stabs msg,30,0,0,0 ; \ - .stabs __STRING(sym),1,0,0,0 -#else -#define WARN_REFERENCES(sym,msg) \ - .stabs msg,30,0,0,0 ; \ - .stabs __STRING(_/**/sym),1,0,0,0 -#endif /* __STDC__ */ - -#endif /* !_ARM_ASM_H_ */ diff --git a/libc/arch-arm/include/machine/cdefs.h b/libc/arch-arm/include/machine/cdefs.h deleted file mode 100644 index 44f1542d6..000000000 --- a/libc/arch-arm/include/machine/cdefs.h +++ /dev/null @@ -1,19 +0,0 @@ -/* $OpenBSD: cdefs.h,v 1.2 2005/11/24 20:46:44 deraadt Exp $ */ - -#ifndef _MACHINE_CDEFS_H_ -#define _MACHINE_CDEFS_H_ - -#if defined(lint) -#define __indr_reference(sym,alias) __lint_equal__(sym,alias) -#define __warn_references(sym,msg) -#define __weak_alias(alias,sym) __lint_equal__(sym,alias) -#elif defined(__GNUC__) && defined(__STDC__) -#define __weak_alias(alias,sym) \ - __asm__(".weak " __STRING(alias) " ; " __STRING(alias) \ - " = " __STRING(sym)); -#define __warn_references(sym,msg) \ - __asm__(".section .gnu.warning." __STRING(sym) \ - " ; .ascii \"" msg "\" ; .text"); -#endif - -#endif /* !_MACHINE_CDEFS_H_ */ diff --git a/libc/arch-arm/include/machine/cpu-features.h b/libc/arch-arm/include/machine/cpu-features.h deleted file mode 100644 index f83600648..000000000 --- a/libc/arch-arm/include/machine/cpu-features.h +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ARM_MACHINE_CPU_FEATURES_H -#define _ARM_MACHINE_CPU_FEATURES_H - -/* The purpose of this file is to define several macros corresponding - * to CPU features that may or may not be available at build time on - * on the target CPU. - * - * This is done to abstract us from the various ARM Architecture - * quirks and alphabet soup. - * - * IMPORTANT: We have no intention to support anything below an ARMv4T ! - */ - -/* _ARM_ARCH_REVISION is a number corresponding to the ARM revision - * we're going to support - * - * it looks like our toolchain doesn't define __ARM_ARCH__ - * so try to guess it. - * - * - * - */ -#ifndef __ARM_ARCH__ - -# if defined __ARM_ARCH_7__ || defined __ARM_ARCH_7A__ || \ - defined __ARM_ARCH_7R__ || defined __ARM_ARCH_7M__ - -# define __ARM_ARCH__ 7 - -# elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ || \ - defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6Z__ || \ - defined __ARM_ARCH_6KZ__ || defined __ARM_ARCH_6T2__ -# -# define __ARM_ARCH__ 6 -# -# elif defined __ARM_ARCH_5__ || defined __ARM_ARCH_5T__ || \ - defined __ARM_ARCH_5TE__ || defined __ARM_ARCH_5TEJ__ -# -# define __ARM_ARCH__ 5 -# -# elif defined __ARM_ARCH_4T__ -# -# define __ARM_ARCH__ 4 -# -# elif defined __ARM_ARCH_4__ -# error ARMv4 is not supported, please use ARMv4T at a minimum -# else -# error Unknown or unsupported ARM architecture -# endif -#endif - -/* experimental feature used to check that our ARMv4 workarounds - * work correctly without a real ARMv4 machine */ -#ifdef BIONIC_EXPERIMENTAL_FORCE_ARMV4 -# undef __ARM_ARCH__ -# define __ARM_ARCH__ 4 -#endif - -/* define __ARM_HAVE_5TE if we have the ARMv5TE instructions */ -#if __ARM_ARCH__ > 5 -# define __ARM_HAVE_5TE 1 -#elif __ARM_ARCH__ == 5 -# if defined __ARM_ARCH_5TE__ || defined __ARM_ARCH_5TEJ__ -# define __ARM_HAVE_5TE 1 -# endif -#endif - -/* instructions introduced in ARMv5 */ -#if __ARM_ARCH__ >= 5 -# define __ARM_HAVE_BLX 1 -# define __ARM_HAVE_CLZ 1 -# define __ARM_HAVE_LDC2 1 -# define __ARM_HAVE_MCR2 1 -# define __ARM_HAVE_MRC2 1 -# define __ARM_HAVE_STC2 1 -#endif - -/* ARMv5TE introduces a few instructions */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_PLD 1 -# define __ARM_HAVE_MCRR 1 -# define __ARM_HAVE_MRRC 1 -#endif - -/* define __ARM_HAVE_HALFWORD_MULTIPLY when half-word multiply instructions - * this means variants of: smul, smulw, smla, smlaw, smlal - */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_HALFWORD_MULTIPLY 1 -#endif - -/* define __ARM_HAVE_PAIR_LOAD_STORE when 64-bit memory loads and stored - * into/from a pair of 32-bit registers is supported throuhg 'ldrd' and 'strd' - */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_PAIR_LOAD_STORE 1 -#endif - -/* define __ARM_HAVE_SATURATED_ARITHMETIC is you have the saturated integer - * arithmetic instructions: qdd, qdadd, qsub, qdsub - */ -#if __ARM_HAVE_5TE -# define __ARM_HAVE_SATURATED_ARITHMETIC 1 -#endif - -/* define __ARM_HAVE_PC_INTERWORK when a direct assignment to the - * pc register will switch into thumb/ARM mode depending on bit 0 - * of the new instruction address. Before ARMv5, this was not the - * case, and you have to write: - * - * mov r0, [] - * bx r0 - * - * instead of: - * - * ldr pc, [] - * - * note that this affects any instruction that explicitely changes the - * value of the pc register, including ldm { ...,pc } or 'add pc, #offset' - */ -#if __ARM_ARCH__ >= 5 -# define __ARM_HAVE_PC_INTERWORK -#endif - - -/* Assembly-only macros */ - -/* define a handy PLD(address) macro since the cache preload - * is an optional opcode - */ -#if __ARM_HAVE_PLD -# define PLD(reg,offset) pld [reg, offset] -#else -# define PLD(reg,offset) /* nothing */ -#endif - -#endif /* _ARM_MACHINE_CPU_FEATURES_H */ diff --git a/libc/arch-arm/include/machine/exec.h b/libc/arch-arm/include/machine/exec.h deleted file mode 100644 index 227b20762..000000000 --- a/libc/arch-arm/include/machine/exec.h +++ /dev/null @@ -1,50 +0,0 @@ -/* $OpenBSD: exec.h,v 1.9 2003/04/17 03:42:14 drahn Exp $ */ -/* $NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $ */ - -/* - * Copyright (c) 1993 Christopher G. Demetriou - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _ARM_EXEC_H_ -#define _ARM_EXEC_H_ - -#define __LDPGSZ 4096 - -#define NATIVE_EXEC_ELF - -#define ARCH_ELFSIZE 32 - -#define ELF_TARG_CLASS ELFCLASS32 -#define ELF_TARG_DATA ELFDATA2LSB -#define ELF_TARG_MACH EM_ARM - -#define _NLIST_DO_AOUT -#define _NLIST_DO_ELF - -#define _KERN_DO_AOUT -#define _KERN_DO_ELF - -#endif /* _ARM_EXEC_H_ */ diff --git a/libc/arch-arm/include/machine/ieee.h b/libc/arch-arm/include/machine/ieee.h deleted file mode 100644 index 5f9b89ecc..000000000 --- a/libc/arch-arm/include/machine/ieee.h +++ /dev/null @@ -1,191 +0,0 @@ -/* $OpenBSD: ieee.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ -/* $NetBSD: ieee.h,v 1.2 2001/02/21 17:43:50 bjh21 Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ieee.h 8.1 (Berkeley) 6/11/93 - */ - -/* - * ieee.h defines the machine-dependent layout of the machine's IEEE - * floating point. - */ - -/* - * Define the number of bits in each fraction and exponent. - * - * k k+1 - * Note that 1.0 x 2 == 0.1 x 2 and that denorms are represented - * - * (-exp_bias+1) - * as fractions that look like 0.fffff x 2 . This means that - * - * -126 - * the number 0.10000 x 2 , for instance, is the same as the normalized - * - * -127 -128 - * float 1.0 x 2 . Thus, to represent 2 , we need one leading zero - * - * -129 - * in the fraction; to represent 2 , we need two, and so on. This - * - * (-exp_bias-fracbits+1) - * implies that the smallest denormalized number is 2 - * - * for whichever format we are talking about: for single precision, for - * - * -126 -149 - * instance, we get .00000000000000000000001 x 2 , or 1.0 x 2 , and - * - * -149 == -127 - 23 + 1. - */ - -/* - * The ARM has two sets of FP data formats. The FPA supports 32-bit, 64-bit - * and 96-bit IEEE formats, with the words in big-endian order. VFP supports - * 32-bin and 64-bit IEEE formats with the words in the CPU's native byte - * order. - * - * The FPA also has two packed decimal formats, but we ignore them here. - */ - -#define SNG_EXPBITS 8 -#define SNG_FRACBITS 23 - -#define DBL_EXPBITS 11 -#define DBL_FRACBITS 52 - -#ifndef __VFP_FP__ -#define E80_EXPBITS 15 -#define E80_FRACBITS 64 - -#define EXT_EXPBITS 15 -#define EXT_FRACBITS 112 -#endif - -struct ieee_single { - u_int sng_frac:23; - u_int sng_exponent:8; - u_int sng_sign:1; -}; - -#ifdef __VFP_FP__ -struct ieee_double { -#ifdef __ARMEB__ - u_int dbl_sign:1; - u_int dbl_exp:11; - u_int dbl_frach:20; - u_int dbl_fracl; -#else /* !__ARMEB__ */ - u_int dbl_fracl; - u_int dbl_frach:20; - u_int dbl_exp:11; - u_int dbl_sign:1; -#endif /* !__ARMEB__ */ -}; -#else /* !__VFP_FP__ */ -struct ieee_double { - u_int dbl_frach:20; - u_int dbl_exp:11; - u_int dbl_sign:1; - u_int dbl_fracl; -}; - -union ieee_double_u { - double dblu_d; - struct ieee_double dblu_dbl; -}; - - -struct ieee_e80 { - u_int e80_exp:15; - u_int e80_zero:16; - u_int e80_sign:1; - u_int e80_frach:31; - u_int e80_j:1; - u_int e80_fracl; -}; - -struct ieee_ext { - u_int ext_frach:16; - u_int ext_exp:15; - u_int ext_sign:1; - u_int ext_frachm; - u_int ext_fraclm; - u_int ext_fracl; -}; -#endif /* !__VFP_FP__ */ - -/* - * Floats whose exponent is in [1..INFNAN) (of whatever type) are - * `normal'. Floats whose exponent is INFNAN are either Inf or NaN. - * Floats whose exponent is zero are either zero (iff all fraction - * bits are zero) or subnormal values. - * - * A NaN is a `signalling NaN' if its QUIETNAN bit is clear in its - * high fraction; if the bit is set, it is a `quiet NaN'. - */ -#define SNG_EXP_INFNAN 255 -#define DBL_EXP_INFNAN 2047 -#ifndef __VFP_FP__ -#define E80_EXP_INFNAN 32767 -#define EXT_EXP_INFNAN 32767 -#endif /* !__VFP_FP__ */ - -#if 0 -#define SNG_QUIETNAN (1 << 22) -#define DBL_QUIETNAN (1 << 19) -#ifndef __VFP_FP__ -#define E80_QUIETNAN (1 << 15) -#define EXT_QUIETNAN (1 << 15) -#endif /* !__VFP_FP__ */ -#endif - -/* - * Exponent biases. - */ -#define SNG_EXP_BIAS 127 -#define DBL_EXP_BIAS 1023 -#ifndef __VFP_FP__ -#define E80_EXP_BIAS 16383 -#define EXT_EXP_BIAS 16383 -#endif /* !__VFP_FP__ */ diff --git a/libc/arch-arm/include/machine/internal_types.h b/libc/arch-arm/include/machine/internal_types.h deleted file mode 100644 index 7e610b0ec..000000000 --- a/libc/arch-arm/include/machine/internal_types.h +++ /dev/null @@ -1,10 +0,0 @@ -/* $OpenBSD: internal_types.h,v 1.2 2004/05/06 15:53:39 drahn Exp $ */ -/* Public domain */ -#ifndef _ARM_INTERNAL_TYPES_H_ -#define _ARM_INTERNAL_TYPES_H_ - -#ifdef __CHAR_UNSIGNED__ -#define __machine_has_unsigned_chars -#endif - -#endif diff --git a/libc/arch-arm/include/machine/kernel.h b/libc/arch-arm/include/machine/kernel.h deleted file mode 100644 index 462b8e3be..000000000 --- a/libc/arch-arm/include/machine/kernel.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ARCH_ARM_KERNEL_H -#define _ARCH_ARM_KERNEL_H - -/* this file contains kernel-specific definitions that were optimized out of - our processed kernel headers, but still useful nonetheless... */ - -typedef unsigned long __kernel_blkcnt_t; -typedef unsigned long __kernel_blksize_t; - -/* these aren't really defined by the kernel headers though... */ -typedef unsigned long __kernel_fsblkcnt_t; -typedef unsigned long __kernel_fsfilcnt_t; -typedef unsigned int __kernel_id_t; - -#endif /* _ARCH_ARM_KERNEL_H */ diff --git a/libc/arch-arm/include/machine/limits.h b/libc/arch-arm/include/machine/limits.h deleted file mode 100644 index f9c04fae2..000000000 --- a/libc/arch-arm/include/machine/limits.h +++ /dev/null @@ -1,63 +0,0 @@ -/* $OpenBSD: limits.h,v 1.3 2006/01/06 22:48:46 millert Exp $ */ -/* $NetBSD: limits.h,v 1.4 2003/04/28 23:16:18 bjh21 Exp $ */ - -/* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)limits.h 7.2 (Berkeley) 6/28/90 - */ - -#ifndef _ARM32_LIMITS_H_ -#define _ARM32_LIMITS_H_ - -#include - -#define MB_LEN_MAX 1 /* no multibyte characters */ - -#ifndef SIZE_MAX -#define SIZE_MAX UINT_MAX /* max value for a size_t */ -#endif -#ifndef SSIZE_MAX -#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ -#endif - -#if __BSD_VISIBLE -#define SIZE_T_MAX UINT_MAX /* max value for a size_t (historic) */ - -#define UQUAD_MAX 0xffffffffffffffffULL /* max unsigned quad */ -#define QUAD_MAX 0x7fffffffffffffffLL /* max signed quad */ -#define QUAD_MIN (-0x7fffffffffffffffLL-1) /* min signed quad */ - -#endif /* __BSD_VISIBLE */ - -#define LONGLONG_BIT 64 -#define LONGLONG_MIN (-9223372036854775807LL-1) -#define LONGLONG_MAX 9223372036854775807LL -#define ULONGLONG_MAX 18446744073709551615ULL - -#endif /* _ARM32_LIMITS_H_ */ diff --git a/libc/arch-arm/include/machine/setjmp.h b/libc/arch-arm/include/machine/setjmp.h deleted file mode 100644 index f20cab2e9..000000000 --- a/libc/arch-arm/include/machine/setjmp.h +++ /dev/null @@ -1,87 +0,0 @@ -/* $OpenBSD: setjmp.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ -/* $NetBSD: setjmp.h,v 1.2 2001/08/25 14:45:59 bjh21 Exp $ */ - -/* - * machine/setjmp.h: machine dependent setjmp-related information. - */ - -#ifdef __ELF__ -#define _JBLEN 64 /* size, in longs, of a jmp_buf */ -#else -#define _JBLEN 29 /* size, in longs, of a jmp_buf */ -#endif - -/* - * NOTE: The internal structure of a jmp_buf is *PRIVATE* - * This information is provided as there is software - * that fiddles with this with obtain the stack pointer - * (yes really ! and its commercial !). - * - * Description of the setjmp buffer - * - * word 0 magic number (dependant on creator) - * 1 - 3 f4 fp register 4 - * 4 - 6 f5 fp register 5 - * 7 - 9 f6 fp register 6 - * 10 - 12 f7 fp register 7 - * 13 fpsr fp status register - * 14 r4 register 4 - * 15 r5 register 5 - * 16 r6 register 6 - * 17 r7 register 7 - * 18 r8 register 8 - * 19 r9 register 9 - * 20 r10 register 10 (sl) - * 21 r11 register 11 (fp) - * 22 r12 register 12 (ip) - * 23 r13 register 13 (sp) - * 24 r14 register 14 (lr) - * 25 signal mask (dependant on magic) - * 26 (con't) - * 27 (con't) - * 28 (con't) - * - * The magic number number identifies the jmp_buf and - * how the buffer was created as well as providing - * a sanity check - * - * A side note I should mention - Please do not tamper - * with the floating point fields. While they are - * always saved and restored at the moment this cannot - * be garenteed especially if the compiler happens - * to be generating soft-float code so no fp - * registers will be used. - * - * Whilst this can be seen an encouraging people to - * use the setjmp buffer in this way I think that it - * is for the best then if changes occur compiles will - * break rather than just having new builds falling over - * mysteriously. - */ - -#define _JB_MAGIC__SETJMP 0x4278f500 -#define _JB_MAGIC_SETJMP 0x4278f501 - -/* Valid for all jmp_buf's */ - -#define _JB_MAGIC 0 -#define _JB_REG_F4 1 -#define _JB_REG_F5 4 -#define _JB_REG_F6 7 -#define _JB_REG_F7 10 -#define _JB_REG_FPSR 13 -#define _JB_REG_R4 14 -#define _JB_REG_R5 15 -#define _JB_REG_R6 16 -#define _JB_REG_R7 17 -#define _JB_REG_R8 18 -#define _JB_REG_R9 19 -#define _JB_REG_R10 20 -#define _JB_REG_R11 21 -#define _JB_REG_R12 22 -#define _JB_REG_R13 23 -#define _JB_REG_R14 24 - -/* Only valid with the _JB_MAGIC_SETJMP magic */ - -#define _JB_SIGMASK 25 diff --git a/libc/arch-arm/syscalls.mk b/libc/arch-arm/syscalls.mk deleted file mode 100644 index 706cb0c9b..000000000 --- a/libc/arch-arm/syscalls.mk +++ /dev/null @@ -1,170 +0,0 @@ -# auto-generated by gensyscalls.py, do not touch -syscall_src := -syscall_src += arch-arm/syscalls/_exit.S -syscall_src += arch-arm/syscalls/_exit_thread.S -syscall_src += arch-arm/syscalls/__fork.S -syscall_src += arch-arm/syscalls/waitid.S -syscall_src += arch-arm/syscalls/__clone.S -syscall_src += arch-arm/syscalls/execve.S -syscall_src += arch-arm/syscalls/setuid.S -syscall_src += arch-arm/syscalls/getuid.S -syscall_src += arch-arm/syscalls/getgid.S -syscall_src += arch-arm/syscalls/geteuid.S -syscall_src += arch-arm/syscalls/getegid.S -syscall_src += arch-arm/syscalls/getresuid.S -syscall_src += arch-arm/syscalls/getresgid.S -syscall_src += arch-arm/syscalls/gettid.S -syscall_src += arch-arm/syscalls/getgroups.S -syscall_src += arch-arm/syscalls/getpgid.S -syscall_src += arch-arm/syscalls/getppid.S -syscall_src += arch-arm/syscalls/setsid.S -syscall_src += arch-arm/syscalls/setgid.S -syscall_src += arch-arm/syscalls/setreuid.S -syscall_src += arch-arm/syscalls/setresuid.S -syscall_src += arch-arm/syscalls/setresgid.S -syscall_src += arch-arm/syscalls/__brk.S -syscall_src += arch-arm/syscalls/__ptrace.S -syscall_src += arch-arm/syscalls/__getpriority.S -syscall_src += arch-arm/syscalls/setpriority.S -syscall_src += arch-arm/syscalls/setrlimit.S -syscall_src += arch-arm/syscalls/getrlimit.S -syscall_src += arch-arm/syscalls/getrusage.S -syscall_src += arch-arm/syscalls/setgroups.S -syscall_src += arch-arm/syscalls/setpgid.S -syscall_src += arch-arm/syscalls/vfork.S -syscall_src += arch-arm/syscalls/setregid.S -syscall_src += arch-arm/syscalls/chroot.S -syscall_src += arch-arm/syscalls/prctl.S -syscall_src += arch-arm/syscalls/capget.S -syscall_src += arch-arm/syscalls/capset.S -syscall_src += arch-arm/syscalls/acct.S -syscall_src += arch-arm/syscalls/read.S -syscall_src += arch-arm/syscalls/write.S -syscall_src += arch-arm/syscalls/__pread64.S -syscall_src += arch-arm/syscalls/__pwrite64.S -syscall_src += arch-arm/syscalls/__open.S -syscall_src += arch-arm/syscalls/__openat.S -syscall_src += arch-arm/syscalls/close.S -syscall_src += arch-arm/syscalls/lseek.S -syscall_src += arch-arm/syscalls/__llseek.S -syscall_src += arch-arm/syscalls/getpid.S -syscall_src += arch-arm/syscalls/__mmap2.S -syscall_src += arch-arm/syscalls/munmap.S -syscall_src += arch-arm/syscalls/mremap.S -syscall_src += arch-arm/syscalls/msync.S -syscall_src += arch-arm/syscalls/mprotect.S -syscall_src += arch-arm/syscalls/madvise.S -syscall_src += arch-arm/syscalls/mlock.S -syscall_src += arch-arm/syscalls/munlock.S -syscall_src += arch-arm/syscalls/mincore.S -syscall_src += arch-arm/syscalls/__ioctl.S -syscall_src += arch-arm/syscalls/readv.S -syscall_src += arch-arm/syscalls/writev.S -syscall_src += arch-arm/syscalls/__fcntl.S -syscall_src += arch-arm/syscalls/flock.S -syscall_src += arch-arm/syscalls/fchmod.S -syscall_src += arch-arm/syscalls/dup.S -syscall_src += arch-arm/syscalls/pipe.S -syscall_src += arch-arm/syscalls/dup2.S -syscall_src += arch-arm/syscalls/select.S -syscall_src += arch-arm/syscalls/ftruncate.S -syscall_src += arch-arm/syscalls/getdents.S -syscall_src += arch-arm/syscalls/fsync.S -syscall_src += arch-arm/syscalls/fchown.S -syscall_src += arch-arm/syscalls/sync.S -syscall_src += arch-arm/syscalls/__fcntl64.S -syscall_src += arch-arm/syscalls/fstatfs.S -syscall_src += arch-arm/syscalls/sendfile.S -syscall_src += arch-arm/syscalls/fstatat.S -syscall_src += arch-arm/syscalls/mkdirat.S -syscall_src += arch-arm/syscalls/fchownat.S -syscall_src += arch-arm/syscalls/fchmodat.S -syscall_src += arch-arm/syscalls/renameat.S -syscall_src += arch-arm/syscalls/link.S -syscall_src += arch-arm/syscalls/unlink.S -syscall_src += arch-arm/syscalls/unlinkat.S -syscall_src += arch-arm/syscalls/chdir.S -syscall_src += arch-arm/syscalls/mknod.S -syscall_src += arch-arm/syscalls/chmod.S -syscall_src += arch-arm/syscalls/chown.S -syscall_src += arch-arm/syscalls/lchown.S -syscall_src += arch-arm/syscalls/mount.S -syscall_src += arch-arm/syscalls/umount2.S -syscall_src += arch-arm/syscalls/fstat.S -syscall_src += arch-arm/syscalls/stat.S -syscall_src += arch-arm/syscalls/lstat.S -syscall_src += arch-arm/syscalls/mkdir.S -syscall_src += arch-arm/syscalls/readlink.S -syscall_src += arch-arm/syscalls/rmdir.S -syscall_src += arch-arm/syscalls/rename.S -syscall_src += arch-arm/syscalls/__getcwd.S -syscall_src += arch-arm/syscalls/access.S -syscall_src += arch-arm/syscalls/symlink.S -syscall_src += arch-arm/syscalls/fchdir.S -syscall_src += arch-arm/syscalls/truncate.S -syscall_src += arch-arm/syscalls/__statfs64.S -syscall_src += arch-arm/syscalls/pause.S -syscall_src += arch-arm/syscalls/gettimeofday.S -syscall_src += arch-arm/syscalls/settimeofday.S -syscall_src += arch-arm/syscalls/times.S -syscall_src += arch-arm/syscalls/nanosleep.S -syscall_src += arch-arm/syscalls/clock_gettime.S -syscall_src += arch-arm/syscalls/clock_settime.S -syscall_src += arch-arm/syscalls/clock_getres.S -syscall_src += arch-arm/syscalls/clock_nanosleep.S -syscall_src += arch-arm/syscalls/getitimer.S -syscall_src += arch-arm/syscalls/setitimer.S -syscall_src += arch-arm/syscalls/__timer_create.S -syscall_src += arch-arm/syscalls/__timer_settime.S -syscall_src += arch-arm/syscalls/__timer_gettime.S -syscall_src += arch-arm/syscalls/__timer_getoverrun.S -syscall_src += arch-arm/syscalls/__timer_delete.S -syscall_src += arch-arm/syscalls/utimes.S -syscall_src += arch-arm/syscalls/sigaction.S -syscall_src += arch-arm/syscalls/sigprocmask.S -syscall_src += arch-arm/syscalls/__sigsuspend.S -syscall_src += arch-arm/syscalls/__rt_sigaction.S -syscall_src += arch-arm/syscalls/__rt_sigprocmask.S -syscall_src += arch-arm/syscalls/__rt_sigtimedwait.S -syscall_src += arch-arm/syscalls/sigpending.S -syscall_src += arch-arm/syscalls/socket.S -syscall_src += arch-arm/syscalls/socketpair.S -syscall_src += arch-arm/syscalls/bind.S -syscall_src += arch-arm/syscalls/connect.S -syscall_src += arch-arm/syscalls/listen.S -syscall_src += arch-arm/syscalls/accept.S -syscall_src += arch-arm/syscalls/getsockname.S -syscall_src += arch-arm/syscalls/getpeername.S -syscall_src += arch-arm/syscalls/sendto.S -syscall_src += arch-arm/syscalls/recvfrom.S -syscall_src += arch-arm/syscalls/shutdown.S -syscall_src += arch-arm/syscalls/setsockopt.S -syscall_src += arch-arm/syscalls/getsockopt.S -syscall_src += arch-arm/syscalls/sendmsg.S -syscall_src += arch-arm/syscalls/recvmsg.S -syscall_src += arch-arm/syscalls/sched_setscheduler.S -syscall_src += arch-arm/syscalls/sched_getscheduler.S -syscall_src += arch-arm/syscalls/sched_yield.S -syscall_src += arch-arm/syscalls/sched_setparam.S -syscall_src += arch-arm/syscalls/sched_getparam.S -syscall_src += arch-arm/syscalls/sched_get_priority_max.S -syscall_src += arch-arm/syscalls/sched_get_priority_min.S -syscall_src += arch-arm/syscalls/sched_rr_get_interval.S -syscall_src += arch-arm/syscalls/uname.S -syscall_src += arch-arm/syscalls/__wait4.S -syscall_src += arch-arm/syscalls/umask.S -syscall_src += arch-arm/syscalls/__reboot.S -syscall_src += arch-arm/syscalls/__syslog.S -syscall_src += arch-arm/syscalls/init_module.S -syscall_src += arch-arm/syscalls/delete_module.S -syscall_src += arch-arm/syscalls/klogctl.S -syscall_src += arch-arm/syscalls/futex.S -syscall_src += arch-arm/syscalls/epoll_create.S -syscall_src += arch-arm/syscalls/epoll_ctl.S -syscall_src += arch-arm/syscalls/epoll_wait.S -syscall_src += arch-arm/syscalls/inotify_init.S -syscall_src += arch-arm/syscalls/inotify_add_watch.S -syscall_src += arch-arm/syscalls/inotify_rm_watch.S -syscall_src += arch-arm/syscalls/poll.S -syscall_src += arch-arm/syscalls/__set_tls.S -syscall_src += arch-arm/syscalls/cacheflush.S diff --git a/libc/arch-arm/syscalls/__brk.S b/libc/arch-arm/syscalls/__brk.S deleted file mode 100644 index 99ad2e328..000000000 --- a/libc/arch-arm/syscalls/__brk.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __brk, #function - .globl __brk - .align 4 - .fnstart - -__brk: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_brk - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__clone.S b/libc/arch-arm/syscalls/__clone.S deleted file mode 100644 index 650e2c0ca..000000000 --- a/libc/arch-arm/syscalls/__clone.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __clone, #function - .globl __clone - .align 4 - .fnstart - -__clone: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_clone - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__fcntl.S b/libc/arch-arm/syscalls/__fcntl.S deleted file mode 100644 index 1b7b92f4f..000000000 --- a/libc/arch-arm/syscalls/__fcntl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __fcntl, #function - .globl __fcntl - .align 4 - .fnstart - -__fcntl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fcntl - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__fcntl64.S b/libc/arch-arm/syscalls/__fcntl64.S deleted file mode 100644 index d1a6fc83e..000000000 --- a/libc/arch-arm/syscalls/__fcntl64.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __fcntl64, #function - .globl __fcntl64 - .align 4 - .fnstart - -__fcntl64: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fcntl64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__fork.S b/libc/arch-arm/syscalls/__fork.S deleted file mode 100644 index fddd276de..000000000 --- a/libc/arch-arm/syscalls/__fork.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __fork, #function - .globl __fork - .align 4 - .fnstart - -__fork: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fork - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__getcwd.S b/libc/arch-arm/syscalls/__getcwd.S deleted file mode 100644 index 6098d09bc..000000000 --- a/libc/arch-arm/syscalls/__getcwd.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __getcwd, #function - .globl __getcwd - .align 4 - .fnstart - -__getcwd: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getcwd - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__getpriority.S b/libc/arch-arm/syscalls/__getpriority.S deleted file mode 100644 index 2b652ef26..000000000 --- a/libc/arch-arm/syscalls/__getpriority.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __getpriority, #function - .globl __getpriority - .align 4 - .fnstart - -__getpriority: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getpriority - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__ioctl.S b/libc/arch-arm/syscalls/__ioctl.S deleted file mode 100644 index 2fad23134..000000000 --- a/libc/arch-arm/syscalls/__ioctl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __ioctl, #function - .globl __ioctl - .align 4 - .fnstart - -__ioctl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_ioctl - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__llseek.S b/libc/arch-arm/syscalls/__llseek.S deleted file mode 100644 index 8325e2d35..000000000 --- a/libc/arch-arm/syscalls/__llseek.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __llseek, #function - .globl __llseek - .align 4 - .fnstart - -__llseek: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR__llseek - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__mmap2.S b/libc/arch-arm/syscalls/__mmap2.S deleted file mode 100644 index d57020a2e..000000000 --- a/libc/arch-arm/syscalls/__mmap2.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __mmap2, #function - .globl __mmap2 - .align 4 - .fnstart - -__mmap2: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_mmap2 - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__open.S b/libc/arch-arm/syscalls/__open.S deleted file mode 100644 index 7e3fb7a57..000000000 --- a/libc/arch-arm/syscalls/__open.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __open, #function - .globl __open - .align 4 - .fnstart - -__open: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_open - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__openat.S b/libc/arch-arm/syscalls/__openat.S deleted file mode 100644 index ae92b9d6a..000000000 --- a/libc/arch-arm/syscalls/__openat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __openat, #function - .globl __openat - .align 4 - .fnstart - -__openat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_openat - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__pread64.S b/libc/arch-arm/syscalls/__pread64.S deleted file mode 100644 index ea645e113..000000000 --- a/libc/arch-arm/syscalls/__pread64.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __pread64, #function - .globl __pread64 - .align 4 - .fnstart - -__pread64: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_pread64 - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__ptrace.S b/libc/arch-arm/syscalls/__ptrace.S deleted file mode 100644 index 329a5afa3..000000000 --- a/libc/arch-arm/syscalls/__ptrace.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __ptrace, #function - .globl __ptrace - .align 4 - .fnstart - -__ptrace: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_ptrace - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__pwrite64.S b/libc/arch-arm/syscalls/__pwrite64.S deleted file mode 100644 index d1263be94..000000000 --- a/libc/arch-arm/syscalls/__pwrite64.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __pwrite64, #function - .globl __pwrite64 - .align 4 - .fnstart - -__pwrite64: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_pwrite64 - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__reboot.S b/libc/arch-arm/syscalls/__reboot.S deleted file mode 100644 index 770e9f818..000000000 --- a/libc/arch-arm/syscalls/__reboot.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __reboot, #function - .globl __reboot - .align 4 - .fnstart - -__reboot: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_reboot - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__rt_sigaction.S b/libc/arch-arm/syscalls/__rt_sigaction.S deleted file mode 100644 index 29abd556b..000000000 --- a/libc/arch-arm/syscalls/__rt_sigaction.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __rt_sigaction, #function - .globl __rt_sigaction - .align 4 - .fnstart - -__rt_sigaction: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_rt_sigaction - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__rt_sigprocmask.S b/libc/arch-arm/syscalls/__rt_sigprocmask.S deleted file mode 100644 index c3acb54f9..000000000 --- a/libc/arch-arm/syscalls/__rt_sigprocmask.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __rt_sigprocmask, #function - .globl __rt_sigprocmask - .align 4 - .fnstart - -__rt_sigprocmask: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_rt_sigprocmask - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__rt_sigtimedwait.S b/libc/arch-arm/syscalls/__rt_sigtimedwait.S deleted file mode 100644 index 0fb157314..000000000 --- a/libc/arch-arm/syscalls/__rt_sigtimedwait.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __rt_sigtimedwait, #function - .globl __rt_sigtimedwait - .align 4 - .fnstart - -__rt_sigtimedwait: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_rt_sigtimedwait - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__set_tls.S b/libc/arch-arm/syscalls/__set_tls.S deleted file mode 100644 index f6a097f6f..000000000 --- a/libc/arch-arm/syscalls/__set_tls.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __set_tls, #function - .globl __set_tls - .align 4 - .fnstart - -__set_tls: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_ARM_set_tls - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__sigsuspend.S b/libc/arch-arm/syscalls/__sigsuspend.S deleted file mode 100644 index 39416f1a6..000000000 --- a/libc/arch-arm/syscalls/__sigsuspend.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __sigsuspend, #function - .globl __sigsuspend - .align 4 - .fnstart - -__sigsuspend: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sigsuspend - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__statfs64.S b/libc/arch-arm/syscalls/__statfs64.S deleted file mode 100644 index f60263721..000000000 --- a/libc/arch-arm/syscalls/__statfs64.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __statfs64, #function - .globl __statfs64 - .align 4 - .fnstart - -__statfs64: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_statfs64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__syslog.S b/libc/arch-arm/syscalls/__syslog.S deleted file mode 100644 index 3318d764c..000000000 --- a/libc/arch-arm/syscalls/__syslog.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __syslog, #function - .globl __syslog - .align 4 - .fnstart - -__syslog: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_syslog - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__timer_create.S b/libc/arch-arm/syscalls/__timer_create.S deleted file mode 100644 index 5bc3966f6..000000000 --- a/libc/arch-arm/syscalls/__timer_create.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_create, #function - .globl __timer_create - .align 4 - .fnstart - -__timer_create: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_timer_create - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__timer_delete.S b/libc/arch-arm/syscalls/__timer_delete.S deleted file mode 100644 index 4ddee0100..000000000 --- a/libc/arch-arm/syscalls/__timer_delete.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_delete, #function - .globl __timer_delete - .align 4 - .fnstart - -__timer_delete: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_timer_delete - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__timer_getoverrun.S b/libc/arch-arm/syscalls/__timer_getoverrun.S deleted file mode 100644 index fb0c87d6b..000000000 --- a/libc/arch-arm/syscalls/__timer_getoverrun.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_getoverrun, #function - .globl __timer_getoverrun - .align 4 - .fnstart - -__timer_getoverrun: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_timer_getoverrun - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__timer_gettime.S b/libc/arch-arm/syscalls/__timer_gettime.S deleted file mode 100644 index 9d6e44665..000000000 --- a/libc/arch-arm/syscalls/__timer_gettime.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_gettime, #function - .globl __timer_gettime - .align 4 - .fnstart - -__timer_gettime: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_timer_gettime - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__timer_settime.S b/libc/arch-arm/syscalls/__timer_settime.S deleted file mode 100644 index a7be132da..000000000 --- a/libc/arch-arm/syscalls/__timer_settime.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_settime, #function - .globl __timer_settime - .align 4 - .fnstart - -__timer_settime: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_timer_settime - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/__wait4.S b/libc/arch-arm/syscalls/__wait4.S deleted file mode 100644 index 967017753..000000000 --- a/libc/arch-arm/syscalls/__wait4.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __wait4, #function - .globl __wait4 - .align 4 - .fnstart - -__wait4: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_wait4 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/_exit.S b/libc/arch-arm/syscalls/_exit.S deleted file mode 100644 index e750ca34c..000000000 --- a/libc/arch-arm/syscalls/_exit.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type _exit, #function - .globl _exit - .align 4 - .fnstart - -_exit: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_exit_group - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/_exit_thread.S b/libc/arch-arm/syscalls/_exit_thread.S deleted file mode 100644 index c6f868f71..000000000 --- a/libc/arch-arm/syscalls/_exit_thread.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type _exit_thread, #function - .globl _exit_thread - .align 4 - .fnstart - -_exit_thread: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_exit - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/accept.S b/libc/arch-arm/syscalls/accept.S deleted file mode 100644 index 6c32f24c3..000000000 --- a/libc/arch-arm/syscalls/accept.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type accept, #function - .globl accept - .align 4 - .fnstart - -accept: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_accept - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/access.S b/libc/arch-arm/syscalls/access.S deleted file mode 100644 index 363910684..000000000 --- a/libc/arch-arm/syscalls/access.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type access, #function - .globl access - .align 4 - .fnstart - -access: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_access - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/acct.S b/libc/arch-arm/syscalls/acct.S deleted file mode 100644 index d7d878149..000000000 --- a/libc/arch-arm/syscalls/acct.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type acct, #function - .globl acct - .align 4 - .fnstart - -acct: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_acct - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/bind.S b/libc/arch-arm/syscalls/bind.S deleted file mode 100644 index 66cc667e9..000000000 --- a/libc/arch-arm/syscalls/bind.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type bind, #function - .globl bind - .align 4 - .fnstart - -bind: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_bind - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/cacheflush.S b/libc/arch-arm/syscalls/cacheflush.S deleted file mode 100644 index d7fba90eb..000000000 --- a/libc/arch-arm/syscalls/cacheflush.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type cacheflush, #function - .globl cacheflush - .align 4 - .fnstart - -cacheflush: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_ARM_cacheflush - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/capget.S b/libc/arch-arm/syscalls/capget.S deleted file mode 100644 index 92082a175..000000000 --- a/libc/arch-arm/syscalls/capget.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type capget, #function - .globl capget - .align 4 - .fnstart - -capget: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_capget - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/capset.S b/libc/arch-arm/syscalls/capset.S deleted file mode 100644 index 8a169ed5e..000000000 --- a/libc/arch-arm/syscalls/capset.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type capset, #function - .globl capset - .align 4 - .fnstart - -capset: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_capset - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/chdir.S b/libc/arch-arm/syscalls/chdir.S deleted file mode 100644 index ff4ec68c2..000000000 --- a/libc/arch-arm/syscalls/chdir.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chdir, #function - .globl chdir - .align 4 - .fnstart - -chdir: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_chdir - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/chmod.S b/libc/arch-arm/syscalls/chmod.S deleted file mode 100644 index 56e43c586..000000000 --- a/libc/arch-arm/syscalls/chmod.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chmod, #function - .globl chmod - .align 4 - .fnstart - -chmod: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_chmod - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/chown.S b/libc/arch-arm/syscalls/chown.S deleted file mode 100644 index 1d3032f02..000000000 --- a/libc/arch-arm/syscalls/chown.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chown, #function - .globl chown - .align 4 - .fnstart - -chown: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_chown32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/chroot.S b/libc/arch-arm/syscalls/chroot.S deleted file mode 100644 index c063d8bfe..000000000 --- a/libc/arch-arm/syscalls/chroot.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chroot, #function - .globl chroot - .align 4 - .fnstart - -chroot: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_chroot - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/clock_getres.S b/libc/arch-arm/syscalls/clock_getres.S deleted file mode 100644 index 6fdbe37d9..000000000 --- a/libc/arch-arm/syscalls/clock_getres.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_getres, #function - .globl clock_getres - .align 4 - .fnstart - -clock_getres: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_clock_getres - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/clock_gettime.S b/libc/arch-arm/syscalls/clock_gettime.S deleted file mode 100644 index 8941b2315..000000000 --- a/libc/arch-arm/syscalls/clock_gettime.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_gettime, #function - .globl clock_gettime - .align 4 - .fnstart - -clock_gettime: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_clock_gettime - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/clock_nanosleep.S b/libc/arch-arm/syscalls/clock_nanosleep.S deleted file mode 100644 index 2c1015102..000000000 --- a/libc/arch-arm/syscalls/clock_nanosleep.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_nanosleep, #function - .globl clock_nanosleep - .align 4 - .fnstart - -clock_nanosleep: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_clock_nanosleep - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/clock_settime.S b/libc/arch-arm/syscalls/clock_settime.S deleted file mode 100644 index 94614f242..000000000 --- a/libc/arch-arm/syscalls/clock_settime.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_settime, #function - .globl clock_settime - .align 4 - .fnstart - -clock_settime: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_clock_settime - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/close.S b/libc/arch-arm/syscalls/close.S deleted file mode 100644 index e54b100e9..000000000 --- a/libc/arch-arm/syscalls/close.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type close, #function - .globl close - .align 4 - .fnstart - -close: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_close - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/connect.S b/libc/arch-arm/syscalls/connect.S deleted file mode 100644 index b05d6a22f..000000000 --- a/libc/arch-arm/syscalls/connect.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type connect, #function - .globl connect - .align 4 - .fnstart - -connect: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_connect - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/delete_module.S b/libc/arch-arm/syscalls/delete_module.S deleted file mode 100644 index 69d59666e..000000000 --- a/libc/arch-arm/syscalls/delete_module.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type delete_module, #function - .globl delete_module - .align 4 - .fnstart - -delete_module: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_delete_module - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/dup.S b/libc/arch-arm/syscalls/dup.S deleted file mode 100644 index 5a5d050c2..000000000 --- a/libc/arch-arm/syscalls/dup.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type dup, #function - .globl dup - .align 4 - .fnstart - -dup: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_dup - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/dup2.S b/libc/arch-arm/syscalls/dup2.S deleted file mode 100644 index 1ced458df..000000000 --- a/libc/arch-arm/syscalls/dup2.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type dup2, #function - .globl dup2 - .align 4 - .fnstart - -dup2: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_dup2 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/epoll_create.S b/libc/arch-arm/syscalls/epoll_create.S deleted file mode 100644 index 389d4ba4e..000000000 --- a/libc/arch-arm/syscalls/epoll_create.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type epoll_create, #function - .globl epoll_create - .align 4 - .fnstart - -epoll_create: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_epoll_create - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/epoll_ctl.S b/libc/arch-arm/syscalls/epoll_ctl.S deleted file mode 100644 index 906d80de4..000000000 --- a/libc/arch-arm/syscalls/epoll_ctl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type epoll_ctl, #function - .globl epoll_ctl - .align 4 - .fnstart - -epoll_ctl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_epoll_ctl - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/epoll_wait.S b/libc/arch-arm/syscalls/epoll_wait.S deleted file mode 100644 index af748786a..000000000 --- a/libc/arch-arm/syscalls/epoll_wait.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type epoll_wait, #function - .globl epoll_wait - .align 4 - .fnstart - -epoll_wait: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_epoll_wait - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/execve.S b/libc/arch-arm/syscalls/execve.S deleted file mode 100644 index 2309a1b02..000000000 --- a/libc/arch-arm/syscalls/execve.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type execve, #function - .globl execve - .align 4 - .fnstart - -execve: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_execve - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fchdir.S b/libc/arch-arm/syscalls/fchdir.S deleted file mode 100644 index 441f3e22f..000000000 --- a/libc/arch-arm/syscalls/fchdir.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchdir, #function - .globl fchdir - .align 4 - .fnstart - -fchdir: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fchdir - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fchmod.S b/libc/arch-arm/syscalls/fchmod.S deleted file mode 100644 index b5f198397..000000000 --- a/libc/arch-arm/syscalls/fchmod.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchmod, #function - .globl fchmod - .align 4 - .fnstart - -fchmod: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fchmod - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fchmodat.S b/libc/arch-arm/syscalls/fchmodat.S deleted file mode 100644 index d6e391647..000000000 --- a/libc/arch-arm/syscalls/fchmodat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchmodat, #function - .globl fchmodat - .align 4 - .fnstart - -fchmodat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fchmodat - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fchown.S b/libc/arch-arm/syscalls/fchown.S deleted file mode 100644 index 7887296bf..000000000 --- a/libc/arch-arm/syscalls/fchown.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchown, #function - .globl fchown - .align 4 - .fnstart - -fchown: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fchown32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fchownat.S b/libc/arch-arm/syscalls/fchownat.S deleted file mode 100644 index 2279d2c5b..000000000 --- a/libc/arch-arm/syscalls/fchownat.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchownat, #function - .globl fchownat - .align 4 - .fnstart - -fchownat: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_fchownat - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/flock.S b/libc/arch-arm/syscalls/flock.S deleted file mode 100644 index 22e391cdf..000000000 --- a/libc/arch-arm/syscalls/flock.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type flock, #function - .globl flock - .align 4 - .fnstart - -flock: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_flock - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fstat.S b/libc/arch-arm/syscalls/fstat.S deleted file mode 100644 index ef1752f73..000000000 --- a/libc/arch-arm/syscalls/fstat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fstat, #function - .globl fstat - .align 4 - .fnstart - -fstat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fstat64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fstatat.S b/libc/arch-arm/syscalls/fstatat.S deleted file mode 100644 index a3dd74a80..000000000 --- a/libc/arch-arm/syscalls/fstatat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fstatat, #function - .globl fstatat - .align 4 - .fnstart - -fstatat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fstatat64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fstatfs.S b/libc/arch-arm/syscalls/fstatfs.S deleted file mode 100644 index 88150d608..000000000 --- a/libc/arch-arm/syscalls/fstatfs.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fstatfs, #function - .globl fstatfs - .align 4 - .fnstart - -fstatfs: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fstatfs64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/fsync.S b/libc/arch-arm/syscalls/fsync.S deleted file mode 100644 index 588dfa31b..000000000 --- a/libc/arch-arm/syscalls/fsync.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fsync, #function - .globl fsync - .align 4 - .fnstart - -fsync: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_fsync - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/ftruncate.S b/libc/arch-arm/syscalls/ftruncate.S deleted file mode 100644 index 2d60b4111..000000000 --- a/libc/arch-arm/syscalls/ftruncate.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type ftruncate, #function - .globl ftruncate - .align 4 - .fnstart - -ftruncate: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_ftruncate - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/futex.S b/libc/arch-arm/syscalls/futex.S deleted file mode 100644 index c2d4b7eb5..000000000 --- a/libc/arch-arm/syscalls/futex.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type futex, #function - .globl futex - .align 4 - .fnstart - -futex: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_futex - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getdents.S b/libc/arch-arm/syscalls/getdents.S deleted file mode 100644 index 312aa0d8c..000000000 --- a/libc/arch-arm/syscalls/getdents.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getdents, #function - .globl getdents - .align 4 - .fnstart - -getdents: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getdents64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getegid.S b/libc/arch-arm/syscalls/getegid.S deleted file mode 100644 index 26723bfa9..000000000 --- a/libc/arch-arm/syscalls/getegid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getegid, #function - .globl getegid - .align 4 - .fnstart - -getegid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getegid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/geteuid.S b/libc/arch-arm/syscalls/geteuid.S deleted file mode 100644 index d86959fc4..000000000 --- a/libc/arch-arm/syscalls/geteuid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type geteuid, #function - .globl geteuid - .align 4 - .fnstart - -geteuid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_geteuid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getgid.S b/libc/arch-arm/syscalls/getgid.S deleted file mode 100644 index 1502fdf21..000000000 --- a/libc/arch-arm/syscalls/getgid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getgid, #function - .globl getgid - .align 4 - .fnstart - -getgid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getgid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getgroups.S b/libc/arch-arm/syscalls/getgroups.S deleted file mode 100644 index e68fe05e9..000000000 --- a/libc/arch-arm/syscalls/getgroups.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getgroups, #function - .globl getgroups - .align 4 - .fnstart - -getgroups: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getgroups32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getitimer.S b/libc/arch-arm/syscalls/getitimer.S deleted file mode 100644 index 404c2fc7e..000000000 --- a/libc/arch-arm/syscalls/getitimer.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getitimer, #function - .globl getitimer - .align 4 - .fnstart - -getitimer: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getitimer - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getpeername.S b/libc/arch-arm/syscalls/getpeername.S deleted file mode 100644 index f04ec3208..000000000 --- a/libc/arch-arm/syscalls/getpeername.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getpeername, #function - .globl getpeername - .align 4 - .fnstart - -getpeername: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getpeername - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getpgid.S b/libc/arch-arm/syscalls/getpgid.S deleted file mode 100644 index 9397458f6..000000000 --- a/libc/arch-arm/syscalls/getpgid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getpgid, #function - .globl getpgid - .align 4 - .fnstart - -getpgid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getpgid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getpid.S b/libc/arch-arm/syscalls/getpid.S deleted file mode 100644 index 1be793a54..000000000 --- a/libc/arch-arm/syscalls/getpid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getpid, #function - .globl getpid - .align 4 - .fnstart - -getpid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getpid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getppid.S b/libc/arch-arm/syscalls/getppid.S deleted file mode 100644 index 14185b990..000000000 --- a/libc/arch-arm/syscalls/getppid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getppid, #function - .globl getppid - .align 4 - .fnstart - -getppid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getppid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getresgid.S b/libc/arch-arm/syscalls/getresgid.S deleted file mode 100644 index 90c90dfec..000000000 --- a/libc/arch-arm/syscalls/getresgid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getresgid, #function - .globl getresgid - .align 4 - .fnstart - -getresgid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getresgid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getresuid.S b/libc/arch-arm/syscalls/getresuid.S deleted file mode 100644 index e067ac0f2..000000000 --- a/libc/arch-arm/syscalls/getresuid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getresuid, #function - .globl getresuid - .align 4 - .fnstart - -getresuid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getresuid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getrlimit.S b/libc/arch-arm/syscalls/getrlimit.S deleted file mode 100644 index 79c135795..000000000 --- a/libc/arch-arm/syscalls/getrlimit.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getrlimit, #function - .globl getrlimit - .align 4 - .fnstart - -getrlimit: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_ugetrlimit - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getrusage.S b/libc/arch-arm/syscalls/getrusage.S deleted file mode 100644 index 81db15356..000000000 --- a/libc/arch-arm/syscalls/getrusage.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getrusage, #function - .globl getrusage - .align 4 - .fnstart - -getrusage: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getrusage - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getsockname.S b/libc/arch-arm/syscalls/getsockname.S deleted file mode 100644 index 2ae08765e..000000000 --- a/libc/arch-arm/syscalls/getsockname.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getsockname, #function - .globl getsockname - .align 4 - .fnstart - -getsockname: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getsockname - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getsockopt.S b/libc/arch-arm/syscalls/getsockopt.S deleted file mode 100644 index 76e1b1108..000000000 --- a/libc/arch-arm/syscalls/getsockopt.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getsockopt, #function - .globl getsockopt - .align 4 - .fnstart - -getsockopt: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_getsockopt - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/gettid.S b/libc/arch-arm/syscalls/gettid.S deleted file mode 100644 index e5da45d4b..000000000 --- a/libc/arch-arm/syscalls/gettid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type gettid, #function - .globl gettid - .align 4 - .fnstart - -gettid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_gettid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/gettimeofday.S b/libc/arch-arm/syscalls/gettimeofday.S deleted file mode 100644 index ba759f29f..000000000 --- a/libc/arch-arm/syscalls/gettimeofday.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type gettimeofday, #function - .globl gettimeofday - .align 4 - .fnstart - -gettimeofday: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_gettimeofday - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/getuid.S b/libc/arch-arm/syscalls/getuid.S deleted file mode 100644 index 68c305761..000000000 --- a/libc/arch-arm/syscalls/getuid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getuid, #function - .globl getuid - .align 4 - .fnstart - -getuid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getuid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/init_module.S b/libc/arch-arm/syscalls/init_module.S deleted file mode 100644 index 4e9cd1f06..000000000 --- a/libc/arch-arm/syscalls/init_module.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type init_module, #function - .globl init_module - .align 4 - .fnstart - -init_module: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_init_module - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/inotify_add_watch.S b/libc/arch-arm/syscalls/inotify_add_watch.S deleted file mode 100644 index 823f32116..000000000 --- a/libc/arch-arm/syscalls/inotify_add_watch.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type inotify_add_watch, #function - .globl inotify_add_watch - .align 4 - .fnstart - -inotify_add_watch: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_inotify_add_watch - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/inotify_init.S b/libc/arch-arm/syscalls/inotify_init.S deleted file mode 100644 index c612b83e4..000000000 --- a/libc/arch-arm/syscalls/inotify_init.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type inotify_init, #function - .globl inotify_init - .align 4 - .fnstart - -inotify_init: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_inotify_init - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/inotify_rm_watch.S b/libc/arch-arm/syscalls/inotify_rm_watch.S deleted file mode 100644 index 6c416d6e4..000000000 --- a/libc/arch-arm/syscalls/inotify_rm_watch.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type inotify_rm_watch, #function - .globl inotify_rm_watch - .align 4 - .fnstart - -inotify_rm_watch: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_inotify_rm_watch - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/klogctl.S b/libc/arch-arm/syscalls/klogctl.S deleted file mode 100644 index aee347493..000000000 --- a/libc/arch-arm/syscalls/klogctl.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type klogctl, #function - .globl klogctl - .align 4 - .fnstart - -klogctl: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_syslog - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/lchown.S b/libc/arch-arm/syscalls/lchown.S deleted file mode 100644 index f8ee79359..000000000 --- a/libc/arch-arm/syscalls/lchown.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type lchown, #function - .globl lchown - .align 4 - .fnstart - -lchown: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_lchown32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/link.S b/libc/arch-arm/syscalls/link.S deleted file mode 100644 index f3685955e..000000000 --- a/libc/arch-arm/syscalls/link.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type link, #function - .globl link - .align 4 - .fnstart - -link: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_link - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/listen.S b/libc/arch-arm/syscalls/listen.S deleted file mode 100644 index d1a8a6e83..000000000 --- a/libc/arch-arm/syscalls/listen.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type listen, #function - .globl listen - .align 4 - .fnstart - -listen: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_listen - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/lseek.S b/libc/arch-arm/syscalls/lseek.S deleted file mode 100644 index 47bf06a46..000000000 --- a/libc/arch-arm/syscalls/lseek.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type lseek, #function - .globl lseek - .align 4 - .fnstart - -lseek: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_lseek - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/lstat.S b/libc/arch-arm/syscalls/lstat.S deleted file mode 100644 index f19d12f84..000000000 --- a/libc/arch-arm/syscalls/lstat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type lstat, #function - .globl lstat - .align 4 - .fnstart - -lstat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_lstat64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/madvise.S b/libc/arch-arm/syscalls/madvise.S deleted file mode 100644 index a992f46b2..000000000 --- a/libc/arch-arm/syscalls/madvise.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type madvise, #function - .globl madvise - .align 4 - .fnstart - -madvise: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_madvise - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mincore.S b/libc/arch-arm/syscalls/mincore.S deleted file mode 100644 index c2b5432a1..000000000 --- a/libc/arch-arm/syscalls/mincore.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mincore, #function - .globl mincore - .align 4 - .fnstart - -mincore: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mincore - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mkdir.S b/libc/arch-arm/syscalls/mkdir.S deleted file mode 100644 index ec8372d06..000000000 --- a/libc/arch-arm/syscalls/mkdir.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mkdir, #function - .globl mkdir - .align 4 - .fnstart - -mkdir: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mkdir - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mkdirat.S b/libc/arch-arm/syscalls/mkdirat.S deleted file mode 100644 index e377c667f..000000000 --- a/libc/arch-arm/syscalls/mkdirat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mkdirat, #function - .globl mkdirat - .align 4 - .fnstart - -mkdirat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mkdirat - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mknod.S b/libc/arch-arm/syscalls/mknod.S deleted file mode 100644 index 0a8b6fa39..000000000 --- a/libc/arch-arm/syscalls/mknod.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mknod, #function - .globl mknod - .align 4 - .fnstart - -mknod: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mknod - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mlock.S b/libc/arch-arm/syscalls/mlock.S deleted file mode 100644 index 4eff70b8d..000000000 --- a/libc/arch-arm/syscalls/mlock.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mlock, #function - .globl mlock - .align 4 - .fnstart - -mlock: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mlock - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mount.S b/libc/arch-arm/syscalls/mount.S deleted file mode 100644 index a2b9f1d8e..000000000 --- a/libc/arch-arm/syscalls/mount.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mount, #function - .globl mount - .align 4 - .fnstart - -mount: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_mount - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mprotect.S b/libc/arch-arm/syscalls/mprotect.S deleted file mode 100644 index b10291eff..000000000 --- a/libc/arch-arm/syscalls/mprotect.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mprotect, #function - .globl mprotect - .align 4 - .fnstart - -mprotect: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mprotect - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/mremap.S b/libc/arch-arm/syscalls/mremap.S deleted file mode 100644 index 397844a63..000000000 --- a/libc/arch-arm/syscalls/mremap.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mremap, #function - .globl mremap - .align 4 - .fnstart - -mremap: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_mremap - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/msync.S b/libc/arch-arm/syscalls/msync.S deleted file mode 100644 index 7ac7cd293..000000000 --- a/libc/arch-arm/syscalls/msync.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type msync, #function - .globl msync - .align 4 - .fnstart - -msync: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_msync - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/munlock.S b/libc/arch-arm/syscalls/munlock.S deleted file mode 100644 index 21ee4d22d..000000000 --- a/libc/arch-arm/syscalls/munlock.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type munlock, #function - .globl munlock - .align 4 - .fnstart - -munlock: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_munlock - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/munmap.S b/libc/arch-arm/syscalls/munmap.S deleted file mode 100644 index 7765b00c6..000000000 --- a/libc/arch-arm/syscalls/munmap.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type munmap, #function - .globl munmap - .align 4 - .fnstart - -munmap: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_munmap - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/nanosleep.S b/libc/arch-arm/syscalls/nanosleep.S deleted file mode 100644 index 1f9b181ff..000000000 --- a/libc/arch-arm/syscalls/nanosleep.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type nanosleep, #function - .globl nanosleep - .align 4 - .fnstart - -nanosleep: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_nanosleep - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/pause.S b/libc/arch-arm/syscalls/pause.S deleted file mode 100644 index 3a16ec3d9..000000000 --- a/libc/arch-arm/syscalls/pause.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type pause, #function - .globl pause - .align 4 - .fnstart - -pause: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_pause - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/pipe.S b/libc/arch-arm/syscalls/pipe.S deleted file mode 100644 index 4edc75e04..000000000 --- a/libc/arch-arm/syscalls/pipe.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type pipe, #function - .globl pipe - .align 4 - .fnstart - -pipe: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_pipe - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/poll.S b/libc/arch-arm/syscalls/poll.S deleted file mode 100644 index 14b18e3d8..000000000 --- a/libc/arch-arm/syscalls/poll.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type poll, #function - .globl poll - .align 4 - .fnstart - -poll: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_poll - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/prctl.S b/libc/arch-arm/syscalls/prctl.S deleted file mode 100644 index 0dd417bb6..000000000 --- a/libc/arch-arm/syscalls/prctl.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type prctl, #function - .globl prctl - .align 4 - .fnstart - -prctl: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_prctl - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/read.S b/libc/arch-arm/syscalls/read.S deleted file mode 100644 index da9d81cdd..000000000 --- a/libc/arch-arm/syscalls/read.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type read, #function - .globl read - .align 4 - .fnstart - -read: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_read - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/readlink.S b/libc/arch-arm/syscalls/readlink.S deleted file mode 100644 index eb8ae8b44..000000000 --- a/libc/arch-arm/syscalls/readlink.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type readlink, #function - .globl readlink - .align 4 - .fnstart - -readlink: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_readlink - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/readv.S b/libc/arch-arm/syscalls/readv.S deleted file mode 100644 index 045648f9e..000000000 --- a/libc/arch-arm/syscalls/readv.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type readv, #function - .globl readv - .align 4 - .fnstart - -readv: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_readv - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/recvfrom.S b/libc/arch-arm/syscalls/recvfrom.S deleted file mode 100644 index 344b60d77..000000000 --- a/libc/arch-arm/syscalls/recvfrom.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type recvfrom, #function - .globl recvfrom - .align 4 - .fnstart - -recvfrom: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_recvfrom - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/recvmsg.S b/libc/arch-arm/syscalls/recvmsg.S deleted file mode 100644 index 0b4b1be75..000000000 --- a/libc/arch-arm/syscalls/recvmsg.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type recvmsg, #function - .globl recvmsg - .align 4 - .fnstart - -recvmsg: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_recvmsg - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/rename.S b/libc/arch-arm/syscalls/rename.S deleted file mode 100644 index 89f23b415..000000000 --- a/libc/arch-arm/syscalls/rename.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type rename, #function - .globl rename - .align 4 - .fnstart - -rename: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_rename - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/renameat.S b/libc/arch-arm/syscalls/renameat.S deleted file mode 100644 index 1807de7a1..000000000 --- a/libc/arch-arm/syscalls/renameat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type renameat, #function - .globl renameat - .align 4 - .fnstart - -renameat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_renameat - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/rmdir.S b/libc/arch-arm/syscalls/rmdir.S deleted file mode 100644 index ac2f4b70f..000000000 --- a/libc/arch-arm/syscalls/rmdir.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type rmdir, #function - .globl rmdir - .align 4 - .fnstart - -rmdir: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_rmdir - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_get_priority_max.S b/libc/arch-arm/syscalls/sched_get_priority_max.S deleted file mode 100644 index e94ec9373..000000000 --- a/libc/arch-arm/syscalls/sched_get_priority_max.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_get_priority_max, #function - .globl sched_get_priority_max - .align 4 - .fnstart - -sched_get_priority_max: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_get_priority_max - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_get_priority_min.S b/libc/arch-arm/syscalls/sched_get_priority_min.S deleted file mode 100644 index e2ae87eaf..000000000 --- a/libc/arch-arm/syscalls/sched_get_priority_min.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_get_priority_min, #function - .globl sched_get_priority_min - .align 4 - .fnstart - -sched_get_priority_min: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_get_priority_min - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_getparam.S b/libc/arch-arm/syscalls/sched_getparam.S deleted file mode 100644 index d9adddcb3..000000000 --- a/libc/arch-arm/syscalls/sched_getparam.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_getparam, #function - .globl sched_getparam - .align 4 - .fnstart - -sched_getparam: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_getparam - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_getscheduler.S b/libc/arch-arm/syscalls/sched_getscheduler.S deleted file mode 100644 index 2a070c1fb..000000000 --- a/libc/arch-arm/syscalls/sched_getscheduler.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_getscheduler, #function - .globl sched_getscheduler - .align 4 - .fnstart - -sched_getscheduler: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_getscheduler - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_rr_get_interval.S b/libc/arch-arm/syscalls/sched_rr_get_interval.S deleted file mode 100644 index 743895358..000000000 --- a/libc/arch-arm/syscalls/sched_rr_get_interval.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_rr_get_interval, #function - .globl sched_rr_get_interval - .align 4 - .fnstart - -sched_rr_get_interval: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_rr_get_interval - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_setparam.S b/libc/arch-arm/syscalls/sched_setparam.S deleted file mode 100644 index 6f7f92da4..000000000 --- a/libc/arch-arm/syscalls/sched_setparam.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_setparam, #function - .globl sched_setparam - .align 4 - .fnstart - -sched_setparam: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_setparam - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_setscheduler.S b/libc/arch-arm/syscalls/sched_setscheduler.S deleted file mode 100644 index 11667c7e3..000000000 --- a/libc/arch-arm/syscalls/sched_setscheduler.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_setscheduler, #function - .globl sched_setscheduler - .align 4 - .fnstart - -sched_setscheduler: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_setscheduler - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sched_yield.S b/libc/arch-arm/syscalls/sched_yield.S deleted file mode 100644 index 6ff0141e9..000000000 --- a/libc/arch-arm/syscalls/sched_yield.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_yield, #function - .globl sched_yield - .align 4 - .fnstart - -sched_yield: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sched_yield - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/select.S b/libc/arch-arm/syscalls/select.S deleted file mode 100644 index 0a0ce5d06..000000000 --- a/libc/arch-arm/syscalls/select.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type select, #function - .globl select - .align 4 - .fnstart - -select: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR__newselect - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sendfile.S b/libc/arch-arm/syscalls/sendfile.S deleted file mode 100644 index 0a1da4f4a..000000000 --- a/libc/arch-arm/syscalls/sendfile.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sendfile, #function - .globl sendfile - .align 4 - .fnstart - -sendfile: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sendfile - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sendmsg.S b/libc/arch-arm/syscalls/sendmsg.S deleted file mode 100644 index eac2d673b..000000000 --- a/libc/arch-arm/syscalls/sendmsg.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sendmsg, #function - .globl sendmsg - .align 4 - .fnstart - -sendmsg: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sendmsg - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sendto.S b/libc/arch-arm/syscalls/sendto.S deleted file mode 100644 index 744891cf0..000000000 --- a/libc/arch-arm/syscalls/sendto.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sendto, #function - .globl sendto - .align 4 - .fnstart - -sendto: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_sendto - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setgid.S b/libc/arch-arm/syscalls/setgid.S deleted file mode 100644 index fdd4ee6f3..000000000 --- a/libc/arch-arm/syscalls/setgid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setgid, #function - .globl setgid - .align 4 - .fnstart - -setgid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setgid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setgroups.S b/libc/arch-arm/syscalls/setgroups.S deleted file mode 100644 index cba9dfb50..000000000 --- a/libc/arch-arm/syscalls/setgroups.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setgroups, #function - .globl setgroups - .align 4 - .fnstart - -setgroups: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setgroups32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setitimer.S b/libc/arch-arm/syscalls/setitimer.S deleted file mode 100644 index b4ad56c6f..000000000 --- a/libc/arch-arm/syscalls/setitimer.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setitimer, #function - .globl setitimer - .align 4 - .fnstart - -setitimer: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setitimer - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setpgid.S b/libc/arch-arm/syscalls/setpgid.S deleted file mode 100644 index 0ec98c6b7..000000000 --- a/libc/arch-arm/syscalls/setpgid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setpgid, #function - .globl setpgid - .align 4 - .fnstart - -setpgid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setpgid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setpriority.S b/libc/arch-arm/syscalls/setpriority.S deleted file mode 100644 index fa4110aa7..000000000 --- a/libc/arch-arm/syscalls/setpriority.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setpriority, #function - .globl setpriority - .align 4 - .fnstart - -setpriority: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setpriority - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setregid.S b/libc/arch-arm/syscalls/setregid.S deleted file mode 100644 index 53d942021..000000000 --- a/libc/arch-arm/syscalls/setregid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setregid, #function - .globl setregid - .align 4 - .fnstart - -setregid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setregid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setresgid.S b/libc/arch-arm/syscalls/setresgid.S deleted file mode 100644 index 0382913da..000000000 --- a/libc/arch-arm/syscalls/setresgid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setresgid, #function - .globl setresgid - .align 4 - .fnstart - -setresgid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setresgid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setresuid.S b/libc/arch-arm/syscalls/setresuid.S deleted file mode 100644 index 266c1a151..000000000 --- a/libc/arch-arm/syscalls/setresuid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setresuid, #function - .globl setresuid - .align 4 - .fnstart - -setresuid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setresuid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setreuid.S b/libc/arch-arm/syscalls/setreuid.S deleted file mode 100644 index 0f94b47de..000000000 --- a/libc/arch-arm/syscalls/setreuid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setreuid, #function - .globl setreuid - .align 4 - .fnstart - -setreuid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setreuid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setrlimit.S b/libc/arch-arm/syscalls/setrlimit.S deleted file mode 100644 index 0a5de4855..000000000 --- a/libc/arch-arm/syscalls/setrlimit.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setrlimit, #function - .globl setrlimit - .align 4 - .fnstart - -setrlimit: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setrlimit - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setsid.S b/libc/arch-arm/syscalls/setsid.S deleted file mode 100644 index e2b0615d4..000000000 --- a/libc/arch-arm/syscalls/setsid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setsid, #function - .globl setsid - .align 4 - .fnstart - -setsid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setsid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setsockopt.S b/libc/arch-arm/syscalls/setsockopt.S deleted file mode 100644 index 01f104f16..000000000 --- a/libc/arch-arm/syscalls/setsockopt.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setsockopt, #function - .globl setsockopt - .align 4 - .fnstart - -setsockopt: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_setsockopt - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/settimeofday.S b/libc/arch-arm/syscalls/settimeofday.S deleted file mode 100644 index 6f7904100..000000000 --- a/libc/arch-arm/syscalls/settimeofday.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type settimeofday, #function - .globl settimeofday - .align 4 - .fnstart - -settimeofday: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_settimeofday - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/setuid.S b/libc/arch-arm/syscalls/setuid.S deleted file mode 100644 index 31cf44690..000000000 --- a/libc/arch-arm/syscalls/setuid.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setuid, #function - .globl setuid - .align 4 - .fnstart - -setuid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_setuid32 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/shutdown.S b/libc/arch-arm/syscalls/shutdown.S deleted file mode 100644 index 5bec030e3..000000000 --- a/libc/arch-arm/syscalls/shutdown.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type shutdown, #function - .globl shutdown - .align 4 - .fnstart - -shutdown: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_shutdown - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sigaction.S b/libc/arch-arm/syscalls/sigaction.S deleted file mode 100644 index 2696f1eaa..000000000 --- a/libc/arch-arm/syscalls/sigaction.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sigaction, #function - .globl sigaction - .align 4 - .fnstart - -sigaction: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sigaction - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sigpending.S b/libc/arch-arm/syscalls/sigpending.S deleted file mode 100644 index 58f565ab2..000000000 --- a/libc/arch-arm/syscalls/sigpending.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sigpending, #function - .globl sigpending - .align 4 - .fnstart - -sigpending: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sigpending - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sigprocmask.S b/libc/arch-arm/syscalls/sigprocmask.S deleted file mode 100644 index f157d76b4..000000000 --- a/libc/arch-arm/syscalls/sigprocmask.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sigprocmask, #function - .globl sigprocmask - .align 4 - .fnstart - -sigprocmask: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sigprocmask - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/socket.S b/libc/arch-arm/syscalls/socket.S deleted file mode 100644 index 93c9a53f8..000000000 --- a/libc/arch-arm/syscalls/socket.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type socket, #function - .globl socket - .align 4 - .fnstart - -socket: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_socket - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/socketpair.S b/libc/arch-arm/syscalls/socketpair.S deleted file mode 100644 index 1bf07d6b5..000000000 --- a/libc/arch-arm/syscalls/socketpair.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type socketpair, #function - .globl socketpair - .align 4 - .fnstart - -socketpair: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_socketpair - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/stat.S b/libc/arch-arm/syscalls/stat.S deleted file mode 100644 index 46afcc567..000000000 --- a/libc/arch-arm/syscalls/stat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type stat, #function - .globl stat - .align 4 - .fnstart - -stat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_stat64 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/symlink.S b/libc/arch-arm/syscalls/symlink.S deleted file mode 100644 index 83b554ea2..000000000 --- a/libc/arch-arm/syscalls/symlink.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type symlink, #function - .globl symlink - .align 4 - .fnstart - -symlink: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_symlink - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/sync.S b/libc/arch-arm/syscalls/sync.S deleted file mode 100644 index 778d38e0c..000000000 --- a/libc/arch-arm/syscalls/sync.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sync, #function - .globl sync - .align 4 - .fnstart - -sync: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_sync - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/times.S b/libc/arch-arm/syscalls/times.S deleted file mode 100644 index c1ab0ce2e..000000000 --- a/libc/arch-arm/syscalls/times.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type times, #function - .globl times - .align 4 - .fnstart - -times: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_times - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/truncate.S b/libc/arch-arm/syscalls/truncate.S deleted file mode 100644 index 674c82837..000000000 --- a/libc/arch-arm/syscalls/truncate.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type truncate, #function - .globl truncate - .align 4 - .fnstart - -truncate: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_truncate - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/umask.S b/libc/arch-arm/syscalls/umask.S deleted file mode 100644 index 6f182596b..000000000 --- a/libc/arch-arm/syscalls/umask.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type umask, #function - .globl umask - .align 4 - .fnstart - -umask: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_umask - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/umount2.S b/libc/arch-arm/syscalls/umount2.S deleted file mode 100644 index 659c3c034..000000000 --- a/libc/arch-arm/syscalls/umount2.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type umount2, #function - .globl umount2 - .align 4 - .fnstart - -umount2: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_umount2 - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/uname.S b/libc/arch-arm/syscalls/uname.S deleted file mode 100644 index fda05e936..000000000 --- a/libc/arch-arm/syscalls/uname.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type uname, #function - .globl uname - .align 4 - .fnstart - -uname: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_uname - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/unlink.S b/libc/arch-arm/syscalls/unlink.S deleted file mode 100644 index 77ae9b788..000000000 --- a/libc/arch-arm/syscalls/unlink.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type unlink, #function - .globl unlink - .align 4 - .fnstart - -unlink: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_unlink - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/unlinkat.S b/libc/arch-arm/syscalls/unlinkat.S deleted file mode 100644 index eb31e8593..000000000 --- a/libc/arch-arm/syscalls/unlinkat.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type unlinkat, #function - .globl unlinkat - .align 4 - .fnstart - -unlinkat: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_unlinkat - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/utimes.S b/libc/arch-arm/syscalls/utimes.S deleted file mode 100644 index 19fe8e256..000000000 --- a/libc/arch-arm/syscalls/utimes.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type utimes, #function - .globl utimes - .align 4 - .fnstart - -utimes: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_utimes - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/vfork.S b/libc/arch-arm/syscalls/vfork.S deleted file mode 100644 index e1417610c..000000000 --- a/libc/arch-arm/syscalls/vfork.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type vfork, #function - .globl vfork - .align 4 - .fnstart - -vfork: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_vfork - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/waitid.S b/libc/arch-arm/syscalls/waitid.S deleted file mode 100644 index 4134e535f..000000000 --- a/libc/arch-arm/syscalls/waitid.S +++ /dev/null @@ -1,21 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type waitid, #function - .globl waitid - .align 4 - .fnstart - -waitid: - mov ip, sp - .save {r4, r5, r6, r7} - stmfd sp!, {r4, r5, r6, r7} - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_waitid - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/write.S b/libc/arch-arm/syscalls/write.S deleted file mode 100644 index 06df33d62..000000000 --- a/libc/arch-arm/syscalls/write.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type write, #function - .globl write - .align 4 - .fnstart - -write: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_write - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-arm/syscalls/writev.S b/libc/arch-arm/syscalls/writev.S deleted file mode 100644 index a6b04db52..000000000 --- a/libc/arch-arm/syscalls/writev.S +++ /dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type writev, #function - .globl writev - .align 4 - .fnstart - -writev: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_writev - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_syscall_errno - .fnend diff --git a/libc/arch-x86/bionic/__get_sp.S b/libc/arch-x86/bionic/__get_sp.S deleted file mode 100644 index aeaaa664e..000000000 --- a/libc/arch-x86/bionic/__get_sp.S +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - .text - .type __get_sp, @function - .global __get_sp - .align 4 - -__get_sp: - mov %esp, %eax - ret diff --git a/libc/arch-x86/bionic/__get_tls.c b/libc/arch-x86/bionic/__get_tls.c deleted file mode 100755 index 5ac6e448b..000000000 --- a/libc/arch-x86/bionic/__get_tls.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* see the implementation of __set_tls and pthread.c to understand this - * code. Basically, the content of gs:[0] always is a pointer to the base - * address of the tls region - */ -void* __get_tls(void) -{ - void* tls; - asm ( " movl %%gs:0, %0" : "=r"(tls) ); - return tls; -} diff --git a/libc/arch-x86/bionic/__set_tls.c b/libc/arch-x86/bionic/__set_tls.c deleted file mode 100755 index 48b55f0e7..000000000 --- a/libc/arch-x86/bionic/__set_tls.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - - -struct user_desc { - unsigned int entry_number; - unsigned long base_addr; - unsigned int limit; - unsigned int seg_32bit:1; - unsigned int contents:2; - unsigned int read_exec_only:1; - unsigned int limit_in_pages:1; - unsigned int seg_not_present:1; - unsigned int useable:1; - unsigned int empty:25; -}; - -extern int __set_thread_area(struct user_desc *u_info); - -/* the following can't be const, since the first call will - * update the 'entry_number' field - */ -static struct user_desc _tls_desc = -{ - -1, - 0, - 0x1000, - 1, - 0, - 0, - 1, - 0, - 1, - 0 -}; - -struct _thread_area_head { - void *self; -}; - -/* we implement thread local storage through the gs: segment descriptor - * we create a segment descriptor for the tls - */ -int __set_tls(void *ptr) -{ - int rc, segment; - - _tls_desc.base_addr = (unsigned long)ptr; - - /* We also need to write the location of the tls to ptr[0] */ - ((struct _thread_area_head *)ptr)->self = ptr; - - rc = __set_thread_area( &_tls_desc ); - if (rc != 0) - { - /* could not set thread local area */ - return -1; - } - - /* this weird computation comes from GLibc */ - segment = _tls_desc.entry_number*8 + 3; - asm __volatile__ ( - " movw %w0, %%gs" :: "q"(segment) - ); - return 0; -} - - - diff --git a/libc/arch-x86/bionic/_exit_with_stack_teardown.S b/libc/arch-x86/bionic/_exit_with_stack_teardown.S deleted file mode 100644 index 83a504dab..000000000 --- a/libc/arch-x86/bionic/_exit_with_stack_teardown.S +++ /dev/null @@ -1,34 +0,0 @@ -#include - -.text -.type _exit_with_stack_teardown, @function -.globl _exit_with_stack_teardown -.align 4 - -/* - * void _exit_with_stack_teardown(void *stackBase, int stackSize, int *retCode) - */ - -_exit_with_stack_teardown: - /* we can trash %ebx here since this call should never return. */ - /* We can also take advantage of the fact that the linux syscall trap - * handler saves all the registers, so we don't need a stack to keep - * the retCode argument for exit while doing the munmap */ - - /* TODO(dmtriyz): No one expects this code to return, so even if - * munmap fails, we have to exit. This should probably be fixed, but - * since ARM side does the same thing, leave it as is. - */ - mov 4(%esp), %ebx /* stackBase */ - mov 8(%esp), %ecx /* stackSize */ - mov 12(%esp), %edx /* retCode, not used for munmap */ - mov $__NR_munmap, %eax - int $0x80 - mov %edx, %ebx /* retrieve the retCode */ - movl $__NR_exit, %eax - int $0x80 - /* exit does not return */ - /* can't have a ret here since we no longer have a usable stack. Seems - * that presently, 'hlt' will cause the program to segfault.. but this - * should never happen :) */ - hlt diff --git a/libc/arch-x86/bionic/_setjmp.S b/libc/arch-x86/bionic/_setjmp.S deleted file mode 100644 index ac62635fd..000000000 --- a/libc/arch-x86/bionic/_setjmp.S +++ /dev/null @@ -1,71 +0,0 @@ -/* $OpenBSD: _setjmp.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -/* - * C library -- _setjmp, _longjmp - * - * _longjmp(a,v) - * will generate a "return(v)" from the last call to - * _setjmp(a) - * by restoring registers from the stack. - * The previous signal state is NOT restored. - */ - -ENTRY(_setjmp) - movl 4(%esp),%eax - movl 0(%esp),%edx - movl %edx, 0(%eax) /* rta */ - movl %ebx, 4(%eax) - movl %esp, 8(%eax) - movl %ebp,12(%eax) - movl %esi,16(%eax) - movl %edi,20(%eax) - xorl %eax,%eax - ret - -ENTRY(_longjmp) - movl 4(%esp),%edx - movl 8(%esp),%eax - movl 0(%edx),%ecx - movl 4(%edx),%ebx - movl 8(%edx),%esp - movl 12(%edx),%ebp - movl 16(%edx),%esi - movl 20(%edx),%edi - testl %eax,%eax - jnz 1f - incl %eax -1: movl %ecx,0(%esp) - ret diff --git a/libc/arch-x86/bionic/atomics_x86.S b/libc/arch-x86/bionic/atomics_x86.S deleted file mode 100644 index 2370f2358..000000000 --- a/libc/arch-x86/bionic/atomics_x86.S +++ /dev/null @@ -1,140 +0,0 @@ -#include - -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 - - -/* - * int __futex_wait(volatile void *ftx, int val, const struct timespec *timeout) - */ -.text -.globl __futex_wait -.type __futex_wait, @function -.align 4 -__futex_wait: - pushl %ebx - pushl %esi - mov 12(%esp), %ebx /* ftx */ - movl $FUTEX_WAIT, %ecx - mov 16(%esp), %edx /* val */ - mov 20(%esp), %esi /* timeout */ - movl $__NR_futex, %eax - int $0x80 - popl %esi - popl %ebx - ret - - -/* int __futex_wake(volatile void *ftx, int count) */ - -.text -.globl __futex_wake -.type __futex_wake, @function -.align 4 -__futex_wake: - pushl %ebx - mov 8(%esp), %ebx /* ftx */ - movl $FUTEX_WAKE, %ecx - mov 12(%esp), %edx /* count */ - movl $__NR_futex, %eax - int $0x80 - popl %ebx - ret - - -/* int __atomic_cmpxchg(int old, int new, volatile int* addr) */ - -.text -.globl __atomic_cmpxchg -.type __atomic_cmpxchg, @function -.align 4 -__atomic_cmpxchg: - mov 4(%esp), %eax /* old */ - mov 8(%esp), %ecx /* new */ - mov 12(%esp), %edx /* addr */ - lock cmpxchg %ecx, (%edx) - jnz 1f - xor %eax, %eax - jmp 2f -1: - movl $1, %eax -2: - ret /* 0 == success, 1 == failure */ - - -/* int __atomic_swap(int new, volatile int* addr) */ - -.text -.globl __atomic_swap -.type __atomic_swap, @function -.align 4 -__atomic_swap: - mov 4(%esp), %ecx /* new */ - mov 8(%esp), %edx /* addr */ - lock xchg %ecx, (%edx) - mov %ecx, %eax - ret - - -/* - * int __atomic_dec(volatile int* addr) - * - * My x86 asm is really rusty.. this is probably suboptimal - */ - -.text -.globl __atomic_dec -.type __atomic_dec, @function -.align 4 -__atomic_dec: - pushl %ebx - pushl %esi - movl 12(%esp), %ebx /* addr */ - -1: - movl (%ebx), %esi /* old = *addr */ - movl %esi, %edx - subl $1, %edx /* new = old - 1 */ - - pushl %ebx - pushl %edx - pushl %esi - call __atomic_cmpxchg - addl $12, %esp - test %eax, %eax - jnz 1b - - movl %esi, %eax /* return old */ - popl %esi - popl %ebx - ret - - -.text -/* int __atomic_inc(volatile int* addr) */ -.globl __atomic_inc -.type __atomic_inc, @function -.align 4 -__atomic_inc: - pushl %ebx - pushl %esi - movl 12(%esp), %ebx /* addr */ - -1: - movl (%ebx), %esi /* old = *addr */ - movl %esi, %edx - addl $1, %edx /* new = old + 1 */ - - pushl %ebx - pushl %edx - pushl %esi - call __atomic_cmpxchg - addl $12, %esp - test %eax, %eax - jnz 1b - - movl %esi, %eax /* return old */ - popl %esi - popl %ebx - ret - diff --git a/libc/arch-x86/bionic/atomics_x86.c b/libc/arch-x86/bionic/atomics_x86.c deleted file mode 100644 index b7b20e6ef..000000000 --- a/libc/arch-x86/bionic/atomics_x86.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -#define FUTEX_SYSCALL 240 -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 - -int __futex_wait(volatile void *ftx, int val) -{ - int ret; - asm volatile ( - "int $0x80;" - : "=a" (ret) - : "0" (FUTEX_SYSCALL), - "b" (ftx), - "c" (FUTEX_WAIT), - "d" (val), - "S" (0) - ); - return ret; -} - -int __futex_wake(volatile void *ftx, int count) -{ - int ret; - asm volatile ( - "int $0x80;" - : "=a" (ret) - : "0" (FUTEX_SYSCALL), - "b" (ftx), - "c" (FUTEX_WAKE), - "d" (count) - ); - return ret; -} - -int __atomic_cmpxchg(int old, int new, volatile int* addr) { - int xchg; - asm volatile ( - "lock;" - "cmpxchg %%ecx, (%%edx);" - "setne %%al;" - : "=a" (xchg) - : "a" (old), - "c" (new), - "d" (addr) - ); - return xchg; -} - -int __atomic_swap(int new, volatile int* addr) { - int old; - asm volatile ( - "lock;" - "xchg %%ecx, (%%edx);" - : "=c" (old) - : "c" (new), - "d" (addr) - ); - return old; -} - -int __atomic_dec(volatile int* addr) { - int old; - do { - old = *addr; - } while (atomic_cmpxchg(old, old-1, addr)); - return old; -} - -int __atomic_inc(volatile int* addr) { - int old; - do { - old = *addr; - } while (atomic_cmpxchg(old, old+1, addr)); - return old; -} - diff --git a/libc/arch-x86/bionic/clone.S b/libc/arch-x86/bionic/clone.S deleted file mode 100644 index 361808ded..000000000 --- a/libc/arch-x86/bionic/clone.S +++ /dev/null @@ -1,50 +0,0 @@ -#include - -.text - -/* - * int __pthread_clone(int (*fn)(void*), void *tls, int flags, - * void *arg); - */ -.globl __pthread_clone -.type __pthread_clone, @function -.align 4 -__pthread_clone: - pushl %ebx - pushl %ecx - movl 16(%esp), %ecx - movl 20(%esp), %ebx - - # insert arguments onto the child stack - movl 12(%esp), %eax - movl %eax, -12(%ecx) - movl 24(%esp), %eax - movl %eax, -8(%ecx) - lea (%ecx), %eax - movl %eax, -4(%ecx) - - movl $__NR_clone, %eax - int $0x80 - test %eax, %eax - jns 1f - - # an error occured, set errno and return -1 - negl %eax - call __set_errno - orl $-1, %eax - jmp 2f - -1: - jnz 2f - - # we're in the child thread now, call __thread_entry - # with the appropriate arguments on the child stack - # we already placed most of them - subl $16, %esp - jmp __thread_entry - hlt - -2: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/bionic/crtbegin_dynamic.S b/libc/arch-x86/bionic/crtbegin_dynamic.S deleted file mode 100644 index 3b47b18ef..000000000 --- a/libc/arch-x86/bionic/crtbegin_dynamic.S +++ /dev/null @@ -1,96 +0,0 @@ -# bionic/arch-x86/bionic/crtbegin_dynamic.S -# -# Copyright 2006, The Android Open Source Project -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of Google Inc. nor the names of its contributors may -# be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - .text - .align 4 - .type _start, @function - .globl _start - -# this is the small startup code that is first run when -# any executable that is statically-linked with Bionic -# runs. -# -# it's purpose is to call __libc_init with appropriate -# arguments, which are: -# -# - the address of the raw data block setup by the Linux -# kernel ELF loader -# -# - address of an "onexit" function, not used on any -# platform supported by Bionic -# -# - address of the "main" function of the program. We -# can't hard-code it in the adr pseudo instruction -# so we use a tiny trampoline that will get relocated -# by the dynamic linker before this code runs -# -# - address of the constructor list -# -_start: - mov %esp, %eax - mov $1f, %edx - pushl %edx - mov $0f, %edx - pushl %edx - mov $0, %edx - pushl %edx - pushl %eax - call __libc_init - -0: - jmp main - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - -# the .ctors section contains a list of pointers to "constructor" -# functions that need to be called in order during C library initialization, -# just before the program is being run. This is a C++ requirement -# -# the last entry shall be 0, and is defined in crtend.S -# - .section .preinit_array, "aw" - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - - .section .ctors, "aw" - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - diff --git a/libc/arch-x86/bionic/crtbegin_so.S b/libc/arch-x86/bionic/crtbegin_so.S deleted file mode 100644 index d49e9df83..000000000 --- a/libc/arch-x86/bionic/crtbegin_so.S +++ /dev/null @@ -1,29 +0,0 @@ -/* we put the _init() function here in case the user files for the shared - * libs want to drop things into .init section. - * We then will call our ctors from crtend_so.o */ -.section .init -.align 4 -.type _init, @function -.globl _init -_init: - -.section .init_array, "aw" -.align 4 -.type __INIT_ARRAY__, @object -.globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - -.section .fini_array, "aw" -.align 4 -.type __FINI_ARRAY__, @object -.globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - -.section .ctors, "aw" -.align 4 -.type __CTOR_LIST__, @object -.globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 diff --git a/libc/arch-x86/bionic/crtbegin_static.S b/libc/arch-x86/bionic/crtbegin_static.S deleted file mode 100644 index eb4acee8f..000000000 --- a/libc/arch-x86/bionic/crtbegin_static.S +++ /dev/null @@ -1,95 +0,0 @@ -# bionic/arch-x86/bionic/crtbegin_static.S -# -# Copyright 2006, The Android Open Source Project -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of Google Inc. nor the names of its contributors may -# be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - .text - .align 4 - .type _start, @function - .globl _start - -# this is the small startup code that is first run when -# any executable that is statically-linked with Bionic -# runs. -# -# it's purpose is to call __libc_init with appropriate -# arguments, which are: -# -# - the address of the raw data block setup by the Linux -# kernel ELF loader -# -# - address of an "onexit" function, not used on any -# platform supported by Bionic -# -# - address of the "main" function of the program. We -# can't hard-code it in the adr pseudo instruction -# so we use a tiny trampoline that will get relocated -# by the dynamic linker before this code runs -# -# - address of the constructor list -# -_start: - mov %esp, %eax - mov $1f, %edx - pushl %edx - mov $0f, %edx - pushl %edx - mov $0, %edx - pushl %edx - pushl %eax - call __libc_init - -0: jmp main - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - -# the .ctors section contains a list of pointers to "constructor" -# functions that need to be called in order during C library initialization, -# just before the program is being run. This is a C++ requirement -# -# the last entry shall be 0, and is defined in crtend.S -# - .section .preinit_array, "aw" - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - - .section .ctors, "aw" - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - diff --git a/libc/arch-x86/bionic/crtend.S b/libc/arch-x86/bionic/crtend.S deleted file mode 100644 index 7f5fb6660..000000000 --- a/libc/arch-x86/bionic/crtend.S +++ /dev/null @@ -1,13 +0,0 @@ - - .section .preinit_array, "aw" - .long 0 - - .section .init_array, "aw" - .long 0 - - .section .fini_array, "aw" - .long 0 - - .section .ctors, "aw" - .long 0 - diff --git a/libc/arch-x86/bionic/crtend_so.S b/libc/arch-x86/bionic/crtend_so.S deleted file mode 100644 index 7fb228083..000000000 --- a/libc/arch-x86/bionic/crtend_so.S +++ /dev/null @@ -1,47 +0,0 @@ -.text -.align 4 -.type __bionic_call_ctors, @function - -/* - * The CTORS_LIST is marked by -1 (start) and 0 (end). - * We mark the end of the .ctors section with the __CTOR_END__ section so - * that we can just iterate backwards from it until we hit -1 and execute - * all the function pointers. This seems to be the way to do it for SVR4 - * derived systems. - */ -__bionic_call_ctors: - pushl %esi - mov $__CTOR_END__, %esi - -0: - /* now grab the next function pointer and check if its -1. If not, - * call it, otherwise we're done. We use %esi since it's callee saved. - */ - subl $4, %esi - mov (%esi), %eax - cmp $0xffffffff, %eax - je 1f - call *%eax - jmp 0b - -1: - /* we're done */ - popl %esi - ret - -.section .init -.align 4 - call __bionic_call_ctors - ret - -.section .ctors, "aw", @progbits -.align 4 -.type __CTOR_END__, @object -__CTOR_END__: - .long 0 - -.section .init_array, "aw" - .long 0 - -.section .fini_array, "aw" - .long 0 diff --git a/libc/arch-x86/bionic/dl_iterate_phdr_static.c b/libc/arch-x86/bionic/dl_iterate_phdr_static.c deleted file mode 100644 index fd1210682..000000000 --- a/libc/arch-x86/bionic/dl_iterate_phdr_static.c +++ /dev/null @@ -1,74 +0,0 @@ -/* bionic/arch-x86/bionic/dl_iterate_phdr_static.c -** -** Copyright 2006, The Android Open Source Project -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** * Neither the name of Google Inc. nor the names of its contributors may -** be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -** EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include -#include - -/* TODO: Move this into a header that linker.h can also pull it in. - * Silly to have same struct in 2 places. This is temporary. */ -struct dl_phdr_info -{ - Elf32_Addr dlpi_addr; - const char *dlpi_name; - const Elf32_Phdr *dlpi_phdr; - Elf32_Half dlpi_phnum; -}; - -/* Dynamic binaries get this from the dynamic linker (system/linker), which - * we don't pull in for static bins. We also don't have a list of so's to - * iterate over, since there's really only a single monolithic blob of - * code/data. - * - * All we need to do is to find where the executable is in memory, and grab the - * phdr and phnum from there. - */ - -/* ld provides this to us in the default link script */ -extern void *__executable_start; - -int -dl_iterate_phdr(int (*cb)(struct dl_phdr_info *info, size_t size, void *data), - void *data) -{ - struct dl_phdr_info dl_info; - Elf32_Ehdr *ehdr = (Elf32_Ehdr *) &__executable_start; - Elf32_Phdr *phdr = (Elf32_Phdr *)((unsigned long)ehdr + ehdr->e_phoff); - - /* TODO: again, copied from linker.c. Find a better home for this - * later. */ - if (ehdr->e_ident[EI_MAG0] != ELFMAG0) return -1; - if (ehdr->e_ident[EI_MAG1] != ELFMAG1) return -1; - if (ehdr->e_ident[EI_MAG2] != ELFMAG2) return -1; - if (ehdr->e_ident[EI_MAG3] != ELFMAG3) return -1; - - dl_info.dlpi_addr = 0; - dl_info.dlpi_name = NULL; - dl_info.dlpi_phdr = phdr; - dl_info.dlpi_phnum = ehdr->e_phnum; - return cb(&dl_info, sizeof (struct dl_phdr_info), data); -} - diff --git a/libc/arch-x86/bionic/setjmp.S b/libc/arch-x86/bionic/setjmp.S deleted file mode 100644 index bcb5f9d5e..000000000 --- a/libc/arch-x86/bionic/setjmp.S +++ /dev/null @@ -1,93 +0,0 @@ -/* $OpenBSD: setjmp.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -/* - * C library -- setjmp, longjmp - * - * longjmp(a,v) - * will generate a "return(v)" from the last call to - * setjmp(a) - * by restoring registers from the stack. - * The previous signal state is restored. - */ - -ENTRY(setjmp) - PIC_PROLOGUE - pushl $0 -#ifdef PIC - call PIC_PLT(_C_LABEL(sigblock)) -#else - call _C_LABEL(sigblock) -#endif - addl $4,%esp - PIC_EPILOGUE - - movl 4(%esp),%ecx - movl 0(%esp),%edx - movl %edx, 0(%ecx) - movl %ebx, 4(%ecx) - movl %esp, 8(%ecx) - movl %ebp,12(%ecx) - movl %esi,16(%ecx) - movl %edi,20(%ecx) - movl %eax,24(%ecx) - xorl %eax,%eax - ret - -ENTRY(longjmp) - movl 4(%esp),%edx - PIC_PROLOGUE - pushl 24(%edx) -#ifdef PIC - call PIC_PLT(_C_LABEL(sigsetmask)) -#else - call _C_LABEL(sigsetmask) -#endif - addl $4,%esp - PIC_EPILOGUE - - movl 4(%esp),%edx - movl 8(%esp),%eax - movl 0(%edx),%ecx - movl 4(%edx),%ebx - movl 8(%edx),%esp - movl 12(%edx),%ebp - movl 16(%edx),%esi - movl 20(%edx),%edi - testl %eax,%eax - jnz 1f - incl %eax -1: movl %ecx,0(%esp) - ret diff --git a/libc/arch-x86/bionic/vfork.S b/libc/arch-x86/bionic/vfork.S deleted file mode 100644 index 53910aba3..000000000 --- a/libc/arch-x86/bionic/vfork.S +++ /dev/null @@ -1,30 +0,0 @@ -#include - -#ifndef __NR_vfork -#define __NR_vfork 190 -#endif - - - .text - .type vfork, @function - .globl vfork - .align 4 - -/* Get rid of the stack modifications (popl/ret) after vfork() success. - * vfork is VERY sneaky. One has to be very careful about what can be done - * between a successful vfork and a a subsequent execve() - */ - -vfork: - /* grab the return address */ - popl %ecx - movl $__NR_vfork, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - orl $-1, %eax -1: - jmp *%ecx diff --git a/libc/arch-x86/include/endian.h b/libc/arch-x86/include/endian.h deleted file mode 100644 index ad37919f3..000000000 --- a/libc/arch-x86/include/endian.h +++ /dev/null @@ -1,70 +0,0 @@ -/* $OpenBSD: endian.h,v 1.14 2005/12/13 00:35:23 millert Exp $ */ - -/*- - * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _I386_ENDIAN_H_ -#define _I386_ENDIAN_H_ - -#ifdef __GNUC__ - -#if defined(_KERNEL) && !defined(I386_CPU) -#define __swap32md(x) ({ \ - u_int32_t __swap32md_x = (x); \ - \ - __asm ("bswap %1" : "+r" (__swap32md_x)); \ - __swap32md_x; \ -}) -#else -#define __swap32md(x) ({ \ - u_int32_t __swap32md_x = (x); \ - \ - __asm ("rorw $8, %w1; rorl $16, %1; rorw $8, %w1" : \ - "+r" (__swap32md_x)); \ - __swap32md_x; \ -}) -#endif /* _KERNEL && !I386_CPU */ - -#define __swap64md(x) ({ \ - u_int64_t __swap64md_x = (x); \ - \ - (u_int64_t)__swap32md(__swap64md_x >> 32) | \ - (u_int64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \ -}) -#define __swap16md(x) ({ \ - u_int16_t __swap16md_x = (x); \ - \ - __asm ("rorw $8, %w1" : "+r" (__swap16md_x)); \ - __swap16md_x; \ -}) - -/* Tell sys/endian.h we have MD variants of the swap macros. */ -#define MD_SWAP - -#endif /* __GNUC__ */ - -#define _BYTE_ORDER _LITTLE_ENDIAN -#include - -#endif /* _I386_ENDIAN_H_ */ diff --git a/libc/arch-x86/include/machine/_types.h b/libc/arch-x86/include/machine/_types.h deleted file mode 100644 index 3a31e22d8..000000000 --- a/libc/arch-x86/include/machine/_types.h +++ /dev/null @@ -1,123 +0,0 @@ -/* $OpenBSD: _types.h,v 1.2 2006/01/13 17:50:06 millert Exp $ */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)types.h 8.3 (Berkeley) 1/5/94 - * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - */ - -#ifndef _I386__TYPES_H_ -#define _I386__TYPES_H_ - -/* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ -#define _SIZE_T -#define _PTRDIFF_T -typedef unsigned int size_t; -typedef int ptrdiff_t; - -#define _OFF_T_DEFINED_ -#define _SIZE_T_DEFINED_ - -#include - -/* 7.18.1.1 Exact-width integer types */ -typedef __signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short __int16_t; -typedef unsigned short __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; -/* LONGLONG */ -typedef long long __int64_t; -/* LONGLONG */ -typedef unsigned long long __uint64_t; - -/* 7.18.1.2 Minimum-width integer types */ -typedef __int8_t __int_least8_t; -typedef __uint8_t __uint_least8_t; -typedef __int16_t __int_least16_t; -typedef __uint16_t __uint_least16_t; -typedef __int32_t __int_least32_t; -typedef __uint32_t __uint_least32_t; -typedef __int64_t __int_least64_t; -typedef __uint64_t __uint_least64_t; - -/* 7.18.1.3 Fastest minimum-width integer types */ -typedef __int32_t __int_fast8_t; -typedef __uint32_t __uint_fast8_t; -typedef __int32_t __int_fast16_t; -typedef __uint32_t __uint_fast16_t; -typedef __int32_t __int_fast32_t; -typedef __uint32_t __uint_fast32_t; -typedef __int64_t __int_fast64_t; -typedef __uint64_t __uint_fast64_t; - -/* 7.18.1.4 Integer types capable of holding object pointers */ -typedef int __intptr_t; -typedef unsigned int __uintptr_t; - -/* 7.18.1.5 Greatest-width integer types */ -typedef __int64_t __intmax_t; -typedef __uint64_t __uintmax_t; - -/* Register size */ -typedef __int32_t __register_t; - -/* VM system types */ -typedef unsigned long __vaddr_t; -typedef unsigned long __paddr_t; -typedef unsigned long __vsize_t; -typedef unsigned long __psize_t; - -/* Standard system types */ -typedef int __clock_t; -typedef int __clockid_t; -typedef long __ptrdiff_t; -typedef int __time_t; -typedef int __timer_t; -#if defined(__GNUC__) && __GNUC__ >= 3 -typedef __builtin_va_list __va_list; -#else -typedef char * __va_list; -#endif - -/* Wide character support types */ -#ifndef __cplusplus -typedef int __wchar_t; -#endif -typedef int __wint_t; -typedef int __rune_t; -typedef void * __wctrans_t; -typedef void * __wctype_t; - -/* Feature test macros */ -#define __HAVE_CPUINFO -#define __HAVE_MUTEX - -#endif /* _I386__TYPES_H_ */ diff --git a/libc/arch-x86/include/machine/asm.h b/libc/arch-x86/include/machine/asm.h deleted file mode 100644 index 7a23060a9..000000000 --- a/libc/arch-x86/include/machine/asm.h +++ /dev/null @@ -1,124 +0,0 @@ -/* $OpenBSD: asm.h,v 1.8 2004/06/13 21:49:16 niklas Exp $ */ -/* $NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)asm.h 5.5 (Berkeley) 5/7/91 - */ - -#ifndef _I386_ASM_H_ -#define _I386_ASM_H_ - -/* This is borrowed from FreeBSD /src/sys/i386/include/asmacros.h v1.27 */ -/* - * CNAME and HIDENAME manage the relationship between symbol names in C - * and the equivalent assembly language names. CNAME is given a name as - * it would be used in a C program. It expands to the equivalent assembly - * language name. HIDENAME is given an assembly-language name, and expands - * to a possibly-modified form that will be invisible to C programs. - */ -#define CNAME(csym) csym -#define HIDENAME(asmsym) .asmsym - -#ifdef PIC -#define PIC_PROLOGUE \ - pushl %ebx; \ - call 666f; \ -666: \ - popl %ebx; \ - addl $_C_LABEL(_GLOBAL_OFFSET_TABLE_)+[.-666b], %ebx -#define PIC_EPILOGUE \ - popl %ebx -#define PIC_PLT(x) x@PLT -#define PIC_GOT(x) x@GOT(%ebx) -#define PIC_GOTOFF(x) x@GOTOFF(%ebx) -#else -#define PIC_PROLOGUE -#define PIC_EPILOGUE -#define PIC_PLT(x) x -#define PIC_GOT(x) x -#define PIC_GOTOFF(x) x -#endif - -#define _C_LABEL(name) name -#define _ASM_LABEL(x) x - -#define CVAROFF(x, y) _C_LABEL(x) + y - -#ifdef __STDC__ -# define __CONCAT(x,y) x ## y -# define __STRING(x) #x -#else -# define __CONCAT(x,y) x/**/y -# define __STRING(x) "x" -#endif - -/* - * WEAK ALIAS: create a weak alias - */ -#define WEAK_ALIAS(alias,sym) \ - .weak alias; \ - alias = sym - -/* - * WARN_REFERENCES: create a warning if the specified symbol is referenced - */ -#define WARN_REFERENCES(_sym,_msg) \ - .section .gnu.warning. ## _sym ; .ascii _msg ; .text - -/* let kernels and others override entrypoint alignment */ -#ifndef _ALIGN_TEXT -# define _ALIGN_TEXT .align 2, 0x90 -#endif - -#define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,@function; x: - -#ifdef GPROF -# define _PROF_PROLOGUE \ - pushl %ebp; movl %esp,%ebp; call PIC_PLT(mcount); popl %ebp -#else -# define _PROF_PROLOGUE -#endif - -#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE -#define NENTRY(y) _ENTRY(_C_LABEL(y)) -#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE - -#define ALTENTRY(name) .globl _C_LABEL(name); _C_LABEL(name): - -#define ASMSTR .asciz - -#define RCSID(x) .text; .asciz x -#define __FBSDID(x) RCSID(x) - -#endif /* !_I386_ASM_H_ */ diff --git a/libc/arch-x86/include/machine/cdefs.h b/libc/arch-x86/include/machine/cdefs.h deleted file mode 100644 index 6efee6ac4..000000000 --- a/libc/arch-x86/include/machine/cdefs.h +++ /dev/null @@ -1,24 +0,0 @@ -/* $OpenBSD: cdefs.h,v 1.9 2005/11/24 20:46:45 deraadt Exp $ */ - -/* - * Written by J.T. Conklin 01/17/95. - * Public domain. - */ - -#ifndef _MACHINE_CDEFS_H_ -#define _MACHINE_CDEFS_H_ - -#if defined(lint) -#define __indr_reference(sym,alias) __lint_equal__(sym,alias) -#define __warn_references(sym,msg) -#define __weak_alias(alias,sym) __lint_equal__(sym,alias) -#elif defined(__GNUC__) && defined(__STDC__) -#define __weak_alias(alias,sym) \ - __asm__(".weak " __STRING(alias) " ; " \ - __STRING(alias) " = " __STRING(sym)); -#define __warn_references(sym,msg) \ - __asm__(".section .gnu.warning." __STRING(sym) \ - " ; .ascii \"" msg "\" ; .text"); -#endif - -#endif /* !_MACHINE_CDEFS_H_ */ diff --git a/libc/arch-x86/include/machine/exec.h b/libc/arch-x86/include/machine/exec.h deleted file mode 100644 index d09174191..000000000 --- a/libc/arch-x86/include/machine/exec.h +++ /dev/null @@ -1,51 +0,0 @@ -/* $OpenBSD: exec.h,v 1.9 2003/04/17 03:42:14 drahn Exp $ */ -/* $NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $ */ - -/* - * Copyright (c) 1993 Christopher G. Demetriou - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _I386_EXEC_H_ -#define _I386_EXEC_H_ - -#define __LDPGSZ 4096 - -#define NATIVE_EXEC_ELF - -#define ARCH_ELFSIZE 32 - -#define ELF_TARG_CLASS ELFCLASS32 -#define ELF_TARG_DATA ELFDATA2LSB -#define ELF_TARG_MACH EM_386 /* XXX - EM_486 is currently unused - by all OSs/compilers/linkers */ - -#define _NLIST_DO_AOUT -#define _NLIST_DO_ELF - -#define _KERN_DO_AOUT -#define _KERN_DO_ELF - -#endif /* _I386_EXEC_H_ */ diff --git a/libc/arch-x86/include/machine/ieee.h b/libc/arch-x86/include/machine/ieee.h deleted file mode 100644 index 55b370327..000000000 --- a/libc/arch-x86/include/machine/ieee.h +++ /dev/null @@ -1,133 +0,0 @@ -/* $OpenBSD: ieee.h,v 1.2 2003/06/02 23:27:47 millert Exp $ */ -/* $NetBSD: ieee.h,v 1.1 1996/09/30 16:34:25 ws Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ieee.h 8.1 (Berkeley) 6/11/93 - */ - -/* - * ieee.h defines the machine-dependent layout of the machine's IEEE - * floating point. It does *not* define (yet?) any of the rounding - * mode bits, exceptions, and so forth. - */ - -/* - * Define the number of bits in each fraction and exponent. - * - * k k+1 - * Note that 1.0 x 2 == 0.1 x 2 and that denorms are represented - * - * (-exp_bias+1) - * as fractions that look like 0.fffff x 2 . This means that - * - * -126 - * the number 0.10000 x 2 , for instance, is the same as the normalized - * - * -127 -128 - * float 1.0 x 2 . Thus, to represent 2 , we need one leading zero - * - * -129 - * in the fraction; to represent 2 , we need two, and so on. This - * - * (-exp_bias-fracbits+1) - * implies that the smallest denormalized number is 2 - * - * for whichever format we are talking about: for single precision, for - * - * -126 -149 - * instance, we get .00000000000000000000001 x 2 , or 1.0 x 2 , and - * - * -149 == -127 - 23 + 1. - */ -#define SNG_EXPBITS 8 -#define SNG_FRACBITS 23 - -#define DBL_EXPBITS 11 -#define DBL_FRACBITS 52 - -#define EXT_EXPBITS 15 -#define EXT_FRACBITS 112 - -struct ieee_single { - u_int sng_frac:23; - u_int sng_exp:8; - u_int sng_sign:1; -}; - -struct ieee_double { - u_int dbl_fracl; - u_int dbl_frach:20; - u_int dbl_exp:11; - u_int dbl_sign:1; -}; - -struct ieee_ext { - u_int ext_fracl; - u_int ext_fraclm; - u_int ext_frachm; - u_int ext_frach:16; - u_int ext_exp:15; - u_int ext_sign:1; -}; - -/* - * Floats whose exponent is in [1..INFNAN) (of whatever type) are - * `normal'. Floats whose exponent is INFNAN are either Inf or NaN. - * Floats whose exponent is zero are either zero (iff all fraction - * bits are zero) or subnormal values. - * - * A NaN is a `signalling NaN' if its QUIETNAN bit is clear in its - * high fraction; if the bit is set, it is a `quiet NaN'. - */ -#define SNG_EXP_INFNAN 255 -#define DBL_EXP_INFNAN 2047 -#define EXT_EXP_INFNAN 32767 - -#if 0 -#define SNG_QUIETNAN (1 << 22) -#define DBL_QUIETNAN (1 << 19) -#define EXT_QUIETNAN (1 << 15) -#endif - -/* - * Exponent biases. - */ -#define SNG_EXP_BIAS 127 -#define DBL_EXP_BIAS 1023 -#define EXT_EXP_BIAS 16383 diff --git a/libc/arch-x86/include/machine/internal_types.h b/libc/arch-x86/include/machine/internal_types.h deleted file mode 100644 index 4d1833cf8..000000000 --- a/libc/arch-x86/include/machine/internal_types.h +++ /dev/null @@ -1,6 +0,0 @@ -/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */ -/* Public domain */ -#ifndef _MACHINE_INTERNAL_TYPES_H_ -#define _MACHINE_INTERNAL_TYPES_H_ - -#endif diff --git a/libc/arch-x86/include/machine/kernel.h b/libc/arch-x86/include/machine/kernel.h deleted file mode 100644 index 19d157728..000000000 --- a/libc/arch-x86/include/machine/kernel.h +++ /dev/null @@ -1,41 +0,0 @@ -/* bionic/arch-arm/include/machine/kernel.h -** -** Copyright 2006-2008, The Android Open Source Project -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** * Neither the name of Google Inc. nor the names of its contributors may -** be used to endorse or promote products derived from this software -** without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY Google Inc. ``AS IS'' AND ANY EXPRESS OR -** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -** EVENT SHALL Google Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#ifndef _ARCH_X86_KERNEL_H -#define _ARCH_X86_KERNEL_H - -/* this file contains kernel-specific definitions that were optimized out of - our processed kernel headers, but still useful nonetheless... */ - -typedef unsigned long __kernel_blkcnt_t; -typedef unsigned long __kernel_blksize_t; - -/* these aren't really defined by the kernel headers though... */ -typedef unsigned long __kernel_fsblkcnt_t; -typedef unsigned long __kernel_fsfilcnt_t; -typedef unsigned int __kernel_id_t; - -#endif /* _ARCH_X86_KERNEL_H */ diff --git a/libc/arch-x86/include/machine/limits.h b/libc/arch-x86/include/machine/limits.h deleted file mode 100644 index 86fd85482..000000000 --- a/libc/arch-x86/include/machine/limits.h +++ /dev/null @@ -1,63 +0,0 @@ -/* $OpenBSD: limits.h,v 1.11 2006/01/06 22:48:47 millert Exp $ */ -/* $NetBSD: limits.h,v 1.11 1995/12/21 01:08:59 mycroft Exp $ */ - -/* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)limits.h 7.2 (Berkeley) 6/28/90 - */ - -#ifndef _MACHINE_LIMITS_H_ -#define _MACHINE_LIMITS_H_ - -#include - -#define MB_LEN_MAX 1 /* no multibyte characters */ - -#ifndef SIZE_MAX -#define SIZE_MAX UINT_MAX /* max value for a size_t */ -#endif -#ifndef SSIZE_MAX -#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ -#endif - -#if __BSD_VISIBLE -#define SIZE_T_MAX UINT_MAX /* max value for a size_t (historic) */ - -#define UQUAD_MAX 0xffffffffffffffffULL /* max unsigned quad */ -#define QUAD_MAX 0x7fffffffffffffffLL /* max signed quad */ -#define QUAD_MIN (-0x7fffffffffffffffLL-1) /* min signed quad */ - -#endif /* __BSD_VISIBLE */ - -#define LONGLONG_BIT 64 -#define LONGLONG_MIN (-9223372036854775807LL-1) -#define LONGLONG_MAX 9223372036854775807LL -#define ULONGLONG_MAX 18446744073709551615ULL - -#endif /* _MACHINE_LIMITS_H_ */ diff --git a/libc/arch-x86/include/machine/setjmp.h b/libc/arch-x86/include/machine/setjmp.h deleted file mode 100644 index ded095da9..000000000 --- a/libc/arch-x86/include/machine/setjmp.h +++ /dev/null @@ -1,8 +0,0 @@ -/* $OpenBSD: setjmp.h,v 1.2 2000/08/05 22:07:32 niklas Exp $ */ -/* $NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:43 cgd Exp $ */ - -/* - * machine/setjmp.h: machine dependent setjmp-related information. - */ - -#define _JBLEN 10 /* size, in longs, of a jmp_buf */ diff --git a/libc/arch-x86/string/bcmp.S b/libc/arch-x86/string/bcmp.S deleted file mode 100644 index a5b46ae74..000000000 --- a/libc/arch-x86/string/bcmp.S +++ /dev/null @@ -1,32 +0,0 @@ -/* $OpenBSD: bcmp.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(bcmp) - pushl %edi - pushl %esi - movl 12(%esp),%edi - movl 16(%esp),%esi - xorl %eax,%eax /* clear return value */ - cld /* set compare direction forward */ - - movl 20(%esp),%ecx /* compare by words */ - shrl $2,%ecx - repe - cmpsl - jne L1 - - movl 20(%esp),%ecx /* compare remainder by bytes */ - andl $3,%ecx - repe - cmpsb - je L2 - -L1: incl %eax -L2: popl %esi - popl %edi - ret diff --git a/libc/arch-x86/string/bcopy.S b/libc/arch-x86/string/bcopy.S deleted file mode 100644 index dde5ae111..000000000 --- a/libc/arch-x86/string/bcopy.S +++ /dev/null @@ -1,93 +0,0 @@ -/* $OpenBSD: bcopy.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from locore.s. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - - /* - * (ov)bcopy (src,dst,cnt) - * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 - */ - -#ifdef MEMCOPY -ENTRY(memcpy) -#else -#ifdef MEMMOVE -ENTRY(memmove) -#else -ENTRY(bcopy) -#endif -#endif - pushl %esi - pushl %edi -#if defined(MEMCOPY) || defined(MEMMOVE) - movl 12(%esp),%edi - movl 16(%esp),%esi - movl %edi, %eax -#else - movl 12(%esp),%esi - movl 16(%esp),%edi -#endif - movl 20(%esp),%ecx - movl %ecx,%edx - cmpl %esi,%edi /* potentially overlapping? */ - jnb 1f - cld /* nope, copy forwards. */ - shrl $2,%ecx /* copy by words */ - rep - movsl - movl %edx,%ecx - andl $3,%ecx /* any bytes left? */ - rep - movsb - popl %edi - popl %esi - ret -1: - addl %ecx,%edi /* copy backwards. */ - addl %ecx,%esi - std - andl $3,%ecx /* any fractional bytes? */ - decl %edi - decl %esi - rep - movsb - movl %edx,%ecx - shrl $2,%ecx - subl $3,%esi - subl $3,%edi - rep - movsl - popl %edi - popl %esi - cld - ret diff --git a/libc/arch-x86/string/bzero.S b/libc/arch-x86/string/bzero.S deleted file mode 100644 index 2ec9c7dd6..000000000 --- a/libc/arch-x86/string/bzero.S +++ /dev/null @@ -1,43 +0,0 @@ -/* $OpenBSD: bzero.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(bzero) - pushl %edi - movl 8(%esp),%edi - movl 12(%esp),%edx - - cld /* set fill direction forward */ - xorl %eax,%eax /* set fill data to 0 */ - - /* - * if the string is too short, it's really not worth the overhead - * of aligning to word boundries, etc. So we jump to a plain - * unaligned set. - */ - cmpl $16,%edx - jb L1 - - movl %edi,%ecx /* compute misalignment */ - negl %ecx - andl $3,%ecx - subl %ecx,%edx - rep /* zero until word aligned */ - stosb - - movl %edx,%ecx /* zero by words */ - shrl $2,%ecx - andl $3,%edx - rep - stosl - -L1: movl %edx,%ecx /* zero remainder by bytes */ - rep - stosb - - popl %edi - ret diff --git a/libc/arch-x86/string/fss.S b/libc/arch-x86/string/fss.S deleted file mode 100644 index 96affabed..000000000 --- a/libc/arch-x86/string/fss.S +++ /dev/null @@ -1,17 +0,0 @@ -/* $OpenBSD: ffs.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(ffs) - bsfl 4(%esp),%eax - jz L1 /* ZF is set if all bits are 0 */ - incl %eax /* bits numbered from 1, not 0 */ - ret - - .align 2 -L1: xorl %eax,%eax /* clear result */ - ret diff --git a/libc/arch-x86/string/index.S b/libc/arch-x86/string/index.S deleted file mode 100644 index 7f83ef5b1..000000000 --- a/libc/arch-x86/string/index.S +++ /dev/null @@ -1,26 +0,0 @@ -/* $OpenBSD: index.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -#ifdef STRCHR -ENTRY(strchr) -#else -ENTRY(index) -#endif - movl 4(%esp),%eax - movb 8(%esp),%cl - .align 2,0x90 -L1: - movb (%eax),%dl - cmpb %dl,%cl /* found char??? */ - je L2 - incl %eax - testb %dl,%dl /* null terminator??? */ - jnz L1 - xorl %eax,%eax -L2: - ret diff --git a/libc/arch-x86/string/memchr.S b/libc/arch-x86/string/memchr.S deleted file mode 100644 index d6bcbe688..000000000 --- a/libc/arch-x86/string/memchr.S +++ /dev/null @@ -1,26 +0,0 @@ -/* $OpenBSD: memchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(memchr) - pushl %edi - movl 8(%esp),%edi /* string address */ - movl 12(%esp),%eax /* set character to search for */ - movl 16(%esp),%ecx /* set length of search */ - testl %ecx,%ecx /* test for len == 0 */ - jz L1 - cld /* set search forward */ - repne /* search! */ - scasb - jne L1 /* scan failed, return null */ - leal -1(%edi),%eax /* adjust result of scan */ - popl %edi - ret - .align 2,0x90 -L1: xorl %eax,%eax - popl %edi - ret diff --git a/libc/arch-x86/string/memcmp.S b/libc/arch-x86/string/memcmp.S deleted file mode 100644 index 1be189aef..000000000 --- a/libc/arch-x86/string/memcmp.S +++ /dev/null @@ -1,43 +0,0 @@ -/* $OpenBSD: memcmp.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(memcmp) - pushl %edi - pushl %esi - movl 12(%esp),%edi - movl 16(%esp),%esi - cld /* set compare direction forward */ - - movl 20(%esp),%ecx /* compare by words */ - shrl $2,%ecx - repe - cmpsl - jne L5 /* do we match so far? */ - - movl 20(%esp),%ecx /* compare remainder by bytes */ - andl $3,%ecx - repe - cmpsb - jne L6 /* do we match? */ - - xorl %eax,%eax /* we match, return zero */ - popl %esi - popl %edi - ret - -L5: movl $4,%ecx /* We know that one of the next */ - subl %ecx,%edi /* four pairs of bytes do not */ - subl %ecx,%esi /* match. */ - repe - cmpsb -L6: movzbl -1(%edi),%eax /* Perform unsigned comparison */ - movzbl -1(%esi),%edx - subl %edx,%eax - popl %esi - popl %edi - ret diff --git a/libc/arch-x86/string/memcpy.S b/libc/arch-x86/string/memcpy.S deleted file mode 100644 index 95c8a838b..000000000 --- a/libc/arch-x86/string/memcpy.S +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: memcpy.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -#define MEMCOPY -#include "bcopy.S" diff --git a/libc/arch-x86/string/memmove.S b/libc/arch-x86/string/memmove.S deleted file mode 100644 index c5bfd19b1..000000000 --- a/libc/arch-x86/string/memmove.S +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: memmove.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -#define MEMMOVE -#include "bcopy.S" diff --git a/libc/arch-x86/string/memset.S b/libc/arch-x86/string/memset.S deleted file mode 100644 index 1059ccc99..000000000 --- a/libc/arch-x86/string/memset.S +++ /dev/null @@ -1,55 +0,0 @@ -/* $OpenBSD: memset.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(memset) - pushl %edi - pushl %ebx - movl 12(%esp),%edi - movzbl 16(%esp),%eax /* unsigned char, zero extend */ - movl 20(%esp),%ecx - pushl %edi /* push address of buffer */ - - cld /* set fill direction forward */ - - /* - * if the string is too short, it's really not worth the overhead - * of aligning to word boundries, etc. So we jump to a plain - * unaligned set. - */ - cmpl $0x0f,%ecx - jle L1 - - movb %al,%ah /* copy char to all bytes in word */ - movl %eax,%edx - sall $16,%eax - orl %edx,%eax - - movl %edi,%edx /* compute misalignment */ - negl %edx - andl $3,%edx - movl %ecx,%ebx - subl %edx,%ebx - - movl %edx,%ecx /* set until word aligned */ - rep - stosb - - movl %ebx,%ecx - shrl $2,%ecx /* set by words */ - rep - stosl - - movl %ebx,%ecx /* set remainder by bytes */ - andl $3,%ecx -L1: rep - stosb - - popl %eax /* pop address of buffer */ - popl %ebx - popl %edi - ret diff --git a/libc/arch-x86/string/rindex.S b/libc/arch-x86/string/rindex.S deleted file mode 100644 index 0260d384c..000000000 --- a/libc/arch-x86/string/rindex.S +++ /dev/null @@ -1,29 +0,0 @@ -/* $OpenBSD: rindex.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -#ifdef STRRCHR -ENTRY(strrchr) -#else -ENTRY(rindex) -#endif - pushl %ebx - movl 8(%esp),%edx - movb 12(%esp),%cl - xorl %eax,%eax /* init pointer to null */ - .align 2,0x90 -L1: - movb (%edx),%bl - cmpb %bl,%cl - jne L2 - movl %edx,%eax -L2: - incl %edx - testb %bl,%bl /* null terminator??? */ - jnz L1 - popl %ebx - ret diff --git a/libc/arch-x86/string/strcat.S b/libc/arch-x86/string/strcat.S deleted file mode 100644 index 60fdd554e..000000000 --- a/libc/arch-x86/string/strcat.S +++ /dev/null @@ -1,73 +0,0 @@ -/* $OpenBSD: strcat.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -#if defined(APIWARN) -#APP - .section .gnu.warning.strcat - .ascii "warning: strcat() is almost always misused, please use strlcat()" -#NO_APP -#endif - -/* - * NOTE: I've unrolled the loop eight times: large enough to make a - * significant difference, and small enough not to totally trash the - * cache. - */ - -ENTRY(strcat) - pushl %edi /* save edi */ - movl 8(%esp),%edi /* dst address */ - movl 12(%esp),%edx /* src address */ - pushl %edi /* push destination address */ - - cld /* set search forward */ - xorl %eax,%eax /* set search for null terminator */ - movl $-1,%ecx /* set search for lots of characters */ - repne /* search! */ - scasb - - leal -1(%edi),%ecx /* correct dst address */ - - .align 2,0x90 -L1: movb (%edx),%al /* unroll loop, but not too much */ - movb %al,(%ecx) - testb %al,%al - jz L2 - movb 1(%edx),%al - movb %al,1(%ecx) - testb %al,%al - jz L2 - movb 2(%edx),%al - movb %al,2(%ecx) - testb %al,%al - jz L2 - movb 3(%edx),%al - movb %al,3(%ecx) - testb %al,%al - jz L2 - movb 4(%edx),%al - movb %al,4(%ecx) - testb %al,%al - jz L2 - movb 5(%edx),%al - movb %al,5(%ecx) - testb %al,%al - jz L2 - movb 6(%edx),%al - movb %al,6(%ecx) - testb %al,%al - jz L2 - movb 7(%edx),%al - movb %al,7(%ecx) - addl $8,%edx - addl $8,%ecx - testb %al,%al - jnz L1 -L2: popl %eax /* pop destination address */ - popl %edi /* restore edi */ - ret diff --git a/libc/arch-x86/string/strchr.S b/libc/arch-x86/string/strchr.S deleted file mode 100644 index f76e593fc..000000000 --- a/libc/arch-x86/string/strchr.S +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: strchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -#define STRCHR -#include "index.S" diff --git a/libc/arch-x86/string/strcmp.S b/libc/arch-x86/string/strcmp.S deleted file mode 100644 index 22ba5460e..000000000 --- a/libc/arch-x86/string/strcmp.S +++ /dev/null @@ -1,81 +0,0 @@ -/* $OpenBSD: strcmp.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -/* - * NOTE: I've unrolled the loop eight times: large enough to make a - * significant difference, and small enough not to totally trash the - * cache. - */ - -ENTRY(strcmp) - movl 0x04(%esp),%eax - movl 0x08(%esp),%edx - jmp L2 /* Jump into the loop! */ - - .align 2,0x90 -L1: incl %eax - incl %edx -L2: movb (%eax),%cl - testb %cl,%cl /* null terminator??? */ - jz L3 - cmpb %cl,(%edx) /* chars match??? */ - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - jne L3 - incl %eax - incl %edx - movb (%eax),%cl - testb %cl,%cl - jz L3 - cmpb %cl,(%edx) - je L1 - .align 2, 0x90 -L3: movzbl (%eax),%eax /* unsigned comparison */ - movzbl (%edx),%edx - subl %edx,%eax - ret diff --git a/libc/arch-x86/string/strcpy.S b/libc/arch-x86/string/strcpy.S deleted file mode 100644 index 341eb6c39..000000000 --- a/libc/arch-x86/string/strcpy.S +++ /dev/null @@ -1,63 +0,0 @@ -/* $OpenBSD: strcpy.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -#if defined(APIWARN) -#APP - .section .gnu.warning.strcpy - .ascii "warning: strcpy() is almost always misused, please use strlcpy()" -#NO_APP -#endif - -/* - * NOTE: I've unrolled the loop eight times: large enough to make a - * significant difference, and small enough not to totally trash the - * cache. - */ - -ENTRY(strcpy) - movl 4(%esp),%ecx /* dst address */ - movl 8(%esp),%edx /* src address */ - pushl %ecx /* push dst address */ - - .align 2,0x90 -L1: movb (%edx),%al /* unroll loop, but not too much */ - movb %al,(%ecx) - testb %al,%al - jz L2 - movb 1(%edx),%al - movb %al,1(%ecx) - testb %al,%al - jz L2 - movb 2(%edx),%al - movb %al,2(%ecx) - testb %al,%al - jz L2 - movb 3(%edx),%al - movb %al,3(%ecx) - testb %al,%al - jz L2 - movb 4(%edx),%al - movb %al,4(%ecx) - testb %al,%al - jz L2 - movb 5(%edx),%al - movb %al,5(%ecx) - testb %al,%al - jz L2 - movb 6(%edx),%al - movb %al,6(%ecx) - testb %al,%al - jz L2 - movb 7(%edx),%al - movb %al,7(%ecx) - addl $8,%edx - addl $8,%ecx - testb %al,%al - jnz L1 -L2: popl %eax /* pop dst address */ - ret diff --git a/libc/arch-x86/string/strlen.S b/libc/arch-x86/string/strlen.S deleted file mode 100644 index 4f04ffc99..000000000 --- a/libc/arch-x86/string/strlen.S +++ /dev/null @@ -1,20 +0,0 @@ -/* $OpenBSD: strlen.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -ENTRY(strlen) - pushl %edi - movl 8(%esp),%edi /* string address */ - cld /* set search forward */ - xorl %eax,%eax /* set search for null terminator */ - movl $-1,%ecx /* set search for lots of characters */ - repne /* search! */ - scasb - notl %ecx /* get length by taking complement */ - leal -1(%ecx),%eax /* and subtracting one */ - popl %edi - ret diff --git a/libc/arch-x86/string/strncmp.S b/libc/arch-x86/string/strncmp.S deleted file mode 100644 index 5aa88d7e7..000000000 --- a/libc/arch-x86/string/strncmp.S +++ /dev/null @@ -1,113 +0,0 @@ -/* $OpenBSD: strncmp.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -/* - * NOTE: I've unrolled the loop eight times: large enough to make a - * significant difference, and small enough not to totally trash the - * cache. - */ - -ENTRY(strncmp) - pushl %ebx - movl 8(%esp),%eax - movl 12(%esp),%ecx - movl 16(%esp),%edx - testl %edx,%edx - jmp L2 /* Jump into the loop! */ - - .align 2,0x90 -L1: incl %eax - incl %ecx - decl %edx -L2: jz L4 /* strings are equal */ - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - jne L3 - - incl %eax - incl %ecx - decl %edx - jz L4 - movb (%eax),%bl - testb %bl,%bl - jz L3 - cmpb %bl,(%ecx) - je L1 - - .align 2,0x90 -L3: movzbl (%eax),%eax /* unsigned comparision */ - movzbl (%ecx),%ecx - subl %ecx,%eax - popl %ebx - ret - .align 2,0x90 -L4: xorl %eax,%eax - popl %ebx - ret diff --git a/libc/arch-x86/string/strrchr.S b/libc/arch-x86/string/strrchr.S deleted file mode 100644 index 4ee153ff5..000000000 --- a/libc/arch-x86/string/strrchr.S +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: strrchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -#define STRRCHR -#include "rindex.S" diff --git a/libc/arch-x86/string/swab.S b/libc/arch-x86/string/swab.S deleted file mode 100644 index 305586023..000000000 --- a/libc/arch-x86/string/swab.S +++ /dev/null @@ -1,67 +0,0 @@ -/* $OpenBSD: swab.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ -/* - * Written by J.T. Conklin . - * Public domain. - */ - -#include - -/* - * On the i486, this code is negligibly faster than the code generated - * by gcc at about half the size. If my i386 databook is correct, it - * should be considerably faster than the gcc code on a i386. - */ - -ENTRY(swab) - pushl %esi - pushl %edi - movl 12(%esp),%esi - movl 16(%esp),%edi - movl 20(%esp),%ecx - - cld # set direction forward - - shrl $1,%ecx - testl $7,%ecx # copy first group of 1 to 7 words - jz L2 # while swaping alternate bytes. - .align 2,0x90 -L1: lodsw - rorw $8,%ax - stosw - decl %ecx - testl $7,%ecx - jnz L1 - -L2: shrl $3,%ecx # copy remainder 8 words at a time - jz L4 # while swapping alternate bytes. - .align 2,0x90 -L3: lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - lodsw - rorw $8,%ax - stosw - decl %ecx - jnz L3 - -L4: popl %edi - popl %esi - ret diff --git a/libc/arch-x86/syscalls.mk b/libc/arch-x86/syscalls.mk deleted file mode 100644 index 86d23080a..000000000 --- a/libc/arch-x86/syscalls.mk +++ /dev/null @@ -1,171 +0,0 @@ -# auto-generated by gensyscalls.py, do not touch -syscall_src := -syscall_src += arch-x86/syscalls/_exit.S -syscall_src += arch-x86/syscalls/_exit_thread.S -syscall_src += arch-x86/syscalls/__fork.S -syscall_src += arch-x86/syscalls/_waitpid.S -syscall_src += arch-x86/syscalls/waitid.S -syscall_src += arch-x86/syscalls/__clone.S -syscall_src += arch-x86/syscalls/execve.S -syscall_src += arch-x86/syscalls/setuid.S -syscall_src += arch-x86/syscalls/getuid.S -syscall_src += arch-x86/syscalls/getgid.S -syscall_src += arch-x86/syscalls/geteuid.S -syscall_src += arch-x86/syscalls/getegid.S -syscall_src += arch-x86/syscalls/getresuid.S -syscall_src += arch-x86/syscalls/getresgid.S -syscall_src += arch-x86/syscalls/gettid.S -syscall_src += arch-x86/syscalls/getgroups.S -syscall_src += arch-x86/syscalls/getpgid.S -syscall_src += arch-x86/syscalls/getppid.S -syscall_src += arch-x86/syscalls/setsid.S -syscall_src += arch-x86/syscalls/setgid.S -syscall_src += arch-x86/syscalls/setreuid.S -syscall_src += arch-x86/syscalls/setresuid.S -syscall_src += arch-x86/syscalls/setresgid.S -syscall_src += arch-x86/syscalls/__brk.S -syscall_src += arch-x86/syscalls/kill.S -syscall_src += arch-x86/syscalls/tkill.S -syscall_src += arch-x86/syscalls/__ptrace.S -syscall_src += arch-x86/syscalls/__set_thread_area.S -syscall_src += arch-x86/syscalls/__getpriority.S -syscall_src += arch-x86/syscalls/setpriority.S -syscall_src += arch-x86/syscalls/setrlimit.S -syscall_src += arch-x86/syscalls/getrlimit.S -syscall_src += arch-x86/syscalls/getrusage.S -syscall_src += arch-x86/syscalls/setgroups.S -syscall_src += arch-x86/syscalls/setpgid.S -syscall_src += arch-x86/syscalls/setregid.S -syscall_src += arch-x86/syscalls/chroot.S -syscall_src += arch-x86/syscalls/prctl.S -syscall_src += arch-x86/syscalls/capget.S -syscall_src += arch-x86/syscalls/capset.S -syscall_src += arch-x86/syscalls/acct.S -syscall_src += arch-x86/syscalls/read.S -syscall_src += arch-x86/syscalls/write.S -syscall_src += arch-x86/syscalls/__pread64.S -syscall_src += arch-x86/syscalls/__pwrite64.S -syscall_src += arch-x86/syscalls/__open.S -syscall_src += arch-x86/syscalls/__openat.S -syscall_src += arch-x86/syscalls/close.S -syscall_src += arch-x86/syscalls/lseek.S -syscall_src += arch-x86/syscalls/__llseek.S -syscall_src += arch-x86/syscalls/getpid.S -syscall_src += arch-x86/syscalls/__mmap2.S -syscall_src += arch-x86/syscalls/munmap.S -syscall_src += arch-x86/syscalls/mremap.S -syscall_src += arch-x86/syscalls/msync.S -syscall_src += arch-x86/syscalls/mprotect.S -syscall_src += arch-x86/syscalls/madvise.S -syscall_src += arch-x86/syscalls/mlock.S -syscall_src += arch-x86/syscalls/munlock.S -syscall_src += arch-x86/syscalls/mincore.S -syscall_src += arch-x86/syscalls/__ioctl.S -syscall_src += arch-x86/syscalls/readv.S -syscall_src += arch-x86/syscalls/writev.S -syscall_src += arch-x86/syscalls/__fcntl.S -syscall_src += arch-x86/syscalls/flock.S -syscall_src += arch-x86/syscalls/fchmod.S -syscall_src += arch-x86/syscalls/dup.S -syscall_src += arch-x86/syscalls/pipe.S -syscall_src += arch-x86/syscalls/dup2.S -syscall_src += arch-x86/syscalls/select.S -syscall_src += arch-x86/syscalls/ftruncate.S -syscall_src += arch-x86/syscalls/getdents.S -syscall_src += arch-x86/syscalls/fsync.S -syscall_src += arch-x86/syscalls/fchown.S -syscall_src += arch-x86/syscalls/sync.S -syscall_src += arch-x86/syscalls/__fcntl64.S -syscall_src += arch-x86/syscalls/fstatfs.S -syscall_src += arch-x86/syscalls/sendfile.S -syscall_src += arch-x86/syscalls/fstatat.S -syscall_src += arch-x86/syscalls/mkdirat.S -syscall_src += arch-x86/syscalls/fchownat.S -syscall_src += arch-x86/syscalls/fchmodat.S -syscall_src += arch-x86/syscalls/renameat.S -syscall_src += arch-x86/syscalls/link.S -syscall_src += arch-x86/syscalls/unlink.S -syscall_src += arch-x86/syscalls/unlinkat.S -syscall_src += arch-x86/syscalls/chdir.S -syscall_src += arch-x86/syscalls/mknod.S -syscall_src += arch-x86/syscalls/chmod.S -syscall_src += arch-x86/syscalls/chown.S -syscall_src += arch-x86/syscalls/lchown.S -syscall_src += arch-x86/syscalls/mount.S -syscall_src += arch-x86/syscalls/umount2.S -syscall_src += arch-x86/syscalls/fstat.S -syscall_src += arch-x86/syscalls/stat.S -syscall_src += arch-x86/syscalls/lstat.S -syscall_src += arch-x86/syscalls/mkdir.S -syscall_src += arch-x86/syscalls/readlink.S -syscall_src += arch-x86/syscalls/rmdir.S -syscall_src += arch-x86/syscalls/rename.S -syscall_src += arch-x86/syscalls/__getcwd.S -syscall_src += arch-x86/syscalls/access.S -syscall_src += arch-x86/syscalls/symlink.S -syscall_src += arch-x86/syscalls/fchdir.S -syscall_src += arch-x86/syscalls/truncate.S -syscall_src += arch-x86/syscalls/__statfs64.S -syscall_src += arch-x86/syscalls/pause.S -syscall_src += arch-x86/syscalls/gettimeofday.S -syscall_src += arch-x86/syscalls/settimeofday.S -syscall_src += arch-x86/syscalls/times.S -syscall_src += arch-x86/syscalls/nanosleep.S -syscall_src += arch-x86/syscalls/clock_gettime.S -syscall_src += arch-x86/syscalls/clock_settime.S -syscall_src += arch-x86/syscalls/clock_getres.S -syscall_src += arch-x86/syscalls/clock_nanosleep.S -syscall_src += arch-x86/syscalls/getitimer.S -syscall_src += arch-x86/syscalls/setitimer.S -syscall_src += arch-x86/syscalls/__timer_create.S -syscall_src += arch-x86/syscalls/__timer_settime.S -syscall_src += arch-x86/syscalls/__timer_gettime.S -syscall_src += arch-x86/syscalls/__timer_getoverrun.S -syscall_src += arch-x86/syscalls/__timer_delete.S -syscall_src += arch-x86/syscalls/utimes.S -syscall_src += arch-x86/syscalls/sigaction.S -syscall_src += arch-x86/syscalls/sigprocmask.S -syscall_src += arch-x86/syscalls/__sigsuspend.S -syscall_src += arch-x86/syscalls/__rt_sigaction.S -syscall_src += arch-x86/syscalls/__rt_sigprocmask.S -syscall_src += arch-x86/syscalls/__rt_sigtimedwait.S -syscall_src += arch-x86/syscalls/sigpending.S -syscall_src += arch-x86/syscalls/socket.S -syscall_src += arch-x86/syscalls/bind.S -syscall_src += arch-x86/syscalls/connect.S -syscall_src += arch-x86/syscalls/listen.S -syscall_src += arch-x86/syscalls/accept.S -syscall_src += arch-x86/syscalls/getsockname.S -syscall_src += arch-x86/syscalls/getpeername.S -syscall_src += arch-x86/syscalls/socketpair.S -syscall_src += arch-x86/syscalls/sendto.S -syscall_src += arch-x86/syscalls/recvfrom.S -syscall_src += arch-x86/syscalls/shutdown.S -syscall_src += arch-x86/syscalls/setsockopt.S -syscall_src += arch-x86/syscalls/getsockopt.S -syscall_src += arch-x86/syscalls/sendmsg.S -syscall_src += arch-x86/syscalls/recvmsg.S -syscall_src += arch-x86/syscalls/sched_setscheduler.S -syscall_src += arch-x86/syscalls/sched_getscheduler.S -syscall_src += arch-x86/syscalls/sched_yield.S -syscall_src += arch-x86/syscalls/sched_setparam.S -syscall_src += arch-x86/syscalls/sched_getparam.S -syscall_src += arch-x86/syscalls/sched_get_priority_max.S -syscall_src += arch-x86/syscalls/sched_get_priority_min.S -syscall_src += arch-x86/syscalls/sched_rr_get_interval.S -syscall_src += arch-x86/syscalls/uname.S -syscall_src += arch-x86/syscalls/__wait4.S -syscall_src += arch-x86/syscalls/umask.S -syscall_src += arch-x86/syscalls/__reboot.S -syscall_src += arch-x86/syscalls/__syslog.S -syscall_src += arch-x86/syscalls/init_module.S -syscall_src += arch-x86/syscalls/delete_module.S -syscall_src += arch-x86/syscalls/klogctl.S -syscall_src += arch-x86/syscalls/futex.S -syscall_src += arch-x86/syscalls/epoll_create.S -syscall_src += arch-x86/syscalls/epoll_ctl.S -syscall_src += arch-x86/syscalls/epoll_wait.S -syscall_src += arch-x86/syscalls/inotify_init.S -syscall_src += arch-x86/syscalls/inotify_add_watch.S -syscall_src += arch-x86/syscalls/inotify_rm_watch.S -syscall_src += arch-x86/syscalls/poll.S diff --git a/libc/arch-x86/syscalls/__brk.S b/libc/arch-x86/syscalls/__brk.S deleted file mode 100644 index 235cc4faa..000000000 --- a/libc/arch-x86/syscalls/__brk.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __brk, @function - .globl __brk - .align 4 - -__brk: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_brk, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__clone.S b/libc/arch-x86/syscalls/__clone.S deleted file mode 100644 index 586212974..000000000 --- a/libc/arch-x86/syscalls/__clone.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __clone, @function - .globl __clone - .align 4 - -__clone: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_clone, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__fcntl.S b/libc/arch-x86/syscalls/__fcntl.S deleted file mode 100644 index 377f08ead..000000000 --- a/libc/arch-x86/syscalls/__fcntl.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __fcntl, @function - .globl __fcntl - .align 4 - -__fcntl: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_fcntl, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__fcntl64.S b/libc/arch-x86/syscalls/__fcntl64.S deleted file mode 100644 index 2ed47fea9..000000000 --- a/libc/arch-x86/syscalls/__fcntl64.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __fcntl64, @function - .globl __fcntl64 - .align 4 - -__fcntl64: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_fcntl64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__fork.S b/libc/arch-x86/syscalls/__fork.S deleted file mode 100644 index 4b5d1c6f4..000000000 --- a/libc/arch-x86/syscalls/__fork.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __fork, @function - .globl __fork - .align 4 - -__fork: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_fork, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__getcwd.S b/libc/arch-x86/syscalls/__getcwd.S deleted file mode 100644 index f2bd520f5..000000000 --- a/libc/arch-x86/syscalls/__getcwd.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __getcwd, @function - .globl __getcwd - .align 4 - -__getcwd: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_getcwd, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__getpriority.S b/libc/arch-x86/syscalls/__getpriority.S deleted file mode 100644 index 08503d854..000000000 --- a/libc/arch-x86/syscalls/__getpriority.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __getpriority, @function - .globl __getpriority - .align 4 - -__getpriority: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_getpriority, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__ioctl.S b/libc/arch-x86/syscalls/__ioctl.S deleted file mode 100644 index cdde9abdd..000000000 --- a/libc/arch-x86/syscalls/__ioctl.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __ioctl, @function - .globl __ioctl - .align 4 - -__ioctl: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_ioctl, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__llseek.S b/libc/arch-x86/syscalls/__llseek.S deleted file mode 100644 index df49a946f..000000000 --- a/libc/arch-x86/syscalls/__llseek.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __llseek, @function - .globl __llseek - .align 4 - -__llseek: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR__llseek, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__mmap2.S b/libc/arch-x86/syscalls/__mmap2.S deleted file mode 100644 index fea571f7e..000000000 --- a/libc/arch-x86/syscalls/__mmap2.S +++ /dev/null @@ -1,38 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __mmap2, @function - .globl __mmap2 - .align 4 - -__mmap2: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - pushl %ebp - mov 28(%esp), %ebx - mov 32(%esp), %ecx - mov 36(%esp), %edx - mov 40(%esp), %esi - mov 44(%esp), %edi - mov 48(%esp), %ebp - movl $__NR_mmap2, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebp - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__open.S b/libc/arch-x86/syscalls/__open.S deleted file mode 100644 index df6fd9352..000000000 --- a/libc/arch-x86/syscalls/__open.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __open, @function - .globl __open - .align 4 - -__open: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_open, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__openat.S b/libc/arch-x86/syscalls/__openat.S deleted file mode 100644 index aa1492791..000000000 --- a/libc/arch-x86/syscalls/__openat.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __openat, @function - .globl __openat - .align 4 - -__openat: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_openat, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__pread64.S b/libc/arch-x86/syscalls/__pread64.S deleted file mode 100644 index 3114673cd..000000000 --- a/libc/arch-x86/syscalls/__pread64.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __pread64, @function - .globl __pread64 - .align 4 - -__pread64: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_pread64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__ptrace.S b/libc/arch-x86/syscalls/__ptrace.S deleted file mode 100644 index bec952b6b..000000000 --- a/libc/arch-x86/syscalls/__ptrace.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __ptrace, @function - .globl __ptrace - .align 4 - -__ptrace: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_ptrace, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__pwrite64.S b/libc/arch-x86/syscalls/__pwrite64.S deleted file mode 100644 index 28f65360a..000000000 --- a/libc/arch-x86/syscalls/__pwrite64.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __pwrite64, @function - .globl __pwrite64 - .align 4 - -__pwrite64: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_pwrite64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__reboot.S b/libc/arch-x86/syscalls/__reboot.S deleted file mode 100644 index 6cb74e202..000000000 --- a/libc/arch-x86/syscalls/__reboot.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __reboot, @function - .globl __reboot - .align 4 - -__reboot: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_reboot, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__rt_sigaction.S b/libc/arch-x86/syscalls/__rt_sigaction.S deleted file mode 100644 index c57f58064..000000000 --- a/libc/arch-x86/syscalls/__rt_sigaction.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __rt_sigaction, @function - .globl __rt_sigaction - .align 4 - -__rt_sigaction: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_rt_sigaction, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__rt_sigprocmask.S b/libc/arch-x86/syscalls/__rt_sigprocmask.S deleted file mode 100644 index 623331b14..000000000 --- a/libc/arch-x86/syscalls/__rt_sigprocmask.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __rt_sigprocmask, @function - .globl __rt_sigprocmask - .align 4 - -__rt_sigprocmask: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_rt_sigprocmask, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__rt_sigtimedwait.S b/libc/arch-x86/syscalls/__rt_sigtimedwait.S deleted file mode 100644 index 8e14a894d..000000000 --- a/libc/arch-x86/syscalls/__rt_sigtimedwait.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __rt_sigtimedwait, @function - .globl __rt_sigtimedwait - .align 4 - -__rt_sigtimedwait: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_rt_sigtimedwait, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__set_thread_area.S b/libc/arch-x86/syscalls/__set_thread_area.S deleted file mode 100644 index cd2204023..000000000 --- a/libc/arch-x86/syscalls/__set_thread_area.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __set_thread_area, @function - .globl __set_thread_area - .align 4 - -__set_thread_area: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_set_thread_area, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__sigsuspend.S b/libc/arch-x86/syscalls/__sigsuspend.S deleted file mode 100644 index 64de756fd..000000000 --- a/libc/arch-x86/syscalls/__sigsuspend.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __sigsuspend, @function - .globl __sigsuspend - .align 4 - -__sigsuspend: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_sigsuspend, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__statfs64.S b/libc/arch-x86/syscalls/__statfs64.S deleted file mode 100644 index a0685b72a..000000000 --- a/libc/arch-x86/syscalls/__statfs64.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __statfs64, @function - .globl __statfs64 - .align 4 - -__statfs64: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_statfs64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__syslog.S b/libc/arch-x86/syscalls/__syslog.S deleted file mode 100644 index 3982db407..000000000 --- a/libc/arch-x86/syscalls/__syslog.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __syslog, @function - .globl __syslog - .align 4 - -__syslog: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_syslog, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__timer_create.S b/libc/arch-x86/syscalls/__timer_create.S deleted file mode 100644 index 66b0cea0c..000000000 --- a/libc/arch-x86/syscalls/__timer_create.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_create, @function - .globl __timer_create - .align 4 - -__timer_create: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_timer_create, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__timer_delete.S b/libc/arch-x86/syscalls/__timer_delete.S deleted file mode 100644 index 4344d08af..000000000 --- a/libc/arch-x86/syscalls/__timer_delete.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_delete, @function - .globl __timer_delete - .align 4 - -__timer_delete: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_timer_delete, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__timer_getoverrun.S b/libc/arch-x86/syscalls/__timer_getoverrun.S deleted file mode 100644 index 43714156b..000000000 --- a/libc/arch-x86/syscalls/__timer_getoverrun.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_getoverrun, @function - .globl __timer_getoverrun - .align 4 - -__timer_getoverrun: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_timer_getoverrun, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__timer_gettime.S b/libc/arch-x86/syscalls/__timer_gettime.S deleted file mode 100644 index 3923b0ad8..000000000 --- a/libc/arch-x86/syscalls/__timer_gettime.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_gettime, @function - .globl __timer_gettime - .align 4 - -__timer_gettime: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_timer_gettime, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__timer_settime.S b/libc/arch-x86/syscalls/__timer_settime.S deleted file mode 100644 index cabb7df7c..000000000 --- a/libc/arch-x86/syscalls/__timer_settime.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __timer_settime, @function - .globl __timer_settime - .align 4 - -__timer_settime: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_timer_settime, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/__wait4.S b/libc/arch-x86/syscalls/__wait4.S deleted file mode 100644 index 75ffb95ce..000000000 --- a/libc/arch-x86/syscalls/__wait4.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type __wait4, @function - .globl __wait4 - .align 4 - -__wait4: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_wait4, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/_exit.S b/libc/arch-x86/syscalls/_exit.S deleted file mode 100644 index 21aa49f5e..000000000 --- a/libc/arch-x86/syscalls/_exit.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type _exit, @function - .globl _exit - .align 4 - -_exit: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_exit_group, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/_exit_thread.S b/libc/arch-x86/syscalls/_exit_thread.S deleted file mode 100644 index 16aaa5be4..000000000 --- a/libc/arch-x86/syscalls/_exit_thread.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type _exit_thread, @function - .globl _exit_thread - .align 4 - -_exit_thread: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_exit, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/_waitpid.S b/libc/arch-x86/syscalls/_waitpid.S deleted file mode 100644 index 7e76496cf..000000000 --- a/libc/arch-x86/syscalls/_waitpid.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type _waitpid, @function - .globl _waitpid - .align 4 - -_waitpid: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_waitpid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/accept.S b/libc/arch-x86/syscalls/accept.S deleted file mode 100644 index ccd56e747..000000000 --- a/libc/arch-x86/syscalls/accept.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type accept, @function - .globl accept - .align 4 - -accept: - pushl %ebx - pushl %ecx - mov $5, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/access.S b/libc/arch-x86/syscalls/access.S deleted file mode 100644 index fff26a9a2..000000000 --- a/libc/arch-x86/syscalls/access.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type access, @function - .globl access - .align 4 - -access: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_access, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/acct.S b/libc/arch-x86/syscalls/acct.S deleted file mode 100644 index 711b6fc8b..000000000 --- a/libc/arch-x86/syscalls/acct.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type acct, @function - .globl acct - .align 4 - -acct: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_acct, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/bind.S b/libc/arch-x86/syscalls/bind.S deleted file mode 100644 index 2172cfbc7..000000000 --- a/libc/arch-x86/syscalls/bind.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type bind, @function - .globl bind - .align 4 - -bind: - pushl %ebx - pushl %ecx - mov $2, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/capget.S b/libc/arch-x86/syscalls/capget.S deleted file mode 100644 index e287cb24b..000000000 --- a/libc/arch-x86/syscalls/capget.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type capget, @function - .globl capget - .align 4 - -capget: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_capget, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/capset.S b/libc/arch-x86/syscalls/capset.S deleted file mode 100644 index ce71f6e7c..000000000 --- a/libc/arch-x86/syscalls/capset.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type capset, @function - .globl capset - .align 4 - -capset: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_capset, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/chdir.S b/libc/arch-x86/syscalls/chdir.S deleted file mode 100644 index be8884707..000000000 --- a/libc/arch-x86/syscalls/chdir.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chdir, @function - .globl chdir - .align 4 - -chdir: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_chdir, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/chmod.S b/libc/arch-x86/syscalls/chmod.S deleted file mode 100644 index d023a7d6b..000000000 --- a/libc/arch-x86/syscalls/chmod.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chmod, @function - .globl chmod - .align 4 - -chmod: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_chmod, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/chown.S b/libc/arch-x86/syscalls/chown.S deleted file mode 100644 index 5646088e9..000000000 --- a/libc/arch-x86/syscalls/chown.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chown, @function - .globl chown - .align 4 - -chown: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_chown32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/chroot.S b/libc/arch-x86/syscalls/chroot.S deleted file mode 100644 index 461087cd2..000000000 --- a/libc/arch-x86/syscalls/chroot.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type chroot, @function - .globl chroot - .align 4 - -chroot: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_chroot, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/clock_getres.S b/libc/arch-x86/syscalls/clock_getres.S deleted file mode 100644 index 07742aebb..000000000 --- a/libc/arch-x86/syscalls/clock_getres.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_getres, @function - .globl clock_getres - .align 4 - -clock_getres: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_clock_getres, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/clock_gettime.S b/libc/arch-x86/syscalls/clock_gettime.S deleted file mode 100644 index bfe14a475..000000000 --- a/libc/arch-x86/syscalls/clock_gettime.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_gettime, @function - .globl clock_gettime - .align 4 - -clock_gettime: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_clock_gettime, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/clock_nanosleep.S b/libc/arch-x86/syscalls/clock_nanosleep.S deleted file mode 100644 index c400e3ffe..000000000 --- a/libc/arch-x86/syscalls/clock_nanosleep.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_nanosleep, @function - .globl clock_nanosleep - .align 4 - -clock_nanosleep: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_clock_nanosleep, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/clock_settime.S b/libc/arch-x86/syscalls/clock_settime.S deleted file mode 100644 index 58495ba5a..000000000 --- a/libc/arch-x86/syscalls/clock_settime.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type clock_settime, @function - .globl clock_settime - .align 4 - -clock_settime: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_clock_settime, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/close.S b/libc/arch-x86/syscalls/close.S deleted file mode 100644 index 1944a83c5..000000000 --- a/libc/arch-x86/syscalls/close.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type close, @function - .globl close - .align 4 - -close: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_close, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/connect.S b/libc/arch-x86/syscalls/connect.S deleted file mode 100644 index 8b8ce4ee7..000000000 --- a/libc/arch-x86/syscalls/connect.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type connect, @function - .globl connect - .align 4 - -connect: - pushl %ebx - pushl %ecx - mov $3, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/delete_module.S b/libc/arch-x86/syscalls/delete_module.S deleted file mode 100644 index 6865d6a71..000000000 --- a/libc/arch-x86/syscalls/delete_module.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type delete_module, @function - .globl delete_module - .align 4 - -delete_module: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_delete_module, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/dup.S b/libc/arch-x86/syscalls/dup.S deleted file mode 100644 index 155de79f5..000000000 --- a/libc/arch-x86/syscalls/dup.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type dup, @function - .globl dup - .align 4 - -dup: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_dup, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/dup2.S b/libc/arch-x86/syscalls/dup2.S deleted file mode 100644 index 59f8329f2..000000000 --- a/libc/arch-x86/syscalls/dup2.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type dup2, @function - .globl dup2 - .align 4 - -dup2: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_dup2, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/epoll_create.S b/libc/arch-x86/syscalls/epoll_create.S deleted file mode 100644 index 8106c5845..000000000 --- a/libc/arch-x86/syscalls/epoll_create.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type epoll_create, @function - .globl epoll_create - .align 4 - -epoll_create: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_epoll_create, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/epoll_ctl.S b/libc/arch-x86/syscalls/epoll_ctl.S deleted file mode 100644 index ff2c112ba..000000000 --- a/libc/arch-x86/syscalls/epoll_ctl.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type epoll_ctl, @function - .globl epoll_ctl - .align 4 - -epoll_ctl: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_epoll_ctl, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/epoll_wait.S b/libc/arch-x86/syscalls/epoll_wait.S deleted file mode 100644 index 3d81a1419..000000000 --- a/libc/arch-x86/syscalls/epoll_wait.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type epoll_wait, @function - .globl epoll_wait - .align 4 - -epoll_wait: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_epoll_wait, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/execve.S b/libc/arch-x86/syscalls/execve.S deleted file mode 100644 index 0ab1d7552..000000000 --- a/libc/arch-x86/syscalls/execve.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type execve, @function - .globl execve - .align 4 - -execve: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_execve, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fchdir.S b/libc/arch-x86/syscalls/fchdir.S deleted file mode 100644 index 4e681be19..000000000 --- a/libc/arch-x86/syscalls/fchdir.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchdir, @function - .globl fchdir - .align 4 - -fchdir: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_fchdir, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fchmod.S b/libc/arch-x86/syscalls/fchmod.S deleted file mode 100644 index 58f8a9485..000000000 --- a/libc/arch-x86/syscalls/fchmod.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchmod, @function - .globl fchmod - .align 4 - -fchmod: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_fchmod, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fchmodat.S b/libc/arch-x86/syscalls/fchmodat.S deleted file mode 100644 index b5b9c6d25..000000000 --- a/libc/arch-x86/syscalls/fchmodat.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchmodat, @function - .globl fchmodat - .align 4 - -fchmodat: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_fchmodat, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fchown.S b/libc/arch-x86/syscalls/fchown.S deleted file mode 100644 index c648d7fd1..000000000 --- a/libc/arch-x86/syscalls/fchown.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchown, @function - .globl fchown - .align 4 - -fchown: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_fchown32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fchownat.S b/libc/arch-x86/syscalls/fchownat.S deleted file mode 100644 index 3bec84326..000000000 --- a/libc/arch-x86/syscalls/fchownat.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fchownat, @function - .globl fchownat - .align 4 - -fchownat: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_fchownat, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/flock.S b/libc/arch-x86/syscalls/flock.S deleted file mode 100644 index 1ca09a526..000000000 --- a/libc/arch-x86/syscalls/flock.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type flock, @function - .globl flock - .align 4 - -flock: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_flock, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fstat.S b/libc/arch-x86/syscalls/fstat.S deleted file mode 100644 index 8f58316dd..000000000 --- a/libc/arch-x86/syscalls/fstat.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fstat, @function - .globl fstat - .align 4 - -fstat: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_fstat64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fstatat.S b/libc/arch-x86/syscalls/fstatat.S deleted file mode 100644 index 4926e998e..000000000 --- a/libc/arch-x86/syscalls/fstatat.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fstatat, @function - .globl fstatat - .align 4 - -fstatat: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_fstatat64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fstatfs.S b/libc/arch-x86/syscalls/fstatfs.S deleted file mode 100644 index f72b3d490..000000000 --- a/libc/arch-x86/syscalls/fstatfs.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fstatfs, @function - .globl fstatfs - .align 4 - -fstatfs: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_fstatfs64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/fsync.S b/libc/arch-x86/syscalls/fsync.S deleted file mode 100644 index d9fd225ed..000000000 --- a/libc/arch-x86/syscalls/fsync.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type fsync, @function - .globl fsync - .align 4 - -fsync: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_fsync, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/ftruncate.S b/libc/arch-x86/syscalls/ftruncate.S deleted file mode 100644 index 25b7df58e..000000000 --- a/libc/arch-x86/syscalls/ftruncate.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type ftruncate, @function - .globl ftruncate - .align 4 - -ftruncate: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_ftruncate, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/futex.S b/libc/arch-x86/syscalls/futex.S deleted file mode 100644 index ac51316bc..000000000 --- a/libc/arch-x86/syscalls/futex.S +++ /dev/null @@ -1,38 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type futex, @function - .globl futex - .align 4 - -futex: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - pushl %ebp - mov 28(%esp), %ebx - mov 32(%esp), %ecx - mov 36(%esp), %edx - mov 40(%esp), %esi - mov 44(%esp), %edi - mov 48(%esp), %ebp - movl $__NR_futex, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebp - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getdents.S b/libc/arch-x86/syscalls/getdents.S deleted file mode 100644 index b8c527fe3..000000000 --- a/libc/arch-x86/syscalls/getdents.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getdents, @function - .globl getdents - .align 4 - -getdents: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_getdents64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getegid.S b/libc/arch-x86/syscalls/getegid.S deleted file mode 100644 index e34a147d5..000000000 --- a/libc/arch-x86/syscalls/getegid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getegid, @function - .globl getegid - .align 4 - -getegid: - movl $__NR_getegid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/geteuid.S b/libc/arch-x86/syscalls/geteuid.S deleted file mode 100644 index 8ec72973d..000000000 --- a/libc/arch-x86/syscalls/geteuid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type geteuid, @function - .globl geteuid - .align 4 - -geteuid: - movl $__NR_geteuid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/getgid.S b/libc/arch-x86/syscalls/getgid.S deleted file mode 100644 index d69d722f2..000000000 --- a/libc/arch-x86/syscalls/getgid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getgid, @function - .globl getgid - .align 4 - -getgid: - movl $__NR_getgid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/getgroups.S b/libc/arch-x86/syscalls/getgroups.S deleted file mode 100644 index f6a9912ee..000000000 --- a/libc/arch-x86/syscalls/getgroups.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getgroups, @function - .globl getgroups - .align 4 - -getgroups: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_getgroups32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getitimer.S b/libc/arch-x86/syscalls/getitimer.S deleted file mode 100644 index f170ebf9f..000000000 --- a/libc/arch-x86/syscalls/getitimer.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getitimer, @function - .globl getitimer - .align 4 - -getitimer: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_getitimer, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getpeername.S b/libc/arch-x86/syscalls/getpeername.S deleted file mode 100644 index b6f8eb80c..000000000 --- a/libc/arch-x86/syscalls/getpeername.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getpeername, @function - .globl getpeername - .align 4 - -getpeername: - pushl %ebx - pushl %ecx - mov $7, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getpgid.S b/libc/arch-x86/syscalls/getpgid.S deleted file mode 100644 index ca1e65900..000000000 --- a/libc/arch-x86/syscalls/getpgid.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getpgid, @function - .globl getpgid - .align 4 - -getpgid: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_getpgid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getpid.S b/libc/arch-x86/syscalls/getpid.S deleted file mode 100644 index df43b880d..000000000 --- a/libc/arch-x86/syscalls/getpid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getpid, @function - .globl getpid - .align 4 - -getpid: - movl $__NR_getpid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/getppid.S b/libc/arch-x86/syscalls/getppid.S deleted file mode 100644 index 9a882bdff..000000000 --- a/libc/arch-x86/syscalls/getppid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getppid, @function - .globl getppid - .align 4 - -getppid: - movl $__NR_getppid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/getresgid.S b/libc/arch-x86/syscalls/getresgid.S deleted file mode 100644 index 454d32b33..000000000 --- a/libc/arch-x86/syscalls/getresgid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getresgid, @function - .globl getresgid - .align 4 - -getresgid: - movl $__NR_getresgid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/getresuid.S b/libc/arch-x86/syscalls/getresuid.S deleted file mode 100644 index f07b5c529..000000000 --- a/libc/arch-x86/syscalls/getresuid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getresuid, @function - .globl getresuid - .align 4 - -getresuid: - movl $__NR_getresuid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/getrlimit.S b/libc/arch-x86/syscalls/getrlimit.S deleted file mode 100644 index f4c334ffe..000000000 --- a/libc/arch-x86/syscalls/getrlimit.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getrlimit, @function - .globl getrlimit - .align 4 - -getrlimit: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_ugetrlimit, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getrusage.S b/libc/arch-x86/syscalls/getrusage.S deleted file mode 100644 index 750ab5b63..000000000 --- a/libc/arch-x86/syscalls/getrusage.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getrusage, @function - .globl getrusage - .align 4 - -getrusage: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_getrusage, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getsockname.S b/libc/arch-x86/syscalls/getsockname.S deleted file mode 100644 index 884acd9bd..000000000 --- a/libc/arch-x86/syscalls/getsockname.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getsockname, @function - .globl getsockname - .align 4 - -getsockname: - pushl %ebx - pushl %ecx - mov $6, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getsockopt.S b/libc/arch-x86/syscalls/getsockopt.S deleted file mode 100644 index a606532b1..000000000 --- a/libc/arch-x86/syscalls/getsockopt.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getsockopt, @function - .globl getsockopt - .align 4 - -getsockopt: - pushl %ebx - pushl %ecx - mov $15, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/gettid.S b/libc/arch-x86/syscalls/gettid.S deleted file mode 100644 index 2e8cb5980..000000000 --- a/libc/arch-x86/syscalls/gettid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type gettid, @function - .globl gettid - .align 4 - -gettid: - movl $__NR_gettid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/gettimeofday.S b/libc/arch-x86/syscalls/gettimeofday.S deleted file mode 100644 index feffe926d..000000000 --- a/libc/arch-x86/syscalls/gettimeofday.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type gettimeofday, @function - .globl gettimeofday - .align 4 - -gettimeofday: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_gettimeofday, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/getuid.S b/libc/arch-x86/syscalls/getuid.S deleted file mode 100644 index 635105ec9..000000000 --- a/libc/arch-x86/syscalls/getuid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type getuid, @function - .globl getuid - .align 4 - -getuid: - movl $__NR_getuid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/init_module.S b/libc/arch-x86/syscalls/init_module.S deleted file mode 100644 index 2e2b088f7..000000000 --- a/libc/arch-x86/syscalls/init_module.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type init_module, @function - .globl init_module - .align 4 - -init_module: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_init_module, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/inotify_add_watch.S b/libc/arch-x86/syscalls/inotify_add_watch.S deleted file mode 100644 index 12a12e451..000000000 --- a/libc/arch-x86/syscalls/inotify_add_watch.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type inotify_add_watch, @function - .globl inotify_add_watch - .align 4 - -inotify_add_watch: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_inotify_add_watch, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/inotify_init.S b/libc/arch-x86/syscalls/inotify_init.S deleted file mode 100644 index 2d186c4f3..000000000 --- a/libc/arch-x86/syscalls/inotify_init.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type inotify_init, @function - .globl inotify_init - .align 4 - -inotify_init: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_inotify_init, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/inotify_rm_watch.S b/libc/arch-x86/syscalls/inotify_rm_watch.S deleted file mode 100644 index f9318334a..000000000 --- a/libc/arch-x86/syscalls/inotify_rm_watch.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type inotify_rm_watch, @function - .globl inotify_rm_watch - .align 4 - -inotify_rm_watch: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_inotify_rm_watch, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/kill.S b/libc/arch-x86/syscalls/kill.S deleted file mode 100644 index e495c5414..000000000 --- a/libc/arch-x86/syscalls/kill.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type kill, @function - .globl kill - .align 4 - -kill: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_kill, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/klogctl.S b/libc/arch-x86/syscalls/klogctl.S deleted file mode 100644 index e46c8ae73..000000000 --- a/libc/arch-x86/syscalls/klogctl.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type klogctl, @function - .globl klogctl - .align 4 - -klogctl: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_syslog, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/lchown.S b/libc/arch-x86/syscalls/lchown.S deleted file mode 100644 index f584a3205..000000000 --- a/libc/arch-x86/syscalls/lchown.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type lchown, @function - .globl lchown - .align 4 - -lchown: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_lchown32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/link.S b/libc/arch-x86/syscalls/link.S deleted file mode 100644 index 3946dbf18..000000000 --- a/libc/arch-x86/syscalls/link.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type link, @function - .globl link - .align 4 - -link: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_link, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/listen.S b/libc/arch-x86/syscalls/listen.S deleted file mode 100644 index de310cf0a..000000000 --- a/libc/arch-x86/syscalls/listen.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type listen, @function - .globl listen - .align 4 - -listen: - pushl %ebx - pushl %ecx - mov $4, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/lseek.S b/libc/arch-x86/syscalls/lseek.S deleted file mode 100644 index 0b2c57c66..000000000 --- a/libc/arch-x86/syscalls/lseek.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type lseek, @function - .globl lseek - .align 4 - -lseek: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_lseek, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/lstat.S b/libc/arch-x86/syscalls/lstat.S deleted file mode 100644 index 4739f3296..000000000 --- a/libc/arch-x86/syscalls/lstat.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type lstat, @function - .globl lstat - .align 4 - -lstat: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_lstat64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/madvise.S b/libc/arch-x86/syscalls/madvise.S deleted file mode 100644 index 2423cc23c..000000000 --- a/libc/arch-x86/syscalls/madvise.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type madvise, @function - .globl madvise - .align 4 - -madvise: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_madvise, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mincore.S b/libc/arch-x86/syscalls/mincore.S deleted file mode 100644 index 1e02ac201..000000000 --- a/libc/arch-x86/syscalls/mincore.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mincore, @function - .globl mincore - .align 4 - -mincore: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_mincore, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mkdir.S b/libc/arch-x86/syscalls/mkdir.S deleted file mode 100644 index 4f1d1572a..000000000 --- a/libc/arch-x86/syscalls/mkdir.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mkdir, @function - .globl mkdir - .align 4 - -mkdir: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_mkdir, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mkdirat.S b/libc/arch-x86/syscalls/mkdirat.S deleted file mode 100644 index 10406d3c6..000000000 --- a/libc/arch-x86/syscalls/mkdirat.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mkdirat, @function - .globl mkdirat - .align 4 - -mkdirat: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_mkdirat, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mknod.S b/libc/arch-x86/syscalls/mknod.S deleted file mode 100644 index 8df1013af..000000000 --- a/libc/arch-x86/syscalls/mknod.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mknod, @function - .globl mknod - .align 4 - -mknod: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_mknod, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mlock.S b/libc/arch-x86/syscalls/mlock.S deleted file mode 100644 index 85323d201..000000000 --- a/libc/arch-x86/syscalls/mlock.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mlock, @function - .globl mlock - .align 4 - -mlock: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_mlock, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mount.S b/libc/arch-x86/syscalls/mount.S deleted file mode 100644 index 46237d3df..000000000 --- a/libc/arch-x86/syscalls/mount.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mount, @function - .globl mount - .align 4 - -mount: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_mount, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mprotect.S b/libc/arch-x86/syscalls/mprotect.S deleted file mode 100644 index f44d564d8..000000000 --- a/libc/arch-x86/syscalls/mprotect.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mprotect, @function - .globl mprotect - .align 4 - -mprotect: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_mprotect, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/mremap.S b/libc/arch-x86/syscalls/mremap.S deleted file mode 100644 index 891261c4a..000000000 --- a/libc/arch-x86/syscalls/mremap.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type mremap, @function - .globl mremap - .align 4 - -mremap: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_mremap, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/msync.S b/libc/arch-x86/syscalls/msync.S deleted file mode 100644 index b83ce0191..000000000 --- a/libc/arch-x86/syscalls/msync.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type msync, @function - .globl msync - .align 4 - -msync: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_msync, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/munlock.S b/libc/arch-x86/syscalls/munlock.S deleted file mode 100644 index 75ee75ee7..000000000 --- a/libc/arch-x86/syscalls/munlock.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type munlock, @function - .globl munlock - .align 4 - -munlock: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_munlock, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/munmap.S b/libc/arch-x86/syscalls/munmap.S deleted file mode 100644 index b25184404..000000000 --- a/libc/arch-x86/syscalls/munmap.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type munmap, @function - .globl munmap - .align 4 - -munmap: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_munmap, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/nanosleep.S b/libc/arch-x86/syscalls/nanosleep.S deleted file mode 100644 index c274d4fc1..000000000 --- a/libc/arch-x86/syscalls/nanosleep.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type nanosleep, @function - .globl nanosleep - .align 4 - -nanosleep: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_nanosleep, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/pause.S b/libc/arch-x86/syscalls/pause.S deleted file mode 100644 index 3fe1546c6..000000000 --- a/libc/arch-x86/syscalls/pause.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type pause, @function - .globl pause - .align 4 - -pause: - movl $__NR_pause, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/pipe.S b/libc/arch-x86/syscalls/pipe.S deleted file mode 100644 index d13090948..000000000 --- a/libc/arch-x86/syscalls/pipe.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type pipe, @function - .globl pipe - .align 4 - -pipe: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_pipe, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/poll.S b/libc/arch-x86/syscalls/poll.S deleted file mode 100644 index b732af666..000000000 --- a/libc/arch-x86/syscalls/poll.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type poll, @function - .globl poll - .align 4 - -poll: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_poll, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/prctl.S b/libc/arch-x86/syscalls/prctl.S deleted file mode 100644 index 4ce5d8968..000000000 --- a/libc/arch-x86/syscalls/prctl.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type prctl, @function - .globl prctl - .align 4 - -prctl: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_prctl, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/read.S b/libc/arch-x86/syscalls/read.S deleted file mode 100644 index 63549dcf4..000000000 --- a/libc/arch-x86/syscalls/read.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type read, @function - .globl read - .align 4 - -read: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_read, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/readlink.S b/libc/arch-x86/syscalls/readlink.S deleted file mode 100644 index 53c76322b..000000000 --- a/libc/arch-x86/syscalls/readlink.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type readlink, @function - .globl readlink - .align 4 - -readlink: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_readlink, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/readv.S b/libc/arch-x86/syscalls/readv.S deleted file mode 100644 index ed352d25b..000000000 --- a/libc/arch-x86/syscalls/readv.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type readv, @function - .globl readv - .align 4 - -readv: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_readv, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/recvfrom.S b/libc/arch-x86/syscalls/recvfrom.S deleted file mode 100644 index 3a3851802..000000000 --- a/libc/arch-x86/syscalls/recvfrom.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type recvfrom, @function - .globl recvfrom - .align 4 - -recvfrom: - pushl %ebx - pushl %ecx - mov $12, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/recvmsg.S b/libc/arch-x86/syscalls/recvmsg.S deleted file mode 100644 index aee69d6e6..000000000 --- a/libc/arch-x86/syscalls/recvmsg.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type recvmsg, @function - .globl recvmsg - .align 4 - -recvmsg: - pushl %ebx - pushl %ecx - mov $17, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/rename.S b/libc/arch-x86/syscalls/rename.S deleted file mode 100644 index 79ae119bf..000000000 --- a/libc/arch-x86/syscalls/rename.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type rename, @function - .globl rename - .align 4 - -rename: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_rename, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/renameat.S b/libc/arch-x86/syscalls/renameat.S deleted file mode 100644 index 30ba210f4..000000000 --- a/libc/arch-x86/syscalls/renameat.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type renameat, @function - .globl renameat - .align 4 - -renameat: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_renameat, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/rmdir.S b/libc/arch-x86/syscalls/rmdir.S deleted file mode 100644 index 124c10daf..000000000 --- a/libc/arch-x86/syscalls/rmdir.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type rmdir, @function - .globl rmdir - .align 4 - -rmdir: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_rmdir, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_get_priority_max.S b/libc/arch-x86/syscalls/sched_get_priority_max.S deleted file mode 100644 index e2d09a62c..000000000 --- a/libc/arch-x86/syscalls/sched_get_priority_max.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_get_priority_max, @function - .globl sched_get_priority_max - .align 4 - -sched_get_priority_max: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_sched_get_priority_max, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_get_priority_min.S b/libc/arch-x86/syscalls/sched_get_priority_min.S deleted file mode 100644 index 0f66eee89..000000000 --- a/libc/arch-x86/syscalls/sched_get_priority_min.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_get_priority_min, @function - .globl sched_get_priority_min - .align 4 - -sched_get_priority_min: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_sched_get_priority_min, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_getparam.S b/libc/arch-x86/syscalls/sched_getparam.S deleted file mode 100644 index 2a8bd0ef6..000000000 --- a/libc/arch-x86/syscalls/sched_getparam.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_getparam, @function - .globl sched_getparam - .align 4 - -sched_getparam: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_sched_getparam, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_getscheduler.S b/libc/arch-x86/syscalls/sched_getscheduler.S deleted file mode 100644 index aaa5f8cb4..000000000 --- a/libc/arch-x86/syscalls/sched_getscheduler.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_getscheduler, @function - .globl sched_getscheduler - .align 4 - -sched_getscheduler: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_sched_getscheduler, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_rr_get_interval.S b/libc/arch-x86/syscalls/sched_rr_get_interval.S deleted file mode 100644 index 58ccddd66..000000000 --- a/libc/arch-x86/syscalls/sched_rr_get_interval.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_rr_get_interval, @function - .globl sched_rr_get_interval - .align 4 - -sched_rr_get_interval: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_sched_rr_get_interval, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_setparam.S b/libc/arch-x86/syscalls/sched_setparam.S deleted file mode 100644 index 4b869bf44..000000000 --- a/libc/arch-x86/syscalls/sched_setparam.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_setparam, @function - .globl sched_setparam - .align 4 - -sched_setparam: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_sched_setparam, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_setscheduler.S b/libc/arch-x86/syscalls/sched_setscheduler.S deleted file mode 100644 index 099a6d17f..000000000 --- a/libc/arch-x86/syscalls/sched_setscheduler.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_setscheduler, @function - .globl sched_setscheduler - .align 4 - -sched_setscheduler: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_sched_setscheduler, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sched_yield.S b/libc/arch-x86/syscalls/sched_yield.S deleted file mode 100644 index fcd728184..000000000 --- a/libc/arch-x86/syscalls/sched_yield.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sched_yield, @function - .globl sched_yield - .align 4 - -sched_yield: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_sched_yield, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/select.S b/libc/arch-x86/syscalls/select.S deleted file mode 100644 index 27359a919..000000000 --- a/libc/arch-x86/syscalls/select.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type select, @function - .globl select - .align 4 - -select: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR__newselect, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sendfile.S b/libc/arch-x86/syscalls/sendfile.S deleted file mode 100644 index 2752eec05..000000000 --- a/libc/arch-x86/syscalls/sendfile.S +++ /dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sendfile, @function - .globl sendfile - .align 4 - -sendfile: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - mov 20(%esp), %ebx - mov 24(%esp), %ecx - mov 28(%esp), %edx - mov 32(%esp), %esi - movl $__NR_sendfile, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sendmsg.S b/libc/arch-x86/syscalls/sendmsg.S deleted file mode 100644 index 5f2662317..000000000 --- a/libc/arch-x86/syscalls/sendmsg.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sendmsg, @function - .globl sendmsg - .align 4 - -sendmsg: - pushl %ebx - pushl %ecx - mov $16, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sendto.S b/libc/arch-x86/syscalls/sendto.S deleted file mode 100644 index d79a2ba13..000000000 --- a/libc/arch-x86/syscalls/sendto.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sendto, @function - .globl sendto - .align 4 - -sendto: - pushl %ebx - pushl %ecx - mov $11, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setgid.S b/libc/arch-x86/syscalls/setgid.S deleted file mode 100644 index 67fd02ee9..000000000 --- a/libc/arch-x86/syscalls/setgid.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setgid, @function - .globl setgid - .align 4 - -setgid: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_setgid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setgroups.S b/libc/arch-x86/syscalls/setgroups.S deleted file mode 100644 index b6bab1154..000000000 --- a/libc/arch-x86/syscalls/setgroups.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setgroups, @function - .globl setgroups - .align 4 - -setgroups: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_setgroups32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setitimer.S b/libc/arch-x86/syscalls/setitimer.S deleted file mode 100644 index 29d4bc6aa..000000000 --- a/libc/arch-x86/syscalls/setitimer.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setitimer, @function - .globl setitimer - .align 4 - -setitimer: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_setitimer, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setpgid.S b/libc/arch-x86/syscalls/setpgid.S deleted file mode 100644 index df723820d..000000000 --- a/libc/arch-x86/syscalls/setpgid.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setpgid, @function - .globl setpgid - .align 4 - -setpgid: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_setpgid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setpriority.S b/libc/arch-x86/syscalls/setpriority.S deleted file mode 100644 index 39d7a185c..000000000 --- a/libc/arch-x86/syscalls/setpriority.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setpriority, @function - .globl setpriority - .align 4 - -setpriority: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_setpriority, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setregid.S b/libc/arch-x86/syscalls/setregid.S deleted file mode 100644 index c3112de6a..000000000 --- a/libc/arch-x86/syscalls/setregid.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setregid, @function - .globl setregid - .align 4 - -setregid: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_setregid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setresgid.S b/libc/arch-x86/syscalls/setresgid.S deleted file mode 100644 index 8e6c8c9b9..000000000 --- a/libc/arch-x86/syscalls/setresgid.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setresgid, @function - .globl setresgid - .align 4 - -setresgid: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_setresgid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setresuid.S b/libc/arch-x86/syscalls/setresuid.S deleted file mode 100644 index f81cb39f9..000000000 --- a/libc/arch-x86/syscalls/setresuid.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setresuid, @function - .globl setresuid - .align 4 - -setresuid: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_setresuid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setreuid.S b/libc/arch-x86/syscalls/setreuid.S deleted file mode 100644 index 99e5d5b91..000000000 --- a/libc/arch-x86/syscalls/setreuid.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setreuid, @function - .globl setreuid - .align 4 - -setreuid: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_setreuid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setrlimit.S b/libc/arch-x86/syscalls/setrlimit.S deleted file mode 100644 index 31613c556..000000000 --- a/libc/arch-x86/syscalls/setrlimit.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setrlimit, @function - .globl setrlimit - .align 4 - -setrlimit: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_setrlimit, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setsid.S b/libc/arch-x86/syscalls/setsid.S deleted file mode 100644 index db3138017..000000000 --- a/libc/arch-x86/syscalls/setsid.S +++ /dev/null @@ -1,20 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setsid, @function - .globl setsid - .align 4 - -setsid: - movl $__NR_setsid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - ret diff --git a/libc/arch-x86/syscalls/setsockopt.S b/libc/arch-x86/syscalls/setsockopt.S deleted file mode 100644 index d1c986a02..000000000 --- a/libc/arch-x86/syscalls/setsockopt.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setsockopt, @function - .globl setsockopt - .align 4 - -setsockopt: - pushl %ebx - pushl %ecx - mov $14, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/settimeofday.S b/libc/arch-x86/syscalls/settimeofday.S deleted file mode 100644 index e77fa1eaa..000000000 --- a/libc/arch-x86/syscalls/settimeofday.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type settimeofday, @function - .globl settimeofday - .align 4 - -settimeofday: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_settimeofday, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/setuid.S b/libc/arch-x86/syscalls/setuid.S deleted file mode 100644 index de334c0d3..000000000 --- a/libc/arch-x86/syscalls/setuid.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type setuid, @function - .globl setuid - .align 4 - -setuid: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_setuid32, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/shutdown.S b/libc/arch-x86/syscalls/shutdown.S deleted file mode 100644 index 45f066425..000000000 --- a/libc/arch-x86/syscalls/shutdown.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type shutdown, @function - .globl shutdown - .align 4 - -shutdown: - pushl %ebx - pushl %ecx - mov $13, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sigaction.S b/libc/arch-x86/syscalls/sigaction.S deleted file mode 100644 index b16e3aa24..000000000 --- a/libc/arch-x86/syscalls/sigaction.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sigaction, @function - .globl sigaction - .align 4 - -sigaction: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_sigaction, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sigpending.S b/libc/arch-x86/syscalls/sigpending.S deleted file mode 100644 index 228088606..000000000 --- a/libc/arch-x86/syscalls/sigpending.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sigpending, @function - .globl sigpending - .align 4 - -sigpending: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_sigpending, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sigprocmask.S b/libc/arch-x86/syscalls/sigprocmask.S deleted file mode 100644 index 42fcf92e9..000000000 --- a/libc/arch-x86/syscalls/sigprocmask.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sigprocmask, @function - .globl sigprocmask - .align 4 - -sigprocmask: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_sigprocmask, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/socket.S b/libc/arch-x86/syscalls/socket.S deleted file mode 100644 index 89a8358d2..000000000 --- a/libc/arch-x86/syscalls/socket.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type socket, @function - .globl socket - .align 4 - -socket: - pushl %ebx - pushl %ecx - mov $1, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/socketpair.S b/libc/arch-x86/syscalls/socketpair.S deleted file mode 100644 index 02229893b..000000000 --- a/libc/arch-x86/syscalls/socketpair.S +++ /dev/null @@ -1,27 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type socketpair, @function - .globl socketpair - .align 4 - -socketpair: - pushl %ebx - pushl %ecx - mov $8, %ebx - mov %esp, %ecx - addl $12, %ecx - movl $__NR_socketcall, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/stat.S b/libc/arch-x86/syscalls/stat.S deleted file mode 100644 index c9984f1e4..000000000 --- a/libc/arch-x86/syscalls/stat.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type stat, @function - .globl stat - .align 4 - -stat: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_stat64, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/symlink.S b/libc/arch-x86/syscalls/symlink.S deleted file mode 100644 index 04c4298c4..000000000 --- a/libc/arch-x86/syscalls/symlink.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type symlink, @function - .globl symlink - .align 4 - -symlink: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_symlink, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/sync.S b/libc/arch-x86/syscalls/sync.S deleted file mode 100644 index 5a6a72729..000000000 --- a/libc/arch-x86/syscalls/sync.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type sync, @function - .globl sync - .align 4 - -sync: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_sync, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/times.S b/libc/arch-x86/syscalls/times.S deleted file mode 100644 index 543f2be9c..000000000 --- a/libc/arch-x86/syscalls/times.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type times, @function - .globl times - .align 4 - -times: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_times, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/tkill.S b/libc/arch-x86/syscalls/tkill.S deleted file mode 100644 index f1f174bc5..000000000 --- a/libc/arch-x86/syscalls/tkill.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type tkill, @function - .globl tkill - .align 4 - -tkill: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_tkill, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/truncate.S b/libc/arch-x86/syscalls/truncate.S deleted file mode 100644 index 8c6646dfb..000000000 --- a/libc/arch-x86/syscalls/truncate.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type truncate, @function - .globl truncate - .align 4 - -truncate: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_truncate, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/umask.S b/libc/arch-x86/syscalls/umask.S deleted file mode 100644 index fe3d8cd18..000000000 --- a/libc/arch-x86/syscalls/umask.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type umask, @function - .globl umask - .align 4 - -umask: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_umask, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/umount2.S b/libc/arch-x86/syscalls/umount2.S deleted file mode 100644 index fdb53542a..000000000 --- a/libc/arch-x86/syscalls/umount2.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type umount2, @function - .globl umount2 - .align 4 - -umount2: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_umount2, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/uname.S b/libc/arch-x86/syscalls/uname.S deleted file mode 100644 index b5e8bfac4..000000000 --- a/libc/arch-x86/syscalls/uname.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type uname, @function - .globl uname - .align 4 - -uname: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_uname, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/unlink.S b/libc/arch-x86/syscalls/unlink.S deleted file mode 100644 index 0fe52bf0a..000000000 --- a/libc/arch-x86/syscalls/unlink.S +++ /dev/null @@ -1,23 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type unlink, @function - .globl unlink - .align 4 - -unlink: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_unlink, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/unlinkat.S b/libc/arch-x86/syscalls/unlinkat.S deleted file mode 100644 index f6f8c1750..000000000 --- a/libc/arch-x86/syscalls/unlinkat.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type unlinkat, @function - .globl unlinkat - .align 4 - -unlinkat: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_unlinkat, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/utimes.S b/libc/arch-x86/syscalls/utimes.S deleted file mode 100644 index 1a1b51da4..000000000 --- a/libc/arch-x86/syscalls/utimes.S +++ /dev/null @@ -1,26 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type utimes, @function - .globl utimes - .align 4 - -utimes: - pushl %ebx - pushl %ecx - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_utimes, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/waitid.S b/libc/arch-x86/syscalls/waitid.S deleted file mode 100644 index 9a5328bb5..000000000 --- a/libc/arch-x86/syscalls/waitid.S +++ /dev/null @@ -1,35 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type waitid, @function - .globl waitid - .align 4 - -waitid: - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_waitid, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/write.S b/libc/arch-x86/syscalls/write.S deleted file mode 100644 index caa450f76..000000000 --- a/libc/arch-x86/syscalls/write.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type write, @function - .globl write - .align 4 - -write: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_write, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/arch-x86/syscalls/writev.S b/libc/arch-x86/syscalls/writev.S deleted file mode 100644 index 53d3731e8..000000000 --- a/libc/arch-x86/syscalls/writev.S +++ /dev/null @@ -1,29 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include - - .text - .type writev, @function - .globl writev - .align 4 - -writev: - pushl %ebx - pushl %ecx - pushl %edx - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_writev, %eax - int $0x80 - cmpl $-129, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edx - popl %ecx - popl %ebx - ret diff --git a/libc/bionic/__errno.c b/libc/bionic/__errno.c deleted file mode 100644 index 8f33ccedd..000000000 --- a/libc/bionic/__errno.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include - -volatile int* __errno( void ) -{ - return &((volatile int*)__get_tls())[TLS_SLOT_ERRNO]; -} diff --git a/libc/bionic/__set_errno.c b/libc/bionic/__set_errno.c deleted file mode 100644 index c72d4f7fd..000000000 --- a/libc/bionic/__set_errno.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - - -int __set_errno(int n) -{ - errno = n; - return -1; -} - -/* - * this function is called from syscall stubs, - * (tail-called in the case of 0-4 arg versions) - */ - -int __set_syscall_errno(int n) -{ - /* some syscalls, mmap() for example, have valid return - ** values that are "negative". Since errno values are not - ** greater than 131 on Linux, we will just consider - ** anything significantly out of range as not-an-error - */ - if(n > -256) { - return __set_errno(-n); - } else { - return n; - } -} diff --git a/libc/bionic/_rand48.c b/libc/bionic/_rand48.c deleted file mode 100644 index e422781e4..000000000 --- a/libc/bionic/_rand48.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 1993 Martin Birgmeier - * All rights reserved. - * - * You may redistribute unmodified or modified versions of this source - * code provided that the above copyright notice and this and the - * following conditions are retained. - * - * This software is provided ``as is'', and comes with no warranties - * of any kind. I shall in no event be liable for anything that happens - * to anyone/anything when using this software. - */ - -#include -#include "rand48.h" - -unsigned short _rand48_seed[3] = { - RAND48_SEED_0, - RAND48_SEED_1, - RAND48_SEED_2 -}; -unsigned short _rand48_mult[3] = { - RAND48_MULT_0, - RAND48_MULT_1, - RAND48_MULT_2 -}; -unsigned short _rand48_add = RAND48_ADD; - -void -_dorand48(unsigned short xseed[3]) -{ - unsigned long accu; - unsigned short temp[2]; - - accu = (unsigned long) _rand48_mult[0] * (unsigned long) xseed[0] + - (unsigned long) _rand48_add; - temp[0] = (unsigned short) accu; /* lower 16 bits */ - accu >>= sizeof(unsigned short) * 8; - accu += (unsigned long) _rand48_mult[0] * (unsigned long) xseed[1] + - (unsigned long) _rand48_mult[1] * (unsigned long) xseed[0]; - temp[1] = (unsigned short) accu; /* middle 16 bits */ - accu >>= sizeof(unsigned short) * 8; - accu += _rand48_mult[0] * xseed[2] + _rand48_mult[1] * xseed[1] + _rand48_mult[2] * xseed[0]; - xseed[0] = temp[0]; - xseed[1] = temp[1]; - xseed[2] = (unsigned short) accu; -} diff --git a/libc/bionic/arc4random.c b/libc/bionic/arc4random.c deleted file mode 100644 index d70580aff..000000000 --- a/libc/bionic/arc4random.c +++ /dev/null @@ -1,308 +0,0 @@ -/* $OpenBSD: arc4random.c,v 1.19 2008/06/04 00:50:23 djm Exp $ */ - -/* - * Copyright (c) 1996, David Mazieres - * Copyright (c) 2008, Damien Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * Arc4 random number generator for OpenBSD. - * - * This code is derived from section 17.1 of Applied Cryptography, - * second edition, which describes a stream cipher allegedly - * compatible with RSA Labs "RC4" cipher (the actual description of - * which is a trade secret). The same algorithm is used as a stream - * cipher called "arcfour" in Tatu Ylonen's ssh package. - * - * Here the stream cipher has been modified always to include the time - * when initializing the state. That makes it impossible to - * regenerate the same random sequence twice, so this can't be used - * for encryption, but will generate good random numbers. - * - * RC4 is a registered trademark of RSA Laboratories. - */ - -#include -#include -#include -#include -#include -#include -#include -#include "thread_private.h" - -/* BIONIC-BEGIN */ -/* this lock should protect the global variables in this file */ -static pthread_mutex_t _arc4_lock = PTHREAD_MUTEX_INITIALIZER; -#define _ARC4_LOCK() pthread_mutex_lock(&_arc4_lock) -#define _ARC4_UNLOCK() pthread_mutex_unlock(&_arc4_lock) -/* BIONIC-END */ - -#ifdef __GNUC__ -#define inline __inline -#else /* !__GNUC__ */ -#define inline -#endif /* !__GNUC__ */ - -struct arc4_stream { - u_int8_t i; - u_int8_t j; - u_int8_t s[256]; -}; - -static int rs_initialized; -static struct arc4_stream rs; -static pid_t arc4_stir_pid; -static int arc4_count; - -static inline u_int8_t arc4_getbyte(void); - -static inline void -arc4_init(void) -{ - int n; - - for (n = 0; n < 256; n++) - rs.s[n] = n; - rs.i = 0; - rs.j = 0; -} - -static inline void -arc4_addrandom(u_char *dat, int datlen) -{ - int n; - u_int8_t si; - - rs.i--; - for (n = 0; n < 256; n++) { - rs.i = (rs.i + 1); - si = rs.s[rs.i]; - rs.j = (rs.j + si + dat[n % datlen]); - rs.s[rs.i] = rs.s[rs.j]; - rs.s[rs.j] = si; - } - rs.j = rs.i; -} - -static void -arc4_stir(void) -{ -#if 1 /* BIONIC-BEGIN */ - int i, fd; - union { - struct timeval tv; - u_int rnd[128 / sizeof(u_int)]; - } rdat; - int n; - - if (!rs_initialized) { - arc4_init(); - rs_initialized = 1; - } - - fd = open("/dev/urandom", O_RDONLY); - if (fd != -1) { - read(fd, rdat.rnd, sizeof(rdat.rnd)); - close(fd); - } - else - { - /* fd < 0 ? Ah, what the heck. We'll just take - * whatever was on the stack. just add a little more - * time-based randomness though - */ - gettimeofday(&rdat.tv, NULL); - } - - arc4_stir_pid = getpid(); - arc4_addrandom((void *) &rdat, sizeof(rdat)); -#else /* BIONIC-END */ - int i, mib[2]; - size_t len; - u_char rnd[128]; - - if (!rs_initialized) { - arc4_init(); - rs_initialized = 1; - } - - mib[0] = CTL_KERN; - mib[1] = KERN_ARND; - - len = sizeof(rnd); - sysctl(mib, 2, rnd, &len, NULL, 0); - - arc4_stir_pid = getpid(); - arc4_addrandom(rnd, sizeof(rnd)); -#endif - /* - * Discard early keystream, as per recommendations in: - * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps - */ - for (i = 0; i < 256; i++) - (void)arc4_getbyte(); - arc4_count = 1600000; -} - -static inline u_int8_t -arc4_getbyte(void) -{ - u_int8_t si, sj; - - rs.i = (rs.i + 1); - si = rs.s[rs.i]; - rs.j = (rs.j + si); - sj = rs.s[rs.j]; - rs.s[rs.i] = sj; - rs.s[rs.j] = si; - return (rs.s[(si + sj) & 0xff]); -} - -u_int8_t -__arc4_getbyte(void) -{ - u_int8_t val; - - _ARC4_LOCK(); - if (--arc4_count == 0 || !rs_initialized) - arc4_stir(); - val = arc4_getbyte(); - _ARC4_UNLOCK(); - return val; -} - -static inline u_int32_t -arc4_getword(void) -{ - u_int32_t val; - val = arc4_getbyte() << 24; - val |= arc4_getbyte() << 16; - val |= arc4_getbyte() << 8; - val |= arc4_getbyte(); - return val; -} - -void -arc4random_stir(void) -{ - _ARC4_LOCK(); - arc4_stir(); - _ARC4_UNLOCK(); -} - -void -arc4random_addrandom(u_char *dat, int datlen) -{ - _ARC4_LOCK(); - if (!rs_initialized) - arc4_stir(); - arc4_addrandom(dat, datlen); - _ARC4_UNLOCK(); -} - -u_int32_t -arc4random(void) -{ - u_int32_t val; - _ARC4_LOCK(); - arc4_count -= 4; - if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != getpid()) - arc4_stir(); - val = arc4_getword(); - _ARC4_UNLOCK(); - return val; -} - -void -arc4random_buf(void *_buf, size_t n) -{ - u_char *buf = (u_char *)_buf; - _ARC4_LOCK(); - if (!rs_initialized || arc4_stir_pid != getpid()) - arc4_stir(); - while (n--) { - if (--arc4_count <= 0) - arc4_stir(); - buf[n] = arc4_getbyte(); - } - _ARC4_UNLOCK(); -} - -/* - * Calculate a uniformly distributed random number less than upper_bound - * avoiding "modulo bias". - * - * Uniformity is achieved by generating new random numbers until the one - * returned is outside the range [0, 2**32 % upper_bound). This - * guarantees the selected random number will be inside - * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound) - * after reduction modulo upper_bound. - */ -u_int32_t -arc4random_uniform(u_int32_t upper_bound) -{ - u_int32_t r, min; - - if (upper_bound < 2) - return 0; - -#if (ULONG_MAX > 0xffffffffUL) - min = 0x100000000UL % upper_bound; -#else - /* Calculate (2**32 % upper_bound) avoiding 64-bit math */ - if (upper_bound > 0x80000000) - min = 1 + ~upper_bound; /* 2**32 - upper_bound */ - else { - /* (2**32 - (x * 2)) % x == 2**32 % x when x <= 2**31 */ - min = ((0xffffffff - (upper_bound * 2)) + 1) % upper_bound; - } -#endif - - /* - * This could theoretically loop forever but each retry has - * p > 0.5 (worst case, usually far better) of selecting a - * number inside the range we need, so it should rarely need - * to re-roll. - */ - for (;;) { - r = arc4random(); - if (r >= min) - break; - } - - return r % upper_bound; -} - -#if 0 -/*-------- Test code for i386 --------*/ -#include -#include -int -main(int argc, char **argv) -{ - const int iter = 1000000; - int i; - pctrval v; - - v = rdtsc(); - for (i = 0; i < iter; i++) - arc4random(); - v = rdtsc() - v; - v /= iter; - - printf("%qd cycles\n", v); -} -#endif diff --git a/libc/bionic/atomics_x86.c b/libc/bionic/atomics_x86.c deleted file mode 100644 index fd60f4f05..000000000 --- a/libc/bionic/atomics_x86.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -#define FUTEX_SYSCALL 240 -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 - -int __futex_wait(volatile void *ftx, int val) -{ - int ret; - asm volatile ( - "int $0x80;" - : "=a" (ret) - : "0" (FUTEX_SYSCALL), - "b" (ftx), - "c" (FUTEX_WAIT), - "d" (val), - "S" (0) - ); - return ret; -} - -int __futex_wake(volatile void *ftx, int count) -{ - int ret; - asm volatile ( - "int $0x80;" - : "=a" (ret) - : "0" (FUTEX_SYSCALL), - "b" (ftx), - "c" (FUTEX_WAKE), - "d" (count) - ); - return ret; -} - -int __atomic_cmpxchg(int old, int new, volatile int* addr) { - int xchg; - asm volatile ( - "lock;" - "cmpxchg %%ecx, (%%edx);" - "setne %%al;" - : "=a" (xchg) - : "a" (old), - "c" (new), - "d" (addr) - ); - return xchg; -} - -int __atomic_swap(int new, volatile int* addr) { - int old; - asm volatile ( - "lock;" - "xchg %%ecx, (%%edx);" - : "=c" (old) - : "c" (new), - "d" (addr) - ); - return old; -} - -int __atomic_dec(volatile int* addr) { - int old; - do { - old = *addr; - } while (atomic_cmpxchg(old, old-1, addr)); - return old; -} diff --git a/libc/bionic/basename.c b/libc/bionic/basename.c deleted file mode 100644 index 8aaae538d..000000000 --- a/libc/bionic/basename.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -#include -#include -#include -#include -#include - -char* -basename(const char* path) -{ - static char* bname = NULL; - int ret; - - if (bname == NULL) { - bname = (char *)malloc(MAXPATHLEN); - if (bname == NULL) - return(NULL); - } - ret = basename_r(path, bname, MAXPATHLEN); - return (ret < 0) ? NULL : bname; -} diff --git a/libc/bionic/basename_r.c b/libc/bionic/basename_r.c deleted file mode 100644 index e9080f058..000000000 --- a/libc/bionic/basename_r.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include - -int -basename_r(const char* path, char* buffer, size_t bufflen) -{ - const char *endp, *startp; - int len, result; - char temp[2]; - - /* Empty or NULL string gets treated as "." */ - if (path == NULL || *path == '\0') { - startp = "."; - len = 1; - goto Exit; - } - - /* Strip trailing slashes */ - endp = path + strlen(path) - 1; - while (endp > path && *endp == '/') - endp--; - - /* All slashes becomes "/" */ - if (endp == path && *endp == '/') { - startp = "/"; - len = 1; - goto Exit; - } - - /* Find the start of the base */ - startp = endp; - while (startp > path && *(startp - 1) != '/') - startp--; - - len = endp - startp +1; - -Exit: - result = len; - if (buffer == NULL) { - return result; - } - if (len > (int)bufflen-1) { - len = (int)bufflen-1; - result = -1; - errno = ERANGE; - } - - if (len >= 0) { - memcpy( buffer, startp, len ); - buffer[len] = 0; - } - return result; -} diff --git a/libc/bionic/dirname.c b/libc/bionic/dirname.c deleted file mode 100644 index 8a1db9054..000000000 --- a/libc/bionic/dirname.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -#include -#include -#include -#include -#include - -char* -dirname(const char* path) -{ - static char* bname = NULL; - int ret; - - if (bname == NULL) { - bname = (char *)malloc(MAXPATHLEN); - if (bname == NULL) - return(NULL); - } - - ret = dirname_r(path, bname, MAXPATHLEN); - return (ret < 0) ? NULL : bname; -} diff --git a/libc/bionic/dirname_r.c b/libc/bionic/dirname_r.c deleted file mode 100644 index df2e9bf7b..000000000 --- a/libc/bionic/dirname_r.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include - -int -dirname_r(const char* path, char* buffer, size_t bufflen) -{ - const char *endp; - int result, len; - - /* Empty or NULL string gets treated as "." */ - if (path == NULL || *path == '\0') { - path = "."; - len = 1; - goto Exit; - } - - /* Strip trailing slashes */ - endp = path + strlen(path) - 1; - while (endp > path && *endp == '/') - endp--; - - /* Find the start of the dir */ - while (endp > path && *endp != '/') - endp--; - - /* Either the dir is "/" or there are no slashes */ - if (endp == path) { - path = (*endp == '/') ? "/" : "."; - len = 1; - goto Exit; - } - - do { - endp--; - } while (endp > path && *endp == '/'); - - len = endp - path +1; - -Exit: - result = len; - if (len+1 > MAXPATHLEN) { - errno = ENAMETOOLONG; - return -1; - } - if (buffer == NULL) - return result; - - if (len > (int)bufflen-1) { - len = (int)bufflen-1; - result = -1; - errno = ERANGE; - } - - if (len >= 0) { - memcpy( buffer, path, len ); - buffer[len] = 0; - } - return result; -} diff --git a/libc/bionic/dlmalloc.c b/libc/bionic/dlmalloc.c deleted file mode 100644 index 78f20c059..000000000 --- a/libc/bionic/dlmalloc.c +++ /dev/null @@ -1,5377 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - This is a version (aka dlmalloc) of malloc/free/realloc written by - Doug Lea and released to the public domain, as explained at - http://creativecommons.org/licenses/publicdomain. Send questions, - comments, complaints, performance data, etc to dl@cs.oswego.edu - -* Version 2.8.3 Thu Sep 22 11:16:15 2005 Doug Lea (dl at gee) - - Note: There may be an updated version of this malloc obtainable at - ftp://gee.cs.oswego.edu/pub/misc/malloc.c - Check before installing! - -* Quickstart - - This library is all in one file to simplify the most common usage: - ftp it, compile it (-O3), and link it into another program. All of - the compile-time options default to reasonable values for use on - most platforms. You might later want to step through various - compile-time and dynamic tuning options. - - For convenience, an include file for code using this malloc is at: - ftp://gee.cs.oswego.edu/pub/misc/malloc-2.8.3.h - You don't really need this .h file unless you call functions not - defined in your system include files. The .h file contains only the - excerpts from this file needed for using this malloc on ANSI C/C++ - systems, so long as you haven't changed compile-time options about - naming and tuning parameters. If you do, then you can create your - own malloc.h that does include all settings by cutting at the point - indicated below. Note that you may already by default be using a C - library containing a malloc that is based on some version of this - malloc (for example in linux). You might still want to use the one - in this file to customize settings or to avoid overheads associated - with library versions. - -* Vital statistics: - - Supported pointer/size_t representation: 4 or 8 bytes - size_t MUST be an unsigned type of the same width as - pointers. (If you are using an ancient system that declares - size_t as a signed type, or need it to be a different width - than pointers, you can use a previous release of this malloc - (e.g. 2.7.2) supporting these.) - - Alignment: 8 bytes (default) - This suffices for nearly all current machines and C compilers. - However, you can define MALLOC_ALIGNMENT to be wider than this - if necessary (up to 128bytes), at the expense of using more space. - - Minimum overhead per allocated chunk: 4 or 8 bytes (if 4byte sizes) - 8 or 16 bytes (if 8byte sizes) - Each malloced chunk has a hidden word of overhead holding size - and status information, and additional cross-check word - if FOOTERS is defined. - - Minimum allocated size: 4-byte ptrs: 16 bytes (including overhead) - 8-byte ptrs: 32 bytes (including overhead) - - Even a request for zero bytes (i.e., malloc(0)) returns a - pointer to something of the minimum allocatable size. - The maximum overhead wastage (i.e., number of extra bytes - allocated than were requested in malloc) is less than or equal - to the minimum size, except for requests >= mmap_threshold that - are serviced via mmap(), where the worst case wastage is about - 32 bytes plus the remainder from a system page (the minimal - mmap unit); typically 4096 or 8192 bytes. - - Security: static-safe; optionally more or less - The "security" of malloc refers to the ability of malicious - code to accentuate the effects of errors (for example, freeing - space that is not currently malloc'ed or overwriting past the - ends of chunks) in code that calls malloc. This malloc - guarantees not to modify any memory locations below the base of - heap, i.e., static variables, even in the presence of usage - errors. The routines additionally detect most improper frees - and reallocs. All this holds as long as the static bookkeeping - for malloc itself is not corrupted by some other means. This - is only one aspect of security -- these checks do not, and - cannot, detect all possible programming errors. - - If FOOTERS is defined nonzero, then each allocated chunk - carries an additional check word to verify that it was malloced - from its space. These check words are the same within each - execution of a program using malloc, but differ across - executions, so externally crafted fake chunks cannot be - freed. This improves security by rejecting frees/reallocs that - could corrupt heap memory, in addition to the checks preventing - writes to statics that are always on. This may further improve - security at the expense of time and space overhead. (Note that - FOOTERS may also be worth using with MSPACES.) - - By default detected errors cause the program to abort (calling - "abort()"). You can override this to instead proceed past - errors by defining PROCEED_ON_ERROR. In this case, a bad free - has no effect, and a malloc that encounters a bad address - caused by user overwrites will ignore the bad address by - dropping pointers and indices to all known memory. This may - be appropriate for programs that should continue if at all - possible in the face of programming errors, although they may - run out of memory because dropped memory is never reclaimed. - - If you don't like either of these options, you can define - CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything - else. And if if you are sure that your program using malloc has - no errors or vulnerabilities, you can define INSECURE to 1, - which might (or might not) provide a small performance improvement. - - Thread-safety: NOT thread-safe unless USE_LOCKS defined - When USE_LOCKS is defined, each public call to malloc, free, - etc is surrounded with either a pthread mutex or a win32 - spinlock (depending on WIN32). This is not especially fast, and - can be a major bottleneck. It is designed only to provide - minimal protection in concurrent environments, and to provide a - basis for extensions. If you are using malloc in a concurrent - program, consider instead using ptmalloc, which is derived from - a version of this malloc. (See http://www.malloc.de). - - System requirements: Any combination of MORECORE and/or MMAP/MUNMAP - This malloc can use unix sbrk or any emulation (invoked using - the CALL_MORECORE macro) and/or mmap/munmap or any emulation - (invoked using CALL_MMAP/CALL_MUNMAP) to get and release system - memory. On most unix systems, it tends to work best if both - MORECORE and MMAP are enabled. On Win32, it uses emulations - based on VirtualAlloc. It also uses common C library functions - like memset. - - Compliance: I believe it is compliant with the Single Unix Specification - (See http://www.unix.org). Also SVID/XPG, ANSI C, and probably - others as well. - -* Overview of algorithms - - This is not the fastest, most space-conserving, most portable, or - most tunable malloc ever written. However it is among the fastest - while also being among the most space-conserving, portable and - tunable. Consistent balance across these factors results in a good - general-purpose allocator for malloc-intensive programs. - - In most ways, this malloc is a best-fit allocator. Generally, it - chooses the best-fitting existing chunk for a request, with ties - broken in approximately least-recently-used order. (This strategy - normally maintains low fragmentation.) However, for requests less - than 256bytes, it deviates from best-fit when there is not an - exactly fitting available chunk by preferring to use space adjacent - to that used for the previous small request, as well as by breaking - ties in approximately most-recently-used order. (These enhance - locality of series of small allocations.) And for very large requests - (>= 256Kb by default), it relies on system memory mapping - facilities, if supported. (This helps avoid carrying around and - possibly fragmenting memory used only for large chunks.) - - All operations (except malloc_stats and mallinfo) have execution - times that are bounded by a constant factor of the number of bits in - a size_t, not counting any clearing in calloc or copying in realloc, - or actions surrounding MORECORE and MMAP that have times - proportional to the number of non-contiguous regions returned by - system allocation routines, which is often just 1. - - The implementation is not very modular and seriously overuses - macros. Perhaps someday all C compilers will do as good a job - inlining modular code as can now be done by brute-force expansion, - but now, enough of them seem not to. - - Some compilers issue a lot of warnings about code that is - dead/unreachable only on some platforms, and also about intentional - uses of negation on unsigned types. All known cases of each can be - ignored. - - For a longer but out of date high-level description, see - http://gee.cs.oswego.edu/dl/html/malloc.html - -* MSPACES - If MSPACES is defined, then in addition to malloc, free, etc., - this file also defines mspace_malloc, mspace_free, etc. These - are versions of malloc routines that take an "mspace" argument - obtained using create_mspace, to control all internal bookkeeping. - If ONLY_MSPACES is defined, only these versions are compiled. - So if you would like to use this allocator for only some allocations, - and your system malloc for others, you can compile with - ONLY_MSPACES and then do something like... - static mspace mymspace = create_mspace(0,0); // for example - #define mymalloc(bytes) mspace_malloc(mymspace, bytes) - - (Note: If you only need one instance of an mspace, you can instead - use "USE_DL_PREFIX" to relabel the global malloc.) - - You can similarly create thread-local allocators by storing - mspaces as thread-locals. For example: - static __thread mspace tlms = 0; - void* tlmalloc(size_t bytes) { - if (tlms == 0) tlms = create_mspace(0, 0); - return mspace_malloc(tlms, bytes); - } - void tlfree(void* mem) { mspace_free(tlms, mem); } - - Unless FOOTERS is defined, each mspace is completely independent. - You cannot allocate from one and free to another (although - conformance is only weakly checked, so usage errors are not always - caught). If FOOTERS is defined, then each chunk carries around a tag - indicating its originating mspace, and frees are directed to their - originating spaces. - - ------------------------- Compile-time options --------------------------- - -Be careful in setting #define values for numerical constants of type -size_t. On some systems, literal values are not automatically extended -to size_t precision unless they are explicitly casted. - -WIN32 default: defined if _WIN32 defined - Defining WIN32 sets up defaults for MS environment and compilers. - Otherwise defaults are for unix. - -MALLOC_ALIGNMENT default: (size_t)8 - Controls the minimum alignment for malloc'ed chunks. It must be a - power of two and at least 8, even on machines for which smaller - alignments would suffice. It may be defined as larger than this - though. Note however that code and data structures are optimized for - the case of 8-byte alignment. - -MSPACES default: 0 (false) - If true, compile in support for independent allocation spaces. - This is only supported if HAVE_MMAP is true. - -ONLY_MSPACES default: 0 (false) - If true, only compile in mspace versions, not regular versions. - -USE_LOCKS default: 0 (false) - Causes each call to each public routine to be surrounded with - pthread or WIN32 mutex lock/unlock. (If set true, this can be - overridden on a per-mspace basis for mspace versions.) - -FOOTERS default: 0 - If true, provide extra checking and dispatching by placing - information in the footers of allocated chunks. This adds - space and time overhead. - -INSECURE default: 0 - If true, omit checks for usage errors and heap space overwrites. - -USE_DL_PREFIX default: NOT defined - Causes compiler to prefix all public routines with the string 'dl'. - This can be useful when you only want to use this malloc in one part - of a program, using your regular system malloc elsewhere. - -ABORT default: defined as abort() - Defines how to abort on failed checks. On most systems, a failed - check cannot die with an "assert" or even print an informative - message, because the underlying print routines in turn call malloc, - which will fail again. Generally, the best policy is to simply call - abort(). It's not very useful to do more than this because many - errors due to overwriting will show up as address faults (null, odd - addresses etc) rather than malloc-triggered checks, so will also - abort. Also, most compilers know that abort() does not return, so - can better optimize code conditionally calling it. - -PROCEED_ON_ERROR default: defined as 0 (false) - Controls whether detected bad addresses cause them to bypassed - rather than aborting. If set, detected bad arguments to free and - realloc are ignored. And all bookkeeping information is zeroed out - upon a detected overwrite of freed heap space, thus losing the - ability to ever return it from malloc again, but enabling the - application to proceed. If PROCEED_ON_ERROR is defined, the - static variable malloc_corruption_error_count is compiled in - and can be examined to see if errors have occurred. This option - generates slower code than the default abort policy. - -DEBUG default: NOT defined - The DEBUG setting is mainly intended for people trying to modify - this code or diagnose problems when porting to new platforms. - However, it may also be able to better isolate user errors than just - using runtime checks. The assertions in the check routines spell - out in more detail the assumptions and invariants underlying the - algorithms. The checking is fairly extensive, and will slow down - execution noticeably. Calling malloc_stats or mallinfo with DEBUG - set will attempt to check every non-mmapped allocated and free chunk - in the course of computing the summaries. - -ABORT_ON_ASSERT_FAILURE default: defined as 1 (true) - Debugging assertion failures can be nearly impossible if your - version of the assert macro causes malloc to be called, which will - lead to a cascade of further failures, blowing the runtime stack. - ABORT_ON_ASSERT_FAILURE cause assertions failures to call abort(), - which will usually make debugging easier. - -MALLOC_FAILURE_ACTION default: sets errno to ENOMEM, or no-op on win32 - The action to take before "return 0" when malloc fails to be able to - return memory because there is none available. - -HAVE_MORECORE default: 1 (true) unless win32 or ONLY_MSPACES - True if this system supports sbrk or an emulation of it. - -MORECORE default: sbrk - The name of the sbrk-style system routine to call to obtain more - memory. See below for guidance on writing custom MORECORE - functions. The type of the argument to sbrk/MORECORE varies across - systems. It cannot be size_t, because it supports negative - arguments, so it is normally the signed type of the same width as - size_t (sometimes declared as "intptr_t"). It doesn't much matter - though. Internally, we only call it with arguments less than half - the max value of a size_t, which should work across all reasonable - possibilities, although sometimes generating compiler warnings. See - near the end of this file for guidelines for creating a custom - version of MORECORE. - -MORECORE_CONTIGUOUS default: 1 (true) - If true, take advantage of fact that consecutive calls to MORECORE - with positive arguments always return contiguous increasing - addresses. This is true of unix sbrk. It does not hurt too much to - set it true anyway, since malloc copes with non-contiguities. - Setting it false when definitely non-contiguous saves time - and possibly wasted space it would take to discover this though. - -MORECORE_CANNOT_TRIM default: NOT defined - True if MORECORE cannot release space back to the system when given - negative arguments. This is generally necessary only if you are - using a hand-crafted MORECORE function that cannot handle negative - arguments. - -HAVE_MMAP default: 1 (true) - True if this system supports mmap or an emulation of it. If so, and - HAVE_MORECORE is not true, MMAP is used for all system - allocation. If set and HAVE_MORECORE is true as well, MMAP is - primarily used to directly allocate very large blocks. It is also - used as a backup strategy in cases where MORECORE fails to provide - space from system. Note: A single call to MUNMAP is assumed to be - able to unmap memory that may have be allocated using multiple calls - to MMAP, so long as they are adjacent. - -HAVE_MREMAP default: 1 on linux, else 0 - If true realloc() uses mremap() to re-allocate large blocks and - extend or shrink allocation spaces. - -MMAP_CLEARS default: 1 on unix - True if mmap clears memory so calloc doesn't need to. This is true - for standard unix mmap using /dev/zero. - -USE_BUILTIN_FFS default: 0 (i.e., not used) - Causes malloc to use the builtin ffs() function to compute indices. - Some compilers may recognize and intrinsify ffs to be faster than the - supplied C version. Also, the case of x86 using gcc is special-cased - to an asm instruction, so is already as fast as it can be, and so - this setting has no effect. (On most x86s, the asm version is only - slightly faster than the C version.) - -malloc_getpagesize default: derive from system includes, or 4096. - The system page size. To the extent possible, this malloc manages - memory from the system in page-size units. This may be (and - usually is) a function rather than a constant. This is ignored - if WIN32, where page size is determined using getSystemInfo during - initialization. - -USE_DEV_RANDOM default: 0 (i.e., not used) - Causes malloc to use /dev/random to initialize secure magic seed for - stamping footers. Otherwise, the current time is used. - -NO_MALLINFO default: 0 - If defined, don't compile "mallinfo". This can be a simple way - of dealing with mismatches between system declarations and - those in this file. - -MALLINFO_FIELD_TYPE default: size_t - The type of the fields in the mallinfo struct. This was originally - defined as "int" in SVID etc, but is more usefully defined as - size_t. The value is used only if HAVE_USR_INCLUDE_MALLOC_H is not set - -REALLOC_ZERO_BYTES_FREES default: not defined - This should be set if a call to realloc with zero bytes should - be the same as a call to free. Some people think it should. Otherwise, - since this malloc returns a unique pointer for malloc(0), so does - realloc(p, 0). - -LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H -LACKS_STRINGS_H, LACKS_STRING_H, LACKS_SYS_TYPES_H, LACKS_ERRNO_H -LACKS_STDLIB_H default: NOT defined unless on WIN32 - Define these if your system does not have these header files. - You might need to manually insert some of the declarations they provide. - -DEFAULT_GRANULARITY default: page size if MORECORE_CONTIGUOUS, - system_info.dwAllocationGranularity in WIN32, - otherwise 64K. - Also settable using mallopt(M_GRANULARITY, x) - The unit for allocating and deallocating memory from the system. On - most systems with contiguous MORECORE, there is no reason to - make this more than a page. However, systems with MMAP tend to - either require or encourage larger granularities. You can increase - this value to prevent system allocation functions to be called so - often, especially if they are slow. The value must be at least one - page and must be a power of two. Setting to 0 causes initialization - to either page size or win32 region size. (Note: In previous - versions of malloc, the equivalent of this option was called - "TOP_PAD") - -DEFAULT_TRIM_THRESHOLD default: 2MB - Also settable using mallopt(M_TRIM_THRESHOLD, x) - The maximum amount of unused top-most memory to keep before - releasing via malloc_trim in free(). Automatic trimming is mainly - useful in long-lived programs using contiguous MORECORE. Because - trimming via sbrk can be slow on some systems, and can sometimes be - wasteful (in cases where programs immediately afterward allocate - more large chunks) the value should be high enough so that your - overall system performance would improve by releasing this much - memory. As a rough guide, you might set to a value close to the - average size of a process (program) running on your system. - Releasing this much memory would allow such a process to run in - memory. Generally, it is worth tuning trim thresholds when a - program undergoes phases where several large chunks are allocated - and released in ways that can reuse each other's storage, perhaps - mixed with phases where there are no such chunks at all. The trim - value must be greater than page size to have any useful effect. To - disable trimming completely, you can set to MAX_SIZE_T. Note that the trick - some people use of mallocing a huge space and then freeing it at - program startup, in an attempt to reserve system memory, doesn't - have the intended effect under automatic trimming, since that memory - will immediately be returned to the system. - -DEFAULT_MMAP_THRESHOLD default: 256K - Also settable using mallopt(M_MMAP_THRESHOLD, x) - The request size threshold for using MMAP to directly service a - request. Requests of at least this size that cannot be allocated - using already-existing space will be serviced via mmap. (If enough - normal freed space already exists it is used instead.) Using mmap - segregates relatively large chunks of memory so that they can be - individually obtained and released from the host system. A request - serviced through mmap is never reused by any other request (at least - not directly; the system may just so happen to remap successive - requests to the same locations). Segregating space in this way has - the benefits that: Mmapped space can always be individually released - back to the system, which helps keep the system level memory demands - of a long-lived program low. Also, mapped memory doesn't become - `locked' between other chunks, as can happen with normally allocated - chunks, which means that even trimming via malloc_trim would not - release them. However, it has the disadvantage that the space - cannot be reclaimed, consolidated, and then used to service later - requests, as happens with normal chunks. The advantages of mmap - nearly always outweigh disadvantages for "large" chunks, but the - value of "large" may vary across systems. The default is an - empirically derived value that works well in most systems. You can - disable mmap by setting to MAX_SIZE_T. - -*/ - -#ifndef WIN32 -#ifdef _WIN32 -#define WIN32 1 -#endif /* _WIN32 */ -#endif /* WIN32 */ -#ifdef WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#define HAVE_MMAP 1 -#define HAVE_MORECORE 0 -#define LACKS_UNISTD_H -#define LACKS_SYS_PARAM_H -#define LACKS_SYS_MMAN_H -#define LACKS_STRING_H -#define LACKS_STRINGS_H -#define LACKS_SYS_TYPES_H -#define LACKS_ERRNO_H -#define MALLOC_FAILURE_ACTION -#define MMAP_CLEARS 0 /* WINCE and some others apparently don't clear */ -#endif /* WIN32 */ - -#if defined(DARWIN) || defined(_DARWIN) -/* Mac OSX docs advise not to use sbrk; it seems better to use mmap */ -#ifndef HAVE_MORECORE -#define HAVE_MORECORE 0 -#define HAVE_MMAP 1 -#endif /* HAVE_MORECORE */ -#endif /* DARWIN */ - -#ifndef LACKS_SYS_TYPES_H -#include /* For size_t */ -#endif /* LACKS_SYS_TYPES_H */ - -/* The maximum possible size_t value has all bits set */ -#define MAX_SIZE_T (~(size_t)0) - -#ifndef ONLY_MSPACES -#define ONLY_MSPACES 0 -#endif /* ONLY_MSPACES */ -#ifndef MSPACES -#if ONLY_MSPACES -#define MSPACES 1 -#else /* ONLY_MSPACES */ -#define MSPACES 0 -#endif /* ONLY_MSPACES */ -#endif /* MSPACES */ -#ifndef MALLOC_ALIGNMENT -#define MALLOC_ALIGNMENT ((size_t)8U) -#endif /* MALLOC_ALIGNMENT */ -#ifndef FOOTERS -#define FOOTERS 0 -#endif /* FOOTERS */ -#ifndef USE_MAX_ALLOWED_FOOTPRINT -#define USE_MAX_ALLOWED_FOOTPRINT 0 -#endif -#ifndef ABORT -#define ABORT abort() -#endif /* ABORT */ -#ifndef ABORT_ON_ASSERT_FAILURE -#define ABORT_ON_ASSERT_FAILURE 1 -#endif /* ABORT_ON_ASSERT_FAILURE */ -#ifndef PROCEED_ON_ERROR -#define PROCEED_ON_ERROR 0 -#endif /* PROCEED_ON_ERROR */ -#ifndef USE_LOCKS -#define USE_LOCKS 0 -#endif /* USE_LOCKS */ -#ifndef INSECURE -#define INSECURE 0 -#endif /* INSECURE */ -#ifndef HAVE_MMAP -#define HAVE_MMAP 1 -#endif /* HAVE_MMAP */ -#ifndef MMAP_CLEARS -#define MMAP_CLEARS 1 -#endif /* MMAP_CLEARS */ -#ifndef HAVE_MREMAP -#ifdef linux -#define HAVE_MREMAP 1 -#else /* linux */ -#define HAVE_MREMAP 0 -#endif /* linux */ -#endif /* HAVE_MREMAP */ -#ifndef MALLOC_FAILURE_ACTION -#define MALLOC_FAILURE_ACTION errno = ENOMEM; -#endif /* MALLOC_FAILURE_ACTION */ -#ifndef HAVE_MORECORE -#if ONLY_MSPACES -#define HAVE_MORECORE 0 -#else /* ONLY_MSPACES */ -#define HAVE_MORECORE 1 -#endif /* ONLY_MSPACES */ -#endif /* HAVE_MORECORE */ -#if !HAVE_MORECORE -#define MORECORE_CONTIGUOUS 0 -#else /* !HAVE_MORECORE */ -#ifndef MORECORE -#define MORECORE sbrk -#endif /* MORECORE */ -#ifndef MORECORE_CONTIGUOUS -#define MORECORE_CONTIGUOUS 1 -#endif /* MORECORE_CONTIGUOUS */ -#endif /* HAVE_MORECORE */ -#ifndef DEFAULT_GRANULARITY -#if MORECORE_CONTIGUOUS -#define DEFAULT_GRANULARITY (0) /* 0 means to compute in init_mparams */ -#else /* MORECORE_CONTIGUOUS */ -#define DEFAULT_GRANULARITY ((size_t)64U * (size_t)1024U) -#endif /* MORECORE_CONTIGUOUS */ -#endif /* DEFAULT_GRANULARITY */ -#ifndef DEFAULT_TRIM_THRESHOLD -#ifndef MORECORE_CANNOT_TRIM -#define DEFAULT_TRIM_THRESHOLD ((size_t)2U * (size_t)1024U * (size_t)1024U) -#else /* MORECORE_CANNOT_TRIM */ -#define DEFAULT_TRIM_THRESHOLD MAX_SIZE_T -#endif /* MORECORE_CANNOT_TRIM */ -#endif /* DEFAULT_TRIM_THRESHOLD */ -#ifndef DEFAULT_MMAP_THRESHOLD -#if HAVE_MMAP -#define DEFAULT_MMAP_THRESHOLD ((size_t)64U * (size_t)1024U) -#else /* HAVE_MMAP */ -#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T -#endif /* HAVE_MMAP */ -#endif /* DEFAULT_MMAP_THRESHOLD */ -#ifndef USE_BUILTIN_FFS -#define USE_BUILTIN_FFS 0 -#endif /* USE_BUILTIN_FFS */ -#ifndef USE_DEV_RANDOM -#define USE_DEV_RANDOM 0 -#endif /* USE_DEV_RANDOM */ -#ifndef NO_MALLINFO -#define NO_MALLINFO 0 -#endif /* NO_MALLINFO */ -#ifndef MALLINFO_FIELD_TYPE -#define MALLINFO_FIELD_TYPE size_t -#endif /* MALLINFO_FIELD_TYPE */ - -/* - mallopt tuning options. SVID/XPG defines four standard parameter - numbers for mallopt, normally defined in malloc.h. None of these - are used in this malloc, so setting them has no effect. But this - malloc does support the following options. -*/ - -#define M_TRIM_THRESHOLD (-1) -#define M_GRANULARITY (-2) -#define M_MMAP_THRESHOLD (-3) - -/* ------------------------ Mallinfo declarations ------------------------ */ - -#if !NO_MALLINFO -/* - This version of malloc supports the standard SVID/XPG mallinfo - routine that returns a struct containing usage properties and - statistics. It should work on any system that has a - /usr/include/malloc.h defining struct mallinfo. The main - declaration needed is the mallinfo struct that is returned (by-copy) - by mallinfo(). The malloinfo struct contains a bunch of fields that - are not even meaningful in this version of malloc. These fields are - are instead filled by mallinfo() with other numbers that might be of - interest. - - HAVE_USR_INCLUDE_MALLOC_H should be set if you have a - /usr/include/malloc.h file that includes a declaration of struct - mallinfo. If so, it is included; else a compliant version is - declared below. These must be precisely the same for mallinfo() to - work. The original SVID version of this struct, defined on most - systems with mallinfo, declares all fields as ints. But some others - define as unsigned long. If your system defines the fields using a - type of different width than listed here, you MUST #include your - system version and #define HAVE_USR_INCLUDE_MALLOC_H. -*/ - -/* #define HAVE_USR_INCLUDE_MALLOC_H */ - -#if !ANDROID -#ifdef HAVE_USR_INCLUDE_MALLOC_H -#include "/usr/include/malloc.h" -#else /* HAVE_USR_INCLUDE_MALLOC_H */ - -struct mallinfo { - MALLINFO_FIELD_TYPE arena; /* non-mmapped space allocated from system */ - MALLINFO_FIELD_TYPE ordblks; /* number of free chunks */ - MALLINFO_FIELD_TYPE smblks; /* always 0 */ - MALLINFO_FIELD_TYPE hblks; /* always 0 */ - MALLINFO_FIELD_TYPE hblkhd; /* space in mmapped regions */ - MALLINFO_FIELD_TYPE usmblks; /* maximum total allocated space */ - MALLINFO_FIELD_TYPE fsmblks; /* always 0 */ - MALLINFO_FIELD_TYPE uordblks; /* total allocated space */ - MALLINFO_FIELD_TYPE fordblks; /* total free space */ - MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */ -}; - -#endif /* HAVE_USR_INCLUDE_MALLOC_H */ -#endif /* NO_MALLINFO */ -#endif /* ANDROID */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#if !ONLY_MSPACES - -/* ------------------- Declarations of public routines ------------------- */ - -/* Check an additional macro for the five primary functions */ -#if !defined(USE_DL_PREFIX) || !defined(MALLOC_LEAK_CHECK) -#define dlcalloc calloc -#define dlfree free -#define dlmalloc malloc -#define dlmemalign memalign -#define dlrealloc realloc -#endif - -#ifndef USE_DL_PREFIX -#define dlvalloc valloc -#define dlpvalloc pvalloc -#define dlmallinfo mallinfo -#define dlmallopt mallopt -#define dlmalloc_trim malloc_trim -#define dlmalloc_walk_free_pages \ - malloc_walk_free_pages -#define dlmalloc_walk_heap \ - malloc_walk_heap -#define dlmalloc_stats malloc_stats -#define dlmalloc_usable_size malloc_usable_size -#define dlmalloc_footprint malloc_footprint -#define dlmalloc_max_allowed_footprint \ - malloc_max_allowed_footprint -#define dlmalloc_set_max_allowed_footprint \ - malloc_set_max_allowed_footprint -#define dlmalloc_max_footprint malloc_max_footprint -#define dlindependent_calloc independent_calloc -#define dlindependent_comalloc independent_comalloc -#endif /* USE_DL_PREFIX */ - - -/* - malloc(size_t n) - Returns a pointer to a newly allocated chunk of at least n bytes, or - null if no space is available, in which case errno is set to ENOMEM - on ANSI C systems. - - If n is zero, malloc returns a minimum-sized chunk. (The minimum - size is 16 bytes on most 32bit systems, and 32 bytes on 64bit - systems.) Note that size_t is an unsigned type, so calls with - arguments that would be negative if signed are interpreted as - requests for huge amounts of space, which will often fail. The - maximum supported value of n differs across systems, but is in all - cases less than the maximum representable value of a size_t. -*/ -void* dlmalloc(size_t); - -/* - free(void* p) - Releases the chunk of memory pointed to by p, that had been previously - allocated using malloc or a related routine such as realloc. - It has no effect if p is null. If p was not malloced or already - freed, free(p) will by default cause the current program to abort. -*/ -void dlfree(void*); - -/* - calloc(size_t n_elements, size_t element_size); - Returns a pointer to n_elements * element_size bytes, with all locations - set to zero. -*/ -void* dlcalloc(size_t, size_t); - -/* - realloc(void* p, size_t n) - Returns a pointer to a chunk of size n that contains the same data - as does chunk p up to the minimum of (n, p's size) bytes, or null - if no space is available. - - The returned pointer may or may not be the same as p. The algorithm - prefers extending p in most cases when possible, otherwise it - employs the equivalent of a malloc-copy-free sequence. - - If p is null, realloc is equivalent to malloc. - - If space is not available, realloc returns null, errno is set (if on - ANSI) and p is NOT freed. - - if n is for fewer bytes than already held by p, the newly unused - space is lopped off and freed if possible. realloc with a size - argument of zero (re)allocates a minimum-sized chunk. - - The old unix realloc convention of allowing the last-free'd chunk - to be used as an argument to realloc is not supported. -*/ - -void* dlrealloc(void*, size_t); - -/* - memalign(size_t alignment, size_t n); - Returns a pointer to a newly allocated chunk of n bytes, aligned - in accord with the alignment argument. - - The alignment argument should be a power of two. If the argument is - not a power of two, the nearest greater power is used. - 8-byte alignment is guaranteed by normal malloc calls, so don't - bother calling memalign with an argument of 8 or less. - - Overreliance on memalign is a sure way to fragment space. -*/ -void* dlmemalign(size_t, size_t); - -/* - valloc(size_t n); - Equivalent to memalign(pagesize, n), where pagesize is the page - size of the system. If the pagesize is unknown, 4096 is used. -*/ -void* dlvalloc(size_t); - -/* - mallopt(int parameter_number, int parameter_value) - Sets tunable parameters The format is to provide a - (parameter-number, parameter-value) pair. mallopt then sets the - corresponding parameter to the argument value if it can (i.e., so - long as the value is meaningful), and returns 1 if successful else - 0. SVID/XPG/ANSI defines four standard param numbers for mallopt, - normally defined in malloc.h. None of these are use in this malloc, - so setting them has no effect. But this malloc also supports other - options in mallopt. See below for details. Briefly, supported - parameters are as follows (listed defaults are for "typical" - configurations). - - Symbol param # default allowed param values - M_TRIM_THRESHOLD -1 2*1024*1024 any (MAX_SIZE_T disables) - M_GRANULARITY -2 page size any power of 2 >= page size - M_MMAP_THRESHOLD -3 256*1024 any (or 0 if no MMAP support) -*/ -int dlmallopt(int, int); - -/* - malloc_footprint(); - Returns the number of bytes obtained from the system. The total - number of bytes allocated by malloc, realloc etc., is less than this - value. Unlike mallinfo, this function returns only a precomputed - result, so can be called frequently to monitor memory consumption. - Even if locks are otherwise defined, this function does not use them, - so results might not be up to date. -*/ -size_t dlmalloc_footprint(void); - -#if USE_MAX_ALLOWED_FOOTPRINT -/* - malloc_max_allowed_footprint(); - Returns the number of bytes that the heap is allowed to obtain - from the system. malloc_footprint() should always return a - size less than or equal to max_allowed_footprint, unless the - max_allowed_footprint was set to a value smaller than the - footprint at the time. -*/ -size_t dlmalloc_max_allowed_footprint(); - -/* - malloc_set_max_allowed_footprint(); - Set the maximum number of bytes that the heap is allowed to - obtain from the system. The size will be rounded up to a whole - page, and the rounded number will be returned from future calls - to malloc_max_allowed_footprint(). If the new max_allowed_footprint - is larger than the current footprint, the heap will never grow - larger than max_allowed_footprint. If the new max_allowed_footprint - is smaller than the current footprint, the heap will not grow - further. - - TODO: try to force the heap to give up memory in the shrink case, - and update this comment once that happens. -*/ -void dlmalloc_set_max_allowed_footprint(size_t bytes); -#endif /* USE_MAX_ALLOWED_FOOTPRINT */ - -/* - malloc_max_footprint(); - Returns the maximum number of bytes obtained from the system. This - value will be greater than current footprint if deallocated space - has been reclaimed by the system. The peak number of bytes allocated - by malloc, realloc etc., is less than this value. Unlike mallinfo, - this function returns only a precomputed result, so can be called - frequently to monitor memory consumption. Even if locks are - otherwise defined, this function does not use them, so results might - not be up to date. -*/ -size_t dlmalloc_max_footprint(void); - -#if !NO_MALLINFO -/* - mallinfo() - Returns (by copy) a struct containing various summary statistics: - - arena: current total non-mmapped bytes allocated from system - ordblks: the number of free chunks - smblks: always zero. - hblks: current number of mmapped regions - hblkhd: total bytes held in mmapped regions - usmblks: the maximum total allocated space. This will be greater - than current total if trimming has occurred. - fsmblks: always zero - uordblks: current total allocated space (normal or mmapped) - fordblks: total free space - keepcost: the maximum number of bytes that could ideally be released - back to system via malloc_trim. ("ideally" means that - it ignores page restrictions etc.) - - Because these fields are ints, but internal bookkeeping may - be kept as longs, the reported values may wrap around zero and - thus be inaccurate. -*/ -struct mallinfo dlmallinfo(void); -#endif /* NO_MALLINFO */ - -/* - independent_calloc(size_t n_elements, size_t element_size, void* chunks[]); - - independent_calloc is similar to calloc, but instead of returning a - single cleared space, it returns an array of pointers to n_elements - independent elements that can hold contents of size elem_size, each - of which starts out cleared, and can be independently freed, - realloc'ed etc. The elements are guaranteed to be adjacently - allocated (this is not guaranteed to occur with multiple callocs or - mallocs), which may also improve cache locality in some - applications. - - The "chunks" argument is optional (i.e., may be null, which is - probably the most typical usage). If it is null, the returned array - is itself dynamically allocated and should also be freed when it is - no longer needed. Otherwise, the chunks array must be of at least - n_elements in length. It is filled in with the pointers to the - chunks. - - In either case, independent_calloc returns this pointer array, or - null if the allocation failed. If n_elements is zero and "chunks" - is null, it returns a chunk representing an array with zero elements - (which should be freed if not wanted). - - Each element must be individually freed when it is no longer - needed. If you'd like to instead be able to free all at once, you - should instead use regular calloc and assign pointers into this - space to represent elements. (In this case though, you cannot - independently free elements.) - - independent_calloc simplifies and speeds up implementations of many - kinds of pools. It may also be useful when constructing large data - structures that initially have a fixed number of fixed-sized nodes, - but the number is not known at compile time, and some of the nodes - may later need to be freed. For example: - - struct Node { int item; struct Node* next; }; - - struct Node* build_list() { - struct Node** pool; - int n = read_number_of_nodes_needed(); - if (n <= 0) return 0; - pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0); - if (pool == 0) die(); - // organize into a linked list... - struct Node* first = pool[0]; - for (i = 0; i < n-1; ++i) - pool[i]->next = pool[i+1]; - free(pool); // Can now free the array (or not, if it is needed later) - return first; - } -*/ -void** dlindependent_calloc(size_t, size_t, void**); - -/* - independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]); - - independent_comalloc allocates, all at once, a set of n_elements - chunks with sizes indicated in the "sizes" array. It returns - an array of pointers to these elements, each of which can be - independently freed, realloc'ed etc. The elements are guaranteed to - be adjacently allocated (this is not guaranteed to occur with - multiple callocs or mallocs), which may also improve cache locality - in some applications. - - The "chunks" argument is optional (i.e., may be null). If it is null - the returned array is itself dynamically allocated and should also - be freed when it is no longer needed. Otherwise, the chunks array - must be of at least n_elements in length. It is filled in with the - pointers to the chunks. - - In either case, independent_comalloc returns this pointer array, or - null if the allocation failed. If n_elements is zero and chunks is - null, it returns a chunk representing an array with zero elements - (which should be freed if not wanted). - - Each element must be individually freed when it is no longer - needed. If you'd like to instead be able to free all at once, you - should instead use a single regular malloc, and assign pointers at - particular offsets in the aggregate space. (In this case though, you - cannot independently free elements.) - - independent_comallac differs from independent_calloc in that each - element may have a different size, and also that it does not - automatically clear elements. - - independent_comalloc can be used to speed up allocation in cases - where several structs or objects must always be allocated at the - same time. For example: - - struct Head { ... } - struct Foot { ... } - - void send_message(char* msg) { - int msglen = strlen(msg); - size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) }; - void* chunks[3]; - if (independent_comalloc(3, sizes, chunks) == 0) - die(); - struct Head* head = (struct Head*)(chunks[0]); - char* body = (char*)(chunks[1]); - struct Foot* foot = (struct Foot*)(chunks[2]); - // ... - } - - In general though, independent_comalloc is worth using only for - larger values of n_elements. For small values, you probably won't - detect enough difference from series of malloc calls to bother. - - Overuse of independent_comalloc can increase overall memory usage, - since it cannot reuse existing noncontiguous small chunks that - might be available for some of the elements. -*/ -void** dlindependent_comalloc(size_t, size_t*, void**); - - -/* - pvalloc(size_t n); - Equivalent to valloc(minimum-page-that-holds(n)), that is, - round up n to nearest pagesize. - */ -void* dlpvalloc(size_t); - -/* - malloc_trim(size_t pad); - - If possible, gives memory back to the system (via negative arguments - to sbrk) if there is unused memory at the `high' end of the malloc - pool or in unused MMAP segments. You can call this after freeing - large blocks of memory to potentially reduce the system-level memory - requirements of a program. However, it cannot guarantee to reduce - memory. Under some allocation patterns, some large free blocks of - memory will be locked between two used chunks, so they cannot be - given back to the system. - - The `pad' argument to malloc_trim represents the amount of free - trailing space to leave untrimmed. If this argument is zero, only - the minimum amount of memory to maintain internal data structures - will be left. Non-zero arguments can be supplied to maintain enough - trailing space to service future expected allocations without having - to re-obtain memory from the system. - - Malloc_trim returns 1 if it actually released any memory, else 0. -*/ -int dlmalloc_trim(size_t); - -/* - malloc_walk_free_pages(handler, harg) - - Calls the provided handler on each free region in the heap. The - memory between start and end are guaranteed not to contain any - important data, so the handler is free to alter the contents - in any way. This can be used to advise the OS that large free - regions may be swapped out. - - The value in harg will be passed to each call of the handler. - */ -void dlmalloc_walk_free_pages(void(*)(void*, void*, void*), void*); - -/* - malloc_walk_heap(handler, harg) - - Calls the provided handler on each object or free region in the - heap. The handler will receive the chunk pointer and length, the - object pointer and length, and the value in harg on each call. - */ -void dlmalloc_walk_heap(void(*)(const void*, size_t, - const void*, size_t, void*), - void*); - -/* - malloc_usable_size(void* p); - - Returns the number of bytes you can actually use in - an allocated chunk, which may be more than you requested (although - often not) due to alignment and minimum size constraints. - You can use this many bytes without worrying about - overwriting other allocated objects. This is not a particularly great - programming practice. malloc_usable_size can be more useful in - debugging and assertions, for example: - - p = malloc(n); - assert(malloc_usable_size(p) >= 256); -*/ -size_t dlmalloc_usable_size(void*); - -/* - malloc_stats(); - Prints on stderr the amount of space obtained from the system (both - via sbrk and mmap), the maximum amount (which may be more than - current if malloc_trim and/or munmap got called), and the current - number of bytes allocated via malloc (or realloc, etc) but not yet - freed. Note that this is the number of bytes allocated, not the - number requested. It will be larger than the number requested - because of alignment and bookkeeping overhead. Because it includes - alignment wastage as being in use, this figure may be greater than - zero even when no user-level chunks are allocated. - - The reported current and maximum system memory can be inaccurate if - a program makes other calls to system memory allocation functions - (normally sbrk) outside of malloc. - - malloc_stats prints only the most commonly interesting statistics. - More information can be obtained by calling mallinfo. -*/ -void dlmalloc_stats(void); - -#endif /* ONLY_MSPACES */ - -#if MSPACES - -/* - mspace is an opaque type representing an independent - region of space that supports mspace_malloc, etc. -*/ -typedef void* mspace; - -/* - create_mspace creates and returns a new independent space with the - given initial capacity, or, if 0, the default granularity size. It - returns null if there is no system memory available to create the - space. If argument locked is non-zero, the space uses a separate - lock to control access. The capacity of the space will grow - dynamically as needed to service mspace_malloc requests. You can - control the sizes of incremental increases of this space by - compiling with a different DEFAULT_GRANULARITY or dynamically - setting with mallopt(M_GRANULARITY, value). -*/ -mspace create_mspace(size_t capacity, int locked); - -/* - destroy_mspace destroys the given space, and attempts to return all - of its memory back to the system, returning the total number of - bytes freed. After destruction, the results of access to all memory - used by the space become undefined. -*/ -size_t destroy_mspace(mspace msp); - -/* - create_mspace_with_base uses the memory supplied as the initial base - of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this - space is used for bookkeeping, so the capacity must be at least this - large. (Otherwise 0 is returned.) When this initial space is - exhausted, additional memory will be obtained from the system. - Destroying this space will deallocate all additionally allocated - space (if possible) but not the initial base. -*/ -mspace create_mspace_with_base(void* base, size_t capacity, int locked); - -/* - mspace_malloc behaves as malloc, but operates within - the given space. -*/ -void* mspace_malloc(mspace msp, size_t bytes); - -/* - mspace_free behaves as free, but operates within - the given space. - - If compiled with FOOTERS==1, mspace_free is not actually needed. - free may be called instead of mspace_free because freed chunks from - any space are handled by their originating spaces. -*/ -void mspace_free(mspace msp, void* mem); - -/* - mspace_realloc behaves as realloc, but operates within - the given space. - - If compiled with FOOTERS==1, mspace_realloc is not actually - needed. realloc may be called instead of mspace_realloc because - realloced chunks from any space are handled by their originating - spaces. -*/ -void* mspace_realloc(mspace msp, void* mem, size_t newsize); - -/* - mspace_calloc behaves as calloc, but operates within - the given space. -*/ -void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size); - -/* - mspace_memalign behaves as memalign, but operates within - the given space. -*/ -void* mspace_memalign(mspace msp, size_t alignment, size_t bytes); - -/* - mspace_independent_calloc behaves as independent_calloc, but - operates within the given space. -*/ -void** mspace_independent_calloc(mspace msp, size_t n_elements, - size_t elem_size, void* chunks[]); - -/* - mspace_independent_comalloc behaves as independent_comalloc, but - operates within the given space. -*/ -void** mspace_independent_comalloc(mspace msp, size_t n_elements, - size_t sizes[], void* chunks[]); - -/* - mspace_footprint() returns the number of bytes obtained from the - system for this space. -*/ -size_t mspace_footprint(mspace msp); - -/* - mspace_max_footprint() returns the peak number of bytes obtained from the - system for this space. -*/ -size_t mspace_max_footprint(mspace msp); - - -#if !NO_MALLINFO -/* - mspace_mallinfo behaves as mallinfo, but reports properties of - the given space. -*/ -struct mallinfo mspace_mallinfo(mspace msp); -#endif /* NO_MALLINFO */ - -/* - mspace_malloc_stats behaves as malloc_stats, but reports - properties of the given space. -*/ -void mspace_malloc_stats(mspace msp); - -/* - mspace_trim behaves as malloc_trim, but - operates within the given space. -*/ -int mspace_trim(mspace msp, size_t pad); - -/* - An alias for mallopt. -*/ -int mspace_mallopt(int, int); - -#endif /* MSPACES */ - -#ifdef __cplusplus -}; /* end of extern "C" */ -#endif /* __cplusplus */ - -/* - ======================================================================== - To make a fully customizable malloc.h header file, cut everything - above this line, put into file malloc.h, edit to suit, and #include it - on the next line, as well as in programs that use this malloc. - ======================================================================== -*/ - -/* #include "malloc.h" */ - -/*------------------------------ internal #includes ---------------------- */ - -#ifdef WIN32 -#pragma warning( disable : 4146 ) /* no "unsigned" warnings */ -#endif /* WIN32 */ - -#include /* for printing in malloc_stats */ - -#ifndef LACKS_ERRNO_H -#include /* for MALLOC_FAILURE_ACTION */ -#endif /* LACKS_ERRNO_H */ -#if FOOTERS -#include /* for magic initialization */ -#endif /* FOOTERS */ -#ifndef LACKS_STDLIB_H -#include /* for abort() */ -#endif /* LACKS_STDLIB_H */ -#ifdef DEBUG -#if ABORT_ON_ASSERT_FAILURE -#define assert(x) if(!(x)) ABORT -#else /* ABORT_ON_ASSERT_FAILURE */ -#include -#endif /* ABORT_ON_ASSERT_FAILURE */ -#else /* DEBUG */ -#define assert(x) -#endif /* DEBUG */ -#ifndef LACKS_STRING_H -#include /* for memset etc */ -#endif /* LACKS_STRING_H */ -#if USE_BUILTIN_FFS -#ifndef LACKS_STRINGS_H -#include /* for ffs */ -#endif /* LACKS_STRINGS_H */ -#endif /* USE_BUILTIN_FFS */ -#if HAVE_MMAP -#ifndef LACKS_SYS_MMAN_H -#include /* for mmap */ -#endif /* LACKS_SYS_MMAN_H */ -#ifndef LACKS_FCNTL_H -#include -#endif /* LACKS_FCNTL_H */ -#endif /* HAVE_MMAP */ -#if HAVE_MORECORE -#ifndef LACKS_UNISTD_H -#include /* for sbrk */ -#else /* LACKS_UNISTD_H */ -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) -extern void* sbrk(ptrdiff_t); -#endif /* FreeBSD etc */ -#endif /* LACKS_UNISTD_H */ -#endif /* HAVE_MMAP */ - -#ifndef WIN32 -#ifndef malloc_getpagesize -# ifdef _SC_PAGESIZE /* some SVR4 systems omit an underscore */ -# ifndef _SC_PAGE_SIZE -# define _SC_PAGE_SIZE _SC_PAGESIZE -# endif -# endif -# ifdef _SC_PAGE_SIZE -# define malloc_getpagesize sysconf(_SC_PAGE_SIZE) -# else -# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE) - extern size_t getpagesize(); -# define malloc_getpagesize getpagesize() -# else -# ifdef WIN32 /* use supplied emulation of getpagesize */ -# define malloc_getpagesize getpagesize() -# else -# ifndef LACKS_SYS_PARAM_H -# include -# endif -# ifdef EXEC_PAGESIZE -# define malloc_getpagesize EXEC_PAGESIZE -# else -# ifdef NBPG -# ifndef CLSIZE -# define malloc_getpagesize NBPG -# else -# define malloc_getpagesize (NBPG * CLSIZE) -# endif -# else -# ifdef NBPC -# define malloc_getpagesize NBPC -# else -# ifdef PAGESIZE -# define malloc_getpagesize PAGESIZE -# else /* just guess */ -# define malloc_getpagesize ((size_t)4096U) -# endif -# endif -# endif -# endif -# endif -# endif -# endif -#endif -#endif - -/* ------------------- size_t and alignment properties -------------------- */ - -/* The byte and bit size of a size_t */ -#define SIZE_T_SIZE (sizeof(size_t)) -#define SIZE_T_BITSIZE (sizeof(size_t) << 3) - -/* Some constants coerced to size_t */ -/* Annoying but necessary to avoid errors on some plaftorms */ -#define SIZE_T_ZERO ((size_t)0) -#define SIZE_T_ONE ((size_t)1) -#define SIZE_T_TWO ((size_t)2) -#define TWO_SIZE_T_SIZES (SIZE_T_SIZE<<1) -#define FOUR_SIZE_T_SIZES (SIZE_T_SIZE<<2) -#define SIX_SIZE_T_SIZES (FOUR_SIZE_T_SIZES+TWO_SIZE_T_SIZES) -#define HALF_MAX_SIZE_T (MAX_SIZE_T / 2U) - -/* The bit mask value corresponding to MALLOC_ALIGNMENT */ -#define CHUNK_ALIGN_MASK (MALLOC_ALIGNMENT - SIZE_T_ONE) - -/* True if address a has acceptable alignment */ -#define is_aligned(A) (((size_t)((A)) & (CHUNK_ALIGN_MASK)) == 0) - -/* the number of bytes to offset an address to align it */ -#define align_offset(A)\ - ((((size_t)(A) & CHUNK_ALIGN_MASK) == 0)? 0 :\ - ((MALLOC_ALIGNMENT - ((size_t)(A) & CHUNK_ALIGN_MASK)) & CHUNK_ALIGN_MASK)) - -/* -------------------------- MMAP preliminaries ------------------------- */ - -/* - If HAVE_MORECORE or HAVE_MMAP are false, we just define calls and - checks to fail so compiler optimizer can delete code rather than - using so many "#if"s. -*/ - - -/* MORECORE and MMAP must return MFAIL on failure */ -#define MFAIL ((void*)(MAX_SIZE_T)) -#define CMFAIL ((char*)(MFAIL)) /* defined for convenience */ - -#if !HAVE_MMAP -#define IS_MMAPPED_BIT (SIZE_T_ZERO) -#define USE_MMAP_BIT (SIZE_T_ZERO) -#define CALL_MMAP(s) MFAIL -#define CALL_MUNMAP(a, s) (-1) -#define DIRECT_MMAP(s) MFAIL - -#else /* HAVE_MMAP */ -#define IS_MMAPPED_BIT (SIZE_T_ONE) -#define USE_MMAP_BIT (SIZE_T_ONE) - -#ifndef WIN32 -#define CALL_MUNMAP(a, s) munmap((a), (s)) -#define MMAP_PROT (PROT_READ|PROT_WRITE) -#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) -#define MAP_ANONYMOUS MAP_ANON -#endif /* MAP_ANON */ -#ifdef MAP_ANONYMOUS -#define MMAP_FLAGS (MAP_PRIVATE|MAP_ANONYMOUS) -#define CALL_MMAP(s) mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0) -#else /* MAP_ANONYMOUS */ -/* - Nearly all versions of mmap support MAP_ANONYMOUS, so the following - is unlikely to be needed, but is supplied just in case. -*/ -#define MMAP_FLAGS (MAP_PRIVATE) -static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */ -#define CALL_MMAP(s) ((dev_zero_fd < 0) ? \ - (dev_zero_fd = open("/dev/zero", O_RDWR), \ - mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \ - mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) -#endif /* MAP_ANONYMOUS */ - -#define DIRECT_MMAP(s) CALL_MMAP(s) -#else /* WIN32 */ - -/* Win32 MMAP via VirtualAlloc */ -static void* win32mmap(size_t size) { - void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE); - return (ptr != 0)? ptr: MFAIL; -} - -/* For direct MMAP, use MEM_TOP_DOWN to minimize interference */ -static void* win32direct_mmap(size_t size) { - void* ptr = VirtualAlloc(0, size, MEM_RESERVE|MEM_COMMIT|MEM_TOP_DOWN, - PAGE_READWRITE); - return (ptr != 0)? ptr: MFAIL; -} - -/* This function supports releasing coalesed segments */ -static int win32munmap(void* ptr, size_t size) { - MEMORY_BASIC_INFORMATION minfo; - char* cptr = ptr; - while (size) { - if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0) - return -1; - if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr || - minfo.State != MEM_COMMIT || minfo.RegionSize > size) - return -1; - if (VirtualFree(cptr, 0, MEM_RELEASE) == 0) - return -1; - cptr += minfo.RegionSize; - size -= minfo.RegionSize; - } - return 0; -} - -#define CALL_MMAP(s) win32mmap(s) -#define CALL_MUNMAP(a, s) win32munmap((a), (s)) -#define DIRECT_MMAP(s) win32direct_mmap(s) -#endif /* WIN32 */ -#endif /* HAVE_MMAP */ - -#if HAVE_MMAP && HAVE_MREMAP -#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv)) -#else /* HAVE_MMAP && HAVE_MREMAP */ -#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL -#endif /* HAVE_MMAP && HAVE_MREMAP */ - -#if HAVE_MORECORE -#define CALL_MORECORE(S) MORECORE(S) -#else /* HAVE_MORECORE */ -#define CALL_MORECORE(S) MFAIL -#endif /* HAVE_MORECORE */ - -/* mstate bit set if continguous morecore disabled or failed */ -#define USE_NONCONTIGUOUS_BIT (4U) - -/* segment bit set in create_mspace_with_base */ -#define EXTERN_BIT (8U) - - -/* --------------------------- Lock preliminaries ------------------------ */ - -#if USE_LOCKS - -/* - When locks are defined, there are up to two global locks: - - * If HAVE_MORECORE, morecore_mutex protects sequences of calls to - MORECORE. In many cases sys_alloc requires two calls, that should - not be interleaved with calls by other threads. This does not - protect against direct calls to MORECORE by other threads not - using this lock, so there is still code to cope the best we can on - interference. - - * magic_init_mutex ensures that mparams.magic and other - unique mparams values are initialized only once. -*/ - -#ifndef WIN32 -/* By default use posix locks */ -#include -#define MLOCK_T pthread_mutex_t -#define INITIAL_LOCK(l) pthread_mutex_init(l, NULL) -#define ACQUIRE_LOCK(l) pthread_mutex_lock(l) -#define RELEASE_LOCK(l) pthread_mutex_unlock(l) - -#if HAVE_MORECORE -static MLOCK_T morecore_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* HAVE_MORECORE */ - -static MLOCK_T magic_init_mutex = PTHREAD_MUTEX_INITIALIZER; - -#else /* WIN32 */ -/* - Because lock-protected regions have bounded times, and there - are no recursive lock calls, we can use simple spinlocks. -*/ - -#define MLOCK_T long -static int win32_acquire_lock (MLOCK_T *sl) { - for (;;) { -#ifdef InterlockedCompareExchangePointer - if (!InterlockedCompareExchange(sl, 1, 0)) - return 0; -#else /* Use older void* version */ - if (!InterlockedCompareExchange((void**)sl, (void*)1, (void*)0)) - return 0; -#endif /* InterlockedCompareExchangePointer */ - Sleep (0); - } -} - -static void win32_release_lock (MLOCK_T *sl) { - InterlockedExchange (sl, 0); -} - -#define INITIAL_LOCK(l) *(l)=0 -#define ACQUIRE_LOCK(l) win32_acquire_lock(l) -#define RELEASE_LOCK(l) win32_release_lock(l) -#if HAVE_MORECORE -static MLOCK_T morecore_mutex; -#endif /* HAVE_MORECORE */ -static MLOCK_T magic_init_mutex; -#endif /* WIN32 */ - -#define USE_LOCK_BIT (2U) -#else /* USE_LOCKS */ -#define USE_LOCK_BIT (0U) -#define INITIAL_LOCK(l) -#endif /* USE_LOCKS */ - -#if USE_LOCKS && HAVE_MORECORE -#define ACQUIRE_MORECORE_LOCK() ACQUIRE_LOCK(&morecore_mutex); -#define RELEASE_MORECORE_LOCK() RELEASE_LOCK(&morecore_mutex); -#else /* USE_LOCKS && HAVE_MORECORE */ -#define ACQUIRE_MORECORE_LOCK() -#define RELEASE_MORECORE_LOCK() -#endif /* USE_LOCKS && HAVE_MORECORE */ - -#if USE_LOCKS -#define ACQUIRE_MAGIC_INIT_LOCK() ACQUIRE_LOCK(&magic_init_mutex); -#define RELEASE_MAGIC_INIT_LOCK() RELEASE_LOCK(&magic_init_mutex); -#else /* USE_LOCKS */ -#define ACQUIRE_MAGIC_INIT_LOCK() -#define RELEASE_MAGIC_INIT_LOCK() -#endif /* USE_LOCKS */ - - -/* ----------------------- Chunk representations ------------------------ */ - -/* - (The following includes lightly edited explanations by Colin Plumb.) - - The malloc_chunk declaration below is misleading (but accurate and - necessary). It declares a "view" into memory allowing access to - necessary fields at known offsets from a given base. - - Chunks of memory are maintained using a `boundary tag' method as - originally described by Knuth. (See the paper by Paul Wilson - ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a survey of such - techniques.) Sizes of free chunks are stored both in the front of - each chunk and at the end. This makes consolidating fragmented - chunks into bigger chunks fast. The head fields also hold bits - representing whether chunks are free or in use. - - Here are some pictures to make it clearer. They are "exploded" to - show that the state of a chunk can be thought of as extending from - the high 31 bits of the head field of its header through the - prev_foot and PINUSE_BIT bit of the following chunk header. - - A chunk that's in use looks like: - - chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Size of previous chunk (if P = 1) | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P| - | Size of this chunk 1| +-+ - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | | - +- -+ - | | - +- -+ - | : - +- size - sizeof(size_t) available payload bytes -+ - : | - chunk-> +- -+ - | | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1| - | Size of next chunk (may or may not be in use) | +-+ - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - And if it's free, it looks like this: - - chunk-> +- -+ - | User payload (must be in use, or we would have merged!) | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P| - | Size of this chunk 0| +-+ - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Next pointer | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Prev pointer | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | : - +- size - sizeof(struct chunk) unused bytes -+ - : | - chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Size of this chunk | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |0| - | Size of next chunk (must be in use, or we would have merged)| +-+ - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | : - +- User payload -+ - : | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - |0| - +-+ - Note that since we always merge adjacent free chunks, the chunks - adjacent to a free chunk must be in use. - - Given a pointer to a chunk (which can be derived trivially from the - payload pointer) we can, in O(1) time, find out whether the adjacent - chunks are free, and if so, unlink them from the lists that they - are on and merge them with the current chunk. - - Chunks always begin on even word boundaries, so the mem portion - (which is returned to the user) is also on an even word boundary, and - thus at least double-word aligned. - - The P (PINUSE_BIT) bit, stored in the unused low-order bit of the - chunk size (which is always a multiple of two words), is an in-use - bit for the *previous* chunk. If that bit is *clear*, then the - word before the current chunk size contains the previous chunk - size, and can be used to find the front of the previous chunk. - The very first chunk allocated always has this bit set, preventing - access to non-existent (or non-owned) memory. If pinuse is set for - any given chunk, then you CANNOT determine the size of the - previous chunk, and might even get a memory addressing fault when - trying to do so. - - The C (CINUSE_BIT) bit, stored in the unused second-lowest bit of - the chunk size redundantly records whether the current chunk is - inuse. This redundancy enables usage checks within free and realloc, - and reduces indirection when freeing and consolidating chunks. - - Each freshly allocated chunk must have both cinuse and pinuse set. - That is, each allocated chunk borders either a previously allocated - and still in-use chunk, or the base of its memory arena. This is - ensured by making all allocations from the the `lowest' part of any - found chunk. Further, no free chunk physically borders another one, - so each free chunk is known to be preceded and followed by either - inuse chunks or the ends of memory. - - Note that the `foot' of the current chunk is actually represented - as the prev_foot of the NEXT chunk. This makes it easier to - deal with alignments etc but can be very confusing when trying - to extend or adapt this code. - - The exceptions to all this are - - 1. The special chunk `top' is the top-most available chunk (i.e., - the one bordering the end of available memory). It is treated - specially. Top is never included in any bin, is used only if - no other chunk is available, and is released back to the - system if it is very large (see M_TRIM_THRESHOLD). In effect, - the top chunk is treated as larger (and thus less well - fitting) than any other available chunk. The top chunk - doesn't update its trailing size field since there is no next - contiguous chunk that would have to index off it. However, - space is still allocated for it (TOP_FOOT_SIZE) to enable - separation or merging when space is extended. - - 3. Chunks allocated via mmap, which have the lowest-order bit - (IS_MMAPPED_BIT) set in their prev_foot fields, and do not set - PINUSE_BIT in their head fields. Because they are allocated - one-by-one, each must carry its own prev_foot field, which is - also used to hold the offset this chunk has within its mmapped - region, which is needed to preserve alignment. Each mmapped - chunk is trailed by the first two fields of a fake next-chunk - for sake of usage checks. - -*/ - -struct malloc_chunk { - size_t prev_foot; /* Size of previous chunk (if free). */ - size_t head; /* Size and inuse bits. */ - struct malloc_chunk* fd; /* double links -- used only if free. */ - struct malloc_chunk* bk; -}; - -typedef struct malloc_chunk mchunk; -typedef struct malloc_chunk* mchunkptr; -typedef struct malloc_chunk* sbinptr; /* The type of bins of chunks */ -typedef unsigned int bindex_t; /* Described below */ -typedef unsigned int binmap_t; /* Described below */ -typedef unsigned int flag_t; /* The type of various bit flag sets */ - -/* ------------------- Chunks sizes and alignments ----------------------- */ - -#define MCHUNK_SIZE (sizeof(mchunk)) - -#if FOOTERS -#define CHUNK_OVERHEAD (TWO_SIZE_T_SIZES) -#else /* FOOTERS */ -#define CHUNK_OVERHEAD (SIZE_T_SIZE) -#endif /* FOOTERS */ - -/* MMapped chunks need a second word of overhead ... */ -#define MMAP_CHUNK_OVERHEAD (TWO_SIZE_T_SIZES) -/* ... and additional padding for fake next-chunk at foot */ -#define MMAP_FOOT_PAD (FOUR_SIZE_T_SIZES) - -/* The smallest size we can malloc is an aligned minimal chunk */ -#define MIN_CHUNK_SIZE\ - ((MCHUNK_SIZE + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK) - -/* conversion from malloc headers to user pointers, and back */ -#define chunk2mem(p) ((void*)((char*)(p) + TWO_SIZE_T_SIZES)) -#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - TWO_SIZE_T_SIZES)) -/* chunk associated with aligned address A */ -#define align_as_chunk(A) (mchunkptr)((A) + align_offset(chunk2mem(A))) - -/* Bounds on request (not chunk) sizes. */ -#define MAX_REQUEST ((-MIN_CHUNK_SIZE) << 2) -#define MIN_REQUEST (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE) - -/* pad request bytes into a usable size */ -#define pad_request(req) \ - (((req) + CHUNK_OVERHEAD + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK) - -/* pad request, checking for minimum (but not maximum) */ -#define request2size(req) \ - (((req) < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(req)) - - -/* ------------------ Operations on head and foot fields ----------------- */ - -/* - The head field of a chunk is or'ed with PINUSE_BIT when previous - adjacent chunk in use, and or'ed with CINUSE_BIT if this chunk is in - use. If the chunk was obtained with mmap, the prev_foot field has - IS_MMAPPED_BIT set, otherwise holding the offset of the base of the - mmapped region to the base of the chunk. -*/ - -#define PINUSE_BIT (SIZE_T_ONE) -#define CINUSE_BIT (SIZE_T_TWO) -#define INUSE_BITS (PINUSE_BIT|CINUSE_BIT) - -/* Head value for fenceposts */ -#define FENCEPOST_HEAD (INUSE_BITS|SIZE_T_SIZE) - -/* extraction of fields from head words */ -#define cinuse(p) ((p)->head & CINUSE_BIT) -#define pinuse(p) ((p)->head & PINUSE_BIT) -#define chunksize(p) ((p)->head & ~(INUSE_BITS)) - -#define clear_pinuse(p) ((p)->head &= ~PINUSE_BIT) -#define clear_cinuse(p) ((p)->head &= ~CINUSE_BIT) - -/* Treat space at ptr +/- offset as a chunk */ -#define chunk_plus_offset(p, s) ((mchunkptr)(((char*)(p)) + (s))) -#define chunk_minus_offset(p, s) ((mchunkptr)(((char*)(p)) - (s))) - -/* Ptr to next or previous physical malloc_chunk. */ -#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->head & ~INUSE_BITS))) -#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_foot) )) - -/* extract next chunk's pinuse bit */ -#define next_pinuse(p) ((next_chunk(p)->head) & PINUSE_BIT) - -/* Get/set size at footer */ -#define get_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_foot) -#define set_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_foot = (s)) - -/* Set size, pinuse bit, and foot */ -#define set_size_and_pinuse_of_free_chunk(p, s)\ - ((p)->head = (s|PINUSE_BIT), set_foot(p, s)) - -/* Set size, pinuse bit, foot, and clear next pinuse */ -#define set_free_with_pinuse(p, s, n)\ - (clear_pinuse(n), set_size_and_pinuse_of_free_chunk(p, s)) - -#define is_mmapped(p)\ - (!((p)->head & PINUSE_BIT) && ((p)->prev_foot & IS_MMAPPED_BIT)) - -/* Get the internal overhead associated with chunk p */ -#define overhead_for(p)\ - (is_mmapped(p)? MMAP_CHUNK_OVERHEAD : CHUNK_OVERHEAD) - -/* Return true if malloced space is not necessarily cleared */ -#if MMAP_CLEARS -#define calloc_must_clear(p) (!is_mmapped(p)) -#else /* MMAP_CLEARS */ -#define calloc_must_clear(p) (1) -#endif /* MMAP_CLEARS */ - -/* ---------------------- Overlaid data structures ----------------------- */ - -/* - When chunks are not in use, they are treated as nodes of either - lists or trees. - - "Small" chunks are stored in circular doubly-linked lists, and look - like this: - - chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Size of previous chunk | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - `head:' | Size of chunk, in bytes |P| - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Forward pointer to next chunk in list | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Back pointer to previous chunk in list | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Unused space (may be 0 bytes long) . - . . - . | -nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - `foot:' | Size of chunk, in bytes | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - Larger chunks are kept in a form of bitwise digital trees (aka - tries) keyed on chunksizes. Because malloc_tree_chunks are only for - free chunks greater than 256 bytes, their size doesn't impose any - constraints on user chunk sizes. Each node looks like: - - chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Size of previous chunk | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - `head:' | Size of chunk, in bytes |P| - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Forward pointer to next chunk of same size | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Back pointer to previous chunk of same size | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Pointer to left child (child[0]) | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Pointer to right child (child[1]) | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Pointer to parent | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | bin index of this chunk | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Unused space . - . | -nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - `foot:' | Size of chunk, in bytes | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - Each tree holding treenodes is a tree of unique chunk sizes. Chunks - of the same size are arranged in a circularly-linked list, with only - the oldest chunk (the next to be used, in our FIFO ordering) - actually in the tree. (Tree members are distinguished by a non-null - parent pointer.) If a chunk with the same size an an existing node - is inserted, it is linked off the existing node using pointers that - work in the same way as fd/bk pointers of small chunks. - - Each tree contains a power of 2 sized range of chunk sizes (the - smallest is 0x100 <= x < 0x180), which is is divided in half at each - tree level, with the chunks in the smaller half of the range (0x100 - <= x < 0x140 for the top nose) in the left subtree and the larger - half (0x140 <= x < 0x180) in the right subtree. This is, of course, - done by inspecting individual bits. - - Using these rules, each node's left subtree contains all smaller - sizes than its right subtree. However, the node at the root of each - subtree has no particular ordering relationship to either. (The - dividing line between the subtree sizes is based on trie relation.) - If we remove the last chunk of a given size from the interior of the - tree, we need to replace it with a leaf node. The tree ordering - rules permit a node to be replaced by any leaf below it. - - The smallest chunk in a tree (a common operation in a best-fit - allocator) can be found by walking a path to the leftmost leaf in - the tree. Unlike a usual binary tree, where we follow left child - pointers until we reach a null, here we follow the right child - pointer any time the left one is null, until we reach a leaf with - both child pointers null. The smallest chunk in the tree will be - somewhere along that path. - - The worst case number of steps to add, find, or remove a node is - bounded by the number of bits differentiating chunks within - bins. Under current bin calculations, this ranges from 6 up to 21 - (for 32 bit sizes) or up to 53 (for 64 bit sizes). The typical case - is of course much better. -*/ - -struct malloc_tree_chunk { - /* The first four fields must be compatible with malloc_chunk */ - size_t prev_foot; - size_t head; - struct malloc_tree_chunk* fd; - struct malloc_tree_chunk* bk; - - struct malloc_tree_chunk* child[2]; - struct malloc_tree_chunk* parent; - bindex_t index; -}; - -typedef struct malloc_tree_chunk tchunk; -typedef struct malloc_tree_chunk* tchunkptr; -typedef struct malloc_tree_chunk* tbinptr; /* The type of bins of trees */ - -/* A little helper macro for trees */ -#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1]) - -/* ----------------------------- Segments -------------------------------- */ - -/* - Each malloc space may include non-contiguous segments, held in a - list headed by an embedded malloc_segment record representing the - top-most space. Segments also include flags holding properties of - the space. Large chunks that are directly allocated by mmap are not - included in this list. They are instead independently created and - destroyed without otherwise keeping track of them. - - Segment management mainly comes into play for spaces allocated by - MMAP. Any call to MMAP might or might not return memory that is - adjacent to an existing segment. MORECORE normally contiguously - extends the current space, so this space is almost always adjacent, - which is simpler and faster to deal with. (This is why MORECORE is - used preferentially to MMAP when both are available -- see - sys_alloc.) When allocating using MMAP, we don't use any of the - hinting mechanisms (inconsistently) supported in various - implementations of unix mmap, or distinguish reserving from - committing memory. Instead, we just ask for space, and exploit - contiguity when we get it. It is probably possible to do - better than this on some systems, but no general scheme seems - to be significantly better. - - Management entails a simpler variant of the consolidation scheme - used for chunks to reduce fragmentation -- new adjacent memory is - normally prepended or appended to an existing segment. However, - there are limitations compared to chunk consolidation that mostly - reflect the fact that segment processing is relatively infrequent - (occurring only when getting memory from system) and that we - don't expect to have huge numbers of segments: - - * Segments are not indexed, so traversal requires linear scans. (It - would be possible to index these, but is not worth the extra - overhead and complexity for most programs on most platforms.) - * New segments are only appended to old ones when holding top-most - memory; if they cannot be prepended to others, they are held in - different segments. - - Except for the top-most segment of an mstate, each segment record - is kept at the tail of its segment. Segments are added by pushing - segment records onto the list headed by &mstate.seg for the - containing mstate. - - Segment flags control allocation/merge/deallocation policies: - * If EXTERN_BIT set, then we did not allocate this segment, - and so should not try to deallocate or merge with others. - (This currently holds only for the initial segment passed - into create_mspace_with_base.) - * If IS_MMAPPED_BIT set, the segment may be merged with - other surrounding mmapped segments and trimmed/de-allocated - using munmap. - * If neither bit is set, then the segment was obtained using - MORECORE so can be merged with surrounding MORECORE'd segments - and deallocated/trimmed using MORECORE with negative arguments. -*/ - -struct malloc_segment { - char* base; /* base address */ - size_t size; /* allocated size */ - struct malloc_segment* next; /* ptr to next segment */ - flag_t sflags; /* mmap and extern flag */ -}; - -#define is_mmapped_segment(S) ((S)->sflags & IS_MMAPPED_BIT) -#define is_extern_segment(S) ((S)->sflags & EXTERN_BIT) - -typedef struct malloc_segment msegment; -typedef struct malloc_segment* msegmentptr; - -/* ---------------------------- malloc_state ----------------------------- */ - -/* - A malloc_state holds all of the bookkeeping for a space. - The main fields are: - - Top - The topmost chunk of the currently active segment. Its size is - cached in topsize. The actual size of topmost space is - topsize+TOP_FOOT_SIZE, which includes space reserved for adding - fenceposts and segment records if necessary when getting more - space from the system. The size at which to autotrim top is - cached from mparams in trim_check, except that it is disabled if - an autotrim fails. - - Designated victim (dv) - This is the preferred chunk for servicing small requests that - don't have exact fits. It is normally the chunk split off most - recently to service another small request. Its size is cached in - dvsize. The link fields of this chunk are not maintained since it - is not kept in a bin. - - SmallBins - An array of bin headers for free chunks. These bins hold chunks - with sizes less than MIN_LARGE_SIZE bytes. Each bin contains - chunks of all the same size, spaced 8 bytes apart. To simplify - use in double-linked lists, each bin header acts as a malloc_chunk - pointing to the real first node, if it exists (else pointing to - itself). This avoids special-casing for headers. But to avoid - waste, we allocate only the fd/bk pointers of bins, and then use - repositioning tricks to treat these as the fields of a chunk. - - TreeBins - Treebins are pointers to the roots of trees holding a range of - sizes. There are 2 equally spaced treebins for each power of two - from TREE_SHIFT to TREE_SHIFT+16. The last bin holds anything - larger. - - Bin maps - There is one bit map for small bins ("smallmap") and one for - treebins ("treemap). Each bin sets its bit when non-empty, and - clears the bit when empty. Bit operations are then used to avoid - bin-by-bin searching -- nearly all "search" is done without ever - looking at bins that won't be selected. The bit maps - conservatively use 32 bits per map word, even if on 64bit system. - For a good description of some of the bit-based techniques used - here, see Henry S. Warren Jr's book "Hacker's Delight" (and - supplement at http://hackersdelight.org/). Many of these are - intended to reduce the branchiness of paths through malloc etc, as - well as to reduce the number of memory locations read or written. - - Segments - A list of segments headed by an embedded malloc_segment record - representing the initial space. - - Address check support - The least_addr field is the least address ever obtained from - MORECORE or MMAP. Attempted frees and reallocs of any address less - than this are trapped (unless INSECURE is defined). - - Magic tag - A cross-check field that should always hold same value as mparams.magic. - - Flags - Bits recording whether to use MMAP, locks, or contiguous MORECORE - - Statistics - Each space keeps track of current and maximum system memory - obtained via MORECORE or MMAP. - - Locking - If USE_LOCKS is defined, the "mutex" lock is acquired and released - around every public call using this mspace. -*/ - -/* Bin types, widths and sizes */ -#define NSMALLBINS (32U) -#define NTREEBINS (32U) -#define SMALLBIN_SHIFT (3U) -#define SMALLBIN_WIDTH (SIZE_T_ONE << SMALLBIN_SHIFT) -#define TREEBIN_SHIFT (8U) -#define MIN_LARGE_SIZE (SIZE_T_ONE << TREEBIN_SHIFT) -#define MAX_SMALL_SIZE (MIN_LARGE_SIZE - SIZE_T_ONE) -#define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD) - -struct malloc_state { - binmap_t smallmap; - binmap_t treemap; - size_t dvsize; - size_t topsize; - char* least_addr; - mchunkptr dv; - mchunkptr top; - size_t trim_check; - size_t magic; - mchunkptr smallbins[(NSMALLBINS+1)*2]; - tbinptr treebins[NTREEBINS]; - size_t footprint; -#if USE_MAX_ALLOWED_FOOTPRINT - size_t max_allowed_footprint; -#endif - size_t max_footprint; - flag_t mflags; -#if USE_LOCKS - MLOCK_T mutex; /* locate lock among fields that rarely change */ -#endif /* USE_LOCKS */ - msegment seg; -}; - -typedef struct malloc_state* mstate; - -/* ------------- Global malloc_state and malloc_params ------------------- */ - -/* - malloc_params holds global properties, including those that can be - dynamically set using mallopt. There is a single instance, mparams, - initialized in init_mparams. -*/ - -struct malloc_params { - size_t magic; - size_t page_size; - size_t granularity; - size_t mmap_threshold; - size_t trim_threshold; - flag_t default_mflags; -}; - -static struct malloc_params mparams; - -/* The global malloc_state used for all non-"mspace" calls */ -static struct malloc_state _gm_ -#if USE_MAX_ALLOWED_FOOTPRINT - = { .max_allowed_footprint = MAX_SIZE_T }; -#else - ; -#endif - -#define gm (&_gm_) -#define is_global(M) ((M) == &_gm_) -#define is_initialized(M) ((M)->top != 0) - -/* -------------------------- system alloc setup ------------------------- */ - -/* Operations on mflags */ - -#define use_lock(M) ((M)->mflags & USE_LOCK_BIT) -#define enable_lock(M) ((M)->mflags |= USE_LOCK_BIT) -#define disable_lock(M) ((M)->mflags &= ~USE_LOCK_BIT) - -#define use_mmap(M) ((M)->mflags & USE_MMAP_BIT) -#define enable_mmap(M) ((M)->mflags |= USE_MMAP_BIT) -#define disable_mmap(M) ((M)->mflags &= ~USE_MMAP_BIT) - -#define use_noncontiguous(M) ((M)->mflags & USE_NONCONTIGUOUS_BIT) -#define disable_contiguous(M) ((M)->mflags |= USE_NONCONTIGUOUS_BIT) - -#define set_lock(M,L)\ - ((M)->mflags = (L)?\ - ((M)->mflags | USE_LOCK_BIT) :\ - ((M)->mflags & ~USE_LOCK_BIT)) - -/* page-align a size */ -#define page_align(S)\ - (((S) + (mparams.page_size)) & ~(mparams.page_size - SIZE_T_ONE)) - -/* granularity-align a size */ -#define granularity_align(S)\ - (((S) + (mparams.granularity)) & ~(mparams.granularity - SIZE_T_ONE)) - -#define is_page_aligned(S)\ - (((size_t)(S) & (mparams.page_size - SIZE_T_ONE)) == 0) -#define is_granularity_aligned(S)\ - (((size_t)(S) & (mparams.granularity - SIZE_T_ONE)) == 0) - -/* True if segment S holds address A */ -#define segment_holds(S, A)\ - ((char*)(A) >= S->base && (char*)(A) < S->base + S->size) - -/* Return segment holding given address */ -static msegmentptr segment_holding(mstate m, char* addr) { - msegmentptr sp = &m->seg; - for (;;) { - if (addr >= sp->base && addr < sp->base + sp->size) - return sp; - if ((sp = sp->next) == 0) - return 0; - } -} - -/* Return true if segment contains a segment link */ -static int has_segment_link(mstate m, msegmentptr ss) { - msegmentptr sp = &m->seg; - for (;;) { - if ((char*)sp >= ss->base && (char*)sp < ss->base + ss->size) - return 1; - if ((sp = sp->next) == 0) - return 0; - } -} - -#ifndef MORECORE_CANNOT_TRIM -#define should_trim(M,s) ((s) > (M)->trim_check) -#else /* MORECORE_CANNOT_TRIM */ -#define should_trim(M,s) (0) -#endif /* MORECORE_CANNOT_TRIM */ - -/* - TOP_FOOT_SIZE is padding at the end of a segment, including space - that may be needed to place segment records and fenceposts when new - noncontiguous segments are added. -*/ -#define TOP_FOOT_SIZE\ - (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE) - - -/* ------------------------------- Hooks -------------------------------- */ - -/* - PREACTION should be defined to return 0 on success, and nonzero on - failure. If you are not using locking, you can redefine these to do - anything you like. -*/ - -#if USE_LOCKS - -/* Ensure locks are initialized */ -#define GLOBALLY_INITIALIZE() (mparams.page_size == 0 && init_mparams()) - -#define PREACTION(M) ((GLOBALLY_INITIALIZE() || use_lock(M))? ACQUIRE_LOCK(&(M)->mutex) : 0) -#define POSTACTION(M) { if (use_lock(M)) RELEASE_LOCK(&(M)->mutex); } -#else /* USE_LOCKS */ - -#ifndef PREACTION -#define PREACTION(M) (0) -#endif /* PREACTION */ - -#ifndef POSTACTION -#define POSTACTION(M) -#endif /* POSTACTION */ - -#endif /* USE_LOCKS */ - -/* - CORRUPTION_ERROR_ACTION is triggered upon detected bad addresses. - USAGE_ERROR_ACTION is triggered on detected bad frees and - reallocs. The argument p is an address that might have triggered the - fault. It is ignored by the two predefined actions, but might be - useful in custom actions that try to help diagnose errors. -*/ - -#if PROCEED_ON_ERROR - -/* A count of the number of corruption errors causing resets */ -int malloc_corruption_error_count; - -/* default corruption action */ -static void reset_on_error(mstate m); - -#define CORRUPTION_ERROR_ACTION(m) reset_on_error(m) -#define USAGE_ERROR_ACTION(m, p) - -#else /* PROCEED_ON_ERROR */ - -#ifndef CORRUPTION_ERROR_ACTION -#define CORRUPTION_ERROR_ACTION(m) ABORT -#endif /* CORRUPTION_ERROR_ACTION */ - -#ifndef USAGE_ERROR_ACTION -#define USAGE_ERROR_ACTION(m,p) ABORT -#endif /* USAGE_ERROR_ACTION */ - -#endif /* PROCEED_ON_ERROR */ - -/* -------------------------- Debugging setup ---------------------------- */ - -#if ! DEBUG - -#define check_free_chunk(M,P) -#define check_inuse_chunk(M,P) -#define check_malloced_chunk(M,P,N) -#define check_mmapped_chunk(M,P) -#define check_malloc_state(M) -#define check_top_chunk(M,P) - -#else /* DEBUG */ -#define check_free_chunk(M,P) do_check_free_chunk(M,P) -#define check_inuse_chunk(M,P) do_check_inuse_chunk(M,P) -#define check_top_chunk(M,P) do_check_top_chunk(M,P) -#define check_malloced_chunk(M,P,N) do_check_malloced_chunk(M,P,N) -#define check_mmapped_chunk(M,P) do_check_mmapped_chunk(M,P) -#define check_malloc_state(M) do_check_malloc_state(M) - -static void do_check_any_chunk(mstate m, mchunkptr p); -static void do_check_top_chunk(mstate m, mchunkptr p); -static void do_check_mmapped_chunk(mstate m, mchunkptr p); -static void do_check_inuse_chunk(mstate m, mchunkptr p); -static void do_check_free_chunk(mstate m, mchunkptr p); -static void do_check_malloced_chunk(mstate m, void* mem, size_t s); -static void do_check_tree(mstate m, tchunkptr t); -static void do_check_treebin(mstate m, bindex_t i); -static void do_check_smallbin(mstate m, bindex_t i); -static void do_check_malloc_state(mstate m); -static int bin_find(mstate m, mchunkptr x); -static size_t traverse_and_check(mstate m); -#endif /* DEBUG */ - -/* ---------------------------- Indexing Bins ---------------------------- */ - -#define is_small(s) (((s) >> SMALLBIN_SHIFT) < NSMALLBINS) -#define small_index(s) ((s) >> SMALLBIN_SHIFT) -#define small_index2size(i) ((i) << SMALLBIN_SHIFT) -#define MIN_SMALL_INDEX (small_index(MIN_CHUNK_SIZE)) - -/* addressing by index. See above about smallbin repositioning */ -#define smallbin_at(M, i) ((sbinptr)((char*)&((M)->smallbins[(i)<<1]))) -#define treebin_at(M,i) (&((M)->treebins[i])) - -/* assign tree index for size S to variable I */ -#if defined(__GNUC__) && defined(i386) -#define compute_tree_index(S, I)\ -{\ - size_t X = S >> TREEBIN_SHIFT;\ - if (X == 0)\ - I = 0;\ - else if (X > 0xFFFF)\ - I = NTREEBINS-1;\ - else {\ - unsigned int K;\ - __asm__("bsrl %1,%0\n\t" : "=r" (K) : "rm" (X));\ - I = (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\ - }\ -} -#else /* GNUC */ -#define compute_tree_index(S, I)\ -{\ - size_t X = S >> TREEBIN_SHIFT;\ - if (X == 0)\ - I = 0;\ - else if (X > 0xFFFF)\ - I = NTREEBINS-1;\ - else {\ - unsigned int Y = (unsigned int)X;\ - unsigned int N = ((Y - 0x100) >> 16) & 8;\ - unsigned int K = (((Y <<= N) - 0x1000) >> 16) & 4;\ - N += K;\ - N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\ - K = 14 - N + ((Y <<= K) >> 15);\ - I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\ - }\ -} -#endif /* GNUC */ - -/* Bit representing maximum resolved size in a treebin at i */ -#define bit_for_tree_index(i) \ - (i == NTREEBINS-1)? (SIZE_T_BITSIZE-1) : (((i) >> 1) + TREEBIN_SHIFT - 2) - -/* Shift placing maximum resolved bit in a treebin at i as sign bit */ -#define leftshift_for_tree_index(i) \ - ((i == NTREEBINS-1)? 0 : \ - ((SIZE_T_BITSIZE-SIZE_T_ONE) - (((i) >> 1) + TREEBIN_SHIFT - 2))) - -/* The size of the smallest chunk held in bin with index i */ -#define minsize_for_tree_index(i) \ - ((SIZE_T_ONE << (((i) >> 1) + TREEBIN_SHIFT)) | \ - (((size_t)((i) & SIZE_T_ONE)) << (((i) >> 1) + TREEBIN_SHIFT - 1))) - - -/* ------------------------ Operations on bin maps ----------------------- */ - -/* bit corresponding to given index */ -#define idx2bit(i) ((binmap_t)(1) << (i)) - -/* Mark/Clear bits with given index */ -#define mark_smallmap(M,i) ((M)->smallmap |= idx2bit(i)) -#define clear_smallmap(M,i) ((M)->smallmap &= ~idx2bit(i)) -#define smallmap_is_marked(M,i) ((M)->smallmap & idx2bit(i)) - -#define mark_treemap(M,i) ((M)->treemap |= idx2bit(i)) -#define clear_treemap(M,i) ((M)->treemap &= ~idx2bit(i)) -#define treemap_is_marked(M,i) ((M)->treemap & idx2bit(i)) - -/* index corresponding to given bit */ - -#if defined(__GNUC__) && defined(i386) -#define compute_bit2idx(X, I)\ -{\ - unsigned int J;\ - __asm__("bsfl %1,%0\n\t" : "=r" (J) : "rm" (X));\ - I = (bindex_t)J;\ -} - -#else /* GNUC */ -#if USE_BUILTIN_FFS -#define compute_bit2idx(X, I) I = ffs(X)-1 - -#else /* USE_BUILTIN_FFS */ -#define compute_bit2idx(X, I)\ -{\ - unsigned int Y = X - 1;\ - unsigned int K = Y >> (16-4) & 16;\ - unsigned int N = K; Y >>= K;\ - N += K = Y >> (8-3) & 8; Y >>= K;\ - N += K = Y >> (4-2) & 4; Y >>= K;\ - N += K = Y >> (2-1) & 2; Y >>= K;\ - N += K = Y >> (1-0) & 1; Y >>= K;\ - I = (bindex_t)(N + Y);\ -} -#endif /* USE_BUILTIN_FFS */ -#endif /* GNUC */ - -/* isolate the least set bit of a bitmap */ -#define least_bit(x) ((x) & -(x)) - -/* mask with all bits to left of least bit of x on */ -#define left_bits(x) ((x<<1) | -(x<<1)) - -/* mask with all bits to left of or equal to least bit of x on */ -#define same_or_left_bits(x) ((x) | -(x)) - - -/* ----------------------- Runtime Check Support ------------------------- */ - -/* - For security, the main invariant is that malloc/free/etc never - writes to a static address other than malloc_state, unless static - malloc_state itself has been corrupted, which cannot occur via - malloc (because of these checks). In essence this means that we - believe all pointers, sizes, maps etc held in malloc_state, but - check all of those linked or offsetted from other embedded data - structures. These checks are interspersed with main code in a way - that tends to minimize their run-time cost. - - When FOOTERS is defined, in addition to range checking, we also - verify footer fields of inuse chunks, which can be used guarantee - that the mstate controlling malloc/free is intact. This is a - streamlined version of the approach described by William Robertson - et al in "Run-time Detection of Heap-based Overflows" LISA'03 - http://www.usenix.org/events/lisa03/tech/robertson.html The footer - of an inuse chunk holds the xor of its mstate and a random seed, - that is checked upon calls to free() and realloc(). This is - (probablistically) unguessable from outside the program, but can be - computed by any code successfully malloc'ing any chunk, so does not - itself provide protection against code that has already broken - security through some other means. Unlike Robertson et al, we - always dynamically check addresses of all offset chunks (previous, - next, etc). This turns out to be cheaper than relying on hashes. -*/ - -#if !INSECURE -/* Check if address a is at least as high as any from MORECORE or MMAP */ -#define ok_address(M, a) ((char*)(a) >= (M)->least_addr) -/* Check if address of next chunk n is higher than base chunk p */ -#define ok_next(p, n) ((char*)(p) < (char*)(n)) -/* Check if p has its cinuse bit on */ -#define ok_cinuse(p) cinuse(p) -/* Check if p has its pinuse bit on */ -#define ok_pinuse(p) pinuse(p) - -#else /* !INSECURE */ -#define ok_address(M, a) (1) -#define ok_next(b, n) (1) -#define ok_cinuse(p) (1) -#define ok_pinuse(p) (1) -#endif /* !INSECURE */ - -#if (FOOTERS && !INSECURE) -/* Check if (alleged) mstate m has expected magic field */ -#define ok_magic(M) ((M)->magic == mparams.magic) -#else /* (FOOTERS && !INSECURE) */ -#define ok_magic(M) (1) -#endif /* (FOOTERS && !INSECURE) */ - - -/* In gcc, use __builtin_expect to minimize impact of checks */ -#if !INSECURE -#if defined(__GNUC__) && __GNUC__ >= 3 -#define RTCHECK(e) __builtin_expect(e, 1) -#else /* GNUC */ -#define RTCHECK(e) (e) -#endif /* GNUC */ -#else /* !INSECURE */ -#define RTCHECK(e) (1) -#endif /* !INSECURE */ - -/* macros to set up inuse chunks with or without footers */ - -#if !FOOTERS - -#define mark_inuse_foot(M,p,s) - -/* Set cinuse bit and pinuse bit of next chunk */ -#define set_inuse(M,p,s)\ - ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\ - ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT) - -/* Set cinuse and pinuse of this chunk and pinuse of next chunk */ -#define set_inuse_and_pinuse(M,p,s)\ - ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\ - ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT) - -/* Set size, cinuse and pinuse bit of this chunk */ -#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\ - ((p)->head = (s|PINUSE_BIT|CINUSE_BIT)) - -#else /* FOOTERS */ - -/* Set foot of inuse chunk to be xor of mstate and seed */ -#define mark_inuse_foot(M,p,s)\ - (((mchunkptr)((char*)(p) + (s)))->prev_foot = ((size_t)(M) ^ mparams.magic)) - -#define get_mstate_for(p)\ - ((mstate)(((mchunkptr)((char*)(p) +\ - (chunksize(p))))->prev_foot ^ mparams.magic)) - -#define set_inuse(M,p,s)\ - ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\ - (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT), \ - mark_inuse_foot(M,p,s)) - -#define set_inuse_and_pinuse(M,p,s)\ - ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\ - (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT),\ - mark_inuse_foot(M,p,s)) - -#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\ - ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\ - mark_inuse_foot(M, p, s)) - -#endif /* !FOOTERS */ - -/* ---------------------------- setting mparams -------------------------- */ - -/* Initialize mparams */ -static int init_mparams(void) { - if (mparams.page_size == 0) { - size_t s; - - mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD; - mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD; -#if MORECORE_CONTIGUOUS - mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT; -#else /* MORECORE_CONTIGUOUS */ - mparams.default_mflags = USE_LOCK_BIT|USE_MMAP_BIT|USE_NONCONTIGUOUS_BIT; -#endif /* MORECORE_CONTIGUOUS */ - -#if (FOOTERS && !INSECURE) - { -#if USE_DEV_RANDOM - int fd; - unsigned char buf[sizeof(size_t)]; - /* Try to use /dev/urandom, else fall back on using time */ - if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 && - read(fd, buf, sizeof(buf)) == sizeof(buf)) { - s = *((size_t *) buf); - close(fd); - } - else -#endif /* USE_DEV_RANDOM */ - s = (size_t)(time(0) ^ (size_t)0x55555555U); - - s |= (size_t)8U; /* ensure nonzero */ - s &= ~(size_t)7U; /* improve chances of fault for bad values */ - - } -#else /* (FOOTERS && !INSECURE) */ - s = (size_t)0x58585858U; -#endif /* (FOOTERS && !INSECURE) */ - ACQUIRE_MAGIC_INIT_LOCK(); - if (mparams.magic == 0) { - mparams.magic = s; - /* Set up lock for main malloc area */ - INITIAL_LOCK(&gm->mutex); - gm->mflags = mparams.default_mflags; - } - RELEASE_MAGIC_INIT_LOCK(); - -#ifndef WIN32 - mparams.page_size = malloc_getpagesize; - mparams.granularity = ((DEFAULT_GRANULARITY != 0)? - DEFAULT_GRANULARITY : mparams.page_size); -#else /* WIN32 */ - { - SYSTEM_INFO system_info; - GetSystemInfo(&system_info); - mparams.page_size = system_info.dwPageSize; - mparams.granularity = system_info.dwAllocationGranularity; - } -#endif /* WIN32 */ - - /* Sanity-check configuration: - size_t must be unsigned and as wide as pointer type. - ints must be at least 4 bytes. - alignment must be at least 8. - Alignment, min chunk size, and page size must all be powers of 2. - */ - if ((sizeof(size_t) != sizeof(char*)) || - (MAX_SIZE_T < MIN_CHUNK_SIZE) || - (sizeof(int) < 4) || - (MALLOC_ALIGNMENT < (size_t)8U) || - ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-SIZE_T_ONE)) != 0) || - ((MCHUNK_SIZE & (MCHUNK_SIZE-SIZE_T_ONE)) != 0) || - ((mparams.granularity & (mparams.granularity-SIZE_T_ONE)) != 0) || - ((mparams.page_size & (mparams.page_size-SIZE_T_ONE)) != 0)) - ABORT; - } - return 0; -} - -/* support for mallopt */ -static int change_mparam(int param_number, int value) { - size_t val = (size_t)value; - init_mparams(); - switch(param_number) { - case M_TRIM_THRESHOLD: - mparams.trim_threshold = val; - return 1; - case M_GRANULARITY: - if (val >= mparams.page_size && ((val & (val-1)) == 0)) { - mparams.granularity = val; - return 1; - } - else - return 0; - case M_MMAP_THRESHOLD: - mparams.mmap_threshold = val; - return 1; - default: - return 0; - } -} - -#if DEBUG -/* ------------------------- Debugging Support --------------------------- */ - -/* Check properties of any chunk, whether free, inuse, mmapped etc */ -static void do_check_any_chunk(mstate m, mchunkptr p) { - assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD)); - assert(ok_address(m, p)); -} - -/* Check properties of top chunk */ -static void do_check_top_chunk(mstate m, mchunkptr p) { - msegmentptr sp = segment_holding(m, (char*)p); - size_t sz = chunksize(p); - assert(sp != 0); - assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD)); - assert(ok_address(m, p)); - assert(sz == m->topsize); - assert(sz > 0); - assert(sz == ((sp->base + sp->size) - (char*)p) - TOP_FOOT_SIZE); - assert(pinuse(p)); - assert(!next_pinuse(p)); -} - -/* Check properties of (inuse) mmapped chunks */ -static void do_check_mmapped_chunk(mstate m, mchunkptr p) { - size_t sz = chunksize(p); - size_t len = (sz + (p->prev_foot & ~IS_MMAPPED_BIT) + MMAP_FOOT_PAD); - assert(is_mmapped(p)); - assert(use_mmap(m)); - assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD)); - assert(ok_address(m, p)); - assert(!is_small(sz)); - assert((len & (mparams.page_size-SIZE_T_ONE)) == 0); - assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD); - assert(chunk_plus_offset(p, sz+SIZE_T_SIZE)->head == 0); -} - -/* Check properties of inuse chunks */ -static void do_check_inuse_chunk(mstate m, mchunkptr p) { - do_check_any_chunk(m, p); - assert(cinuse(p)); - assert(next_pinuse(p)); - /* If not pinuse and not mmapped, previous chunk has OK offset */ - assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p); - if (is_mmapped(p)) - do_check_mmapped_chunk(m, p); -} - -/* Check properties of free chunks */ -static void do_check_free_chunk(mstate m, mchunkptr p) { - size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT); - mchunkptr next = chunk_plus_offset(p, sz); - do_check_any_chunk(m, p); - assert(!cinuse(p)); - assert(!next_pinuse(p)); - assert (!is_mmapped(p)); - if (p != m->dv && p != m->top) { - if (sz >= MIN_CHUNK_SIZE) { - assert((sz & CHUNK_ALIGN_MASK) == 0); - assert(is_aligned(chunk2mem(p))); - assert(next->prev_foot == sz); - assert(pinuse(p)); - assert (next == m->top || cinuse(next)); - assert(p->fd->bk == p); - assert(p->bk->fd == p); - } - else /* markers are always of size SIZE_T_SIZE */ - assert(sz == SIZE_T_SIZE); - } -} - -/* Check properties of malloced chunks at the point they are malloced */ -static void do_check_malloced_chunk(mstate m, void* mem, size_t s) { - if (mem != 0) { - mchunkptr p = mem2chunk(mem); - size_t sz = p->head & ~(PINUSE_BIT|CINUSE_BIT); - do_check_inuse_chunk(m, p); - assert((sz & CHUNK_ALIGN_MASK) == 0); - assert(sz >= MIN_CHUNK_SIZE); - assert(sz >= s); - /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */ - assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE)); - } -} - -/* Check a tree and its subtrees. */ -static void do_check_tree(mstate m, tchunkptr t) { - tchunkptr head = 0; - tchunkptr u = t; - bindex_t tindex = t->index; - size_t tsize = chunksize(t); - bindex_t idx; - compute_tree_index(tsize, idx); - assert(tindex == idx); - assert(tsize >= MIN_LARGE_SIZE); - assert(tsize >= minsize_for_tree_index(idx)); - assert((idx == NTREEBINS-1) || (tsize < minsize_for_tree_index((idx+1)))); - - do { /* traverse through chain of same-sized nodes */ - do_check_any_chunk(m, ((mchunkptr)u)); - assert(u->index == tindex); - assert(chunksize(u) == tsize); - assert(!cinuse(u)); - assert(!next_pinuse(u)); - assert(u->fd->bk == u); - assert(u->bk->fd == u); - if (u->parent == 0) { - assert(u->child[0] == 0); - assert(u->child[1] == 0); - } - else { - assert(head == 0); /* only one node on chain has parent */ - head = u; - assert(u->parent != u); - assert (u->parent->child[0] == u || - u->parent->child[1] == u || - *((tbinptr*)(u->parent)) == u); - if (u->child[0] != 0) { - assert(u->child[0]->parent == u); - assert(u->child[0] != u); - do_check_tree(m, u->child[0]); - } - if (u->child[1] != 0) { - assert(u->child[1]->parent == u); - assert(u->child[1] != u); - do_check_tree(m, u->child[1]); - } - if (u->child[0] != 0 && u->child[1] != 0) { - assert(chunksize(u->child[0]) < chunksize(u->child[1])); - } - } - u = u->fd; - } while (u != t); - assert(head != 0); -} - -/* Check all the chunks in a treebin. */ -static void do_check_treebin(mstate m, bindex_t i) { - tbinptr* tb = treebin_at(m, i); - tchunkptr t = *tb; - int empty = (m->treemap & (1U << i)) == 0; - if (t == 0) - assert(empty); - if (!empty) - do_check_tree(m, t); -} - -/* Check all the chunks in a smallbin. */ -static void do_check_smallbin(mstate m, bindex_t i) { - sbinptr b = smallbin_at(m, i); - mchunkptr p = b->bk; - unsigned int empty = (m->smallmap & (1U << i)) == 0; - if (p == b) - assert(empty); - if (!empty) { - for (; p != b; p = p->bk) { - size_t size = chunksize(p); - mchunkptr q; - /* each chunk claims to be free */ - do_check_free_chunk(m, p); - /* chunk belongs in bin */ - assert(small_index(size) == i); - assert(p->bk == b || chunksize(p->bk) == chunksize(p)); - /* chunk is followed by an inuse chunk */ - q = next_chunk(p); - if (q->head != FENCEPOST_HEAD) - do_check_inuse_chunk(m, q); - } - } -} - -/* Find x in a bin. Used in other check functions. */ -static int bin_find(mstate m, mchunkptr x) { - size_t size = chunksize(x); - if (is_small(size)) { - bindex_t sidx = small_index(size); - sbinptr b = smallbin_at(m, sidx); - if (smallmap_is_marked(m, sidx)) { - mchunkptr p = b; - do { - if (p == x) - return 1; - } while ((p = p->fd) != b); - } - } - else { - bindex_t tidx; - compute_tree_index(size, tidx); - if (treemap_is_marked(m, tidx)) { - tchunkptr t = *treebin_at(m, tidx); - size_t sizebits = size << leftshift_for_tree_index(tidx); - while (t != 0 && chunksize(t) != size) { - t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]; - sizebits <<= 1; - } - if (t != 0) { - tchunkptr u = t; - do { - if (u == (tchunkptr)x) - return 1; - } while ((u = u->fd) != t); - } - } - } - return 0; -} - -/* Traverse each chunk and check it; return total */ -static size_t traverse_and_check(mstate m) { - size_t sum = 0; - if (is_initialized(m)) { - msegmentptr s = &m->seg; - sum += m->topsize + TOP_FOOT_SIZE; - while (s != 0) { - mchunkptr q = align_as_chunk(s->base); - mchunkptr lastq = 0; - assert(pinuse(q)); - while (segment_holds(s, q) && - q != m->top && q->head != FENCEPOST_HEAD) { - sum += chunksize(q); - if (cinuse(q)) { - assert(!bin_find(m, q)); - do_check_inuse_chunk(m, q); - } - else { - assert(q == m->dv || bin_find(m, q)); - assert(lastq == 0 || cinuse(lastq)); /* Not 2 consecutive free */ - do_check_free_chunk(m, q); - } - lastq = q; - q = next_chunk(q); - } - s = s->next; - } - } - return sum; -} - -/* Check all properties of malloc_state. */ -static void do_check_malloc_state(mstate m) { - bindex_t i; - size_t total; - /* check bins */ - for (i = 0; i < NSMALLBINS; ++i) - do_check_smallbin(m, i); - for (i = 0; i < NTREEBINS; ++i) - do_check_treebin(m, i); - - if (m->dvsize != 0) { /* check dv chunk */ - do_check_any_chunk(m, m->dv); - assert(m->dvsize == chunksize(m->dv)); - assert(m->dvsize >= MIN_CHUNK_SIZE); - assert(bin_find(m, m->dv) == 0); - } - - if (m->top != 0) { /* check top chunk */ - do_check_top_chunk(m, m->top); - assert(m->topsize == chunksize(m->top)); - assert(m->topsize > 0); - assert(bin_find(m, m->top) == 0); - } - - total = traverse_and_check(m); - assert(total <= m->footprint); - assert(m->footprint <= m->max_footprint); -#if USE_MAX_ALLOWED_FOOTPRINT - //TODO: change these assertions if we allow for shrinking. - assert(m->footprint <= m->max_allowed_footprint); - assert(m->max_footprint <= m->max_allowed_footprint); -#endif -} -#endif /* DEBUG */ - -/* ----------------------------- statistics ------------------------------ */ - -#if !NO_MALLINFO -static struct mallinfo internal_mallinfo(mstate m) { - struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - if (!PREACTION(m)) { - check_malloc_state(m); - if (is_initialized(m)) { - size_t nfree = SIZE_T_ONE; /* top always free */ - size_t mfree = m->topsize + TOP_FOOT_SIZE; - size_t sum = mfree; - msegmentptr s = &m->seg; - while (s != 0) { - mchunkptr q = align_as_chunk(s->base); - while (segment_holds(s, q) && - q != m->top && q->head != FENCEPOST_HEAD) { - size_t sz = chunksize(q); - sum += sz; - if (!cinuse(q)) { - mfree += sz; - ++nfree; - } - q = next_chunk(q); - } - s = s->next; - } - - nm.arena = sum; - nm.ordblks = nfree; - nm.hblkhd = m->footprint - sum; - nm.usmblks = m->max_footprint; - nm.uordblks = m->footprint - mfree; - nm.fordblks = mfree; - nm.keepcost = m->topsize; - } - - POSTACTION(m); - } - return nm; -} -#endif /* !NO_MALLINFO */ - -static void internal_malloc_stats(mstate m) { - if (!PREACTION(m)) { - size_t maxfp = 0; - size_t fp = 0; - size_t used = 0; - check_malloc_state(m); - if (is_initialized(m)) { - msegmentptr s = &m->seg; - maxfp = m->max_footprint; - fp = m->footprint; - used = fp - (m->topsize + TOP_FOOT_SIZE); - - while (s != 0) { - mchunkptr q = align_as_chunk(s->base); - while (segment_holds(s, q) && - q != m->top && q->head != FENCEPOST_HEAD) { - if (!cinuse(q)) - used -= chunksize(q); - q = next_chunk(q); - } - s = s->next; - } - } - - fprintf(stderr, "max system bytes = %10lu\n", (unsigned long)(maxfp)); - fprintf(stderr, "system bytes = %10lu\n", (unsigned long)(fp)); - fprintf(stderr, "in use bytes = %10lu\n", (unsigned long)(used)); - - POSTACTION(m); - } -} - -/* ----------------------- Operations on smallbins ----------------------- */ - -/* - Various forms of linking and unlinking are defined as macros. Even - the ones for trees, which are very long but have very short typical - paths. This is ugly but reduces reliance on inlining support of - compilers. -*/ - -/* Link a free chunk into a smallbin */ -#define insert_small_chunk(M, P, S) {\ - bindex_t I = small_index(S);\ - mchunkptr B = smallbin_at(M, I);\ - mchunkptr F = B;\ - assert(S >= MIN_CHUNK_SIZE);\ - if (!smallmap_is_marked(M, I))\ - mark_smallmap(M, I);\ - else if (RTCHECK(ok_address(M, B->fd)))\ - F = B->fd;\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - }\ - B->fd = P;\ - F->bk = P;\ - P->fd = F;\ - P->bk = B;\ -} - -/* Unlink a chunk from a smallbin - * Added check: if F->bk != P or B->fd != P, we have double linked list - * corruption, and abort. - */ -#define unlink_small_chunk(M, P, S) {\ - mchunkptr F = P->fd;\ - mchunkptr B = P->bk;\ - bindex_t I = small_index(S);\ - if (__builtin_expect (F->bk != P || B->fd != P, 0))\ - CORRUPTION_ERROR_ACTION(M);\ - assert(P != B);\ - assert(P != F);\ - assert(chunksize(P) == small_index2size(I));\ - if (F == B)\ - clear_smallmap(M, I);\ - else if (RTCHECK((F == smallbin_at(M,I) || ok_address(M, F)) &&\ - (B == smallbin_at(M,I) || ok_address(M, B)))) {\ - F->bk = B;\ - B->fd = F;\ - }\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - }\ -} - -/* Unlink the first chunk from a smallbin - * Added check: if F->bk != P or B->fd != P, we have double linked list - * corruption, and abort. - */ -#define unlink_first_small_chunk(M, B, P, I) {\ - mchunkptr F = P->fd;\ - if (__builtin_expect (F->bk != P || B->fd != P, 0))\ - CORRUPTION_ERROR_ACTION(M);\ - assert(P != B);\ - assert(P != F);\ - assert(chunksize(P) == small_index2size(I));\ - if (B == F)\ - clear_smallmap(M, I);\ - else if (RTCHECK(ok_address(M, F))) {\ - B->fd = F;\ - F->bk = B;\ - }\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - }\ -} - -/* Replace dv node, binning the old one */ -/* Used only when dvsize known to be small */ -#define replace_dv(M, P, S) {\ - size_t DVS = M->dvsize;\ - if (DVS != 0) {\ - mchunkptr DV = M->dv;\ - assert(is_small(DVS));\ - insert_small_chunk(M, DV, DVS);\ - }\ - M->dvsize = S;\ - M->dv = P;\ -} - -/* ------------------------- Operations on trees ------------------------- */ - -/* Insert chunk into tree */ -#define insert_large_chunk(M, X, S) {\ - tbinptr* H;\ - bindex_t I;\ - compute_tree_index(S, I);\ - H = treebin_at(M, I);\ - X->index = I;\ - X->child[0] = X->child[1] = 0;\ - if (!treemap_is_marked(M, I)) {\ - mark_treemap(M, I);\ - *H = X;\ - X->parent = (tchunkptr)H;\ - X->fd = X->bk = X;\ - }\ - else {\ - tchunkptr T = *H;\ - size_t K = S << leftshift_for_tree_index(I);\ - for (;;) {\ - if (chunksize(T) != S) {\ - tchunkptr* C = &(T->child[(K >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]);\ - K <<= 1;\ - if (*C != 0)\ - T = *C;\ - else if (RTCHECK(ok_address(M, C))) {\ - *C = X;\ - X->parent = T;\ - X->fd = X->bk = X;\ - break;\ - }\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - break;\ - }\ - }\ - else {\ - tchunkptr F = T->fd;\ - if (RTCHECK(ok_address(M, T) && ok_address(M, F))) {\ - T->fd = F->bk = X;\ - X->fd = F;\ - X->bk = T;\ - X->parent = 0;\ - break;\ - }\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - break;\ - }\ - }\ - }\ - }\ -} - -/* - Unlink steps: - - 1. If x is a chained node, unlink it from its same-sized fd/bk links - and choose its bk node as its replacement. - 2. If x was the last node of its size, but not a leaf node, it must - be replaced with a leaf node (not merely one with an open left or - right), to make sure that lefts and rights of descendents - correspond properly to bit masks. We use the rightmost descendent - of x. We could use any other leaf, but this is easy to locate and - tends to counteract removal of leftmosts elsewhere, and so keeps - paths shorter than minimally guaranteed. This doesn't loop much - because on average a node in a tree is near the bottom. - 3. If x is the base of a chain (i.e., has parent links) relink - x's parent and children to x's replacement (or null if none). - - Added check: if F->bk != X or R->fd != X, we have double linked list - corruption, and abort. -*/ - -#define unlink_large_chunk(M, X) {\ - tchunkptr XP = X->parent;\ - tchunkptr R;\ - if (X->bk != X) {\ - tchunkptr F = X->fd;\ - R = X->bk;\ - if (__builtin_expect (F->bk != X || R->fd != X, 0))\ - CORRUPTION_ERROR_ACTION(M);\ - if (RTCHECK(ok_address(M, F))) {\ - F->bk = R;\ - R->fd = F;\ - }\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - }\ - }\ - else {\ - tchunkptr* RP;\ - if (((R = *(RP = &(X->child[1]))) != 0) ||\ - ((R = *(RP = &(X->child[0]))) != 0)) {\ - tchunkptr* CP;\ - while ((*(CP = &(R->child[1])) != 0) ||\ - (*(CP = &(R->child[0])) != 0)) {\ - R = *(RP = CP);\ - }\ - if (RTCHECK(ok_address(M, RP)))\ - *RP = 0;\ - else {\ - CORRUPTION_ERROR_ACTION(M);\ - }\ - }\ - }\ - if (XP != 0) {\ - tbinptr* H = treebin_at(M, X->index);\ - if (X == *H) {\ - if ((*H = R) == 0) \ - clear_treemap(M, X->index);\ - }\ - else if (RTCHECK(ok_address(M, XP))) {\ - if (XP->child[0] == X) \ - XP->child[0] = R;\ - else \ - XP->child[1] = R;\ - }\ - else\ - CORRUPTION_ERROR_ACTION(M);\ - if (R != 0) {\ - if (RTCHECK(ok_address(M, R))) {\ - tchunkptr C0, C1;\ - R->parent = XP;\ - if ((C0 = X->child[0]) != 0) {\ - if (RTCHECK(ok_address(M, C0))) {\ - R->child[0] = C0;\ - C0->parent = R;\ - }\ - else\ - CORRUPTION_ERROR_ACTION(M);\ - }\ - if ((C1 = X->child[1]) != 0) {\ - if (RTCHECK(ok_address(M, C1))) {\ - R->child[1] = C1;\ - C1->parent = R;\ - }\ - else\ - CORRUPTION_ERROR_ACTION(M);\ - }\ - }\ - else\ - CORRUPTION_ERROR_ACTION(M);\ - }\ - }\ -} - -/* Relays to large vs small bin operations */ - -#define insert_chunk(M, P, S)\ - if (is_small(S)) insert_small_chunk(M, P, S)\ - else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); } - -#define unlink_chunk(M, P, S)\ - if (is_small(S)) unlink_small_chunk(M, P, S)\ - else { tchunkptr TP = (tchunkptr)(P); unlink_large_chunk(M, TP); } - - -/* Relays to internal calls to malloc/free from realloc, memalign etc */ - -#if ONLY_MSPACES -#define internal_malloc(m, b) mspace_malloc(m, b) -#define internal_free(m, mem) mspace_free(m,mem); -#else /* ONLY_MSPACES */ -#if MSPACES -#define internal_malloc(m, b)\ - (m == gm)? dlmalloc(b) : mspace_malloc(m, b) -#define internal_free(m, mem)\ - if (m == gm) dlfree(mem); else mspace_free(m,mem); -#else /* MSPACES */ -#define internal_malloc(m, b) dlmalloc(b) -#define internal_free(m, mem) dlfree(mem) -#endif /* MSPACES */ -#endif /* ONLY_MSPACES */ - -/* ----------------------- Direct-mmapping chunks ----------------------- */ - -/* - Directly mmapped chunks are set up with an offset to the start of - the mmapped region stored in the prev_foot field of the chunk. This - allows reconstruction of the required argument to MUNMAP when freed, - and also allows adjustment of the returned chunk to meet alignment - requirements (especially in memalign). There is also enough space - allocated to hold a fake next chunk of size SIZE_T_SIZE to maintain - the PINUSE bit so frees can be checked. -*/ - -/* Malloc using mmap */ -static void* mmap_alloc(mstate m, size_t nb) { - size_t mmsize = granularity_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK); -#if USE_MAX_ALLOWED_FOOTPRINT - size_t new_footprint = m->footprint + mmsize; - if (new_footprint <= m->footprint || /* Check for wrap around 0 */ - new_footprint > m->max_allowed_footprint) - return 0; -#endif - if (mmsize > nb) { /* Check for wrap around 0 */ - char* mm = (char*)(DIRECT_MMAP(mmsize)); - if (mm != CMFAIL) { - size_t offset = align_offset(chunk2mem(mm)); - size_t psize = mmsize - offset - MMAP_FOOT_PAD; - mchunkptr p = (mchunkptr)(mm + offset); - p->prev_foot = offset | IS_MMAPPED_BIT; - (p)->head = (psize|CINUSE_BIT); - mark_inuse_foot(m, p, psize); - chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD; - chunk_plus_offset(p, psize+SIZE_T_SIZE)->head = 0; - - if (mm < m->least_addr) - m->least_addr = mm; - if ((m->footprint += mmsize) > m->max_footprint) - m->max_footprint = m->footprint; - assert(is_aligned(chunk2mem(p))); - check_mmapped_chunk(m, p); - return chunk2mem(p); - } - } - return 0; -} - -/* Realloc using mmap */ -static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb) { - size_t oldsize = chunksize(oldp); - if (is_small(nb)) /* Can't shrink mmap regions below small size */ - return 0; - /* Keep old chunk if big enough but not too big */ - if (oldsize >= nb + SIZE_T_SIZE && - (oldsize - nb) <= (mparams.granularity << 1)) - return oldp; - else { - size_t offset = oldp->prev_foot & ~IS_MMAPPED_BIT; - size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD; - size_t newmmsize = granularity_align(nb + SIX_SIZE_T_SIZES + - CHUNK_ALIGN_MASK); - char* cp = (char*)CALL_MREMAP((char*)oldp - offset, - oldmmsize, newmmsize, 1); - if (cp != CMFAIL) { - mchunkptr newp = (mchunkptr)(cp + offset); - size_t psize = newmmsize - offset - MMAP_FOOT_PAD; - newp->head = (psize|CINUSE_BIT); - mark_inuse_foot(m, newp, psize); - chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD; - chunk_plus_offset(newp, psize+SIZE_T_SIZE)->head = 0; - - if (cp < m->least_addr) - m->least_addr = cp; - if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint) - m->max_footprint = m->footprint; - check_mmapped_chunk(m, newp); - return newp; - } - } - return 0; -} - -/* -------------------------- mspace management -------------------------- */ - -/* Initialize top chunk and its size */ -static void init_top(mstate m, mchunkptr p, size_t psize) { - /* Ensure alignment */ - size_t offset = align_offset(chunk2mem(p)); - p = (mchunkptr)((char*)p + offset); - psize -= offset; - - m->top = p; - m->topsize = psize; - p->head = psize | PINUSE_BIT; - /* set size of fake trailing chunk holding overhead space only once */ - chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE; - m->trim_check = mparams.trim_threshold; /* reset on each update */ -} - -/* Initialize bins for a new mstate that is otherwise zeroed out */ -static void init_bins(mstate m) { - /* Establish circular links for smallbins */ - bindex_t i; - for (i = 0; i < NSMALLBINS; ++i) { - sbinptr bin = smallbin_at(m,i); - bin->fd = bin->bk = bin; - } -} - -#if PROCEED_ON_ERROR - -/* default corruption action */ -static void reset_on_error(mstate m) { - int i; - ++malloc_corruption_error_count; - /* Reinitialize fields to forget about all memory */ - m->smallbins = m->treebins = 0; - m->dvsize = m->topsize = 0; - m->seg.base = 0; - m->seg.size = 0; - m->seg.next = 0; - m->top = m->dv = 0; - for (i = 0; i < NTREEBINS; ++i) - *treebin_at(m, i) = 0; - init_bins(m); -} -#endif /* PROCEED_ON_ERROR */ - -/* Allocate chunk and prepend remainder with chunk in successor base. */ -static void* prepend_alloc(mstate m, char* newbase, char* oldbase, - size_t nb) { - mchunkptr p = align_as_chunk(newbase); - mchunkptr oldfirst = align_as_chunk(oldbase); - size_t psize = (char*)oldfirst - (char*)p; - mchunkptr q = chunk_plus_offset(p, nb); - size_t qsize = psize - nb; - set_size_and_pinuse_of_inuse_chunk(m, p, nb); - - assert((char*)oldfirst > (char*)q); - assert(pinuse(oldfirst)); - assert(qsize >= MIN_CHUNK_SIZE); - - /* consolidate remainder with first chunk of old base */ - if (oldfirst == m->top) { - size_t tsize = m->topsize += qsize; - m->top = q; - q->head = tsize | PINUSE_BIT; - check_top_chunk(m, q); - } - else if (oldfirst == m->dv) { - size_t dsize = m->dvsize += qsize; - m->dv = q; - set_size_and_pinuse_of_free_chunk(q, dsize); - } - else { - if (!cinuse(oldfirst)) { - size_t nsize = chunksize(oldfirst); - unlink_chunk(m, oldfirst, nsize); - oldfirst = chunk_plus_offset(oldfirst, nsize); - qsize += nsize; - } - set_free_with_pinuse(q, qsize, oldfirst); - insert_chunk(m, q, qsize); - check_free_chunk(m, q); - } - - check_malloced_chunk(m, chunk2mem(p), nb); - return chunk2mem(p); -} - - -/* Add a segment to hold a new noncontiguous region */ -static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) { - /* Determine locations and sizes of segment, fenceposts, old top */ - char* old_top = (char*)m->top; - msegmentptr oldsp = segment_holding(m, old_top); - char* old_end = oldsp->base + oldsp->size; - size_t ssize = pad_request(sizeof(struct malloc_segment)); - char* rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK); - size_t offset = align_offset(chunk2mem(rawsp)); - char* asp = rawsp + offset; - char* csp = (asp < (old_top + MIN_CHUNK_SIZE))? old_top : asp; - mchunkptr sp = (mchunkptr)csp; - msegmentptr ss = (msegmentptr)(chunk2mem(sp)); - mchunkptr tnext = chunk_plus_offset(sp, ssize); - mchunkptr p = tnext; - int nfences = 0; - - /* reset top to new space */ - init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE); - - /* Set up segment record */ - assert(is_aligned(ss)); - set_size_and_pinuse_of_inuse_chunk(m, sp, ssize); - *ss = m->seg; /* Push current record */ - m->seg.base = tbase; - m->seg.size = tsize; - m->seg.sflags = mmapped; - m->seg.next = ss; - - /* Insert trailing fenceposts */ - for (;;) { - mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE); - p->head = FENCEPOST_HEAD; - ++nfences; - if ((char*)(&(nextp->head)) < old_end) - p = nextp; - else - break; - } - assert(nfences >= 2); - - /* Insert the rest of old top into a bin as an ordinary free chunk */ - if (csp != old_top) { - mchunkptr q = (mchunkptr)old_top; - size_t psize = csp - old_top; - mchunkptr tn = chunk_plus_offset(q, psize); - set_free_with_pinuse(q, psize, tn); - insert_chunk(m, q, psize); - } - - check_top_chunk(m, m->top); -} - -/* -------------------------- System allocation -------------------------- */ - -/* Get memory from system using MORECORE or MMAP */ -static void* sys_alloc(mstate m, size_t nb) { - char* tbase = CMFAIL; - size_t tsize = 0; - flag_t mmap_flag = 0; - - init_mparams(); - - /* Directly map large chunks */ - if (use_mmap(m) && nb >= mparams.mmap_threshold) { - void* mem = mmap_alloc(m, nb); - if (mem != 0) - return mem; - } - -#if USE_MAX_ALLOWED_FOOTPRINT - /* Make sure the footprint doesn't grow past max_allowed_footprint. - * This covers all cases except for where we need to page align, below. - */ - { - size_t new_footprint = m->footprint + - granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE); - if (new_footprint <= m->footprint || /* Check for wrap around 0 */ - new_footprint > m->max_allowed_footprint) - return 0; - } -#endif - - /* - Try getting memory in any of three ways (in most-preferred to - least-preferred order): - 1. A call to MORECORE that can normally contiguously extend memory. - (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or - or main space is mmapped or a previous contiguous call failed) - 2. A call to MMAP new space (disabled if not HAVE_MMAP). - Note that under the default settings, if MORECORE is unable to - fulfill a request, and HAVE_MMAP is true, then mmap is - used as a noncontiguous system allocator. This is a useful backup - strategy for systems with holes in address spaces -- in this case - sbrk cannot contiguously expand the heap, but mmap may be able to - find space. - 3. A call to MORECORE that cannot usually contiguously extend memory. - (disabled if not HAVE_MORECORE) - */ - - if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) { - char* br = CMFAIL; - msegmentptr ss = (m->top == 0)? 0 : segment_holding(m, (char*)m->top); - size_t asize = 0; - ACQUIRE_MORECORE_LOCK(); - - if (ss == 0) { /* First time through or recovery */ - char* base = (char*)CALL_MORECORE(0); - if (base != CMFAIL) { - asize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE); - /* Adjust to end on a page boundary */ - if (!is_page_aligned(base)) { - asize += (page_align((size_t)base) - (size_t)base); -#if USE_MAX_ALLOWED_FOOTPRINT - /* If the alignment pushes us over max_allowed_footprint, - * poison the upcoming call to MORECORE and continue. - */ - { - size_t new_footprint = m->footprint + asize; - if (new_footprint <= m->footprint || /* Check for wrap around 0 */ - new_footprint > m->max_allowed_footprint) { - asize = HALF_MAX_SIZE_T; - } - } -#endif - } - /* Can't call MORECORE if size is negative when treated as signed */ - if (asize < HALF_MAX_SIZE_T && - (br = (char*)(CALL_MORECORE(asize))) == base) { - tbase = base; - tsize = asize; - } - } - } - else { - /* Subtract out existing available top space from MORECORE request. */ - asize = granularity_align(nb - m->topsize + TOP_FOOT_SIZE + SIZE_T_ONE); - /* Use mem here only if it did continuously extend old space */ - if (asize < HALF_MAX_SIZE_T && - (br = (char*)(CALL_MORECORE(asize))) == ss->base+ss->size) { - tbase = br; - tsize = asize; - } - } - - if (tbase == CMFAIL) { /* Cope with partial failure */ - if (br != CMFAIL) { /* Try to use/extend the space we did get */ - if (asize < HALF_MAX_SIZE_T && - asize < nb + TOP_FOOT_SIZE + SIZE_T_ONE) { - size_t esize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE - asize); - if (esize < HALF_MAX_SIZE_T) { - char* end = (char*)CALL_MORECORE(esize); - if (end != CMFAIL) - asize += esize; - else { /* Can't use; try to release */ - CALL_MORECORE(-asize); - br = CMFAIL; - } - } - } - } - if (br != CMFAIL) { /* Use the space we did get */ - tbase = br; - tsize = asize; - } - else - disable_contiguous(m); /* Don't try contiguous path in the future */ - } - - RELEASE_MORECORE_LOCK(); - } - - if (HAVE_MMAP && tbase == CMFAIL) { /* Try MMAP */ - size_t req = nb + TOP_FOOT_SIZE + SIZE_T_ONE; - size_t rsize = granularity_align(req); - if (rsize > nb) { /* Fail if wraps around zero */ - char* mp = (char*)(CALL_MMAP(rsize)); - if (mp != CMFAIL) { - tbase = mp; - tsize = rsize; - mmap_flag = IS_MMAPPED_BIT; - } - } - } - - if (HAVE_MORECORE && tbase == CMFAIL) { /* Try noncontiguous MORECORE */ - size_t asize = granularity_align(nb + TOP_FOOT_SIZE + SIZE_T_ONE); - if (asize < HALF_MAX_SIZE_T) { - char* br = CMFAIL; - char* end = CMFAIL; - ACQUIRE_MORECORE_LOCK(); - br = (char*)(CALL_MORECORE(asize)); - end = (char*)(CALL_MORECORE(0)); - RELEASE_MORECORE_LOCK(); - if (br != CMFAIL && end != CMFAIL && br < end) { - size_t ssize = end - br; - if (ssize > nb + TOP_FOOT_SIZE) { - tbase = br; - tsize = ssize; - } - } - } - } - - if (tbase != CMFAIL) { - - if ((m->footprint += tsize) > m->max_footprint) - m->max_footprint = m->footprint; - - if (!is_initialized(m)) { /* first-time initialization */ - m->seg.base = m->least_addr = tbase; - m->seg.size = tsize; - m->seg.sflags = mmap_flag; - m->magic = mparams.magic; - init_bins(m); - if (is_global(m)) - init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE); - else { - /* Offset top by embedded malloc_state */ - mchunkptr mn = next_chunk(mem2chunk(m)); - init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) -TOP_FOOT_SIZE); - } - } - - else { - /* Try to merge with an existing segment */ - msegmentptr sp = &m->seg; - while (sp != 0 && tbase != sp->base + sp->size) - sp = sp->next; - if (sp != 0 && - !is_extern_segment(sp) && - (sp->sflags & IS_MMAPPED_BIT) == mmap_flag && - segment_holds(sp, m->top)) { /* append */ - sp->size += tsize; - init_top(m, m->top, m->topsize + tsize); - } - else { - if (tbase < m->least_addr) - m->least_addr = tbase; - sp = &m->seg; - while (sp != 0 && sp->base != tbase + tsize) - sp = sp->next; - if (sp != 0 && - !is_extern_segment(sp) && - (sp->sflags & IS_MMAPPED_BIT) == mmap_flag) { - char* oldbase = sp->base; - sp->base = tbase; - sp->size += tsize; - return prepend_alloc(m, tbase, oldbase, nb); - } - else - add_segment(m, tbase, tsize, mmap_flag); - } - } - - if (nb < m->topsize) { /* Allocate from new or extended top space */ - size_t rsize = m->topsize -= nb; - mchunkptr p = m->top; - mchunkptr r = m->top = chunk_plus_offset(p, nb); - r->head = rsize | PINUSE_BIT; - set_size_and_pinuse_of_inuse_chunk(m, p, nb); - check_top_chunk(m, m->top); - check_malloced_chunk(m, chunk2mem(p), nb); - return chunk2mem(p); - } - } - - MALLOC_FAILURE_ACTION; - return 0; -} - -/* ----------------------- system deallocation -------------------------- */ - -/* Unmap and unlink any mmapped segments that don't contain used chunks */ -static size_t release_unused_segments(mstate m) { - size_t released = 0; - msegmentptr pred = &m->seg; - msegmentptr sp = pred->next; - while (sp != 0) { - char* base = sp->base; - size_t size = sp->size; - msegmentptr next = sp->next; - if (is_mmapped_segment(sp) && !is_extern_segment(sp)) { - mchunkptr p = align_as_chunk(base); - size_t psize = chunksize(p); - /* Can unmap if first chunk holds entire segment and not pinned */ - if (!cinuse(p) && (char*)p + psize >= base + size - TOP_FOOT_SIZE) { - tchunkptr tp = (tchunkptr)p; - assert(segment_holds(sp, (char*)sp)); - if (p == m->dv) { - m->dv = 0; - m->dvsize = 0; - } - else { - unlink_large_chunk(m, tp); - } - if (CALL_MUNMAP(base, size) == 0) { - released += size; - m->footprint -= size; - /* unlink obsoleted record */ - sp = pred; - sp->next = next; - } - else { /* back out if cannot unmap */ - insert_large_chunk(m, tp, psize); - } - } - } - pred = sp; - sp = next; - } - return released; -} - -static int sys_trim(mstate m, size_t pad) { - size_t released = 0; - if (pad < MAX_REQUEST && is_initialized(m)) { - pad += TOP_FOOT_SIZE; /* ensure enough room for segment overhead */ - - if (m->topsize > pad) { - /* Shrink top space in granularity-size units, keeping at least one */ - size_t unit = mparams.granularity; - size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit - - SIZE_T_ONE) * unit; - msegmentptr sp = segment_holding(m, (char*)m->top); - - if (!is_extern_segment(sp)) { - if (is_mmapped_segment(sp)) { - if (HAVE_MMAP && - sp->size >= extra && - !has_segment_link(m, sp)) { /* can't shrink if pinned */ - size_t newsize = sp->size - extra; - /* Prefer mremap, fall back to munmap */ - if ((CALL_MREMAP(sp->base, sp->size, newsize, 0) != MFAIL) || - (CALL_MUNMAP(sp->base + newsize, extra) == 0)) { - released = extra; - } - } - } - else if (HAVE_MORECORE) { - if (extra >= HALF_MAX_SIZE_T) /* Avoid wrapping negative */ - extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit; - ACQUIRE_MORECORE_LOCK(); - { - /* Make sure end of memory is where we last set it. */ - char* old_br = (char*)(CALL_MORECORE(0)); - if (old_br == sp->base + sp->size) { - char* rel_br = (char*)(CALL_MORECORE(-extra)); - char* new_br = (char*)(CALL_MORECORE(0)); - if (rel_br != CMFAIL && new_br < old_br) - released = old_br - new_br; - } - } - RELEASE_MORECORE_LOCK(); - } - } - - if (released != 0) { - sp->size -= released; - m->footprint -= released; - init_top(m, m->top, m->topsize - released); - check_top_chunk(m, m->top); - } - } - - /* Unmap any unused mmapped segments */ - if (HAVE_MMAP) - released += release_unused_segments(m); - - /* On failure, disable autotrim to avoid repeated failed future calls */ - if (released == 0) - m->trim_check = MAX_SIZE_T; - } - - return (released != 0)? 1 : 0; -} - -/* ---------------------------- malloc support --------------------------- */ - -/* allocate a large request from the best fitting chunk in a treebin */ -static void* tmalloc_large(mstate m, size_t nb) { - tchunkptr v = 0; - size_t rsize = -nb; /* Unsigned negation */ - tchunkptr t; - bindex_t idx; - compute_tree_index(nb, idx); - - if ((t = *treebin_at(m, idx)) != 0) { - /* Traverse tree for this bin looking for node with size == nb */ - size_t sizebits = nb << leftshift_for_tree_index(idx); - tchunkptr rst = 0; /* The deepest untaken right subtree */ - for (;;) { - tchunkptr rt; - size_t trem = chunksize(t) - nb; - if (trem < rsize) { - v = t; - if ((rsize = trem) == 0) - break; - } - rt = t->child[1]; - t = t->child[(sizebits >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]; - if (rt != 0 && rt != t) - rst = rt; - if (t == 0) { - t = rst; /* set t to least subtree holding sizes > nb */ - break; - } - sizebits <<= 1; - } - } - - if (t == 0 && v == 0) { /* set t to root of next non-empty treebin */ - binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap; - if (leftbits != 0) { - bindex_t i; - binmap_t leastbit = least_bit(leftbits); - compute_bit2idx(leastbit, i); - t = *treebin_at(m, i); - } - } - - while (t != 0) { /* find smallest of tree or subtree */ - size_t trem = chunksize(t) - nb; - if (trem < rsize) { - rsize = trem; - v = t; - } - t = leftmost_child(t); - } - - /* If dv is a better fit, return 0 so malloc will use it */ - if (v != 0 && rsize < (size_t)(m->dvsize - nb)) { - if (RTCHECK(ok_address(m, v))) { /* split */ - mchunkptr r = chunk_plus_offset(v, nb); - assert(chunksize(v) == rsize + nb); - if (RTCHECK(ok_next(v, r))) { - unlink_large_chunk(m, v); - if (rsize < MIN_CHUNK_SIZE) - set_inuse_and_pinuse(m, v, (rsize + nb)); - else { - set_size_and_pinuse_of_inuse_chunk(m, v, nb); - set_size_and_pinuse_of_free_chunk(r, rsize); - insert_chunk(m, r, rsize); - } - return chunk2mem(v); - } - } - CORRUPTION_ERROR_ACTION(m); - } - return 0; -} - -/* allocate a small request from the best fitting chunk in a treebin */ -static void* tmalloc_small(mstate m, size_t nb) { - tchunkptr t, v; - size_t rsize; - bindex_t i; - binmap_t leastbit = least_bit(m->treemap); - compute_bit2idx(leastbit, i); - - v = t = *treebin_at(m, i); - rsize = chunksize(t) - nb; - - while ((t = leftmost_child(t)) != 0) { - size_t trem = chunksize(t) - nb; - if (trem < rsize) { - rsize = trem; - v = t; - } - } - - if (RTCHECK(ok_address(m, v))) { - mchunkptr r = chunk_plus_offset(v, nb); - assert(chunksize(v) == rsize + nb); - if (RTCHECK(ok_next(v, r))) { - unlink_large_chunk(m, v); - if (rsize < MIN_CHUNK_SIZE) - set_inuse_and_pinuse(m, v, (rsize + nb)); - else { - set_size_and_pinuse_of_inuse_chunk(m, v, nb); - set_size_and_pinuse_of_free_chunk(r, rsize); - replace_dv(m, r, rsize); - } - return chunk2mem(v); - } - } - - CORRUPTION_ERROR_ACTION(m); - return 0; -} - -/* --------------------------- realloc support --------------------------- */ - -static void* internal_realloc(mstate m, void* oldmem, size_t bytes) { - if (bytes >= MAX_REQUEST) { - MALLOC_FAILURE_ACTION; - return 0; - } - if (!PREACTION(m)) { - mchunkptr oldp = mem2chunk(oldmem); - size_t oldsize = chunksize(oldp); - mchunkptr next = chunk_plus_offset(oldp, oldsize); - mchunkptr newp = 0; - void* extra = 0; - - /* Try to either shrink or extend into top. Else malloc-copy-free */ - - if (RTCHECK(ok_address(m, oldp) && ok_cinuse(oldp) && - ok_next(oldp, next) && ok_pinuse(next))) { - size_t nb = request2size(bytes); - if (is_mmapped(oldp)) - newp = mmap_resize(m, oldp, nb); - else if (oldsize >= nb) { /* already big enough */ - size_t rsize = oldsize - nb; - newp = oldp; - if (rsize >= MIN_CHUNK_SIZE) { - mchunkptr remainder = chunk_plus_offset(newp, nb); - set_inuse(m, newp, nb); - set_inuse(m, remainder, rsize); - extra = chunk2mem(remainder); - } - } - else if (next == m->top && oldsize + m->topsize > nb) { - /* Expand into top */ - size_t newsize = oldsize + m->topsize; - size_t newtopsize = newsize - nb; - mchunkptr newtop = chunk_plus_offset(oldp, nb); - set_inuse(m, oldp, nb); - newtop->head = newtopsize |PINUSE_BIT; - m->top = newtop; - m->topsize = newtopsize; - newp = oldp; - } - } - else { - USAGE_ERROR_ACTION(m, oldmem); - POSTACTION(m); - return 0; - } - - POSTACTION(m); - - if (newp != 0) { - if (extra != 0) { - internal_free(m, extra); - } - check_inuse_chunk(m, newp); - return chunk2mem(newp); - } - else { - void* newmem = internal_malloc(m, bytes); - if (newmem != 0) { - size_t oc = oldsize - overhead_for(oldp); - memcpy(newmem, oldmem, (oc < bytes)? oc : bytes); - internal_free(m, oldmem); - } - return newmem; - } - } - return 0; -} - -/* --------------------------- memalign support -------------------------- */ - -static void* internal_memalign(mstate m, size_t alignment, size_t bytes) { - if (alignment <= MALLOC_ALIGNMENT) /* Can just use malloc */ - return internal_malloc(m, bytes); - if (alignment < MIN_CHUNK_SIZE) /* must be at least a minimum chunk size */ - alignment = MIN_CHUNK_SIZE; - if ((alignment & (alignment-SIZE_T_ONE)) != 0) {/* Ensure a power of 2 */ - size_t a = MALLOC_ALIGNMENT << 1; - while (a < alignment) a <<= 1; - alignment = a; - } - - if (bytes >= MAX_REQUEST - alignment) { - if (m != 0) { /* Test isn't needed but avoids compiler warning */ - MALLOC_FAILURE_ACTION; - } - } - else { - size_t nb = request2size(bytes); - size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD; - char* mem = (char*)internal_malloc(m, req); - if (mem != 0) { - void* leader = 0; - void* trailer = 0; - mchunkptr p = mem2chunk(mem); - - if (PREACTION(m)) return 0; - if ((((size_t)(mem)) % alignment) != 0) { /* misaligned */ - /* - Find an aligned spot inside chunk. Since we need to give - back leading space in a chunk of at least MIN_CHUNK_SIZE, if - the first calculation places us at a spot with less than - MIN_CHUNK_SIZE leader, we can move to the next aligned spot. - We've allocated enough total room so that this is always - possible. - */ - char* br = (char*)mem2chunk((size_t)(((size_t)(mem + - alignment - - SIZE_T_ONE)) & - -alignment)); - char* pos = ((size_t)(br - (char*)(p)) >= MIN_CHUNK_SIZE)? - br : br+alignment; - mchunkptr newp = (mchunkptr)pos; - size_t leadsize = pos - (char*)(p); - size_t newsize = chunksize(p) - leadsize; - - if (is_mmapped(p)) { /* For mmapped chunks, just adjust offset */ - newp->prev_foot = p->prev_foot + leadsize; - newp->head = (newsize|CINUSE_BIT); - } - else { /* Otherwise, give back leader, use the rest */ - set_inuse(m, newp, newsize); - set_inuse(m, p, leadsize); - leader = chunk2mem(p); - } - p = newp; - } - - /* Give back spare room at the end */ - if (!is_mmapped(p)) { - size_t size = chunksize(p); - if (size > nb + MIN_CHUNK_SIZE) { - size_t remainder_size = size - nb; - mchunkptr remainder = chunk_plus_offset(p, nb); - set_inuse(m, p, nb); - set_inuse(m, remainder, remainder_size); - trailer = chunk2mem(remainder); - } - } - - assert (chunksize(p) >= nb); - assert((((size_t)(chunk2mem(p))) % alignment) == 0); - check_inuse_chunk(m, p); - POSTACTION(m); - if (leader != 0) { - internal_free(m, leader); - } - if (trailer != 0) { - internal_free(m, trailer); - } - return chunk2mem(p); - } - } - return 0; -} - -/* ------------------------ comalloc/coalloc support --------------------- */ - -static void** ialloc(mstate m, - size_t n_elements, - size_t* sizes, - int opts, - void* chunks[]) { - /* - This provides common support for independent_X routines, handling - all of the combinations that can result. - - The opts arg has: - bit 0 set if all elements are same size (using sizes[0]) - bit 1 set if elements should be zeroed - */ - - size_t element_size; /* chunksize of each element, if all same */ - size_t contents_size; /* total size of elements */ - size_t array_size; /* request size of pointer array */ - void* mem; /* malloced aggregate space */ - mchunkptr p; /* corresponding chunk */ - size_t remainder_size; /* remaining bytes while splitting */ - void** marray; /* either "chunks" or malloced ptr array */ - mchunkptr array_chunk; /* chunk for malloced ptr array */ - flag_t was_enabled; /* to disable mmap */ - size_t size; - size_t i; - - /* compute array length, if needed */ - if (chunks != 0) { - if (n_elements == 0) - return chunks; /* nothing to do */ - marray = chunks; - array_size = 0; - } - else { - /* if empty req, must still return chunk representing empty array */ - if (n_elements == 0) - return (void**)internal_malloc(m, 0); - marray = 0; - array_size = request2size(n_elements * (sizeof(void*))); - } - - /* compute total element size */ - if (opts & 0x1) { /* all-same-size */ - element_size = request2size(*sizes); - contents_size = n_elements * element_size; - } - else { /* add up all the sizes */ - element_size = 0; - contents_size = 0; - for (i = 0; i != n_elements; ++i) - contents_size += request2size(sizes[i]); - } - - size = contents_size + array_size; - - /* - Allocate the aggregate chunk. First disable direct-mmapping so - malloc won't use it, since we would not be able to later - free/realloc space internal to a segregated mmap region. - */ - was_enabled = use_mmap(m); - disable_mmap(m); - mem = internal_malloc(m, size - CHUNK_OVERHEAD); - if (was_enabled) - enable_mmap(m); - if (mem == 0) - return 0; - - if (PREACTION(m)) return 0; - p = mem2chunk(mem); - remainder_size = chunksize(p); - - assert(!is_mmapped(p)); - - if (opts & 0x2) { /* optionally clear the elements */ - memset((size_t*)mem, 0, remainder_size - SIZE_T_SIZE - array_size); - } - - /* If not provided, allocate the pointer array as final part of chunk */ - if (marray == 0) { - size_t array_chunk_size; - array_chunk = chunk_plus_offset(p, contents_size); - array_chunk_size = remainder_size - contents_size; - marray = (void**) (chunk2mem(array_chunk)); - set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size); - remainder_size = contents_size; - } - - /* split out elements */ - for (i = 0; ; ++i) { - marray[i] = chunk2mem(p); - if (i != n_elements-1) { - if (element_size != 0) - size = element_size; - else - size = request2size(sizes[i]); - remainder_size -= size; - set_size_and_pinuse_of_inuse_chunk(m, p, size); - p = chunk_plus_offset(p, size); - } - else { /* the final element absorbs any overallocation slop */ - set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size); - break; - } - } - -#if DEBUG - if (marray != chunks) { - /* final element must have exactly exhausted chunk */ - if (element_size != 0) { - assert(remainder_size == element_size); - } - else { - assert(remainder_size == request2size(sizes[i])); - } - check_inuse_chunk(m, mem2chunk(marray)); - } - for (i = 0; i != n_elements; ++i) - check_inuse_chunk(m, mem2chunk(marray[i])); - -#endif /* DEBUG */ - - POSTACTION(m); - return marray; -} - - -/* -------------------------- public routines ---------------------------- */ - -#if !ONLY_MSPACES - -void* dlmalloc(size_t bytes) { - /* - Basic algorithm: - If a small request (< 256 bytes minus per-chunk overhead): - 1. If one exists, use a remainderless chunk in associated smallbin. - (Remainderless means that there are too few excess bytes to - represent as a chunk.) - 2. If it is big enough, use the dv chunk, which is normally the - chunk adjacent to the one used for the most recent small request. - 3. If one exists, split the smallest available chunk in a bin, - saving remainder in dv. - 4. If it is big enough, use the top chunk. - 5. If available, get memory from system and use it - Otherwise, for a large request: - 1. Find the smallest available binned chunk that fits, and use it - if it is better fitting than dv chunk, splitting if necessary. - 2. If better fitting than any binned chunk, use the dv chunk. - 3. If it is big enough, use the top chunk. - 4. If request size >= mmap threshold, try to directly mmap this chunk. - 5. If available, get memory from system and use it - - The ugly goto's here ensure that postaction occurs along all paths. - */ - - if (!PREACTION(gm)) { - void* mem; - size_t nb; - if (bytes <= MAX_SMALL_REQUEST) { - bindex_t idx; - binmap_t smallbits; - nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes); - idx = small_index(nb); - smallbits = gm->smallmap >> idx; - - if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */ - mchunkptr b, p; - idx += ~smallbits & 1; /* Uses next bin if idx empty */ - b = smallbin_at(gm, idx); - p = b->fd; - assert(chunksize(p) == small_index2size(idx)); - unlink_first_small_chunk(gm, b, p, idx); - set_inuse_and_pinuse(gm, p, small_index2size(idx)); - mem = chunk2mem(p); - check_malloced_chunk(gm, mem, nb); - goto postaction; - } - - else if (nb > gm->dvsize) { - if (smallbits != 0) { /* Use chunk in next nonempty smallbin */ - mchunkptr b, p, r; - size_t rsize; - bindex_t i; - binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx)); - binmap_t leastbit = least_bit(leftbits); - compute_bit2idx(leastbit, i); - b = smallbin_at(gm, i); - p = b->fd; - assert(chunksize(p) == small_index2size(i)); - unlink_first_small_chunk(gm, b, p, i); - rsize = small_index2size(i) - nb; - /* Fit here cannot be remainderless if 4byte sizes */ - if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE) - set_inuse_and_pinuse(gm, p, small_index2size(i)); - else { - set_size_and_pinuse_of_inuse_chunk(gm, p, nb); - r = chunk_plus_offset(p, nb); - set_size_and_pinuse_of_free_chunk(r, rsize); - replace_dv(gm, r, rsize); - } - mem = chunk2mem(p); - check_malloced_chunk(gm, mem, nb); - goto postaction; - } - - else if (gm->treemap != 0 && (mem = tmalloc_small(gm, nb)) != 0) { - check_malloced_chunk(gm, mem, nb); - goto postaction; - } - } - } - else if (bytes >= MAX_REQUEST) - nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */ - else { - nb = pad_request(bytes); - if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) { - check_malloced_chunk(gm, mem, nb); - goto postaction; - } - } - - if (nb <= gm->dvsize) { - size_t rsize = gm->dvsize - nb; - mchunkptr p = gm->dv; - if (rsize >= MIN_CHUNK_SIZE) { /* split dv */ - mchunkptr r = gm->dv = chunk_plus_offset(p, nb); - gm->dvsize = rsize; - set_size_and_pinuse_of_free_chunk(r, rsize); - set_size_and_pinuse_of_inuse_chunk(gm, p, nb); - } - else { /* exhaust dv */ - size_t dvs = gm->dvsize; - gm->dvsize = 0; - gm->dv = 0; - set_inuse_and_pinuse(gm, p, dvs); - } - mem = chunk2mem(p); - check_malloced_chunk(gm, mem, nb); - goto postaction; - } - - else if (nb < gm->topsize) { /* Split top */ - size_t rsize = gm->topsize -= nb; - mchunkptr p = gm->top; - mchunkptr r = gm->top = chunk_plus_offset(p, nb); - r->head = rsize | PINUSE_BIT; - set_size_and_pinuse_of_inuse_chunk(gm, p, nb); - mem = chunk2mem(p); - check_top_chunk(gm, gm->top); - check_malloced_chunk(gm, mem, nb); - goto postaction; - } - - mem = sys_alloc(gm, nb); - - postaction: - POSTACTION(gm); - return mem; - } - - return 0; -} - -void dlfree(void* mem) { - /* - Consolidate freed chunks with preceeding or succeeding bordering - free chunks, if they exist, and then place in a bin. Intermixed - with special cases for top, dv, mmapped chunks, and usage errors. - */ - - if (mem != 0) { - mchunkptr p = mem2chunk(mem); -#if FOOTERS - mstate fm = get_mstate_for(p); - if (!ok_magic(fm)) { - USAGE_ERROR_ACTION(fm, p); - return; - } -#else /* FOOTERS */ -#define fm gm -#endif /* FOOTERS */ - if (!PREACTION(fm)) { - check_inuse_chunk(fm, p); - if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) { - size_t psize = chunksize(p); - mchunkptr next = chunk_plus_offset(p, psize); - if (!pinuse(p)) { - size_t prevsize = p->prev_foot; - if ((prevsize & IS_MMAPPED_BIT) != 0) { - prevsize &= ~IS_MMAPPED_BIT; - psize += prevsize + MMAP_FOOT_PAD; - if (CALL_MUNMAP((char*)p - prevsize, psize) == 0) - fm->footprint -= psize; - goto postaction; - } - else { - mchunkptr prev = chunk_minus_offset(p, prevsize); - psize += prevsize; - p = prev; - if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */ - if (p != fm->dv) { - unlink_chunk(fm, p, prevsize); - } - else if ((next->head & INUSE_BITS) == INUSE_BITS) { - fm->dvsize = psize; - set_free_with_pinuse(p, psize, next); - goto postaction; - } - } - else - goto erroraction; - } - } - - if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) { - if (!cinuse(next)) { /* consolidate forward */ - if (next == fm->top) { - size_t tsize = fm->topsize += psize; - fm->top = p; - p->head = tsize | PINUSE_BIT; - if (p == fm->dv) { - fm->dv = 0; - fm->dvsize = 0; - } - if (should_trim(fm, tsize)) - sys_trim(fm, 0); - goto postaction; - } - else if (next == fm->dv) { - size_t dsize = fm->dvsize += psize; - fm->dv = p; - set_size_and_pinuse_of_free_chunk(p, dsize); - goto postaction; - } - else { - size_t nsize = chunksize(next); - psize += nsize; - unlink_chunk(fm, next, nsize); - set_size_and_pinuse_of_free_chunk(p, psize); - if (p == fm->dv) { - fm->dvsize = psize; - goto postaction; - } - } - } - else - set_free_with_pinuse(p, psize, next); - insert_chunk(fm, p, psize); - check_free_chunk(fm, p); - goto postaction; - } - } - erroraction: - USAGE_ERROR_ACTION(fm, p); - postaction: - POSTACTION(fm); - } - } -#if !FOOTERS -#undef fm -#endif /* FOOTERS */ -} - -void* dlcalloc(size_t n_elements, size_t elem_size) { - void *mem; - if (n_elements && MAX_SIZE_T / n_elements < elem_size) { - /* Fail on overflow */ - MALLOC_FAILURE_ACTION; - return NULL; - } - elem_size *= n_elements; - mem = dlmalloc(elem_size); - if (mem && calloc_must_clear(mem2chunk(mem))) - memset(mem, 0, elem_size); - return mem; -} - -void* dlrealloc(void* oldmem, size_t bytes) { - if (oldmem == 0) - return dlmalloc(bytes); -#ifdef REALLOC_ZERO_BYTES_FREES - if (bytes == 0) { - dlfree(oldmem); - return 0; - } -#endif /* REALLOC_ZERO_BYTES_FREES */ - else { -#if ! FOOTERS - mstate m = gm; -#else /* FOOTERS */ - mstate m = get_mstate_for(mem2chunk(oldmem)); - if (!ok_magic(m)) { - USAGE_ERROR_ACTION(m, oldmem); - return 0; - } -#endif /* FOOTERS */ - return internal_realloc(m, oldmem, bytes); - } -} - -void* dlmemalign(size_t alignment, size_t bytes) { - return internal_memalign(gm, alignment, bytes); -} - -void** dlindependent_calloc(size_t n_elements, size_t elem_size, - void* chunks[]) { - size_t sz = elem_size; /* serves as 1-element array */ - return ialloc(gm, n_elements, &sz, 3, chunks); -} - -void** dlindependent_comalloc(size_t n_elements, size_t sizes[], - void* chunks[]) { - return ialloc(gm, n_elements, sizes, 0, chunks); -} - -void* dlvalloc(size_t bytes) { - size_t pagesz; - init_mparams(); - pagesz = mparams.page_size; - return dlmemalign(pagesz, bytes); -} - -void* dlpvalloc(size_t bytes) { - size_t pagesz; - init_mparams(); - pagesz = mparams.page_size; - return dlmemalign(pagesz, (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE)); -} - -int dlmalloc_trim(size_t pad) { - int result = 0; - if (!PREACTION(gm)) { - result = sys_trim(gm, pad); - POSTACTION(gm); - } - return result; -} - -size_t dlmalloc_footprint(void) { - return gm->footprint; -} - -#if USE_MAX_ALLOWED_FOOTPRINT -size_t dlmalloc_max_allowed_footprint(void) { - return gm->max_allowed_footprint; -} - -void dlmalloc_set_max_allowed_footprint(size_t bytes) { - if (bytes > gm->footprint) { - /* Increase the size in multiples of the granularity, - * which is the smallest unit we request from the system. - */ - gm->max_allowed_footprint = gm->footprint + - granularity_align(bytes - gm->footprint); - } - else { - //TODO: allow for reducing the max footprint - gm->max_allowed_footprint = gm->footprint; - } -} -#endif - -size_t dlmalloc_max_footprint(void) { - return gm->max_footprint; -} - -#if !NO_MALLINFO -struct mallinfo dlmallinfo(void) { - return internal_mallinfo(gm); -} -#endif /* NO_MALLINFO */ - -void dlmalloc_stats() { - internal_malloc_stats(gm); -} - -size_t dlmalloc_usable_size(void* mem) { - if (mem != 0) { - mchunkptr p = mem2chunk(mem); - if (cinuse(p)) - return chunksize(p) - overhead_for(p); - } - return 0; -} - -int dlmallopt(int param_number, int value) { - return change_mparam(param_number, value); -} - -#endif /* !ONLY_MSPACES */ - -/* ----------------------------- user mspaces ---------------------------- */ - -#if MSPACES - -static mstate init_user_mstate(char* tbase, size_t tsize) { - size_t msize = pad_request(sizeof(struct malloc_state)); - mchunkptr mn; - mchunkptr msp = align_as_chunk(tbase); - mstate m = (mstate)(chunk2mem(msp)); - memset(m, 0, msize); - INITIAL_LOCK(&m->mutex); - msp->head = (msize|PINUSE_BIT|CINUSE_BIT); - m->seg.base = m->least_addr = tbase; - m->seg.size = m->footprint = m->max_footprint = tsize; -#if USE_MAX_ALLOWED_FOOTPRINT - m->max_allowed_footprint = MAX_SIZE_T; -#endif - m->magic = mparams.magic; - m->mflags = mparams.default_mflags; - disable_contiguous(m); - init_bins(m); - mn = next_chunk(mem2chunk(m)); - init_top(m, mn, (size_t)((tbase + tsize) - (char*)mn) - TOP_FOOT_SIZE); - check_top_chunk(m, m->top); - return m; -} - -mspace create_mspace(size_t capacity, int locked) { - mstate m = 0; - size_t msize = pad_request(sizeof(struct malloc_state)); - init_mparams(); /* Ensure pagesize etc initialized */ - - if (capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) { - size_t rs = ((capacity == 0)? mparams.granularity : - (capacity + TOP_FOOT_SIZE + msize)); - size_t tsize = granularity_align(rs); - char* tbase = (char*)(CALL_MMAP(tsize)); - if (tbase != CMFAIL) { - m = init_user_mstate(tbase, tsize); - m->seg.sflags = IS_MMAPPED_BIT; - set_lock(m, locked); - } - } - return (mspace)m; -} - -mspace create_mspace_with_base(void* base, size_t capacity, int locked) { - mstate m = 0; - size_t msize = pad_request(sizeof(struct malloc_state)); - init_mparams(); /* Ensure pagesize etc initialized */ - - if (capacity > msize + TOP_FOOT_SIZE && - capacity < (size_t) -(msize + TOP_FOOT_SIZE + mparams.page_size)) { - m = init_user_mstate((char*)base, capacity); - m->seg.sflags = EXTERN_BIT; - set_lock(m, locked); - } - return (mspace)m; -} - -size_t destroy_mspace(mspace msp) { - size_t freed = 0; - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - msegmentptr sp = &ms->seg; - while (sp != 0) { - char* base = sp->base; - size_t size = sp->size; - flag_t flag = sp->sflags; - sp = sp->next; - if ((flag & IS_MMAPPED_BIT) && !(flag & EXTERN_BIT) && - CALL_MUNMAP(base, size) == 0) - freed += size; - } - } - else { - USAGE_ERROR_ACTION(ms,ms); - } - return freed; -} - -/* - mspace versions of routines are near-clones of the global - versions. This is not so nice but better than the alternatives. -*/ - - -void* mspace_malloc(mspace msp, size_t bytes) { - mstate ms = (mstate)msp; - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - return 0; - } - if (!PREACTION(ms)) { - void* mem; - size_t nb; - if (bytes <= MAX_SMALL_REQUEST) { - bindex_t idx; - binmap_t smallbits; - nb = (bytes < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(bytes); - idx = small_index(nb); - smallbits = ms->smallmap >> idx; - - if ((smallbits & 0x3U) != 0) { /* Remainderless fit to a smallbin. */ - mchunkptr b, p; - idx += ~smallbits & 1; /* Uses next bin if idx empty */ - b = smallbin_at(ms, idx); - p = b->fd; - assert(chunksize(p) == small_index2size(idx)); - unlink_first_small_chunk(ms, b, p, idx); - set_inuse_and_pinuse(ms, p, small_index2size(idx)); - mem = chunk2mem(p); - check_malloced_chunk(ms, mem, nb); - goto postaction; - } - - else if (nb > ms->dvsize) { - if (smallbits != 0) { /* Use chunk in next nonempty smallbin */ - mchunkptr b, p, r; - size_t rsize; - bindex_t i; - binmap_t leftbits = (smallbits << idx) & left_bits(idx2bit(idx)); - binmap_t leastbit = least_bit(leftbits); - compute_bit2idx(leastbit, i); - b = smallbin_at(ms, i); - p = b->fd; - assert(chunksize(p) == small_index2size(i)); - unlink_first_small_chunk(ms, b, p, i); - rsize = small_index2size(i) - nb; - /* Fit here cannot be remainderless if 4byte sizes */ - if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE) - set_inuse_and_pinuse(ms, p, small_index2size(i)); - else { - set_size_and_pinuse_of_inuse_chunk(ms, p, nb); - r = chunk_plus_offset(p, nb); - set_size_and_pinuse_of_free_chunk(r, rsize); - replace_dv(ms, r, rsize); - } - mem = chunk2mem(p); - check_malloced_chunk(ms, mem, nb); - goto postaction; - } - - else if (ms->treemap != 0 && (mem = tmalloc_small(ms, nb)) != 0) { - check_malloced_chunk(ms, mem, nb); - goto postaction; - } - } - } - else if (bytes >= MAX_REQUEST) - nb = MAX_SIZE_T; /* Too big to allocate. Force failure (in sys alloc) */ - else { - nb = pad_request(bytes); - if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) { - check_malloced_chunk(ms, mem, nb); - goto postaction; - } - } - - if (nb <= ms->dvsize) { - size_t rsize = ms->dvsize - nb; - mchunkptr p = ms->dv; - if (rsize >= MIN_CHUNK_SIZE) { /* split dv */ - mchunkptr r = ms->dv = chunk_plus_offset(p, nb); - ms->dvsize = rsize; - set_size_and_pinuse_of_free_chunk(r, rsize); - set_size_and_pinuse_of_inuse_chunk(ms, p, nb); - } - else { /* exhaust dv */ - size_t dvs = ms->dvsize; - ms->dvsize = 0; - ms->dv = 0; - set_inuse_and_pinuse(ms, p, dvs); - } - mem = chunk2mem(p); - check_malloced_chunk(ms, mem, nb); - goto postaction; - } - - else if (nb < ms->topsize) { /* Split top */ - size_t rsize = ms->topsize -= nb; - mchunkptr p = ms->top; - mchunkptr r = ms->top = chunk_plus_offset(p, nb); - r->head = rsize | PINUSE_BIT; - set_size_and_pinuse_of_inuse_chunk(ms, p, nb); - mem = chunk2mem(p); - check_top_chunk(ms, ms->top); - check_malloced_chunk(ms, mem, nb); - goto postaction; - } - - mem = sys_alloc(ms, nb); - - postaction: - POSTACTION(ms); - return mem; - } - - return 0; -} - -void mspace_free(mspace msp, void* mem) { - if (mem != 0) { - mchunkptr p = mem2chunk(mem); -#if FOOTERS - mstate fm = get_mstate_for(p); -#else /* FOOTERS */ - mstate fm = (mstate)msp; -#endif /* FOOTERS */ - if (!ok_magic(fm)) { - USAGE_ERROR_ACTION(fm, p); - return; - } - if (!PREACTION(fm)) { - check_inuse_chunk(fm, p); - if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) { - size_t psize = chunksize(p); - mchunkptr next = chunk_plus_offset(p, psize); - if (!pinuse(p)) { - size_t prevsize = p->prev_foot; - if ((prevsize & IS_MMAPPED_BIT) != 0) { - prevsize &= ~IS_MMAPPED_BIT; - psize += prevsize + MMAP_FOOT_PAD; - if (CALL_MUNMAP((char*)p - prevsize, psize) == 0) - fm->footprint -= psize; - goto postaction; - } - else { - mchunkptr prev = chunk_minus_offset(p, prevsize); - psize += prevsize; - p = prev; - if (RTCHECK(ok_address(fm, prev))) { /* consolidate backward */ - if (p != fm->dv) { - unlink_chunk(fm, p, prevsize); - } - else if ((next->head & INUSE_BITS) == INUSE_BITS) { - fm->dvsize = psize; - set_free_with_pinuse(p, psize, next); - goto postaction; - } - } - else - goto erroraction; - } - } - - if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) { - if (!cinuse(next)) { /* consolidate forward */ - if (next == fm->top) { - size_t tsize = fm->topsize += psize; - fm->top = p; - p->head = tsize | PINUSE_BIT; - if (p == fm->dv) { - fm->dv = 0; - fm->dvsize = 0; - } - if (should_trim(fm, tsize)) - sys_trim(fm, 0); - goto postaction; - } - else if (next == fm->dv) { - size_t dsize = fm->dvsize += psize; - fm->dv = p; - set_size_and_pinuse_of_free_chunk(p, dsize); - goto postaction; - } - else { - size_t nsize = chunksize(next); - psize += nsize; - unlink_chunk(fm, next, nsize); - set_size_and_pinuse_of_free_chunk(p, psize); - if (p == fm->dv) { - fm->dvsize = psize; - goto postaction; - } - } - } - else - set_free_with_pinuse(p, psize, next); - insert_chunk(fm, p, psize); - check_free_chunk(fm, p); - goto postaction; - } - } - erroraction: - USAGE_ERROR_ACTION(fm, p); - postaction: - POSTACTION(fm); - } - } -} - -void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size) { - void *mem; - mstate ms = (mstate)msp; - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - return 0; - } - if (n_elements && MAX_SIZE_T / n_elements < elem_size) { - /* Fail on overflow */ - MALLOC_FAILURE_ACTION; - return NULL; - } - elem_size *= n_elements; - mem = internal_malloc(ms, elem_size); - if (mem && calloc_must_clear(mem2chunk(mem))) - memset(mem, 0, elem_size); - return mem; -} - -void* mspace_realloc(mspace msp, void* oldmem, size_t bytes) { - if (oldmem == 0) - return mspace_malloc(msp, bytes); -#ifdef REALLOC_ZERO_BYTES_FREES - if (bytes == 0) { - mspace_free(msp, oldmem); - return 0; - } -#endif /* REALLOC_ZERO_BYTES_FREES */ - else { -#if FOOTERS - mchunkptr p = mem2chunk(oldmem); - mstate ms = get_mstate_for(p); -#else /* FOOTERS */ - mstate ms = (mstate)msp; -#endif /* FOOTERS */ - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - return 0; - } - return internal_realloc(ms, oldmem, bytes); - } -} - -void* mspace_memalign(mspace msp, size_t alignment, size_t bytes) { - mstate ms = (mstate)msp; - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - return 0; - } - return internal_memalign(ms, alignment, bytes); -} - -void** mspace_independent_calloc(mspace msp, size_t n_elements, - size_t elem_size, void* chunks[]) { - size_t sz = elem_size; /* serves as 1-element array */ - mstate ms = (mstate)msp; - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - return 0; - } - return ialloc(ms, n_elements, &sz, 3, chunks); -} - -void** mspace_independent_comalloc(mspace msp, size_t n_elements, - size_t sizes[], void* chunks[]) { - mstate ms = (mstate)msp; - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - return 0; - } - return ialloc(ms, n_elements, sizes, 0, chunks); -} - -int mspace_trim(mspace msp, size_t pad) { - int result = 0; - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - if (!PREACTION(ms)) { - result = sys_trim(ms, pad); - POSTACTION(ms); - } - } - else { - USAGE_ERROR_ACTION(ms,ms); - } - return result; -} - -void mspace_malloc_stats(mspace msp) { - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - internal_malloc_stats(ms); - } - else { - USAGE_ERROR_ACTION(ms,ms); - } -} - -size_t mspace_footprint(mspace msp) { - size_t result; - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - result = ms->footprint; - } - else { - USAGE_ERROR_ACTION(ms,ms); - } - return result; -} - -#if USE_MAX_ALLOWED_FOOTPRINT -size_t mspace_max_allowed_footprint(mspace msp) { - size_t result; - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - result = ms->max_allowed_footprint; - } - else { - USAGE_ERROR_ACTION(ms,ms); - } - return result; -} - -void mspace_set_max_allowed_footprint(mspace msp, size_t bytes) { - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - if (bytes > ms->footprint) { - /* Increase the size in multiples of the granularity, - * which is the smallest unit we request from the system. - */ - ms->max_allowed_footprint = ms->footprint + - granularity_align(bytes - ms->footprint); - } - else { - //TODO: allow for reducing the max footprint - ms->max_allowed_footprint = ms->footprint; - } - } - else { - USAGE_ERROR_ACTION(ms,ms); - } -} -#endif - -size_t mspace_max_footprint(mspace msp) { - size_t result; - mstate ms = (mstate)msp; - if (ok_magic(ms)) { - result = ms->max_footprint; - } - else { - USAGE_ERROR_ACTION(ms,ms); - } - return result; -} - - -#if !NO_MALLINFO -struct mallinfo mspace_mallinfo(mspace msp) { - mstate ms = (mstate)msp; - if (!ok_magic(ms)) { - USAGE_ERROR_ACTION(ms,ms); - } - return internal_mallinfo(ms); -} -#endif /* NO_MALLINFO */ - -int mspace_mallopt(int param_number, int value) { - return change_mparam(param_number, value); -} - -#endif /* MSPACES */ - -#if MSPACES && ONLY_MSPACES -void mspace_walk_free_pages(mspace msp, - void(*handler)(void *start, void *end, void *arg), void *harg) -{ - mstate m = (mstate)msp; - if (!ok_magic(m)) { - USAGE_ERROR_ACTION(m,m); - return; - } -#else -void dlmalloc_walk_free_pages(void(*handler)(void *start, void *end, void *arg), - void *harg) -{ - mstate m = (mstate)gm; -#endif - if (!PREACTION(m)) { - if (is_initialized(m)) { - msegmentptr s = &m->seg; - while (s != 0) { - mchunkptr p = align_as_chunk(s->base); - while (segment_holds(s, p) && - p != m->top && p->head != FENCEPOST_HEAD) { - void *chunkptr, *userptr; - size_t chunklen, userlen; - chunkptr = p; - chunklen = chunksize(p); - if (!cinuse(p)) { - void *start; - if (is_small(chunklen)) { - start = (void *)(p + 1); - } - else { - start = (void *)((tchunkptr)p + 1); - } - handler(start, next_chunk(p), harg); - } - p = next_chunk(p); - } - if (p == m->top) { - handler((void *)(p + 1), next_chunk(p), harg); - } - s = s->next; - } - } - POSTACTION(m); - } -} - - -#if MSPACES && ONLY_MSPACES -void mspace_walk_heap(mspace msp, - void(*handler)(const void *chunkptr, size_t chunklen, - const void *userptr, size_t userlen, - void *arg), - void *harg) -{ - msegmentptr s; - mstate m = (mstate)msp; - if (!ok_magic(m)) { - USAGE_ERROR_ACTION(m,m); - return; - } -#else -void dlmalloc_walk_heap(void(*handler)(const void *chunkptr, size_t chunklen, - const void *userptr, size_t userlen, - void *arg), - void *harg) -{ - msegmentptr s; - mstate m = (mstate)gm; -#endif - - s = &m->seg; - while (s != 0) { - mchunkptr p = align_as_chunk(s->base); - while (segment_holds(s, p) && - p != m->top && p->head != FENCEPOST_HEAD) { - void *chunkptr, *userptr; - size_t chunklen, userlen; - chunkptr = p; - chunklen = chunksize(p); - if (cinuse(p)) { - userptr = chunk2mem(p); - userlen = chunklen - overhead_for(p); - } - else { - userptr = NULL; - userlen = 0; - } - handler(chunkptr, chunklen, userptr, userlen, harg); - p = next_chunk(p); - } - if (p == m->top) { - /* The top chunk is just a big free chunk for our purposes. - */ - handler(m->top, m->topsize, NULL, 0, harg); - } - s = s->next; - } -} - -/* -------------------- Alternative MORECORE functions ------------------- */ - -/* - Guidelines for creating a custom version of MORECORE: - - * For best performance, MORECORE should allocate in multiples of pagesize. - * MORECORE may allocate more memory than requested. (Or even less, - but this will usually result in a malloc failure.) - * MORECORE must not allocate memory when given argument zero, but - instead return one past the end address of memory from previous - nonzero call. - * For best performance, consecutive calls to MORECORE with positive - arguments should return increasing addresses, indicating that - space has been contiguously extended. - * Even though consecutive calls to MORECORE need not return contiguous - addresses, it must be OK for malloc'ed chunks to span multiple - regions in those cases where they do happen to be contiguous. - * MORECORE need not handle negative arguments -- it may instead - just return MFAIL when given negative arguments. - Negative arguments are always multiples of pagesize. MORECORE - must not misinterpret negative args as large positive unsigned - args. You can suppress all such calls from even occurring by defining - MORECORE_CANNOT_TRIM, - - As an example alternative MORECORE, here is a custom allocator - kindly contributed for pre-OSX macOS. It uses virtually but not - necessarily physically contiguous non-paged memory (locked in, - present and won't get swapped out). You can use it by uncommenting - this section, adding some #includes, and setting up the appropriate - defines above: - - #define MORECORE osMoreCore - - There is also a shutdown routine that should somehow be called for - cleanup upon program exit. - - #define MAX_POOL_ENTRIES 100 - #define MINIMUM_MORECORE_SIZE (64 * 1024U) - static int next_os_pool; - void *our_os_pools[MAX_POOL_ENTRIES]; - - void *osMoreCore(int size) - { - void *ptr = 0; - static void *sbrk_top = 0; - - if (size > 0) - { - if (size < MINIMUM_MORECORE_SIZE) - size = MINIMUM_MORECORE_SIZE; - if (CurrentExecutionLevel() == kTaskLevel) - ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0); - if (ptr == 0) - { - return (void *) MFAIL; - } - // save ptrs so they can be freed during cleanup - our_os_pools[next_os_pool] = ptr; - next_os_pool++; - ptr = (void *) ((((size_t) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK); - sbrk_top = (char *) ptr + size; - return ptr; - } - else if (size < 0) - { - // we don't currently support shrink behavior - return (void *) MFAIL; - } - else - { - return sbrk_top; - } - } - - // cleanup any allocated memory pools - // called as last thing before shutting down driver - - void osCleanupMem(void) - { - void **ptr; - - for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++) - if (*ptr) - { - PoolDeallocate(*ptr); - *ptr = 0; - } - } - -*/ - - -/* ----------------------------------------------------------------------- -History: - V2.8.3 Thu Sep 22 11:16:32 2005 Doug Lea (dl at gee) - * Add max_footprint functions - * Ensure all appropriate literals are size_t - * Fix conditional compilation problem for some #define settings - * Avoid concatenating segments with the one provided - in create_mspace_with_base - * Rename some variables to avoid compiler shadowing warnings - * Use explicit lock initialization. - * Better handling of sbrk interference. - * Simplify and fix segment insertion, trimming and mspace_destroy - * Reinstate REALLOC_ZERO_BYTES_FREES option from 2.7.x - * Thanks especially to Dennis Flanagan for help on these. - - V2.8.2 Sun Jun 12 16:01:10 2005 Doug Lea (dl at gee) - * Fix memalign brace error. - - V2.8.1 Wed Jun 8 16:11:46 2005 Doug Lea (dl at gee) - * Fix improper #endif nesting in C++ - * Add explicit casts needed for C++ - - V2.8.0 Mon May 30 14:09:02 2005 Doug Lea (dl at gee) - * Use trees for large bins - * Support mspaces - * Use segments to unify sbrk-based and mmap-based system allocation, - removing need for emulation on most platforms without sbrk. - * Default safety checks - * Optional footer checks. Thanks to William Robertson for the idea. - * Internal code refactoring - * Incorporate suggestions and platform-specific changes. - Thanks to Dennis Flanagan, Colin Plumb, Niall Douglas, - Aaron Bachmann, Emery Berger, and others. - * Speed up non-fastbin processing enough to remove fastbins. - * Remove useless cfree() to avoid conflicts with other apps. - * Remove internal memcpy, memset. Compilers handle builtins better. - * Remove some options that no one ever used and rename others. - - V2.7.2 Sat Aug 17 09:07:30 2002 Doug Lea (dl at gee) - * Fix malloc_state bitmap array misdeclaration - - V2.7.1 Thu Jul 25 10:58:03 2002 Doug Lea (dl at gee) - * Allow tuning of FIRST_SORTED_BIN_SIZE - * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte. - * Better detection and support for non-contiguousness of MORECORE. - Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger - * Bypass most of malloc if no frees. Thanks To Emery Berger. - * Fix freeing of old top non-contiguous chunk im sysmalloc. - * Raised default trim and map thresholds to 256K. - * Fix mmap-related #defines. Thanks to Lubos Lunak. - * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield. - * Branch-free bin calculation - * Default trim and mmap thresholds now 256K. - - V2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) - * Introduce independent_comalloc and independent_calloc. - Thanks to Michael Pachos for motivation and help. - * Make optional .h file available - * Allow > 2GB requests on 32bit systems. - * new WIN32 sbrk, mmap, munmap, lock code from . - Thanks also to Andreas Mueller , - and Anonymous. - * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for - helping test this.) - * memalign: check alignment arg - * realloc: don't try to shift chunks backwards, since this - leads to more fragmentation in some programs and doesn't - seem to help in any others. - * Collect all cases in malloc requiring system memory into sysmalloc - * Use mmap as backup to sbrk - * Place all internal state in malloc_state - * Introduce fastbins (although similar to 2.5.1) - * Many minor tunings and cosmetic improvements - * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK - * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS - Thanks to Tony E. Bennett and others. - * Include errno.h to support default failure action. - - V2.6.6 Sun Dec 5 07:42:19 1999 Doug Lea (dl at gee) - * return null for negative arguments - * Added Several WIN32 cleanups from Martin C. Fong - * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h' - (e.g. WIN32 platforms) - * Cleanup header file inclusion for WIN32 platforms - * Cleanup code to avoid Microsoft Visual C++ compiler complaints - * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing - memory allocation routines - * Set 'malloc_getpagesize' for WIN32 platforms (needs more work) - * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to - usage of 'assert' in non-WIN32 code - * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to - avoid infinite loop - * Always call 'fREe()' rather than 'free()' - - V2.6.5 Wed Jun 17 15:57:31 1998 Doug Lea (dl at gee) - * Fixed ordering problem with boundary-stamping - - V2.6.3 Sun May 19 08:17:58 1996 Doug Lea (dl at gee) - * Added pvalloc, as recommended by H.J. Liu - * Added 64bit pointer support mainly from Wolfram Gloger - * Added anonymously donated WIN32 sbrk emulation - * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen - * malloc_extend_top: fix mask error that caused wastage after - foreign sbrks - * Add linux mremap support code from HJ Liu - - V2.6.2 Tue Dec 5 06:52:55 1995 Doug Lea (dl at gee) - * Integrated most documentation with the code. - * Add support for mmap, with help from - Wolfram Gloger (Gloger@lrz.uni-muenchen.de). - * Use last_remainder in more cases. - * Pack bins using idea from colin@nyx10.cs.du.edu - * Use ordered bins instead of best-fit threshhold - * Eliminate block-local decls to simplify tracing and debugging. - * Support another case of realloc via move into top - * Fix error occuring when initial sbrk_base not word-aligned. - * Rely on page size for units instead of SBRK_UNIT to - avoid surprises about sbrk alignment conventions. - * Add mallinfo, mallopt. Thanks to Raymond Nijssen - (raymond@es.ele.tue.nl) for the suggestion. - * Add `pad' argument to malloc_trim and top_pad mallopt parameter. - * More precautions for cases where other routines call sbrk, - courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de). - * Added macros etc., allowing use in linux libc from - H.J. Lu (hjl@gnu.ai.mit.edu) - * Inverted this history list - - V2.6.1 Sat Dec 2 14:10:57 1995 Doug Lea (dl at gee) - * Re-tuned and fixed to behave more nicely with V2.6.0 changes. - * Removed all preallocation code since under current scheme - the work required to undo bad preallocations exceeds - the work saved in good cases for most test programs. - * No longer use return list or unconsolidated bins since - no scheme using them consistently outperforms those that don't - given above changes. - * Use best fit for very large chunks to prevent some worst-cases. - * Added some support for debugging - - V2.6.0 Sat Nov 4 07:05:23 1995 Doug Lea (dl at gee) - * Removed footers when chunks are in use. Thanks to - Paul Wilson (wilson@cs.texas.edu) for the suggestion. - - V2.5.4 Wed Nov 1 07:54:51 1995 Doug Lea (dl at gee) - * Added malloc_trim, with help from Wolfram Gloger - (wmglo@Dent.MED.Uni-Muenchen.DE). - - V2.5.3 Tue Apr 26 10:16:01 1994 Doug Lea (dl at g) - - V2.5.2 Tue Apr 5 16:20:40 1994 Doug Lea (dl at g) - * realloc: try to expand in both directions - * malloc: swap order of clean-bin strategy; - * realloc: only conditionally expand backwards - * Try not to scavenge used bins - * Use bin counts as a guide to preallocation - * Occasionally bin return list chunks in first scan - * Add a few optimizations from colin@nyx10.cs.du.edu - - V2.5.1 Sat Aug 14 15:40:43 1993 Doug Lea (dl at g) - * faster bin computation & slightly different binning - * merged all consolidations to one part of malloc proper - (eliminating old malloc_find_space & malloc_clean_bin) - * Scan 2 returns chunks (not just 1) - * Propagate failure in realloc if malloc returns 0 - * Add stuff to allow compilation on non-ANSI compilers - from kpv@research.att.com - - V2.5 Sat Aug 7 07:41:59 1993 Doug Lea (dl at g.oswego.edu) - * removed potential for odd address access in prev_chunk - * removed dependency on getpagesize.h - * misc cosmetics and a bit more internal documentation - * anticosmetics: mangled names in macros to evade debugger strangeness - * tested on sparc, hp-700, dec-mips, rs6000 - with gcc & native cc (hp, dec only) allowing - Detlefs & Zorn comparison study (in SIGPLAN Notices.) - - Trial version Fri Aug 28 13:14:29 1992 Doug Lea (dl at g.oswego.edu) - * Based loosely on libg++-1.2X malloc. (It retains some of the overall - structure of old version, but most details differ.) - -*/ diff --git a/libc/bionic/dlmalloc.h b/libc/bionic/dlmalloc.h deleted file mode 100644 index 75b5e1fc5..000000000 --- a/libc/bionic/dlmalloc.h +++ /dev/null @@ -1,640 +0,0 @@ -/* - Default header file for malloc-2.8.x, written by Doug Lea - and released to the public domain, as explained at - http://creativecommons.org/licenses/publicdomain. - - last update: Mon Aug 15 08:55:52 2005 Doug Lea (dl at gee) - - This header is for ANSI C/C++ only. You can set any of - the following #defines before including: - - * If USE_DL_PREFIX is defined, it is assumed that malloc.c - was also compiled with this option, so all routines - have names starting with "dl". - - * If HAVE_USR_INCLUDE_MALLOC_H is defined, it is assumed that this - file will be #included AFTER . This is needed only if - your system defines a struct mallinfo that is incompatible with the - standard one declared here. Otherwise, you can include this file - INSTEAD of your system system . At least on ANSI, all - declarations should be compatible with system versions - - * If MSPACES is defined, declarations for mspace versions are included. -*/ - -#ifndef MALLOC_280_H -#define MALLOC_280_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include /* for size_t */ - -#if !ONLY_MSPACES - -/* Check an additional macro for the five primary functions */ -#if !defined(USE_DL_PREFIX) || !defined(MALLOC_LEAK_CHECK) -#define dlcalloc calloc -#define dlfree free -#define dlmalloc malloc -#define dlmemalign memalign -#define dlrealloc realloc -#endif - -#ifndef USE_DL_PREFIX -#define dlvalloc valloc -#define dlpvalloc pvalloc -#define dlmallinfo mallinfo -#define dlmallopt mallopt -#define dlmalloc_trim malloc_trim -#define dlmalloc_walk_free_pages \ - malloc_walk_free_pages -#define dlmalloc_walk_heap \ - malloc_walk_heap -#define dlmalloc_stats malloc_stats -#define dlmalloc_usable_size malloc_usable_size -#define dlmalloc_footprint malloc_footprint -#define dlmalloc_max_allowed_footprint \ - malloc_max_allowed_footprint -#define dlmalloc_set_max_allowed_footprint \ - malloc_set_max_allowed_footprint -#define dlmalloc_max_footprint malloc_max_footprint -#define dlindependent_calloc independent_calloc -#define dlindependent_comalloc independent_comalloc -#endif /* USE_DL_PREFIX */ - - -/* - malloc(size_t n) - Returns a pointer to a newly allocated chunk of at least n bytes, or - null if no space is available, in which case errno is set to ENOMEM - on ANSI C systems. - - If n is zero, malloc returns a minimum-sized chunk. (The minimum - size is 16 bytes on most 32bit systems, and 32 bytes on 64bit - systems.) Note that size_t is an unsigned type, so calls with - arguments that would be negative if signed are interpreted as - requests for huge amounts of space, which will often fail. The - maximum supported value of n differs across systems, but is in all - cases less than the maximum representable value of a size_t. -*/ -void* dlmalloc(size_t); - -/* - free(void* p) - Releases the chunk of memory pointed to by p, that had been previously - allocated using malloc or a related routine such as realloc. - It has no effect if p is null. If p was not malloced or already - freed, free(p) will by default cuase the current program to abort. -*/ -void dlfree(void*); - -/* - calloc(size_t n_elements, size_t element_size); - Returns a pointer to n_elements * element_size bytes, with all locations - set to zero. -*/ -void* dlcalloc(size_t, size_t); - -/* - realloc(void* p, size_t n) - Returns a pointer to a chunk of size n that contains the same data - as does chunk p up to the minimum of (n, p's size) bytes, or null - if no space is available. - - The returned pointer may or may not be the same as p. The algorithm - prefers extending p in most cases when possible, otherwise it - employs the equivalent of a malloc-copy-free sequence. - - If p is null, realloc is equivalent to malloc. - - If space is not available, realloc returns null, errno is set (if on - ANSI) and p is NOT freed. - - if n is for fewer bytes than already held by p, the newly unused - space is lopped off and freed if possible. realloc with a size - argument of zero (re)allocates a minimum-sized chunk. - - The old unix realloc convention of allowing the last-free'd chunk - to be used as an argument to realloc is not supported. -*/ - -void* dlrealloc(void*, size_t); - -/* - memalign(size_t alignment, size_t n); - Returns a pointer to a newly allocated chunk of n bytes, aligned - in accord with the alignment argument. - - The alignment argument should be a power of two. If the argument is - not a power of two, the nearest greater power is used. - 8-byte alignment is guaranteed by normal malloc calls, so don't - bother calling memalign with an argument of 8 or less. - - Overreliance on memalign is a sure way to fragment space. -*/ -void* dlmemalign(size_t, size_t); - -/* - valloc(size_t n); - Equivalent to memalign(pagesize, n), where pagesize is the page - size of the system. If the pagesize is unknown, 4096 is used. -*/ -void* dlvalloc(size_t); - -/* - mallopt(int parameter_number, int parameter_value) - Sets tunable parameters The format is to provide a - (parameter-number, parameter-value) pair. mallopt then sets the - corresponding parameter to the argument value if it can (i.e., so - long as the value is meaningful), and returns 1 if successful else - 0. SVID/XPG/ANSI defines four standard param numbers for mallopt, - normally defined in malloc.h. None of these are use in this malloc, - so setting them has no effect. But this malloc also supports other - options in mallopt: - - Symbol param # default allowed param values - M_TRIM_THRESHOLD -1 2*1024*1024 any (-1U disables trimming) - M_GRANULARITY -2 page size any power of 2 >= page size - M_MMAP_THRESHOLD -3 256*1024 any (or 0 if no MMAP support) -*/ -int dlmallopt(int, int); - -#define M_TRIM_THRESHOLD (-1) -#define M_GRANULARITY (-2) -#define M_MMAP_THRESHOLD (-3) - - -/* - malloc_footprint(); - Returns the number of bytes obtained from the system. The total - number of bytes allocated by malloc, realloc etc., is less than this - value. Unlike mallinfo, this function returns only a precomputed - result, so can be called frequently to monitor memory consumption. - Even if locks are otherwise defined, this function does not use them, - so results might not be up to date. -*/ -size_t dlmalloc_footprint(); - -/* - malloc_max_allowed_footprint(); - Returns the number of bytes that the heap is allowed to obtain - from the system. malloc_footprint() should always return a - size less than or equal to max_allowed_footprint, unless the - max_allowed_footprint was set to a value smaller than the - footprint at the time. - - This function is only available if dlmalloc.c was compiled - with USE_MAX_ALLOWED_FOOTPRINT set. -*/ -size_t dlmalloc_max_allowed_footprint(); - -/* - malloc_set_max_allowed_footprint(); - Set the maximum number of bytes that the heap is allowed to - obtain from the system. The size will be rounded up to a whole - page, and the rounded number will be returned from future calls - to malloc_max_allowed_footprint(). If the new max_allowed_footprint - is larger than the current footprint, the heap will never grow - larger than max_allowed_footprint. If the new max_allowed_footprint - is smaller than the current footprint, the heap will not grow - further. - - This function is only available if dlmalloc.c was compiled - with USE_MAX_ALLOWED_FOOTPRINT set. - - TODO: try to force the heap to give up memory in the shrink case, - and update this comment once that happens. -*/ -void dlmalloc_set_max_allowed_footprint(size_t bytes); - -/* - malloc_max_footprint(); - Returns the maximum number of bytes obtained from the system. This - value will be greater than current footprint if deallocated space - has been reclaimed by the system. The peak number of bytes allocated - by malloc, realloc etc., is less than this value. Unlike mallinfo, - this function returns only a precomputed result, so can be called - frequently to monitor memory consumption. Even if locks are - otherwise defined, this function does not use them, so results might - not be up to date. -*/ -size_t dlmalloc_max_footprint(void); - -#if !NO_MALLINFO -/* - mallinfo() - Returns (by copy) a struct containing various summary statistics: - - arena: current total non-mmapped bytes allocated from system - ordblks: the number of free chunks - smblks: always zero. - hblks: current number of mmapped regions - hblkhd: total bytes held in mmapped regions - usmblks: the maximum total allocated space. This will be greater - than current total if trimming has occurred. - fsmblks: always zero - uordblks: current total allocated space (normal or mmapped) - fordblks: total free space - keepcost: the maximum number of bytes that could ideally be released - back to system via malloc_trim. ("ideally" means that - it ignores page restrictions etc.) - - Because these fields are ints, but internal bookkeeping may - be kept as longs, the reported values may wrap around zero and - thus be inaccurate. -*/ -#ifndef HAVE_USR_INCLUDE_MALLOC_H -#ifndef _MALLOC_H_ -#ifndef MALLINFO_FIELD_TYPE -#define MALLINFO_FIELD_TYPE size_t -#endif /* MALLINFO_FIELD_TYPE */ -struct mallinfo { - MALLINFO_FIELD_TYPE arena; /* non-mmapped space allocated from system */ - MALLINFO_FIELD_TYPE ordblks; /* number of free chunks */ - MALLINFO_FIELD_TYPE smblks; /* always 0 */ - MALLINFO_FIELD_TYPE hblks; /* always 0 */ - MALLINFO_FIELD_TYPE hblkhd; /* space in mmapped regions */ - MALLINFO_FIELD_TYPE usmblks; /* maximum total allocated space */ - MALLINFO_FIELD_TYPE fsmblks; /* always 0 */ - MALLINFO_FIELD_TYPE uordblks; /* total allocated space */ - MALLINFO_FIELD_TYPE fordblks; /* total free space */ - MALLINFO_FIELD_TYPE keepcost; /* releasable (via malloc_trim) space */ -}; -#endif /* _MALLOC_H_ */ -#endif /* HAVE_USR_INCLUDE_MALLOC_H */ - -struct mallinfo dlmallinfo(void); -#endif /* NO_MALLINFO */ - -/* - independent_calloc(size_t n_elements, size_t element_size, void* chunks[]); - - independent_calloc is similar to calloc, but instead of returning a - single cleared space, it returns an array of pointers to n_elements - independent elements that can hold contents of size elem_size, each - of which starts out cleared, and can be independently freed, - realloc'ed etc. The elements are guaranteed to be adjacently - allocated (this is not guaranteed to occur with multiple callocs or - mallocs), which may also improve cache locality in some - applications. - - The "chunks" argument is optional (i.e., may be null, which is - probably the most typical usage). If it is null, the returned array - is itself dynamically allocated and should also be freed when it is - no longer needed. Otherwise, the chunks array must be of at least - n_elements in length. It is filled in with the pointers to the - chunks. - - In either case, independent_calloc returns this pointer array, or - null if the allocation failed. If n_elements is zero and "chunks" - is null, it returns a chunk representing an array with zero elements - (which should be freed if not wanted). - - Each element must be individually freed when it is no longer - needed. If you'd like to instead be able to free all at once, you - should instead use regular calloc and assign pointers into this - space to represent elements. (In this case though, you cannot - independently free elements.) - - independent_calloc simplifies and speeds up implementations of many - kinds of pools. It may also be useful when constructing large data - structures that initially have a fixed number of fixed-sized nodes, - but the number is not known at compile time, and some of the nodes - may later need to be freed. For example: - - struct Node { int item; struct Node* next; }; - - struct Node* build_list() { - struct Node** pool; - int n = read_number_of_nodes_needed(); - if (n <= 0) return 0; - pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0); - if (pool == 0) die(); - // organize into a linked list... - struct Node* first = pool[0]; - for (i = 0; i < n-1; ++i) - pool[i]->next = pool[i+1]; - free(pool); // Can now free the array (or not, if it is needed later) - return first; - } -*/ -void** dlindependent_calloc(size_t, size_t, void**); - -/* - independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]); - - independent_comalloc allocates, all at once, a set of n_elements - chunks with sizes indicated in the "sizes" array. It returns - an array of pointers to these elements, each of which can be - independently freed, realloc'ed etc. The elements are guaranteed to - be adjacently allocated (this is not guaranteed to occur with - multiple callocs or mallocs), which may also improve cache locality - in some applications. - - The "chunks" argument is optional (i.e., may be null). If it is null - the returned array is itself dynamically allocated and should also - be freed when it is no longer needed. Otherwise, the chunks array - must be of at least n_elements in length. It is filled in with the - pointers to the chunks. - - In either case, independent_comalloc returns this pointer array, or - null if the allocation failed. If n_elements is zero and chunks is - null, it returns a chunk representing an array with zero elements - (which should be freed if not wanted). - - Each element must be individually freed when it is no longer - needed. If you'd like to instead be able to free all at once, you - should instead use a single regular malloc, and assign pointers at - particular offsets in the aggregate space. (In this case though, you - cannot independently free elements.) - - independent_comallac differs from independent_calloc in that each - element may have a different size, and also that it does not - automatically clear elements. - - independent_comalloc can be used to speed up allocation in cases - where several structs or objects must always be allocated at the - same time. For example: - - struct Head { ... } - struct Foot { ... } - - void send_message(char* msg) { - int msglen = strlen(msg); - size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) }; - void* chunks[3]; - if (independent_comalloc(3, sizes, chunks) == 0) - die(); - struct Head* head = (struct Head*)(chunks[0]); - char* body = (char*)(chunks[1]); - struct Foot* foot = (struct Foot*)(chunks[2]); - // ... - } - - In general though, independent_comalloc is worth using only for - larger values of n_elements. For small values, you probably won't - detect enough difference from series of malloc calls to bother. - - Overuse of independent_comalloc can increase overall memory usage, - since it cannot reuse existing noncontiguous small chunks that - might be available for some of the elements. -*/ -void** dlindependent_comalloc(size_t, size_t*, void**); - - -/* - pvalloc(size_t n); - Equivalent to valloc(minimum-page-that-holds(n)), that is, - round up n to nearest pagesize. - */ -void* dlpvalloc(size_t); - -/* - malloc_trim(size_t pad); - - If possible, gives memory back to the system (via negative arguments - to sbrk) if there is unused memory at the `high' end of the malloc - pool or in unused MMAP segments. You can call this after freeing - large blocks of memory to potentially reduce the system-level memory - requirements of a program. However, it cannot guarantee to reduce - memory. Under some allocation patterns, some large free blocks of - memory will be locked between two used chunks, so they cannot be - given back to the system. - - The `pad' argument to malloc_trim represents the amount of free - trailing space to leave untrimmed. If this argument is zero, only - the minimum amount of memory to maintain internal data structures - will be left. Non-zero arguments can be supplied to maintain enough - trailing space to service future expected allocations without having - to re-obtain memory from the system. - - Malloc_trim returns 1 if it actually released any memory, else 0. -*/ -int dlmalloc_trim(size_t); - -/* - malloc_walk_free_pages(handler, harg) - - Calls the provided handler on each free region in the heap. The - memory between start and end are guaranteed not to contain any - important data, so the handler is free to alter the contents - in any way. This can be used to advise the OS that large free - regions may be swapped out. - - The value in harg will be passed to each call of the handler. - */ -void dlmalloc_walk_free_pages(void(*handler)(void *start, void *end, void *arg), - void *harg); - -/* - malloc_walk_heap(handler, harg) - - Calls the provided handler on each object or free region in the - heap. The handler will receive the chunk pointer and length, the - object pointer and length, and the value in harg on each call. - */ -void dlmalloc_walk_heap(void(*handler)(const void *chunkptr, size_t chunklen, - const void *userptr, size_t userlen, - void *arg), - void *harg); - -/* - malloc_usable_size(void* p); - - Returns the number of bytes you can actually use in - an allocated chunk, which may be more than you requested (although - often not) due to alignment and minimum size constraints. - You can use this many bytes without worrying about - overwriting other allocated objects. This is not a particularly great - programming practice. malloc_usable_size can be more useful in - debugging and assertions, for example: - - p = malloc(n); - assert(malloc_usable_size(p) >= 256); -*/ -size_t dlmalloc_usable_size(void*); - -/* - malloc_stats(); - Prints on stderr the amount of space obtained from the system (both - via sbrk and mmap), the maximum amount (which may be more than - current if malloc_trim and/or munmap got called), and the current - number of bytes allocated via malloc (or realloc, etc) but not yet - freed. Note that this is the number of bytes allocated, not the - number requested. It will be larger than the number requested - because of alignment and bookkeeping overhead. Because it includes - alignment wastage as being in use, this figure may be greater than - zero even when no user-level chunks are allocated. - - The reported current and maximum system memory can be inaccurate if - a program makes other calls to system memory allocation functions - (normally sbrk) outside of malloc. - - malloc_stats prints only the most commonly interesting statistics. - More information can be obtained by calling mallinfo. -*/ -void dlmalloc_stats(); - -#endif /* !ONLY_MSPACES */ - -#if MSPACES - -/* - mspace is an opaque type representing an independent - region of space that supports mspace_malloc, etc. -*/ -typedef void* mspace; - -/* - create_mspace creates and returns a new independent space with the - given initial capacity, or, if 0, the default granularity size. It - returns null if there is no system memory available to create the - space. If argument locked is non-zero, the space uses a separate - lock to control access. The capacity of the space will grow - dynamically as needed to service mspace_malloc requests. You can - control the sizes of incremental increases of this space by - compiling with a different DEFAULT_GRANULARITY or dynamically - setting with mallopt(M_GRANULARITY, value). -*/ -mspace create_mspace(size_t capacity, int locked); - -/* - destroy_mspace destroys the given space, and attempts to return all - of its memory back to the system, returning the total number of - bytes freed. After destruction, the results of access to all memory - used by the space become undefined. -*/ -size_t destroy_mspace(mspace msp); - -/* - create_mspace_with_base uses the memory supplied as the initial base - of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this - space is used for bookkeeping, so the capacity must be at least this - large. (Otherwise 0 is returned.) When this initial space is - exhausted, additional memory will be obtained from the system. - Destroying this space will deallocate all additionally allocated - space (if possible) but not the initial base. -*/ -mspace create_mspace_with_base(void* base, size_t capacity, int locked); - -/* - mspace_malloc behaves as malloc, but operates within - the given space. -*/ -void* mspace_malloc(mspace msp, size_t bytes); - -/* - mspace_free behaves as free, but operates within - the given space. - - If compiled with FOOTERS==1, mspace_free is not actually needed. - free may be called instead of mspace_free because freed chunks from - any space are handled by their originating spaces. -*/ -void mspace_free(mspace msp, void* mem); - -/* - mspace_realloc behaves as realloc, but operates within - the given space. - - If compiled with FOOTERS==1, mspace_realloc is not actually - needed. realloc may be called instead of mspace_realloc because - realloced chunks from any space are handled by their originating - spaces. -*/ -void* mspace_realloc(mspace msp, void* mem, size_t newsize); - -/* - mspace_calloc behaves as calloc, but operates within - the given space. -*/ -void* mspace_calloc(mspace msp, size_t n_elements, size_t elem_size); - -/* - mspace_memalign behaves as memalign, but operates within - the given space. -*/ -void* mspace_memalign(mspace msp, size_t alignment, size_t bytes); - -/* - mspace_independent_calloc behaves as independent_calloc, but - operates within the given space. -*/ -void** mspace_independent_calloc(mspace msp, size_t n_elements, - size_t elem_size, void* chunks[]); - -/* - mspace_independent_comalloc behaves as independent_comalloc, but - operates within the given space. -*/ -void** mspace_independent_comalloc(mspace msp, size_t n_elements, - size_t sizes[], void* chunks[]); - -/* - mspace_footprint() returns the number of bytes obtained from the - system for this space. -*/ -size_t mspace_footprint(mspace msp); - -/* - mspace_max_allowed_footprint() returns the number of bytes that - this space is allowed to obtain from the system. See - malloc_max_allowed_footprint() for a more in-depth description. - - This function is only available if dlmalloc.c was compiled - with USE_MAX_ALLOWED_FOOTPRINT set. -*/ -size_t mspace_max_allowed_footprint(mspace msp); - -/* - mspace_set_max_allowed_footprint() sets the maximum number of - bytes (rounded up to a page) that this space is allowed to - obtain from the system. See malloc_set_max_allowed_footprint() - for a more in-depth description. - - This function is only available if dlmalloc.c was compiled - with USE_MAX_ALLOWED_FOOTPRINT set. -*/ -void mspace_set_max_allowed_footprint(mspace msp, size_t bytes); - -/* - mspace_max_footprint() returns the maximum number of bytes obtained - from the system over the lifetime of this space. -*/ -size_t mspace_max_footprint(mspace msp); - - -#if !NO_MALLINFO -/* - mspace_mallinfo behaves as mallinfo, but reports properties of - the given space. -*/ -struct mallinfo mspace_mallinfo(mspace msp); -#endif /* NO_MALLINFO */ - -/* - mspace_malloc_stats behaves as malloc_stats, but reports - properties of the given space. -*/ -void mspace_malloc_stats(mspace msp); - -/* - mspace_trim behaves as malloc_trim, but - operates within the given space. -*/ -int mspace_trim(mspace msp, size_t pad); - -/* - An alias for mallopt. -*/ -int mspace_mallopt(int, int); - -#endif /* MSPACES */ - -#ifdef __cplusplus -}; /* end of extern "C" */ -#endif - -#endif /* MALLOC_280_H */ diff --git a/libc/bionic/drand48.c b/libc/bionic/drand48.c deleted file mode 100644 index fd481966e..000000000 --- a/libc/bionic/drand48.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 1993 Martin Birgmeier - * All rights reserved. - * - * You may redistribute unmodified or modified versions of this source - * code provided that the above copyright notice and this and the - * following conditions are retained. - * - * This software is provided ``as is'', and comes with no warranties - * of any kind. I shall in no event be liable for anything that happens - * to anyone/anything when using this software. - */ - -#include - -#include "rand48.h" - -extern unsigned short _rand48_seed[3]; - -double -drand48(void) -{ - return erand48(_rand48_seed); -} diff --git a/libc/bionic/eabi.c b/libc/bionic/eabi.c deleted file mode 100644 index f212d0556..000000000 --- a/libc/bionic/eabi.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include - -void* __dso_handle = 0; - -/* Make this a weak symbol to avoid a multiple definition error when linking - * with libstdc++-v3. */ -int __attribute__((weak)) -__aeabi_atexit (void *object, void (*destructor) (void *), void *dso_handle) -{ - //return __cxa_atexit(destructor, object, dso_handle); - return 0; -} - - -void __aeabi_memcpy8(void *dest, const void *src, size_t n) { - memcpy(dest, src, n); -} - -void __aeabi_memcpy4(void *dest, const void *src, size_t n) { - memcpy(dest, src, n); -} - -void __aeabi_memcpy(void *dest, const void *src, size_t n) { - memcpy(dest, src, n); -} - - -void __aeabi_memmove8(void *dest, const void *src, size_t n) { - memmove(dest, src, n); -} - -void __aeabi_memmove4(void *dest, const void *src, size_t n) { - memmove(dest, src, n); -} - -void __aeabi_memmove(void *dest, const void *src, size_t n) { - memmove(dest, src, n); -} - -/* - * __aeabi_memset has the order of its second and third arguments reversed. - * This allows __aeabi_memclr to tail-call __aeabi_memset - */ - -void __aeabi_memset8(void *dest, size_t n, int c) { - memset(dest, c, n); -} - -void __aeabi_memset4(void *dest, size_t n, int c) { - memset(dest, c, n); -} - -void __aeabi_memset(void *dest, size_t n, int c) { - memset(dest, c, n); -} - - -void __aeabi_memclr8(void *dest, size_t n) { - __aeabi_memset8(dest, n, 0); -} - -void __aeabi_memclr4(void *dest, size_t n) { - __aeabi_memset4(dest, n, 0); -} - -void __aeabi_memclr(void *dest, size_t n) { - __aeabi_memset(dest, n, 0); -} diff --git a/libc/bionic/erand48.c b/libc/bionic/erand48.c deleted file mode 100644 index 843ff3418..000000000 --- a/libc/bionic/erand48.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 1993 Martin Birgmeier - * All rights reserved. - * - * You may redistribute unmodified or modified versions of this source - * code provided that the above copyright notice and this and the - * following conditions are retained. - * - * This software is provided ``as is'', and comes with no warranties - * of any kind. I shall in no event be liable for anything that happens - * to anyone/anything when using this software. - */ - -#include - -#include "rand48.h" - -double -erand48(unsigned short xseed[3]) -{ - _dorand48(xseed); - return ldexp((double) xseed[0], -48) + - ldexp((double) xseed[1], -32) + - ldexp((double) xseed[2], -16); -} diff --git a/libc/bionic/fork.c b/libc/bionic/fork.c deleted file mode 100644 index 1c6a4ba05..000000000 --- a/libc/bionic/fork.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include "pthread_internal.h" - -extern int __fork(void); - -int fork(void) -{ - int ret; - - /* Posix mandates that the timers of a fork child process be - * disarmed, but not destroyed. To avoid a race condition, we're - * going to stop all timers now, and only re-start them in case - * of error, or in the parent process - */ - __timer_table_start_stop(1); - ret = __fork(); - if (ret != 0) { /* not a child process */ - __timer_table_start_stop(0); - } - return ret; -} diff --git a/libc/bionic/hash.h b/libc/bionic/hash.h deleted file mode 100644 index 3b483f1a1..000000000 --- a/libc/bionic/hash.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 1999 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of KTH nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -/* $Heimdal: hash.h,v 1.1 1999/03/22 19:16:25 joda Exp $ - $NetBSD: hash.h,v 1.1.1.3 2002/09/12 12:41:42 joda Exp $ */ - -/* stuff in common between md4, md5, and sha1 */ - -#ifndef __hash_h__ -#define __hash_h__ - -#include -#include - -#ifndef min -#define min(a,b) (((a)>(b))?(b):(a)) -#endif - -/* Vector Crays doesn't have a good 32-bit type, or more precisely, - int32_t as defined by isn't 32 bits, and we don't - want to depend in being able to redefine this type. To cope with - this we have to clamp the result in some places to [0,2^32); no - need to do this on other machines. Did I say this was a mess? - */ - -#ifdef _CRAY -#define CRAYFIX(X) ((X) & 0xffffffff) -#else -#define CRAYFIX(X) (X) -#endif - -static inline u_int32_t -cshift (u_int32_t x, unsigned int n) -{ - x = CRAYFIX(x); - return CRAYFIX((x << n) | (x >> (32 - n))); -} - -#endif /* __hash_h__ */ diff --git a/libc/bionic/if_indextoname.c b/libc/bionic/if_indextoname.c deleted file mode 100644 index dc08b289a..000000000 --- a/libc/bionic/if_indextoname.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include - -/* - * Map an interface index into its name. - * Returns NULL on error. - */ -char* -if_indextoname(unsigned ifindex, char *ifname) -{ - int index; - int ctl_sock; - struct ifreq ifr; - char* ret = NULL; - - memset(&ifr, 0, sizeof(struct ifreq)); - ifr.ifr_ifindex = ifindex; - - if ((ctl_sock = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) { - if (ioctl(ctl_sock, SIOCGIFNAME, &ifr) >= 0) { - ret = strncpy (ifname, ifr.ifr_name, IFNAMSIZ); - } else { - /* Posix requires ENXIO */ - if (errno == ENODEV) - errno = ENXIO; - } - close(ctl_sock); - } - return ret; -} diff --git a/libc/bionic/if_nametoindex.c b/libc/bionic/if_nametoindex.c deleted file mode 100644 index d670e43e2..000000000 --- a/libc/bionic/if_nametoindex.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include - -/* - * Map an interface name into its corresponding index. - * Returns 0 on error, as 0 is not a valid index. - */ -unsigned int if_nametoindex(const char *ifname) -{ - int index; - int ctl_sock; - struct ifreq ifr; - - memset(&ifr, 0, sizeof(struct ifreq)); - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - ifr.ifr_name[IFNAMSIZ - 1] = 0; - - index = 0; - if ((ctl_sock = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) { - if (ioctl(ctl_sock, SIOCGIFINDEX, &ifr) >= 0) { - index = ifr.ifr_ifindex; - } - close(ctl_sock); - } - return index; -} diff --git a/libc/bionic/ioctl.c b/libc/bionic/ioctl.c deleted file mode 100644 index 6dd95d0a9..000000000 --- a/libc/bionic/ioctl.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include - -extern int __ioctl(int, int, void *); - -int ioctl(int fd, int request, ...) -{ - va_list ap; - void * arg; - - va_start(ap, request); - arg = va_arg(ap, void *); - va_end(ap); - - return __ioctl(fd, request, arg); -} - diff --git a/libc/bionic/ldexp.c b/libc/bionic/ldexp.c deleted file mode 100644 index ec1f3ddda..000000000 --- a/libc/bionic/ldexp.c +++ /dev/null @@ -1,122 +0,0 @@ -/* @(#)s_scalbn.c 5.1 93/09/24 */ -/* @(#)fdlibm.h 5.1 93/09/24 */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -#include - -#include -#include -#include - -/* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */ - -#if BYTE_ORDER == BIG_ENDIAN - -typedef union -{ - double value; - struct - { - u_int32_t msw; - u_int32_t lsw; - } parts; -} ieee_double_shape_type; - -#endif - -#if BYTE_ORDER == LITTLE_ENDIAN - -typedef union -{ - double value; - struct - { - u_int32_t lsw; - u_int32_t msw; - } parts; -} ieee_double_shape_type; - -#endif - -/* Get two 32 bit ints from a double. */ - -#define EXTRACT_WORDS(ix0,ix1,d) \ -do { \ - ieee_double_shape_type ew_u; \ - ew_u.value = (d); \ - (ix0) = ew_u.parts.msw; \ - (ix1) = ew_u.parts.lsw; \ -} while (0) - -/* Get the more significant 32 bit int from a double. */ - -#define GET_HIGH_WORD(i,d) \ -do { \ - ieee_double_shape_type gh_u; \ - gh_u.value = (d); \ - (i) = gh_u.parts.msw; \ -} while (0) - -/* Set the more significant 32 bits of a double from an int. */ - -#define SET_HIGH_WORD(d,v) \ -do { \ - ieee_double_shape_type sh_u; \ - sh_u.value = (d); \ - sh_u.parts.msw = (v); \ - (d) = sh_u.value; \ -} while (0) - - -static const double -two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ -twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */ -huge = 1.0e+300, -tiny = 1.0e-300; - -static double -_copysign(double x, double y) -{ - u_int32_t hx,hy; - GET_HIGH_WORD(hx,x); - GET_HIGH_WORD(hy,y); - SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000)); - return x; -} - -double -ldexp(double x, int n) -{ - int32_t k,hx,lx; - EXTRACT_WORDS(hx,lx,x); - k = (hx&0x7ff00000)>>20; /* extract exponent */ - if (k==0) { /* 0 or subnormal x */ - if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */ - x *= two54; - GET_HIGH_WORD(hx,x); - k = ((hx&0x7ff00000)>>20) - 54; - if (n< -50000) return tiny*x; /*underflow*/ - } - if (k==0x7ff) return x+x; /* NaN or Inf */ - k = k+n; - if (k > 0x7fe) return huge*_copysign(huge,x); /* overflow */ - if (k > 0) /* normal result */ - {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;} - if (k <= -54) { - if (n > 50000) /* in case integer overflow in n+k */ - return huge*_copysign(huge,x); /*overflow*/ - else return tiny*_copysign(tiny,x); /*underflow*/ - } - k += 54; /* subnormal result */ - SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); - return x*twom54; -} diff --git a/libc/bionic/libc_init_common.c b/libc/bionic/libc_init_common.c deleted file mode 100644 index de4919d27..000000000 --- a/libc/bionic/libc_init_common.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include "pthread_internal.h" -#include "atexit.h" -#include "libc_init_common.h" - -#include -#include - -extern void _init(void); -extern void _fini(void); - -static void call_array(void(**list)()) -{ - // First element is -1, list is null-terminated - while (*++list) { - (*list)(); - } -} - -static void __bionic_do_global_dtors(structors_array_t const * const p) -{ - call_array(p->fini_array); - //_fini(); -} - -extern unsigned __get_sp(void); -extern pid_t gettid(void); - -char* __progname; -char **environ; - -/* from asm/page.h */ -unsigned int __page_size = PAGE_SIZE; -unsigned int __page_shift = PAGE_SHIFT; - - -int __system_properties_init(void); - -void __libc_init_common(uintptr_t *elfdata, - void (*onexit)(void), - int (*slingshot)(int, char**, char**), - structors_array_t const * const structors, - void (*pre_ctor_hook)()) -{ - pthread_internal_t thread; - pthread_attr_t thread_attr; - void *tls_area[BIONIC_TLS_SLOTS]; - int argc; - char **argv, **envp, **envend; - struct auxentry *auxentry; - unsigned int page_size = 0, page_shift = 0; - - /* The main thread's stack has empirically shown to be 84k */ - unsigned stacktop = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE; - unsigned stacksize = 128 * 1024; //84 * 1024; - unsigned stackbottom = stacktop - stacksize; - - pthread_attr_init(&thread_attr); - pthread_attr_setstack(&thread_attr, (void*)stackbottom, stacksize); - _init_thread(&thread, gettid(), &thread_attr, (void*)stackbottom); - __init_tls(tls_area, &thread); - - argc = (int) *elfdata++; - argv = (char**) elfdata; - envp = argv+(argc+1); - environ = envp; - - __progname = argv[0] ? argv[0] : ""; - - errno = 0; - - __system_properties_init(); - - if (pre_ctor_hook) pre_ctor_hook(); - - // XXX: we should execute the .fini_array upon exit - - // pre-init array. - // XXX: I'm not sure what's the different with the init array. - call_array(structors->preinit_array); - - // for compatibility with non-eabi binary, call the .ctors section - call_array(structors->ctors_array); - - // call static constructors - call_array(structors->init_array); - - exit(slingshot(argc, argv, envp)); -} diff --git a/libc/bionic/libc_init_common.h b/libc/bionic/libc_init_common.h deleted file mode 100644 index bbc82e4b7..000000000 --- a/libc/bionic/libc_init_common.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef LIBC_INIT_COMMON_H -#define LIBC_INIT_COMMON_H - -#include - -typedef struct -{ - void (**preinit_array)(void); - void (**init_array)(void); - void (**fini_array)(void); - void (**ctors_array)(void); -} structors_array_t; - -extern __noreturn void __libc_init_common(uintptr_t *elfdata, - void (*onexit)(void), - int (*slingshot)(int, char**, char**), - structors_array_t const * const structors, - void (*pre_ctor_hook)()); - -#endif diff --git a/libc/bionic/libc_init_dynamic.c b/libc/bionic/libc_init_dynamic.c deleted file mode 100644 index 8cf24b466..000000000 --- a/libc/bionic/libc_init_dynamic.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * libc_init_static.c - * - * This function takes the raw data block set up by the ELF loader - * in the kernel and parses it. It is invoked by crt0.S which makes - * any necessary adjustments and passes calls this function using - * the standard C calling convention. - * - * The arguments are: - * uintptr_t *elfdata -- The ELF loader data block; usually from the stack. - * Basically a pointer to argc. - * void (*onexit)(void) -- Function to install into onexit - */ - -/* - * Several Linux ABIs don't pass the onexit pointer, and the ones that - * do never use it. Therefore, unless USE_ONEXIT is defined, we just - * ignore the onexit pointer. - */ -/* #define USE_ONEXIT */ - -#include -#include -#include -#include -#include -#include "pthread_internal.h" -#include "atexit.h" -#include "libc_init_common.h" - -extern void malloc_debug_init(); - -__noreturn void __libc_init(uintptr_t *elfdata, - void (*onexit)(void), - int (*slingshot)(int, char**, char**), - structors_array_t const * const structors) -{ - __libc_init_common(elfdata, onexit, slingshot, structors, malloc_debug_init); -} diff --git a/libc/bionic/libc_init_static.c b/libc/bionic/libc_init_static.c deleted file mode 100644 index ec463f7ec..000000000 --- a/libc/bionic/libc_init_static.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * libc_init_static.c - * - * This function takes the raw data block set up by the ELF loader - * in the kernel and parses it. It is invoked by crt0.S which makes - * any necessary adjustments and passes calls this function using - * the standard C calling convention. - * - * The arguments are: - * uintptr_t *elfdata -- The ELF loader data block; usually from the stack. - * Basically a pointer to argc. - * void (*onexit)(void) -- Function to install into onexit - */ - -/* - * Several Linux ABIs don't pass the onexit pointer, and the ones that - * do never use it. Therefore, unless USE_ONEXIT is defined, we just - * ignore the onexit pointer. - */ -/* #define USE_ONEXIT */ - -#include -#include -#include -#include -#include -#include "pthread_internal.h" -#include "atexit.h" -#include "libc_init_common.h" - -#include -#include - -__noreturn void __libc_init(uintptr_t *elfdata, - void (*onexit)(void), - int (*slingshot)(int, char**, char**), - structors_array_t const * const structors) -{ -/* - * To enable malloc checks for statically linked programs, add - * "WITH_MALLOC_CHECK_LIBC_A := true" in device/buildspec.mk - */ -#ifdef MALLOC_LEAK_CHECK - extern void malloc_debug_init(); - __libc_init_common(elfdata, onexit, slingshot, structors, malloc_debug_init); -#else - __libc_init_common(elfdata, onexit, slingshot, structors, NULL); -#endif -} diff --git a/libc/bionic/logd_write.c b/libc/bionic/logd_write.c deleted file mode 100644 index 7c3608bf7..000000000 --- a/libc/bionic/logd_write.c +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include "logd.h" - -#include - -#define LOG_BUF_SIZE 1024 - -typedef enum { - LOG_ID_MAIN = 0, - LOG_ID_RADIO, - LOG_ID_MAX -} log_id_t; - -static int __write_to_log_init(log_id_t, struct iovec *vec); -static int (*write_to_log)(log_id_t, struct iovec *vec) = __write_to_log_init; -static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER; - -static int log_fds[(int)LOG_ID_MAX] = { -1, -1 }; - -static int __write_to_log_null(log_id_t log_fd, struct iovec *vec) -{ - return -1; -} - -static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec) -{ - ssize_t ret; - int log_fd; - - if ((int)log_id >= 0 && (int)log_id < (int)LOG_ID_MAX) { - log_fd = log_fds[(int)log_id]; - } else { - return EBADF; - } - - do { - ret = writev(log_fd, vec, 3); - } while (ret < 0 && errno == EINTR); - - return ret; -} - -static int __write_to_log_init(log_id_t log_id, struct iovec *vec) -{ - pthread_mutex_lock(&log_init_lock); - - if (write_to_log == __write_to_log_init) { - log_fds[LOG_ID_MAIN] = open("/dev/"LOGGER_LOG_MAIN, O_WRONLY); - log_fds[LOG_ID_RADIO] = open("/dev/"LOGGER_LOG_RADIO, O_WRONLY); - - write_to_log = __write_to_log_kernel; - - if (log_fds[LOG_ID_MAIN] < 0 || log_fds[LOG_ID_RADIO] < 0) { - close(log_fds[LOG_ID_MAIN]); - close(log_fds[LOG_ID_RADIO]); - log_fds[LOG_ID_MAIN] = -1; - log_fds[LOG_ID_RADIO] = -1; - write_to_log = __write_to_log_null; - } - } - - pthread_mutex_unlock(&log_init_lock); - - return write_to_log(log_id, vec); -} - -static int __android_log_write(int prio, const char *tag, const char *msg) -{ - struct iovec vec[3]; - log_id_t log_id = LOG_ID_MAIN; - - if (!tag) - tag = ""; - - if (!strcmp(tag, "HTC_RIL")) - log_id = LOG_ID_RADIO; - - vec[0].iov_base = (unsigned char *) &prio; - vec[0].iov_len = 1; - vec[1].iov_base = (void *) tag; - vec[1].iov_len = strlen(tag) + 1; - vec[2].iov_base = (void *) msg; - vec[2].iov_len = strlen(msg) + 1; - - return write_to_log(log_id, vec); -} - - -static int __android_log_vprint(int prio, const char *tag, const char *fmt, - va_list ap) -{ - char buf[LOG_BUF_SIZE]; - - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - - return __android_log_write(prio, tag, buf); -} - -int __libc_android_log_print(int prio, const char *tag, const char *fmt, ...) -{ - va_list ap; - char buf[LOG_BUF_SIZE]; - - va_start(ap, fmt); - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - va_end(ap); - - return __android_log_write(prio, tag, buf); -} - -int __libc_android_log_assert(const char *cond, const char *tag, - const char *fmt, ...) -{ - va_list ap; - char buf[LOG_BUF_SIZE]; - - va_start(ap, fmt); - vsnprintf(buf, LOG_BUF_SIZE, fmt, ap); - va_end(ap); - - __android_log_write(ANDROID_LOG_FATAL, tag, buf); - - exit(1); - - return -1; -} diff --git a/libc/bionic/malloc_leak.c b/libc/bionic/malloc_leak.c deleted file mode 100644 index a0aa2ae64..000000000 --- a/libc/bionic/malloc_leak.c +++ /dev/null @@ -1,900 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "dlmalloc.h" -#include "logd.h" - -// ============================================================================= -// Utilities directly used by Dalvik -// ============================================================================= - -#define HASHTABLE_SIZE 1543 -#define BACKTRACE_SIZE 32 -/* flag definitions, currently sharing storage with "size" */ -#define SIZE_FLAG_ZYGOTE_CHILD (1<<31) -#define SIZE_FLAG_MASK (SIZE_FLAG_ZYGOTE_CHILD) - -#define MAX_SIZE_T (~(size_t)0) - -/* - * In a VM process, this is set to 1 after fork()ing out of zygote. - */ -int gMallocLeakZygoteChild = 0; - -// ============================================================================= -// Structures -// ============================================================================= - -typedef struct HashEntry HashEntry; -struct HashEntry { - size_t slot; - HashEntry* prev; - HashEntry* next; - size_t numEntries; - // fields above "size" are NOT sent to the host - size_t size; - size_t allocations; - intptr_t backtrace[0]; -}; - -typedef struct HashTable HashTable; -struct HashTable { - size_t count; - HashEntry* slots[HASHTABLE_SIZE]; -}; - -static pthread_mutex_t gAllocationsMutex = PTHREAD_MUTEX_INITIALIZER; -static HashTable gHashTable; - -// ============================================================================= -// output fucntions -// ============================================================================= - -static int hash_entry_compare(const void* arg1, const void* arg2) -{ - HashEntry* e1 = *(HashEntry**)arg1; - HashEntry* e2 = *(HashEntry**)arg2; - - size_t nbAlloc1 = e1->allocations; - size_t nbAlloc2 = e2->allocations; - size_t size1 = e1->size & ~SIZE_FLAG_MASK; - size_t size2 = e2->size & ~SIZE_FLAG_MASK; - size_t alloc1 = nbAlloc1 * size1; - size_t alloc2 = nbAlloc2 * size2; - - // sort in descending order by: - // 1) total size - // 2) number of allocations - // - // This is used for sorting, not determination of equality, so we don't - // need to compare the bit flags. - int result; - if (alloc1 > alloc2) { - result = -1; - } else if (alloc1 < alloc2) { - result = 1; - } else { - if (nbAlloc1 > nbAlloc2) { - result = -1; - } else if (nbAlloc1 < nbAlloc2) { - result = 1; - } else { - result = 0; - } - } - return result; -} - -/* - * Retrieve native heap information. - * - * "*info" is set to a buffer we allocate - * "*overallSize" is set to the size of the "info" buffer - * "*infoSize" is set to the size of a single entry - * "*totalMemory" is set to the sum of all allocations we're tracking; does - * not include heap overhead - * "*backtraceSize" is set to the maximum number of entries in the back trace - */ -void get_malloc_leak_info(uint8_t** info, size_t* overallSize, - size_t* infoSize, size_t* totalMemory, size_t* backtraceSize) -{ - // don't do anything if we have invalid arguments - if (info == NULL || overallSize == NULL || infoSize == NULL || - totalMemory == NULL || backtraceSize == NULL) { - return; - } - - pthread_mutex_lock(&gAllocationsMutex); - - if (gHashTable.count == 0) { - *info = NULL; - *overallSize = 0; - *infoSize = 0; - *totalMemory = 0; - *backtraceSize = 0; - goto done; - } - - void** list = (void**)dlmalloc(sizeof(void*) * gHashTable.count); - - // debug_log("*****\ngHashTable.count = %d\n", gHashTable.count); - // debug_log("list = %p\n", list); - - // get the entries into an array to be sorted - int index = 0; - int i; - for (i = 0 ; i < HASHTABLE_SIZE ; i++) { - HashEntry* entry = gHashTable.slots[i]; - while (entry != NULL) { - list[index] = entry; - *totalMemory = *totalMemory + - ((entry->size & ~SIZE_FLAG_MASK) * entry->allocations); - index++; - entry = entry->next; - } - } - - // debug_log("sorted list!\n"); - // XXX: the protocol doesn't allow variable size for the stack trace (yet) - *infoSize = (sizeof(size_t) * 2) + (sizeof(intptr_t) * BACKTRACE_SIZE); - *overallSize = *infoSize * gHashTable.count; - *backtraceSize = BACKTRACE_SIZE; - - // debug_log("infoSize = 0x%x overall = 0x%x\n", *infoSize, *overallSize); - // now get A byte array big enough for this - *info = (uint8_t*)dlmalloc(*overallSize); - - // debug_log("info = %p\n", info); - if (*info == NULL) { - *overallSize = 0; - goto done; - } - - // debug_log("sorting list...\n"); - qsort((void*)list, gHashTable.count, sizeof(void*), hash_entry_compare); - - uint8_t* head = *info; - const int count = gHashTable.count; - for (i = 0 ; i < count ; i++) { - HashEntry* entry = list[i]; - size_t entrySize = (sizeof(size_t) * 2) + (sizeof(intptr_t) * entry->numEntries); - if (entrySize < *infoSize) { - /* we're writing less than a full entry, clear out the rest */ - /* TODO: only clear out the part we're not overwriting? */ - memset(head, 0, *infoSize); - } else { - /* make sure the amount we're copying doesn't exceed the limit */ - entrySize = *infoSize; - } - memcpy(head, &(entry->size), entrySize); - head += *infoSize; - } - - dlfree(list); - -done: - // debug_log("+++++ done!\n"); - pthread_mutex_unlock(&gAllocationsMutex); -} - -void free_malloc_leak_info(uint8_t* info) -{ - dlfree(info); -} - -struct mallinfo mallinfo() -{ - return dlmallinfo(); -} - -void* valloc(size_t bytes) { - /* assume page size of 4096 bytes */ - return memalign( getpagesize(), bytes ); -} - - -/* - * Code guarded by MALLOC_LEAK_CHECK is only needed when malloc check is - * enabled. Currently we exclude them in libc.so, and only include them in - * libc_debug.so. - */ -#ifdef MALLOC_LEAK_CHECK -#define MALLOC_ALIGNMENT 8 -#define GUARD 0x48151642 - -#define DEBUG 0 - -// ============================================================================= -// Structures -// ============================================================================= -typedef struct AllocationEntry AllocationEntry; -struct AllocationEntry { - HashEntry* entry; - uint32_t guard; -}; - -// ============================================================================= -// log funtions -// ============================================================================= - -#define debug_log(format, ...) \ - __libc_android_log_print(ANDROID_LOG_DEBUG, "malloc_leak", (format), ##__VA_ARGS__ ) - -// ============================================================================= -// Hash Table functions -// ============================================================================= -static uint32_t get_hash(intptr_t* backtrace, size_t numEntries) -{ - if (backtrace == NULL) return 0; - - int hash = 0; - size_t i; - for (i = 0 ; i < numEntries ; i++) { - hash = (hash * 33) + (backtrace[i] >> 2); - } - - return hash; -} - -static HashEntry* find_entry(HashTable* table, int slot, - intptr_t* backtrace, size_t numEntries, size_t size) -{ - HashEntry* entry = table->slots[slot]; - while (entry != NULL) { - //debug_log("backtrace: %p, entry: %p entry->backtrace: %p\n", - // backtrace, entry, (entry != NULL) ? entry->backtrace : NULL); - /* - * See if the entry matches exactly. We compare the "size" field, - * including the flag bits. - */ - if (entry->size == size && entry->numEntries == numEntries && - !memcmp(backtrace, entry->backtrace, numEntries * sizeof(intptr_t))) { - return entry; - } - - entry = entry->next; - } - - return NULL; -} - -static HashEntry* record_backtrace(intptr_t* backtrace, size_t numEntries, size_t size) -{ - size_t hash = get_hash(backtrace, numEntries); - size_t slot = hash % HASHTABLE_SIZE; - - if (size & SIZE_FLAG_MASK) { - debug_log("malloc_debug: allocation %zx exceeds bit width\n", size); - abort(); - } - - if (gMallocLeakZygoteChild) - size |= SIZE_FLAG_ZYGOTE_CHILD; - - HashEntry* entry = find_entry(&gHashTable, slot, backtrace, numEntries, size); - - if (entry != NULL) { - entry->allocations++; - } else { - // create a new entry - entry = (HashEntry*)dlmalloc(sizeof(HashEntry) + numEntries*sizeof(intptr_t)); - entry->allocations = 1; - entry->slot = slot; - entry->prev = NULL; - entry->next = gHashTable.slots[slot]; - entry->numEntries = numEntries; - entry->size = size; - - memcpy(entry->backtrace, backtrace, numEntries * sizeof(intptr_t)); - - gHashTable.slots[slot] = entry; - - if (entry->next != NULL) { - entry->next->prev = entry; - } - - // we just added an entry, increase the size of the hashtable - gHashTable.count++; - } - - return entry; -} - -static int is_valid_entry(HashEntry* entry) -{ - if (entry != NULL) { - int i; - for (i = 0 ; i < HASHTABLE_SIZE ; i++) { - HashEntry* e1 = gHashTable.slots[i]; - - while (e1 != NULL) { - if (e1 == entry) { - return 1; - } - - e1 = e1->next; - } - } - } - - return 0; -} - -static void remove_entry(HashEntry* entry) -{ - HashEntry* prev = entry->prev; - HashEntry* next = entry->next; - - if (prev != NULL) entry->prev->next = next; - if (next != NULL) entry->next->prev = prev; - - if (prev == NULL) { - // we are the head of the list. set the head to be next - gHashTable.slots[entry->slot] = entry->next; - } - - // we just removed and entry, decrease the size of the hashtable - gHashTable.count--; -} - - -// ============================================================================= -// stack trace functions -// ============================================================================= - -typedef struct -{ - size_t count; - intptr_t* addrs; -} stack_crawl_state_t; - - -/* depends how the system includes define this */ -#ifdef HAVE_UNWIND_CONTEXT_STRUCT -typedef struct _Unwind_Context __unwind_context; -#else -typedef _Unwind_Context __unwind_context; -#endif - -static _Unwind_Reason_Code trace_function(__unwind_context *context, void *arg) -{ - stack_crawl_state_t* state = (stack_crawl_state_t*)arg; - if (state->count) { - intptr_t ip = (intptr_t)_Unwind_GetIP(context); - if (ip) { - state->addrs[0] = ip; - state->addrs++; - state->count--; - return _URC_NO_REASON; - } - } - /* - * If we run out of space to record the address or 0 has been seen, stop - * unwinding the stack. - */ - return _URC_END_OF_STACK; -} - -static inline -int get_backtrace(intptr_t* addrs, size_t max_entries) -{ - stack_crawl_state_t state; - state.count = max_entries; - state.addrs = (intptr_t*)addrs; - _Unwind_Backtrace(trace_function, (void*)&state); - return max_entries - state.count; -} - -// ============================================================================= -// malloc leak function dispatcher -// ============================================================================= - -static void* leak_malloc(size_t bytes); -static void leak_free(void* mem); -static void* leak_calloc(size_t n_elements, size_t elem_size); -static void* leak_realloc(void* oldMem, size_t bytes); -static void* leak_memalign(size_t alignment, size_t bytes); - -static void* fill_malloc(size_t bytes); -static void fill_free(void* mem); -static void* fill_realloc(void* oldMem, size_t bytes); -static void* fill_memalign(size_t alignment, size_t bytes); - -static void* chk_malloc(size_t bytes); -static void chk_free(void* mem); -static void* chk_calloc(size_t n_elements, size_t elem_size); -static void* chk_realloc(void* oldMem, size_t bytes); -static void* chk_memalign(size_t alignment, size_t bytes); - -typedef struct { - void* (*malloc)(size_t bytes); - void (*free)(void* mem); - void* (*calloc)(size_t n_elements, size_t elem_size); - void* (*realloc)(void* oldMem, size_t bytes); - void* (*memalign)(size_t alignment, size_t bytes); -} MallocDebug; - -static const MallocDebug gMallocEngineTable[] __attribute__((aligned(32))) = -{ - { dlmalloc, dlfree, dlcalloc, dlrealloc, dlmemalign }, - { leak_malloc, leak_free, leak_calloc, leak_realloc, leak_memalign }, - { fill_malloc, fill_free, dlcalloc, fill_realloc, fill_memalign }, - { chk_malloc, chk_free, chk_calloc, chk_realloc, chk_memalign } -}; - -enum { - INDEX_NORMAL = 0, - INDEX_LEAK_CHECK, - INDEX_MALLOC_FILL, - INDEX_MALLOC_CHECK, -}; - -static MallocDebug const * gMallocDispatch = &gMallocEngineTable[INDEX_NORMAL]; -static int gMallocDebugLevel; -static int gTrapOnError = 1; - -void* malloc(size_t bytes) { - return gMallocDispatch->malloc(bytes); -} -void free(void* mem) { - gMallocDispatch->free(mem); -} -void* calloc(size_t n_elements, size_t elem_size) { - return gMallocDispatch->calloc(n_elements, elem_size); -} -void* realloc(void* oldMem, size_t bytes) { - return gMallocDispatch->realloc(oldMem, bytes); -} -void* memalign(size_t alignment, size_t bytes) { - return gMallocDispatch->memalign(alignment, bytes); -} - -// ============================================================================= -// malloc check functions -// ============================================================================= - -#define CHK_FILL_FREE 0xef -#define CHK_SENTINEL_VALUE 0xeb -#define CHK_SENTINEL_HEAD_SIZE 16 -#define CHK_SENTINEL_TAIL_SIZE 16 -#define CHK_OVERHEAD_SIZE ( CHK_SENTINEL_HEAD_SIZE + \ - CHK_SENTINEL_TAIL_SIZE + \ - sizeof(size_t) ) - -static void dump_stack_trace() -{ - intptr_t addrs[20]; - int c = get_backtrace(addrs, 20); - char buf[16]; - char tmp[16*20]; - int i; - - tmp[0] = 0; // Need to initialize tmp[0] for the first strcat - for (i=0 ; i=0 ; i--) { - if (buf[i] != CHK_SENTINEL_VALUE) { - gMallocDispatch = &gMallocEngineTable[INDEX_NORMAL]; - __libc_android_log_print(ANDROID_LOG_ERROR, "libc", - "*** MALLOC CHECK: buffer %p, size=%lu, " - "corrupted %d bytes after allocation", - buffer, size, i+1); - dump_stack_trace(); - if (gTrapOnError) { - __builtin_trap(); - } - gMallocDispatch = &gMallocEngineTable[INDEX_MALLOC_CHECK]; - } - } -} - -void* chk_malloc(size_t bytes) -{ - char* buffer = (char*)dlmalloc(bytes + CHK_OVERHEAD_SIZE); - if (buffer) { - pthread_mutex_lock(&gAllocationsMutex); - memset(buffer, CHK_SENTINEL_VALUE, bytes + CHK_OVERHEAD_SIZE); - size_t offset = dlmalloc_usable_size(buffer) - sizeof(size_t); - *(size_t *)(buffer + offset) = bytes; - buffer += CHK_SENTINEL_HEAD_SIZE; - pthread_mutex_unlock(&gAllocationsMutex); - } - return buffer; -} - -void chk_free(void* mem) -{ - assert_valid_malloc_pointer(mem); - if (mem) { - pthread_mutex_lock(&gAllocationsMutex); - char* buffer = (char*)mem - CHK_SENTINEL_HEAD_SIZE; - size_t offset = dlmalloc_usable_size(buffer) - sizeof(size_t); - size_t bytes = *(size_t *)(buffer + offset); - chk_out_of_bounds_check__locked(mem, bytes); - pthread_mutex_unlock(&gAllocationsMutex); - memset(buffer, CHK_FILL_FREE, bytes); - dlfree(buffer); - } -} - -void* chk_calloc(size_t n_elements, size_t elem_size) -{ - size_t size; - void* ptr; - - /* Fail on overflow - just to be safe even though this code runs only - * within the debugging C library, not the production one */ - if (n_elements && MAX_SIZE_T / n_elements < elem_size) { - return NULL; - } - size = n_elements * elem_size; - ptr = chk_malloc(size); - if (ptr != NULL) { - memset(ptr, 0, size); - } - return ptr; -} - -void* chk_realloc(void* mem, size_t bytes) -{ - assert_valid_malloc_pointer(mem); - char* new_buffer = chk_malloc(bytes); - if (mem == NULL) { - return new_buffer; - } - - pthread_mutex_lock(&gAllocationsMutex); - char* buffer = (char*)mem - CHK_SENTINEL_HEAD_SIZE; - size_t offset = dlmalloc_usable_size(buffer) - sizeof(size_t); - size_t old_bytes = *(size_t *)(buffer + offset); - chk_out_of_bounds_check__locked(mem, old_bytes); - pthread_mutex_unlock(&gAllocationsMutex); - - if (new_buffer) { - size_t size = (bytes < old_bytes)?(bytes):(old_bytes); - memcpy(new_buffer, mem, size); - chk_free(mem); - } - - return new_buffer; -} - -void* chk_memalign(size_t alignment, size_t bytes) -{ - // XXX: it's better to use malloc, than being wrong - return chk_malloc(bytes); -} - -// ============================================================================= -// malloc fill functions -// ============================================================================= - -void* fill_malloc(size_t bytes) -{ - void* buffer = dlmalloc(bytes); - if (buffer) { - memset(buffer, CHK_SENTINEL_VALUE, bytes); - } - return buffer; -} - -void fill_free(void* mem) -{ - size_t bytes = dlmalloc_usable_size(mem); - memset(mem, CHK_FILL_FREE, bytes); - dlfree(mem); -} - -void* fill_realloc(void* mem, size_t bytes) -{ - void* buffer = fill_malloc(bytes); - if (mem == NULL) { - return buffer; - } - if (buffer) { - size_t old_size = dlmalloc_usable_size(mem); - size_t size = (bytes < old_size)?(bytes):(old_size); - memcpy(buffer, mem, size); - fill_free(mem); - } - return buffer; -} - -void* fill_memalign(size_t alignment, size_t bytes) -{ - void* buffer = dlmemalign(alignment, bytes); - if (buffer) { - memset(buffer, CHK_SENTINEL_VALUE, bytes); - } - return buffer; -} - -// ============================================================================= -// malloc leak functions -// ============================================================================= - -#define MEMALIGN_GUARD ((void*)0xA1A41520) - -void* leak_malloc(size_t bytes) -{ - // allocate enough space infront of the allocation to store the pointer for - // the alloc structure. This will making free'ing the structer really fast! - - // 1. allocate enough memory and include our header - // 2. set the base pointer to be right after our header - - void* base = dlmalloc(bytes + sizeof(AllocationEntry)); - if (base != NULL) { - pthread_mutex_lock(&gAllocationsMutex); - - intptr_t backtrace[BACKTRACE_SIZE]; - size_t numEntries = get_backtrace(backtrace, BACKTRACE_SIZE); - - AllocationEntry* header = (AllocationEntry*)base; - header->entry = record_backtrace(backtrace, numEntries, bytes); - header->guard = GUARD; - - // now increment base to point to after our header. - // this should just work since our header is 8 bytes. - base = (AllocationEntry*)base + 1; - - pthread_mutex_unlock(&gAllocationsMutex); - } - - return base; -} - -void leak_free(void* mem) -{ - if (mem != NULL) { - pthread_mutex_lock(&gAllocationsMutex); - - // check the guard to make sure it is valid - AllocationEntry* header = (AllocationEntry*)mem - 1; - - if (header->guard != GUARD) { - // could be a memaligned block - if (((void**)mem)[-1] == MEMALIGN_GUARD) { - mem = ((void**)mem)[-2]; - header = (AllocationEntry*)mem - 1; - } - } - - if (header->guard == GUARD || is_valid_entry(header->entry)) { - // decrement the allocations - HashEntry* entry = header->entry; - entry->allocations--; - if (entry->allocations <= 0) { - remove_entry(entry); - dlfree(entry); - } - - // now free the memory! - dlfree(header); - } else { - debug_log("WARNING bad header guard: '0x%x'! and invalid entry: %p\n", - header->guard, header->entry); - } - - pthread_mutex_unlock(&gAllocationsMutex); - } -} - -void* leak_calloc(size_t n_elements, size_t elem_size) -{ - size_t size; - void* ptr; - - /* Fail on overflow - just to be safe even though this code runs only - * within the debugging C library, not the production one */ - if (n_elements && MAX_SIZE_T / n_elements < elem_size) { - return NULL; - } - size = n_elements * elem_size; - ptr = leak_malloc(size); - if (ptr != NULL) { - memset(ptr, 0, size); - } - return ptr; -} - -void* leak_realloc(void* oldMem, size_t bytes) -{ - if (oldMem == NULL) { - return leak_malloc(bytes); - } - void* newMem = NULL; - AllocationEntry* header = (AllocationEntry*)oldMem - 1; - if (header && header->guard == GUARD) { - size_t oldSize = header->entry->size & ~SIZE_FLAG_MASK; - newMem = leak_malloc(bytes); - if (newMem != NULL) { - size_t copySize = (oldSize <= bytes) ? oldSize : bytes; - memcpy(newMem, oldMem, copySize); - leak_free(oldMem); - } - } else { - newMem = dlrealloc(oldMem, bytes); - } - return newMem; -} - -void* leak_memalign(size_t alignment, size_t bytes) -{ - // we can just use malloc - if (alignment <= MALLOC_ALIGNMENT) - return leak_malloc(bytes); - - // need to make sure it's a power of two - if (alignment & (alignment-1)) - alignment = 1L << (31 - __builtin_clz(alignment)); - - // here, aligment is at least MALLOC_ALIGNMENT<<1 bytes - // we will align by at least MALLOC_ALIGNMENT bytes - // and at most alignment-MALLOC_ALIGNMENT bytes - size_t size = (alignment-MALLOC_ALIGNMENT) + bytes; - void* base = leak_malloc(size); - if (base != NULL) { - intptr_t ptr = (intptr_t)base; - if ((ptr % alignment) == 0) - return base; - - // align the pointer - ptr += ((-ptr) % alignment); - - // there is always enough space for the base pointer and the guard - ((void**)ptr)[-1] = MEMALIGN_GUARD; - ((void**)ptr)[-2] = base; - - return (void*)ptr; - } - return base; -} -#endif /* MALLOC_LEAK_CHECK */ - -// called from libc_init() -extern char* __progname; - -void malloc_debug_init() -{ - unsigned int level = 0; -#ifdef MALLOC_LEAK_CHECK - // if MALLOC_LEAK_CHECK is enabled, use level=1 by default - level = 1; -#endif - char env[PROP_VALUE_MAX]; - int len = __system_property_get("libc.debug.malloc", env); - - if (len) { - level = atoi(env); -#ifndef MALLOC_LEAK_CHECK - /* Alert the user that libc_debug.so needs to be installed as libc.so - * when performing malloc checks. - */ - if (level != 0) { - __libc_android_log_print(ANDROID_LOG_INFO, "libc", - "Malloc checks need libc_debug.so pushed to the device!\n"); - - } -#endif - } - -#ifdef MALLOC_LEAK_CHECK - gMallocDebugLevel = level; - switch (level) { - default: - case 0: - gMallocDispatch = &gMallocEngineTable[INDEX_NORMAL]; - break; - case 1: - __libc_android_log_print(ANDROID_LOG_INFO, "libc", - "%s using MALLOC_DEBUG = %d (leak checker)\n", - __progname, level); - gMallocDispatch = &gMallocEngineTable[INDEX_LEAK_CHECK]; - break; - case 5: - __libc_android_log_print(ANDROID_LOG_INFO, "libc", - "%s using MALLOC_DEBUG = %d (fill)\n", - __progname, level); - gMallocDispatch = &gMallocEngineTable[INDEX_MALLOC_FILL]; - break; - case 10: - __libc_android_log_print(ANDROID_LOG_INFO, "libc", - "%s using MALLOC_DEBUG = %d (sentinels, fill)\n", - __progname, level); - gMallocDispatch = &gMallocEngineTable[INDEX_MALLOC_CHECK]; - break; - } -#endif -} diff --git a/libc/bionic/md5.c b/libc/bionic/md5.c deleted file mode 100644 index 087786ff3..000000000 --- a/libc/bionic/md5.c +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" - -__RCSID("$Heimdal: md5.c,v 1.15 2001/01/29 04:33:44 assar Exp $" - "$NetBSD: md5.c,v 1.1.1.4 2002/09/12 12:41:42 joda Exp $"); -#endif - -#include "md5.h" -#include "hash.h" - -#define A m->counter[0] -#define B m->counter[1] -#define C m->counter[2] -#define D m->counter[3] -#define X data - -void -MD5_Init (struct md5 *m) -{ - m->sz[0] = 0; - m->sz[1] = 0; - D = 0x10325476; - C = 0x98badcfe; - B = 0xefcdab89; - A = 0x67452301; -} - -#define F(x,y,z) CRAYFIX((x & y) | (~x & z)) -#define G(x,y,z) CRAYFIX((x & z) | (y & ~z)) -#define H(x,y,z) (x ^ y ^ z) -#define I(x,y,z) CRAYFIX(y ^ (x | ~z)) - -#define DOIT(a,b,c,d,k,s,i,OP) \ -a = b + cshift(a + OP(b,c,d) + X[k] + (i), s) - -#define DO1(a,b,c,d,k,s,i) DOIT(a,b,c,d,k,s,i,F) -#define DO2(a,b,c,d,k,s,i) DOIT(a,b,c,d,k,s,i,G) -#define DO3(a,b,c,d,k,s,i) DOIT(a,b,c,d,k,s,i,H) -#define DO4(a,b,c,d,k,s,i) DOIT(a,b,c,d,k,s,i,I) - -static inline void -calc (struct md5 *m, u_int32_t *data) -{ - u_int32_t AA, BB, CC, DD; - - AA = A; - BB = B; - CC = C; - DD = D; - - /* Round 1 */ - - DO1(A,B,C,D,0,7,0xd76aa478); - DO1(D,A,B,C,1,12,0xe8c7b756); - DO1(C,D,A,B,2,17,0x242070db); - DO1(B,C,D,A,3,22,0xc1bdceee); - - DO1(A,B,C,D,4,7,0xf57c0faf); - DO1(D,A,B,C,5,12,0x4787c62a); - DO1(C,D,A,B,6,17,0xa8304613); - DO1(B,C,D,A,7,22,0xfd469501); - - DO1(A,B,C,D,8,7,0x698098d8); - DO1(D,A,B,C,9,12,0x8b44f7af); - DO1(C,D,A,B,10,17,0xffff5bb1); - DO1(B,C,D,A,11,22,0x895cd7be); - - DO1(A,B,C,D,12,7,0x6b901122); - DO1(D,A,B,C,13,12,0xfd987193); - DO1(C,D,A,B,14,17,0xa679438e); - DO1(B,C,D,A,15,22,0x49b40821); - - /* Round 2 */ - - DO2(A,B,C,D,1,5,0xf61e2562); - DO2(D,A,B,C,6,9,0xc040b340); - DO2(C,D,A,B,11,14,0x265e5a51); - DO2(B,C,D,A,0,20,0xe9b6c7aa); - - DO2(A,B,C,D,5,5,0xd62f105d); - DO2(D,A,B,C,10,9,0x2441453); - DO2(C,D,A,B,15,14,0xd8a1e681); - DO2(B,C,D,A,4,20,0xe7d3fbc8); - - DO2(A,B,C,D,9,5,0x21e1cde6); - DO2(D,A,B,C,14,9,0xc33707d6); - DO2(C,D,A,B,3,14,0xf4d50d87); - DO2(B,C,D,A,8,20,0x455a14ed); - - DO2(A,B,C,D,13,5,0xa9e3e905); - DO2(D,A,B,C,2,9,0xfcefa3f8); - DO2(C,D,A,B,7,14,0x676f02d9); - DO2(B,C,D,A,12,20,0x8d2a4c8a); - - /* Round 3 */ - - DO3(A,B,C,D,5,4,0xfffa3942); - DO3(D,A,B,C,8,11,0x8771f681); - DO3(C,D,A,B,11,16,0x6d9d6122); - DO3(B,C,D,A,14,23,0xfde5380c); - - DO3(A,B,C,D,1,4,0xa4beea44); - DO3(D,A,B,C,4,11,0x4bdecfa9); - DO3(C,D,A,B,7,16,0xf6bb4b60); - DO3(B,C,D,A,10,23,0xbebfbc70); - - DO3(A,B,C,D,13,4,0x289b7ec6); - DO3(D,A,B,C,0,11,0xeaa127fa); - DO3(C,D,A,B,3,16,0xd4ef3085); - DO3(B,C,D,A,6,23,0x4881d05); - - DO3(A,B,C,D,9,4,0xd9d4d039); - DO3(D,A,B,C,12,11,0xe6db99e5); - DO3(C,D,A,B,15,16,0x1fa27cf8); - DO3(B,C,D,A,2,23,0xc4ac5665); - - /* Round 4 */ - - DO4(A,B,C,D,0,6,0xf4292244); - DO4(D,A,B,C,7,10,0x432aff97); - DO4(C,D,A,B,14,15,0xab9423a7); - DO4(B,C,D,A,5,21,0xfc93a039); - - DO4(A,B,C,D,12,6,0x655b59c3); - DO4(D,A,B,C,3,10,0x8f0ccc92); - DO4(C,D,A,B,10,15,0xffeff47d); - DO4(B,C,D,A,1,21,0x85845dd1); - - DO4(A,B,C,D,8,6,0x6fa87e4f); - DO4(D,A,B,C,15,10,0xfe2ce6e0); - DO4(C,D,A,B,6,15,0xa3014314); - DO4(B,C,D,A,13,21,0x4e0811a1); - - DO4(A,B,C,D,4,6,0xf7537e82); - DO4(D,A,B,C,11,10,0xbd3af235); - DO4(C,D,A,B,2,15,0x2ad7d2bb); - DO4(B,C,D,A,9,21,0xeb86d391); - - A += AA; - B += BB; - C += CC; - D += DD; -} - -/* - * From `Performance analysis of MD5' by Joseph D. Touch - */ - -#if defined(WORDS_BIGENDIAN) -static inline u_int32_t -swap_u_int32_t (u_int32_t t) -{ - u_int32_t temp1, temp2; - - temp1 = cshift(t, 16); - temp2 = temp1 >> 8; - temp1 &= 0x00ff00ff; - temp2 &= 0x00ff00ff; - temp1 <<= 8; - return temp1 | temp2; -} -#endif - -struct x32{ - unsigned int a:32; - unsigned int b:32; -}; - -void -MD5_Update (struct md5 *m, const void *v, size_t len) -{ - const unsigned char *p = v; - size_t old_sz = m->sz[0]; - size_t offset; - - m->sz[0] += len * 8; - if (m->sz[0] < old_sz) - ++m->sz[1]; - offset = (old_sz / 8) % 64; - while(len > 0){ - size_t l = min(len, 64 - offset); - memcpy(m->save + offset, p, l); - offset += l; - p += l; - len -= l; - if(offset == 64){ -#if defined(WORDS_BIGENDIAN) - int i; - u_int32_t current[16]; - struct x32 *u = (struct x32*)m->save; - for(i = 0; i < 8; i++){ - current[2*i+0] = swap_u_int32_t(u[i].a); - current[2*i+1] = swap_u_int32_t(u[i].b); - } - calc(m, current); -#else - calc(m, (u_int32_t*)m->save); -#endif - offset = 0; - } - } -} - -void -MD5_Final (void *res, struct md5 *m) -{ - static unsigned char zeros[72]; - unsigned offset = (m->sz[0] / 8) % 64; - unsigned int dstart = (120 - offset - 1) % 64 + 1; - - *zeros = 0x80; - memset (zeros + 1, 0, sizeof(zeros) - 1); - zeros[dstart+0] = (m->sz[0] >> 0) & 0xff; - zeros[dstart+1] = (m->sz[0] >> 8) & 0xff; - zeros[dstart+2] = (m->sz[0] >> 16) & 0xff; - zeros[dstart+3] = (m->sz[0] >> 24) & 0xff; - zeros[dstart+4] = (m->sz[1] >> 0) & 0xff; - zeros[dstart+5] = (m->sz[1] >> 8) & 0xff; - zeros[dstart+6] = (m->sz[1] >> 16) & 0xff; - zeros[dstart+7] = (m->sz[1] >> 24) & 0xff; - MD5_Update (m, zeros, dstart + 8); - { - int i; - unsigned char *r = (unsigned char *)res; - - for (i = 0; i < 4; ++i) { - r[4*i] = m->counter[i] & 0xFF; - r[4*i+1] = (m->counter[i] >> 8) & 0xFF; - r[4*i+2] = (m->counter[i] >> 16) & 0xFF; - r[4*i+3] = (m->counter[i] >> 24) & 0xFF; - } - } -#if 0 - { - int i; - u_int32_t *r = (u_int32_t *)res; - - for (i = 0; i < 4; ++i) - r[i] = swap_u_int32_t (m->counter[i]); - } -#endif -} diff --git a/libc/bionic/md5.h b/libc/bionic/md5.h deleted file mode 100644 index a381994ef..000000000 --- a/libc/bionic/md5.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* $Heimdal: md5.h,v 1.8 2001/01/29 02:08:57 assar Exp $ - $NetBSD: md5.h,v 1.1.1.4 2002/09/12 12:41:42 joda Exp $ */ - -#include -#include - -struct md5 { - unsigned int sz[2]; - u_int32_t counter[4]; - unsigned char save[64]; -}; - -typedef struct md5 MD5_CTX; - -void MD5_Init (struct md5 *m); -void MD5_Update (struct md5 *m, const void *p, size_t len); -void MD5_Final (void *res, struct md5 *m); /* u_int32_t res[4] */ diff --git a/libc/bionic/pthread-timers.c b/libc/bionic/pthread-timers.c deleted file mode 100644 index 818b47dd8..000000000 --- a/libc/bionic/pthread-timers.c +++ /dev/null @@ -1,636 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include "pthread_internal.h" -#include -#include -#include - -/* This file implements the support required to implement SIGEV_THREAD posix - * timers. See the following pages for additionnal details: - * - * www.opengroup.org/onlinepubs/000095399/functions/timer_create.html - * www.opengroup.org/onlinepubs/000095399/functions/timer_settime.html - * www.opengroup.org/onlinepubs/000095399/functions/xsh_chap02_04.html#tag_02_04_01 - * - * The Linux kernel doesn't support these, so we need to implement them in the - * C library. We use a very basic scheme where each timer is associated to a - * thread that will loop, waiting for timeouts or messages from the program - * corresponding to calls to timer_settime() and timer_delete(). - * - * Note also an important thing: Posix mandates that in the case of fork(), - * the timers of the child process should be disarmed, but not deleted. - * this is implemented by providing a fork() wrapper (see bionic/fork.c) which - * stops all timers before the fork, and only re-start them in case of error - * or in the parent process. - * - * the stop/start is implemented by the __timer_table_start_stop() function - * below. - */ - -/* normal (i.e. non-SIGEV_THREAD) timer ids are created directly by the kernel - * and are passed as is to/from the caller. - * - * on the other hand, a SIGEV_THREAD timer ID will have its TIMER_ID_WRAP_BIT - * always set to 1. In this implementation, this is always bit 31, which is - * guaranteed to never be used by kernel-provided timer ids - * - * (see code in /lib/idr.c, used to manage IDs, to see why) - */ - -#define TIMER_ID_WRAP_BIT 0x80000000 -#define TIMER_ID_WRAP(id) ((timer_t)((id) | TIMER_ID_WRAP_BIT)) -#define TIMER_ID_UNWRAP(id) ((timer_t)((id) & ~TIMER_ID_WRAP_BIT)) -#define TIMER_ID_IS_WRAPPED(id) (((id) & TIMER_ID_WRAP_BIT) != 0) - -/* this value is used internally to indicate a 'free' or 'zombie' - * thr_timer structure. Here, 'zombie' means that timer_delete() - * has been called, but that the corresponding thread hasn't - * exited yet. - */ -#define TIMER_ID_NONE ((timer_t)0xffffffff) - -/* True iff a timer id is valid */ -#define TIMER_ID_IS_VALID(id) ((id) != TIMER_ID_NONE) - -/* the maximum value of overrun counters */ -#define DELAYTIMER_MAX 0x7fffffff - -#define __likely(x) __builtin_expect(!!(x),1) -#define __unlikely(x) __builtin_expect(!!(x),0) - -typedef struct thr_timer thr_timer_t; -typedef struct thr_timer_table thr_timer_table_t; - -/* The Posix spec says the function receives an unsigned parameter, but - * it's really a 'union sigval' a.k.a. sigval_t */ -typedef void (*thr_timer_func_t)( sigval_t ); - -struct thr_timer { - thr_timer_t* next; /* next in free list */ - timer_t id; /* TIMER_ID_NONE iff free or dying */ - clockid_t clock; - pthread_t thread; - pthread_attr_t attributes; - thr_timer_func_t callback; - sigval_t value; - - /* the following are used to communicate between - * the timer thread and the timer_XXX() functions - */ - pthread_mutex_t mutex; /* lock */ - pthread_cond_t cond; /* signal a state change to thread */ - int volatile done; /* set by timer_delete */ - int volatile stopped; /* set by _start_stop() */ - struct timespec volatile expires; /* next expiration time, or 0 */ - struct timespec volatile period; /* reload value, or 0 */ - int volatile overruns; /* current number of overruns */ -}; - -#define MAX_THREAD_TIMERS 32 - -struct thr_timer_table { - pthread_mutex_t lock; - thr_timer_t* free_timer; - thr_timer_t timers[ MAX_THREAD_TIMERS ]; -}; - -/** GLOBAL TABLE OF THREAD TIMERS - **/ - -static void -thr_timer_table_init( thr_timer_table_t* t ) -{ - int nn; - - memset(t, 0, sizeof *t); - pthread_mutex_init( &t->lock, NULL ); - - for (nn = 0; nn < MAX_THREAD_TIMERS; nn++) - t->timers[nn].id = TIMER_ID_NONE; - - t->free_timer = &t->timers[0]; - for (nn = 1; nn < MAX_THREAD_TIMERS; nn++) - t->timers[nn-1].next = &t->timers[nn]; -} - - -static thr_timer_t* -thr_timer_table_alloc( thr_timer_table_t* t ) -{ - thr_timer_t* timer; - - if (t == NULL) - return NULL; - - pthread_mutex_lock(&t->lock); - timer = t->free_timer; - if (timer != NULL) { - t->free_timer = timer->next; - timer->next = NULL; - timer->id = TIMER_ID_WRAP((timer - t->timers)); - } - pthread_mutex_unlock(&t->lock); - return timer; -} - - -static void -thr_timer_table_free( thr_timer_table_t* t, thr_timer_t* timer ) -{ - pthread_mutex_lock( &t->lock ); - timer->id = TIMER_ID_NONE; - timer->thread = 0; - timer->next = t->free_timer; - t->free_timer = timer; - pthread_mutex_unlock( &t->lock ); -} - - -static void -thr_timer_table_start_stop( thr_timer_table_t* t, int stop ) -{ - int nn; - - pthread_mutex_lock(&t->lock); - - for (nn = 0; nn < MAX_THREAD_TIMERS; nn++) { - thr_timer_t* timer = &t->timers[nn]; - - if (TIMER_ID_IS_VALID(timer->id)) { - /* tell the thread to start/stop */ - pthread_mutex_lock(&timer->mutex); - timer->stopped = stop; - pthread_cond_signal( &timer->cond ); - pthread_mutex_unlock(&timer->mutex); - } - } - pthread_mutex_unlock(&t->lock); -} - - -/* convert a timer_id into the corresponding thr_timer_t* pointer - * returns NULL if the id is not wrapped or is invalid/free - */ -static thr_timer_t* -thr_timer_table_from_id( thr_timer_table_t* t, - timer_t id, - int remove ) -{ - unsigned index; - thr_timer_t* timer; - - if (t == NULL || !TIMER_ID_IS_WRAPPED(id)) - return NULL; - - index = (unsigned) TIMER_ID_UNWRAP(id); - if (index >= MAX_THREAD_TIMERS) - return NULL; - - pthread_mutex_lock(&t->lock); - - timer = &t->timers[index]; - - if (!TIMER_ID_IS_VALID(timer->id)) { - timer = NULL; - } else { - /* if we're removing this timer, clear the id - * right now to prevent another thread to - * use the same id after the unlock */ - if (remove) - timer->id = TIMER_ID_NONE; - } - pthread_mutex_unlock(&t->lock); - - return timer; -} - -/* the static timer table - we only create it if the process - * really wants to use SIGEV_THREAD timers, which should be - * pretty infrequent - */ - -static pthread_once_t __timer_table_once = PTHREAD_ONCE_INIT; -static thr_timer_table_t* __timer_table; - -static void -__timer_table_init( void ) -{ - __timer_table = calloc(1,sizeof(*__timer_table)); - - if (__timer_table != NULL) - thr_timer_table_init( __timer_table ); -} - -static thr_timer_table_t* -__timer_table_get(void) -{ - pthread_once( &__timer_table_once, __timer_table_init ); - return __timer_table; -} - -/** POSIX THREAD TIMERS CLEANUP ON FORK - ** - ** this should be called from the 'fork()' wrapper to stop/start - ** all active thread timers. this is used to implement a Posix - ** requirements: the timers of fork child processes must be - ** disarmed but not deleted. - **/ -void -__timer_table_start_stop( int stop ) -{ - if (__timer_table != NULL) { - thr_timer_table_t* table = __timer_table_get(); - thr_timer_table_start_stop(table, stop); - } -} - -static thr_timer_t* -thr_timer_from_id( timer_t id ) -{ - thr_timer_table_t* table = __timer_table_get(); - thr_timer_t* timer = thr_timer_table_from_id( table, id, 0 ); - - return timer; -} - - -static __inline__ void -thr_timer_lock( thr_timer_t* t ) -{ - pthread_mutex_lock(&t->mutex); -} - -static __inline__ void -thr_timer_unlock( thr_timer_t* t ) -{ - pthread_mutex_unlock(&t->mutex); -} - -/** POSIX TIMERS APIs */ - -/* first, declare the syscall stubs */ -extern int __timer_create( clockid_t, struct sigevent*, timer_t* ); -extern int __timer_delete( timer_t ); -extern int __timer_gettime( timer_t, struct itimerspec* ); -extern int __timer_settime( timer_t, int, const struct itimerspec*, struct itimerspec* ); -extern int __timer_getoverrun(timer_t); - -static void* timer_thread_start( void* ); - -/* then the wrappers themselves */ -int -timer_create( clockid_t clockid, struct sigevent* evp, timer_t *ptimerid) -{ - /* if not a SIGEV_THREAD timer, direct creation by the kernel */ - if (__likely(evp == NULL || evp->sigev_notify != SIGEV_THREAD)) - return __timer_create( clockid, evp, ptimerid ); - - // check arguments - if (evp->sigev_notify_function == NULL) { - errno = EINVAL; - return -1; - } - - { - struct timespec dummy; - - /* check that the clock id is supported by the kernel */ - if (clock_gettime( clockid, &dummy ) < 0 && errno == EINVAL ) - return -1; - } - - /* create a new timer and its thread */ - { - thr_timer_table_t* table = __timer_table_get(); - thr_timer_t* timer = thr_timer_table_alloc( table ); - struct sigevent evp0; - - if (timer == NULL) { - errno = ENOMEM; - return -1; - } - - /* copy the thread attributes */ - if (evp->sigev_notify_attributes == NULL) { - pthread_attr_init(&timer->attributes); - } - else { - timer->attributes = ((pthread_attr_t*)evp->sigev_notify_attributes)[0]; - } - - /* Posix says that the default is PTHREAD_CREATE_DETACHED and - * that PTHREAD_CREATE_JOINABLE has undefined behaviour. - * So simply always use DETACHED :-) - */ - pthread_attr_setdetachstate(&timer->attributes, PTHREAD_CREATE_DETACHED); - - timer->callback = evp->sigev_notify_function; - timer->value = evp->sigev_value; - timer->clock = clockid; - - pthread_mutex_init( &timer->mutex, NULL ); - pthread_cond_init( &timer->cond, NULL ); - - timer->done = 0; - timer->stopped = 0; - timer->expires.tv_sec = timer->expires.tv_nsec = 0; - timer->period.tv_sec = timer->period.tv_nsec = 0; - timer->overruns = 0; - - /* create the thread */ - if (pthread_create( &timer->thread, &timer->attributes, timer_thread_start, timer ) < 0) { - thr_timer_table_free( __timer_table, timer ); - errno = ENOMEM; - return -1; - } - - *ptimerid = timer->id; - return 0; - } -} - - -int -timer_delete( timer_t id ) -{ - if ( __likely(!TIMER_ID_IS_WRAPPED(id)) ) - return __timer_delete( id ); - else - { - thr_timer_table_t* table = __timer_table_get(); - thr_timer_t* timer = thr_timer_table_from_id(table, id, 1); - - if (timer == NULL) { - errno = EINVAL; - return -1; - } - - /* tell the timer's thread to stop */ - thr_timer_lock(timer); - timer->done = 1; - pthread_cond_signal( &timer->cond ); - thr_timer_unlock(timer); - - /* NOTE: the thread will call __timer_table_free() to free the - * timer object. the '1' parameter to thr_timer_table_from_id - * above ensured that the object and its timer_id cannot be - * reused before that. - */ - return 0; - } -} - -/* return the relative time until the next expiration, or 0 if - * the timer is disarmed */ -static void -timer_gettime_internal( thr_timer_t* timer, - struct itimerspec* spec) -{ - struct timespec diff; - - diff = timer->expires; - if (!timespec_is_zero(&diff)) - { - struct timespec now; - - clock_gettime( timer->clock, &now ); - timespec_sub(&diff, &now); - - /* in case of overrun, return 0 */ - if (timespec_cmp0(&diff) < 0) { - timespec_zero(&diff); - } - } - - spec->it_value = diff; - spec->it_interval = timer->period; -} - - -int -timer_gettime( timer_t id, struct itimerspec* ospec ) -{ - if (ospec == NULL) { - errno = EINVAL; - return -1; - } - - if ( __likely(!TIMER_ID_IS_WRAPPED(id)) ) { - return __timer_gettime( id, ospec ); - } else { - thr_timer_t* timer = thr_timer_from_id(id); - - if (timer == NULL) { - errno = EINVAL; - return -1; - } - thr_timer_lock(timer); - timer_gettime_internal( timer, ospec ); - thr_timer_unlock(timer); - } - return 0; -} - - -int -timer_settime( timer_t id, - int flags, - const struct itimerspec* spec, - struct itimerspec* ospec ) -{ - if (spec == NULL) { - errno = EINVAL; - return -1; - } - - if ( __likely(!TIMER_ID_IS_WRAPPED(id)) ) { - return __timer_settime( id, flags, spec, ospec ); - } else { - thr_timer_t* timer = thr_timer_from_id(id); - struct timespec expires, now; - - if (timer == NULL) { - errno = EINVAL; - return -1; - } - thr_timer_lock(timer); - - /* return current timer value if ospec isn't NULL */ - if (ospec != NULL) { - timer_gettime_internal(timer, ospec ); - } - - /* compute next expiration time */ - expires = spec->it_value; - clock_gettime( timer->clock, &now ); - if (!(flags & TIMER_ABSTIME)) { - timespec_add(&expires, &now); - } else { - if (timespec_cmp(&expires, &now) < 0) - expires = now; - } - - timer->expires = expires; - timer->period = spec->it_interval; - thr_timer_unlock( timer ); - - /* signal the change to the thread */ - pthread_cond_signal( &timer->cond ); - } - return 0; -} - - -int -timer_getoverrun(timer_t id) -{ - if ( __likely(!TIMER_ID_IS_WRAPPED(id)) ) { - return __timer_getoverrun( id ); - } else { - thr_timer_t* timer = thr_timer_from_id(id); - int result; - - if (timer == NULL) { - errno = EINVAL; - return -1; - } - - thr_timer_lock(timer); - result = timer->overruns; - thr_timer_unlock(timer); - - return result; - } -} - - -static void* -timer_thread_start( void* _arg ) -{ - thr_timer_t* timer = _arg; - - thr_timer_lock( timer ); - - /* we loop until timer->done is set in timer_delete() */ - while (!timer->done) - { - struct timespec expires = timer->expires; - struct timespec period = timer->period; - struct timespec now; - - /* if the timer is stopped or disarmed, wait indefinitely - * for a state change from timer_settime/_delete/_start_stop - */ - if ( timer->stopped || timespec_is_zero(&expires) ) - { - pthread_cond_wait( &timer->cond, &timer->mutex ); - continue; - } - - /* otherwise, we need to do a timed wait until either a - * state change of the timer expiration time. - */ - clock_gettime(timer->clock, &now); - - if (timespec_cmp( &expires, &now ) > 0) - { - /* cool, there was no overrun, so compute the - * relative timeout as 'expires - now', then wait - */ - int ret; - struct timespec diff = expires; - timespec_sub( &diff, &now ); - - ret = __pthread_cond_timedwait_relative( - &timer->cond, &timer->mutex, &diff); - - /* if we didn't timeout, it means that a state change - * occured, so reloop to take care of it. - */ - if (ret != ETIMEDOUT) - continue; - } - else - { - /* overrun was detected before we could wait ! */ - if (!timespec_is_zero( &period ) ) - { - /* for periodic timers, compute total overrun count */ - do { - timespec_add( &expires, &period ); - if (timer->overruns < DELAYTIMER_MAX) - timer->overruns += 1; - } while ( timespec_cmp( &expires, &now ) < 0 ); - - /* backtrack the last one, because we're going to - * add the same value just a bit later */ - timespec_sub( &expires, &period ); - } - else - { - /* for non-periodic timer, things are simple */ - timer->overruns = 1; - } - } - - /* if we get there, a timeout was detected. - * first reload/disarm the timer has needed - */ - if ( !timespec_is_zero(&period) ) { - timespec_add( &expires, &period ); - } else { - timespec_zero( &expires ); - } - timer->expires = expires; - - /* now call the timer callback function. release the - * lock to allow the function to modify the timer setting - * or call timer_getoverrun(). - * - * NOTE: at this point we trust the callback not to be a - * total moron and pthread_kill() the timer thread - */ - thr_timer_unlock(timer); - timer->callback( timer->value ); - thr_timer_lock(timer); - - /* now clear the overruns counter. it only makes sense - * within the callback */ - timer->overruns = 0; - } - - thr_timer_unlock( timer ); - - /* free the timer object now. there is no need to call - * __timer_table_get() since we're guaranteed that __timer_table - * is initialized in this thread - */ - thr_timer_table_free(__timer_table, timer); - - return NULL; -} diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c deleted file mode 100644 index ec3c459e0..000000000 --- a/libc/bionic/pthread.c +++ /dev/null @@ -1,1587 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "pthread_internal.h" -#include "thread_private.h" -#include -#include -#include -#include - -extern int __pthread_clone(int (*fn)(void*), void *child_stack, int flags, void *arg); -extern void _exit_with_stack_teardown(void * stackBase, int stackSize, int retCode); -extern void _exit_thread(int retCode); -extern int __set_errno(int); - -void _thread_created_hook(pid_t thread_id) __attribute__((noinline)); - -#define PTHREAD_ATTR_FLAG_DETACHED 0x00000001 -#define PTHREAD_ATTR_FLAG_USER_STACK 0x00000002 - -#define DEFAULT_STACKSIZE (1024 * 1024) -#define STACKBASE 0x10000000 - -static uint8_t * gStackBase = (uint8_t *)STACKBASE; - -static pthread_mutex_t mmap_lock = PTHREAD_MUTEX_INITIALIZER; - - -static const pthread_attr_t gDefaultPthreadAttr = { - .flags = 0, - .stack_base = NULL, - .stack_size = DEFAULT_STACKSIZE, - .guard_size = PAGE_SIZE, - .sched_policy = SCHED_NORMAL, - .sched_priority = 0 -}; - -#define INIT_THREADS 1 - -static pthread_internal_t* gThreadList = NULL; -static pthread_mutex_t gThreadListLock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t gDebuggerNotificationLock = PTHREAD_MUTEX_INITIALIZER; - - -/* we simply malloc/free the internal pthread_internal_t structures. we may - * want to use a different allocation scheme in the future, but this one should - * be largely enough - */ -static pthread_internal_t* -_pthread_internal_alloc(void) -{ - pthread_internal_t* thread; - - thread = calloc( sizeof(*thread), 1 ); - if (thread) - thread->intern = 1; - - return thread; -} - -static void -_pthread_internal_free( pthread_internal_t* thread ) -{ - if (thread && thread->intern) { - thread->intern = 0; /* just in case */ - free (thread); - } -} - - -static void -_pthread_internal_remove_locked( pthread_internal_t* thread ) -{ - thread->next->pref = thread->pref; - thread->pref[0] = thread->next; -} - -static void -_pthread_internal_remove( pthread_internal_t* thread ) -{ - pthread_mutex_lock(&gThreadListLock); - _pthread_internal_remove_locked(thread); - pthread_mutex_unlock(&gThreadListLock); -} - -static void -_pthread_internal_add( pthread_internal_t* thread ) -{ - pthread_mutex_lock(&gThreadListLock); - thread->pref = &gThreadList; - thread->next = thread->pref[0]; - if (thread->next) - thread->next->pref = &thread->next; - thread->pref[0] = thread; - pthread_mutex_unlock(&gThreadListLock); -} - -pthread_internal_t* -__get_thread(void) -{ - void** tls = (void**)__get_tls(); - - return (pthread_internal_t*) tls[TLS_SLOT_THREAD_ID]; -} - - -void* -__get_stack_base(int *p_stack_size) -{ - pthread_internal_t* thread = __get_thread(); - - *p_stack_size = thread->attr.stack_size; - return thread->attr.stack_base; -} - - -void __init_tls(void** tls, void* thread) -{ - int nn; - - ((pthread_internal_t*)thread)->tls = tls; - - // slot 0 must point to the tls area, this is required by the implementation - // of the x86 Linux kernel thread-local-storage - tls[TLS_SLOT_SELF] = (void*)tls; - tls[TLS_SLOT_THREAD_ID] = thread; - for (nn = TLS_SLOT_ERRNO; nn < BIONIC_TLS_SLOTS; nn++) - tls[nn] = 0; - - __set_tls( (void*)tls ); -} - - -/* - * This trampoline is called from the assembly clone() function - */ -void __thread_entry(int (*func)(void*), void *arg, void **tls) -{ - int retValue; - pthread_internal_t * thrInfo; - - // Wait for our creating thread to release us. This lets it have time to - // notify gdb about this thread before it starts doing anything. - pthread_mutex_t * start_mutex = (pthread_mutex_t *)&tls[TLS_SLOT_SELF]; - pthread_mutex_lock(start_mutex); - pthread_mutex_destroy(start_mutex); - - thrInfo = (pthread_internal_t *) tls[TLS_SLOT_THREAD_ID]; - - __init_tls( tls, thrInfo ); - - pthread_exit( (void*)func(arg) ); -} - -void _init_thread(pthread_internal_t * thread, pid_t kernel_id, pthread_attr_t * attr, void * stack_base) -{ - if (attr == NULL) { - thread->attr = gDefaultPthreadAttr; - } else { - thread->attr = *attr; - } - thread->attr.stack_base = stack_base; - thread->kernel_id = kernel_id; - - // set the scheduling policy/priority of the thread - if (thread->attr.sched_policy != SCHED_NORMAL) { - struct sched_param param; - param.sched_priority = thread->attr.sched_priority; - sched_setscheduler(kernel_id, thread->attr.sched_policy, ¶m); - } - - pthread_cond_init(&thread->join_cond, NULL); - thread->join_count = 0; - - thread->cleanup_stack = NULL; - - _pthread_internal_add(thread); -} - - -/* XXX stacks not reclaimed if thread spawn fails */ -/* XXX stacks address spaces should be reused if available again */ - -static void *mkstack(size_t size, size_t guard_size) -{ - void * stack; - - pthread_mutex_lock(&mmap_lock); - - stack = mmap((void *)gStackBase, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, - -1, 0); - - if(stack == MAP_FAILED) { - stack = NULL; - goto done; - } - - if(mprotect(stack, guard_size, PROT_NONE)){ - munmap(stack, size); - stack = NULL; - goto done; - } - -done: - pthread_mutex_unlock(&mmap_lock); - return stack; -} - -/* - * Create a new thread. The thread's stack is layed out like so: - * - * +---------------------------+ - * | pthread_internal_t | - * +---------------------------+ - * | | - * | TLS area | - * | | - * +---------------------------+ - * | | - * . . - * . stack area . - * . . - * | | - * +---------------------------+ - * | guard page | - * +---------------------------+ - * - * note that TLS[0] must be a pointer to itself, this is required - * by the thread-local storage implementation of the x86 Linux - * kernel, where the TLS pointer is read by reading fs:[0] - */ -int pthread_create(pthread_t *thread_out, pthread_attr_t const * attr, - void *(*start_routine)(void *), void * arg) -{ - char* stack; - void** tls; - int tid; - pthread_mutex_t * start_mutex; - pthread_internal_t * thread; - int madestack = 0; - int old_errno = errno; - - /* this will inform the rest of the C library that at least one thread - * was created. this will enforce certain functions to acquire/release - * locks (e.g. atexit()) to protect shared global structures. - * - * this works because pthread_create() is not called by the C library - * initialization routine that sets up the main thread's data structures. - */ - __isthreaded = 1; - - thread = _pthread_internal_alloc(); - if (thread == NULL) - return ENOMEM; - - if (attr == NULL) { - attr = &gDefaultPthreadAttr; - } - - // make sure the stack is PAGE_SIZE aligned - size_t stackSize = (attr->stack_size + - (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); - - if (!attr->stack_base) { - stack = mkstack(stackSize, attr->guard_size); - if(stack == NULL) { - _pthread_internal_free(thread); - return ENOMEM; - } - madestack = 1; - } else { - stack = attr->stack_base; - } - - // Make room for TLS - tls = (void**)(stack + stackSize - BIONIC_TLS_SLOTS*sizeof(void*)); - - // Create a mutex for the thread in TLS_SLOT_SELF to wait on once it starts so we can keep - // it from doing anything until after we notify the debugger about it - start_mutex = (pthread_mutex_t *) &tls[TLS_SLOT_SELF]; - pthread_mutex_init(start_mutex, NULL); - pthread_mutex_lock(start_mutex); - - tls[TLS_SLOT_THREAD_ID] = thread; - - tid = __pthread_clone((int(*)(void*))start_routine, tls, - CLONE_FILES | CLONE_FS | CLONE_VM | CLONE_SIGHAND - | CLONE_THREAD | CLONE_SYSVSEM | CLONE_DETACHED, - arg); - - if(tid < 0) { - int result; - if (madestack) - munmap(stack, stackSize); - _pthread_internal_free(thread); - result = errno; - errno = old_errno; - return result; - } - - _init_thread(thread, tid, (pthread_attr_t*)attr, stack); - - if (!madestack) - thread->attr.flags |= PTHREAD_ATTR_FLAG_USER_STACK; - - // Notify any debuggers about the new thread - pthread_mutex_lock(&gDebuggerNotificationLock); - _thread_created_hook(tid); - pthread_mutex_unlock(&gDebuggerNotificationLock); - - // Let the thread do it's thing - pthread_mutex_unlock(start_mutex); - - *thread_out = (pthread_t)thread; - return 0; -} - - -int pthread_attr_init(pthread_attr_t * attr) -{ - *attr = gDefaultPthreadAttr; - return 0; -} - -int pthread_attr_destroy(pthread_attr_t * attr) -{ - memset(attr, 0x42, sizeof(pthread_attr_t)); - return 0; -} - -int pthread_attr_setdetachstate(pthread_attr_t * attr, int state) -{ - if (state == PTHREAD_CREATE_DETACHED) { - attr->flags |= PTHREAD_ATTR_FLAG_DETACHED; - } else if (state == PTHREAD_CREATE_JOINABLE) { - attr->flags &= ~PTHREAD_ATTR_FLAG_DETACHED; - } else { - return EINVAL; - } - return 0; -} - -int pthread_attr_getdetachstate(pthread_attr_t const * attr, int * state) -{ - *state = (attr->flags & PTHREAD_ATTR_FLAG_DETACHED) - ? PTHREAD_CREATE_DETACHED - : PTHREAD_CREATE_JOINABLE; - return 0; -} - -int pthread_attr_setschedpolicy(pthread_attr_t * attr, int policy) -{ - attr->sched_policy = policy; - return 0; -} - -int pthread_attr_getschedpolicy(pthread_attr_t const * attr, int * policy) -{ - *policy = attr->sched_policy; - return 0; -} - -int pthread_attr_setschedparam(pthread_attr_t * attr, struct sched_param const * param) -{ - attr->sched_priority = param->sched_priority; - return 0; -} - -int pthread_attr_getschedparam(pthread_attr_t const * attr, struct sched_param * param) -{ - param->sched_priority = attr->sched_priority; - return 0; -} - -int pthread_attr_setstacksize(pthread_attr_t * attr, size_t stack_size) -{ - if ((stack_size & (PAGE_SIZE - 1) || stack_size < PTHREAD_STACK_MIN)) { - return EINVAL; - } - attr->stack_size = stack_size; - return 0; -} - -int pthread_attr_getstacksize(pthread_attr_t const * attr, size_t * stack_size) -{ - *stack_size = attr->stack_size; - return 0; -} - -int pthread_attr_setstackaddr(pthread_attr_t * attr, void * stack_addr) -{ -#if 1 - // It's not clear if this is setting the top or bottom of the stack, so don't handle it for now. - return ENOSYS; -#else - if ((uint32_t)stack_addr & (PAGE_SIZE - 1)) { - return EINVAL; - } - attr->stack_base = stack_addr; - return 0; -#endif -} - -int pthread_attr_getstackaddr(pthread_attr_t const * attr, void ** stack_addr) -{ - *stack_addr = attr->stack_base + attr->stack_size; - return 0; -} - -int pthread_attr_setstack(pthread_attr_t * attr, void * stack_base, size_t stack_size) -{ - if ((stack_size & (PAGE_SIZE - 1) || stack_size < PTHREAD_STACK_MIN)) { - return EINVAL; - } - if ((uint32_t)stack_base & (PAGE_SIZE - 1)) { - return EINVAL; - } - attr->stack_base = stack_base; - attr->stack_size = stack_size; - return 0; -} - -int pthread_attr_getstack(pthread_attr_t const * attr, void ** stack_base, size_t * stack_size) -{ - *stack_base = attr->stack_base; - *stack_size = attr->stack_size; - return 0; -} - -int pthread_attr_setguardsize(pthread_attr_t * attr, size_t guard_size) -{ - if (guard_size & (PAGE_SIZE - 1) || guard_size < PAGE_SIZE) { - return EINVAL; - } - - attr->guard_size = guard_size; - return 0; -} - -int pthread_attr_getguardsize(pthread_attr_t const * attr, size_t * guard_size) -{ - *guard_size = attr->guard_size; - return 0; -} - -int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr) -{ - pthread_internal_t * thread = (pthread_internal_t *)thid; - *attr = thread->attr; - return 0; -} - -int pthread_attr_setscope(pthread_attr_t *attr, int scope) -{ - if (scope == PTHREAD_SCOPE_SYSTEM) - return 0; - if (scope == PTHREAD_SCOPE_PROCESS) - return ENOTSUP; - - return EINVAL; -} - -int pthread_attr_getscope(pthread_attr_t const *attr) -{ - return PTHREAD_SCOPE_SYSTEM; -} - - -/* CAVEAT: our implementation of pthread_cleanup_push/pop doesn't support C++ exceptions - * and thread cancelation - */ - -void __pthread_cleanup_push( __pthread_cleanup_t* c, - __pthread_cleanup_func_t routine, - void* arg ) -{ - pthread_internal_t* thread = __get_thread(); - - c->__cleanup_routine = routine; - c->__cleanup_arg = arg; - c->__cleanup_prev = thread->cleanup_stack; - thread->cleanup_stack = c; -} - -void __pthread_cleanup_pop( __pthread_cleanup_t* c, int execute ) -{ - pthread_internal_t* thread = __get_thread(); - - thread->cleanup_stack = c->__cleanup_prev; - if (execute) - c->__cleanup_routine(c->__cleanup_arg); -} - -/* used by pthread_exit() to clean all TLS keys of the current thread */ -static void pthread_key_clean_all(void); - -void pthread_exit(void * retval) -{ - pthread_internal_t* thread = __get_thread(); - void* stack_base = thread->attr.stack_base; - int stack_size = thread->attr.stack_size; - int user_stack = (thread->attr.flags & PTHREAD_ATTR_FLAG_USER_STACK) != 0; - - // call the cleanup handlers first - while (thread->cleanup_stack) { - __pthread_cleanup_t* c = thread->cleanup_stack; - thread->cleanup_stack = c->__cleanup_prev; - c->__cleanup_routine(c->__cleanup_arg); - } - - // call the TLS destructors, it is important to do that before removing this - // thread from the global list. this will ensure that if someone else deletes - // a TLS key, the corresponding value will be set to NULL in this thread's TLS - // space (see pthread_key_delete) - pthread_key_clean_all(); - - // if the thread is detached, destroy the pthread_internal_t - // otherwise, keep it in memory and signal any joiners - if (thread->attr.flags & PTHREAD_ATTR_FLAG_DETACHED) { - _pthread_internal_remove(thread); - _pthread_internal_free(thread); - } else { - /* the join_count field is used to store the number of threads waiting for - * the termination of this thread with pthread_join(), - * - * if it is positive we need to signal the waiters, and we do not touch - * the count (it will be decremented by the waiters, the last one will - * also remove/free the thread structure - * - * if it is zero, we set the count value to -1 to indicate that the - * thread is in 'zombie' state: it has stopped executing, and its stack - * is gone (as well as its TLS area). when another thread calls pthread_join() - * on it, it will immediately free the thread and return. - */ - pthread_mutex_lock(&gThreadListLock); - thread->return_value = retval; - if (thread->join_count > 0) { - pthread_cond_broadcast(&thread->join_cond); - } else { - thread->join_count = -1; /* zombie thread */ - } - pthread_mutex_unlock(&gThreadListLock); - } - - // destroy the thread stack - if (user_stack) - _exit_thread((int)retval); - else - _exit_with_stack_teardown(stack_base, stack_size, (int)retval); -} - -int pthread_join(pthread_t thid, void ** ret_val) -{ - pthread_internal_t* thread = (pthread_internal_t*)thid; - int count; - - // check that the thread still exists and is not detached - pthread_mutex_lock(&gThreadListLock); - - for (thread = gThreadList; thread != NULL; thread = thread->next) - if (thread == (pthread_internal_t*)thid) - break; - - if (!thread) { - pthread_mutex_unlock(&gThreadListLock); - return ESRCH; - } - - if (thread->attr.flags & PTHREAD_ATTR_FLAG_DETACHED) { - pthread_mutex_unlock(&gThreadListLock); - return EINVAL; - } - - /* wait for thread death when needed - * - * if the 'join_count' is negative, this is a 'zombie' thread that - * is already dead and without stack/TLS - * - * otherwise, we need to increment 'join-count' and wait to be signaled - */ - count = thread->join_count; - if (count >= 0) { - thread->join_count += 1; - pthread_cond_wait( &thread->join_cond, &gThreadListLock ); - count = --thread->join_count; - } - if (ret_val) - *ret_val = thread->return_value; - - /* remove thread descriptor when we're the last joiner or when the - * thread was already a zombie. - */ - if (count <= 0) { - _pthread_internal_remove_locked(thread); - _pthread_internal_free(thread); - } - pthread_mutex_unlock(&gThreadListLock); - return 0; -} - -int pthread_detach( pthread_t thid ) -{ - pthread_internal_t* thread; - int result = 0; - int flags; - - pthread_mutex_lock(&gThreadListLock); - for (thread = gThreadList; thread != NULL; thread = thread->next) - if (thread == (pthread_internal_t*)thid) - goto FoundIt; - - result = ESRCH; - goto Exit; - -FoundIt: - do { - flags = thread->attr.flags; - - if ( flags & PTHREAD_ATTR_FLAG_DETACHED ) { - /* thread is not joinable ! */ - result = EINVAL; - goto Exit; - } - } - while ( __atomic_cmpxchg( flags, flags | PTHREAD_ATTR_FLAG_DETACHED, - (volatile int*)&thread->attr.flags ) != 0 ); -Exit: - pthread_mutex_unlock(&gThreadListLock); - return result; -} - -pthread_t pthread_self(void) -{ - return (pthread_t)__get_thread(); -} - -int pthread_equal(pthread_t one, pthread_t two) -{ - return (one == two ? 1 : 0); -} - -int pthread_getschedparam(pthread_t thid, int * policy, - struct sched_param * param) -{ - int old_errno = errno; - - pthread_internal_t * thread = (pthread_internal_t *)thid; - int err = sched_getparam(thread->kernel_id, param); - if (!err) { - *policy = sched_getscheduler(thread->kernel_id); - } else { - err = errno; - errno = old_errno; - } - return err; -} - -int pthread_setschedparam(pthread_t thid, int policy, - struct sched_param const * param) -{ - pthread_internal_t * thread = (pthread_internal_t *)thid; - int old_errno = errno; - int ret; - - ret = sched_setscheduler(thread->kernel_id, policy, param); - if (ret < 0) { - ret = errno; - errno = old_errno; - } - return ret; -} - - -int __futex_wait(volatile void *ftx, int val, const struct timespec *timeout); -int __futex_wake(volatile void *ftx, int count); - -// mutex lock states -// -// 0: unlocked -// 1: locked, no waiters -// 2: locked, maybe waiters - -/* a mutex is implemented as a 32-bit integer holding the following fields - * - * bits: name description - * 31-16 tid owner thread's kernel id (recursive and errorcheck only) - * 15-14 type mutex type - * 13-2 counter counter of recursive mutexes - * 1-0 state lock state (0, 1 or 2) - */ - - -#define MUTEX_OWNER(m) (((m)->value >> 16) & 0xffff) -#define MUTEX_COUNTER(m) (((m)->value >> 2) & 0xfff) - -#define MUTEX_TYPE_MASK 0xc000 -#define MUTEX_TYPE_NORMAL 0x0000 -#define MUTEX_TYPE_RECURSIVE 0x4000 -#define MUTEX_TYPE_ERRORCHECK 0x8000 - -#define MUTEX_COUNTER_SHIFT 2 -#define MUTEX_COUNTER_MASK 0x3ffc - - - - -int pthread_mutexattr_init(pthread_mutexattr_t *attr) -{ - if (attr) { - *attr = PTHREAD_MUTEX_DEFAULT; - return 0; - } else { - return EINVAL; - } -} - -int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) -{ - if (attr) { - *attr = -1; - return 0; - } else { - return EINVAL; - } -} - -int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type) -{ - if (attr && *attr >= PTHREAD_MUTEX_NORMAL && - *attr <= PTHREAD_MUTEX_ERRORCHECK ) { - *type = *attr; - return 0; - } - return EINVAL; -} - -int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) -{ - if (attr && type >= PTHREAD_MUTEX_NORMAL && - type <= PTHREAD_MUTEX_ERRORCHECK ) { - *attr = type; - return 0; - } - return EINVAL; -} - -/* process-shared mutexes are not supported at the moment */ - -int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared) -{ - if (!attr) - return EINVAL; - - return (pshared == PTHREAD_PROCESS_PRIVATE) ? 0 : ENOTSUP; -} - -int pthread_mutexattr_getpshared(pthread_mutexattr_t *attr, int *pshared) -{ - if (!attr) - return EINVAL; - - *pshared = PTHREAD_PROCESS_PRIVATE; - return 0; -} - -int pthread_mutex_init(pthread_mutex_t *mutex, - const pthread_mutexattr_t *attr) -{ - if ( mutex ) { - if (attr == NULL) { - mutex->value = MUTEX_TYPE_NORMAL; - return 0; - } - switch ( *attr ) { - case PTHREAD_MUTEX_NORMAL: - mutex->value = MUTEX_TYPE_NORMAL; - return 0; - - case PTHREAD_MUTEX_RECURSIVE: - mutex->value = MUTEX_TYPE_RECURSIVE; - return 0; - - case PTHREAD_MUTEX_ERRORCHECK: - mutex->value = MUTEX_TYPE_ERRORCHECK; - return 0; - } - } - return EINVAL; -} - -int pthread_mutex_destroy(pthread_mutex_t *mutex) -{ - mutex->value = 0xdead10cc; - return 0; -} - - -/* - * Lock a non-recursive mutex. - * - * As noted above, there are three states: - * 0 (unlocked, no contention) - * 1 (locked, no contention) - * 2 (locked, contention) - * - * Non-recursive mutexes don't use the thread-id or counter fields, and the - * "type" value is zero, so the only bits that will be set are the ones in - * the lock state field. - */ -static __inline__ void -_normal_lock(pthread_mutex_t* mutex) -{ - /* - * The common case is an unlocked mutex, so we begin by trying to - * change the lock's state from 0 to 1. __atomic_cmpxchg() returns 0 - * if it made the swap successfully. If the result is nonzero, this - * lock is already held by another thread. - */ - if (__atomic_cmpxchg(0, 1, &mutex->value ) != 0) { - /* - * We want to go to sleep until the mutex is available, which - * requires promoting it to state 2. We need to swap in the new - * state value and then wait until somebody wakes us up. - * - * __atomic_swap() returns the previous value. We swap 2 in and - * see if we got zero back; if so, we have acquired the lock. If - * not, another thread still holds the lock and we wait again. - * - * The second argument to the __futex_wait() call is compared - * against the current value. If it doesn't match, __futex_wait() - * returns immediately (otherwise, it sleeps for a time specified - * by the third argument; 0 means sleep forever). This ensures - * that the mutex is in state 2 when we go to sleep on it, which - * guarantees a wake-up call. - */ - while (__atomic_swap(2, &mutex->value ) != 0) - __futex_wait(&mutex->value, 2, 0); - } -} - -/* - * Release a non-recursive mutex. The caller is responsible for determining - * that we are in fact the owner of this lock. - */ -static __inline__ void -_normal_unlock(pthread_mutex_t* mutex) -{ - /* - * The mutex value will be 1 or (rarely) 2. We use an atomic decrement - * to release the lock. __atomic_dec() returns the previous value; - * if it wasn't 1 we have to do some additional work. - */ - if (__atomic_dec(&mutex->value) != 1) { - /* - * Start by releasing the lock. The decrement changed it from - * "contended lock" to "uncontended lock", which means we still - * hold it, and anybody who tries to sneak in will push it back - * to state 2. - * - * Once we set it to zero the lock is up for grabs. We follow - * this with a __futex_wake() to ensure that one of the waiting - * threads has a chance to grab it. - * - * This doesn't cause a race with the swap/wait pair in - * _normal_lock(), because the __futex_wait() call there will - * return immediately if the mutex value isn't 2. - */ - mutex->value = 0; - - /* - * Wake up one waiting thread. We don't know which thread will be - * woken or when it'll start executing -- futexes make no guarantees - * here. There may not even be a thread waiting. - * - * The newly-woken thread will replace the 0 we just set above - * with 2, which means that when it eventually releases the mutex - * it will also call FUTEX_WAKE. This results in one extra wake - * call whenever a lock is contended, but lets us avoid forgetting - * anyone without requiring us to track the number of sleepers. - * - * It's possible for another thread to sneak in and grab the lock - * between the zero assignment above and the wake call below. If - * the new thread is "slow" and holds the lock for a while, we'll - * wake up a sleeper, which will swap in a 2 and then go back to - * sleep since the lock is still held. If the new thread is "fast", - * running to completion before we call wake, the thread we - * eventually wake will find an unlocked mutex and will execute. - * Either way we have correct behavior and nobody is orphaned on - * the wait queue. - */ - __futex_wake(&mutex->value, 1); - } -} - -static pthread_mutex_t __recursive_lock = PTHREAD_MUTEX_INITIALIZER; - -static void -_recursive_lock(void) -{ - _normal_lock( &__recursive_lock); -} - -static void -_recursive_unlock(void) -{ - _normal_unlock( &__recursive_lock ); -} - -#define __likely(cond) __builtin_expect(!!(cond), 1) -#define __unlikely(cond) __builtin_expect(!!(cond), 0) - -int pthread_mutex_lock(pthread_mutex_t *mutex) -{ - if (__likely(mutex != NULL)) - { - int mtype = (mutex->value & MUTEX_TYPE_MASK); - - if ( __likely(mtype == MUTEX_TYPE_NORMAL) ) { - _normal_lock(mutex); - } - else - { - int tid = __get_thread()->kernel_id; - - if ( tid == MUTEX_OWNER(mutex) ) - { - int oldv, counter; - - if (mtype == MUTEX_TYPE_ERRORCHECK) { - /* trying to re-lock a mutex we already acquired */ - return EDEADLK; - } - /* - * We own the mutex, but other threads are able to change - * the contents (e.g. promoting it to "contended"), so we - * need to hold the global lock. - */ - _recursive_lock(); - oldv = mutex->value; - counter = (oldv + (1 << MUTEX_COUNTER_SHIFT)) & MUTEX_COUNTER_MASK; - mutex->value = (oldv & ~MUTEX_COUNTER_MASK) | counter; - _recursive_unlock(); - } - else - { - /* - * If the new lock is available immediately, we grab it in - * the "uncontended" state. - */ - int new_lock_type = 1; - - for (;;) { - int oldv; - - _recursive_lock(); - oldv = mutex->value; - if (oldv == mtype) { /* uncontended released lock => 1 or 2 */ - mutex->value = ((tid << 16) | mtype | new_lock_type); - } else if ((oldv & 3) == 1) { /* locked state 1 => state 2 */ - oldv ^= 3; - mutex->value = oldv; - } - _recursive_unlock(); - - if (oldv == mtype) - break; - - /* - * The lock was held, possibly contended by others. From - * now on, if we manage to acquire the lock, we have to - * assume that others are still contending for it so that - * we'll wake them when we unlock it. - */ - new_lock_type = 2; - - __futex_wait( &mutex->value, oldv, 0 ); - } - } - } - return 0; - } - return EINVAL; -} - - -int pthread_mutex_unlock(pthread_mutex_t *mutex) -{ - if (__likely(mutex != NULL)) - { - int mtype = (mutex->value & MUTEX_TYPE_MASK); - - if (__likely(mtype == MUTEX_TYPE_NORMAL)) { - _normal_unlock(mutex); - } - else - { - int tid = __get_thread()->kernel_id; - - if ( tid == MUTEX_OWNER(mutex) ) - { - int oldv; - - _recursive_lock(); - oldv = mutex->value; - if (oldv & MUTEX_COUNTER_MASK) { - mutex->value = oldv - (1 << MUTEX_COUNTER_SHIFT); - oldv = 0; - } else { - mutex->value = mtype; - } - _recursive_unlock(); - - if ((oldv & 3) == 2) - __futex_wake( &mutex->value, 1 ); - } - else { - /* trying to unlock a lock we do not own */ - return EPERM; - } - } - return 0; - } - return EINVAL; -} - - -int pthread_mutex_trylock(pthread_mutex_t *mutex) -{ - if (__likely(mutex != NULL)) - { - int mtype = (mutex->value & MUTEX_TYPE_MASK); - - if ( __likely(mtype == MUTEX_TYPE_NORMAL) ) - { - if (__atomic_cmpxchg(0, 1, &mutex->value) == 0) - return 0; - - return EBUSY; - } - else - { - int tid = __get_thread()->kernel_id; - int oldv; - - if ( tid == MUTEX_OWNER(mutex) ) - { - int oldv, counter; - - if (mtype == MUTEX_TYPE_ERRORCHECK) { - /* already locked by ourselves */ - return EDEADLK; - } - - _recursive_lock(); - oldv = mutex->value; - counter = (oldv + (1 << MUTEX_COUNTER_SHIFT)) & MUTEX_COUNTER_MASK; - mutex->value = (oldv & ~MUTEX_COUNTER_MASK) | counter; - _recursive_unlock(); - return 0; - } - - /* try to lock it */ - _recursive_lock(); - oldv = mutex->value; - if (oldv == mtype) /* uncontended released lock => state 1 */ - mutex->value = ((tid << 16) | mtype | 1); - _recursive_unlock(); - - if (oldv != mtype) - return EBUSY; - - return 0; - } - } - return EINVAL; -} - - -/* XXX *technically* there is a race condition that could allow - * XXX a signal to be missed. If thread A is preempted in _wait() - * XXX after unlocking the mutex and before waiting, and if other - * XXX threads call signal or broadcast UINT_MAX times (exactly), - * XXX before thread A is scheduled again and calls futex_wait(), - * XXX then the signal will be lost. - */ - -int pthread_cond_init(pthread_cond_t *cond, - const pthread_condattr_t *attr) -{ - cond->value = 0; - return 0; -} - -int pthread_cond_destroy(pthread_cond_t *cond) -{ - cond->value = 0xdeadc04d; - return 0; -} - -int pthread_cond_broadcast(pthread_cond_t *cond) -{ - __atomic_dec(&cond->value); - __futex_wake(&cond->value, INT_MAX); - return 0; -} - -int pthread_cond_signal(pthread_cond_t *cond) -{ - __atomic_dec(&cond->value); - __futex_wake(&cond->value, 1); - return 0; -} - -int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) -{ - return pthread_cond_timedwait(cond, mutex, NULL); -} - -int __pthread_cond_timedwait_relative(pthread_cond_t *cond, - pthread_mutex_t * mutex, - const struct timespec *reltime) -{ - int status; - int oldvalue = cond->value; - - pthread_mutex_unlock(mutex); - status = __futex_wait(&cond->value, oldvalue, reltime); - pthread_mutex_lock(mutex); - - if (status == (-ETIMEDOUT)) return ETIMEDOUT; - return 0; -} - -int __pthread_cond_timedwait(pthread_cond_t *cond, - pthread_mutex_t * mutex, - const struct timespec *abstime, - clockid_t clock) -{ - struct timespec ts; - struct timespec * tsp; - - if (abstime != NULL) { - clock_gettime(clock, &ts); - ts.tv_sec = abstime->tv_sec - ts.tv_sec; - ts.tv_nsec = abstime->tv_nsec - ts.tv_nsec; - if (ts.tv_nsec < 0) { - ts.tv_sec--; - ts.tv_nsec += 1000000000; - } - if((ts.tv_nsec < 0) || (ts.tv_sec < 0)) { - return ETIMEDOUT; - } - tsp = &ts; - } else { - tsp = NULL; - } - - return __pthread_cond_timedwait_relative(cond, mutex, tsp); -} - -int pthread_cond_timedwait(pthread_cond_t *cond, - pthread_mutex_t * mutex, - const struct timespec *abstime) -{ - return __pthread_cond_timedwait(cond, mutex, abstime, CLOCK_REALTIME); -} - - -int pthread_cond_timedwait_monotonic(pthread_cond_t *cond, - pthread_mutex_t * mutex, - const struct timespec *abstime) -{ - return __pthread_cond_timedwait(cond, mutex, abstime, CLOCK_MONOTONIC); -} - -int pthread_cond_timeout_np(pthread_cond_t *cond, - pthread_mutex_t * mutex, - unsigned msecs) -{ - int oldvalue; - struct timespec ts; - int status; - - ts.tv_sec = msecs / 1000; - ts.tv_nsec = (msecs % 1000) * 1000000; - - oldvalue = cond->value; - - pthread_mutex_unlock(mutex); - status = __futex_wait(&cond->value, oldvalue, &ts); - pthread_mutex_lock(mutex); - - if(status == (-ETIMEDOUT)) return ETIMEDOUT; - - return 0; -} - - - -/* A technical note regarding our thread-local-storage (TLS) implementation: - * - * There can be up to TLSMAP_SIZE independent TLS keys in a given process, - * though the first TLSMAP_START keys are reserved for Bionic to hold - * special thread-specific variables like errno or a pointer to - * the current thread's descriptor. - * - * while stored in the TLS area, these entries cannot be accessed through - * pthread_getspecific() / pthread_setspecific() and pthread_key_delete() - * - * also, some entries in the key table are pre-allocated (see tlsmap_lock) - * to greatly simplify and speedup some OpenGL-related operations. though the - * initialy value will be NULL on all threads. - * - * you can use pthread_getspecific()/setspecific() on these, and in theory - * you could also call pthread_key_delete() as well, though this would - * probably break some apps. - * - * The 'tlsmap_t' type defined below implements a shared global map of - * currently created/allocated TLS keys and the destructors associated - * with them. You should use tlsmap_lock/unlock to access it to avoid - * any race condition. - * - * the global TLS map simply contains a bitmap of allocated keys, and - * an array of destructors. - * - * each thread has a TLS area that is a simple array of TLSMAP_SIZE void* - * pointers. the TLS area of the main thread is stack-allocated in - * __libc_init_common, while the TLS area of other threads is placed at - * the top of their stack in pthread_create. - * - * when pthread_key_create() is called, it finds the first free key in the - * bitmap, then set it to 1, saving the destructor altogether - * - * when pthread_key_delete() is called. it will erase the key's bitmap bit - * and its destructor, and will also clear the key data in the TLS area of - * all created threads. As mandated by Posix, it is the responsability of - * the caller of pthread_key_delete() to properly reclaim the objects that - * were pointed to by these data fields (either before or after the call). - * - */ - -/* TLS Map implementation - */ - -#define TLSMAP_START (TLS_SLOT_MAX_WELL_KNOWN+1) -#define TLSMAP_SIZE BIONIC_TLS_SLOTS -#define TLSMAP_BITS 32 -#define TLSMAP_WORDS ((TLSMAP_SIZE+TLSMAP_BITS-1)/TLSMAP_BITS) -#define TLSMAP_WORD(m,k) (m)->map[(k)/TLSMAP_BITS] -#define TLSMAP_MASK(k) (1U << ((k)&(TLSMAP_BITS-1))) - -/* this macro is used to quickly check that a key belongs to a reasonable range */ -#define TLSMAP_VALIDATE_KEY(key) \ - ((key) >= TLSMAP_START && (key) < TLSMAP_SIZE) - -/* the type of tls key destructor functions */ -typedef void (*tls_dtor_t)(void*); - -typedef struct { - int init; /* see comment in tlsmap_lock() */ - uint32_t map[TLSMAP_WORDS]; /* bitmap of allocated keys */ - tls_dtor_t dtors[TLSMAP_SIZE]; /* key destructors */ -} tlsmap_t; - -static pthread_mutex_t _tlsmap_lock = PTHREAD_MUTEX_INITIALIZER; -static tlsmap_t _tlsmap; - -/* lock the global TLS map lock and return a handle to it */ -static __inline__ tlsmap_t* tlsmap_lock(void) -{ - tlsmap_t* m = &_tlsmap; - - pthread_mutex_lock(&_tlsmap_lock); - /* we need to initialize the first entry of the 'map' array - * with the value TLS_DEFAULT_ALLOC_MAP. doing it statically - * when declaring _tlsmap is a bit awkward and is going to - * produce warnings, so do it the first time we use the map - * instead - */ - if (__unlikely(!m->init)) { - TLSMAP_WORD(m,0) = TLS_DEFAULT_ALLOC_MAP; - m->init = 1; - } - return m; -} - -/* unlock the global TLS map */ -static __inline__ void tlsmap_unlock(tlsmap_t* m) -{ - pthread_mutex_unlock(&_tlsmap_lock); - (void)m; /* a good compiler is a happy compiler */ -} - -/* test to see wether a key is allocated */ -static __inline__ int tlsmap_test(tlsmap_t* m, int key) -{ - return (TLSMAP_WORD(m,key) & TLSMAP_MASK(key)) != 0; -} - -/* set the destructor and bit flag on a newly allocated key */ -static __inline__ void tlsmap_set(tlsmap_t* m, int key, tls_dtor_t dtor) -{ - TLSMAP_WORD(m,key) |= TLSMAP_MASK(key); - m->dtors[key] = dtor; -} - -/* clear the destructor and bit flag on an existing key */ -static __inline__ void tlsmap_clear(tlsmap_t* m, int key) -{ - TLSMAP_WORD(m,key) &= ~TLSMAP_MASK(key); - m->dtors[key] = NULL; -} - -/* allocate a new TLS key, return -1 if no room left */ -static int tlsmap_alloc(tlsmap_t* m, tls_dtor_t dtor) -{ - int key; - - for ( key = TLSMAP_START; key < TLSMAP_SIZE; key++ ) { - if ( !tlsmap_test(m, key) ) { - tlsmap_set(m, key, dtor); - return key; - } - } - return -1; -} - - -int pthread_key_create(pthread_key_t *key, void (*destructor_function)(void *)) -{ - uint32_t err = ENOMEM; - tlsmap_t* map = tlsmap_lock(); - int k = tlsmap_alloc(map, destructor_function); - - if (k >= 0) { - *key = k; - err = 0; - } - tlsmap_unlock(map); - return err; -} - - -/* This deletes a pthread_key_t. note that the standard mandates that this does - * not call the destructor of non-NULL key values. Instead, it is the - * responsability of the caller to properly dispose of the corresponding data - * and resources, using any mean it finds suitable. - * - * On the other hand, this function will clear the corresponding key data - * values in all known threads. this prevents later (invalid) calls to - * pthread_getspecific() to receive invalid/stale values. - */ -int pthread_key_delete(pthread_key_t key) -{ - uint32_t err; - pthread_internal_t* thr; - tlsmap_t* map; - - if (!TLSMAP_VALIDATE_KEY(key)) { - return EINVAL; - } - - map = tlsmap_lock(); - - if (!tlsmap_test(map, key)) { - err = EINVAL; - goto err1; - } - - /* clear value in all threads */ - pthread_mutex_lock(&gThreadListLock); - for ( thr = gThreadList; thr != NULL; thr = thr->next ) { - /* avoid zombie threads with a negative 'join_count'. these are really - * already dead and don't have a TLS area anymore. - * - * similarly, it is possible to have thr->tls == NULL for threads that - * were just recently created through pthread_create() but whose - * startup trampoline (__thread_entry) hasn't been run yet by the - * scheduler. so check for this too. - */ - if (thr->join_count < 0 || !thr->tls) - continue; - - thr->tls[key] = NULL; - } - tlsmap_clear(map, key); - - pthread_mutex_unlock(&gThreadListLock); - err = 0; - -err1: - tlsmap_unlock(map); - return err; -} - - -int pthread_setspecific(pthread_key_t key, const void *ptr) -{ - int err = EINVAL; - tlsmap_t* map; - - if (TLSMAP_VALIDATE_KEY(key)) { - /* check that we're trying to set data for an allocated key */ - map = tlsmap_lock(); - if (tlsmap_test(map, key)) { - ((uint32_t *)__get_tls())[key] = (uint32_t)ptr; - err = 0; - } - tlsmap_unlock(map); - } - return err; -} - -void * pthread_getspecific(pthread_key_t key) -{ - if (!TLSMAP_VALIDATE_KEY(key)) { - return NULL; - } - - /* for performance reason, we do not lock/unlock the global TLS map - * to check that the key is properly allocated. if the key was not - * allocated, the value read from the TLS should always be NULL - * due to pthread_key_delete() clearing the values for all threads. - */ - return (void *)(((unsigned *)__get_tls())[key]); -} - -/* Posix mandates that this be defined in but we don't have - * it just yet. - */ -#ifndef PTHREAD_DESTRUCTOR_ITERATIONS -# define PTHREAD_DESTRUCTOR_ITERATIONS 4 -#endif - -/* this function is called from pthread_exit() to remove all TLS key data - * from this thread's TLS area. this must call the destructor of all keys - * that have a non-NULL data value (and a non-NULL destructor). - * - * because destructors can do funky things like deleting/creating other - * keys, we need to implement this in a loop - */ -static void pthread_key_clean_all(void) -{ - tlsmap_t* map; - void** tls = (void**)__get_tls(); - int rounds = PTHREAD_DESTRUCTOR_ITERATIONS; - - map = tlsmap_lock(); - - for (rounds = PTHREAD_DESTRUCTOR_ITERATIONS; rounds > 0; rounds--) - { - int kk, count = 0; - - for (kk = TLSMAP_START; kk < TLSMAP_SIZE; kk++) { - if ( tlsmap_test(map, kk) ) - { - void* data = tls[kk]; - tls_dtor_t dtor = map->dtors[kk]; - - if (data != NULL && dtor != NULL) - { - /* we need to clear the key data now, this will prevent the - * destructor (or a later one) from seeing the old value if - * it calls pthread_getspecific() for some odd reason - * - * we do not do this if 'dtor == NULL' just in case another - * destructor function might be responsible for manually - * releasing the corresponding data. - */ - tls[kk] = NULL; - - /* because the destructor is free to call pthread_key_create - * and/or pthread_key_delete, we need to temporarily unlock - * the TLS map - */ - tlsmap_unlock(map); - (*dtor)(data); - map = tlsmap_lock(); - - count += 1; - } - } - } - - /* if we didn't call any destructor, there is no need to check the - * TLS data again - */ - if (count == 0) - break; - } - tlsmap_unlock(map); -} - -// man says this should be in , but it isn't -extern int tkill(int tid, int sig); - -int pthread_kill(pthread_t tid, int sig) -{ - int ret; - int old_errno = errno; - pthread_internal_t * thread = (pthread_internal_t *)tid; - - ret = tkill(thread->kernel_id, sig); - if (ret < 0) { - ret = errno; - errno = old_errno; - } - - return ret; -} - -extern int __rt_sigprocmask(int, const sigset_t *, sigset_t *, size_t); - -int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) -{ - return __rt_sigprocmask(how, set, oset, _NSIG / 8); -} - - -int pthread_getcpuclockid(pthread_t tid, clockid_t *clockid) -{ - const int CLOCK_IDTYPE_BITS = 3; - pthread_internal_t* thread = (pthread_internal_t*)tid; - - if (!thread) - return ESRCH; - - *clockid = CLOCK_THREAD_CPUTIME_ID | (thread->kernel_id << CLOCK_IDTYPE_BITS); - return 0; -} - - -/* NOTE: this implementation doesn't support a init function that throws a C++ exception - * or calls fork() - */ -int pthread_once( pthread_once_t* once_control, void (*init_routine)(void) ) -{ - static pthread_mutex_t once_lock = PTHREAD_MUTEX_INITIALIZER; - - if (*once_control == PTHREAD_ONCE_INIT) { - _normal_lock( &once_lock ); - if (*once_control == PTHREAD_ONCE_INIT) { - (*init_routine)(); - *once_control = ~PTHREAD_ONCE_INIT; - } - _normal_unlock( &once_lock ); - } - return 0; -} diff --git a/libc/bionic/pthread_internal.h b/libc/bionic/pthread_internal.h deleted file mode 100644 index eb4e80ccc..000000000 --- a/libc/bionic/pthread_internal.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _PTHREAD_INTERNAL_H_ -#define _PTHREAD_INTERNAL_H_ - -#include - -__BEGIN_DECLS - -typedef struct pthread_internal_t -{ - struct pthread_internal_t* next; - struct pthread_internal_t** pref; - pthread_attr_t attr; - pid_t kernel_id; - pthread_cond_t join_cond; - int join_count; - void* return_value; - int intern; - __pthread_cleanup_t* cleanup_stack; - void** tls; /* thread-local storage area */ -} pthread_internal_t; - -extern void _init_thread(pthread_internal_t * thread, pid_t kernel_id, pthread_attr_t * attr, void * stack_base); - -/* needed by posix-timers.c */ - -static __inline__ void timespec_add( struct timespec* a, const struct timespec* b ) -{ - a->tv_sec += b->tv_sec; - a->tv_nsec += b->tv_nsec; - if (a->tv_nsec >= 1000000000) { - a->tv_nsec -= 1000000000; - a->tv_sec += 1; - } -} - -static __inline__ void timespec_sub( struct timespec* a, const struct timespec* b ) -{ - a->tv_sec -= b->tv_sec; - a->tv_nsec -= b->tv_nsec; - if (a->tv_nsec < 0) { - a->tv_nsec += 1000000000; - a->tv_sec -= 1; - } -} - -static __inline__ void timespec_zero( struct timespec* a ) -{ - a->tv_sec = a->tv_nsec = 0; -} - -static __inline__ int timespec_is_zero( const struct timespec* a ) -{ - return (a->tv_sec == 0 && a->tv_nsec == 0); -} - -static __inline__ int timespec_cmp( const struct timespec* a, const struct timespec* b ) -{ - if (a->tv_sec < b->tv_sec) return -1; - if (a->tv_sec > b->tv_sec) return +1; - if (a->tv_nsec < b->tv_nsec) return -1; - if (a->tv_nsec > b->tv_nsec) return +1; - return 0; -} - -static __inline__ int timespec_cmp0( const struct timespec* a ) -{ - if (a->tv_sec < 0) return -1; - if (a->tv_sec > 0) return +1; - if (a->tv_nsec < 0) return -1; - if (a->tv_nsec > 0) return +1; - return 0; -} - -extern int __pthread_cond_timedwait(pthread_cond_t*, - pthread_mutex_t*, - const struct timespec*, - clockid_t); - -extern int __pthread_cond_timedwait_relative(pthread_cond_t*, - pthread_mutex_t*, - const struct timespec*); - -/* needed by fork.c */ -extern void __timer_table_start_stop(int stop); - -__END_DECLS - -#endif /* _PTHREAD_INTERNAL_H_ */ diff --git a/libc/bionic/ptrace.c b/libc/bionic/ptrace.c deleted file mode 100644 index b1ca00ccd..000000000 --- a/libc/bionic/ptrace.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include - -extern long __ptrace(int request, pid_t pid, void *addr, void *data); - -long ptrace(int request, pid_t pid, void * addr, void * data) -{ - switch (request) { - case PTRACE_PEEKUSR: - case PTRACE_PEEKTEXT: - case PTRACE_PEEKDATA: - { - long word; - long ret; - - ret = __ptrace(request, pid, addr, &word); - if (ret == 0) { - return word; - } else { - // __ptrace will set errno for us - return -1; - } - } - - default: - return __ptrace(request, pid, addr, data); - } -} - -/* - * Hook for gdb to get notified when a thread is created - */ -void _thread_created_hook(pid_t thread_id) __attribute__((noinline)); -void _thread_created_hook(pid_t thread_id) -{ -} diff --git a/libc/bionic/pututline.c b/libc/bionic/pututline.c deleted file mode 100644 index 24490683e..000000000 --- a/libc/bionic/pututline.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include - - -void pututline(struct utmp* utmp) -{ - FILE* f; - struct utmp u; - int i; - - if (!(f = fopen(_PATH_UTMP, "w+"))) - return; - - while (fread(&u, sizeof(struct utmp), 1, f) == 1) - { - if (!strncmp(utmp->ut_line, u.ut_line, sizeof(u.ut_line) -1)) - { - if ((i = ftell(f)) < 0) - goto ret; - if (fseek(f, i - sizeof(struct utmp), SEEK_SET) < 0) - goto ret; - fwrite(utmp, sizeof(struct utmp), 1, f); - goto ret; - } - } - - - fclose(f); - - if (!(f = fopen(_PATH_UTMP, "w+"))) - return; - fwrite(utmp, sizeof(struct utmp), 1, f); - -ret: - fclose(f); -} diff --git a/libc/bionic/rand48.h b/libc/bionic/rand48.h deleted file mode 100644 index 0a3d83d3c..000000000 --- a/libc/bionic/rand48.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 1993 Martin Birgmeier - * All rights reserved. - * - * You may redistribute unmodified or modified versions of this source - * code provided that the above copyright notice and this and the - * following conditions are retained. - * - * This software is provided ``as is'', and comes with no warranties - * of any kind. I shall in no event be liable for anything that happens - * to anyone/anything when using this software. - * - * $FreeBSD: src/lib/libc/gen/rand48.h,v 1.2 2002/02/01 01:32:19 obrien Exp $ - */ - -#ifndef _RAND48_H_ -#define _RAND48_H_ - -#include -#include - -void _dorand48(unsigned short[3]); - -#define RAND48_SEED_0 (0x330e) -#define RAND48_SEED_1 (0xabcd) -#define RAND48_SEED_2 (0x1234) -#define RAND48_MULT_0 (0xe66d) -#define RAND48_MULT_1 (0xdeec) -#define RAND48_MULT_2 (0x0005) -#define RAND48_ADD (0x000b) - -#endif /* _RAND48_H_ */ diff --git a/libc/bionic/realpath.c b/libc/bionic/realpath.c deleted file mode 100644 index 274a3a097..000000000 --- a/libc/bionic/realpath.c +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (c) 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Jan-Simon Pendry. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)realpath.c 8.1 (Berkeley) 2/16/94"; -static char rcsid[] = -"$FreeBSD: /repoman/r/ncvs/src/lib/libc/stdlib/realpath.c,v 1.6.2.1 2003/08/03 23:47:39 nectar Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include -#include - -#include -#include -#include -#include -#include - -/* - * char *realpath(const char *path, char resolved_path[MAXPATHLEN]); - * - * Find the real name of path, by removing all ".", ".." and symlink - * components. Returns (resolved) on success, or (NULL) on failure, - * in which case the path which caused trouble is left in (resolved). - */ -char * -realpath(path, resolved) - const char *path; - char *resolved; -{ - struct stat sb; - int fd, n, rootd, serrno; - char *p, *q, wbuf[MAXPATHLEN]; - int symlinks = 0; - - /* Save the starting point. */ - if ((fd = open(".", O_RDONLY)) < 0) { - (void)strcpy(resolved, "."); - return (NULL); - } - - /* - * Find the dirname and basename from the path to be resolved. - * Change directory to the dirname component. - * lstat the basename part. - * if it is a symlink, read in the value and loop. - * if it is a directory, then change to that directory. - * get the current directory name and append the basename. - */ - (void)strncpy(resolved, path, MAXPATHLEN - 1); - resolved[MAXPATHLEN - 1] = '\0'; -loop: - q = strrchr(resolved, '/'); - if (q != NULL) { - p = q + 1; - if (q == resolved) - q = "/"; - else { - do { - --q; - } while (q > resolved && *q == '/'); - q[1] = '\0'; - q = resolved; - } - if (chdir(q) < 0) - goto err1; - } else - p = resolved; - - /* Deal with the last component. */ - if (*p != '\0' && lstat(p, &sb) == 0) { - if (S_ISLNK(sb.st_mode)) { - if (++symlinks > MAXSYMLINKS) { - errno = ELOOP; - goto err1; - } - n = readlink(p, resolved, MAXPATHLEN - 1); - if (n < 0) - goto err1; - resolved[n] = '\0'; - goto loop; - } - if (S_ISDIR(sb.st_mode)) { - if (chdir(p) < 0) - goto err1; - p = ""; - } - } - - /* - * Save the last component name and get the full pathname of - * the current directory. - */ - (void)strcpy(wbuf, p); - if (getcwd(resolved, MAXPATHLEN) == 0) - goto err1; - - /* - * Join the two strings together, ensuring that the right thing - * happens if the last component is empty, or the dirname is root. - */ - if (resolved[0] == '/' && resolved[1] == '\0') - rootd = 1; - else - rootd = 0; - - if (*wbuf) { - if (strlen(resolved) + strlen(wbuf) + (1-rootd) + 1 > - MAXPATHLEN) { - errno = ENAMETOOLONG; - goto err1; - } - if (rootd == 0) - (void)strcat(resolved, "/"); - (void)strcat(resolved, wbuf); - } - - /* Go back to where we came from. */ - if (fchdir(fd) < 0) { - serrno = errno; - goto err2; - } - - /* It's okay if the close fails, what's an fd more or less? */ - (void)close(fd); - return (resolved); - -err1: serrno = errno; - (void)fchdir(fd); -err2: (void)close(fd); - errno = serrno; - return (NULL); -} diff --git a/libc/bionic/rules.jam b/libc/bionic/rules.jam deleted file mode 100644 index 219526b79..000000000 --- a/libc/bionic/rules.jam +++ /dev/null @@ -1 +0,0 @@ -NO_LOCAL_SRC = malloc_leak.c ; diff --git a/libc/bionic/semaphore.c b/libc/bionic/semaphore.c deleted file mode 100644 index 0c94600b7..000000000 --- a/libc/bionic/semaphore.c +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include - -int sem_init(sem_t *sem, int pshared, unsigned int value) -{ - if (sem == NULL) { - errno = EINVAL; - return -1; - } - - if (pshared != 0) { - errno = ENOSYS; - return -1; - } - - sem->count = value; - return 0; -} - - -int sem_destroy(sem_t *sem) -{ - if (sem == NULL) { - errno = EINVAL; - return -1; - } - if (sem->count == 0) { - errno = EBUSY; - return -1; - } - return 0; -} - - -sem_t *sem_open(const char *name, int oflag, ...) -{ - name=name; - oflag=oflag; - - errno = ENOSYS; - return SEM_FAILED; -} - - -int sem_close(sem_t *sem) -{ - if (sem == NULL) { - errno = EINVAL; - return -1; - } - errno = ENOSYS; - return -1; -} - - -int sem_unlink(const char * name) -{ - errno = ENOSYS; - return -1; -} - - -static int -__atomic_dec_if_positive( volatile unsigned int* pvalue ) -{ - unsigned int old; - - do { - old = *pvalue; - } - while ( old != 0 && __atomic_cmpxchg( (int)old, (int)old-1, (volatile int*)pvalue ) != 0 ); - - return old; -} - -int sem_wait(sem_t *sem) -{ - if (sem == NULL) { - errno = EINVAL; - return -1; - } - - for (;;) { - if (__atomic_dec_if_positive(&sem->count)) - break; - - __futex_wait(&sem->count, 0, 0); - } - return 0; -} - -int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout) -{ - int ret; - - if (sem == NULL) { - errno = EINVAL; - return -1; - } - - /* POSIX says we need to try to decrement the semaphore - * before checking the timeout value */ - if (__atomic_dec_if_positive(&sem->count)) - return 0; - - /* check it as per Posix */ - if (abs_timeout == NULL || - abs_timeout->tv_sec < 0 || - abs_timeout->tv_nsec < 0 || - abs_timeout->tv_nsec >= 1000000000) - { - errno = EINVAL; - return -1; - } - - for (;;) { - struct timespec ts; - int ret; - - /* Posix mandates CLOCK_REALTIME here */ - clock_gettime( CLOCK_REALTIME, &ts ); - ts.tv_sec = abs_timeout->tv_sec - ts.tv_sec; - ts.tv_nsec = abs_timeout->tv_nsec - ts.tv_nsec; - if (ts.tv_nsec < 0) { - ts.tv_nsec += 1000000000; - ts.tv_sec -= 1; - } - - if (ts.tv_sec < 0 || ts.tv_nsec < 0) { - errno = ETIMEDOUT; - return -1; - } - - ret = __futex_wait(&sem->count, 0, &ts); - - /* return in case of timeout or interrupt */ - if (ret == -ETIMEDOUT || ret == -EINTR) { - errno = -ret; - return -1; - } - - if (__atomic_dec_if_positive(&sem->count)) - break; - } - return 0; -} - -int sem_post(sem_t *sem) -{ - if (sem == NULL) - return EINVAL; - - if (__atomic_inc((volatile int*)&sem->count) == 0) - __futex_wake(&sem->count, 1); - - return 0; -} - -int sem_trywait(sem_t *sem) -{ - if (sem == NULL) { - errno = EINVAL; - return -1; - } - - if (__atomic_dec_if_positive(&sem->count) > 0) { - return 0; - } else { - return EAGAIN; - } -} - -int sem_getvalue(sem_t *sem, int *sval) -{ - if (sem == NULL || sval == NULL) { - errno = EINVAL; - return -1; - } - - *sval = sem->count; - return 0; -} diff --git a/libc/bionic/sha1.c b/libc/bionic/sha1.c deleted file mode 100644 index efa95a55c..000000000 --- a/libc/bionic/sha1.c +++ /dev/null @@ -1,270 +0,0 @@ -/* $NetBSD: sha1.c,v 1.1 2005/12/20 20:29:40 christos Exp $ */ -/* $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $ */ - -/* - * SHA-1 in C - * By Steve Reid - * 100% Public Domain - * - * Test Vectors (from FIPS PUB 180-1) - * "abc" - * A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D - * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" - * 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 - * A million repetitions of "a" - * 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F - */ - -#define SHA1HANDSOFF /* Copies data before messing with it. */ - -#include -#include -#include -#include -#include - -#if HAVE_NBTOOL_CONFIG_H -#include "nbtool_config.h" -#endif - -#if !HAVE_SHA1_H - -#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) - -/* - * blk0() and blk() perform the initial expand. - * I got the idea of expanding during the round function from SSLeay - */ -#if BYTE_ORDER == LITTLE_ENDIAN -# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ - |(rol(block->l[i],8)&0x00FF00FF)) -#else -# define blk0(i) block->l[i] -#endif -#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ - ^block->l[(i+2)&15]^block->l[i&15],1)) - -/* - * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1 - */ -#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); -#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); -#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); - -typedef union { - u_char c[64]; - u_int l[16]; -} CHAR64LONG16; - -/* old sparc64 gcc could not compile this */ -#undef SPARC64_GCC_WORKAROUND -#if defined(__sparc64__) && defined(__GNUC__) && __GNUC__ < 3 -#define SPARC64_GCC_WORKAROUND -#endif - -#ifdef SPARC64_GCC_WORKAROUND -void do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *); -void do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *); -void do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *); -void do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *); - -#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i) -#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i) -#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i) -#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i) -#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i) - -void -do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block) -{ - nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3); - nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7); - nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11); - nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15); - nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19); -} - -void -do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block) -{ - nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23); - nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27); - nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31); - nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35); - nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39); -} - -void -do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block) -{ - nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43); - nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47); - nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51); - nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55); - nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59); -} - -void -do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block) -{ - nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63); - nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67); - nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71); - nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75); - nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79); -} -#endif - -/* - * Hash a single 512-bit block. This is the core of the algorithm. - */ -void SHA1Transform(state, buffer) - u_int32_t state[5]; - const u_char buffer[64]; -{ - u_int32_t a, b, c, d, e; - CHAR64LONG16 *block; - -#ifdef SHA1HANDSOFF - CHAR64LONG16 workspace; -#endif - - assert(buffer != 0); - assert(state != 0); - -#ifdef SHA1HANDSOFF - block = &workspace; - (void)memcpy(block, buffer, 64); -#else - block = (CHAR64LONG16 *)(void *)buffer; -#endif - - /* Copy context->state[] to working vars */ - a = state[0]; - b = state[1]; - c = state[2]; - d = state[3]; - e = state[4]; - -#ifdef SPARC64_GCC_WORKAROUND - do_R01(&a, &b, &c, &d, &e, block); - do_R2(&a, &b, &c, &d, &e, block); - do_R3(&a, &b, &c, &d, &e, block); - do_R4(&a, &b, &c, &d, &e, block); -#else - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); -#endif - - /* Add the working vars back into context.state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; - - /* Wipe variables */ - a = b = c = d = e = 0; -} - - -/* - * SHA1Init - Initialize new context - */ -void SHA1Init(context) - SHA1_CTX *context; -{ - - assert(context != 0); - - /* SHA1 initialization constants */ - context->state[0] = 0x67452301; - context->state[1] = 0xEFCDAB89; - context->state[2] = 0x98BADCFE; - context->state[3] = 0x10325476; - context->state[4] = 0xC3D2E1F0; - context->count[0] = context->count[1] = 0; -} - - -/* - * Run your data through this. - */ -void SHA1Update(context, data, len) - SHA1_CTX *context; - const u_char *data; - u_int len; -{ - u_int i, j; - - assert(context != 0); - assert(data != 0); - - j = context->count[0]; - if ((context->count[0] += len << 3) < j) - context->count[1] += (len>>29)+1; - j = (j >> 3) & 63; - if ((j + len) > 63) { - (void)memcpy(&context->buffer[j], data, (i = 64-j)); - SHA1Transform(context->state, context->buffer); - for ( ; i + 63 < len; i += 64) - SHA1Transform(context->state, &data[i]); - j = 0; - } else { - i = 0; - } - (void)memcpy(&context->buffer[j], &data[i], len - i); -} - - -/* - * Add padding and return the message digest. - */ -void SHA1Final(digest, context) - u_char digest[20]; - SHA1_CTX* context; -{ - u_int i; - u_char finalcount[8]; - - assert(digest != 0); - assert(context != 0); - - for (i = 0; i < 8; i++) { - finalcount[i] = (u_char)((context->count[(i >= 4 ? 0 : 1)] - >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ - } - SHA1Update(context, (const u_char *)"\200", 1); - while ((context->count[0] & 504) != 448) - SHA1Update(context, (const u_char *)"\0", 1); - SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ - - if (digest) { - for (i = 0; i < 20; i++) - digest[i] = (u_char) - ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); - } -} - -#endif /* HAVE_SHA1_H */ diff --git a/libc/bionic/ssp.c b/libc/bionic/ssp.c deleted file mode 100644 index 20794f4d0..000000000 --- a/libc/bionic/ssp.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include -#include -#include "logd.h" - -void *__stack_chk_guard = 0; - -/* Initialize the canary with a random value from /dev/urandom. - * If that fails, use the "terminator canary". */ -static void __attribute__ ((constructor)) -__guard_setup(void) -{ - int fd; - - fd = open("/dev/urandom", O_RDONLY); - if (fd != -1) { - ssize_t len = read(fd, &__stack_chk_guard, - sizeof(__stack_chk_guard)); - close(fd); - if (len == sizeof(__stack_chk_guard)) - return; - } - - /* If that failed, switch to 'terminator canary' */ - ((unsigned char *)&__stack_chk_guard)[0] = 0; - ((unsigned char *)&__stack_chk_guard)[1] = 0; - ((unsigned char *)&__stack_chk_guard)[2] = '\n'; - ((unsigned char *)&__stack_chk_guard)[3] = 255; -} - -/* This is the crash handler. - * Does a best effort at logging and calls _exit to terminate - * the process immediately (without atexit handlers, etc.) */ -void __stack_chk_fail(void) -{ - struct sigaction sa; - sigset_t sigmask; - static const char message[] = "stack corruption detected: aborted"; - char path[PATH_MAX]; - int count; - - /* Immediately block all (but SIGABRT) signal handlers from running code */ - sigfillset(&sigmask); - sigdelset(&sigmask, SIGABRT); - sigprocmask(SIG_BLOCK, &sigmask, NULL); - - /* Use /proc/self/exe link to obtain the program name for logging - * purposes. If it's not available, we set it to "unknown" */ - if ((count = readlink("/proc/self/exe", path, sizeof(path) - 1)) == -1) { - strlcpy(path, "unknown", sizeof(path)); - } else { - path[count] = '\0'; - } - - /* Do a best effort at logging. This ends up calling writev(2) */ - __libc_android_log_print(ANDROID_LOG_FATAL, path, message); - - /* Make sure there is no default action for SIGABRT */ - bzero(&sa, sizeof(struct sigaction)); - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - sa.sa_handler = SIG_DFL; - sigaction(SIGABRT, &sa, NULL); - - /* Terminate the process and exit immediately */ - kill(getpid(), SIGABRT); - - _exit(127); -} diff --git a/libc/bionic/stubs.c b/libc/bionic/stubs.c deleted file mode 100644 index 365f21a2a..000000000 --- a/libc/bionic/stubs.c +++ /dev/null @@ -1,380 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** Thread-specific state for the stubs functions - **/ - -pthread_once_t the_once = PTHREAD_ONCE_INIT; -pthread_key_t the_key; - -typedef struct { - struct passwd passwd; - struct group group; - char* group_members[2]; - char app_name_buffer[32]; - char group_name_buffer[32]; -} stubs_state_t; - -static void -stubs_state_free( void* _s ) -{ - stubs_state_t* s = _s; - free(s); -} - -static stubs_state_t* -stubs_state_alloc( void ) -{ - stubs_state_t* s = calloc(1, sizeof *s); - - if (s != NULL) { - s->group.gr_mem = s->group_members; - } - return s; -} - -static void __stubs_key_init(void) -{ - pthread_key_create( &the_key, stubs_state_free ); -} - -static stubs_state_t* -__stubs_state(void) -{ - stubs_state_t* s; - - pthread_once(&the_once, __stubs_key_init); - s = pthread_getspecific(the_key); - if (s == NULL) { - s = stubs_state_alloc(); - if (s == NULL) { - errno = ENOMEM; /* just in case */ - } else { - if ( pthread_setspecific(the_key, s) != 0 ) { - stubs_state_free(s); - errno = ENOMEM; - s = NULL; - } - } - } - return s; -} - -static struct passwd* -android_iinfo_to_passwd( struct passwd *pw, - struct android_id_info *iinfo ) -{ - pw->pw_name = (char*)iinfo->name; - pw->pw_uid = iinfo->aid; - pw->pw_gid = iinfo->aid; - pw->pw_dir = "/"; - pw->pw_shell = "/system/bin/sh"; - return pw; -} - -static struct group* -android_iinfo_to_group( struct group *gr, - struct android_id_info *iinfo ) -{ - gr->gr_name = (char*) iinfo->name; - gr->gr_gid = iinfo->aid; - gr->gr_mem[0] = gr->gr_name; - gr->gr_mem[1] = NULL; - return gr; -} - -static struct passwd * -android_id_to_passwd( struct passwd *pw, unsigned id) -{ - struct android_id_info *iinfo = android_ids; - unsigned n; - for (n = 0; n < android_id_count; n++) { - if (iinfo[n].aid == id) { - return android_iinfo_to_passwd(pw, iinfo + n); - } - } - return NULL; -} - -static struct passwd* -android_name_to_passwd(struct passwd *pw, const char *name) -{ - struct android_id_info *iinfo = android_ids; - unsigned n; - for (n = 0; n < android_id_count; n++) { - if (!strcmp(iinfo[n].name, name)) { - return android_iinfo_to_passwd(pw, iinfo + n); - } - } - return NULL; -} - -static struct group* -android_id_to_group( struct group *gr, unsigned id ) -{ - struct android_id_info *iinfo = android_ids; - unsigned n; - for (n = 0; n < android_id_count; n++) { - if (iinfo[n].aid == id) { - return android_iinfo_to_group(gr, iinfo + n); - } - } - return NULL; -} - -static struct group* -android_name_to_group( struct group *gr, const char *name ) -{ - struct android_id_info *iinfo = android_ids; - unsigned n; - for (n = 0; n < android_id_count; n++) { - if (!strcmp(iinfo[n].name, name)) { - return android_iinfo_to_group(gr, iinfo + n); - } - } - return NULL; -} - -/* translate a user/group name like app_1234 into the - * corresponding user/group id (AID_APP + 1234) - * returns 0 and sets errno to ENOENT in case of error - */ -static unsigned -app_id_from_name( const char* name ) -{ - unsigned long id; - char* end; - - if (memcmp(name, "app_", 4) != 0 || !isdigit(name[4])) - goto FAIL; - - id = strtoul(name+4, &end, 10); - if (id == 0 || *end != '\0') - goto FAIL; - - id += AID_APP; - - /* check for overflow and that the value can be - * stored in our 32-bit uid_t/gid_t */ - if (id < AID_APP || (unsigned)id != id) - goto FAIL; - - return (unsigned)id; - -FAIL: - errno = ENOENT; - return 0; -} - -/* translate a uid into the corresponding app_ - * passwd structure (sets errno to ENOENT on failure) - */ -static struct passwd* -app_id_to_passwd(uid_t uid, stubs_state_t* state) -{ - struct passwd* pw = &state->passwd; - - if (uid < AID_APP) { - errno = ENOENT; - return NULL; - } - - snprintf( state->app_name_buffer, sizeof state->app_name_buffer, - "app_%u", uid - AID_APP ); - - pw->pw_name = state->app_name_buffer; - pw->pw_dir = "/data"; - pw->pw_shell = "/system/bin/sh"; - pw->pw_uid = uid; - pw->pw_gid = uid; - - return pw; -} - -/* translate a gid into the corresponding app_ - * group structure (sets errno to ENOENT on failure) - */ -static struct group* -app_id_to_group(gid_t gid, stubs_state_t* state) -{ - struct group* gr = &state->group; - - if (gid < AID_APP) { - errno = ENOENT; - return NULL; - } - - snprintf(state->group_name_buffer, sizeof state->group_name_buffer, - "app_%u", gid - AID_APP); - - gr->gr_name = state->group_name_buffer; - gr->gr_gid = gid; - gr->gr_mem[0] = gr->gr_name; - gr->gr_mem[1] = NULL; - - return gr; -} - - -struct passwd* -getpwuid(uid_t uid) -{ - stubs_state_t* state = __stubs_state(); - struct passwd* pw; - - if (state == NULL) - return NULL; - - pw = &state->passwd; - - if ( android_id_to_passwd(pw, uid) != NULL ) - return pw; - - return app_id_to_passwd(uid, state); -} - -struct passwd* -getpwnam(const char *login) -{ - stubs_state_t* state = __stubs_state(); - - if (state == NULL) - return NULL; - - if (android_name_to_passwd(&state->passwd, login) != NULL) - return &state->passwd; - - return app_id_to_passwd( app_id_from_name(login), state ); -} - -int -getgrouplist (const char *user, gid_t group, - gid_t *groups, int *ngroups) -{ - if (*ngroups < 1) { - *ngroups = 1; - return -1; - } - groups[0] = group; - return (*ngroups = 1); -} - -char* -getlogin(void) -{ - struct passwd *pw = getpwuid(getuid()); - - if(pw) { - return pw->pw_name; - } else { - return NULL; - } -} - -struct group* -getgrgid(gid_t gid) -{ - stubs_state_t* state = __stubs_state(); - struct group* gr; - - if (state == NULL) - return NULL; - - gr = android_id_to_group(&state->group, gid); - if (gr != NULL) - return gr; - - return app_id_to_group(gid, state); -} - -struct group* -getgrnam(const char *name) -{ - stubs_state_t* state = __stubs_state(); - unsigned id; - - if (state == NULL) - return NULL; - - if (android_name_to_group(&state->group, name) != 0) - return &state->group; - - return app_id_to_group( app_id_from_name(name), state ); -} - - -struct netent* getnetbyname(const char *name) -{ - fprintf(stderr, "FIX ME! implement getgrnam() %s:%d\n", __FILE__, __LINE__); - return NULL; -} - -void endpwent(void) -{ -} - -struct mntent* getmntent(FILE* f) -{ - fprintf(stderr, "FIX ME! implement getmntent() %s:%d\n", __FILE__, __LINE__); - return NULL; -} - -char* ttyname(int fd) -{ - fprintf(stderr, "FIX ME! implement ttyname() %s:%d\n", __FILE__, __LINE__); - return NULL; -} - -struct netent *getnetbyaddr(uint32_t net, int type) -{ - fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); - return NULL; -} - -struct protoent *getprotobyname(const char *name) -{ - fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); - return NULL; -} - -struct protoent *getprotobynumber(int proto) -{ - fprintf(stderr, "FIX ME! implement %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__); - return NULL; -} diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c deleted file mode 100644 index 5e3b9e725..000000000 --- a/libc/bionic/system_properties.c +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#include - -#include - -static const char property_service_name[] = PROP_SERVICE_NAME; - -static unsigned dummy_props = 0; - -prop_area *__system_property_area__ = (void*) &dummy_props; - -int __system_properties_init(void) -{ - prop_area *pa; - int s, fd; - unsigned sz; - char *env; - - if(__system_property_area__ != ((void*) &dummy_props)) { - return 0; - } - - env = getenv("ANDROID_PROPERTY_WORKSPACE"); - if (!env) { - return -1; - } - fd = atoi(env); - env = strchr(env, ','); - if (!env) { - return -1; - } - sz = atoi(env + 1); - - pa = mmap(0, sz, PROT_READ, MAP_SHARED, fd, 0); - - if(pa == MAP_FAILED) { - return -1; - } - - if((pa->magic != PROP_AREA_MAGIC) || (pa->version != PROP_AREA_VERSION)) { - munmap(pa, sz); - return -1; - } - - __system_property_area__ = pa; - return 0; -} - -const prop_info *__system_property_find_nth(unsigned n) -{ - prop_area *pa = __system_property_area__; - - if(n >= pa->count) { - return 0; - } else { - return TOC_TO_INFO(pa, pa->toc[n]); - } -} - -const prop_info *__system_property_find(const char *name) -{ - prop_area *pa = __system_property_area__; - unsigned count = pa->count; - unsigned *toc = pa->toc; - unsigned len = strlen(name); - prop_info *pi; - - while(count--) { - unsigned entry = *toc++; - if(TOC_NAME_LEN(entry) != len) continue; - - pi = TOC_TO_INFO(pa, entry); - if(memcmp(name, pi->name, len)) continue; - - return pi; - } - - return 0; -} - -int __system_property_read(const prop_info *pi, char *name, char *value) -{ - unsigned serial, len; - - for(;;) { - serial = pi->serial; - while(SERIAL_DIRTY(serial)) { - __futex_wait(&pi->serial, serial, 0); - serial = pi->serial; - } - len = SERIAL_VALUE_LEN(serial); - memcpy(value, pi->value, len + 1); - if(serial == pi->serial) { - if(name != 0) { - strcpy(name, pi->name); - } - return len; - } - } -} - -int __system_property_get(const char *name, char *value) -{ - const prop_info *pi = __system_property_find(name); - - if(pi != 0) { - return __system_property_read(pi, 0, value); - } else { - value[0] = 0; - return 0; - } -} - -int __system_property_wait(const prop_info *pi) -{ - unsigned n; - if(pi == 0) { - prop_area *pa = __system_property_area__; - n = pa->serial; - do { - __futex_wait(&pa->serial, n, 0); - } while(n == pa->serial); - } else { - n = pi->serial; - do { - __futex_wait(&pi->serial, n, 0); - } while(n == pi->serial); - } - return 0; -} diff --git a/libc/bionic/thread_atexit.c b/libc/bionic/thread_atexit.c deleted file mode 100644 index dc4a5a0ff..000000000 --- a/libc/bionic/thread_atexit.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* some simple glue used to make the BSD atexit code happy */ - -#include -#include "pthread_internal.h" - -static pthread_mutex_t gAtExitLock = PTHREAD_MUTEX_INITIALIZER; - -void _thread_atexit_lock( void ) -{ - pthread_mutex_lock( &gAtExitLock ); -} - -void _thread_atexit_unlock( void ) -{ - pthread_mutex_unlock( &gAtExitLock ); -} - diff --git a/libc/bionic/time64.c b/libc/bionic/time64.c deleted file mode 100644 index 1e1f88189..000000000 --- a/libc/bionic/time64.c +++ /dev/null @@ -1,793 +0,0 @@ -/* - -Copyright (c) 2007-2008 Michael G Schwern - -This software originally derived from Paul Sheer's pivotal_gmtime_r.c. - -The MIT License: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -*/ - -/* See http://code.google.com/p/y2038 for this code's origin */ - -/* - -Programmers who have available to them 64-bit time values as a 'long -long' type can use localtime64_r() and gmtime64_r() which correctly -converts the time even on 32-bit systems. Whether you have 64-bit time -values will depend on the operating system. - -localtime64_r() is a 64-bit equivalent of localtime_r(). - -gmtime64_r() is a 64-bit equivalent of gmtime_r(). - -*/ - -#include -#include -#include -#include -#include -#include -#include "time64.h" - -/* BIONIC_BEGIN */ -/* the following are here to avoid exposing time64_config.h and - * other types in our public time64.h header - */ -#include "time64_config.h" - -/* Not everyone has gm/localtime_r(), provide a replacement */ -#ifdef HAS_LOCALTIME_R -# define LOCALTIME_R(clock, result) localtime_r(clock, result) -#else -# define LOCALTIME_R(clock, result) fake_localtime_r(clock, result) -#endif -#ifdef HAS_GMTIME_R -# define GMTIME_R(clock, result) gmtime_r(clock, result) -#else -# define GMTIME_R(clock, result) fake_gmtime_r(clock, result) -#endif - -typedef int64_t Int64; -typedef time64_t Time64_T; -typedef int64_t Year; -#define TM tm -/* BIONIC_END */ - -/* Spec says except for stftime() and the _r() functions, these - all return static memory. Stabbings! */ -static struct TM Static_Return_Date; -static char Static_Return_String[35]; - -static const int days_in_month[2][12] = { - {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, - {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, -}; - -static const int julian_days_by_month[2][12] = { - {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}, - {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335}, -}; - -static char const wday_name[7][3] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -}; - -static char const mon_name[12][3] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" -}; - -static const int length_of_year[2] = { 365, 366 }; - -/* Some numbers relating to the gregorian cycle */ -static const Year years_in_gregorian_cycle = 400; -#define days_in_gregorian_cycle ((365 * 400) + 100 - 4 + 1) -static const Time64_T seconds_in_gregorian_cycle = days_in_gregorian_cycle * 60LL * 60LL * 24LL; - -/* Year range we can trust the time funcitons with */ -#define MAX_SAFE_YEAR 2037 -#define MIN_SAFE_YEAR 1971 - -/* 28 year Julian calendar cycle */ -#define SOLAR_CYCLE_LENGTH 28 - -/* Year cycle from MAX_SAFE_YEAR down. */ -static const int safe_years_high[SOLAR_CYCLE_LENGTH] = { - 2016, 2017, 2018, 2019, - 2020, 2021, 2022, 2023, - 2024, 2025, 2026, 2027, - 2028, 2029, 2030, 2031, - 2032, 2033, 2034, 2035, - 2036, 2037, 2010, 2011, - 2012, 2013, 2014, 2015 -}; - -/* Year cycle from MIN_SAFE_YEAR up */ -static const int safe_years_low[SOLAR_CYCLE_LENGTH] = { - 1996, 1997, 1998, 1971, - 1972, 1973, 1974, 1975, - 1976, 1977, 1978, 1979, - 1980, 1981, 1982, 1983, - 1984, 1985, 1986, 1987, - 1988, 1989, 1990, 1991, - 1992, 1993, 1994, 1995, -}; - -/* This isn't used, but it's handy to look at */ -static const int dow_year_start[SOLAR_CYCLE_LENGTH] = { - 5, 0, 1, 2, /* 0 2016 - 2019 */ - 3, 5, 6, 0, /* 4 */ - 1, 3, 4, 5, /* 8 1996 - 1998, 1971*/ - 6, 1, 2, 3, /* 12 1972 - 1975 */ - 4, 6, 0, 1, /* 16 */ - 2, 4, 5, 6, /* 20 2036, 2037, 2010, 2011 */ - 0, 2, 3, 4 /* 24 2012, 2013, 2014, 2015 */ -}; - -/* Let's assume people are going to be looking for dates in the future. - Let's provide some cheats so you can skip ahead. - This has a 4x speed boost when near 2008. -*/ -/* Number of days since epoch on Jan 1st, 2008 GMT */ -#define CHEAT_DAYS (1199145600 / 24 / 60 / 60) -#define CHEAT_YEARS 108 - -#define IS_LEAP(n) ((!(((n) + 1900) % 400) || (!(((n) + 1900) % 4) && (((n) + 1900) % 100))) != 0) -#define WRAP(a,b,m) ((a) = ((a) < 0 ) ? ((b)--, (a) + (m)) : (a)) - -#ifdef USE_SYSTEM_LOCALTIME -# define SHOULD_USE_SYSTEM_LOCALTIME(a) ( \ - (a) <= SYSTEM_LOCALTIME_MAX && \ - (a) >= SYSTEM_LOCALTIME_MIN \ -) -#else -# define SHOULD_USE_SYSTEM_LOCALTIME(a) (0) -#endif - -#ifdef USE_SYSTEM_GMTIME -# define SHOULD_USE_SYSTEM_GMTIME(a) ( \ - (a) <= SYSTEM_GMTIME_MAX && \ - (a) >= SYSTEM_GMTIME_MIN \ -) -#else -# define SHOULD_USE_SYSTEM_GMTIME(a) (0) -#endif - -/* Multi varadic macros are a C99 thing, alas */ -#ifdef TIME_64_DEBUG -# define TRACE(format) (fprintf(stderr, format)) -# define TRACE1(format, var1) (fprintf(stderr, format, var1)) -# define TRACE2(format, var1, var2) (fprintf(stderr, format, var1, var2)) -# define TRACE3(format, var1, var2, var3) (fprintf(stderr, format, var1, var2, var3)) -#else -# define TRACE(format) ((void)0) -# define TRACE1(format, var1) ((void)0) -# define TRACE2(format, var1, var2) ((void)0) -# define TRACE3(format, var1, var2, var3) ((void)0) -#endif - - -static int is_exception_century(Year year) -{ - int is_exception = ((year % 100 == 0) && !(year % 400 == 0)); - TRACE1("# is_exception_century: %s\n", is_exception ? "yes" : "no"); - - return(is_exception); -} - - -/* timegm() is not in the C or POSIX spec, but it is such a useful - extension I would be remiss in leaving it out. Also I need it - for localtime64() -*/ -Time64_T timegm64(const struct TM *date) { - Time64_T days = 0; - Time64_T seconds = 0; - Year year; - Year orig_year = (Year)date->tm_year; - int cycles = 0; - - if( orig_year > 100 ) { - cycles = (orig_year - 100) / 400; - orig_year -= cycles * 400; - days += (Time64_T)cycles * days_in_gregorian_cycle; - } - else if( orig_year < -300 ) { - cycles = (orig_year - 100) / 400; - orig_year -= cycles * 400; - days += (Time64_T)cycles * days_in_gregorian_cycle; - } - TRACE3("# timegm/ cycles: %d, days: %lld, orig_year: %lld\n", cycles, days, orig_year); - - if( orig_year > 70 ) { - year = 70; - while( year < orig_year ) { - days += length_of_year[IS_LEAP(year)]; - year++; - } - } - else if ( orig_year < 70 ) { - year = 69; - do { - days -= length_of_year[IS_LEAP(year)]; - year--; - } while( year >= orig_year ); - } - - - days += julian_days_by_month[IS_LEAP(orig_year)][date->tm_mon]; - days += date->tm_mday - 1; - - seconds = days * 60 * 60 * 24; - - seconds += date->tm_hour * 60 * 60; - seconds += date->tm_min * 60; - seconds += date->tm_sec; - - return(seconds); -} - - -static int check_tm(struct TM *tm) -{ - /* Don't forget leap seconds */ - assert(tm->tm_sec >= 0); - assert(tm->tm_sec <= 61); - - assert(tm->tm_min >= 0); - assert(tm->tm_min <= 59); - - assert(tm->tm_hour >= 0); - assert(tm->tm_hour <= 23); - - assert(tm->tm_mday >= 1); - assert(tm->tm_mday <= days_in_month[IS_LEAP(tm->tm_year)][tm->tm_mon]); - - assert(tm->tm_mon >= 0); - assert(tm->tm_mon <= 11); - - assert(tm->tm_wday >= 0); - assert(tm->tm_wday <= 6); - - assert(tm->tm_yday >= 0); - assert(tm->tm_yday <= length_of_year[IS_LEAP(tm->tm_year)]); - -#ifdef HAS_TM_TM_GMTOFF - assert(tm->tm_gmtoff >= -24 * 60 * 60); - assert(tm->tm_gmtoff <= 24 * 60 * 60); -#endif - - return 1; -} - - -/* The exceptional centuries without leap years cause the cycle to - shift by 16 -*/ -static Year cycle_offset(Year year) -{ - const Year start_year = 2000; - Year year_diff = year - start_year; - Year exceptions; - - if( year > start_year ) - year_diff--; - - exceptions = year_diff / 100; - exceptions -= year_diff / 400; - - TRACE3("# year: %lld, exceptions: %lld, year_diff: %lld\n", - year, exceptions, year_diff); - - return exceptions * 16; -} - -/* For a given year after 2038, pick the latest possible matching - year in the 28 year calendar cycle. - - A matching year... - 1) Starts on the same day of the week. - 2) Has the same leap year status. - - This is so the calendars match up. - - Also the previous year must match. When doing Jan 1st you might - wind up on Dec 31st the previous year when doing a -UTC time zone. - - Finally, the next year must have the same start day of week. This - is for Dec 31st with a +UTC time zone. - It doesn't need the same leap year status since we only care about - January 1st. -*/ -static int safe_year(const Year year) -{ - int safe_year = 0; - Year year_cycle; - - if( year >= MIN_SAFE_YEAR && year <= MAX_SAFE_YEAR ) { - return (int)year; - } - - year_cycle = year + cycle_offset(year); - - /* safe_years_low is off from safe_years_high by 8 years */ - if( year < MIN_SAFE_YEAR ) - year_cycle -= 8; - - /* Change non-leap xx00 years to an equivalent */ - if( is_exception_century(year) ) - year_cycle += 11; - - /* Also xx01 years, since the previous year will be wrong */ - if( is_exception_century(year - 1) ) - year_cycle += 17; - - year_cycle %= SOLAR_CYCLE_LENGTH; - if( year_cycle < 0 ) - year_cycle = SOLAR_CYCLE_LENGTH + year_cycle; - - assert( year_cycle >= 0 ); - assert( year_cycle < SOLAR_CYCLE_LENGTH ); - if( year < MIN_SAFE_YEAR ) - safe_year = safe_years_low[year_cycle]; - else if( year > MAX_SAFE_YEAR ) - safe_year = safe_years_high[year_cycle]; - else - assert(0); - - TRACE3("# year: %lld, year_cycle: %lld, safe_year: %d\n", - year, year_cycle, safe_year); - - assert(safe_year <= MAX_SAFE_YEAR && safe_year >= MIN_SAFE_YEAR); - - return safe_year; -} - - -void copy_tm_to_TM(const struct tm *src, struct TM *dest) { - if( src == NULL ) { - memset(dest, 0, sizeof(*dest)); - } - else { -# ifdef USE_TM64 - dest->tm_sec = src->tm_sec; - dest->tm_min = src->tm_min; - dest->tm_hour = src->tm_hour; - dest->tm_mday = src->tm_mday; - dest->tm_mon = src->tm_mon; - dest->tm_year = (Year)src->tm_year; - dest->tm_wday = src->tm_wday; - dest->tm_yday = src->tm_yday; - dest->tm_isdst = src->tm_isdst; - -# ifdef HAS_TM_TM_GMTOFF - dest->tm_gmtoff = src->tm_gmtoff; -# endif - -# ifdef HAS_TM_TM_ZONE - dest->tm_zone = src->tm_zone; -# endif - -# else - /* They're the same type */ - memcpy(dest, src, sizeof(*dest)); -# endif - } -} - - -void copy_TM_to_tm(const struct TM *src, struct tm *dest) { - if( src == NULL ) { - memset(dest, 0, sizeof(*dest)); - } - else { -# ifdef USE_TM64 - dest->tm_sec = src->tm_sec; - dest->tm_min = src->tm_min; - dest->tm_hour = src->tm_hour; - dest->tm_mday = src->tm_mday; - dest->tm_mon = src->tm_mon; - dest->tm_year = (int)src->tm_year; - dest->tm_wday = src->tm_wday; - dest->tm_yday = src->tm_yday; - dest->tm_isdst = src->tm_isdst; - -# ifdef HAS_TM_TM_GMTOFF - dest->tm_gmtoff = src->tm_gmtoff; -# endif - -# ifdef HAS_TM_TM_ZONE - dest->tm_zone = src->tm_zone; -# endif - -# else - /* They're the same type */ - memcpy(dest, src, sizeof(*dest)); -# endif - } -} - - -/* Simulate localtime_r() to the best of our ability */ -struct tm * fake_localtime_r(const time_t *clock, struct tm *result) { - const struct tm *static_result = localtime(clock); - - assert(result != NULL); - - if( static_result == NULL ) { - memset(result, 0, sizeof(*result)); - return NULL; - } - else { - memcpy(result, static_result, sizeof(*result)); - return result; - } -} - - - -/* Simulate gmtime_r() to the best of our ability */ -struct tm * fake_gmtime_r(const time_t *clock, struct tm *result) { - const struct tm *static_result = gmtime(clock); - - assert(result != NULL); - - if( static_result == NULL ) { - memset(result, 0, sizeof(*result)); - return NULL; - } - else { - memcpy(result, static_result, sizeof(*result)); - return result; - } -} - - -static Time64_T seconds_between_years(Year left_year, Year right_year) { - int increment = (left_year > right_year) ? 1 : -1; - Time64_T seconds = 0; - int cycles; - - if( left_year > 2400 ) { - cycles = (left_year - 2400) / 400; - left_year -= cycles * 400; - seconds += cycles * seconds_in_gregorian_cycle; - } - else if( left_year < 1600 ) { - cycles = (left_year - 1600) / 400; - left_year += cycles * 400; - seconds += cycles * seconds_in_gregorian_cycle; - } - - while( left_year != right_year ) { - seconds += length_of_year[IS_LEAP(right_year - 1900)] * 60 * 60 * 24; - right_year += increment; - } - - return seconds * increment; -} - - -Time64_T mktime64(const struct TM *input_date) { - struct tm safe_date; - struct TM date; - Time64_T time; - Year year = input_date->tm_year + 1900; - - if( MIN_SAFE_YEAR <= year && year <= MAX_SAFE_YEAR ) { - copy_TM_to_tm(input_date, &safe_date); - return (Time64_T)mktime(&safe_date); - } - - /* Have to make the year safe in date else it won't fit in safe_date */ - date = *input_date; - date.tm_year = safe_year(year) - 1900; - copy_TM_to_tm(&date, &safe_date); - - time = (Time64_T)mktime(&safe_date); - - time += seconds_between_years(year, (Year)(safe_date.tm_year + 1900)); - - return time; -} - - -/* Because I think mktime() is a crappy name */ -Time64_T timelocal64(const struct TM *date) { - return mktime64(date); -} - - -struct TM *gmtime64_r (const Time64_T *in_time, struct TM *p) -{ - int v_tm_sec, v_tm_min, v_tm_hour, v_tm_mon, v_tm_wday; - Time64_T v_tm_tday; - int leap; - Time64_T m; - Time64_T time = *in_time; - Year year = 70; - int cycles = 0; - - assert(p != NULL); - - /* Use the system gmtime() if time_t is small enough */ - if( SHOULD_USE_SYSTEM_GMTIME(*in_time) ) { - time_t safe_time = *in_time; - struct tm safe_date; - GMTIME_R(&safe_time, &safe_date); - - copy_tm_to_TM(&safe_date, p); - assert(check_tm(p)); - - return p; - } - -#ifdef HAS_TM_TM_GMTOFF - p->tm_gmtoff = 0; -#endif - p->tm_isdst = 0; - -#ifdef HAS_TM_TM_ZONE - p->tm_zone = "UTC"; -#endif - - v_tm_sec = (int)(time % 60); - time /= 60; - v_tm_min = (int)(time % 60); - time /= 60; - v_tm_hour = (int)(time % 24); - time /= 24; - v_tm_tday = time; - - WRAP (v_tm_sec, v_tm_min, 60); - WRAP (v_tm_min, v_tm_hour, 60); - WRAP (v_tm_hour, v_tm_tday, 24); - - v_tm_wday = (int)((v_tm_tday + 4) % 7); - if (v_tm_wday < 0) - v_tm_wday += 7; - m = v_tm_tday; - - if (m >= CHEAT_DAYS) { - year = CHEAT_YEARS; - m -= CHEAT_DAYS; - } - - if (m >= 0) { - /* Gregorian cycles, this is huge optimization for distant times */ - cycles = (int)(m / (Time64_T) days_in_gregorian_cycle); - if( cycles ) { - m -= (cycles * (Time64_T) days_in_gregorian_cycle); - year += (cycles * years_in_gregorian_cycle); - } - - /* Years */ - leap = IS_LEAP (year); - while (m >= (Time64_T) length_of_year[leap]) { - m -= (Time64_T) length_of_year[leap]; - year++; - leap = IS_LEAP (year); - } - - /* Months */ - v_tm_mon = 0; - while (m >= (Time64_T) days_in_month[leap][v_tm_mon]) { - m -= (Time64_T) days_in_month[leap][v_tm_mon]; - v_tm_mon++; - } - } else { - year--; - - /* Gregorian cycles */ - cycles = (int)((m / (Time64_T) days_in_gregorian_cycle) + 1); - if( cycles ) { - m -= (cycles * (Time64_T) days_in_gregorian_cycle); - year += (cycles * years_in_gregorian_cycle); - } - - /* Years */ - leap = IS_LEAP (year); - while (m < (Time64_T) -length_of_year[leap]) { - m += (Time64_T) length_of_year[leap]; - year--; - leap = IS_LEAP (year); - } - - /* Months */ - v_tm_mon = 11; - while (m < (Time64_T) -days_in_month[leap][v_tm_mon]) { - m += (Time64_T) days_in_month[leap][v_tm_mon]; - v_tm_mon--; - } - m += (Time64_T) days_in_month[leap][v_tm_mon]; - } - - p->tm_year = year; - if( p->tm_year != year ) { -#ifdef EOVERFLOW - errno = EOVERFLOW; -#endif - return NULL; - } - - /* At this point m is less than a year so casting to an int is safe */ - p->tm_mday = (int) m + 1; - p->tm_yday = julian_days_by_month[leap][v_tm_mon] + (int)m; - p->tm_sec = v_tm_sec; - p->tm_min = v_tm_min; - p->tm_hour = v_tm_hour; - p->tm_mon = v_tm_mon; - p->tm_wday = v_tm_wday; - - assert(check_tm(p)); - - return p; -} - - -struct TM *localtime64_r (const Time64_T *time, struct TM *local_tm) -{ - time_t safe_time; - struct tm safe_date; - struct TM gm_tm; - Year orig_year; - int month_diff; - - assert(local_tm != NULL); - - /* Use the system localtime() if time_t is small enough */ - if( SHOULD_USE_SYSTEM_LOCALTIME(*time) ) { - safe_time = *time; - - TRACE1("Using system localtime for %lld\n", *time); - - LOCALTIME_R(&safe_time, &safe_date); - - copy_tm_to_TM(&safe_date, local_tm); - assert(check_tm(local_tm)); - - return local_tm; - } - - if( gmtime64_r(time, &gm_tm) == NULL ) { - TRACE1("gmtime64_r returned null for %lld\n", *time); - return NULL; - } - - orig_year = gm_tm.tm_year; - - if (gm_tm.tm_year > (2037 - 1900) || - gm_tm.tm_year < (1970 - 1900) - ) - { - TRACE1("Mapping tm_year %lld to safe_year\n", (Year)gm_tm.tm_year); - gm_tm.tm_year = safe_year((Year)(gm_tm.tm_year + 1900)) - 1900; - } - - safe_time = timegm64(&gm_tm); - if( LOCALTIME_R(&safe_time, &safe_date) == NULL ) { - TRACE1("localtime_r(%d) returned NULL\n", (int)safe_time); - return NULL; - } - - copy_tm_to_TM(&safe_date, local_tm); - - local_tm->tm_year = orig_year; - if( local_tm->tm_year != orig_year ) { - TRACE2("tm_year overflow: tm_year %lld, orig_year %lld\n", - (Year)local_tm->tm_year, (Year)orig_year); - -#ifdef EOVERFLOW - errno = EOVERFLOW; -#endif - return NULL; - } - - - month_diff = local_tm->tm_mon - gm_tm.tm_mon; - - /* When localtime is Dec 31st previous year and - gmtime is Jan 1st next year. - */ - if( month_diff == 11 ) { - local_tm->tm_year--; - } - - /* When localtime is Jan 1st, next year and - gmtime is Dec 31st, previous year. - */ - if( month_diff == -11 ) { - local_tm->tm_year++; - } - - /* GMT is Jan 1st, xx01 year, but localtime is still Dec 31st - in a non-leap xx00. There is one point in the cycle - we can't account for which the safe xx00 year is a leap - year. So we need to correct for Dec 31st comming out as - the 366th day of the year. - */ - if( !IS_LEAP(local_tm->tm_year) && local_tm->tm_yday == 365 ) - local_tm->tm_yday--; - - assert(check_tm(local_tm)); - - return local_tm; -} - - -int valid_tm_wday( const struct TM* date ) { - if( 0 <= date->tm_wday && date->tm_wday <= 6 ) - return 1; - else - return 0; -} - -int valid_tm_mon( const struct TM* date ) { - if( 0 <= date->tm_mon && date->tm_mon <= 11 ) - return 1; - else - return 0; -} - - -char *asctime64_r( const struct TM* date, char *result ) { - /* I figure everything else can be displayed, even hour 25, but if - these are out of range we walk off the name arrays */ - if( !valid_tm_wday(date) || !valid_tm_mon(date) ) - return NULL; - - sprintf(result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", - wday_name[date->tm_wday], - mon_name[date->tm_mon], - date->tm_mday, date->tm_hour, - date->tm_min, date->tm_sec, - 1900 + date->tm_year); - - return result; -} - - -char *ctime64_r( const Time64_T* time, char* result ) { - struct TM date; - - localtime64_r( time, &date ); - return asctime64_r( &date, result ); -} - - -/* Non-thread safe versions of the above */ -struct TM *localtime64(const Time64_T *time) { - return localtime64_r(time, &Static_Return_Date); -} - -struct TM *gmtime64(const Time64_T *time) { - return gmtime64_r(time, &Static_Return_Date); -} - -char *asctime64( const struct TM* date ) { - return asctime64_r( date, Static_Return_String ); -} - -char *ctime64( const Time64_T* time ) { - return asctime64(localtime64(time)); -} diff --git a/libc/bionic/time64_config.h b/libc/bionic/time64_config.h deleted file mode 100644 index 53bcecf6b..000000000 --- a/libc/bionic/time64_config.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Debugging - TIME_64_DEBUG - Define if you want debugging messages -*/ -/* #define TIME_64_DEBUG */ - - -/* INT_64_T - A 64 bit integer type to use to store time and others. - Must be defined. -*/ -#define INT_64_T long long - - -/* USE_TM64 - Should we use a 64 bit safe replacement for tm? This will - let you go past year 2 billion but the struct will be incompatible - with tm. Conversion functions will be provided. -*/ -/* #define USE_TM64 */ - - -/* Availability of system functions. - - HAS_GMTIME_R - Define if your system has gmtime_r() - - HAS_LOCALTIME_R - Define if your system has localtime_r() - - HAS_TIMEGM - Define if your system has timegm(), a GNU extension. -*/ -#define HAS_GMTIME_R -#define HAS_LOCALTIME_R -/*#define HAS_TIMEGM */ - - -/* Details of non-standard tm struct elements. - - HAS_TM_TM_GMTOFF - True if your tm struct has a "tm_gmtoff" element. - A BSD extension. - - HAS_TM_TM_ZONE - True if your tm struct has a "tm_zone" element. - A BSD extension. -*/ -#define HAS_TM_TM_GMTOFF -#define HAS_TM_TM_ZONE - - -/* USE_SYSTEM_LOCALTIME - USE_SYSTEM_GMTIME - Should we use the system functions if the time is inside their range? - Your system localtime() is probably more accurate, but our gmtime() is - fast and safe. -*/ -#define USE_SYSTEM_LOCALTIME -/* #define USE_SYSTEM_GMTIME */ - - -/* SYSTEM_LOCALTIME_MAX - SYSTEM_LOCALTIME_MIN - SYSTEM_GMTIME_MAX - SYSTEM_GMTIME_MIN - Maximum and minimum values your system's gmtime() and localtime() - can handle. We will use your system functions if the time falls - inside these ranges. -*/ -#define SYSTEM_LOCALTIME_MAX 2147483647 -#define SYSTEM_LOCALTIME_MIN -2147483647 -#define SYSTEM_GMTIME_MAX 2147483647 -#define SYSTEM_GMTIME_MIN -2147483647 - diff --git a/libc/bionic/utime.c b/libc/bionic/utime.c deleted file mode 100644 index 7239847ed..000000000 --- a/libc/bionic/utime.c +++ /dev/null @@ -1,55 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)utime.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ -#include -//__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/utime.c,v 1.3 2007/01/09 00:27:56 imp Exp $"); - -#include - -#include - -int -utime(path, times) - const char *path; - const struct utimbuf *times; -{ - struct timeval tv[2], *tvp; - - if (times) { - tv[0].tv_sec = times->actime; - tv[1].tv_sec = times->modtime; - tv[0].tv_usec = tv[1].tv_usec = 0; - tvp = tv; - } else - tvp = NULL; - return (utimes(path, tvp)); -} diff --git a/libc/bionic/utmp.c b/libc/bionic/utmp.c deleted file mode 100644 index c3b55da82..000000000 --- a/libc/bionic/utmp.c +++ /dev/null @@ -1,93 +0,0 @@ -/*- - * Copyright (c) 2002 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Christos Zoulas. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -#include - -#include -#include -#include -#include -#include -#include - -static struct utmp utmp; -static FILE *ut; -static char utfile[MAXPATHLEN] = _PATH_UTMP; - -void -setutent(void) -{ - if (ut == NULL) - return; - (void)fseeko(ut, (off_t)0, SEEK_SET); -} - -struct utmp * -getutent(void) -{ - if (ut == NULL) { - if ((ut = fopen(utfile, "r")) == NULL) - return NULL; - } - if (fread(&utmp, sizeof(utmp), 1, ut) == 1) - return &utmp; - return NULL; -} - -void -endutent(void) -{ - if (ut != NULL) { - (void)fclose(ut); - ut = NULL; - } -} - -int -utmpname(const char *fname) -{ - size_t len = strlen(fname); - - if (len >= sizeof(utfile)) - return 0; - - /* must not end in x! */ - if (fname[len - 1] == 'x') - return 0; - - (void)strlcpy(utfile, fname, sizeof(utfile)); - endutent(); - return 1; -} diff --git a/libc/docs/OVERVIEW.TXT b/libc/docs/OVERVIEW.TXT deleted file mode 100644 index 4c153b152..000000000 --- a/libc/docs/OVERVIEW.TXT +++ /dev/null @@ -1,388 +0,0 @@ -Bionic C Library Overview: -========================== - -Introduction: - -Core Philosophy: - - The core idea behind Bionic's design is: KEEP IT REALLY SIMPLE. - - This implies that the C library should only provide lightweight wrappers - around kernel facilities and not try to be too smart to deal with edge cases. - - The name "Bionic" comes from the fact that it is part-BSD and part-Linux: - its source code consists in a mix of BSD C library pieces with custom - Linux-specific bits used to deal with threads, processes, signals and a few - others things. - - All original BSD pieces carry the BSD copyright disclaimer. Bionic-specific - bits carry the Android Open Source Project copyright disclaimer. And - everything is released under the BSD license. - -Architectures: - - Bionic currently supports the ARM and x86 instruction sets. In theory, it - should be possible to support more, but this may require a little work (e.g. - adding system call IDs to SYSCALLS.TXT, described below, or modifying the - dynamic linker). - - The ARM-specific code is under arch-arm/ and the x86-specific one is under - arch-x86/ - - Note that the x86 version is only meant to run on an x86 Android device. We - make absolutely no claim that you could build and use Bionic on a stock x86 - Linux distribution (though that would be cool, so patches are welcomed :-)) - -Syscall stubs: - - Each system call function is implemented by a tiny assembler source fragment - (called a "syscall stub"), which is generated automatically by - tools/gensyscalls.py which reads the SYSCALLS.TXT file for input. - - SYSCALLS.TXT contains the list of all syscall stubs to generate, along with - the corresponding syscall numeric identifier (which may differ between ARM - and x86), and its signature - - If you modify this file, you may want to use tools/checksyscalls.py which - checks its content against official Linux kernel header files, and will - report errors when invalid syscall ids are used. - - Sometimes, the C library function is really a wrapper that calls the - corresponding syscall with another name. For example, the exit() function - is provided by the C library and calls the _exit() syscall stub. - - See SYSCALLS.TXT for documentation and details. - - -time_t: - - time_t is 32-bit as defined by the kernel on 32-bit CPUs. A 64-bit version - would be preferrable to avoid the Y2038 bug, but the kernel maintainers - consider that this is not needed at the moment. - - Instead, Bionic provides a header that defines a time64_t type, - and related functions like mktime64(), localtime64(), etc... - - -Timezone management: - - The name of the current timezone is taken from the TZ environment variable, - if defined. Otherwise, the system property named 'persist.sys.timezone' is - checked instead. - - The zoneinfo timezone database and index files are located under directory - /system/usr/share/zoneinfo, instead of the more Posix-compliant path of - /usr/share/zoneinfo - - -off_t: - - For similar reasons, off_t is 32-bit. We define loff_t as the 64-bit variant - due to BSD inheritance, but off64_t should be available as a typedef to ease - porting of current Linux-specific code. - - -Linux kernel headers: - - Bionic comes with its own set of "clean" Linux kernel headers to allow - user-space code to use kernel-specific declarations (e.g. IOCTLs, structure - declarations, constants, etc...). They are located in: - - ./kernel/common, - ./kernel/arch-arm - ./kernel/arch-x86 - - These headers have been generated by a tool (kernel/tools/update-all.py) to - only include the public definitions from the original Linux kernel headers. - - If you want to know why and how this is done, read kernel/README.TXT to get - all the (gory) details. - - -PThread implementation: - - Bionic's C library comes with its own pthread implementation bundled in. - This is different from other historical C libraries which: - - - place it in an external library (-lpthread) - - play linker tricks with weak symbols at dynamic link time - - The support for real-time features (a.k.a. -lrt) is also bundled in the - C library. - - The implementation is based on futexes and strives to provide *very* short - code paths for common operations. Notable features are the following: - - - pthread_mutex_t, pthread_cond_t are only 4 bytes each. - - - Normal, recursive and error-check mutexes are supported, and the code - path is heavily optimized for the normal case, which is used most of - the time. - - - Process-shared mutexes and condition variables are not supported. - Their implementation requires far more complexity and was absolutely - not needed for Android (which uses other inter-process synchronization - capabilities). - - Note that they could be added in the future without breaking the ABI - by specifying more sophisticated code paths (which may make the common - paths slightly slower though). - - - There is currently no support for read/write locks, priority-ceiling in - mutexes and other more advanced features. Again, the main idea being - that this was not needed for Android at all but could be added in the - future. - -pthread_cancel(): - - pthread_cancel() will *not* be supported in Bionic, because doing this would - involve making the C library significantly bigger for very little benefit. - - Consider that: - - - A proper implementation must insert pthread cancellation checks in a lot - of different places of the C library. And conformance is very difficult - to test properly. - - - A proper implementation must also clean up resources, like releasing - memory, or unlocking mutexes, properly if the cancellation happens in a - complex function (e.g. inside gethostbyname() or fprintf() + complex - formatting rules). This tends to slow down the path of many functions. - - - pthread cancellation cannot stop all threads: e.g. it can't do anything - against an infinite loop - - - pthread cancellation itself has short-comings and isn't very portable - (see http://advogato.org/person/slamb/diary.html?start=49 for example). - - All of this is contrary to the Bionic design goals. If your code depends on - thread cancellation, please consider alternatives. - - Note however that Bionic does implement pthread_cleanup_push() and - pthread_cleanup_pop(), which can be used to handle cleanups that happen when - a thread voluntarily exits through pthread_exit() or returning from its - main function. - - -pthread_once(): - - Do not call fork() within a callback provided to pthread_once(). Doing this - may result in a deadlock in the child process the next time it calls - pthread_once(). - - Also, you can't throw a C++ Exception from the callback (see C++ Exception - Support below). - - The current implementation of pthread_once() lacks the necessary support of - multi-core-safe double-checked-locking (read and write barriers). - - -Thread-specific data - - The thread-specific storage only provides for a bit less than 64 - pthread_key_t objects to each process. The implementation provides 64 real - slots but also uses about 5 of them (exact number may depend on - implementation) for its own use (e.g. two slots are pre-allocated by the C - library to speed-up the Android OpenGL sub-system). - - Note that Posix mandates a minimum of 128 slots, but we do not claim to be - Posix-compliant. - - Except for the main thread, the TLS area is stored at the top of the stack. - See comments in bionic/libc/bionic/pthread.c for details. - - At the moment, thread-local storage defined through the __thread compiler - keyword is not supported by the Bionic C library and dynamic linker. - - -Multi-core support - - At the moment, Bionic does not provide or use read/write memory barriers. - This means that using it on certain multi-core systems might not be - supported, depending on its exact CPU architecture. - - -Android-specific features: - - Bionic provides a small number of Android-specific features to its clients: - - - access to system properties: - - Android provides a simple shared value/key space to all processes on the - system. It stores a liberal number of 'properties', each of them being a - simple size-limited string that can be associated to a size-limited - string value. - - The header can be used to read system - properties and also defines the maximum size of keys and values. - - - Android-specific user/group management: - - There is no /etc/passwd or /etc/groups in Android. By design, it is - meant to be used by a single handset user. On the other hand, Android - uses the Linux user/group management features extensively to secure - process permissions, like access to various filesystem directories. - - In the Android scheme, each installed application gets its own - uid_t/gid_t starting from 10000; lower numerical ids are reserved for - system daemons. - - getpwnam() recognizes some hard-coded subsystems names (e.g. "radio") - and will translate them to their low-user-id values. It also recognizes - "app_1234" as the synthetic name of the application that was installed - with uid 10000 + 1234, which is 11234. getgrnam() works similarly - - getgrouplist() will always return a single group for any user name, - which is the one passed as an input parameter. - - getgrgid() will similarly only return a structure that contains a - single-element members list, corresponding to the user with the same - numerical value than the group. - - See bionic/libc/bionic/stubs.c for more details. - - - getservent() - - There is no /etc/services on Android. Instead the C library embeds a - constant list of services in its executable, which is parsed on demand - by the various functions that depend on it. See - bionic/libc/netbsd/net/getservent.c and - bionic/libc/netbsd/net/services.h - - The list of services defined internally might change liberally in the - future. This feature is mostly historically and is very rarely used. - - The getservent() returns thread-local data. getservbyport() and - getservbyname() are also implemented in a similar fashion. - - - getprotoent() - - There is no /etc/protocol on Android. Bionic does not currently - implement getprotoent() and related functions. If added, it will - likely be done in a way similar to getservent() - -DNS resolver: - - Bionic uses a NetBSD-derived resolver library which has been modified in - the following ways: - - - don't implement the name-server-switch feature (a.k.a. ) - - - read /system/etc/resolv.conf instead of /etc/resolv.conf - - - read the list of servers from system properties. the code looks for - 'net.dns1', 'net.dns2', etc.. Each property should contain the IP - address of a DNS server. - - these properties are set/modified by other parts of the Android system - (e.g. the dhcpd daemon). - - the implementation also supports per-process DNS server list, using the - properties 'net.dns1.', 'net.dns2.', etc... Where stands - for the numerical ID of the current process. - - - when performing a query, use a properly randomized Query ID (instead of - a incremented one), for increased security. - - - when performing a query, bind the local client socket to a random port - for increased security. - - - get rid of *many* unfortunate thread-safety issues in the original code - - Bionic does *not* expose implementation details of its DNS resolver; the - content of is intentionally blank. The resolver - implementation might change completely in the future. - - -PThread Real-Time Timers: - - timer_create(), timer_gettime(), timer_settime() and timer_getoverrun() are - supported. - - Bionic also now supports SIGEV_THREAD real-time timers (see timer_create()). - The implementation simply uses a single thread per timer, unlike GLibc which - uses complex heuristics to try to use the less threads possible when several - timers with compatible properties are used. - - This means that if your code uses a lot of SIGEV_THREAD timers, your program - may consume a lot of memory. However, if your program needs many of these - timers, it'd better handle timeout events directly instead. - - Other timers (e.g. SIGEV_SIGNAL) are handled by the kernel and use much less - system resources. - - -Binary Compatibility: - - Bionic is *not* in any way binary-compatible with the GNU C Library, ucLibc - or any known Linux C library. This means several things: - - - You cannot expect to build something against the GNU C Library headers and - have it dynamically link properly to Bionic later. - - - You should *really* use the Android toolchain to build your program against - Bionic. The toolchain deals with many important details that are crucial - to get something working properly. - - Failure to do so will usually result in the inability to run or link your - program, or even runtime crashes. Several random web pages on the Internet - describe how you can succesfully write a "hello-world" program with the - ARM GNU toolchain. These examples usually work by chance, if anything else, - and you should not follow these instructions unless you want to waste a lot - of your time in the process. - - Note however that you *can* generate a binary that is built against the - GNU C Library headers and then statically linked to it. The corresponding - executable should be able to run (if it doesn't use dlopen()/dlsym()) - - -Dynamic Linker: - - Bionic comes with its own dynamic linker (just like ld.so on Linux really - comes from GLibc). This linker does not support all the relocations - generated by other GCC ARM toolchains. - - -C++ Exceptions Support: - - At the moment, Bionic doesn't support C++ exceptions, what this really means - is the following: - - - If pthread_once() is called with a C++ callback that throws an exception, - then the C library will keep the corresponding pthread_once_t mutex - locked. Any further call to pthread_once() will result in a deadlock. - - A proper implementation should be able to register a C++ exception - cleanup handler before the callback to properly unlock the - pthread_once_t. Unfortunately this requires tricky assembly code that - is highly dependent on the compiler. - - This feature is not planned to be supported anytime soon. - - - The same problem may arise if you throw an exception within a callback - called from the C library. Fortunately, these cases are very rare in the - real-world, but any callback you provide to the C library should *not* - throw an exception. - - - Bionic lacks a few support functions to have exception support work - properly. - -System V IPCs: - - Bionic intentionally does not provide support for System-V IPCs mechanisms, - like the ones provided by semget(), shmget(), msgget(). The reason for this - is to avoid denial-of-service. For a detailed rationale about this, please - read the file docs/SYSV-IPCS.TXT. - -Include Paths: - - The Android build system should automatically provide the necessary include - paths required to build against the C library headers. However, if you want - to do that yourself, you will need to add: - - libc/arch-$ARCH/include - libc/include - libc/kernel/common - libc/kernel/arch-$ARCH - - to your C include path. diff --git a/libc/docs/SYSV-IPC.TXT b/libc/docs/SYSV-IPC.TXT deleted file mode 100644 index 5a3eef0d7..000000000 --- a/libc/docs/SYSV-IPC.TXT +++ /dev/null @@ -1,103 +0,0 @@ -Android does not support System V IPCs, i.e. the facilities provided by the -following standard Posix headers: - - /* SysV semaphores */ - /* SysV shared memory segments */ - /* SysV message queues */ - /* General IPC definitions */ - -The reason for this is due to the fact that, by design, they lead to global -kernel resource leakage. - -For example, there is no way to automatically release a SysV semaphore -allocated in the kernel when: - -- a buggy or malicious process exits -- a non-buggy and non-malicious process crashes or is explicitely killed. - -Killing processes automatically to make room for new ones is an -important part of Android's application lifecycle implementation. This means -that, even assuming only non-buggy and non-malicious code, it is very likely -that over time, the kernel global tables used to implement SysV IPCs will fill -up. - -At that point, strange failures are likely to occur and prevent programs that -use them to run properly until the next reboot of the system. - -And we can't ignore potential malicious applications. As a proof of concept -here is a simple exploit that you can run on a standard Linux box today: - ---------------- cut here ------------------------ -#include -#include -#include -#include -#include -#include - -#define NUM_SEMAPHORES 32 -#define MAX_FAILS 10 - -int main(void) -{ - int counter = 0; - int fails = 0; - - if (counter == IPC_PRIVATE) - counter++; - - printf( "%d (NUM_SEMAPHORES=%d)\n", counter, NUM_SEMAPHORES); - - for (;;) { - int ret = fork(); - int status; - - if (ret < 0) { - perror("fork:"); - break; - } - if (ret == 0) { - /* in the child */ - ret = semget( (key_t)counter, NUM_SEMAPHORES, IPC_CREAT ); - if (ret < 0) { - return errno; - } - return 0; - } - else { - /* in the parent */ - ret = wait(&status); - if (ret < 0) { - perror("waitpid:"); - break; - } - if (status != 0) { - status = WEXITSTATUS(status); - fprintf(stderr, "child %d FAIL at counter=%d: %d\n", ret, - counter, status); - if (++fails >= MAX_FAILS) - break; - } - } - - counter++; - if ((counter % 1000) == 0) { - printf("%d\n", counter); - } - if (counter == IPC_PRIVATE) - counter++; - } - return 0; -} ---------------- cut here ------------------------ - -If you run it on a typical Linux distribution today, you'll discover that it -will quickly fill up the kernel's table of unique key_t values, and that -strange things will happen in some parts of the system, but not all. - -(You can use the "ipcs -u" command to get a summary describing the kernel - tables and their allocations) - -For example, in our experience, anything program launched after that that -calls strerror() will simply crash. The USB sub-system starts spoutting weird -errors to the system console, etc... diff --git a/libc/include/alloca.h b/libc/include/alloca.h deleted file mode 100644 index 0c50fc310..000000000 --- a/libc/include/alloca.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ALLOCA_H -#define _ALLOCA_H - -#define alloca(size) __builtin_alloca(size) - -#endif /* _ALLOCA_H */ - diff --git a/libc/include/arpa/inet.h b/libc/include/arpa/inet.h deleted file mode 100644 index 3ebb872ec..000000000 --- a/libc/include/arpa/inet.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ARPA_INET_H_ -#define _ARPA_INET_H_ - -#include -#include -#include -#include - -__BEGIN_DECLS - -typedef uint32_t in_addr_t; - -extern uint32_t inet_addr(const char *); - -extern int inet_aton(const char *, struct in_addr *); -extern char* inet_ntoa(struct in_addr); - -extern int inet_pton(int, const char *, void *); -extern const char* inet_ntop(int, const void *, char *, size_t); - -extern unsigned int inet_nsap_addr(const char *, unsigned char *, int); -extern char* inet_nsap_ntoa(int, const unsigned char *, char *); - -__END_DECLS - -#endif /* _ARPA_INET_H_ */ - - diff --git a/libc/include/arpa/nameser.h b/libc/include/arpa/nameser.h deleted file mode 100644 index 028eadced..000000000 --- a/libc/include/arpa/nameser.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _arpa_nameser_h -#define _arpa_nameser_h - -#include -#include - -/* this header intentionally blank - * - * the definitions normally found in are - * really a bunch of resolver's internal declarations that - * should not be exposed to client code in any way - */ - -#endif /* _arpa_nameser_h */ diff --git a/libc/include/assert.h b/libc/include/assert.h deleted file mode 100644 index 62470f5f0..000000000 --- a/libc/include/assert.h +++ /dev/null @@ -1,65 +0,0 @@ -/* $OpenBSD: assert.h,v 1.12 2006/01/31 10:53:51 hshoexer Exp $ */ -/* $NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)assert.h 8.2 (Berkeley) 1/21/94 - */ - -/* - * Unlike other ANSI header files, may usefully be included - * multiple times, with and without NDEBUG defined. - */ - -#include - -#undef assert -#undef _assert - -#ifdef NDEBUG -# define assert(e) ((void)0) -# define _assert(e) ((void)0) -#else -# define _assert(e) assert(e) -# if __ISO_C_VISIBLE >= 1999 -# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e)) -# else -# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e)) -# endif -#endif - -__BEGIN_DECLS -__dead void __assert(const char *, int, const char *); -__dead void __assert2(const char *, int, const char *, const char *); -__END_DECLS diff --git a/libc/include/byteswap.h b/libc/include/byteswap.h deleted file mode 100644 index 16d2ad4f9..000000000 --- a/libc/include/byteswap.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _BYTESWAP_H_ -#define _BYTESWAP_H_ - -#include - -#define bswap_16(x) swap16(x) -#define bswap_32(x) swap32(x) -#define bswap_64(x) swap64(x) - -#endif /* _BYTESWAP_H_ */ diff --git a/libc/include/ctype.h b/libc/include/ctype.h deleted file mode 100644 index b5f9ff4f8..000000000 --- a/libc/include/ctype.h +++ /dev/null @@ -1,203 +0,0 @@ -/* $OpenBSD: ctype.h,v 1.19 2005/12/13 00:35:22 millert Exp $ */ -/* $NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $ */ - -/* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ctype.h 5.3 (Berkeley) 4/3/91 - */ - -#ifndef _CTYPE_H_ -#define _CTYPE_H_ - -#include - -#define _U 0x01 -#define _L 0x02 -#define _N 0x04 -#define _S 0x08 -#define _P 0x10 -#define _C 0x20 -#define _X 0x40 -#define _B 0x80 - -__BEGIN_DECLS - -extern const char *_ctype_; -extern const short *_tolower_tab_; -extern const short *_toupper_tab_; - -/* extern __inline is a GNU C extension */ -#ifdef __GNUC__ -#define __CTYPE_INLINE extern __inline -#else -#define __CTYPE_INLINE static __inline -#endif - -#if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint) -int isalnum(int); -int isalpha(int); -int iscntrl(int); -int isdigit(int); -int isgraph(int); -int islower(int); -int isprint(int); -int ispunct(int); -int isspace(int); -int isupper(int); -int isxdigit(int); -int tolower(int); -int toupper(int); - -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __POSIX_VISIBLE > 200112 \ - || __XPG_VISIBLE > 600 -int isblank(int); -#endif - -#if __BSD_VISIBLE || __XPG_VISIBLE -int isascii(int); -int toascii(int); -int _tolower(int); -int _toupper(int); -#endif /* __BSD_VISIBLE || __XPG_VISIBLE */ - -#endif /* __GNUC__ || _ANSI_LIBRARY || lint */ - -#if defined(NDEBUG) - -__CTYPE_INLINE int isalnum(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_U|_L|_N))); -} - -__CTYPE_INLINE int isalpha(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_U|_L))); -} - -__CTYPE_INLINE int iscntrl(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _C)); -} - -__CTYPE_INLINE int isdigit(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _N)); -} - -__CTYPE_INLINE int isgraph(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_P|_U|_L|_N))); -} - -__CTYPE_INLINE int islower(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _L)); -} - -__CTYPE_INLINE int isprint(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_P|_U|_L|_N|_B))); -} - -__CTYPE_INLINE int ispunct(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _P)); -} - -__CTYPE_INLINE int isspace(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _S)); -} - -__CTYPE_INLINE int isupper(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & _U)); -} - -__CTYPE_INLINE int isxdigit(int c) -{ - return (c == -1 ? 0 : ((_ctype_ + 1)[(unsigned char)c] & (_N|_X))); -} - -__CTYPE_INLINE int tolower(int c) -{ - if ((unsigned int)c > 255) - return (c); - return ((_tolower_tab_ + 1)[c]); -} - -__CTYPE_INLINE int toupper(int c) -{ - if ((unsigned int)c > 255) - return (c); - return ((_toupper_tab_ + 1)[c]); -} - -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __POSIX_VISIBLE > 200112 \ - || __XPG_VISIBLE > 600 -__CTYPE_INLINE int isblank(int c) -{ - return (c == ' ' || c == '\t'); -} -#endif - -#if __BSD_VISIBLE || __XPG_VISIBLE -__CTYPE_INLINE int isascii(int c) -{ - return ((unsigned int)c <= 0177); -} - -__CTYPE_INLINE int toascii(int c) -{ - return (c & 0177); -} - -__CTYPE_INLINE int _tolower(int c) -{ - return (c - 'A' + 'a'); -} - -__CTYPE_INLINE int _toupper(int c) -{ - return (c - 'a' + 'A'); -} -#endif /* __BSD_VISIBLE || __XPG_VISIBLE */ - -#endif /* NDEBUG */ - -__END_DECLS - -#undef __CTYPE_INLINE - -#endif /* !_CTYPE_H_ */ diff --git a/libc/include/dirent.h b/libc/include/dirent.h deleted file mode 100644 index 55eef7b52..000000000 --- a/libc/include/dirent.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _DIRENT_H_ -#define _DIRENT_H_ - -#include -#include - -__BEGIN_DECLS - -#ifndef DT_UNKNOWN -#define DT_UNKNOWN 0 -#define DT_FIFO 1 -#define DT_CHR 2 -#define DT_DIR 4 -#define DT_BLK 6 -#define DT_REG 8 -#define DT_LNK 10 -#define DT_SOCK 12 -#define DT_WHT 14 -#endif - -/* the following structure is really called dirent64 by the kernel - * headers. They also define a struct dirent, but the latter lack - * the d_type field which is required by some libraries (e.g. hotplug) - * who assume to be able to access it directly. sad... - */ -struct dirent { - uint64_t d_ino; - int64_t d_off; - unsigned short d_reclen; - unsigned char d_type; - char d_name[256]; -}; - -typedef struct DIR DIR; - -extern int getdents(unsigned int, struct dirent*, unsigned int); -extern DIR* opendir(const char* dirpath); -extern DIR* fdopendir(int fd); -extern struct dirent* readdir(DIR* dirp); -extern int readdir_r(DIR* dirp, struct dirent *entry, struct dirent **result); -extern int closedir(DIR* dirp); -extern void rewinddir(DIR *dirp); -extern int dirfd(DIR* dirp); -extern int alphasort(const void *a, const void *b); -extern int scandir(const char *dir, struct dirent ***namelist, - int(*filter)(const struct dirent *), - int(*compar)(const struct dirent **, - const struct dirent **)); - -__END_DECLS - -#endif /* _DIRENT_H_ */ diff --git a/libc/include/dlfcn.h b/libc/include/dlfcn.h deleted file mode 100644 index 958279687..000000000 --- a/libc/include/dlfcn.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef __DLFCN_H__ -#define __DLFCN_H__ - -#include - -__BEGIN_DECLS - -extern void* dlopen(const char* filename, int flag); -extern int dlclose(void* handle); -extern const char* dlerror(void); -extern void* dlsym(void* handle, const char* symbol); - -enum { - RTLD_NOW = 0, - RTLD_LAZY = 1, - - RTLD_LOCAL = 0, - RTLD_GLOBAL = 2, -}; - -#define RTLD_DEFAULT ((void*) 0xffffffff) -#define RTLD_NEXT ((void*) 0xfffffffe) - -__END_DECLS - -#endif /* __DLFCN_H */ - - diff --git a/libc/include/elf.h b/libc/include/elf.h deleted file mode 100644 index 8a86a6390..000000000 --- a/libc/include/elf.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ELF_H -#define _ELF_H - -/* these definitions are missing from the BSD sources */ -enum { - AT_NULL = 0, - AT_IGNORE, - AT_EXECFD, - AT_PHDR, - AT_PHENT, - AT_PHNUM, - AT_PAGESZ, - AT_BASE, - AT_FLAGS, - AT_ENTRY, - AT_NOTELF, - AT_UID, - AT_EUID, - AT_GID, - AT_EGID, - AT_PLATFORM, - AT_HWCAP, - AT_CLKTCK, - - AT_SECURE = 23 -}; - -#include - -#endif /* _ELF_H */ - diff --git a/libc/include/endian.h b/libc/include/endian.h deleted file mode 100644 index 475b48cf6..000000000 --- a/libc/include/endian.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ENDIAN_H_ -#define _ENDIAN_H_ - -#include - -#endif /* _ENDIAN_H_ */ diff --git a/libc/include/err.h b/libc/include/err.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/errno.h b/libc/include/errno.h deleted file mode 100644 index 2b2685af4..000000000 --- a/libc/include/errno.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _ERRNO_H -#define _ERRNO_H - -#include -#include - -__BEGIN_DECLS - -/* on Linux, ENOTSUP and EOPNOTSUPP are defined as the same error code - * even if 1000.3 states that they should be different - */ -#ifndef ENOTUP -#define ENOTSUP EOPNOTSUPP -#endif - -/* internal function that should *only* be called from system calls */ -/* use errno = xxxx instead in C code */ -extern int __set_errno(int error); - -/* internal function returning the address of the thread-specific errno */ -extern volatile int* __errno(void); - -/* a macro expanding to the errno l-value */ -#define errno (*__errno()) - -__END_DECLS - -#endif /* _ERRNO_H */ diff --git a/libc/include/fcntl.h b/libc/include/fcntl.h deleted file mode 100644 index 59e7135cd..000000000 --- a/libc/include/fcntl.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _FCNTL_H -#define _FCNTL_H - -#include -#include -#include -#include /* this is not required, but makes client code much happier */ - -__BEGIN_DECLS - -#ifndef O_ASYNC -#define O_ASYNC FASYNC -#endif - -extern int open(const char* path, int mode, ...); -extern int openat(int fd, const char* path, int mode, ...); -extern int unlinkat(int dirfd, const char *pathname, int flags); -extern int fcntl(int fd, int command, ...); -extern int creat(const char* path, mode_t mode); - -__END_DECLS - -#endif /* _FCNTL_H */ diff --git a/libc/include/features.h b/libc/include/features.h deleted file mode 100644 index 343c84d2b..000000000 --- a/libc/include/features.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _FEATURES_H_ -#define _FEATURES_H_ - -/* certain Linux-specific programs expect a header file - * that defines various features macros - */ - -/* we do include a number of BSD extensions */ -#define _BSD_SOURCE 1 - -/* we do include a number of GNU extensions */ -#define _GNU_SOURCE 1 - -/* C95 support */ -#undef __USE_ISOC95 -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199409L -# define __USE_ISOC95 1 -#endif - -/* C99 support */ -#undef __USE_ISOC99 -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L -# define __USE_ISOC99 1 -#endif - -/* Posix support */ -#define __USE_POSIX 1 -#define __USE_POSIX2 1 -#define __USE_XPG 1 - -#endif /* _FEATURES_H_ */ diff --git a/libc/include/fnmatch.h b/libc/include/fnmatch.h deleted file mode 100644 index 772b4efa1..000000000 --- a/libc/include/fnmatch.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _FNMATCH_H -#define _FNMATCH_H - -#include - -__BEGIN_DECLS - -#define FNM_NOMATCH 1 /* Match failed. */ -#define FNM_NOSYS 2 /* Function not supported (unused). */ - -#define FNM_NOESCAPE 0x01 /* Disable backslash escaping. */ -#define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */ -#define FNM_PERIOD 0x04 /* Period must be matched by period. */ -#define FNM_LEADING_DIR 0x08 /* Ignore / after Imatch. */ -#define FNM_CASEFOLD 0x10 /* Case insensitive search. */ - -#define FNM_IGNORECASE FNM_CASEFOLD -#define FNM_FILE_NAME FNM_PATHNAME - -extern int fnmatch(const char *pattern, const char *string, int flags); - -__END_DECLS - -#endif /* _FNMATCH_H */ - diff --git a/libc/include/getopt.h b/libc/include/getopt.h deleted file mode 100644 index 6b4954b50..000000000 --- a/libc/include/getopt.h +++ /dev/null @@ -1,85 +0,0 @@ -/* $OpenBSD: getopt.h,v 1.1 2002/12/03 20:24:29 millert Exp $ */ -/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ - -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Dieter Baron and Thomas Klausner. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _GETOPT_H_ -#define _GETOPT_H_ - -#include - -/* - * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions - */ -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -struct option { - /* name of long option */ - const char *name; - /* - * one of no_argument, required_argument, and optional_argument: - * whether option takes an argument - */ - int has_arg; - /* if not NULL, set *flag to val when option found */ - int *flag; - /* if flag not NULL, value to set *flag to; else return value */ - int val; -}; - -__BEGIN_DECLS -int getopt_long(int, char * const *, const char *, - const struct option *, int *); -int getopt_long_only(int, char * const *, const char *, - const struct option *, int *); -#ifndef _GETOPT_DEFINED_ -#define _GETOPT_DEFINED_ -int getopt(int, char * const *, const char *); -int getsubopt(char **, char * const *, char **); - -extern char *optarg; /* getopt(3) external variables */ -extern int opterr; -extern int optind; -extern int optopt; -extern int optreset; -extern char *suboptarg; /* getsubopt(3) external variable */ -#endif -__END_DECLS - -#endif /* !_GETOPT_H_ */ diff --git a/libc/include/grp.h b/libc/include/grp.h deleted file mode 100644 index 86d99f357..000000000 --- a/libc/include/grp.h +++ /dev/null @@ -1,82 +0,0 @@ -/* $OpenBSD: grp.h,v 1.8 2005/12/13 00:35:22 millert Exp $ */ -/* $NetBSD: grp.h,v 1.7 1995/04/29 05:30:40 cgd Exp $ */ - -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)grp.h 8.2 (Berkeley) 1/21/94 - */ - -#ifndef _GRP_H_ -#define _GRP_H_ - -#include -#include - -#if __BSD_VISIBLE -#define _PATH_GROUP "/etc/group" -#endif - -struct group { - char *gr_name; /* group name */ - char *gr_passwd; /* group password */ - gid_t gr_gid; /* group id */ - char **gr_mem; /* group members */ -}; - -__BEGIN_DECLS -struct group *getgrgid(gid_t); -struct group *getgrnam(const char *); -#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE -struct group *getgrent(void); -void setgrent(void); -void endgrent(void); -int getgrgid_r(gid_t, struct group *, char *, - size_t, struct group **); -int getgrnam_r(const char *, struct group *, char *, - size_t, struct group **); -#endif -#if __BSD_VISIBLE -void setgrfile(const char *); -int setgroupent(int); -char *group_from_gid(gid_t, int); -#endif - -int getgrouplist (const char *user, gid_t group, - gid_t *groups, int *ngroups); - -int initgroups (const char *user, gid_t group); - -__END_DECLS - -#endif /* !_GRP_H_ */ diff --git a/libc/include/inttypes.h b/libc/include/inttypes.h deleted file mode 100644 index ca303cbc4..000000000 --- a/libc/include/inttypes.h +++ /dev/null @@ -1,258 +0,0 @@ -/* $OpenBSD: inttypes.h,v 1.9 2006/01/15 00:47:51 millert Exp $ */ - -/* - * Copyright (c) 1997, 2005 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _INTTYPES_H_ -#define _INTTYPES_H_ - -#include -#include - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) -/* - * 7.8.1 Macros for format specifiers - * - * Each of the following object-like macros expands to a string - * literal containing a conversion specifier, possibly modified by - * a prefix such as hh, h, l, or ll, suitable for use within the - * format argument of a formatted input/output function when - * converting the corresponding integer type. These macro names - * have the general form of PRI (character string literals for the - * fprintf family) or SCN (character string literals for the fscanf - * family), followed by the conversion specifier, followed by a - * name corresponding to a similar typedef name. For example, - * PRIdFAST32 can be used in a format string to print the value of - * an integer of type int_fast32_t. - */ - -/* fprintf macros for signed integers */ -#define PRId8 "d" /* int8_t */ -#define PRId16 "d" /* int16_t */ -#define PRId32 "d" /* int32_t */ -#define PRId64 "lld" /* int64_t */ - -#define PRIdLEAST8 "d" /* int_least8_t */ -#define PRIdLEAST16 "d" /* int_least16_t */ -#define PRIdLEAST32 "d" /* int_least32_t */ -#define PRIdLEAST64 "lld" /* int_least64_t */ - -#define PRIdFAST8 "d" /* int_fast8_t */ -#define PRIdFAST16 "d" /* int_fast16_t */ -#define PRIdFAST32 "d" /* int_fast32_t */ -#define PRIdFAST64 "lld" /* int_fast64_t */ - -#define PRIdMAX "jd" /* intmax_t */ -#define PRIdPTR "ld" /* intptr_t */ - -#define PRIi8 "i" /* int8_t */ -#define PRIi16 "i" /* int16_t */ -#define PRIi32 "i" /* int32_t */ -#define PRIi64 "lli" /* int64_t */ - -#define PRIiLEAST8 "i" /* int_least8_t */ -#define PRIiLEAST16 "i" /* int_least16_t */ -#define PRIiLEAST32 "i" /* int_least32_t */ -#define PRIiLEAST64 "lli" /* int_least64_t */ - -#define PRIiFAST8 "i" /* int_fast8_t */ -#define PRIiFAST16 "i" /* int_fast16_t */ -#define PRIiFAST32 "i" /* int_fast32_t */ -#define PRIiFAST64 "lli" /* int_fast64_t */ - -#define PRIiMAX "ji" /* intmax_t */ -#define PRIiPTR "li" /* intptr_t */ - -/* fprintf macros for unsigned integers */ -#define PRIo8 "o" /* int8_t */ -#define PRIo16 "o" /* int16_t */ -#define PRIo32 "o" /* int32_t */ -#define PRIo64 "llo" /* int64_t */ - -#define PRIoLEAST8 "o" /* int_least8_t */ -#define PRIoLEAST16 "o" /* int_least16_t */ -#define PRIoLEAST32 "o" /* int_least32_t */ -#define PRIoLEAST64 "llo" /* int_least64_t */ - -#define PRIoFAST8 "o" /* int_fast8_t */ -#define PRIoFAST16 "o" /* int_fast16_t */ -#define PRIoFAST32 "o" /* int_fast32_t */ -#define PRIoFAST64 "llo" /* int_fast64_t */ - -#define PRIoMAX "jo" /* intmax_t */ -#define PRIoPTR "lo" /* intptr_t */ - -#define PRIu8 "u" /* uint8_t */ -#define PRIu16 "u" /* uint16_t */ -#define PRIu32 "u" /* uint32_t */ -#define PRIu64 "llu" /* uint64_t */ - -#define PRIuLEAST8 "u" /* uint_least8_t */ -#define PRIuLEAST16 "u" /* uint_least16_t */ -#define PRIuLEAST32 "u" /* uint_least32_t */ -#define PRIuLEAST64 "llu" /* uint_least64_t */ - -#define PRIuFAST8 "u" /* uint_fast8_t */ -#define PRIuFAST16 "u" /* uint_fast16_t */ -#define PRIuFAST32 "u" /* uint_fast32_t */ -#define PRIuFAST64 "llu" /* uint_fast64_t */ - -#define PRIuMAX "ju" /* uintmax_t */ -#define PRIuPTR "lu" /* uintptr_t */ - -#define PRIx8 "x" /* uint8_t */ -#define PRIx16 "x" /* uint16_t */ -#define PRIx32 "x" /* uint32_t */ -#define PRIx64 "llx" /* uint64_t */ - -#define PRIxLEAST8 "x" /* uint_least8_t */ -#define PRIxLEAST16 "x" /* uint_least16_t */ -#define PRIxLEAST32 "x" /* uint_least32_t */ -#define PRIxLEAST64 "llx" /* uint_least64_t */ - -#define PRIxFAST8 "x" /* uint_fast8_t */ -#define PRIxFAST16 "x" /* uint_fast16_t */ -#define PRIxFAST32 "x" /* uint_fast32_t */ -#define PRIxFAST64 "llx" /* uint_fast64_t */ - -#define PRIxMAX "jx" /* uintmax_t */ -#define PRIxPTR "lx" /* uintptr_t */ - -#define PRIX8 "X" /* uint8_t */ -#define PRIX16 "X" /* uint16_t */ -#define PRIX32 "X" /* uint32_t */ -#define PRIX64 "llX" /* uint64_t */ - -#define PRIXLEAST8 "X" /* uint_least8_t */ -#define PRIXLEAST16 "X" /* uint_least16_t */ -#define PRIXLEAST32 "X" /* uint_least32_t */ -#define PRIXLEAST64 "llX" /* uint_least64_t */ - -#define PRIXFAST8 "X" /* uint_fast8_t */ -#define PRIXFAST16 "X" /* uint_fast16_t */ -#define PRIXFAST32 "X" /* uint_fast32_t */ -#define PRIXFAST64 "llX" /* uint_fast64_t */ - -#define PRIXMAX "jX" /* uintmax_t */ -#define PRIXPTR "lX" /* uintptr_t */ - -/* fscanf macros for signed integers */ -#define SCNd8 "hhd" /* int8_t */ -#define SCNd16 "hd" /* int16_t */ -#define SCNd32 "d" /* int32_t */ -#define SCNd64 "lld" /* int64_t */ - -#define SCNdLEAST8 "hhd" /* int_least8_t */ -#define SCNdLEAST16 "hd" /* int_least16_t */ -#define SCNdLEAST32 "d" /* int_least32_t */ -#define SCNdLEAST64 "lld" /* int_least64_t */ - -#define SCNdFAST8 "hhd" /* int_fast8_t */ -#define SCNdFAST16 "hd" /* int_fast16_t */ -#define SCNdFAST32 "d" /* int_fast32_t */ -#define SCNdFAST64 "lld" /* int_fast64_t */ - -#define SCNdMAX "jd" /* intmax_t */ -#define SCNdPTR "ld" /* intptr_t */ - -#define SCNi8 "hhi" /* int8_t */ -#define SCNi16 "hi" /* int16_t */ -#define SCNi32 "i" /* int32_t */ -#define SCNi64 "lli" /* int64_t */ - -#define SCNiLEAST8 "hhi" /* int_least8_t */ -#define SCNiLEAST16 "hi" /* int_least16_t */ -#define SCNiLEAST32 "i" /* int_least32_t */ -#define SCNiLEAST64 "lli" /* int_least64_t */ - -#define SCNiFAST8 "hhi" /* int_fast8_t */ -#define SCNiFAST16 "hi" /* int_fast16_t */ -#define SCNiFAST32 "i" /* int_fast32_t */ -#define SCNiFAST64 "lli" /* int_fast64_t */ - -#define SCNiMAX "ji" /* intmax_t */ -#define SCNiPTR "li" /* intptr_t */ - -/* fscanf macros for unsigned integers */ -#define SCNo8 "hho" /* uint8_t */ -#define SCNo16 "ho" /* uint16_t */ -#define SCNo32 "o" /* uint32_t */ -#define SCNo64 "llo" /* uint64_t */ - -#define SCNoLEAST8 "hho" /* uint_least8_t */ -#define SCNoLEAST16 "ho" /* uint_least16_t */ -#define SCNoLEAST32 "o" /* uint_least32_t */ -#define SCNoLEAST64 "llo" /* uint_least64_t */ - -#define SCNoFAST8 "hho" /* uint_fast8_t */ -#define SCNoFAST16 "ho" /* uint_fast16_t */ -#define SCNoFAST32 "o" /* uint_fast32_t */ -#define SCNoFAST64 "llo" /* uint_fast64_t */ - -#define SCNoMAX "jo" /* uintmax_t */ -#define SCNoPTR "lo" /* uintptr_t */ - -#define SCNu8 "hhu" /* uint8_t */ -#define SCNu16 "hu" /* uint16_t */ -#define SCNu32 "u" /* uint32_t */ -#define SCNu64 "llu" /* uint64_t */ - -#define SCNuLEAST8 "hhu" /* uint_least8_t */ -#define SCNuLEAST16 "hu" /* uint_least16_t */ -#define SCNuLEAST32 "u" /* uint_least32_t */ -#define SCNuLEAST64 "llu" /* uint_least64_t */ - -#define SCNuFAST8 "hhu" /* uint_fast8_t */ -#define SCNuFAST16 "hu" /* uint_fast16_t */ -#define SCNuFAST32 "u" /* uint_fast32_t */ -#define SCNuFAST64 "llu" /* uint_fast64_t */ - -#define SCNuMAX "ju" /* uintmax_t */ -#define SCNuPTR "lu" /* uintptr_t */ - -#define SCNx8 "hhx" /* uint8_t */ -#define SCNx16 "hx" /* uint16_t */ -#define SCNx32 "x" /* uint32_t */ -#define SCNx64 "llx" /* uint64_t */ - -#define SCNxLEAST8 "hhx" /* uint_least8_t */ -#define SCNxLEAST16 "hx" /* uint_least16_t */ -#define SCNxLEAST32 "x" /* uint_least32_t */ -#define SCNxLEAST64 "llx" /* uint_least64_t */ - -#define SCNxFAST8 "hhx" /* uint_fast8_t */ -#define SCNxFAST16 "hx" /* uint_fast16_t */ -#define SCNxFAST32 "x" /* uint_fast32_t */ -#define SCNxFAST64 "llx" /* uint_fast64_t */ - -#define SCNxMAX "jx" /* uintmax_t */ -#define SCNxPTR "lx" /* uintptr_t */ - -#endif /* __cplusplus || __STDC_FORMAT_MACROS */ - -typedef struct { - intmax_t quot; /* quotient */ - intmax_t rem; /* remainder */ -} imaxdiv_t; - -__BEGIN_DECLS -intmax_t imaxabs(intmax_t); -imaxdiv_t imaxdiv(intmax_t, intmax_t); -intmax_t strtoimax(const char *, char **, int); -uintmax_t strtoumax(const char *, char **, int); -__END_DECLS - -#endif /* _INTTYPES_H_ */ diff --git a/libc/include/lastlog.h b/libc/include/lastlog.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/libgen.h b/libc/include/libgen.h deleted file mode 100644 index c5fc76a79..000000000 --- a/libc/include/libgen.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _LIBGEN_H -#define _LIBGEN_H - -#include -#include - -__BEGIN_DECLS - -/* our version of dirname/basename don't modify the input path */ -extern char* dirname (const char* path); -extern char* basename(const char* path); - -/* special thread-safe Bionic versions - * - * if 'buffer' is NULL, 'bufflen' is ignored and the length of the result is returned - * otherwise, place result in 'buffer' - * - * at most bufflen-1 characters written, plus a terminating zero - * - * return length of result, or -1 in case of error, with errno set to: - * - * ERANGE: buffer is too short - * ENAMETOOLONG: the result is too long for a valid path - */ -extern int dirname_r(const char* path, char* buffer, size_t bufflen); -extern int basename_r(const char* path, char* buffer, size_t bufflen); - -__END_DECLS - -#endif /* _LIBGEN_H */ diff --git a/libc/include/limits.h b/libc/include/limits.h deleted file mode 100644 index c204e4dfd..000000000 --- a/libc/include/limits.h +++ /dev/null @@ -1,96 +0,0 @@ -/* $OpenBSD: limits.h,v 1.13 2005/12/31 19:29:38 millert Exp $ */ -/* $NetBSD: limits.h,v 1.7 1994/10/26 00:56:00 cgd Exp $ */ - -/* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)limits.h 5.9 (Berkeley) 4/3/91 - */ - -#ifndef _LIMITS_H_ -#define _LIMITS_H_ - -#include - -#if __POSIX_VISIBLE -#define _POSIX_ARG_MAX 4096 -#define _POSIX_CHILD_MAX 25 -#define _POSIX_LINK_MAX 8 -#define _POSIX_MAX_CANON 255 -#define _POSIX_MAX_INPUT 255 -#define _POSIX_NAME_MAX 14 -#define _POSIX_NGROUPS_MAX 0 -#define _POSIX_OPEN_MAX 16 -#define _POSIX_PATH_MAX 256 -#define _POSIX_PIPE_BUF 512 -#define _POSIX_RE_DUP_MAX 255 -#define _POSIX_SSIZE_MAX 32767 -#define _POSIX_STREAM_MAX 8 -#define _POSIX_SYMLINK_MAX 255 -#define _POSIX_SYMLOOP_MAX 8 -#define _POSIX_TZNAME_MAX 3 - -#define _POSIX2_BC_BASE_MAX 99 -#define _POSIX2_BC_DIM_MAX 2048 -#define _POSIX2_BC_SCALE_MAX 99 -#define _POSIX2_BC_STRING_MAX 1000 -#define _POSIX2_COLL_WEIGHTS_MAX 2 -#define _POSIX2_EXPR_NEST_MAX 32 -#define _POSIX2_LINE_MAX 2048 -#define _POSIX2_RE_DUP_MAX _POSIX_RE_DUP_MAX - -#if __POSIX_VISIBLE >= 200112 -#define _POSIX_TTY_NAME_MAX 9 /* includes trailing NUL */ -#define _POSIX_LOGIN_NAME_MAX 9 /* includes trailing NUL */ -#endif /* __POSIX_VISIBLE >= 200112 */ -#endif /* __POSIX_VISIBLE */ - -#if __XPG_VISIBLE -#define PASS_MAX 128 /* _PASSWORD_LEN from */ - -#define NL_ARGMAX 9 -#define NL_LANGMAX 14 -#define NL_MSGMAX 32767 -#define NL_NMAX 1 -#define NL_SETMAX 255 -#define NL_TEXTMAX 255 - -#define TMP_MAX 308915776 -#endif /* __XPG_VISIBLE */ - -#include - -#if __POSIX_VISIBLE -#include -#endif - -#ifndef PAGESIZE -#define PAGESIZE PAGE_SIZE -#endif - -#endif /* !_LIMITS_H_ */ diff --git a/libc/include/locale.h b/libc/include/locale.h deleted file mode 100644 index 65b5c7dbe..000000000 --- a/libc/include/locale.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _LOCALE_H_ -#define _LOCALE_H_ - -#include - -__BEGIN_DECLS - -enum { - LC_CTYPE = 0, - LC_NUMERIC = 1, - LC_TIME = 2, - LC_COLLATE = 3, - LC_MONETARY = 4, - LC_MESSAGES = 5, - LC_ALL = 6, - LC_PAPER = 7, - LC_NAME = 8, - LC_ADDRESS = 9, - - LC_TELEPHONE = 10, - LC_MEASUREMENT = 11, - LC_IDENTIFICATION = 12 -}; - -extern char *setlocale(int category, const char *locale); - -/* Make libstdc++-v3 happy. */ -struct lconv { }; -struct lconv *localeconv(void); - -__END_DECLS - -#endif /* _LOCALE_H_ */ diff --git a/libc/include/malloc.h b/libc/include/malloc.h deleted file mode 100644 index a864286f4..000000000 --- a/libc/include/malloc.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _MALLOC_H_ -#define _MALLOC_H_ - -#include -#include - -__BEGIN_DECLS - -extern __mallocfunc void* malloc(size_t); -extern __mallocfunc void* calloc(size_t, size_t); -extern __mallocfunc void* realloc(void *, size_t); -extern void free(void *); - -extern void* memalign(size_t alignment, size_t bytesize); -extern void* valloc(size_t bytesize); -extern void* pvalloc(size_t bytesize); -extern int mallopt(int param_number, int param_value); -extern size_t malloc_footprint(void); -extern size_t malloc_max_footprint(void); - -struct mallinfo { - size_t arena; /* non-mmapped space allocated from system */ - size_t ordblks; /* number of free chunks */ - size_t smblks; /* always 0 */ - size_t hblks; /* always 0 */ - size_t hblkhd; /* space in mmapped regions */ - size_t usmblks; /* maximum total allocated space */ - size_t fsmblks; /* always 0 */ - size_t uordblks; /* total allocated space */ - size_t fordblks; /* total free space */ - size_t keepcost; /* releasable (via malloc_trim) space */ -}; - -extern struct mallinfo mallinfo(void); - - -/* - malloc_usable_size(void* p); - - Returns the number of bytes you can actually use in - an allocated chunk, which may be more than you requested (although - often not) due to alignment and minimum size constraints. - You can use this many bytes without worrying about - overwriting other allocated objects. This is not a particularly great - programming practice. malloc_usable_size can be more useful in - debugging and assertions, for example: - - p = malloc(n); - assert(malloc_usable_size(p) >= 256); -*/ -extern size_t malloc_usable_size(void* block); - -/* - malloc_stats(); - Prints on stderr the amount of space obtained from the system (both - via sbrk and mmap), the maximum amount (which may be more than - current if malloc_trim and/or munmap got called), and the current - number of bytes allocated via malloc (or realloc, etc) but not yet - freed. Note that this is the number of bytes allocated, not the - number requested. It will be larger than the number requested - because of alignment and bookkeeping overhead. Because it includes - alignment wastage as being in use, this figure may be greater than - zero even when no user-level chunks are allocated. - - The reported current and maximum system memory can be inaccurate if - a program makes other calls to system memory allocation functions - (normally sbrk) outside of malloc. - - malloc_stats prints only the most commonly interesting statistics. - More information can be obtained by calling mallinfo. -*/ -extern void malloc_stats(void); - -__END_DECLS - -#endif /* _MALLOC_H_ */ - diff --git a/libc/include/memory.h b/libc/include/memory.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/mntent.h b/libc/include/mntent.h deleted file mode 100644 index 468ff742e..000000000 --- a/libc/include/mntent.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _MNTENT_H_ -#define _MNTENT_H_ - - -#define MNTTYPE_IGNORE "ignore" - -struct mntent -{ - char* mnt_fsname; - char* mnt_dir; - char* mnt_type; - char* mnt_opts; - int mnt_freq; - int mnt_passno; -}; - - -__BEGIN_DECLS - - -struct mntent* getmntent(FILE*); - -__END_DECLS - -#endif diff --git a/libc/include/net/ethertypes.h b/libc/include/net/ethertypes.h deleted file mode 100644 index 1cfd2cd7e..000000000 --- a/libc/include/net/ethertypes.h +++ /dev/null @@ -1,313 +0,0 @@ -/* $NetBSD: ethertypes.h,v 1.17 2005/12/10 23:21:38 elad Exp $ */ - -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)if_ether.h 8.1 (Berkeley) 6/10/93 - */ - -/* - * Ethernet protocol types. - * - * According to "assigned numbers", the Ethernet protocol numbers are also - * used as ARP protocol type numbers. - * - * I factor them out here to avoid pulling all the Ethernet header file - * into the hardware independent ARP code. -is - * - * Additional sources of information: - * http://www.mit.edu/~map/Ethernet/Ethernet.txt - * ftp://venera.isi.edu/in-notes/iana/assignments/ethernet-numbers - * - */ - -#ifndef _NET_ETHERTYPES_H_ -#define _NET_ETHERTYPES_H_ - -/* - * NOTE: 0x0000-0x05DC (0..1500) are generally IEEE 802.3 length fields. - * However, there are some conflicts. - */ - -#define ETHERTYPE_8023 0x0004 /* IEEE 802.3 packet */ - /* 0x0101 .. 0x1FF Experimental */ -#define ETHERTYPE_PUP 0x0200 /* Xerox PUP protocol - see 0A00 */ -#define ETHERTYPE_PUPAT 0x0200 /* PUP Address Translation - see 0A01 */ -#define ETHERTYPE_SPRITE 0x0500 /* ??? */ - /* 0x0400 Nixdorf */ -#define ETHERTYPE_NS 0x0600 /* XNS */ -#define ETHERTYPE_NSAT 0x0601 /* XNS Address Translation (3Mb only) */ -#define ETHERTYPE_DLOG1 0x0660 /* DLOG (?) */ -#define ETHERTYPE_DLOG2 0x0661 /* DLOG (?) */ -#define ETHERTYPE_IP 0x0800 /* IP protocol */ -#define ETHERTYPE_X75 0x0801 /* X.75 Internet */ -#define ETHERTYPE_NBS 0x0802 /* NBS Internet */ -#define ETHERTYPE_ECMA 0x0803 /* ECMA Internet */ -#define ETHERTYPE_CHAOS 0x0804 /* CHAOSnet */ -#define ETHERTYPE_X25 0x0805 /* X.25 Level 3 */ -#define ETHERTYPE_ARP 0x0806 /* Address resolution protocol */ -#define ETHERTYPE_NSCOMPAT 0x0807 /* XNS Compatibility */ -#define ETHERTYPE_FRARP 0x0808 /* Frame Relay ARP (RFC1701) */ - /* 0x081C Symbolics Private */ - /* 0x0888 - 0x088A Xyplex */ -#define ETHERTYPE_UBDEBUG 0x0900 /* Ungermann-Bass network debugger */ -#define ETHERTYPE_IEEEPUP 0x0A00 /* Xerox IEEE802.3 PUP */ -#define ETHERTYPE_IEEEPUPAT 0x0A01 /* Xerox IEEE802.3 PUP Address Translation */ -#define ETHERTYPE_VINES 0x0BAD /* Banyan VINES */ -#define ETHERTYPE_VINESLOOP 0x0BAE /* Banyan VINES Loopback */ -#define ETHERTYPE_VINESECHO 0x0BAF /* Banyan VINES Echo */ - -/* 0x1000 - 0x100F Berkeley Trailer */ -/* - * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have - * (type-ETHERTYPE_TRAIL)*512 bytes of data followed - * by an ETHER type (as given above) and then the (variable-length) header. - */ -#define ETHERTYPE_TRAIL 0x1000 /* Trailer packet */ -#define ETHERTYPE_NTRAILER 16 - -#define ETHERTYPE_DCA 0x1234 /* DCA - Multicast */ -#define ETHERTYPE_VALID 0x1600 /* VALID system protocol */ -#define ETHERTYPE_DOGFIGHT 0x1989 /* Artificial Horizons ("Aviator" dogfight simulator [on Sun]) */ -#define ETHERTYPE_RCL 0x1995 /* Datapoint Corporation (RCL lan protocol) */ - - /* The following 3C0x types - are unregistered: */ -#define ETHERTYPE_NBPVCD 0x3C00 /* 3Com NBP virtual circuit datagram (like XNS SPP) not registered */ -#define ETHERTYPE_NBPSCD 0x3C01 /* 3Com NBP System control datagram not registered */ -#define ETHERTYPE_NBPCREQ 0x3C02 /* 3Com NBP Connect request (virtual cct) not registered */ -#define ETHERTYPE_NBPCRSP 0x3C03 /* 3Com NBP Connect repsonse not registered */ -#define ETHERTYPE_NBPCC 0x3C04 /* 3Com NBP Connect complete not registered */ -#define ETHERTYPE_NBPCLREQ 0x3C05 /* 3Com NBP Close request (virtual cct) not registered */ -#define ETHERTYPE_NBPCLRSP 0x3C06 /* 3Com NBP Close response not registered */ -#define ETHERTYPE_NBPDG 0x3C07 /* 3Com NBP Datagram (like XNS IDP) not registered */ -#define ETHERTYPE_NBPDGB 0x3C08 /* 3Com NBP Datagram broadcast not registered */ -#define ETHERTYPE_NBPCLAIM 0x3C09 /* 3Com NBP Claim NetBIOS name not registered */ -#define ETHERTYPE_NBPDLTE 0x3C0A /* 3Com NBP Delete Netbios name not registered */ -#define ETHERTYPE_NBPRAS 0x3C0B /* 3Com NBP Remote adaptor status request not registered */ -#define ETHERTYPE_NBPRAR 0x3C0C /* 3Com NBP Remote adaptor response not registered */ -#define ETHERTYPE_NBPRST 0x3C0D /* 3Com NBP Reset not registered */ - -#define ETHERTYPE_PCS 0x4242 /* PCS Basic Block Protocol */ -#define ETHERTYPE_IMLBLDIAG 0x424C /* Information Modes Little Big LAN diagnostic */ -#define ETHERTYPE_DIDDLE 0x4321 /* THD - Diddle */ -#define ETHERTYPE_IMLBL 0x4C42 /* Information Modes Little Big LAN */ -#define ETHERTYPE_SIMNET 0x5208 /* BBN Simnet Private */ -#define ETHERTYPE_DECEXPER 0x6000 /* DEC Unassigned, experimental */ -#define ETHERTYPE_MOPDL 0x6001 /* DEC MOP dump/load */ -#define ETHERTYPE_MOPRC 0x6002 /* DEC MOP remote console */ -#define ETHERTYPE_DECnet 0x6003 /* DEC DECNET Phase IV route */ -#define ETHERTYPE_DN ETHERTYPE_DECnet /* libpcap, tcpdump */ -#define ETHERTYPE_LAT 0x6004 /* DEC LAT */ -#define ETHERTYPE_DECDIAG 0x6005 /* DEC diagnostic protocol (at interface initialization?) */ -#define ETHERTYPE_DECCUST 0x6006 /* DEC customer protocol */ -#define ETHERTYPE_SCA 0x6007 /* DEC LAVC, SCA */ -#define ETHERTYPE_AMBER 0x6008 /* DEC AMBER */ -#define ETHERTYPE_DECMUMPS 0x6009 /* DEC MUMPS */ - /* 0x6010 - 0x6014 3Com Corporation */ -#define ETHERTYPE_TRANSETHER 0x6558 /* Trans Ether Bridging (RFC1701)*/ -#define ETHERTYPE_RAWFR 0x6559 /* Raw Frame Relay (RFC1701) */ -#define ETHERTYPE_UBDL 0x7000 /* Ungermann-Bass download */ -#define ETHERTYPE_UBNIU 0x7001 /* Ungermann-Bass NIUs */ -#define ETHERTYPE_UBDIAGLOOP 0x7002 /* Ungermann-Bass diagnostic/loopback */ -#define ETHERTYPE_UBNMC 0x7003 /* Ungermann-Bass ??? (NMC to/from UB Bridge) */ -#define ETHERTYPE_UBBST 0x7005 /* Ungermann-Bass Bridge Spanning Tree */ -#define ETHERTYPE_OS9 0x7007 /* OS/9 Microware */ -#define ETHERTYPE_OS9NET 0x7009 /* OS/9 Net? */ - /* 0x7020 - 0x7029 LRT (England) (now Sintrom) */ -#define ETHERTYPE_RACAL 0x7030 /* Racal-Interlan */ -#define ETHERTYPE_PRIMENTS 0x7031 /* Prime NTS (Network Terminal Service) */ -#define ETHERTYPE_CABLETRON 0x7034 /* Cabletron */ -#define ETHERTYPE_CRONUSVLN 0x8003 /* Cronus VLN */ -#define ETHERTYPE_CRONUS 0x8004 /* Cronus Direct */ -#define ETHERTYPE_HP 0x8005 /* HP Probe */ -#define ETHERTYPE_NESTAR 0x8006 /* Nestar */ -#define ETHERTYPE_ATTSTANFORD 0x8008 /* AT&T/Stanford (local use) */ -#define ETHERTYPE_EXCELAN 0x8010 /* Excelan */ -#define ETHERTYPE_SG_DIAG 0x8013 /* SGI diagnostic type */ -#define ETHERTYPE_SG_NETGAMES 0x8014 /* SGI network games */ -#define ETHERTYPE_SG_RESV 0x8015 /* SGI reserved type */ -#define ETHERTYPE_SG_BOUNCE 0x8016 /* SGI bounce server */ -#define ETHERTYPE_APOLLODOMAIN 0x8019 /* Apollo DOMAIN */ -#define ETHERTYPE_TYMSHARE 0x802E /* Tymeshare */ -#define ETHERTYPE_TIGAN 0x802F /* Tigan, Inc. */ -#define ETHERTYPE_REVARP 0x8035 /* Reverse addr resolution protocol */ -#define ETHERTYPE_AEONIC 0x8036 /* Aeonic Systems */ -#define ETHERTYPE_IPXNEW 0x8037 /* IPX (Novell Netware?) */ -#define ETHERTYPE_LANBRIDGE 0x8038 /* DEC LANBridge */ -#define ETHERTYPE_DSMD 0x8039 /* DEC DSM/DDP */ -#define ETHERTYPE_ARGONAUT 0x803A /* DEC Argonaut Console */ -#define ETHERTYPE_VAXELN 0x803B /* DEC VAXELN */ -#define ETHERTYPE_DECDNS 0x803C /* DEC DNS Naming Service */ -#define ETHERTYPE_ENCRYPT 0x803D /* DEC Ethernet Encryption */ -#define ETHERTYPE_DECDTS 0x803E /* DEC Distributed Time Service */ -#define ETHERTYPE_DECLTM 0x803F /* DEC LAN Traffic Monitor */ -#define ETHERTYPE_DECNETBIOS 0x8040 /* DEC PATHWORKS DECnet NETBIOS Emulation */ -#define ETHERTYPE_DECLAST 0x8041 /* DEC Local Area System Transport */ - /* 0x8042 DEC Unassigned */ -#define ETHERTYPE_PLANNING 0x8044 /* Planning Research Corp. */ - /* 0x8046 - 0x8047 AT&T */ -#define ETHERTYPE_DECAM 0x8048 /* DEC Availability Manager for Distributed Systems DECamds (but someone at DEC says not) */ -#define ETHERTYPE_EXPERDATA 0x8049 /* ExperData */ -#define ETHERTYPE_VEXP 0x805B /* Stanford V Kernel exp. */ -#define ETHERTYPE_VPROD 0x805C /* Stanford V Kernel prod. */ -#define ETHERTYPE_ES 0x805D /* Evans & Sutherland */ -#define ETHERTYPE_LITTLE 0x8060 /* Little Machines */ -#define ETHERTYPE_COUNTERPOINT 0x8062 /* Counterpoint Computers */ - /* 0x8065 - 0x8066 Univ. of Mass @ Amherst */ -#define ETHERTYPE_VEECO 0x8067 /* Veeco Integrated Auto. */ -#define ETHERTYPE_GENDYN 0x8068 /* General Dynamics */ -#define ETHERTYPE_ATT 0x8069 /* AT&T */ -#define ETHERTYPE_AUTOPHON 0x806A /* Autophon */ -#define ETHERTYPE_COMDESIGN 0x806C /* ComDesign */ -#define ETHERTYPE_COMPUGRAPHIC 0x806D /* Compugraphic Corporation */ - /* 0x806E - 0x8077 Landmark Graphics Corp. */ -#define ETHERTYPE_MATRA 0x807A /* Matra */ -#define ETHERTYPE_DDE 0x807B /* Dansk Data Elektronik */ -#define ETHERTYPE_MERIT 0x807C /* Merit Internodal (or Univ of Michigan?) */ - /* 0x807D - 0x807F Vitalink Communications */ -#define ETHERTYPE_VLTLMAN 0x8080 /* Vitalink TransLAN III Management */ - /* 0x8081 - 0x8083 Counterpoint Computers */ - /* 0x8088 - 0x808A Xyplex */ -#define ETHERTYPE_ATALK 0x809B /* AppleTalk */ -#define ETHERTYPE_AT ETHERTYPE_ATALK /* old NetBSD */ -#define ETHERTYPE_APPLETALK ETHERTYPE_ATALK /* HP-UX */ - /* 0x809C - 0x809E Datability */ -#define ETHERTYPE_SPIDER 0x809F /* Spider Systems Ltd. */ - /* 0x80A3 Nixdorf */ - /* 0x80A4 - 0x80B3 Siemens Gammasonics Inc. */ - /* 0x80C0 - 0x80C3 DCA (Digital Comm. Assoc.) Data Exchange Cluster */ - /* 0x80C4 - 0x80C5 Banyan Systems */ -#define ETHERTYPE_PACER 0x80C6 /* Pacer Software */ -#define ETHERTYPE_APPLITEK 0x80C7 /* Applitek Corporation */ - /* 0x80C8 - 0x80CC Intergraph Corporation */ - /* 0x80CD - 0x80CE Harris Corporation */ - /* 0x80CF - 0x80D2 Taylor Instrument */ - /* 0x80D3 - 0x80D4 Rosemount Corporation */ -#define ETHERTYPE_SNA 0x80D5 /* IBM SNA Services over Ethernet */ -#define ETHERTYPE_VARIAN 0x80DD /* Varian Associates */ - /* 0x80DE - 0x80DF TRFS (Integrated Solutions Transparent Remote File System) */ - /* 0x80E0 - 0x80E3 Allen-Bradley */ - /* 0x80E4 - 0x80F0 Datability */ -#define ETHERTYPE_RETIX 0x80F2 /* Retix */ -#define ETHERTYPE_AARP 0x80F3 /* AppleTalk AARP */ - /* 0x80F4 - 0x80F5 Kinetics */ -#define ETHERTYPE_APOLLO 0x80F7 /* Apollo Computer */ -#define ETHERTYPE_VLAN 0x8100 /* IEEE 802.1Q VLAN tagging (XXX conflicts) */ - /* 0x80FF - 0x8101 Wellfleet Communications (XXX conflicts) */ -#define ETHERTYPE_BOFL 0x8102 /* Wellfleet; BOFL (Breath OF Life) pkts [every 5-10 secs.] */ -#define ETHERTYPE_WELLFLEET 0x8103 /* Wellfleet Communications */ - /* 0x8107 - 0x8109 Symbolics Private */ -#define ETHERTYPE_TALARIS 0x812B /* Talaris */ -#define ETHERTYPE_WATERLOO 0x8130 /* Waterloo Microsystems Inc. (XXX which?) */ -#define ETHERTYPE_HAYES 0x8130 /* Hayes Microcomputers (XXX which?) */ -#define ETHERTYPE_VGLAB 0x8131 /* VG Laboratory Systems */ - /* 0x8132 - 0x8137 Bridge Communications */ -#define ETHERTYPE_IPX 0x8137 /* Novell (old) NetWare IPX (ECONFIG E option) */ -#define ETHERTYPE_NOVELL 0x8138 /* Novell, Inc. */ - /* 0x8139 - 0x813D KTI */ -#define ETHERTYPE_MUMPS 0x813F /* M/MUMPS data sharing */ -#define ETHERTYPE_AMOEBA 0x8145 /* Vrije Universiteit (NL) Amoeba 4 RPC (obsolete) */ -#define ETHERTYPE_FLIP 0x8146 /* Vrije Universiteit (NL) FLIP (Fast Local Internet Protocol) */ -#define ETHERTYPE_VURESERVED 0x8147 /* Vrije Universiteit (NL) [reserved] */ -#define ETHERTYPE_LOGICRAFT 0x8148 /* Logicraft */ -#define ETHERTYPE_NCD 0x8149 /* Network Computing Devices */ -#define ETHERTYPE_ALPHA 0x814A /* Alpha Micro */ -#define ETHERTYPE_SNMP 0x814C /* SNMP over Ethernet (see RFC1089) */ - /* 0x814D - 0x814E BIIN */ -#define ETHERTYPE_TEC 0x814F /* Technically Elite Concepts */ -#define ETHERTYPE_RATIONAL 0x8150 /* Rational Corp */ - /* 0x8151 - 0x8153 Qualcomm */ - /* 0x815C - 0x815E Computer Protocol Pty Ltd */ - /* 0x8164 - 0x8166 Charles River Data Systems */ -#define ETHERTYPE_XTP 0x817D /* Protocol Engines XTP */ -#define ETHERTYPE_SGITW 0x817E /* SGI/Time Warner prop. */ -#define ETHERTYPE_HIPPI_FP 0x8180 /* HIPPI-FP encapsulation */ -#define ETHERTYPE_STP 0x8181 /* Scheduled Transfer STP, HIPPI-ST */ - /* 0x8182 - 0x8183 Reserved for HIPPI-6400 */ - /* 0x8184 - 0x818C SGI prop. */ -#define ETHERTYPE_MOTOROLA 0x818D /* Motorola */ -#define ETHERTYPE_NETBEUI 0x8191 /* PowerLAN NetBIOS/NetBEUI (PC) */ - /* 0x819A - 0x81A3 RAD Network Devices */ - /* 0x81B7 - 0x81B9 Xyplex */ - /* 0x81CC - 0x81D5 Apricot Computers */ - /* 0x81D6 - 0x81DD Artisoft Lantastic */ - /* 0x81E6 - 0x81EF Polygon */ - /* 0x81F0 - 0x81F2 Comsat Labs */ - /* 0x81F3 - 0x81F5 SAIC */ - /* 0x81F6 - 0x81F8 VG Analytical */ - /* 0x8203 - 0x8205 QNX Software Systems Ltd. */ - /* 0x8221 - 0x8222 Ascom Banking Systems */ - /* 0x823E - 0x8240 Advanced Encryption Systems */ - /* 0x8263 - 0x826A Charles River Data Systems */ - /* 0x827F - 0x8282 Athena Programming */ - /* 0x829A - 0x829B Inst Ind Info Tech */ - /* 0x829C - 0x82AB Taurus Controls */ - /* 0x82AC - 0x8693 Walker Richer & Quinn */ -#define ETHERTYPE_ACCTON 0x8390 /* Accton Technologies (unregistered) */ -#define ETHERTYPE_TALARISMC 0x852B /* Talaris multicast */ -#define ETHERTYPE_KALPANA 0x8582 /* Kalpana */ - /* 0x8694 - 0x869D Idea Courier */ - /* 0x869E - 0x86A1 Computer Network Tech */ - /* 0x86A3 - 0x86AC Gateway Communications */ -#define ETHERTYPE_SECTRA 0x86DB /* SECTRA */ -#define ETHERTYPE_IPV6 0x86DD /* IP protocol version 6 */ -#define ETHERTYPE_DELTACON 0x86DE /* Delta Controls */ -#define ETHERTYPE_ATOMIC 0x86DF /* ATOMIC */ - /* 0x86E0 - 0x86EF Landis & Gyr Powers */ - /* 0x8700 - 0x8710 Motorola */ -#define ETHERTYPE_RDP 0x8739 /* Control Technology Inc. RDP Without IP */ -#define ETHERTYPE_MICP 0x873A /* Control Technology Inc. Mcast Industrial Ctrl Proto. */ - /* 0x873B - 0x873C Control Technology Inc. Proprietary */ -#define ETHERTYPE_TCPCOMP 0x876B /* TCP/IP Compression (RFC1701) */ -#define ETHERTYPE_IPAS 0x876C /* IP Autonomous Systems (RFC1701) */ -#define ETHERTYPE_SECUREDATA 0x876D /* Secure Data (RFC1701) */ -#define ETHERTYPE_FLOWCONTROL 0x8808 /* 802.3x flow control packet */ -#define ETHERTYPE_SLOWPROTOCOLS 0x8809 /* Slow protocols */ -#define ETHERTYPE_PPP 0x880B /* PPP (obsolete by PPPOE) */ -#define ETHERTYPE_HITACHI 0x8820 /* Hitachi Cable (Optoelectronic Systems Laboratory) */ -#define ETHERTYPE_MPLS 0x8847 /* MPLS Unicast */ -#define ETHERTYPE_MPLS_MCAST 0x8848 /* MPLS Multicast */ -#define ETHERTYPE_AXIS 0x8856 /* Axis Communications AB proprietary bootstrap/config */ -#define ETHERTYPE_PPPOEDISC 0x8863 /* PPP Over Ethernet Discovery Stage */ -#define ETHERTYPE_PPPOE 0x8864 /* PPP Over Ethernet Session Stage */ -#define ETHERTYPE_LANPROBE 0x8888 /* HP LanProbe test? */ -#define ETHERTYPE_PAE 0x888e /* EAPOL PAE/802.1x */ -#define ETHERTYPE_LOOPBACK 0x9000 /* Loopback */ -#define ETHERTYPE_LBACK ETHERTYPE_LOOPBACK /* DEC MOP loopback */ -#define ETHERTYPE_XNSSM 0x9001 /* 3Com (Formerly Bridge Communications), XNS Systems Management */ -#define ETHERTYPE_TCPSM 0x9002 /* 3Com (Formerly Bridge Communications), TCP/IP Systems Management */ -#define ETHERTYPE_BCLOOP 0x9003 /* 3Com (Formerly Bridge Communications), loopback detection */ -#define ETHERTYPE_DEBNI 0xAAAA /* DECNET? Used by VAX 6220 DEBNI */ -#define ETHERTYPE_SONIX 0xFAF5 /* Sonix Arpeggio */ -#define ETHERTYPE_VITAL 0xFF00 /* BBN VITAL-LanBridge cache wakeups */ - /* 0xFF00 - 0xFFOF ISC Bunker Ramo */ - -#define ETHERTYPE_MAX 0xFFFF /* Maximum valid ethernet type, reserved */ - -#endif /* !_NET_ETHERTYPES_H_ */ diff --git a/libc/include/net/if.h b/libc/include/net/if.h deleted file mode 100644 index 9044fc5a9..000000000 --- a/libc/include/net/if.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#ifndef IF_NAMESIZE -#define IF_NAMESIZE IFNAMSIZ -#endif - -__BEGIN_DECLS - -/* - * Map an interface name into its corresponding index. - */ -extern unsigned int if_nametoindex(const char *); -extern char* if_indextoname(unsigned ifindex, char *ifname); - -__END_DECLS diff --git a/libc/include/net/if_arp.h b/libc/include/net/if_arp.h deleted file mode 100644 index a25f1b475..000000000 --- a/libc/include/net/if_arp.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/net/if_dl.h b/libc/include/net/if_dl.h deleted file mode 100644 index 1f0c08061..000000000 --- a/libc/include/net/if_dl.h +++ /dev/null @@ -1,87 +0,0 @@ -/* $NetBSD: if_dl.h,v 1.18 2005/12/11 23:05:24 thorpej Exp $ */ - -/* - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)if_dl.h 8.1 (Berkeley) 6/10/93 - */ - -/* - * A Link-Level Sockaddr may specify the interface in one of two - * ways: either by means of a system-provided index number (computed - * anew and possibly differently on every reboot), or by a human-readable - * string such as "il0" (for managerial convenience). - * - * Census taking actions, such as something akin to SIOCGCONF would return - * both the index and the human name. - * - * High volume transactions (such as giving a link-level ``from'' address - * in a recvfrom or recvmsg call) may be likely only to provide the indexed - * form, (which requires fewer copy operations and less space). - * - * The form and interpretation of the link-level address is purely a matter - * of convention between the device driver and its consumers; however, it is - * expected that all drivers for an interface of a given if_type will agree. - */ - -#ifndef _NET_IF_DL_H_ -#define _NET_IF_DL_H_ - -#include - -/* - * Structure of a Link-Level sockaddr: - */ -struct sockaddr_dl { - u_char sdl_len; /* Total length of sockaddr */ - sa_family_t sdl_family; /* AF_LINK */ - u_int16_t sdl_index; /* if != 0, system given index for interface */ - u_char sdl_type; /* interface type */ - u_char sdl_nlen; /* interface name length, no trailing 0 reqd. */ - u_char sdl_alen; /* link level address length */ - u_char sdl_slen; /* link layer selector length */ - char sdl_data[12]; /* minimum work area, can be larger; - contains both if name and ll address */ -}; - -/* We do arithmetic directly with these, so keep them char instead of void */ -#define LLADDR(s) ((char *)((s)->sdl_data + (s)->sdl_nlen)) -#define CLLADDR(s) ((const char *)((s)->sdl_data + (s)->sdl_nlen)) - -#ifndef _KERNEL - -#include - -__BEGIN_DECLS -void link_addr(const char *, struct sockaddr_dl *); -char *link_ntoa(const struct sockaddr_dl *); -__END_DECLS - -#endif /* !_KERNEL */ - -#endif /* !_NET_IF_DL_H_ */ diff --git a/libc/include/net/if_ether.h b/libc/include/net/if_ether.h deleted file mode 100644 index 121f9ac97..000000000 --- a/libc/include/net/if_ether.h +++ /dev/null @@ -1,217 +0,0 @@ -/* $NetBSD: if_ether.h,v 1.43 2006/11/24 01:04:30 rpaulo Exp $ */ - -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)if_ether.h 8.1 (Berkeley) 6/10/93 - */ - -#ifndef _NET_IF_ETHER_H_ -#define _NET_IF_ETHER_H_ - -#ifdef _KERNEL -#ifdef _KERNEL_OPT -#include "opt_mbuftrace.h" -#endif -#include -#endif - -/* - * Some basic Ethernet constants. - */ -#define ETHER_ADDR_LEN 6 /* length of an Ethernet address */ -#define ETHER_TYPE_LEN 2 /* length of the Ethernet type field */ -#define ETHER_CRC_LEN 4 /* length of the Ethernet CRC */ -#define ETHER_HDR_LEN ((ETHER_ADDR_LEN * 2) + ETHER_TYPE_LEN) -#define ETHER_MIN_LEN 64 /* minimum frame length, including CRC */ -#define ETHER_MAX_LEN 1518 /* maximum frame length, including CRC */ -#define ETHER_MAX_LEN_JUMBO 9018 /* maximum jumbo frame len, including CRC */ - -/* - * Some Ethernet extensions. - */ -#define ETHER_VLAN_ENCAP_LEN 4 /* length of 802.1Q VLAN encapsulation */ - -/* - * Ethernet address - 6 octets - * this is only used by the ethers(3) functions. - */ -struct ether_addr { - u_int8_t ether_addr_octet[ETHER_ADDR_LEN]; -} __attribute__((__packed__)); - -/* - * Structure of a 10Mb/s Ethernet header. - */ -struct ether_header { - u_int8_t ether_dhost[ETHER_ADDR_LEN]; - u_int8_t ether_shost[ETHER_ADDR_LEN]; - u_int16_t ether_type; -} __attribute__((__packed__)); - -#include - -#define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */ - -#define ETHERMTU_JUMBO (ETHER_MAX_LEN_JUMBO - ETHER_HDR_LEN - ETHER_CRC_LEN) -#define ETHERMTU (ETHER_MAX_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) -#define ETHERMIN (ETHER_MIN_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) - -/* - * Compute the maximum frame size based on ethertype (i.e. possible - * encapsulation) and whether or not an FCS is present. - */ -#define ETHER_MAX_FRAME(ifp, etype, hasfcs) \ - ((ifp)->if_mtu + ETHER_HDR_LEN + \ - ((hasfcs) ? ETHER_CRC_LEN : 0) + \ - (((etype) == ETHERTYPE_VLAN) ? ETHER_VLAN_ENCAP_LEN : 0)) - -/* - * Ethernet CRC32 polynomials (big- and little-endian verions). - */ -#define ETHER_CRC_POLY_LE 0xedb88320 -#define ETHER_CRC_POLY_BE 0x04c11db6 - -#ifndef _STANDALONE - -/* - * Ethernet-specific mbuf flags. - */ -#define M_HASFCS M_LINK0 /* FCS included at end of frame */ -#define M_PROMISC M_LINK1 /* this packet is not for us */ - -#ifdef _KERNEL -/* - * Macro to map an IP multicast address to an Ethernet multicast address. - * The high-order 25 bits of the Ethernet address are statically assigned, - * and the low-order 23 bits are taken from the low end of the IP address. - */ -#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \ - /* struct in_addr *ipaddr; */ \ - /* u_int8_t enaddr[ETHER_ADDR_LEN]; */ \ -{ \ - (enaddr)[0] = 0x01; \ - (enaddr)[1] = 0x00; \ - (enaddr)[2] = 0x5e; \ - (enaddr)[3] = ((u_int8_t *)ipaddr)[1] & 0x7f; \ - (enaddr)[4] = ((u_int8_t *)ipaddr)[2]; \ - (enaddr)[5] = ((u_int8_t *)ipaddr)[3]; \ -} -/* - * Macro to map an IP6 multicast address to an Ethernet multicast address. - * The high-order 16 bits of the Ethernet address are statically assigned, - * and the low-order 32 bits are taken from the low end of the IP6 address. - */ -#define ETHER_MAP_IPV6_MULTICAST(ip6addr, enaddr) \ - /* struct in6_addr *ip6addr; */ \ - /* u_int8_t enaddr[ETHER_ADDR_LEN]; */ \ -{ \ - (enaddr)[0] = 0x33; \ - (enaddr)[1] = 0x33; \ - (enaddr)[2] = ((u_int8_t *)ip6addr)[12]; \ - (enaddr)[3] = ((u_int8_t *)ip6addr)[13]; \ - (enaddr)[4] = ((u_int8_t *)ip6addr)[14]; \ - (enaddr)[5] = ((u_int8_t *)ip6addr)[15]; \ -} -#endif - -#define ETHERCAP_VLAN_MTU 0x00000001 /* VLAN-compatible MTU */ -#define ETHERCAP_VLAN_HWTAGGING 0x00000002 /* hardware VLAN tag support */ -#define ETHERCAP_JUMBO_MTU 0x00000004 /* 9000 byte MTU supported */ - -#ifdef _KERNEL -extern const uint8_t etherbroadcastaddr[ETHER_ADDR_LEN]; -extern const uint8_t ethermulticastaddr_slowprotocols[ETHER_ADDR_LEN]; -extern const uint8_t ether_ipmulticast_min[ETHER_ADDR_LEN]; -extern const uint8_t ether_ipmulticast_max[ETHER_ADDR_LEN]; - -int ether_ioctl(struct ifnet *, u_long, caddr_t); -int ether_addmulti (struct ifreq *, struct ethercom *); -int ether_delmulti (struct ifreq *, struct ethercom *); -int ether_changeaddr (struct ifreq *, struct ethercom *); -int ether_multiaddr(struct sockaddr *, u_int8_t[], u_int8_t[]); - -/* - * Ethernet 802.1Q VLAN structures. - */ - -/* add VLAN tag to input/received packet */ -#define VLAN_INPUT_TAG(ifp, m, vlanid, _errcase) \ - do { \ - struct m_tag *mtag = \ - m_tag_get(PACKET_TAG_VLAN, sizeof(u_int), M_NOWAIT);\ - if (mtag == NULL) { \ - ifp->if_ierrors++; \ - printf("%s: unable to allocate VLAN tag\n", \ - ifp->if_xname); \ - m_freem(m); \ - _errcase; \ - } \ - *(u_int *)(mtag + 1) = vlanid; \ - m_tag_prepend(m, mtag); \ - } while(0) - -/* extract VLAN tag from output/trasmit packet */ -#define VLAN_OUTPUT_TAG(ec, m0) \ - VLAN_ATTACHED(ec) ? m_tag_find((m0), PACKET_TAG_VLAN, NULL) : NULL - -/* extract VLAN ID value from a VLAN tag */ -#define VLAN_TAG_VALUE(mtag) \ - ((*(u_int *)(mtag + 1)) & 4095) - -/* test if any VLAN is configured for this interface */ -#define VLAN_ATTACHED(ec) ((ec)->ec_nvlans > 0) - -void ether_ifattach(struct ifnet *, const u_int8_t *); -void ether_ifdetach(struct ifnet *); - -char *ether_sprintf(const u_int8_t *); -char *ether_snprintf(char *, size_t, const u_int8_t *); - -u_int32_t ether_crc32_le(const u_int8_t *, size_t); -u_int32_t ether_crc32_be(const u_int8_t *, size_t); - -int ether_nonstatic_aton(u_char *, char *); -#else -/* - * Prototype ethers(3) functions. - */ -#include -__BEGIN_DECLS -char * ether_ntoa __P((const struct ether_addr *)); -struct ether_addr * - ether_aton __P((const char *)); -int ether_ntohost __P((char *, const struct ether_addr *)); -int ether_hostton __P((const char *, struct ether_addr *)); -int ether_line __P((const char *, struct ether_addr *, char *)); -__END_DECLS -#endif - -#endif /* _STANDALONE */ - -#endif /* !_NET_IF_ETHER_H_ */ diff --git a/libc/include/net/if_ieee1394.h b/libc/include/net/if_ieee1394.h deleted file mode 100644 index 5a61581f2..000000000 --- a/libc/include/net/if_ieee1394.h +++ /dev/null @@ -1,127 +0,0 @@ -/* $NetBSD: if_ieee1394.h,v 1.6 2005/12/10 23:21:38 elad Exp $ */ - -/* - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Atsushi Onoe. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _NET_IF_IEEE1394_H_ -#define _NET_IF_IEEE1394_H_ - -/* hardware address information for arp / nd */ -struct ieee1394_hwaddr { - u_int8_t iha_uid[8]; /* node unique ID */ - u_int8_t iha_maxrec; /* max_rec in the config ROM */ - u_int8_t iha_speed; /* min of link/PHY speed */ - u_int8_t iha_offset[6]; /* unicast FIFO address */ -}; - -/* - * BPF wants to see one of these. - */ -struct ieee1394_bpfhdr { - uint8_t ibh_dhost[8]; - uint8_t ibh_shost[8]; - uint16_t ibh_type; -}; - -#ifdef _KERNEL - -/* pseudo header */ -struct ieee1394_header { - u_int8_t ih_uid[8]; /* dst/src uid */ - u_int8_t ih_maxrec; /* dst maxrec for tx */ - u_int8_t ih_speed; /* speed */ - u_int8_t ih_offset[6]; /* dst offset */ -}; - -/* unfragment encapsulation header */ -struct ieee1394_unfraghdr { - u_int16_t iuh_ft; /* fragment type == 0 */ - u_int16_t iuh_etype; /* ether_type */ -}; - -/* fragmented encapsulation header */ -struct ieee1394_fraghdr { - u_int16_t ifh_ft_size; /* fragment type, data size-1 */ - u_int16_t ifh_etype_off; /* etype for first fragment */ - /* offset for subseq frag */ - u_int16_t ifh_dgl; /* datagram label */ - u_int16_t ifh_reserved; -}; - -#define IEEE1394_FT_SUBSEQ 0x8000 -#define IEEE1394_FT_MORE 0x4000 - -#define IEEE1394MTU 1500 - -#define IEEE1394_GASP_LEN 8 /* GASP header for Stream */ -#define IEEE1394_ADDR_LEN 8 -#define IEEE1394_CRC_LEN 4 - -struct ieee1394_reass_pkt { - LIST_ENTRY(ieee1394_reass_pkt) rp_next; - struct mbuf *rp_m; - u_int16_t rp_size; - u_int16_t rp_etype; - u_int16_t rp_off; - u_int16_t rp_dgl; - u_int16_t rp_len; - u_int16_t rp_ttl; -}; - -struct ieee1394_reassq { - LIST_ENTRY(ieee1394_reassq) rq_node; - LIST_HEAD(, ieee1394_reass_pkt) rq_pkt; - u_int32_t fr_id; -}; - -struct ieee1394com { - struct ifnet fc_if; - struct ieee1394_hwaddr ic_hwaddr; - u_int16_t ic_dgl; - LIST_HEAD(, ieee1394_reassq) ic_reassq; -}; - -const char *ieee1394_sprintf(const u_int8_t *); -void ieee1394_input(struct ifnet *, struct mbuf *, u_int16_t); -void ieee1394_ifattach(struct ifnet *, const struct ieee1394_hwaddr *); -void ieee1394_ifdetach(struct ifnet *); -int ieee1394_ioctl(struct ifnet *, u_long, caddr_t); -struct mbuf * ieee1394_fragment(struct ifnet *, struct mbuf *, int, u_int16_t); -void ieee1394_drain(struct ifnet *); -void ieee1394_watchdog(struct ifnet *); -#endif /* _KERNEL */ - -#endif /* !_NET_IF_IEEE1394_H_ */ diff --git a/libc/include/net/if_packet.h b/libc/include/net/if_packet.h deleted file mode 100644 index b5e8e0e11..000000000 --- a/libc/include/net/if_packet.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/net/if_types.h b/libc/include/net/if_types.h deleted file mode 100644 index f0a04f7c6..000000000 --- a/libc/include/net/if_types.h +++ /dev/null @@ -1,267 +0,0 @@ -/* $NetBSD: if_types.h,v 1.24 2005/12/10 23:21:38 elad Exp $ */ - -/* - * Copyright (c) 1989, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)if_types.h 8.3 (Berkeley) 4/28/95 - */ - -#ifndef _NET_IF_TYPES_H_ -#define _NET_IF_TYPES_H_ - -/* - * Interface types for benefit of parsing media address headers. - * This list is derived from the SNMP list of ifTypes, originally - * documented in RFC1573, now maintained as: - * - * - */ - -#define IFT_OTHER 0x1 /* none of the following */ -#define IFT_1822 0x2 /* old-style arpanet imp */ -#define IFT_HDH1822 0x3 /* HDH arpanet imp */ -#define IFT_X25DDN 0x4 /* x25 to imp */ -#define IFT_X25 0x5 /* PDN X25 interface (RFC877) */ -#define IFT_ETHER 0x6 /* Ethernet CSMA/CD */ -#define IFT_ISO88023 0x7 /* CSMA/CD */ -#define IFT_ISO88024 0x8 /* Token Bus */ -#define IFT_ISO88025 0x9 /* Token Ring */ -#define IFT_ISO88026 0xa /* MAN */ -#define IFT_STARLAN 0xb -#define IFT_P10 0xc /* Proteon 10MBit ring */ -#define IFT_P80 0xd /* Proteon 80MBit ring */ -#define IFT_HY 0xe /* Hyperchannel */ -#define IFT_FDDI 0xf -#define IFT_LAPB 0x10 -#define IFT_SDLC 0x11 -#define IFT_T1 0x12 -#define IFT_CEPT 0x13 /* E1 - european T1 */ -#define IFT_ISDNBASIC 0x14 -#define IFT_ISDNPRIMARY 0x15 -#define IFT_PTPSERIAL 0x16 /* Proprietary PTP serial */ -#define IFT_PPP 0x17 /* RFC 1331 */ -#define IFT_LOOP 0x18 /* loopback */ -#define IFT_EON 0x19 /* ISO over IP */ -#define IFT_XETHER 0x1a /* obsolete 3MB experimental ethernet */ -#define IFT_NSIP 0x1b /* XNS over IP */ -#define IFT_SLIP 0x1c /* IP over generic TTY */ -#define IFT_ULTRA 0x1d /* Ultra Technologies */ -#define IFT_DS3 0x1e /* Generic T3 */ -#define IFT_SIP 0x1f /* SMDS */ -#define IFT_FRELAY 0x20 /* Frame Relay DTE only */ -#define IFT_RS232 0x21 -#define IFT_PARA 0x22 /* parallel-port */ -#define IFT_ARCNET 0x23 -#define IFT_ARCNETPLUS 0x24 -#define IFT_ATM 0x25 /* ATM cells */ -#define IFT_MIOX25 0x26 -#define IFT_SONET 0x27 /* SONET or SDH */ -#define IFT_X25PLE 0x28 -#define IFT_ISO88022LLC 0x29 -#define IFT_LOCALTALK 0x2a -#define IFT_SMDSDXI 0x2b -#define IFT_FRELAYDCE 0x2c /* Frame Relay DCE */ -#define IFT_V35 0x2d -#define IFT_HSSI 0x2e -#define IFT_HIPPI 0x2f -#define IFT_MODEM 0x30 /* Generic Modem */ -#define IFT_AAL5 0x31 /* AAL5 over ATM */ -#define IFT_SONETPATH 0x32 -#define IFT_SONETVT 0x33 -#define IFT_SMDSICIP 0x34 /* SMDS InterCarrier Interface */ -#define IFT_PROPVIRTUAL 0x35 /* Proprietary Virtual/internal */ -#define IFT_PROPMUX 0x36 /* Proprietary Multiplexing */ -#define IFT_IEEE80212 0x37 /* 100BaseVG */ -#define IFT_FIBRECHANNEL 0x38 /* Fibre Channel */ -#define IFT_HIPPIINTERFACE 0x39 /* HIPPI interfaces */ -#define IFT_FRAMERELAYINTERCONNECT 0x3a /* Obsolete, use either 0x20 or 0x2c */ -#define IFT_AFLANE8023 0x3b /* ATM Emulated LAN for 802.3 */ -#define IFT_AFLANE8025 0x3c /* ATM Emulated LAN for 802.5 */ -#define IFT_CCTEMUL 0x3d /* ATM Emulated circuit */ -#define IFT_FASTETHER 0x3e /* Fast Ethernet (100BaseT) */ -#define IFT_ISDN 0x3f /* ISDN and X.25 */ -#define IFT_V11 0x40 /* CCITT V.11/X.21 */ -#define IFT_V36 0x41 /* CCITT V.36 */ -#define IFT_G703AT64K 0x42 /* CCITT G703 at 64Kbps */ -#define IFT_G703AT2MB 0x43 /* Obsolete see DS1-MIB */ -#define IFT_QLLC 0x44 /* SNA QLLC */ -#define IFT_FASTETHERFX 0x45 /* Fast Ethernet (100BaseFX) */ -#define IFT_CHANNEL 0x46 /* channel */ -#define IFT_IEEE80211 0x47 /* radio spread spectrum */ -#define IFT_IBM370PARCHAN 0x48 /* IBM System 360/370 OEMI Channel */ -#define IFT_ESCON 0x49 /* IBM Enterprise Systems Connection */ -#define IFT_DLSW 0x4a /* Data Link Switching */ -#define IFT_ISDNS 0x4b /* ISDN S/T interface */ -#define IFT_ISDNU 0x4c /* ISDN U interface */ -#define IFT_LAPD 0x4d /* Link Access Protocol D */ -#define IFT_IPSWITCH 0x4e /* IP Switching Objects */ -#define IFT_RSRB 0x4f /* Remote Source Route Bridging */ -#define IFT_ATMLOGICAL 0x50 /* ATM Logical Port */ -#define IFT_DS0 0x51 /* Digital Signal Level 0 */ -#define IFT_DS0BUNDLE 0x52 /* group of ds0s on the same ds1 */ -#define IFT_BSC 0x53 /* Bisynchronous Protocol */ -#define IFT_ASYNC 0x54 /* Asynchronous Protocol */ -#define IFT_CNR 0x55 /* Combat Net Radio */ -#define IFT_ISO88025DTR 0x56 /* ISO 802.5r DTR */ -#define IFT_EPLRS 0x57 /* Ext Pos Loc Report Sys */ -#define IFT_ARAP 0x58 /* Appletalk Remote Access Protocol */ -#define IFT_PROPCNLS 0x59 /* Proprietary Connectionless Protocol*/ -#define IFT_HOSTPAD 0x5a /* CCITT-ITU X.29 PAD Protocol */ -#define IFT_TERMPAD 0x5b /* CCITT-ITU X.3 PAD Facility */ -#define IFT_FRAMERELAYMPI 0x5c /* Multiproto Interconnect over FR */ -#define IFT_X213 0x5d /* CCITT-ITU X213 */ -#define IFT_ADSL 0x5e /* Asymmetric Digital Subscriber Loop */ -#define IFT_RADSL 0x5f /* Rate-Adapt. Digital Subscriber Loop*/ -#define IFT_SDSL 0x60 /* Symmetric Digital Subscriber Loop */ -#define IFT_VDSL 0x61 /* Very H-Speed Digital Subscrib. Loop*/ -#define IFT_ISO88025CRFPINT 0x62 /* ISO 802.5 CRFP */ -#define IFT_MYRINET 0x63 /* Myricom Myrinet */ -#define IFT_VOICEEM 0x64 /* voice recEive and transMit */ -#define IFT_VOICEFXO 0x65 /* voice Foreign Exchange Office */ -#define IFT_VOICEFXS 0x66 /* voice Foreign Exchange Station */ -#define IFT_VOICEENCAP 0x67 /* voice encapsulation */ -#define IFT_VOICEOVERIP 0x68 /* voice over IP encapsulation */ -#define IFT_ATMDXI 0x69 /* ATM DXI */ -#define IFT_ATMFUNI 0x6a /* ATM FUNI */ -#define IFT_ATMIMA 0x6b /* ATM IMA */ -#define IFT_PPPMULTILINKBUNDLE 0x6c /* PPP Multilink Bundle */ -#define IFT_IPOVERCDLC 0x6d /* IBM ipOverCdlc */ -#define IFT_IPOVERCLAW 0x6e /* IBM Common Link Access to Workstn */ -#define IFT_STACKTOSTACK 0x6f /* IBM stackToStack */ -#define IFT_VIRTUALIPADDRESS 0x70 /* IBM VIPA */ -#define IFT_MPC 0x71 /* IBM multi-protocol channel support */ -#define IFT_IPOVERATM 0x72 /* IBM ipOverAtm */ -#define IFT_ISO88025FIBER 0x73 /* ISO 802.5j Fiber Token Ring */ -#define IFT_TDLC 0x74 /* IBM twinaxial data link control */ -#define IFT_GIGABITETHERNET 0x75 /* Gigabit Ethernet */ -#define IFT_HDLC 0x76 /* HDLC */ -#define IFT_LAPF 0x77 /* LAP F */ -#define IFT_V37 0x78 /* V.37 */ -#define IFT_X25MLP 0x79 /* Multi-Link Protocol */ -#define IFT_X25HUNTGROUP 0x7a /* X25 Hunt Group */ -#define IFT_TRANSPHDLC 0x7b /* Transp HDLC */ -#define IFT_INTERLEAVE 0x7c /* Interleave channel */ -#define IFT_FAST 0x7d /* Fast channel */ -#define IFT_IP 0x7e /* IP (for APPN HPR in IP networks) */ -#define IFT_DOCSCABLEMACLAYER 0x7f /* CATV Mac Layer */ -#define IFT_DOCSCABLEDOWNSTREAM 0x80 /* CATV Downstream interface */ -#define IFT_DOCSCABLEUPSTREAM 0x81 /* CATV Upstream interface */ -#define IFT_A12MPPSWITCH 0x82 /* Avalon Parallel Processor */ -#define IFT_TUNNEL 0x83 /* Encapsulation interface */ -#define IFT_COFFEE 0x84 /* coffee pot */ -#define IFT_CES 0x85 /* Circiut Emulation Service */ -#define IFT_ATMSUBINTERFACE 0x86 /* (x) ATM Sub Interface */ -#define IFT_L2VLAN 0x87 /* Layer 2 Virtual LAN using 802.1Q */ -#define IFT_L3IPVLAN 0x88 /* Layer 3 Virtual LAN - IP Protocol */ -#define IFT_L3IPXVLAN 0x89 /* Layer 3 Virtual LAN - IPX Prot. */ -#define IFT_DIGITALPOWERLINE 0x8a /* IP over Power Lines */ -#define IFT_MEDIAMAILOVERIP 0x8b /* (xxx) Multimedia Mail over IP */ -#define IFT_DTM 0x8c /* Dynamic synchronous Transfer Mode */ -#define IFT_DCN 0x8d /* Data Communications Network */ -#define IFT_IPFORWARD 0x8e /* IP Forwarding Interface */ -#define IFT_MSDSL 0x8f /* Multi-rate Symmetric DSL */ -#define IFT_IEEE1394 0x90 /* IEEE1394 High Performance SerialBus*/ -#define IFT_IFGSN 0x91 /* HIPPI-6400 */ -#define IFT_DVBRCCMACLAYER 0x92 /* DVB-RCC MAC Layer */ -#define IFT_DVBRCCDOWNSTREAM 0x93 /* DVB-RCC Downstream Channel */ -#define IFT_DVBRCCUPSTREAM 0x94 /* DVB-RCC Upstream Channel */ -#define IFT_ATMVIRTUAL 0x95 /* ATM Virtual Interface */ -#define IFT_MPLSTUNNEL 0x96 /* MPLS Tunnel Virtual Interface */ -#define IFT_SRP 0x97 /* Spatial Reuse Protocol */ -#define IFT_VOICEOVERATM 0x98 /* Voice over ATM */ -#define IFT_VOICEOVERFRAMERELAY 0x99 /* Voice Over Frame Relay */ -#define IFT_IDSL 0x9a /* Digital Subscriber Loop over ISDN */ -#define IFT_COMPOSITELINK 0x9b /* Avici Composite Link Interface */ -#define IFT_SS7SIGLINK 0x9c /* SS7 Signaling Link */ -#define IFT_PROPWIRELESSP2P 0x9d /* Prop. P2P wireless interface */ -#define IFT_FRFORWARD 0x9e /* Frame forward Interface */ -#define IFT_RFC1483 0x9f /* Multiprotocol over ATM AAL5 */ -#define IFT_USB 0xa0 /* USB Interface */ -#define IFT_IEEE8023ADLAG 0xa1 /* IEEE 802.3ad Link Aggregate*/ -#define IFT_BGPPOLICYACCOUNTING 0xa2 /* BGP Policy Accounting */ -#define IFT_FRF16MFRBUNDLE 0xa3 /* FRF.16 Multilik Frame Relay*/ -#define IFT_H323GATEKEEPER 0xa4 /* H323 Gatekeeper */ -#define IFT_H323PROXY 0xa5 /* H323 Voice and Video Proxy */ -#define IFT_MPLS 0xa6 /* MPLS */ -#define IFT_MFSIGLINK 0xa7 /* Multi-frequency signaling link */ -#define IFT_HDSL2 0xa8 /* High Bit-Rate DSL, 2nd gen. */ -#define IFT_SHDSL 0xa9 /* Multirate HDSL2 */ -#define IFT_DS1FDL 0xaa /* Facility Data Link (4Kbps) on a DS1*/ -#define IFT_POS 0xab /* Packet over SONET/SDH Interface */ -#define IFT_DVBASILN 0xac /* DVB-ASI Input */ -#define IFT_DVBASIOUT 0xad /* DVB-ASI Output */ -#define IFT_PLC 0xae /* Power Line Communications */ -#define IFT_NFAS 0xaf /* Non-Facility Associated Signaling */ -#define IFT_TR008 0xb0 /* TROO8 */ -#define IFT_GR303RDT 0xb1 /* Remote Digital Terminal */ -#define IFT_GR303IDT 0xb2 /* Integrated Digital Terminal */ -#define IFT_ISUP 0xb3 /* ISUP */ -#define IFT_PROPDOCSWIRELESSMACLAYER 0xb4 /* prop/Wireless MAC Layer */ -#define IFT_PROPDOCSWIRELESSDOWNSTREAM 0xb5 /* prop/Wireless Downstream */ -#define IFT_PROPDOCSWIRELESSUPSTREAM 0xb6 /* prop/Wireless Upstream */ -#define IFT_HIPERLAN2 0xb7 /* HIPERLAN Type 2 Radio Interface */ -#define IFT_PROPBWAP2MP 0xb8 /* PropBroadbandWirelessAccess P2MP*/ -#define IFT_SONETOVERHEADCHANNEL 0xb9 /* SONET Overhead Channel */ -#define IFT_DIGITALWRAPPEROVERHEADCHANNEL 0xba /* Digital Wrapper Overhead */ -#define IFT_AAL2 0xbb /* ATM adaptation layer 2 */ -#define IFT_RADIOMAC 0xbc /* MAC layer over radio links */ -#define IFT_ATMRADIO 0xbd /* ATM over radio links */ -#define IFT_IMT 0xbe /* Inter-Machine Trunks */ -#define IFT_MVL 0xbf /* Multiple Virtual Lines DSL */ -#define IFT_REACHDSL 0xc0 /* Long Reach DSL */ -#define IFT_FRDLCIENDPT 0xc1 /* Frame Relay DLCI End Point */ -#define IFT_ATMVCIENDPT 0xc2 /* ATM VCI End Point */ -#define IFT_OPTICALCHANNEL 0xc3 /* Optical Channel */ -#define IFT_OPTICALTRANSPORT 0xc4 /* Optical Transport */ -#define IFT_PROPATM 0xc5 /* Proprietary ATM */ -#define IFT_VOICEOVERCABLE 0xc6 /* Voice Over Cable Interface */ -#define IFT_INFINIBAND 0xc7 /* Infiniband */ -#define IFT_TELINK 0xc8 /* TE Link */ -#define IFT_Q2931 0xc9 /* Q.2931 */ -#define IFT_VIRTUALTG 0xca /* Virtual Trunk Group */ -#define IFT_SIPTG 0xcb /* SIP Trunk Group */ -#define IFT_SIPSIG 0xcc /* SIP Signaling */ -#define IFT_DOCSCABLEUPSTREAMCHANNEL 0xcd /* CATV Upstream Channel */ -#define IFT_ECONET 0xce /* Acorn Econet */ -#define IFT_PON155 0xcf /* FSAN 155Mb Symetrical PON interface */ -#define IFT_PON622 0xd0 /* FSAN 622Mb Symetrical PON interface */*/ -#define IFT_BRIDGE 0xd1 /* Transparent bridge interface */ -#define IFT_LINEGROUP 0xd2 /* Interface common to multiple lines */ -#define IFT_VOICEEMFGD 0xd3 /* voice E&M Feature Group D */ -#define IFT_VOICEFGDEANA 0xd4 /* voice FGD Exchange Access North American */ -#define IFT_VOICEDID 0xd5 /* voice Direct Inward Dialing */ -#define IFT_STF 0xd7 /* 6to4 interface */ - -/* not based on IANA assignments - how should we treat these? */ -#define IFT_GIF 0xf0 -#define IFT_PVC 0xf1 -#define IFT_FAITH 0xf2 -#define IFT_PFLOG 0xf5 /* Packet filter logging */ -#define IFT_PFSYNC 0xf6 /* Packet filter state syncing */ - -#endif /* !_NET_IF_TYPES_H_ */ diff --git a/libc/include/net/route.h b/libc/include/net/route.h deleted file mode 100644 index a60df24c0..000000000 --- a/libc/include/net/route.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/netdb.h b/libc/include/netdb.h deleted file mode 100644 index b0c3b7275..000000000 --- a/libc/include/netdb.h +++ /dev/null @@ -1,253 +0,0 @@ -/*- - * Copyright (c) 1980, 1983, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * - - * --Copyright-- - */ - -/* - * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: /repoman/r/ncvs/src/include/netdb.h,v 1.41 2006/04/15 16:20:26 ume Exp $ - */ - -#ifndef _NETDB_H_ -#define _NETDB_H_ - -#include -#include -#include - -#ifndef _PATH_HEQUIV -# define _PATH_HEQUIV "/system/etc/hosts.equiv" -#endif -#define _PATH_HOSTS "/system/etc/hosts" -#define _PATH_NETWORKS "/system/etc/networks" -#define _PATH_PROTOCOLS "/system/etc/protocols" -#define _PATH_SERVICES "/system/etc/services" - -#define MAXHOSTNAMELEN 256 - -/* BIONIC-BEGIN */ -#define h_errno (*__get_h_errno()) -extern int* __get_h_errno(void); -/* BIONIC-END */ - -/* - * Structures returned by network data base library. All addresses are - * supplied in host order, and returned in network order (suitable for - * use in system calls). - */ -struct hostent { - char *h_name; /* official name of host */ - char **h_aliases; /* alias list */ - int h_addrtype; /* host address type */ - int h_length; /* length of address */ - char **h_addr_list; /* list of addresses from name server */ -#define h_addr h_addr_list[0] /* address, for backward compatibility */ -}; - -struct netent { - char *n_name; /* official name of net */ - char **n_aliases; /* alias list */ - int n_addrtype; /* net address type */ - uint32_t n_net; /* network # */ -}; - -struct servent { - char *s_name; /* official service name */ - char **s_aliases; /* alias list */ - int s_port; /* port # */ - char *s_proto; /* protocol to use */ -}; - -struct protoent { - char *p_name; /* official protocol name */ - char **p_aliases; /* alias list */ - int p_proto; /* protocol # */ -}; - -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ - socklen_t ai_addrlen; /* length of ai_addr */ - char *ai_canonname; /* canonical name for hostname */ - struct sockaddr *ai_addr; /* binary address */ - struct addrinfo *ai_next; /* next structure in linked list */ -}; - -/* - * Error return codes from gethostbyname() and gethostbyaddr() - * (left in h_errno). - */ - -#define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ -#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ - -/* - * Error return codes from getaddrinfo() - */ -#if 0 -/* obsoleted */ -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#endif -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 /* invalid value for hints */ -#define EAI_PROTOCOL 13 /* resolved protocol is unknown */ -#define EAI_OVERFLOW 14 /* argument buffer overflow */ -#define EAI_MAX 15 - -/* - * Flag values for getaddrinfo() - */ -#define AI_PASSIVE 0x00000001 /* get address to use bind() */ -#define AI_CANONNAME 0x00000002 /* fill ai_canonname */ -#define AI_NUMERICHOST 0x00000004 /* prevent host name resolution */ -#define AI_NUMERICSERV 0x00000008 /* prevent service name resolution */ -/* valid flags for addrinfo (not a standard def, apps should not use it) */ -#define AI_MASK \ - (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \ - AI_ADDRCONFIG) - -#define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */ -#define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */ -#define AI_ADDRCONFIG 0x00000400 /* only if any address is assigned */ -#define AI_V4MAPPED 0x00000800 /* accept IPv4-mapped IPv6 address */ -/* special recommended flags for getipnodebyname */ -#define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG) - -/* - * Constants for getnameinfo() - */ -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - -/* - * Flag values for getnameinfo() - */ -#define NI_NOFQDN 0x00000001 -#define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 -#define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 -#if 0 /* obsolete */ -#define NI_WITHSCOPEID 0x00000020 -#endif - -/* - * Scope delimit character - */ -#define SCOPE_DELIMITER '%' - -__BEGIN_DECLS -void endhostent(void); -void endnetent(void); -void endnetgrent(void); -void endprotoent(void); -void endservent(void); -void freehostent(struct hostent *); -struct hostent *gethostbyaddr(const char *, int, int); -int gethostbyaddr_r(const char *, int, int, struct hostent *, char *, size_t, struct hostent **, int *); -struct hostent *gethostbyname(const char *); -int gethostbyname_r(const char *, struct hostent *, char *, size_t, struct hostent **, int *); -struct hostent *gethostbyname2(const char *, int); -int gethostbyname2_r(const char *, int, struct hostent *, char *, size_t, struct hostent **, int *); -struct hostent *gethostent(void); -int gethostent_r(struct hostent *, char *, size_t, struct hostent **, int *); -struct hostent *getipnodebyaddr(const void *, size_t, int, int *); -struct hostent *getipnodebyname(const char *, int, int, int *); -struct netent *getnetbyaddr(uint32_t, int); -int getnetbyaddr_r(uint32_t, int, struct netent *, char *, size_t, struct netent**, int *); -struct netent *getnetbyname(const char *); -int getnetbyname_r(const char *, struct netent *, char *, size_t, struct netent **, int *); -struct netent *getnetent(void); -int getnetent_r(struct netent *, char *, size_t, struct netent **, int *); -int getnetgrent(char **, char **, char **); -struct protoent *getprotobyname(const char *); -int getprotobyname_r(const char *, struct protoent *, char *, size_t, struct protoent **); -struct protoent *getprotobynumber(int); -int getprotobynumber_r(int, struct protoent *, char *, size_t, struct protoent **); -struct protoent *getprotoent(void); -int getprotoent_r(struct protoent *, char *, size_t, struct protoent **); -struct servent *getservbyname(const char *, const char *); -struct servent *getservbyport(int, const char *); -struct servent *getservent(void); -void herror(const char *); -const char *hstrerror(int); -int innetgr(const char *, const char *, const char *, const char *); -void sethostent(int); -void setnetent(int); -void setprotoent(int); -int getaddrinfo(const char *, const char *, const struct addrinfo *, struct addrinfo **); -int getnameinfo(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t, int); -void freeaddrinfo(struct addrinfo *); -const char *gai_strerror(int); -void setnetgrent(const char *); -void setservent(int); - -__END_DECLS - -#endif /* !_NETDB_H_ */ diff --git a/libc/include/netinet/ether.h b/libc/include/netinet/ether.h deleted file mode 100644 index a1c9cbb15..000000000 --- a/libc/include/netinet/ether.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include diff --git a/libc/include/netinet/if_ether.h b/libc/include/netinet/if_ether.h deleted file mode 100644 index 700b9dbf0..000000000 --- a/libc/include/netinet/if_ether.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#ifndef ETHER_ADDR_LEN -#define ETHER_ADDR_LEN ETH_ALEN -#include -#endif diff --git a/libc/include/netinet/in.h b/libc/include/netinet/in.h deleted file mode 100644 index 77ae50654..000000000 --- a/libc/include/netinet/in.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _NETINET_IN_H_ -#define _NETINET_IN_H_ - -#include -#include -#include -#include - -__BEGIN_DECLS - -#define IPPORT_RESERVED 1024 - -extern int bindresvport (int sd, struct sockaddr_in *sin); - -__END_DECLS - -#endif /* _NETINET_IN_H_ */ diff --git a/libc/include/netinet/in6.h b/libc/include/netinet/in6.h deleted file mode 100644 index e645c4877..000000000 --- a/libc/include/netinet/in6.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _NETINET_IN6_H -#define _NETINET_IN6_H - -#include - -#define IN6_IS_ADDR_UNSPECIFIED(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) == 0)) - -#define IN6_IS_ADDR_LOOPBACK(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) == ntohl(1))) - -#define IN6_IS_ADDR_V4COMPAT(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) != 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) != ntohl(1))) - -#define IN6_IS_ADDR_V4MAPPED(a) \ - ((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \ - (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff))) - -#define IN6_IS_ADDR_LINKLOCAL(a) \ - (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80)) - -#define IN6_IS_ADDR_SITELOCAL(a) \ - (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0)) - -#define IN6_IS_ADDR_MULTICAST(a) \ - (((__const uint8_t *) (a))[0] == 0xff) - - -#define IPV6_ADDR_SCOPE_NODELOCAL 0x01 -#define IPV6_ADDR_SCOPE_INTFACELOCAL 0x01 -#define IPV6_ADDR_SCOPE_LINKLOCAL 0x02 -#define IPV6_ADDR_SCOPE_SITELOCAL 0x05 -#define IPV6_ADDR_SCOPE_ORGLOCAL 0x08 -#define IPV6_ADDR_SCOPE_GLOBAL 0x0e - -#define IPV6_ADDR_MC_SCOPE(a) \ - ((a)->s6_addr[1] & 0x0f) - -#define IN6_IS_ADDR_MC_LINKLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_LINKLOCAL)) -#define IN6_IS_ADDR_MC_SITELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_SITELOCAL)) -#define IN6_IS_ADDR_MC_ORGLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_ORGLOCAL)) - - -#define IN6_ARE_ADDR_EQUAL(a, b) \ - (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) - -#define INET6_ADDRSTRLEN 46 - -#endif /* _NETINET_IN6_H */ diff --git a/libc/include/netinet/in_systm.h b/libc/include/netinet/in_systm.h deleted file mode 100644 index ff53fb7b9..000000000 --- a/libc/include/netinet/in_systm.h +++ /dev/null @@ -1,59 +0,0 @@ -/* $NetBSD: in_systm.h,v 1.13 2005/12/10 23:36:23 elad Exp $ */ - -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)in_systm.h 8.1 (Berkeley) 6/10/93 - */ - -#ifndef _NETINET_IN_SYSTM_H_ -#define _NETINET_IN_SYSTM_H_ - -/* - * Miscellaneous internetwork - * definitions for kernel. - */ - -/* - * Network types. - * - * Internally the system keeps counters in the headers with the bytes - * swapped so that VAX instructions will work on them. It reverses - * the bytes before transmission at each protocol level. The n_ types - * represent the types with the bytes in ``high-ender'' order. - */ -typedef u_int16_t n_short; /* short as received from the net */ -typedef u_int32_t n_long; /* long as received from the net */ - -typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */ - -#ifdef _KERNEL -n_time iptime (void); -#endif - -#endif /* !_NETINET_IN_SYSTM_H_ */ diff --git a/libc/include/netinet/ip.h b/libc/include/netinet/ip.h deleted file mode 100644 index 541905c13..000000000 --- a/libc/include/netinet/ip.h +++ /dev/null @@ -1,275 +0,0 @@ -/* $OpenBSD: ip.h,v 1.12 2006/04/27 02:19:32 tedu Exp $ */ -/* $NetBSD: ip.h,v 1.9 1995/05/15 01:22:44 cgd Exp $ */ - -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip.h 8.1 (Berkeley) 6/10/93 - */ - -#ifndef _NETINET_IP_H_ -#define _NETINET_IP_H_ - -#include -#include -#include -#include -#include - -__BEGIN_DECLS - -/* - * Definitions for internet protocol version 4. - * Per RFC 791, September 1981. - */ -#define IPVERSION 4 - -/* - * Structure of an internet header, naked of options. - */ -struct ip { -#if BYTE_ORDER == LITTLE_ENDIAN - u_int32_t ip_hl:4, /* header length */ - ip_v:4; /* version */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int32_t ip_v:4, /* version */ - ip_hl:4; /* header length */ -#endif - u_int8_t ip_tos; /* type of service */ - u_int16_t ip_len; /* total length */ - u_int16_t ip_id; /* identification */ - u_int16_t ip_off; /* fragment offset field */ -#define IP_RF 0x8000 /* reserved fragment flag */ -#define IP_DF 0x4000 /* dont fragment flag */ -#define IP_MF 0x2000 /* more fragments flag */ -#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - u_int8_t ip_ttl; /* time to live */ - u_int8_t ip_p; /* protocol */ - u_int16_t ip_sum; /* checksum */ - struct in_addr ip_src, ip_dst; /* source and dest address */ -}; - -#define IP_MAXPACKET 65535 /* maximum packet size */ - -/* - * Definitions for IP type of service (ip_tos) - */ -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -/* IPTOS_LOWCOST 0x02 XXX */ -#if 1 -/* ECN RFC3168 obsoletes RFC2481, and these will be deprecated soon. */ -#define IPTOS_CE 0x01 /* congestion experienced */ -#define IPTOS_ECT 0x02 /* ECN-capable transport */ -#endif - -/* - * Definitions for IP precedence (also in ip_tos) (hopefully unused) - */ -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - -/* - * ECN (Explicit Congestion Notification) codepoints in RFC3168 - * mapped to the lower 2 bits of the TOS field. - */ -#define IPTOS_ECN_NOTECT 0x00 /* not-ECT */ -#define IPTOS_ECN_ECT1 0x01 /* ECN-capable transport (1) */ -#define IPTOS_ECN_ECT0 0x02 /* ECN-capable transport (0) */ -#define IPTOS_ECN_CE 0x03 /* congestion experienced */ -#define IPTOS_ECN_MASK 0x03 /* ECN field mask */ - -/* - * Definitions for options. - */ -#define IPOPT_COPIED(o) ((o)&0x80) -#define IPOPT_CLASS(o) ((o)&0x60) -#define IPOPT_NUMBER(o) ((o)&0x1f) - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_DEBMEAS 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_EOL 0 /* end of option list */ -#define IPOPT_NOP 1 /* no operation */ - -#define IPOPT_RR 7 /* record packet route */ -#define IPOPT_TS 68 /* timestamp */ -#define IPOPT_SECURITY 130 /* provide s,c,h,tcc */ -#define IPOPT_LSRR 131 /* loose source route */ -#define IPOPT_SATID 136 /* satnet id */ -#define IPOPT_SSRR 137 /* strict source route */ - -/* - * Offsets to fields in options other than EOL and NOP. - */ -#define IPOPT_OPTVAL 0 /* option ID */ -#define IPOPT_OLEN 1 /* option length */ -#define IPOPT_OFFSET 2 /* offset within option */ -#define IPOPT_MINOFF 4 /* min value of above */ - -/* - * Time stamp option structure. - */ -struct ip_timestamp { - u_int8_t ipt_code; /* IPOPT_TS */ - u_int8_t ipt_len; /* size of structure (variable) */ - u_int8_t ipt_ptr; /* index of current entry */ -#if _BYTE_ORDER == _LITTLE_ENDIAN - u_int32_t ipt_flg:4, /* flags, see below */ - ipt_oflw:4; /* overflow counter */ -#endif -#if _BYTE_ORDER == _BIG_ENDIAN - u_int32_t ipt_oflw:4, /* overflow counter */ - ipt_flg:4; /* flags, see below */ -#endif - union ipt_timestamp { - n_time ipt_time[1]; - struct ipt_ta { - struct in_addr ipt_addr; - n_time ipt_time; - } ipt_ta[1]; - } ipt_timestamp; -}; - -/* flag bits for ipt_flg */ -#define IPOPT_TS_TSONLY 0 /* timestamps only */ -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -#define IPOPT_TS_PRESPEC 3 /* specified modules only */ - -/* bits for security (not byte swapped) */ -#define IPOPT_SECUR_UNCLASS 0x0000 -#define IPOPT_SECUR_CONFID 0xf135 -#define IPOPT_SECUR_EFTO 0x789a -#define IPOPT_SECUR_MMMM 0xbc4d -#define IPOPT_SECUR_RESTR 0xaf13 -#define IPOPT_SECUR_SECRET 0xd788 -#define IPOPT_SECUR_TOPSECRET 0x6bc5 - -/* - * Internet implementation parameters. - */ -#define MAXTTL 255 /* maximum time to live (seconds) */ -#define IPDEFTTL 64 /* default ttl, from RFC 1340 */ -#define IPFRAGTTL 60 /* time to live for frags, slowhz */ -#define IPTTLDEC 1 /* subtracted when forwarding */ - -#define IP_MSS 576 /* default maximum segment size */ - -/* - * This is the real IPv4 pseudo header, used for computing the TCP and UDP - * checksums. For the Internet checksum, struct ipovly can be used instead. - * For stronger checksums, the real thing must be used. - */ -struct ippseudo { - struct in_addr ippseudo_src; /* source internet address */ - struct in_addr ippseudo_dst; /* destination internet address */ - u_int8_t ippseudo_pad; /* pad, must be zero */ - u_int8_t ippseudo_p; /* protocol */ - u_int16_t ippseudo_len; /* protocol length */ -}; - -/* BIONIC addition: declarations matching the Linux kernel */ -/* some programs expect these... */ - -#define IPOPT_OPTVAL 0 -#define IPOPT_OLEN 1 -#define IPOPT_OFFSET 2 -#define IPOPT_MINOFF 4 -#define MAX_IPOPTLEN 40 - -#define IPOPT_COPY 0x80 -#define IPOPT_CLASS_MASK 0x60 -#define IPOPT_NUMBER_MASK 0x1f - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_MEASUREMENT 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_END (0 |IPOPT_CONTROL) -#define IPOPT_NOOP (1 |IPOPT_CONTROL) -#define IPOPT_SEC (2 |IPOPT_CONTROL|IPOPT_COPY) -#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT) -#define IPOPT_SID (8 |IPOPT_CONTROL|IPOPT_COPY) -#define IPOPT_RA (20|IPOPT_CONTROL|IPOPT_COPY) - -struct iphdr { -#if defined(__LITTLE_ENDIAN_BITFIELD) - uint8_t ihl :4, - version:4; -#elif defined (__BIG_ENDIAN_BITFIELD) - uint8_t version:4, - ihl :4; -#else -#error "Please fix " -#endif - uint8_t tos; - uint16_t tot_len; - uint16_t id; - uint16_t frag_off; - uint8_t ttl; - uint8_t protocol; - uint16_t check; - int32_t saddr; - int32_t daddr; -}; - -struct ip_auth_hdr { - uint8_t nexthdr; - uint8_t hdrlen; - uint16_t reserved; - uint32_t spi; - uint32_t seq_no; - uint8_t auth_data[0]; -}; - -struct ip_esp_hdr { - uint32_t spi; - uint32_t seq_no; - uint8_t enc_data[0]; -}; - -struct ip_comp_hdr { - uint8_t nexthdr; - uint8_t flags; - uint16_t cpi; -}; - -__END_DECLS - -#endif /* _NETINET_IP_H_ */ diff --git a/libc/include/netinet/ip_icmp.h b/libc/include/netinet/ip_icmp.h deleted file mode 100644 index 75105927f..000000000 --- a/libc/include/netinet/ip_icmp.h +++ /dev/null @@ -1,214 +0,0 @@ -/* $OpenBSD: ip_icmp.h,v 1.21 2005/07/31 03:30:55 pascoe Exp $ */ -/* $NetBSD: ip_icmp.h,v 1.10 1996/02/13 23:42:28 christos Exp $ */ - -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - */ - -#ifndef _NETINET_IP_ICMP_H_ -#define _NETINET_IP_ICMP_H_ - -#include -#include - -__BEGIN_DECLS - -/* - * Interface Control Message Protocol Definitions. - * Per RFC 792, September 1981. - * RFC 950, August 1985. (Address Mask Request / Reply) - * RFC 1256, September 1991. (Router Advertisement and Solicitation) - * RFC 1108, November 1991. (Param Problem, Missing Req. Option) - * RFC 1393, January 1993. (Traceroute) - * RFC 1475, June 1993. (Datagram Conversion Error) - * RFC 1812, June 1995. (adm prohib, host precedence, precedence cutoff) - * RFC 2002, October 1996. (Mobility changes to Router Advertisement) - */ - -/* - * ICMP Router Advertisement data - */ -struct icmp_ra_addr { - uint32_t ira_addr; - uint32_t ira_preference; -}; - -/* - * Structure of an icmp header. - */ -struct icmp { - uint8_t icmp_type; /* type of message, see below */ - uint8_t icmp_code; /* type sub code */ - uint16_t icmp_cksum; /* ones complement cksum of struct */ - union { - uint8_t ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ - struct ih_idseq { - uint16_t icd_id; - uint16_t icd_seq; - } ih_idseq; - int32_t ih_void; - - /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ - struct ih_pmtu { - uint16_t ipm_void; - uint16_t ipm_nextmtu; - } ih_pmtu; - - struct ih_rtradv { - uint8_t irt_num_addrs; - uint8_t irt_wpa; - uint16_t irt_lifetime; - } ih_rtradv; - } icmp_hun; -#define icmp_pptr icmp_hun.ih_pptr -#define icmp_gwaddr icmp_hun.ih_gwaddr -#define icmp_id icmp_hun.ih_idseq.icd_id -#define icmp_seq icmp_hun.ih_idseq.icd_seq -#define icmp_void icmp_hun.ih_void -#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void -#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu -#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs -#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa -#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime - union { - struct id_ts { - uint32_t its_otime; - uint32_t its_rtime; - uint32_t its_ttime; - } id_ts; - struct id_ip { - struct ip idi_ip; - /* options and then 64 bits of data */ - } id_ip; - uint32_t id_mask; - int8_t id_data[1]; - } icmp_dun; -#define icmp_otime icmp_dun.id_ts.its_otime -#define icmp_rtime icmp_dun.id_ts.its_rtime -#define icmp_ttime icmp_dun.id_ts.its_ttime -#define icmp_ip icmp_dun.id_ip.idi_ip -#define icmp_mask icmp_dun.id_mask -#define icmp_data icmp_dun.id_data -}; - -/* - * For IPv6 transition related ICMP errors. - */ -#define ICMP_V6ADVLENMIN (8 + sizeof(struct ip) + 40) -#define ICMP_V6ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 40) - -/* - * Lower bounds on packet lengths for various types. - * For the error advice packets must first insure that the - * packet is large enough to contain the returned ip header. - * Only then can we do the check to see if 64 bits of packet - * data have been returned, since we need to check the returned - * ip header length. - */ -#define ICMP_MINLEN 8 /* abs minimum */ -#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ -#define ICMP_MASKLEN 12 /* address mask */ -#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) - /* N.B.: must separately check that ip_hl >= 5 */ - -/* - * Definition of type and code field values. - * http://www.iana.org/assignments/icmp-parameters - */ -#define ICMP_ECHOREPLY 0 /* echo reply */ -#define ICMP_UNREACH 3 /* dest unreachable, codes: */ -#define ICMP_UNREACH_NET 0 /* bad net */ -#define ICMP_UNREACH_HOST 1 /* bad host */ -#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */ -#define ICMP_UNREACH_PORT 3 /* bad port */ -#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */ -#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */ -#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */ -#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */ -#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */ -#define ICMP_UNREACH_NET_PROHIB 9 /* for crypto devs */ -#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */ -#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */ -#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */ -#define ICMP_UNREACH_FILTER_PROHIB 13 /* prohibited access */ -#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* precedence violat'n*/ -#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* precedence cutoff */ -#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */ -#define ICMP_REDIRECT 5 /* shorter route, codes: */ -#define ICMP_REDIRECT_NET 0 /* for network */ -#define ICMP_REDIRECT_HOST 1 /* for host */ -#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */ -#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */ -#define ICMP_ALTHOSTADDR 6 /* alternate host address */ -#define ICMP_ECHO 8 /* echo service */ -#define ICMP_ROUTERADVERT 9 /* router advertisement */ -#define ICMP_ROUTERADVERT_NORMAL 0 /* normal advertisement */ -#define ICMP_ROUTERADVERT_NOROUTE_COMMON 16 /* selective routing */ -#define ICMP_ROUTERSOLICIT 10 /* router solicitation */ -#define ICMP_TIMXCEED 11 /* time exceeded, code: */ -#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */ -#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */ -#define ICMP_PARAMPROB 12 /* ip header bad */ -#define ICMP_PARAMPROB_ERRATPTR 0 /* req. opt. absent */ -#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */ -#define ICMP_PARAMPROB_LENGTH 2 /* bad length */ -#define ICMP_TSTAMP 13 /* timestamp request */ -#define ICMP_TSTAMPREPLY 14 /* timestamp reply */ -#define ICMP_IREQ 15 /* information request */ -#define ICMP_IREQREPLY 16 /* information reply */ -#define ICMP_MASKREQ 17 /* address mask request */ -#define ICMP_MASKREPLY 18 /* address mask reply */ -#define ICMP_TRACEROUTE 30 /* traceroute */ -#define ICMP_DATACONVERR 31 /* data conversion error */ -#define ICMP_MOBILE_REDIRECT 32 /* mobile host redirect */ -#define ICMP_IPV6_WHEREAREYOU 33 /* IPv6 where-are-you */ -#define ICMP_IPV6_IAMHERE 34 /* IPv6 i-am-here */ -#define ICMP_MOBILE_REGREQUEST 35 /* mobile registration req */ -#define ICMP_MOBILE_REGREPLY 36 /* mobile registration reply */ -#define ICMP_SKIP 39 /* SKIP */ -#define ICMP_PHOTURIS 40 /* Photuris */ -#define ICMP_PHOTURIS_UNKNOWN_INDEX 1 /* unknown sec index */ -#define ICMP_PHOTURIS_AUTH_FAILED 2 /* auth failed */ -#define ICMP_PHOTURIS_DECRYPT_FAILED 3 /* decrypt failed */ - -#define ICMP_MAXTYPE 40 - -#define ICMP_INFOTYPE(type) \ - ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \ - (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \ - (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \ - (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \ - (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) - -__END_DECLS - -#endif /* _NETINET_IP_ICMP_H_ */ diff --git a/libc/include/netinet/tcp.h b/libc/include/netinet/tcp.h deleted file mode 100644 index 9adf9048f..000000000 --- a/libc/include/netinet/tcp.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _NETINET_TCP_H -#define _NETINET_TCP_H - -#include /* Include *before* linux/tcp.h */ -#include - -#endif /* _NETINET_TCP_H */ diff --git a/libc/include/netinet/udp.h b/libc/include/netinet/udp.h deleted file mode 100644 index 25e0dfca9..000000000 --- a/libc/include/netinet/udp.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _NETINET_UDP_H -#define _NETINET_UDP_H - -/* - * We would include linux/udp.h, but it brings in too much other stuff - */ - -#ifdef __FAVOR_BSD - -struct udphdr { - u_int16_t uh_sport; /* source port */ - u_int16_t uh_dport; /* destination port */ - u_int16_t uh_ulen; /* udp length */ - u_int16_t uh_sum; /* udp checksum */ -}; - -#else - -struct udphdr { - __u16 source; - __u16 dest; - __u16 len; - __u16 check; -}; - -#endif /* __FAVOR_BSD */ - -#endif /* _NETINET_UDP_H */ diff --git a/libc/include/netpacket/packet.h b/libc/include/netpacket/packet.h deleted file mode 100644 index b5e8e0e11..000000000 --- a/libc/include/netpacket/packet.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/nsswitch.h b/libc/include/nsswitch.h deleted file mode 100644 index d19d0555b..000000000 --- a/libc/include/nsswitch.h +++ /dev/null @@ -1,236 +0,0 @@ -/* $NetBSD: nsswitch.h,v 1.18 2005/11/29 03:12:58 christos Exp $ */ - -/*- - * Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Luke Mewburn. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _NSSWITCH_H -#define _NSSWITCH_H 1 - -#include -#include - -#define NSS_MODULE_INTERFACE_VERSION 0 - -#ifndef _PATH_NS_CONF -#define _PATH_NS_CONF "/etc/nsswitch.conf" -#endif - -#define NS_CONTINUE 0 -#define NS_RETURN 1 - -/* - * Layout of: - * uint32_t ns_src.flags - */ - /* nsswitch.conf status codes and nsdispatch(3) return values */ -#define NS_SUCCESS (1<<0) /* entry was found */ -#define NS_UNAVAIL (1<<1) /* source not responding, or corrupt */ -#define NS_NOTFOUND (1<<2) /* source responded 'no such entry' */ -#define NS_TRYAGAIN (1<<3) /* source busy, may respond to retrys */ -#define NS_STATUSMASK 0x000000ff /* bitmask to get the status flags */ - - /* internal nsdispatch(3) flags; not settable in nsswitch.conf(5) */ -#define NS_FORCEALL (1<<8) /* force all methods to be invoked; */ - -/* - * Currently implemented sources. - */ -#define NSSRC_FILES "files" /* local files */ -#define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */ -#define NSSRC_NIS "nis" /* YP/NIS */ -#define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */ - -/* - * Currently implemented databases. - */ -#define NSDB_HOSTS "hosts" -#define NSDB_GROUP "group" -#define NSDB_GROUP_COMPAT "group_compat" -#define NSDB_NETGROUP "netgroup" -#define NSDB_NETWORKS "networks" -#define NSDB_PASSWD "passwd" -#define NSDB_PASSWD_COMPAT "passwd_compat" -#define NSDB_SHELLS "shells" - -/* - * Suggested databases to implement. - */ -#define NSDB_ALIASES "aliases" -#define NSDB_AUTH "auth" -#define NSDB_AUTOMOUNT "automount" -#define NSDB_BOOTPARAMS "bootparams" -#define NSDB_ETHERS "ethers" -#define NSDB_EXPORTS "exports" -#define NSDB_NETMASKS "netmasks" -#define NSDB_PHONES "phones" -#define NSDB_PRINTCAP "printcap" -#define NSDB_PROTOCOLS "protocols" -#define NSDB_REMOTE "remote" -#define NSDB_RPC "rpc" -#define NSDB_SENDMAILVARS "sendmailvars" -#define NSDB_SERVICES "services" -#define NSDB_TERMCAP "termcap" -#define NSDB_TTYS "ttys" - -/* - * ns_dtab `callback' function signature. - */ -typedef int (*nss_method)(void *, void *, va_list); - -/* - * ns_dtab - `nsswitch dispatch table' - * Contains an entry for each source and the appropriate function to call. - */ -typedef struct { - const char *src; - nss_method callback; - void *cb_data; -} ns_dtab; - -/* - * Macros to help build an ns_dtab[] - */ -#define NS_FILES_CB(F,C) { NSSRC_FILES, F, __UNCONST(C) }, -#define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, __UNCONST(C) }, - -#ifdef HESIOD -# define NS_DNS_CB(F,C) { NSSRC_DNS, F, __UNCONST(C) }, -#else -# define NS_DNS_CB(F,C) -#endif - -#ifdef YP -# define NS_NIS_CB(F,C) { NSSRC_NIS, F, __UNCONST(C) }, -#else -# define NS_NIS_CB(F,C) -#endif - -/* - * ns_src - `nsswitch source' - * Used by the nsparser routines to store a mapping between a source - * and its dispatch control flags for a given database. - */ -typedef struct { - const char *name; - uint32_t flags; -} ns_src; - - -/* - * Default sourcelists (if nsswitch.conf is missing, corrupt, - * or the requested database doesn't have an entry) - */ -extern const ns_src __nsdefaultsrc[]; -extern const ns_src __nsdefaultcompat[]; -extern const ns_src __nsdefaultcompat_forceall[]; -extern const ns_src __nsdefaultfiles[]; -extern const ns_src __nsdefaultfiles_forceall[]; -extern const ns_src __nsdefaultnis[]; -extern const ns_src __nsdefaultnis_forceall[]; - - -/* - * ns_mtab - `nsswitch method table' - * An nsswitch module provides a mapping from (database name, method name) - * tuples to the nss_method and associated callback data. Effectively, - * ns_dtab, but used for dynamically loaded modules. - */ -typedef struct { - const char *database; - const char *name; - nss_method method; - void *mdata; -} ns_mtab; - -/* - * nss_module_register_fn - module registration function - * called at module load - * nss_module_unregister_fn - module un-registration function - * called at module unload - */ -typedef void (*nss_module_unregister_fn)(ns_mtab *, u_int); -typedef ns_mtab *(*nss_module_register_fn)(const char *, u_int *, - nss_module_unregister_fn *); - -#ifdef _NS_PRIVATE - -/* - * Private data structures for back-end nsswitch implementation. - */ - -/* - * ns_dbt - `nsswitch database thang' - * For each database in /etc/nsswitch.conf there is a ns_dbt, with its - * name and a list of ns_src's containing the source information. - */ -typedef struct { - const char *name; /* name of database */ - ns_src *srclist; /* list of sources */ - u_int srclistsize; /* size of srclist */ -} ns_dbt; - -/* - * ns_mod - `nsswitch module' - */ -typedef struct { - const char *name; /* module name */ - void *handle; /* handle from dlopen() */ - ns_mtab *mtab; /* method table */ - u_int mtabsize; /* size of mtab */ - /* called to unload module */ - nss_module_unregister_fn unregister; -} ns_mod; - -#endif /* _NS_PRIVATE */ - - -#include - -__BEGIN_DECLS -int nsdispatch(void *, const ns_dtab [], const char *, - const char *, const ns_src [], ...); - -#ifdef _NS_PRIVATE -int _nsdbtaddsrc(ns_dbt *, const ns_src *); -void _nsdbtdump(const ns_dbt *); -int _nsdbtput(const ns_dbt *); -void _nsyyerror(const char *); -int _nsyylex(void); -#endif /* _NS_PRIVATE */ - -__END_DECLS - -#endif /* !_NSSWITCH_H */ diff --git a/libc/include/pathconf.h b/libc/include/pathconf.h deleted file mode 100644 index 4677f7b07..000000000 --- a/libc/include/pathconf.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _PATHCONF_H_ -#define _PATHCONF_H_ - -/* constants to be used for the 'name' paremeter of pathconf/fpathconf */ - -#define _PC_FILESIZEBITS 0x0000 -#define _PC_LINK_MAX 0x0001 -#define _PC_MAX_CANON 0x0002 -#define _PC_MAX_INPUT 0x0003 -#define _PC_NAME_MAX 0x0004 -#define _PC_PATH_MAX 0x0005 -#define _PC_PIPE_BUF 0x0006 -#define _PC_2_SYMLINKS 0x0007 -#define _PC_ALLOC_SIZE_MIN 0x0008 -#define _PC_REC_INCR_XFER_SIZE 0x0009 -#define _PC_REC_MAX_XFER_SIZE 0x000a -#define _PC_REC_MIN_XFER_SIZE 0x000b -#define _PC_REC_XFER_ALIGN 0x000c -#define _PC_SYMLINK_MAX 0x000d -#define _PC_CHOWN_RESTRICTED 0x000e -#define _PC_NO_TRUNC 0x000f -#define _PC_VDISABLE 0x0010 -#define _PC_ASYNC_IO 0x0011 -#define _PC_PRIO_IO 0x0012 -#define _PC_SYNC_IO 0x0013 - -extern long fpathconf(int fildes, int name); -extern long pathconf(const char *path, int name); - -#endif /* _PATHCONF_H_ */ - diff --git a/libc/include/paths.h b/libc/include/paths.h deleted file mode 100644 index a72162fa9..000000000 --- a/libc/include/paths.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)paths.h 8.1 (Berkeley) 6/2/93 - */ - -#ifndef _PATHS_H_ -#define _PATHS_H_ - -/* Default search path. */ -#define _PATH_DEFPATH "/usr/bin:/bin" -/* All standard utilities path. */ -#define _PATH_STDPATH \ - "/usr/bin:/bin:/usr/sbin:/sbin" - -#define _PATH_BSHELL "/system/bin/sh" -#define _PATH_CONSOLE "/dev/console" -#define _PATH_CSHELL "/bin/csh" -#define _PATH_DEVDB "/var/run/dev.db" -#define _PATH_DEVNULL "/dev/null" -#define _PATH_DRUM "/dev/drum" -#define _PATH_KLOG "/proc/kmsg" -#define _PATH_KMEM "/dev/kmem" -#define _PATH_LASTLOG "/var/log/lastlog" -#define _PATH_MAILDIR "/var/mail" -#define _PATH_MAN "/usr/share/man" -#define _PATH_MEM "/dev/mem" -#define _PATH_MNTTAB "/etc/fstab" -#define _PATH_MOUNTED "/etc/mtab" -#define _PATH_NOLOGIN "/etc/nologin" -#define _PATH_PRESERVE "/var/lib" -#define _PATH_RWHODIR "/var/spool/rwho" -#define _PATH_SENDMAIL "/usr/sbin/sendmail" -#define _PATH_SHADOW "/etc/shadow" -#define _PATH_SHELLS "/etc/shells" -#define _PATH_TTY "/dev/tty" -#define _PATH_UNIX "/boot/vmlinux" -#define _PATH_UTMP "/var/run/utmp" -#define _PATH_VI "/bin/vi" -#define _PATH_WTMP "/var/log/wtmp" - -/* Provide trailing slash, since mostly used for building pathnames. */ -#define _PATH_DEV "/dev/" -#define _PATH_TMP "/tmp/" -#define _PATH_VARDB "/var/db/" -#define _PATH_VARRUN "/var/run/" -#define _PATH_VARTMP "/var/tmp/" - -#endif /* !_PATHS_H_ */ diff --git a/libc/include/poll.h b/libc/include/poll.h deleted file mode 100644 index 560be8979..000000000 --- a/libc/include/poll.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _POLL_H_ -#define _POLL_H_ - -#include -#include - -__BEGIN_DECLS - -typedef unsigned int nfds_t; - -/* POSIX specifies "int" for the timeout, Linux seems to use long... */ -extern int poll(struct pollfd *, nfds_t, long); - -__END_DECLS - -#endif /* _POLL_H_ */ diff --git a/libc/include/pthread.h b/libc/include/pthread.h deleted file mode 100644 index e3afdaede..000000000 --- a/libc/include/pthread.h +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _PTHREAD_H_ -#define _PTHREAD_H_ - -#include -#include -#include -#include -#include - -/* - * Types - */ -typedef struct -{ - int volatile value; -} pthread_mutex_t; - -#define PTHREAD_MUTEX_INITIALIZER {0} -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER {0x4000} -#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER {0x8000} - -enum { - PTHREAD_MUTEX_NORMAL = 0, - PTHREAD_MUTEX_RECURSIVE = 1, - PTHREAD_MUTEX_ERRORCHECK = 2, - - PTHREAD_MUTEX_ERRORCHECK_NP = PTHREAD_MUTEX_ERRORCHECK, - PTHREAD_MUTEX_RECURSIVE_NP = PTHREAD_MUTEX_RECURSIVE, - - PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL -}; - - - -typedef struct -{ - int volatile value; -} pthread_cond_t; - -typedef struct -{ - uint32_t flags; - void * stack_base; - size_t stack_size; - size_t guard_size; - int32_t sched_policy; - int32_t sched_priority; -} pthread_attr_t; - -typedef long pthread_mutexattr_t; -typedef long pthread_condattr_t; - -typedef int pthread_key_t; -typedef long pthread_t; - -typedef volatile int pthread_once_t; - -/* - * Defines - */ -#define PTHREAD_COND_INITIALIZER {0} - -#define PTHREAD_STACK_MIN (2 * PAGE_SIZE) - -#define PTHREAD_CREATE_DETACHED 0x00000001 -#define PTHREAD_CREATE_JOINABLE 0x00000000 - -#define PTHREAD_ONCE_INIT 0 - -#define PTHREAD_PROCESS_PRIVATE 0 -#define PTHREAD_PROCESS_SHARED 1 - -#define PTHREAD_SCOPE_SYSTEM 0 -#define PTHREAD_SCOPE_PROCESS 1 - -/* - * Prototypes - */ -#if __cplusplus -extern "C" { -#endif - -int pthread_attr_init(pthread_attr_t * attr); -int pthread_attr_destroy(pthread_attr_t * attr); - -int pthread_attr_setdetachstate(pthread_attr_t * attr, int state); -int pthread_attr_getdetachstate(pthread_attr_t const * attr, int * state); - -int pthread_attr_setschedpolicy(pthread_attr_t * attr, int policy); -int pthread_attr_getschedpolicy(pthread_attr_t const * attr, int * policy); - -int pthread_attr_setschedparam(pthread_attr_t * attr, struct sched_param const * param); -int pthread_attr_getschedparam(pthread_attr_t const * attr, struct sched_param * param); - -int pthread_attr_setstacksize(pthread_attr_t * attr, size_t stack_size); -int pthread_attr_getstacksize(pthread_attr_t const * attr, size_t * stack_size); - -int pthread_attr_setstackaddr(pthread_attr_t * attr, void * stackaddr); -int pthread_attr_getstackaddr(pthread_attr_t const * attr, void ** stackaddr); - -int pthread_attr_setstack(pthread_attr_t * attr, void * stackaddr, size_t stack_size); -int pthread_attr_getstack(pthread_attr_t const * attr, void ** stackaddr, size_t * stack_size); - -int pthread_attr_setguardsize(pthread_attr_t * attr, size_t guard_size); -int pthread_attr_getguardsize(pthread_attr_t const * attr, size_t * guard_size); - -int pthread_attr_setscope(pthread_attr_t *attr, int scope); -int pthread_attr_getscope(pthread_attr_t const *attr); - -int pthread_getattr_np(pthread_t thid, pthread_attr_t * attr); - -int pthread_create(pthread_t *thread, pthread_attr_t const * attr, - void *(*start_routine)(void *), void * arg); -void pthread_exit(void * retval); -int pthread_join(pthread_t thid, void ** ret_val); -int pthread_detach(pthread_t thid); - -pthread_t pthread_self(void); -int pthread_equal(pthread_t one, pthread_t two); - -int pthread_getschedparam(pthread_t thid, int * policy, - struct sched_param * param); -int pthread_setschedparam(pthread_t thid, int poilcy, - struct sched_param const * param); - -int pthread_mutexattr_init(pthread_mutexattr_t *attr); -int pthread_mutexattr_destroy(pthread_mutexattr_t *attr); -int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type); -int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type); -int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared); -int pthread_mutexattr_getpshared(pthread_mutexattr_t *attr, int *pshared); - -int pthread_mutex_init(pthread_mutex_t *mutex, - const pthread_mutexattr_t *attr); -int pthread_mutex_destroy(pthread_mutex_t *mutex); -int pthread_mutex_lock(pthread_mutex_t *mutex); -int pthread_mutex_unlock(pthread_mutex_t *mutex); -int pthread_mutex_trylock(pthread_mutex_t *mutex); -int pthread_mutex_timedlock(pthread_mutex_t *mutex, struct timespec* ts); - -int pthread_cond_init(pthread_cond_t *cond, - const pthread_condattr_t *attr); -int pthread_cond_destroy(pthread_cond_t *cond); -int pthread_cond_broadcast(pthread_cond_t *cond); -int pthread_cond_signal(pthread_cond_t *cond); -int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); -int pthread_cond_timedwait(pthread_cond_t *cond, - pthread_mutex_t * mutex, - const struct timespec *abstime); - -/* BIONIC: same as pthread_cond_timedwait, except the 'abstime' given refers - * to the CLOCK_MONOTONIC clock instead, to avoid any problems when - * the wall-clock time is changed brutally - */ -int pthread_cond_timedwait_monotonic(pthread_cond_t *cond, - pthread_mutex_t *mutex, - const struct timespec *abstime); - -int pthread_cond_timeout_np(pthread_cond_t *cond, - pthread_mutex_t * mutex, - unsigned msecs); - -int pthread_key_create(pthread_key_t *key, void (*destructor_function)(void *)); -int pthread_key_delete (pthread_key_t); -int pthread_setspecific(pthread_key_t key, const void *value); -void *pthread_getspecific(pthread_key_t key); - -int pthread_kill(pthread_t tid, int sig); -int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset); - -int pthread_getcpuclockid(pthread_t tid, clockid_t *clockid); - -int pthread_once(pthread_once_t *once_control, void (*init_routine)(void)); - -typedef void (*__pthread_cleanup_func_t)(void*); - -typedef struct __pthread_cleanup_t { - struct __pthread_cleanup_t* __cleanup_prev; - __pthread_cleanup_func_t __cleanup_routine; - void* __cleanup_arg; -} __pthread_cleanup_t; - -extern void __pthread_cleanup_push(__pthread_cleanup_t* c, - __pthread_cleanup_func_t routine, - void* arg); - -extern void __pthread_cleanup_pop(__pthread_cleanup_t* c, - int execute); - -/* Believe or not, the definitions of pthread_cleanup_push and - * pthread_cleanup_pop below are correct. Posix states that these - * can be implemented as macros that might introduce opening and - * closing braces, and that using setjmp/longjmp/return/break/continue - * between them results in undefined behaviour. - * - * And indeed, GLibc and other C libraries use a similar definition - */ -#define pthread_cleanup_push(routine, arg) \ - do { \ - __pthread_cleanup_t __cleanup; \ - __pthread_cleanup_push( &__cleanup, (routine), (arg) ); \ - -#define pthread_cleanup_pop(execute) \ - __pthread_cleanup_pop( &__cleanup, (execute)); \ - } while (0); - -#if __cplusplus -} /* extern "C" */ -#endif - -/************ TO FIX ************/ - -#define LONG_LONG_MAX __LONG_LONG_MAX__ -#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1) - -#endif // _PTHREAD_H_ diff --git a/libc/include/pwd.h b/libc/include/pwd.h deleted file mode 100644 index 6f3fad594..000000000 --- a/libc/include/pwd.h +++ /dev/null @@ -1,125 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pwd.h 8.2 (Berkeley) 1/21/94 - */ - -/*- - * Portions Copyright(C) 1995, Jason Downs. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _PWD_H_ -#define _PWD_H_ - -#include -#include - -#define _PATH_PASSWD "/etc/passwd" -#define _PATH_MASTERPASSWD "/etc/master.passwd" -#define _PATH_MASTERPASSWD_LOCK "/etc/ptmp" - -#define _PATH_PASSWD_CONF "/etc/passwd.conf" -#define _PATH_PASSWDCONF _PATH_PASSWD_CONF /* XXX: compat */ -#define _PATH_USERMGMT_CONF "/etc/usermgmt.conf" - -#define _PATH_MP_DB "/etc/pwd.db" -#define _PATH_SMP_DB "/etc/spwd.db" - -#define _PATH_PWD_MKDB "/usr/sbin/pwd_mkdb" - -#define _PW_KEYBYNAME '1' /* stored by name */ -#define _PW_KEYBYNUM '2' /* stored by entry in the "file" */ -#define _PW_KEYBYUID '3' /* stored by uid */ - -#define _PASSWORD_EFMT1 '_' /* extended DES encryption format */ -#define _PASSWORD_NONDES '$' /* non-DES encryption formats */ - -#define _PASSWORD_LEN 128 /* max length, not counting NUL */ - -#define _PASSWORD_NOUID 0x01 /* flag for no specified uid. */ -#define _PASSWORD_NOGID 0x02 /* flag for no specified gid. */ -#define _PASSWORD_NOCHG 0x04 /* flag for no specified change. */ -#define _PASSWORD_NOEXP 0x08 /* flag for no specified expire. */ - -#define _PASSWORD_OLDFMT 0x10 /* flag to expect an old style entry */ -#define _PASSWORD_NOWARN 0x20 /* no warnings for bad entries */ - -#define _PASSWORD_WARNDAYS 14 /* days to warn about expiry */ -#define _PASSWORD_CHGNOW -1 /* special day to force password change at next login */ - -struct passwd -{ - char* pw_name; - char* pw_passwd; - uid_t pw_uid; - gid_t pw_gid; - char* pw_dir; - char* pw_shell; -}; - -__BEGIN_DECLS - -struct passwd* getpwnam(const char*); -struct passwd* getpwuid(uid_t); - -int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**); -int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**); - -void endpwent(void); -struct passwd* getpwent(void); -int setpwent(void); - -__END_DECLS - -#endif diff --git a/libc/include/resolv.h b/libc/include/resolv.h deleted file mode 100644 index 4247d68b7..000000000 --- a/libc/include/resolv.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _RESOLV_H_ -#define _RESOLV_H_ - -#include -#include -#include -#include -#include -#include - -__BEGIN_DECLS - -struct res_state; - -extern struct __res_state *__res_state(void); -#define _res (*__res_state()) - -/* Base-64 functions - because some code expects it there */ - -#define b64_ntop __b64_ntop -#define b64_pton __b64_pton -extern int b64_ntop(u_char const *, size_t, char *, size_t); -extern int b64_pton(char const *, u_char *, size_t); - -__END_DECLS - -#endif /* _RESOLV_H_ */ diff --git a/libc/include/sched.h b/libc/include/sched.h deleted file mode 100644 index 6600bae64..000000000 --- a/libc/include/sched.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SCHED_H_ -#define _SCHED_H_ - -#include -#include - -__BEGIN_DECLS - -#define SCHED_NORMAL 0 -#define SCHED_OTHER 0 -#define SCHED_FIFO 1 -#define SCHED_RR 2 - -struct sched_param { - int sched_priority; -}; - -extern int sched_setscheduler(pid_t, int, const struct sched_param *); -extern int sched_getscheduler(pid_t); -extern int sched_yield(void); -extern int sched_get_priority_max(int policy); -extern int sched_get_priority_min(int policy); -extern int sched_setparam(pid_t, const struct sched_param *); -extern int sched_getparam(pid_t, struct sched_param *); -extern int sched_rr_get_interval(pid_t pid, struct timespec *tp); - -#define CLONE_VM 0x00000100 -#define CLONE_FS 0x00000200 -#define CLONE_FILES 0x00000400 -#define CLONE_SIGHAND 0x00000800 -#define CLONE_PTRACE 0x00002000 -#define CLONE_VFORK 0x00004000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x00010000 -#define CLONE_NEWNS 0x00020000 -#define CLONE_SYSVSEM 0x00040000 -#define CLONE_SETTLS 0x00080000 -#define CLONE_PARENT_SETTID 0x00100000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_DETACHED 0x00400000 -#define CLONE_UNTRACED 0x00800000 -#define CLONE_CHILD_SETTID 0x01000000 -#define CLONE_STOPPED 0x02000000 - -extern int clone(int (*fn)(void*), void *child_stack, int flags, void *arg); -extern pid_t __clone(int, void *); - -__END_DECLS - -#endif /* _SCHED_H_ */ diff --git a/libc/include/semaphore.h b/libc/include/semaphore.h deleted file mode 100644 index 30e31239a..000000000 --- a/libc/include/semaphore.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SEMAPHORE_H -#define _SEMAPHORE_H - -#include - -__BEGIN_DECLS - -typedef struct { - volatile unsigned int count; -} sem_t; - -#define SEM_FAILED NULL - -extern int sem_init(sem_t *sem, int pshared, unsigned int value); - -extern int sem_close(sem_t *); -extern int sem_destroy(sem_t *); -extern int sem_getvalue(sem_t *, int *); -extern int sem_init(sem_t *, int, unsigned int); -extern sem_t *sem_open(const char *, int, ...); -extern int sem_post(sem_t *); -extern int sem_trywait(sem_t *); -extern int sem_unlink(const char *); -extern int sem_wait(sem_t *); - -struct timespec; -extern int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout); - -__END_DECLS - -#endif /* _SEMAPHORE_H */ diff --git a/libc/include/setjmp.h b/libc/include/setjmp.h deleted file mode 100644 index 68fdcef35..000000000 --- a/libc/include/setjmp.h +++ /dev/null @@ -1,63 +0,0 @@ -/* $OpenBSD: setjmp.h,v 1.5 2005/12/13 00:35:22 millert Exp $ */ -/* $NetBSD: setjmp.h,v 1.11 1994/12/20 10:35:44 cgd Exp $ */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)setjmp.h 8.2 (Berkeley) 1/21/94 - */ - -#ifndef _SETJMP_H_ -#define _SETJMP_H_ - -#include -#include - -typedef long sigjmp_buf[_JBLEN + 1]; -typedef long jmp_buf[_JBLEN]; - -__BEGIN_DECLS - -int _setjmp(jmp_buf); -void _longjmp(jmp_buf, int); -void longjmperror(void); - -int setjmp(jmp_buf); -void longjmp(jmp_buf, int); - -int sigsetjmp(sigjmp_buf, int); -void siglongjmp(sigjmp_buf, int); - -__END_DECLS - -#endif /* !_SETJMP_H_ */ diff --git a/libc/include/sgtty.h b/libc/include/sgtty.h deleted file mode 100644 index 1ac310069..000000000 --- a/libc/include/sgtty.h +++ /dev/null @@ -1,48 +0,0 @@ -/* $NetBSD: sgtty.h,v 1.8 2005/02/03 04:39:32 perry Exp $ */ - -/* - * Copyright (c) 1985, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)sgtty.h 8.1 (Berkeley) 6/2/93 - */ - -#ifndef _SGTTY_H_ -#define _SGTTY_H_ - -#ifndef USE_OLD_TTY -#define USE_OLD_TTY -#endif -#include -#include - -__BEGIN_DECLS -int gtty(int, struct sgttyb *); -int stty(int, struct sgttyb *); -__END_DECLS - -#endif /* _SGTTY_H_ */ diff --git a/libc/include/sha1.h b/libc/include/sha1.h deleted file mode 100644 index f7ada46a5..000000000 --- a/libc/include/sha1.h +++ /dev/null @@ -1,31 +0,0 @@ -/* $NetBSD: sha1.h,v 1.13 2005/12/26 18:41:36 perry Exp $ */ - -/* - * SHA-1 in C - * By Steve Reid - * 100% Public Domain - */ - -#ifndef _SYS_SHA1_H_ -#define _SYS_SHA1_H_ - -#include -#include - -#define SHA1_DIGEST_LENGTH 20 -#define SHA1_DIGEST_STRING_LENGTH 41 - -typedef struct { - uint32_t state[5]; - uint32_t count[2]; - u_char buffer[64]; -} SHA1_CTX; - -__BEGIN_DECLS -void SHA1Transform(uint32_t[5], const u_char[64]); -void SHA1Init(SHA1_CTX *); -void SHA1Update(SHA1_CTX *, const u_char *, u_int); -void SHA1Final(u_char[SHA1_DIGEST_LENGTH], SHA1_CTX *); -__END_DECLS - -#endif /* _SYS_SHA1_H_ */ diff --git a/libc/include/signal.h b/libc/include/signal.h deleted file mode 100644 index 55408478b..000000000 --- a/libc/include/signal.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SIGNAL_H_ -#define _SIGNAL_H_ - -#include -#include /* For LONG_BIT */ -#include /* For memset() */ -#include -#include - -#define __ARCH_SI_UID_T __kernel_uid32_t -#include -#undef __ARCH_SI_UID_T - -__BEGIN_DECLS - -typedef int sig_atomic_t; - -/* crepy NIG / _NSIG handling, just to be safe */ -#ifndef NSIG -# define NSIG _NSIG -#endif -#ifndef _NSIG -# define _NSIG NSIG -#endif - -extern const char * const sys_siglist[]; - -static __inline__ int sigismember(sigset_t *set, int signum) -{ - unsigned long *local_set = (unsigned long *)set; - signum--; - return (int)((local_set[signum/LONG_BIT] >> (signum%LONG_BIT)) & 1); -} - - -static __inline__ int sigaddset(sigset_t *set, int signum) -{ - unsigned long *local_set = (unsigned long *)set; - signum--; - local_set[signum/LONG_BIT] |= 1UL << (signum%LONG_BIT); - return 0; -} - - -static __inline__ int sigdelset(sigset_t *set, int signum) -{ - unsigned long *local_set = (unsigned long *)set; - signum--; - local_set[signum/LONG_BIT] &= ~(1UL << (signum%LONG_BIT)); - return 0; -} - - -static __inline__ int sigemptyset(sigset_t *set) -{ - memset(set, 0, sizeof *set); - return 0; -} - -static __inline__ int sigfillset(sigset_t *set) -{ - memset(set, ~0, sizeof *set); - return 0; -} - - -/* compatibility types */ -typedef void (*sig_t)(int); -typedef sig_t sighandler_t; - -/* differentiater between sysv and bsd behaviour 8*/ -extern __sighandler_t sysv_signal(int, __sighandler_t); -extern __sighandler_t bsd_signal(int, __sighandler_t); - -/* the default is bsd */ -static __inline__ __sighandler_t signal(int s, __sighandler_t f) -{ - return bsd_signal(s,f); -} - -/* the syscall itself */ -extern __sighandler_t __signal(int, __sighandler_t, int); - -extern int sigprocmask(int, const sigset_t *, sigset_t *); -extern int sigaction(int, const struct sigaction *, struct sigaction *); - -extern int sigpending(sigset_t *); -extern int sigsuspend(const sigset_t *); -extern int sigwait(const sigset_t *set, int *sig); -extern int siginterrupt(int sig, int flag); - -extern int raise(int); -extern int kill(pid_t, int); - - -__END_DECLS - -#endif /* _SIGNAL_H_ */ diff --git a/libc/include/stdint.h b/libc/include/stdint.h deleted file mode 100644 index 39a8ab8dd..000000000 --- a/libc/include/stdint.h +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _STDINT_H -#define _STDINT_H - -#include -#include - - - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -# define __STDINT_LIMITS -#endif - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) -# define __STDINT_MACROS -#endif - -/* the definitions of STDINT_LIMITS depend on those of STDINT_MACROS */ -#if defined __STDINT_LIMITS && !defined __STDINT_MACROS -# define __STDINT_MACROS -#endif - -typedef __int8_t int8_t; -typedef __uint8_t uint8_t; -typedef __int16_t int16_t; -typedef __uint16_t uint16_t; -typedef __int32_t int32_t; -typedef __uint32_t uint32_t; -#if !defined(__STRICT_ANSI__) -typedef __int64_t int64_t; -typedef __uint64_t uint64_t; -#endif - -/* - * int8_t & uint8_t - */ - -typedef int8_t int_least8_t; -typedef int8_t int_fast8_t; - -typedef uint8_t uint_least8_t; -typedef uint8_t uint_fast8_t; - -#ifdef __STDINT_LIMITS -# define INT8_MIN (-128) -# define INT8_MAX (127) -# define INT_LEAST8_MIN INT8_MIN -# define INT_LEAST8_MAX INT8_MAX -# define INT_FAST8_MIN INT8_MIN -# define INT_FAST8_MAX INT8_MAX - -# define UINT8_MAX (255U) -# define UINT_LEAST8_MAX UINT8_MAX -# define UINT_FAST8_MAX UINT8_MAX -#endif - -#ifdef __STDINT_MACROS -# define INT8_C(c) c -# define INT_LEAST8_C(c) INT8_C(c) -# define INT_FAST8_C(c) INT8_C(c) - -# define UINT8_C(c) c ## U -# define UINT_LEAST8_C(c) UINT8_C(c) -# define UINT_FAST8_C(c) UINT8_C(c) -#endif - -/* - * int16_t & uint16_t - */ - - -typedef int16_t int_least16_t; -typedef int32_t int_fast16_t; - -typedef uint16_t uint_least16_t; -typedef uint32_t uint_fast16_t; - -#ifdef __STDINT_LIMITS -# define INT16_MIN (-32768) -# define INT16_MAX (32767) -# define INT_LEAST16_MIN INT16_MIN -# define INT_LEAST16_MAX INT16_MAX -# define INT_FAST16_MIN INT32_MIN -# define INT_FAST16_MAX INT32_MAX - -# define UINT16_MAX (65535U) -# define UINT_LEAST16_MAX UINT16_MAX -# define UINT_FAST16_MAX UINT32_MAX -#endif - -#ifdef __STDINT_MACROS -# define INT16_C(c) c -# define INT_LEAST16_C(c) INT16_C(c) -# define INT_FAST16_C(c) INT32_C(c) - -# define UINT16_C(c) c ## U -# define UINT_LEAST16_C(c) UINT16_C(c) -# define UINT_FAST16_C(c) UINT32_C(c) -#endif - -/* - * int32_t & uint32_t - */ - -typedef int32_t int_least32_t; -typedef int32_t int_fast32_t; - -typedef uint32_t uint_least32_t; -typedef uint32_t uint_fast32_t; - -#ifdef __STDINT_LIMITS -# define INT32_MIN (-2147483647-1) -# define INT32_MAX (2147483647) -# define INT_LEAST32_MIN INT32_MIN -# define INT_LEAST32_MAX INT32_MAX -# define INT_FAST32_MIN INT32_MIN -# define INT_FAST32_MAX INT32_MAX - -# define UINT32_MAX (4294967295U) -# define UINT_LEAST32_MAX UINT32_MAX -# define UINT_FAST32_MAX UINT32_MAX -#endif - -#ifdef __STDINT_MACROS -# define INT32_C(c) c -# define INT_LEAST32_C(c) INT32_C(c) -# define INT_FAST32_C(c) INT32_C(c) - -# define UINT32_C(c) c ## U -# define UINT_LEAST32_C(c) UINT32_C(c) -# define UINT_FAST32_C(c) UINT32_C(c) -#endif - -#if !defined(__STRICT_ANSI__) -/* - * int64_t - */ -typedef int64_t int_least64_t; -typedef int64_t int_fast64_t; - -typedef uint64_t uint_least64_t; -typedef uint64_t uint_fast64_t; - - -#ifdef __STDINT_LIMITS -# define INT64_MIN (__INT64_C(-9223372036854775807)-1) -# define INT64_MAX (__INT64_C(9223372036854775807)) -# define INT_LEAST64_MIN INT64_MIN -# define INT_LEAST64_MAX INT64_MAX -# define INT_FAST64_MIN INT64_MIN -# define INT_FAST64_MAX INT64_MAX -# define UINT64_MAX (__UINT64_C(18446744073709551615)) - -# define UINT_LEAST64_MAX UINT64_MAX -# define UINT_FAST64_MAX UINT64_MAX -#endif - -#ifdef __STDINT_MACROS -# define __INT64_C(c) c ## LL -# define INT64_C(c) __INT64_C(c) -# define INT_LEAST64_C(c) INT64_C(c) -# define INT_FAST64_C(c) INT64_C(c) - -# define __UINT64_C(c) c ## ULL -# define UINT64_C(c) __UINT64_C(c) -# define UINT_LEAST64_C(c) UINT64_C(c) -# define UINT_FAST64_C(c) UINT64_C(c) -#endif - - -# define __PRI64_RANK "ll" -# define __PRIFAST_RANK "" -# define __PRIPTR_RANK "" - -#endif /* !__STRICT_ANSI__ */ - -/* - * intptr_t & uintptr_t - */ - -typedef int intptr_t; -typedef unsigned int uintptr_t; - -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -# define INTPTR_C(c) INT32_C(c) -# define UINTPTR_C(c) UINT32_C(c) -# define PTRDIFF_C(c) INT32_C(c) -# define PTRDIFF_MIN INT32_MIN -# define PTRDIFF_MAX INT32_MAX - - -/* - * intmax_t & uintmax_t - */ - -#if !defined(__STRICT_ANSI__) - -typedef uint64_t uintmax_t; -typedef int64_t intmax_t; - -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -#define INTMAX_C(c) INT64_C(c) -#define UINTMAX_C(c) UINT64_C(c) - -#else /* __STRICT_ANSI__ */ - -typedef uint32_t uintmax_t; -typedef int32_t intmax_t; - -#define INTMAX_MIN INT32_MIN -#define INTMAX_MAX INT32_MAX -#define UINTMAX_MAX UINT32_MAX - -#define INTMAX_C(c) INT32_C(c) -#define UINTMAX_C(c) UINT32_C(c) - -#endif /* __STRICT_ANSI__ */ - - -/* size_t is defined by the GCC-specific */ -#ifndef _SSIZE_T_DEFINED_ -#define _SSIZE_T_DEFINED_ -typedef long int ssize_t; -#endif - -#define _BITSIZE 32 - -/* Keep the kernel from trying to define these types... */ -#define __BIT_TYPES_DEFINED__ - -#endif /* _STDINT_H */ diff --git a/libc/include/stdio.h b/libc/include/stdio.h deleted file mode 100644 index 79e526b7c..000000000 --- a/libc/include/stdio.h +++ /dev/null @@ -1,437 +0,0 @@ -/* $OpenBSD: stdio.h,v 1.35 2006/01/13 18:10:09 miod Exp $ */ -/* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)stdio.h 5.17 (Berkeley) 6/3/91 - */ - -#ifndef _STDIO_H_ -#define _STDIO_H_ - -#include -#include - -/* va_list and size_t must be defined by stdio.h according to Posix */ -#define __need___va_list -#include - -/* note that this forces stddef.h to *only* define size_t */ -#define __need_size_t -#include - -#include - -#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE -#include /* XXX should be removed */ -#endif - -#ifndef _SIZE_T_DEFINED_ -#define _SIZE_T_DEFINED_ -typedef unsigned long size_t; -#endif - -#ifndef _OFF_T_DEFINED_ -#define _OFF_T_DEFINED_ -typedef long off_t; -#endif - -#ifndef NULL -#ifdef __GNUG__ -#define NULL __null -#else -#define NULL 0L -#endif -#endif - -#define _FSTDIO /* Define for new stdio with functions. */ - -typedef off_t fpos_t; /* stdio file position type */ - -/* - * NB: to fit things in six character monocase externals, the stdio - * code uses the prefix `__s' for stdio objects, typically followed - * by a three-character attempt at a mnemonic. - */ - -/* stdio buffers */ -struct __sbuf { - unsigned char *_base; - int _size; -}; - -/* - * stdio state variables. - * - * The following always hold: - * - * if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR), - * _lbfsize is -_bf._size, else _lbfsize is 0 - * if _flags&__SRD, _w is 0 - * if _flags&__SWR, _r is 0 - * - * This ensures that the getc and putc macros (or inline functions) never - * try to write or read from a file that is in `read' or `write' mode. - * (Moreover, they can, and do, automatically switch from read mode to - * write mode, and back, on "r+" and "w+" files.) - * - * _lbfsize is used only to make the inline line-buffered output stream - * code as compact as possible. - * - * _ub, _up, and _ur are used when ungetc() pushes back more characters - * than fit in the current _bf, or when ungetc() pushes back a character - * that does not match the previous one in _bf. When this happens, - * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff - * _ub._base!=NULL) and _up and _ur save the current values of _p and _r. - */ -typedef struct __sFILE { - unsigned char *_p; /* current position in (some) buffer */ - int _r; /* read space left for getc() */ - int _w; /* write space left for putc() */ - short _flags; /* flags, below; this FILE is free if 0 */ - short _file; /* fileno, if Unix descriptor, else -1 */ - struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ - int _lbfsize; /* 0 or -_bf._size, for inline putc */ - - /* operations */ - void *_cookie; /* cookie passed to io functions */ - int (*_close)(void *); - int (*_read)(void *, char *, int); - fpos_t (*_seek)(void *, fpos_t, int); - int (*_write)(void *, const char *, int); - - /* extension data, to avoid further ABI breakage */ - struct __sbuf _ext; - /* data for long sequences of ungetc() */ - unsigned char *_up; /* saved _p when _p is doing ungetc data */ - int _ur; /* saved _r when _r is counting ungetc data */ - - /* tricks to meet minimum requirements even when malloc() fails */ - unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */ - unsigned char _nbuf[1]; /* guarantee a getc() buffer */ - - /* separate buffer for fgetln() when line crosses buffer boundary */ - struct __sbuf _lb; /* buffer for fgetln() */ - - /* Unix stdio files get aligned to block boundaries on fseek() */ - int _blksize; /* stat.st_blksize (may be != _bf._size) */ - fpos_t _offset; /* current lseek offset */ -} FILE; - -__BEGIN_DECLS -extern FILE __sF[]; -__END_DECLS - -#define __SLBF 0x0001 /* line buffered */ -#define __SNBF 0x0002 /* unbuffered */ -#define __SRD 0x0004 /* OK to read */ -#define __SWR 0x0008 /* OK to write */ - /* RD and WR are never simultaneously asserted */ -#define __SRW 0x0010 /* open for reading & writing */ -#define __SEOF 0x0020 /* found EOF */ -#define __SERR 0x0040 /* found error */ -#define __SMBF 0x0080 /* _buf is from malloc */ -#define __SAPP 0x0100 /* fdopen()ed in append mode */ -#define __SSTR 0x0200 /* this is an sprintf/snprintf string */ -#define __SOPT 0x0400 /* do fseek() optimisation */ -#define __SNPT 0x0800 /* do not do fseek() optimisation */ -#define __SOFF 0x1000 /* set iff _offset is in fact correct */ -#define __SMOD 0x2000 /* true => fgetln modified _p text */ -#define __SALC 0x4000 /* allocate string space dynamically */ - -/* - * The following three definitions are for ANSI C, which took them - * from System V, which brilliantly took internal interface macros and - * made them official arguments to setvbuf(), without renaming them. - * Hence, these ugly _IOxxx names are *supposed* to appear in user code. - * - * Although numbered as their counterparts above, the implementation - * does not rely on this. - */ -#define _IOFBF 0 /* setvbuf should set fully buffered */ -#define _IOLBF 1 /* setvbuf should set line buffered */ -#define _IONBF 2 /* setvbuf should set unbuffered */ - -#define BUFSIZ 1024 /* size of buffer used by setbuf */ - -#define EOF (-1) - -/* - * FOPEN_MAX is a minimum maximum, and should be the number of descriptors - * that the kernel can provide without allocation of a resource that can - * fail without the process sleeping. Do not use this for anything. - */ -#define FOPEN_MAX 20 /* must be <= OPEN_MAX */ -#define FILENAME_MAX 1024 /* must be <= PATH_MAX */ - -/* System V/ANSI C; this is the wrong way to do this, do *not* use these. */ -#if __BSD_VISIBLE || __XPG_VISIBLE -#define P_tmpdir "/tmp/" -#endif -#define L_tmpnam 1024 /* XXX must be == PATH_MAX */ -#define TMP_MAX 308915776 - -#ifndef SEEK_SET -#define SEEK_SET 0 /* set file offset to offset */ -#endif -#ifndef SEEK_CUR -#define SEEK_CUR 1 /* set file offset to current plus offset */ -#endif -#ifndef SEEK_END -#define SEEK_END 2 /* set file offset to EOF plus offset */ -#endif - -#define stdin (&__sF[0]) -#define stdout (&__sF[1]) -#define stderr (&__sF[2]) - -/* - * Functions defined in ANSI C standard. - */ -__BEGIN_DECLS -void clearerr(FILE *); -int fclose(FILE *); -int feof(FILE *); -int ferror(FILE *); -int fflush(FILE *); -int fgetc(FILE *); -int fgetpos(FILE *, fpos_t *); -char *fgets(char *, int, FILE *); -FILE *fopen(const char *, const char *); -int fprintf(FILE *, const char *, ...); -int fputc(int, FILE *); -int fputs(const char *, FILE *); -size_t fread(void *, size_t, size_t, FILE *); -FILE *freopen(const char *, const char *, FILE *); -int fscanf(FILE *, const char *, ...); -int fseek(FILE *, long, int); -int fseeko(FILE *, off_t, int); -int fsetpos(FILE *, const fpos_t *); -long ftell(FILE *); -off_t ftello(FILE *); -size_t fwrite(const void *, size_t, size_t, FILE *); -int getc(FILE *); -int getchar(void); -char *gets(char *); -#if __BSD_VISIBLE && !defined(__SYS_ERRLIST) -#define __SYS_ERRLIST - -extern int sys_nerr; /* perror(3) external variables */ -extern char *sys_errlist[]; -#endif -void perror(const char *); -int printf(const char *, ...); -int putc(int, FILE *); -int putchar(int); -int puts(const char *); -int remove(const char *); -int rename(const char *, const char *); -void rewind(FILE *); -int scanf(const char *, ...); -void setbuf(FILE *, char *); -int setvbuf(FILE *, char *, int, size_t); -int sprintf(char *, const char *, ...); -int sscanf(const char *, const char *, ...); -FILE *tmpfile(void); -char *tmpnam(char *); -int ungetc(int, FILE *); -int vfprintf(FILE *, const char *, __va_list); -int vprintf(const char *, __va_list); -int vsprintf(char *, const char *, __va_list); - -#if __ISO_C_VISIBLE >= 1999 || __BSD_VISIBLE -int snprintf(char *, size_t, const char *, ...) - __attribute__((__format__ (printf, 3, 4))) - __attribute__((__nonnull__ (3))); -int vfscanf(FILE *, const char *, __va_list) - __attribute__((__format__ (scanf, 2, 0))) - __attribute__((__nonnull__ (2))); -int vscanf(const char *, __va_list) - __attribute__((__format__ (scanf, 1, 0))) - __attribute__((__nonnull__ (1))); -int vsnprintf(char *, size_t, const char *, __va_list) - __attribute__((__format__ (printf, 3, 0))) - __attribute__((__nonnull__ (3))); -int vsscanf(const char *, const char *, __va_list) - __attribute__((__format__ (scanf, 2, 0))) - __attribute__((__nonnull__ (2))); -#endif /* __ISO_C_VISIBLE >= 1999 || __BSD_VISIBLE */ - -__END_DECLS - - -/* - * Functions defined in POSIX 1003.1. - */ -#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE -#define L_ctermid 1024 /* size for ctermid(); PATH_MAX */ -#define L_cuserid 9 /* size for cuserid(); UT_NAMESIZE + 1 */ - -__BEGIN_DECLS -char *ctermid(char *); -char *cuserid(char *); -FILE *fdopen(int, const char *); -int fileno(FILE *); - -#if (__POSIX_VISIBLE >= 199209) || 1 /* ANDROID: Bionic does include this */ -int pclose(FILE *); -FILE *popen(const char *, const char *); -#endif - -#if __POSIX_VISIBLE >= 199506 -void flockfile(FILE *); -int ftrylockfile(FILE *); -void funlockfile(FILE *); - -/* - * These are normally used through macros as defined below, but POSIX - * requires functions as well. - */ -int getc_unlocked(FILE *); -int getchar_unlocked(void); -int putc_unlocked(int, FILE *); -int putchar_unlocked(int); -#endif /* __POSIX_VISIBLE >= 199506 */ - -#if __XPG_VISIBLE -char *tempnam(const char *, const char *); -#endif -__END_DECLS - -#endif /* __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE */ - -/* - * Routines that are purely local. - */ -#if __BSD_VISIBLE -__BEGIN_DECLS -int asprintf(char **, const char *, ...) - __attribute__((__format__ (printf, 2, 3))) - __attribute__((__nonnull__ (2))); -char *fgetln(FILE *, size_t *); -int fpurge(FILE *); -int getw(FILE *); -int putw(int, FILE *); -void setbuffer(FILE *, char *, int); -int setlinebuf(FILE *); -int vasprintf(char **, const char *, __va_list) - __attribute__((__format__ (printf, 2, 0))) - __attribute__((__nonnull__ (2))); -__END_DECLS - -/* - * Stdio function-access interface. - */ -__BEGIN_DECLS -FILE *funopen(const void *, - int (*)(void *, char *, int), - int (*)(void *, const char *, int), - fpos_t (*)(void *, fpos_t, int), - int (*)(void *)); -__END_DECLS -#define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0) -#define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0) -#endif /* __BSD_VISIBLE */ - -/* - * Functions internal to the implementation. - */ -__BEGIN_DECLS -int __srget(FILE *); -int __swbuf(int, FILE *); -__END_DECLS - -/* - * The __sfoo macros are here so that we can - * define function versions in the C library. - */ -#define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++)) -#if defined(__GNUC__) -static __inline int __sputc(int _c, FILE *_p) { - if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n')) - return (*_p->_p++ = _c); - else - return (__swbuf(_c, _p)); -} -#else -/* - * This has been tuned to generate reasonable code on the vax using pcc. - */ -#define __sputc(c, p) \ - (--(p)->_w < 0 ? \ - (p)->_w >= (p)->_lbfsize ? \ - (*(p)->_p = (c)), *(p)->_p != '\n' ? \ - (int)*(p)->_p++ : \ - __swbuf('\n', p) : \ - __swbuf((int)(c), p) : \ - (*(p)->_p = (c), (int)*(p)->_p++)) -#endif - -#define __sfeof(p) (((p)->_flags & __SEOF) != 0) -#define __sferror(p) (((p)->_flags & __SERR) != 0) -#define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF))) -#define __sfileno(p) ((p)->_file) - -#define feof(p) __sfeof(p) -#define ferror(p) __sferror(p) - -#ifndef _POSIX_THREADS -#define clearerr(p) __sclearerr(p) -#endif - -#if __POSIX_VISIBLE -#define fileno(p) __sfileno(p) -#endif - -#ifndef lint -#ifndef _POSIX_THREADS -#define getc(fp) __sgetc(fp) -#endif /* _POSIX_THREADS */ -#define getc_unlocked(fp) __sgetc(fp) -/* - * The macro implementations of putc and putc_unlocked are not - * fully POSIX compliant; they do not set errno on failure - */ -#if __BSD_VISIBLE -#ifndef _POSIX_THREADS -#define putc(x, fp) __sputc(x, fp) -#endif /* _POSIX_THREADS */ -#define putc_unlocked(x, fp) __sputc(x, fp) -#endif /* __BSD_VISIBLE */ -#endif /* lint */ - -#define getchar() getc(stdin) -#define putchar(x) putc(x, stdout) -#define getchar_unlocked() getc_unlocked(stdin) -#define putchar_unlocked(c) putc_unlocked(c, stdout) - -#endif /* _STDIO_H_ */ diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h deleted file mode 100644 index acfe69424..000000000 --- a/libc/include/stdlib.h +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _STDLIB_H_ -#define _STDLIB_H_ - -#include - -/* wchar_t is required in stdlib.h according to POSIX. - * note that defining __need_wchar_t prevents stddef.h - * to define all other symbols it does normally */ -#define __need_wchar_t -#include - -#include -#include -#include -#include -#include - -__BEGIN_DECLS - -#define EXIT_FAILURE 1 -#define EXIT_SUCCESS 0 - -extern __noreturn void exit(int); -extern __noreturn void abort(void); -extern int atexit(void (*)(void)); -extern int on_exit(void (*)(int, void *), void *); - -extern char *getenv(const char *); -extern int putenv(const char *); -extern int setenv(const char *, const char *, int); -extern int unsetenv(const char *); -extern int clearenv(void); - -extern char *mktemp (char *); -extern int mkstemp (char *); - -extern long strtol(const char *, char **, int); -extern long long strtoll(const char *, char **, int); -extern unsigned long strtoul(const char *, char **, int); -extern unsigned long long strtoull(const char *, char **, int); -extern double strtod(const char *nptr, char **endptr); - -static __inline__ float strtof(const char *nptr, char **endptr) -{ - return (float)strtod(nptr, endptr); -} - -extern int atoi(const char *); -extern long atol(const char *); -extern long long atoll(const char *); - -static __inline__ double atof(const char *nptr) -{ - return (strtod(nptr, NULL)); -} - -static __inline__ int abs(int __n) { - return (__n < 0) ? -__n : __n; -} - -static __inline__ long labs(long __n) { - return (__n < 0L) ? -__n : __n; -} - -static __inline__ long long llabs(long long __n) { - return (__n < 0LL) ? -__n : __n; -} - -extern char * realpath(const char *path, char *resolved); -extern int system(const char * string); - -extern void * bsearch(const void *key, const void *base0, - size_t nmemb, size_t size, - int (*compar)(const void *, const void *)); - -extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); - -extern long jrand48(unsigned short *); -extern long mrand48(void); -extern long nrand48(unsigned short *); -extern long lrand48(void); -extern unsigned short *seed48(unsigned short*); -extern void srand48(long); -extern unsigned int arc4random(void); -extern void arc4random_stir(void); -extern void arc4random_addrandom(unsigned char *, int); - -#define RAND_MAX 0x7fffffff -static __inline__ int rand(void) { - return (int)lrand48(); -} -static __inline__ void srand(unsigned int __s) { - srand48(__s); -} -static __inline__ long random(void) -{ - return lrand48(); -} -static __inline__ void srandom(unsigned int __s) -{ - srand48(__s); -} - -/* Basic PTY functions. These only work if devpts is mounted! */ - -extern int unlockpt(int); -extern char* ptsname(int); -extern char* ptsname_r(int, char*, size_t); -extern int getpt(void); - -static __inline__ int grantpt(int __fd) -{ - (void)__fd; - return 0; /* devpts does this all for us! */ -} - -typedef struct { - int quot; - int rem; -} div_t; - -extern div_t div(int, int); - -typedef struct { - long int quot; - long int rem; -} ldiv_t; - -extern ldiv_t ldiv(long, long); - -typedef struct { - long long int quot; - long long int rem; -} lldiv_t; - -extern lldiv_t lldiv(long long, long long); - -/* make STLPort happy */ -extern int mblen(const char *, size_t); -extern size_t mbstowcs(wchar_t *, const char *, size_t); -extern int mbtowc(wchar_t *, const char *, size_t); - -/* Likewise, make libstdc++-v3 happy. */ -extern int wctomb(char *, wchar_t); -extern size_t wcstombs(char *, const wchar_t *, size_t); -#define MB_CUR_MAX 1 - -__END_DECLS - -#endif /* _STDLIB_H_ */ diff --git a/libc/include/string.h b/libc/include/string.h deleted file mode 100644 index 613dcd78a..000000000 --- a/libc/include/string.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _STRING_H_ -#define _STRING_H_ - -#include -#include -#include - -__BEGIN_DECLS - -extern void* memccpy(void *, const void *, int, size_t); -extern void* memchr(const void *, int, size_t); -extern void* memrchr(const void *, int, size_t); -extern int memcmp(const void *, const void *, size_t); -extern void* memcpy(void *, const void *, size_t); -extern void* memmove(void *, const void *, size_t); -extern void* memset(void *, int, size_t); -extern void* memmem(const void *, size_t, const void *, size_t); -extern void memswap(void *, void *, size_t); - -extern char* index(const char *, int); -extern char* rindex(const char *, int); -extern char* strchr(const char *, int); -extern char* strrchr(const char *, int); - -extern size_t strlen(const char *); -extern int strcmp(const char *, const char *); -extern char* strcpy(char *, const char *); -extern char* strcat(char *, const char *); - -extern int strcasecmp(const char *, const char *); -extern int strncasecmp(const char *, const char *, size_t); -extern char* strdup(const char *); - -extern char* strstr(const char *, const char *); -extern char* strcasestr(const char *haystack, const char *needle); -extern char* strtok(char *, const char *); -extern char* strtok_r(char *, const char *, char**); - -extern char* strerror(int); -extern int strerror_r(int errnum, char *buf, size_t n); - -extern size_t strnlen(const char *, size_t); -extern char* strncat(char *, const char *, size_t); -extern char* strndup(const char *, size_t); -extern int strncmp(const char *, const char *, size_t); -extern char* strncpy(char *, const char *, size_t); - -extern size_t strlcat(char *, const char *, size_t); -extern size_t strlcpy(char *, const char *, size_t); - -extern size_t strcspn(const char *, const char *); -extern char* strpbrk(const char *, const char *); -extern char* strsep(char **, const char *); -extern size_t strspn(const char *, const char *); - -extern char* strsignal(int sig); - -extern int strcoll(const char *, const char *); -extern size_t strxfrm(char *, const char *, size_t); - -__END_DECLS - -#endif /* _STRING_H_ */ diff --git a/libc/include/strings.h b/libc/include/strings.h deleted file mode 100644 index 1f73e21a2..000000000 --- a/libc/include/strings.h +++ /dev/null @@ -1,55 +0,0 @@ -/* $NetBSD: strings.h,v 1.10 2005/02/03 04:39:32 perry Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Klaus Klein. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _STRINGS_H_ -#define _STRINGS_H_ - -#include - -__BEGIN_DECLS -int bcmp(const void *, const void *, size_t); -void bcopy(const void *, void *, size_t); -void bzero(void *, size_t); -int ffs(int); -char *index(const char *, int); -char *rindex(const char *, int); -int strcasecmp(const char *, const char *); -int strncasecmp(const char *, const char *, size_t); -__END_DECLS - -#endif /* !defined(_STRINGS_H_) */ diff --git a/libc/include/sys/_errdefs.h b/libc/include/sys/_errdefs.h deleted file mode 100644 index e27ab7ae7..000000000 --- a/libc/include/sys/_errdefs.h +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* the following corresponds to the error codes of the Linux kernel used by the Android platform - * these are distinct from the OpenBSD ones, which is why we need to redeclare them here - * - * this file may be included several times to define either error constants or their - * string representation - */ - -#ifndef __BIONIC_ERRDEF -#error "__BIONIC_ERRDEF must be defined before including this file" -#endif -__BIONIC_ERRDEF( EPERM , 1, "Operation not permitted" ) -__BIONIC_ERRDEF( ENOENT , 2, "No such file or directory" ) -__BIONIC_ERRDEF( ESRCH , 3, "No such process" ) -__BIONIC_ERRDEF( EINTR , 4, "Interrupted system call" ) -__BIONIC_ERRDEF( EIO , 5, "I/O error" ) -__BIONIC_ERRDEF( ENXIO , 6, "No such device or address" ) -__BIONIC_ERRDEF( E2BIG , 7, "Argument list too long" ) -__BIONIC_ERRDEF( ENOEXEC , 8, "Exec format error" ) -__BIONIC_ERRDEF( EBADF , 9, "Bad file number" ) -__BIONIC_ERRDEF( ECHILD , 10, "No child processes" ) -__BIONIC_ERRDEF( EAGAIN , 11, "Try again" ) -__BIONIC_ERRDEF( ENOMEM , 12, "Out of memory" ) -__BIONIC_ERRDEF( EACCES , 13, "Permission denied" ) -__BIONIC_ERRDEF( EFAULT , 14, "Bad address" ) -__BIONIC_ERRDEF( ENOTBLK , 15, "Block device required" ) -__BIONIC_ERRDEF( EBUSY , 16, "Device or resource busy" ) -__BIONIC_ERRDEF( EEXIST , 17, "File exists" ) -__BIONIC_ERRDEF( EXDEV , 18, "Cross-device link" ) -__BIONIC_ERRDEF( ENODEV , 19, "No such device" ) -__BIONIC_ERRDEF( ENOTDIR , 20, "Not a directory" ) -__BIONIC_ERRDEF( EISDIR , 21, "Is a directory" ) -__BIONIC_ERRDEF( EINVAL , 22, "Invalid argument" ) -__BIONIC_ERRDEF( ENFILE , 23, "File table overflow" ) -__BIONIC_ERRDEF( EMFILE , 24, "Too many open files" ) -__BIONIC_ERRDEF( ENOTTY , 25, "Not a typewriter" ) -__BIONIC_ERRDEF( ETXTBSY , 26, "Text file busy" ) -__BIONIC_ERRDEF( EFBIG , 27, "File too large" ) -__BIONIC_ERRDEF( ENOSPC , 28, "No space left on device" ) -__BIONIC_ERRDEF( ESPIPE , 29, "Illegal seek" ) -__BIONIC_ERRDEF( EROFS , 30, "Read-only file system" ) -__BIONIC_ERRDEF( EMLINK , 31, "Too many links" ) -__BIONIC_ERRDEF( EPIPE , 32, "Broken pipe" ) -__BIONIC_ERRDEF( EDOM , 33, "Math argument out of domain of func" ) -__BIONIC_ERRDEF( ERANGE , 34, "Math result not representable" ) -__BIONIC_ERRDEF( EDEADLK , 35, "Resource deadlock would occur" ) -__BIONIC_ERRDEF( ENAMETOOLONG , 36, "File name too long" ) -__BIONIC_ERRDEF( ENOLCK , 37, "No record locks available" ) -__BIONIC_ERRDEF( ENOSYS , 38, "Function not implemented" ) -__BIONIC_ERRDEF( ENOTEMPTY , 39, "Directory not empty" ) -__BIONIC_ERRDEF( ELOOP , 40, "Too many symbolic links encountered" ) -__BIONIC_ERRDEF( ENOMSG , 42, "No message of desired type" ) -__BIONIC_ERRDEF( EIDRM , 43, "Identifier removed" ) -__BIONIC_ERRDEF( ECHRNG , 44, "Channel number out of range" ) -__BIONIC_ERRDEF( EL2NSYNC , 45, "Level 2 not synchronized" ) -__BIONIC_ERRDEF( EL3HLT , 46, "Level 3 halted" ) -__BIONIC_ERRDEF( EL3RST , 47, "Level 3 reset" ) -__BIONIC_ERRDEF( ELNRNG , 48, "Link number out of range" ) -__BIONIC_ERRDEF( EUNATCH , 49, "Protocol driver not attached" ) -__BIONIC_ERRDEF( ENOCSI , 50, "No CSI structure available" ) -__BIONIC_ERRDEF( EL2HLT , 51, "Level 2 halted" ) -__BIONIC_ERRDEF( EBADE , 52, "Invalid exchange" ) -__BIONIC_ERRDEF( EBADR , 53, "Invalid request descriptor" ) -__BIONIC_ERRDEF( EXFULL , 54, "Exchange full" ) -__BIONIC_ERRDEF( ENOANO , 55, "No anode" ) -__BIONIC_ERRDEF( EBADRQC , 56, "Invalid request code" ) -__BIONIC_ERRDEF( EBADSLT , 57, "Invalid slot" ) -__BIONIC_ERRDEF( EBFONT , 59, "Bad font file format" ) -__BIONIC_ERRDEF( ENOSTR , 60, "Device not a stream" ) -__BIONIC_ERRDEF( ENODATA , 61, "No data available" ) -__BIONIC_ERRDEF( ETIME , 62, "Timer expired" ) -__BIONIC_ERRDEF( ENOSR , 63, "Out of streams resources" ) -__BIONIC_ERRDEF( ENONET , 64, "Machine is not on the network" ) -__BIONIC_ERRDEF( ENOPKG , 65, "Package not installed" ) -__BIONIC_ERRDEF( EREMOTE , 66, "Object is remote" ) -__BIONIC_ERRDEF( ENOLINK , 67, "Link has been severed" ) -__BIONIC_ERRDEF( EADV , 68, "Advertise error" ) -__BIONIC_ERRDEF( ESRMNT , 69, "Srmount error" ) -__BIONIC_ERRDEF( ECOMM , 70, "Communication error on send" ) -__BIONIC_ERRDEF( EPROTO , 71, "Protocol error" ) -__BIONIC_ERRDEF( EMULTIHOP , 72, "Multihop attempted" ) -__BIONIC_ERRDEF( EDOTDOT , 73, "RFS specific error" ) -__BIONIC_ERRDEF( EBADMSG , 74, "Not a data message" ) -__BIONIC_ERRDEF( EOVERFLOW , 75, "Value too large for defined data type" ) -__BIONIC_ERRDEF( ENOTUNIQ , 76, "Name not unique on network" ) -__BIONIC_ERRDEF( EBADFD , 77, "File descriptor in bad state" ) -__BIONIC_ERRDEF( EREMCHG , 78, "Remote address changed" ) -__BIONIC_ERRDEF( ELIBACC , 79, "Can not access a needed shared library" ) -__BIONIC_ERRDEF( ELIBBAD , 80, "Accessing a corrupted shared library" ) -__BIONIC_ERRDEF( ELIBSCN , 81, ".lib section in a.out corrupted" ) -__BIONIC_ERRDEF( ELIBMAX , 82, "Attempting to link in too many shared libraries" ) -__BIONIC_ERRDEF( ELIBEXEC , 83, "Cannot exec a shared library directly" ) -__BIONIC_ERRDEF( EILSEQ , 84, "Illegal byte sequence" ) -__BIONIC_ERRDEF( ERESTART , 85, "Interrupted system call should be restarted" ) -__BIONIC_ERRDEF( ESTRPIPE , 86, "Streams pipe error" ) -__BIONIC_ERRDEF( EUSERS , 87, "Too many users" ) -__BIONIC_ERRDEF( ENOTSOCK , 88, "Socket operation on non-socket" ) -__BIONIC_ERRDEF( EDESTADDRREQ , 89, "Destination address required" ) -__BIONIC_ERRDEF( EMSGSIZE , 90, "Message too long" ) -__BIONIC_ERRDEF( EPROTOTYPE , 91, "Protocol wrong type for socket" ) -__BIONIC_ERRDEF( ENOPROTOOPT , 92, "Protocol not available" ) -__BIONIC_ERRDEF( EPROTONOSUPPORT, 93, "Protocol not supported" ) -__BIONIC_ERRDEF( ESOCKTNOSUPPORT, 94, "Socket type not supported" ) -__BIONIC_ERRDEF( EOPNOTSUPP , 95, "Operation not supported on transport endpoint" ) -__BIONIC_ERRDEF( EPFNOSUPPORT , 96, "Protocol family not supported" ) -__BIONIC_ERRDEF( EAFNOSUPPORT , 97, "Address family not supported by protocol" ) -__BIONIC_ERRDEF( EADDRINUSE , 98, "Address already in use" ) -__BIONIC_ERRDEF( EADDRNOTAVAIL , 99, "Cannot assign requested address" ) -__BIONIC_ERRDEF( ENETDOWN , 100, "Network is down" ) -__BIONIC_ERRDEF( ENETUNREACH , 101, "Network is unreachable" ) -__BIONIC_ERRDEF( ENETRESET , 102, "Network dropped connection because of reset" ) -__BIONIC_ERRDEF( ECONNABORTED , 103, "Software caused connection abort" ) -__BIONIC_ERRDEF( ECONNRESET , 104, "Connection reset by peer" ) -__BIONIC_ERRDEF( ENOBUFS , 105, "No buffer space available" ) -__BIONIC_ERRDEF( EISCONN , 106, "Transport endpoint is already connected" ) -__BIONIC_ERRDEF( ENOTCONN , 107, "Transport endpoint is not connected" ) -__BIONIC_ERRDEF( ESHUTDOWN , 108, "Cannot send after transport endpoint shutdown" ) -__BIONIC_ERRDEF( ETOOMANYREFS , 109, "Too many references: cannot splice" ) -__BIONIC_ERRDEF( ETIMEDOUT , 110, "Connection timed out" ) -__BIONIC_ERRDEF( ECONNREFUSED , 111, "Connection refused" ) -__BIONIC_ERRDEF( EHOSTDOWN , 112, "Host is down" ) -__BIONIC_ERRDEF( EHOSTUNREACH , 113, "No route to host" ) -__BIONIC_ERRDEF( EALREADY , 114, "Operation already in progress" ) -__BIONIC_ERRDEF( EINPROGRESS , 115, "Operation now in progress" ) -__BIONIC_ERRDEF( ESTALE , 116, "Stale NFS file handle" ) -__BIONIC_ERRDEF( EUCLEAN , 117, "Structure needs cleaning" ) -__BIONIC_ERRDEF( ENOTNAM , 118, "Not a XENIX named type file" ) -__BIONIC_ERRDEF( ENAVAIL , 119, "No XENIX semaphores available" ) -__BIONIC_ERRDEF( EISNAM , 120, "Is a named type file" ) -__BIONIC_ERRDEF( EREMOTEIO , 121, "Remote I/O error" ) -__BIONIC_ERRDEF( EDQUOT , 122, "Quota exceeded" ) -__BIONIC_ERRDEF( ENOMEDIUM , 123, "No medium found" ) -__BIONIC_ERRDEF( EMEDIUMTYPE , 124, "Wrong medium type" ) -__BIONIC_ERRDEF( ECANCELED , 125, "Operation Canceled" ) -__BIONIC_ERRDEF( ENOKEY , 126, "Required key not available" ) -__BIONIC_ERRDEF( EKEYEXPIRED , 127, "Key has expired" ) -__BIONIC_ERRDEF( EKEYREVOKED , 128, "Key has been revoked" ) -__BIONIC_ERRDEF( EKEYREJECTED , 129, "Key was rejected by service" ) -__BIONIC_ERRDEF( EOWNERDEAD , 130, "Owner died" ) -__BIONIC_ERRDEF( ENOTRECOVERABLE, 131, "State not recoverable" ) - -/* the following is not defined by Linux but needed for the BSD portions of the C library */ -__BIONIC_ERRDEF( EFTYPE, 1000, "Stupid C library hack !!" ) - -#undef __BIONIC_ERRDEF diff --git a/libc/include/sys/_sigdefs.h b/libc/include/sys/_sigdefs.h deleted file mode 100644 index a3cb7a3d6..000000000 --- a/libc/include/sys/_sigdefs.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* this header is used to define signal constants and names; it might be included several times */ -#ifndef __BIONIC_SIGDEF -#error __BIONIC_SIGDEF not defined -#endif - -__BIONIC_SIGDEF(SIGHUP,1,"Hangup") -__BIONIC_SIGDEF(SIGINT,2,"Interrupt") -__BIONIC_SIGDEF(SIGQUIT,3,"Quit") -__BIONIC_SIGDEF(SIGILL,4,"Illegal instruction") -__BIONIC_SIGDEF(SIGTRAP,5,"Trap") -__BIONIC_SIGDEF(SIGABRT,6,"Aborted") -__BIONIC_SIGDEF(SIGBUS,7,"Bus error") -__BIONIC_SIGDEF(SIGFPE,8,"Floating point exception") -__BIONIC_SIGDEF(SIGKILL,9,"Killed") -__BIONIC_SIGDEF(SIGUSR1,10,"User signal 1") -__BIONIC_SIGDEF(SIGSEGV,11,"Segmentation fault") -__BIONIC_SIGDEF(SIGUSR2,12,"User signal 2") -__BIONIC_SIGDEF(SIGPIPE,13,"Broken pipe") -__BIONIC_SIGDEF(SIGALRM,14,"Alarm clock") -__BIONIC_SIGDEF(SIGTERM,15,"Terminated") -__BIONIC_SIGDEF(SIGSTKFLT,16,"Stack fault") -__BIONIC_SIGDEF(SIGCHLD,17,"Child exited") -__BIONIC_SIGDEF(SIGCONT,18,"Continue") -__BIONIC_SIGDEF(SIGSTOP,19,"Stopped (signal)") -__BIONIC_SIGDEF(SIGTSTP,20,"Stopped") -__BIONIC_SIGDEF(SIGTTIN,21,"Stopped (tty input)") -__BIONIC_SIGDEF(SIGTTOU,22,"Stopper (tty output)") -__BIONIC_SIGDEF(SIGURG,23,"Urgent I/O condition") -__BIONIC_SIGDEF(SIGXCPU,24,"CPU time limit exceeded") -__BIONIC_SIGDEF(SIGXFSZ,25,"File size limit exceeded") -__BIONIC_SIGDEF(SIGVTALRM,26,"Virtual timer expired") -__BIONIC_SIGDEF(SIGPROF,27,"Profiling timer expired") -__BIONIC_SIGDEF(SIGWINCH,28,"Window size changed") -__BIONIC_SIGDEF(SIGIO,29,"I/O possible") -__BIONIC_SIGDEF(SIGPWR,30,"Power failure") -__BIONIC_SIGDEF(SIGSYS,31,"Bad system call") - -#undef __BIONIC_SIGDEF diff --git a/libc/include/sys/_system_properties.h b/libc/include/sys/_system_properties.h deleted file mode 100644 index 42a7f6c0f..000000000 --- a/libc/include/sys/_system_properties.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _INCLUDE_SYS__SYSTEM_PROPERTIES_H -#define _INCLUDE_SYS__SYSTEM_PROPERTIES_H - -#ifndef _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ -#error you should #include instead -#else -#include - -typedef struct prop_area prop_area; -typedef struct prop_msg prop_msg; - -#define PROP_AREA_MAGIC 0x504f5250 -#define PROP_AREA_VERSION 0x45434f76 - -#define PROP_SERVICE_NAME "property_service" - -/* #define PROP_MAX_ENTRIES 247 */ -/* 247 -> 32620 bytes (<32768) */ - -#define TOC_NAME_LEN(toc) ((toc) >> 24) -#define TOC_TO_INFO(area, toc) ((prop_info*) (((char*) area) + ((toc) & 0xFFFFFF))) - -struct prop_area { - unsigned volatile count; - unsigned volatile serial; - unsigned magic; - unsigned version; - unsigned reserved[4]; - unsigned toc[1]; -}; - -#define SERIAL_VALUE_LEN(serial) ((serial) >> 24) -#define SERIAL_DIRTY(serial) ((serial) & 1) - -struct prop_info { - char name[PROP_NAME_MAX]; - unsigned volatile serial; - char value[PROP_VALUE_MAX]; -}; - -struct prop_msg -{ - unsigned cmd; - char name[PROP_NAME_MAX]; - char value[PROP_VALUE_MAX]; -}; - -#define PROP_MSG_SETPROP 1 - -/* -** Rules: -** -** - there is only one writer, but many readers -** - prop_area.count will never decrease in value -** - once allocated, a prop_info's name will not change -** - once allocated, a prop_info's offset will not change -** - reading a value requires the following steps -** 1. serial = pi->serial -** 2. if SERIAL_DIRTY(serial), wait*, then goto 1 -** 3. memcpy(local, pi->value, SERIAL_VALUE_LEN(serial) + 1) -** 4. if pi->serial != serial, goto 2 -** -** - writing a value requires the following steps -** 1. pi->serial = pi->serial | 1 -** 2. memcpy(pi->value, local_value, value_len) -** 3. pi->serial = (value_len << 24) | ((pi->serial + 1) & 0xffffff) -** -** Improvements: -** - maintain the toc sorted by pi->name to allow lookup -** by binary search -** -*/ - -#define PROP_PATH_RAMDISK_DEFAULT "/default.prop" -#define PROP_PATH_SYSTEM_BUILD "/system/build.prop" -#define PROP_PATH_SYSTEM_DEFAULT "/system/default.prop" -#define PROP_PATH_LOCAL_OVERRIDE "/data/local.prop" - -#endif -#endif diff --git a/libc/include/sys/_types.h b/libc/include/sys/_types.h deleted file mode 100644 index 7b99e06cc..000000000 --- a/libc/include/sys/_types.h +++ /dev/null @@ -1,77 +0,0 @@ -/* $OpenBSD: _types.h,v 1.1 2006/01/06 18:53:05 millert Exp $ */ - -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)types.h 8.3 (Berkeley) 1/5/94 - */ - -#ifndef _SYS__TYPES_H_ -#define _SYS__TYPES_H_ - -#undef __KERNEL_STRICT_NAMES -#define __KERNEL_STRICT_NAMES 1 - -#include - -typedef unsigned long __cpuid_t; /* CPU id */ -typedef __int32_t __dev_t; /* device number */ -typedef __uint32_t __fixpt_t; /* fixed point number */ -typedef __uint32_t __gid_t; /* group id */ -typedef __uint32_t __id_t; /* may contain pid, uid or gid */ -typedef __uint32_t __in_addr_t; /* base type for internet address */ -typedef __uint16_t __in_port_t; /* IP port type */ -typedef __uint32_t __ino_t; /* inode number */ -typedef long __key_t; /* IPC key (for Sys V IPC) */ -typedef __uint32_t __mode_t; /* permissions */ -typedef __uint32_t __nlink_t; /* link count */ -typedef __int32_t __pid_t; /* process id */ -typedef __uint64_t __rlim_t; /* resource limit */ -typedef __uint16_t __sa_family_t; /* sockaddr address family type */ -typedef __int32_t __segsz_t; /* segment size */ -typedef __uint32_t __socklen_t; /* length type for network syscalls */ -typedef __int32_t __swblk_t; /* swap offset */ -typedef __uint32_t __uid_t; /* user id */ -typedef __uint32_t __useconds_t; /* microseconds */ -typedef __int32_t __suseconds_t; /* microseconds (signed) */ - -/* - * mbstate_t is an opaque object to keep conversion state, during multibyte - * stream conversions. The content must not be referenced by user programs. - */ -typedef union { - char __mbstate8[128]; - __int64_t __mbstateL; /* for alignment */ -} __mbstate_t; - -/* BIONIC: if we're using non-cleaned up user-level kernel headers, - * this will prevent many type declaration conflicts - */ -#define __KERNEL_STRICT_NAMES 1 - -#endif /* !_SYS__TYPES_H_ */ diff --git a/libc/include/sys/atomics.h b/libc/include/sys/atomics.h deleted file mode 100644 index d3fa1454f..000000000 --- a/libc/include/sys/atomics.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_ATOMICS_H -#define _SYS_ATOMICS_H - -#include -#include - -__BEGIN_DECLS - -extern int __atomic_cmpxchg(int old, int _new, volatile int *ptr); -extern int __atomic_swap(int _new, volatile int *ptr); -extern int __atomic_dec(volatile int *ptr); -extern int __atomic_inc(volatile int *ptr); - -int __futex_wait(volatile void *ftx, int val, const struct timespec *timeout); -int __futex_wake(volatile void *ftx, int count); - -__END_DECLS - -#endif /* _SYS_ATOMICS_H */ diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h deleted file mode 100644 index fe7033dba..000000000 --- a/libc/include/sys/cdefs.h +++ /dev/null @@ -1,376 +0,0 @@ -/* $NetBSD: cdefs.h,v 1.58 2004/12/11 05:59:00 christos Exp $ */ - -/* - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Berkeley Software Design, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 - */ - -#ifndef _SYS_CDEFS_H_ -#define _SYS_CDEFS_H_ - - -/* our implementation of wchar_t is only 8-bit - die die non-portable code */ -#undef __WCHAR_TYPE__ -#define __WCHAR_TYPE__ unsigned char - - -/* - * Macro to test if we're using a GNU C compiler of a specific vintage - * or later, for e.g. features that appeared in a particular version - * of GNU C. Usage: - * - * #if __GNUC_PREREQ__(major, minor) - * ...cool feature... - * #else - * ...delete feature... - * #endif - */ -#ifdef __GNUC__ -#define __GNUC_PREREQ__(x, y) \ - ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ - (__GNUC__ > (x))) -#else -#define __GNUC_PREREQ__(x, y) 0 -#endif - -//XXX #include - -/* BIONIC: simpler definition */ -#define __BSD_VISIBLE 1 - -#include - -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#define __static_cast(x,y) static_cast(y) -#else -#define __BEGIN_DECLS -#define __END_DECLS -#define __static_cast(x,y) (x)y -#endif - -/* - * The __CONCAT macro is used to concatenate parts of symbol names, e.g. - * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. - * The __CONCAT macro is a bit tricky -- make sure you don't put spaces - * in between its arguments. __CONCAT can also concatenate double-quoted - * strings produced by the __STRING macro, but this only works with ANSI C. - */ - -#define ___STRING(x) __STRING(x) -#define ___CONCAT(x,y) __CONCAT(x,y) - -#if __STDC__ || defined(__cplusplus) -#define __P(protos) protos /* full-blown ANSI C */ -#define __CONCAT(x,y) x ## y -#define __STRING(x) #x - -#define __const const /* define reserved names to standard */ -#define __signed signed -#define __volatile volatile -#if defined(__cplusplus) -#define __inline inline /* convert to C++ keyword */ -#else -#if !defined(__GNUC__) && !defined(__lint__) -#define __inline /* delete GCC keyword */ -#endif /* !__GNUC__ && !__lint__ */ -#endif /* !__cplusplus */ - -#else /* !(__STDC__ || __cplusplus) */ -#define __P(protos) () /* traditional C preprocessor */ -#define __CONCAT(x,y) x/**/y -#define __STRING(x) "x" - -#ifndef __GNUC__ -#define __const /* delete pseudo-ANSI C keywords */ -#define __inline -#define __signed -#define __volatile -#endif /* !__GNUC__ */ - -/* - * In non-ANSI C environments, new programs will want ANSI-only C keywords - * deleted from the program and old programs will want them left alone. - * Programs using the ANSI C keywords const, inline etc. as normal - * identifiers should define -DNO_ANSI_KEYWORDS. - */ -#ifndef NO_ANSI_KEYWORDS -#define const __const /* convert ANSI C keywords */ -#define inline __inline -#define signed __signed -#define volatile __volatile -#endif /* !NO_ANSI_KEYWORDS */ -#endif /* !(__STDC__ || __cplusplus) */ - -/* - * Used for internal auditing of the NetBSD source tree. - */ -#ifdef __AUDIT__ -#define __aconst __const -#else -#define __aconst -#endif - -/* - * The following macro is used to remove const cast-away warnings - * from gcc -Wcast-qual; it should be used with caution because it - * can hide valid errors; in particular most valid uses are in - * situations where the API requires it, not to cast away string - * constants. We don't use *intptr_t on purpose here and we are - * explicit about unsigned long so that we don't have additional - * dependencies. - */ -#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) - -/* - * GCC2 provides __extension__ to suppress warnings for various GNU C - * language extensions under "-ansi -pedantic". - */ -#if !__GNUC_PREREQ__(2, 0) -#define __extension__ /* delete __extension__ if non-gcc or gcc1 */ -#endif - -/* - * GCC1 and some versions of GCC2 declare dead (non-returning) and - * pure (no side effects) functions using "volatile" and "const"; - * unfortunately, these then cause warnings under "-ansi -pedantic". - * GCC2 uses a new, peculiar __attribute__((attrs)) style. All of - * these work for GNU C++ (modulo a slight glitch in the C++ grammar - * in the distribution version of 2.5.5). - */ -#if !__GNUC_PREREQ__(2, 5) -#define __attribute__(x) /* delete __attribute__ if non-gcc or gcc1 */ -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -#define __dead __volatile -#define __pure __const -#endif -#endif - -/* Delete pseudo-keywords wherever they are not available or needed. */ -#ifndef __dead -#define __dead -#define __pure -#endif - -#if __GNUC_PREREQ__(2, 7) -#define __unused __attribute__((__unused__)) -#else -#define __unused /* delete */ -#endif - -#if __GNUC_PREREQ__(3, 1) -#define __used __attribute__((__used__)) -#else -#define __used /* delete */ -#endif - -#if __GNUC_PREREQ__(2, 7) -#define __packed __attribute__((__packed__)) -#define __aligned(x) __attribute__((__aligned__(x))) -#define __section(x) __attribute__((__section__(x))) -#elif defined(__lint__) -#define __packed /* delete */ -#define __aligned(x) /* delete */ -#define __section(x) /* delete */ -#else -#define __packed error: no __packed for this compiler -#define __aligned(x) error: no __aligned for this compiler -#define __section(x) error: no __section for this compiler -#endif - -#if !__GNUC_PREREQ__(2, 8) -#define __extension__ -#endif - -#if __GNUC_PREREQ__(2, 8) -#define __statement(x) __extension__(x) -#elif defined(lint) -#define __statement(x) (0) -#else -#define __statement(x) (x) -#endif - -/* - * C99 defines the restrict type qualifier keyword, which was made available - * in GCC 2.92. - */ -#if __STDC_VERSION__ >= 199901L -#define __restrict restrict -#else -#if !__GNUC_PREREQ__(2, 92) -#define __restrict /* delete __restrict when not supported */ -#endif -#endif - -/* - * C99 defines __func__ predefined identifier, which was made available - * in GCC 2.95. - */ -#if !(__STDC_VERSION__ >= 199901L) -#if __GNUC_PREREQ__(2, 6) -#define __func__ __PRETTY_FUNCTION__ -#elif __GNUC_PREREQ__(2, 4) -#define __func__ __FUNCTION__ -#else -#define __func__ "" -#endif -#endif /* !(__STDC_VERSION__ >= 199901L) */ - -#if defined(_KERNEL) -#if defined(NO_KERNEL_RCSIDS) -#undef __KERNEL_RCSID -#define __KERNEL_RCSID(_n, _s) /* nothing */ -#endif /* NO_KERNEL_RCSIDS */ -#endif /* _KERNEL */ - -#if !defined(_STANDALONE) && !defined(_KERNEL) -#ifdef __GNUC__ -#define __RENAME(x) ___RENAME(x) -#else -#ifdef __lint__ -#define __RENAME(x) __symbolrename(x) -#else -#error "No function renaming possible" -#endif /* __lint__ */ -#endif /* __GNUC__ */ -#else /* _STANDALONE || _KERNEL */ -#define __RENAME(x) no renaming in kernel or standalone environment -#endif - -/* - * A barrier to stop the optimizer from moving code or assume live - * register values. This is gcc specific, the version is more or less - * arbitrary, might work with older compilers. - */ -#if __GNUC_PREREQ__(2, 95) -#define __insn_barrier() __asm __volatile("":::"memory") -#else -#define __insn_barrier() /* */ -#endif - -/* - * GNU C version 2.96 adds explicit branch prediction so that - * the CPU back-end can hint the processor and also so that - * code blocks can be reordered such that the predicted path - * sees a more linear flow, thus improving cache behavior, etc. - * - * The following two macros provide us with a way to use this - * compiler feature. Use __predict_true() if you expect the expression - * to evaluate to true, and __predict_false() if you expect the - * expression to evaluate to false. - * - * A few notes about usage: - * - * * Generally, __predict_false() error condition checks (unless - * you have some _strong_ reason to do otherwise, in which case - * document it), and/or __predict_true() `no-error' condition - * checks, assuming you want to optimize for the no-error case. - * - * * Other than that, if you don't know the likelihood of a test - * succeeding from empirical or other `hard' evidence, don't - * make predictions. - * - * * These are meant to be used in places that are run `a lot'. - * It is wasteful to make predictions in code that is run - * seldomly (e.g. at subsystem initialization time) as the - * basic block reordering that this affects can often generate - * larger code. - */ -#if __GNUC_PREREQ__(2, 96) -#define __predict_true(exp) __builtin_expect((exp) != 0, 1) -#define __predict_false(exp) __builtin_expect((exp) != 0, 0) -#else -#define __predict_true(exp) (exp) -#define __predict_false(exp) (exp) -#endif - -#if __GNUC_PREREQ__(2, 96) -#define __noreturn __attribute__((__noreturn__)) -#define __mallocfunc __attribute__((malloc)) -#else -#define __noreturn -#define __mallocfunc -#endif - -/* - * Macros for manipulating "link sets". Link sets are arrays of pointers - * to objects, which are gathered up by the linker. - * - * Object format-specific code has provided us with the following macros: - * - * __link_set_add_text(set, sym) - * Add a reference to the .text symbol `sym' to `set'. - * - * __link_set_add_rodata(set, sym) - * Add a reference to the .rodata symbol `sym' to `set'. - * - * __link_set_add_data(set, sym) - * Add a reference to the .data symbol `sym' to `set'. - * - * __link_set_add_bss(set, sym) - * Add a reference to the .bss symbol `sym' to `set'. - * - * __link_set_decl(set, ptype) - * Provide an extern declaration of the set `set', which - * contains an array of the pointer type `ptype'. This - * macro must be used by any code which wishes to reference - * the elements of a link set. - * - * __link_set_start(set) - * This points to the first slot in the link set. - * - * __link_set_end(set) - * This points to the (non-existent) slot after the last - * entry in the link set. - * - * __link_set_count(set) - * Count the number of entries in link set `set'. - * - * In addition, we provide the following macros for accessing link sets: - * - * __link_set_foreach(pvar, set) - * Iterate over the link set `set'. Because a link set is - * an array of pointers, pvar must be declared as "type **pvar", - * and the actual entry accessed as "*pvar". - * - * __link_set_entry(set, idx) - * Access the link set entry at index `idx' from set `set'. - */ -#define __link_set_foreach(pvar, set) \ - for (pvar = __link_set_start(set); pvar < __link_set_end(set); pvar++) - -#define __link_set_entry(set, idx) (__link_set_begin(set)[idx]) - -#define __BIONIC__ 1 - -#endif /* !_SYS_CDEFS_H_ */ diff --git a/libc/include/sys/cdefs_elf.h b/libc/include/sys/cdefs_elf.h deleted file mode 100644 index e051b1d0e..000000000 --- a/libc/include/sys/cdefs_elf.h +++ /dev/null @@ -1,152 +0,0 @@ -/* $NetBSD: cdefs_elf.h,v 1.22 2005/02/26 22:25:34 perry Exp $ */ - -/* - * Copyright (c) 1995, 1996 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -#ifndef _SYS_CDEFS_ELF_H_ -#define _SYS_CDEFS_ELF_H_ - -#ifdef __LEADING_UNDERSCORE -#define _C_LABEL(x) __CONCAT(_,x) -#define _C_LABEL_STRING(x) "_"x -#else -#define _C_LABEL(x) x -#define _C_LABEL_STRING(x) x -#endif - -#if __STDC__ -#define ___RENAME(x) __asm__(___STRING(_C_LABEL(x))) -#else -#ifdef __LEADING_UNDERSCORE -#define ___RENAME(x) ____RENAME(_/**/x) -#define ____RENAME(x) __asm__(___STRING(x)) -#else -#define ___RENAME(x) __asm__(___STRING(x)) -#endif -#endif - -#define __indr_reference(sym,alias) /* nada, since we do weak refs */ - -#if __STDC__ -#define __strong_alias(alias,sym) \ - __asm__(".global " _C_LABEL_STRING(#alias) "\n" \ - _C_LABEL_STRING(#alias) " = " _C_LABEL_STRING(#sym)); - -#define __weak_alias(alias,sym) \ - __asm__(".weak " _C_LABEL_STRING(#alias) "\n" \ - _C_LABEL_STRING(#alias) " = " _C_LABEL_STRING(#sym)); -#define __weak_extern(sym) \ - __asm__(".weak " _C_LABEL_STRING(#sym)); -#define __warn_references(sym,msg) \ - __asm__(".section .gnu.warning." #sym "\n\t.ascii \"" msg "\"\n\t.text"); - -#else /* !__STDC__ */ - -#ifdef __LEADING_UNDERSCORE -#define __weak_alias(alias,sym) ___weak_alias(_/**/alias,_/**/sym) -#define ___weak_alias(alias,sym) \ - __asm__(".weak alias\nalias = sym"); -#else -#define __weak_alias(alias,sym) \ - __asm__(".weak alias\nalias = sym"); -#endif -#ifdef __LEADING_UNDERSCORE -#define __weak_extern(sym) ___weak_extern(_/**/sym) -#define ___weak_extern(sym) \ - __asm__(".weak sym"); -#else -#define __weak_extern(sym) \ - __asm__(".weak sym"); -#endif -#define __warn_references(sym,msg) \ - __asm__(".section .gnu.warning.sym\n\t.ascii msg ; .text"); - -#endif /* !__STDC__ */ - -#if __STDC__ -#define __SECTIONSTRING(_sec, _str) \ - __asm__(".section " #_sec "\n\t.asciz \"" _str "\"\n\t.previous") -#else -#define __SECTIONSTRING(_sec, _str) \ - __asm__(".section _sec\n\t.asciz _str\n\t.previous") -#endif - -#define __IDSTRING(_n,_s) __SECTIONSTRING(.ident,_s) - -#define __RCSID(_s) __IDSTRING(rcsid,_s) -#define __SCCSID(_s) -#define __SCCSID2(_s) -#if 0 /* XXX userland __COPYRIGHTs have \ns in them */ -#define __COPYRIGHT(_s) __SECTIONSTRING(.copyright,_s) -#else -#define __COPYRIGHT(_s) \ - static const char copyright[] \ - __attribute__((__unused__,__section__(".copyright"))) = _s -#endif - -#define __KERNEL_RCSID(_n, _s) __RCSID(_s) -#define __KERNEL_SCCSID(_n, _s) -#if 0 /* XXX see above */ -#define __KERNEL_COPYRIGHT(_n, _s) __COPYRIGHT(_s) -#else -#define __KERNEL_COPYRIGHT(_n, _s) __SECTIONSTRING(.copyright, _s) -#endif - -#ifndef __lint__ -#define __link_set_make_entry(set, sym) \ - static void const * const __link_set_##set##_sym_##sym \ - __section("link_set_" #set) __used = &sym -#define __link_set_make_entry2(set, sym, n) \ - static void const * const __link_set_##set##_sym_##sym##_##n \ - __section("link_set_" #set) __used = &sym[n] -#else -#define __link_set_make_entry(set, sym) \ - extern void const * const __link_set_##set##_sym_##sym -#define __link_set_make_entry2(set, sym, n) \ - extern void const * const __link_set_##set##_sym_##sym##_##n -#endif /* __lint__ */ - -#define __link_set_add_text(set, sym) __link_set_make_entry(set, sym) -#define __link_set_add_rodata(set, sym) __link_set_make_entry(set, sym) -#define __link_set_add_data(set, sym) __link_set_make_entry(set, sym) -#define __link_set_add_bss(set, sym) __link_set_make_entry(set, sym) -#define __link_set_add_text2(set, sym, n) __link_set_make_entry2(set, sym, n) -#define __link_set_add_rodata2(set, sym, n) __link_set_make_entry2(set, sym, n) -#define __link_set_add_data2(set, sym, n) __link_set_make_entry2(set, sym, n) -#define __link_set_add_bss2(set, sym, n) __link_set_make_entry2(set, sym, n) - -#define __link_set_decl(set, ptype) \ - extern ptype * const __start_link_set_##set[]; \ - extern ptype * const __stop_link_set_##set[] \ - -#define __link_set_start(set) (__start_link_set_##set) -#define __link_set_end(set) (__stop_link_set_##set) - -#define __link_set_count(set) \ - (__link_set_end(set) - __link_set_start(set)) - -#endif /* !_SYS_CDEFS_ELF_H_ */ diff --git a/libc/include/sys/dirent.h b/libc/include/sys/dirent.h deleted file mode 100644 index da96f5efe..000000000 --- a/libc/include/sys/dirent.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_DIRENT_H_ -#define _SYS_DIRENT_H_ - -#include -#include - -__BEGIN_DECLS - -/* this corresponds to the kernel dirent64 */ -struct dirent { - uint64_t d_ino; - int64_t d_off; - unsigned short d_reclen; - unsigned char d_type; - char d_name[256]; -}; - -extern int getdents(unsigned int, struct dirent *, unsigned int); - -__END_DECLS - -#endif /* _SYS_DIRENT_H_ */ diff --git a/libc/include/sys/endian.h b/libc/include/sys/endian.h deleted file mode 100644 index 00f48391e..000000000 --- a/libc/include/sys/endian.h +++ /dev/null @@ -1,273 +0,0 @@ -/* $OpenBSD: endian.h,v 1.17 2006/01/06 18:53:05 millert Exp $ */ - -/*- - * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Generic definitions for little- and big-endian systems. Other endianesses - * has to be dealt with in the specific machine/endian.h file for that port. - * - * This file is meant to be included from a little- or big-endian port's - * machine/endian.h after setting _BYTE_ORDER to either 1234 for little endian - * or 4321 for big.. - */ - -#ifndef _SYS_ENDIAN_H_ -#define _SYS_ENDIAN_H_ - -#include -#include - -#define _LITTLE_ENDIAN 1234 -#define _BIG_ENDIAN 4321 -#define _PDP_ENDIAN 3412 - -#if __BSD_VISIBLE -#define LITTLE_ENDIAN _LITTLE_ENDIAN -#define BIG_ENDIAN _BIG_ENDIAN -#define PDP_ENDIAN _PDP_ENDIAN -#define BYTE_ORDER _BYTE_ORDER -#endif - -#ifdef __GNUC__ - -#define __swap16gen(x) __statement({ \ - __uint16_t __swap16gen_x = (x); \ - \ - (__uint16_t)((__swap16gen_x & 0xff) << 8 | \ - (__swap16gen_x & 0xff00) >> 8); \ -}) - -#define __swap32gen(x) __statement({ \ - __uint32_t __swap32gen_x = (x); \ - \ - (__uint32_t)((__swap32gen_x & 0xff) << 24 | \ - (__swap32gen_x & 0xff00) << 8 | \ - (__swap32gen_x & 0xff0000) >> 8 | \ - (__swap32gen_x & 0xff000000) >> 24); \ -}) - -#define __swap64gen(x) __statement({ \ - __uint64_t __swap64gen_x = (x); \ - \ - (__uint64_t)((__swap64gen_x & 0xff) << 56 | \ - (__swap64gen_x & 0xff00ULL) << 40 | \ - (__swap64gen_x & 0xff0000ULL) << 24 | \ - (__swap64gen_x & 0xff000000ULL) << 8 | \ - (__swap64gen_x & 0xff00000000ULL) >> 8 | \ - (__swap64gen_x & 0xff0000000000ULL) >> 24 | \ - (__swap64gen_x & 0xff000000000000ULL) >> 40 | \ - (__swap64gen_x & 0xff00000000000000ULL) >> 56); \ -}) - -#else /* __GNUC__ */ - -/* Note that these macros evaluate their arguments several times. */ -#define __swap16gen(x) \ - (__uint16_t)(((__uint16_t)(x) & 0xff) << 8 | ((__uint16_t)(x) & 0xff00) >> 8) - -#define __swap32gen(x) \ - (__uint32_t)(((__uint32_t)(x) & 0xff) << 24 | \ - ((__uint32_t)(x) & 0xff00) << 8 | ((__uint32_t)(x) & 0xff0000) >> 8 |\ - ((__uint32_t)(x) & 0xff000000) >> 24) - -#define __swap64gen(x) \ - (__uint64_t)((((__uint64_t)(x) & 0xff) << 56) | \ - ((__uint64_t)(x) & 0xff00ULL) << 40 | \ - ((__uint64_t)(x) & 0xff0000ULL) << 24 | \ - ((__uint64_t)(x) & 0xff000000ULL) << 8 | \ - ((__uint64_t)(x) & 0xff00000000ULL) >> 8 | \ - ((__uint64_t)(x) & 0xff0000000000ULL) >> 24 | \ - ((__uint64_t)(x) & 0xff000000000000ULL) >> 40 | \ - ((__uint64_t)(x) & 0xff00000000000000ULL) >> 56) - -#endif /* __GNUC__ */ - -/* - * Define MD_SWAP if you provide swap{16,32}md functions/macros that are - * optimized for your architecture, These will be used for swap{16,32} - * unless the argument is a constant and we are using GCC, where we can - * take advantage of the CSE phase much better by using the generic version. - */ -#ifdef MD_SWAP -#if __GNUC__ - -#define __swap16(x) __statement({ \ - __uint16_t __swap16_x = (x); \ - \ - __builtin_constant_p(x) ? __swap16gen(__swap16_x) : \ - __swap16md(__swap16_x); \ -}) - -#define __swap32(x) __statement({ \ - __uint32_t __swap32_x = (x); \ - \ - __builtin_constant_p(x) ? __swap32gen(__swap32_x) : \ - __swap32md(__swap32_x); \ -}) - -#define __swap64(x) __statement({ \ - __uint64_t __swap64_x = (x); \ - \ - __builtin_constant_p(x) ? __swap64gen(__swap64_x) : \ - __swap64md(__swap64_x); \ -}) - -#endif /* __GNUC__ */ - -#else /* MD_SWAP */ -#define __swap16 __swap16gen -#define __swap32 __swap32gen -#define __swap64 __swap64gen -#endif /* MD_SWAP */ - -#define __swap16_multi(v, n) do { \ - __size_t __swap16_multi_n = (n); \ - __uint16_t *__swap16_multi_v = (v); \ - \ - while (__swap16_multi_n) { \ - *__swap16_multi_v = swap16(*__swap16_multi_v); \ - __swap16_multi_v++; \ - __swap16_multi_n--; \ - } \ -} while (0) - -#if __BSD_VISIBLE -#define swap16 __swap16 -#define swap32 __swap32 -#define swap64 __swap64 -#define swap16_multi __swap16_multi - -__BEGIN_DECLS -__uint64_t htobe64(__uint64_t); -__uint32_t htobe32(__uint32_t); -__uint16_t htobe16(__uint16_t); -__uint64_t betoh64(__uint64_t); -__uint32_t betoh32(__uint32_t); -__uint16_t betoh16(__uint16_t); - -__uint64_t htole64(__uint64_t); -__uint32_t htole32(__uint32_t); -__uint16_t htole16(__uint16_t); -__uint64_t letoh64(__uint64_t); -__uint32_t letoh32(__uint32_t); -__uint16_t letoh16(__uint16_t); -__END_DECLS -#endif /* __BSD_VISIBLE */ - -#if _BYTE_ORDER == _LITTLE_ENDIAN - -/* Can be overridden by machine/endian.h before inclusion of this file. */ -#ifndef _QUAD_HIGHWORD -#define _QUAD_HIGHWORD 1 -#endif -#ifndef _QUAD_LOWWORD -#define _QUAD_LOWWORD 0 -#endif - -#if __BSD_VISIBLE -#define htobe16 __swap16 -#define htobe32 __swap32 -#define htobe64 __swap64 -#define betoh16 __swap16 -#define betoh32 __swap32 -#define betoh64 __swap64 - -#define htole16(x) (x) -#define htole32(x) (x) -#define htole64(x) (x) -#define letoh16(x) (x) -#define letoh32(x) (x) -#define letoh64(x) (x) -#endif /* __BSD_VISIBLE */ - -#define htons(x) __swap16(x) -#define htonl(x) __swap32(x) -#define ntohs(x) __swap16(x) -#define ntohl(x) __swap32(x) - -/* Bionic additions */ -#define ntohq(x) __swap64(x) -#define htonq(x) __swap64(x) - -#define __LITTLE_ENDIAN_BITFIELD - -#endif /* _BYTE_ORDER */ - -#if _BYTE_ORDER == _BIG_ENDIAN - -/* Can be overridden by machine/endian.h before inclusion of this file. */ -#ifndef _QUAD_HIGHWORD -#define _QUAD_HIGHWORD 0 -#endif -#ifndef _QUAD_LOWWORD -#define _QUAD_LOWWORD 1 -#endif - -#if __BSD_VISIBLE -#define htole16 __swap16 -#define htole32 __swap32 -#define htole64 __swap64 -#define letoh16 __swap16 -#define letoh32 __swap32 -#define letoh64 __swap64 - -#define htobe16(x) (x) -#define htobe32(x) (x) -#define htobe64(x) (x) -#define betoh16(x) (x) -#define betoh32(x) (x) -#define betoh64(x) (x) -#endif /* __BSD_VISIBLE */ - -#define htons(x) (x) -#define htonl(x) (x) -#define ntohs(x) (x) -#define ntohl(x) (x) - -/* Bionic additions */ -#define ntohq(x) (x) -#define htonq(x) (x) - -#define __BIG_ENDIAN_BITFIELD - -#endif /* _BYTE_ORDER */ - -#if __BSD_VISIBLE -#define NTOHL(x) (x) = ntohl((u_int32_t)(x)) -#define NTOHS(x) (x) = ntohs((u_int16_t)(x)) -#define HTONL(x) (x) = htonl((u_int32_t)(x)) -#define HTONS(x) (x) = htons((u_int16_t)(x)) -#endif - - -#define __BYTE_ORDER _BYTE_ORDER -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN _LITTLE_ENDIAN -#endif -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN _BIG_ENDIAN -#endif - -#endif /* _SYS_ENDIAN_H_ */ diff --git a/libc/include/sys/epoll.h b/libc/include/sys/epoll.h deleted file mode 100644 index 1478caa6c..000000000 --- a/libc/include/sys/epoll.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_EPOLL_H_ -#define _SYS_EPOLL_H_ - -#define EPOLLIN 0x00000001 -#define EPOLLPRI 0x00000002 -#define EPOLLOUT 0x00000004 -#define EPOLLERR 0x00000008 -#define EPOLLHUP 0x00000010 -#define EPOLLRDNORM 0x00000040 -#define EPOLLRDBAND 0x00000080 -#define EPOLLWRNORM 0x00000100 -#define EPOLLWRBAND 0x00000200 -#define EPOLLMSG 0x00000400 -#define EPOLLET 0x80000000 - -#define EPOLL_CTL_ADD 1 -#define EPOLL_CTL_DEL 2 -#define EPOLL_CTL_MOD 3 - -typedef union epoll_data -{ - void *ptr; - int fd; - unsigned int u32; - unsigned long long u64; -} epoll_data_t; - -struct epoll_event -{ - unsigned int events; - epoll_data_t data; -}; - -int epoll_create(int size); -int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event); -int epoll_wait(int epfd, struct epoll_event *events, int max, int timeout); - -#endif /* _SYS_EPOLL_H_ */ - diff --git a/libc/include/sys/errno.h b/libc/include/sys/errno.h deleted file mode 100644 index 339f4fc10..000000000 --- a/libc/include/sys/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/sys/exec_elf.h b/libc/include/sys/exec_elf.h deleted file mode 100644 index f72f81e14..000000000 --- a/libc/include/sys/exec_elf.h +++ /dev/null @@ -1,625 +0,0 @@ -/* $OpenBSD: exec_elf.h,v 1.41 2006/01/06 18:53:05 millert Exp $ */ -/* - * Copyright (c) 1995, 1996 Erik Theisen. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * This is the ELF ABI header file - * formerly known as "elf_abi.h". - */ - -#ifndef _SYS_EXEC_ELF_H_ -#define _SYS_EXEC_ELF_H_ - -#include -#include - -typedef __uint8_t Elf_Byte; - -typedef __uint32_t Elf32_Addr; /* Unsigned program address */ -typedef __uint32_t Elf32_Off; /* Unsigned file offset */ -typedef __int32_t Elf32_Sword; /* Signed large integer */ -typedef __uint32_t Elf32_Word; /* Unsigned large integer */ -typedef __uint16_t Elf32_Half; /* Unsigned medium integer */ - -typedef __uint64_t Elf64_Addr; -typedef __uint64_t Elf64_Off; -typedef __int32_t Elf64_Shalf; - -#ifdef __alpha__ -typedef __int64_t Elf64_Sword; -typedef __uint64_t Elf64_Word; -#else -typedef __int32_t Elf64_Sword; -typedef __uint32_t Elf64_Word; -#endif - -typedef __int64_t Elf64_Sxword; -typedef __uint64_t Elf64_Xword; - -typedef __uint32_t Elf64_Half; -typedef __uint16_t Elf64_Quarter; - -/* - * e_ident[] identification indexes - * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html - */ -#define EI_MAG0 0 /* file ID */ -#define EI_MAG1 1 /* file ID */ -#define EI_MAG2 2 /* file ID */ -#define EI_MAG3 3 /* file ID */ -#define EI_CLASS 4 /* file class */ -#define EI_DATA 5 /* data encoding */ -#define EI_VERSION 6 /* ELF header version */ -#define EI_OSABI 7 /* OS/ABI ID */ -#define EI_ABIVERSION 8 /* ABI version */ -#define EI_PAD 9 /* start of pad bytes */ -#define EI_NIDENT 16 /* Size of e_ident[] */ - -/* e_ident[] magic number */ -#define ELFMAG0 0x7f /* e_ident[EI_MAG0] */ -#define ELFMAG1 'E' /* e_ident[EI_MAG1] */ -#define ELFMAG2 'L' /* e_ident[EI_MAG2] */ -#define ELFMAG3 'F' /* e_ident[EI_MAG3] */ -#define ELFMAG "\177ELF" /* magic */ -#define SELFMAG 4 /* size of magic */ - -/* e_ident[] file class */ -#define ELFCLASSNONE 0 /* invalid */ -#define ELFCLASS32 1 /* 32-bit objs */ -#define ELFCLASS64 2 /* 64-bit objs */ -#define ELFCLASSNUM 3 /* number of classes */ - -/* e_ident[] data encoding */ -#define ELFDATANONE 0 /* invalid */ -#define ELFDATA2LSB 1 /* Little-Endian */ -#define ELFDATA2MSB 2 /* Big-Endian */ -#define ELFDATANUM 3 /* number of data encode defines */ - -/* e_ident[] Operating System/ABI */ -#define ELFOSABI_SYSV 0 /* UNIX System V ABI */ -#define ELFOSABI_HPUX 1 /* HP-UX operating system */ -#define ELFOSABI_NETBSD 2 /* NetBSD */ -#define ELFOSABI_LINUX 3 /* GNU/Linux */ -#define ELFOSABI_HURD 4 /* GNU/Hurd */ -#define ELFOSABI_86OPEN 5 /* 86Open common IA32 ABI */ -#define ELFOSABI_SOLARIS 6 /* Solaris */ -#define ELFOSABI_MONTEREY 7 /* Monterey */ -#define ELFOSABI_IRIX 8 /* IRIX */ -#define ELFOSABI_FREEBSD 9 /* FreeBSD */ -#define ELFOSABI_TRU64 10 /* TRU64 UNIX */ -#define ELFOSABI_MODESTO 11 /* Novell Modesto */ -#define ELFOSABI_OPENBSD 12 /* OpenBSD */ -#define ELFOSABI_ARM 97 /* ARM */ -#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ - -/* e_ident */ -#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \ - (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \ - (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \ - (ehdr).e_ident[EI_MAG3] == ELFMAG3) - -/* ELF Header */ -typedef struct elfhdr { - unsigned char e_ident[EI_NIDENT]; /* ELF Identification */ - Elf32_Half e_type; /* object file type */ - Elf32_Half e_machine; /* machine */ - Elf32_Word e_version; /* object file version */ - Elf32_Addr e_entry; /* virtual entry point */ - Elf32_Off e_phoff; /* program header table offset */ - Elf32_Off e_shoff; /* section header table offset */ - Elf32_Word e_flags; /* processor-specific flags */ - Elf32_Half e_ehsize; /* ELF header size */ - Elf32_Half e_phentsize; /* program header entry size */ - Elf32_Half e_phnum; /* number of program header entries */ - Elf32_Half e_shentsize; /* section header entry size */ - Elf32_Half e_shnum; /* number of section header entries */ - Elf32_Half e_shstrndx; /* section header table's "section - header string table" entry offset */ -} Elf32_Ehdr; - -typedef struct { - unsigned char e_ident[EI_NIDENT]; /* Id bytes */ - Elf64_Quarter e_type; /* file type */ - Elf64_Quarter e_machine; /* machine type */ - Elf64_Half e_version; /* version number */ - Elf64_Addr e_entry; /* entry point */ - Elf64_Off e_phoff; /* Program hdr offset */ - Elf64_Off e_shoff; /* Section hdr offset */ - Elf64_Half e_flags; /* Processor flags */ - Elf64_Quarter e_ehsize; /* sizeof ehdr */ - Elf64_Quarter e_phentsize; /* Program header entry size */ - Elf64_Quarter e_phnum; /* Number of program headers */ - Elf64_Quarter e_shentsize; /* Section header entry size */ - Elf64_Quarter e_shnum; /* Number of section headers */ - Elf64_Quarter e_shstrndx; /* String table index */ -} Elf64_Ehdr; - -/* e_type */ -#define ET_NONE 0 /* No file type */ -#define ET_REL 1 /* relocatable file */ -#define ET_EXEC 2 /* executable file */ -#define ET_DYN 3 /* shared object file */ -#define ET_CORE 4 /* core file */ -#define ET_NUM 5 /* number of types */ -#define ET_LOPROC 0xff00 /* reserved range for processor */ -#define ET_HIPROC 0xffff /* specific e_type */ - -/* e_machine */ -#define EM_NONE 0 /* No Machine */ -#define EM_M32 1 /* AT&T WE 32100 */ -#define EM_SPARC 2 /* SPARC */ -#define EM_386 3 /* Intel 80386 */ -#define EM_68K 4 /* Motorola 68000 */ -#define EM_88K 5 /* Motorola 88000 */ -#define EM_486 6 /* Intel 80486 - unused? */ -#define EM_860 7 /* Intel 80860 */ -#define EM_MIPS 8 /* MIPS R3000 Big-Endian only */ -/* - * Don't know if EM_MIPS_RS4_BE, - * EM_SPARC64, EM_PARISC, - * or EM_PPC are ABI compliant - */ -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 Big-Endian */ -#define EM_SPARC64 11 /* SPARC v9 64-bit unoffical */ -#define EM_PARISC 15 /* HPPA */ -#define EM_SPARC32PLUS 18 /* Enhanced instruction set SPARC */ -#define EM_PPC 20 /* PowerPC */ -#define EM_ARM 40 /* Advanced RISC Machines ARM */ -#define EM_ALPHA 41 /* DEC ALPHA */ -#define EM_SPARCV9 43 /* SPARC version 9 */ -#define EM_ALPHA_EXP 0x9026 /* DEC ALPHA */ -#define EM_AMD64 62 /* AMD64 architecture */ -#define EM_VAX 75 /* DEC VAX */ -#define EM_NUM 15 /* number of machine types */ - -/* Version */ -#define EV_NONE 0 /* Invalid */ -#define EV_CURRENT 1 /* Current */ -#define EV_NUM 2 /* number of versions */ - -/* Section Header */ -typedef struct { - Elf32_Word sh_name; /* name - index into section header - string table section */ - Elf32_Word sh_type; /* type */ - Elf32_Word sh_flags; /* flags */ - Elf32_Addr sh_addr; /* address */ - Elf32_Off sh_offset; /* file offset */ - Elf32_Word sh_size; /* section size */ - Elf32_Word sh_link; /* section header table index link */ - Elf32_Word sh_info; /* extra information */ - Elf32_Word sh_addralign; /* address alignment */ - Elf32_Word sh_entsize; /* section entry size */ -} Elf32_Shdr; - -typedef struct { - Elf64_Half sh_name; /* section name */ - Elf64_Half sh_type; /* section type */ - Elf64_Xword sh_flags; /* section flags */ - Elf64_Addr sh_addr; /* virtual address */ - Elf64_Off sh_offset; /* file offset */ - Elf64_Xword sh_size; /* section size */ - Elf64_Half sh_link; /* link to another */ - Elf64_Half sh_info; /* misc info */ - Elf64_Xword sh_addralign; /* memory alignment */ - Elf64_Xword sh_entsize; /* table entry size */ -} Elf64_Shdr; - -/* Special Section Indexes */ -#define SHN_UNDEF 0 /* undefined */ -#define SHN_LORESERVE 0xff00 /* lower bounds of reserved indexes */ -#define SHN_LOPROC 0xff00 /* reserved range for processor */ -#define SHN_HIPROC 0xff1f /* specific section indexes */ -#define SHN_ABS 0xfff1 /* absolute value */ -#define SHN_COMMON 0xfff2 /* common symbol */ -#define SHN_HIRESERVE 0xffff /* upper bounds of reserved indexes */ - -/* sh_type */ -#define SHT_NULL 0 /* inactive */ -#define SHT_PROGBITS 1 /* program defined information */ -#define SHT_SYMTAB 2 /* symbol table section */ -#define SHT_STRTAB 3 /* string table section */ -#define SHT_RELA 4 /* relocation section with addends*/ -#define SHT_HASH 5 /* symbol hash table section */ -#define SHT_DYNAMIC 6 /* dynamic section */ -#define SHT_NOTE 7 /* note section */ -#define SHT_NOBITS 8 /* no space section */ -#define SHT_REL 9 /* relation section without addends */ -#define SHT_SHLIB 10 /* reserved - purpose unknown */ -#define SHT_DYNSYM 11 /* dynamic symbol table section */ -#define SHT_NUM 12 /* number of section types */ -#define SHT_LOPROC 0x70000000 /* reserved range for processor */ -#define SHT_HIPROC 0x7fffffff /* specific section header types */ -#define SHT_LOUSER 0x80000000 /* reserved range for application */ -#define SHT_HIUSER 0xffffffff /* specific indexes */ - -/* Section names */ -#define ELF_BSS ".bss" /* uninitialized data */ -#define ELF_DATA ".data" /* initialized data */ -#define ELF_DEBUG ".debug" /* debug */ -#define ELF_DYNAMIC ".dynamic" /* dynamic linking information */ -#define ELF_DYNSTR ".dynstr" /* dynamic string table */ -#define ELF_DYNSYM ".dynsym" /* dynamic symbol table */ -#define ELF_FINI ".fini" /* termination code */ -#define ELF_GOT ".got" /* global offset table */ -#define ELF_HASH ".hash" /* symbol hash table */ -#define ELF_INIT ".init" /* initialization code */ -#define ELF_REL_DATA ".rel.data" /* relocation data */ -#define ELF_REL_FINI ".rel.fini" /* relocation termination code */ -#define ELF_REL_INIT ".rel.init" /* relocation initialization code */ -#define ELF_REL_DYN ".rel.dyn" /* relocaltion dynamic link info */ -#define ELF_REL_RODATA ".rel.rodata" /* relocation read-only data */ -#define ELF_REL_TEXT ".rel.text" /* relocation code */ -#define ELF_RODATA ".rodata" /* read-only data */ -#define ELF_SHSTRTAB ".shstrtab" /* section header string table */ -#define ELF_STRTAB ".strtab" /* string table */ -#define ELF_SYMTAB ".symtab" /* symbol table */ -#define ELF_TEXT ".text" /* code */ - - -/* Section Attribute Flags - sh_flags */ -#define SHF_WRITE 0x1 /* Writable */ -#define SHF_ALLOC 0x2 /* occupies memory */ -#define SHF_EXECINSTR 0x4 /* executable */ -#define SHF_MASKPROC 0xf0000000 /* reserved bits for processor */ - /* specific section attributes */ - -/* Symbol Table Entry */ -typedef struct elf32_sym { - Elf32_Word st_name; /* name - index into string table */ - Elf32_Addr st_value; /* symbol value */ - Elf32_Word st_size; /* symbol size */ - unsigned char st_info; /* type and binding */ - unsigned char st_other; /* 0 - no defined meaning */ - Elf32_Half st_shndx; /* section header index */ -} Elf32_Sym; - -typedef struct { - Elf64_Half st_name; /* Symbol name index in str table */ - Elf_Byte st_info; /* type / binding attrs */ - Elf_Byte st_other; /* unused */ - Elf64_Quarter st_shndx; /* section index of symbol */ - Elf64_Xword st_value; /* value of symbol */ - Elf64_Xword st_size; /* size of symbol */ -} Elf64_Sym; - -/* Symbol table index */ -#define STN_UNDEF 0 /* undefined */ - -/* Extract symbol info - st_info */ -#define ELF32_ST_BIND(x) ((x) >> 4) -#define ELF32_ST_TYPE(x) (((unsigned int) x) & 0xf) -#define ELF32_ST_INFO(b,t) (((b) << 4) + ((t) & 0xf)) - -#define ELF64_ST_BIND(x) ((x) >> 4) -#define ELF64_ST_TYPE(x) (((unsigned int) x) & 0xf) -#define ELF64_ST_INFO(b,t) (((b) << 4) + ((t) & 0xf)) - -/* Symbol Binding - ELF32_ST_BIND - st_info */ -#define STB_LOCAL 0 /* Local symbol */ -#define STB_GLOBAL 1 /* Global symbol */ -#define STB_WEAK 2 /* like global - lower precedence */ -#define STB_NUM 3 /* number of symbol bindings */ -#define STB_LOPROC 13 /* reserved range for processor */ -#define STB_HIPROC 15 /* specific symbol bindings */ - -/* Symbol type - ELF32_ST_TYPE - st_info */ -#define STT_NOTYPE 0 /* not specified */ -#define STT_OBJECT 1 /* data object */ -#define STT_FUNC 2 /* function */ -#define STT_SECTION 3 /* section */ -#define STT_FILE 4 /* file */ -#define STT_NUM 5 /* number of symbol types */ -#define STT_LOPROC 13 /* reserved range for processor */ -#define STT_HIPROC 15 /* specific symbol types */ - -/* Relocation entry with implicit addend */ -typedef struct { - Elf32_Addr r_offset; /* offset of relocation */ - Elf32_Word r_info; /* symbol table index and type */ -} Elf32_Rel; - -/* Relocation entry with explicit addend */ -typedef struct { - Elf32_Addr r_offset; /* offset of relocation */ - Elf32_Word r_info; /* symbol table index and type */ - Elf32_Sword r_addend; -} Elf32_Rela; - -/* Extract relocation info - r_info */ -#define ELF32_R_SYM(i) ((i) >> 8) -#define ELF32_R_TYPE(i) ((unsigned char) (i)) -#define ELF32_R_INFO(s,t) (((s) << 8) + (unsigned char)(t)) - -typedef struct { - Elf64_Xword r_offset; /* where to do it */ - Elf64_Xword r_info; /* index & type of relocation */ -} Elf64_Rel; - -typedef struct { - Elf64_Xword r_offset; /* where to do it */ - Elf64_Xword r_info; /* index & type of relocation */ - Elf64_Sxword r_addend; /* adjustment value */ -} Elf64_Rela; - -#define ELF64_R_SYM(info) ((info) >> 32) -#define ELF64_R_TYPE(info) ((info) & 0xFFFFFFFF) -#define ELF64_R_INFO(s,t) (((s) << 32) + (__uint32_t)(t)) - -/* Program Header */ -typedef struct { - Elf32_Word p_type; /* segment type */ - Elf32_Off p_offset; /* segment offset */ - Elf32_Addr p_vaddr; /* virtual address of segment */ - Elf32_Addr p_paddr; /* physical address - ignored? */ - Elf32_Word p_filesz; /* number of bytes in file for seg. */ - Elf32_Word p_memsz; /* number of bytes in mem. for seg. */ - Elf32_Word p_flags; /* flags */ - Elf32_Word p_align; /* memory alignment */ -} Elf32_Phdr; - -typedef struct { - Elf64_Half p_type; /* entry type */ - Elf64_Half p_flags; /* flags */ - Elf64_Off p_offset; /* offset */ - Elf64_Addr p_vaddr; /* virtual address */ - Elf64_Addr p_paddr; /* physical address */ - Elf64_Xword p_filesz; /* file size */ - Elf64_Xword p_memsz; /* memory size */ - Elf64_Xword p_align; /* memory & file alignment */ -} Elf64_Phdr; - -/* Segment types - p_type */ -#define PT_NULL 0 /* unused */ -#define PT_LOAD 1 /* loadable segment */ -#define PT_DYNAMIC 2 /* dynamic linking section */ -#define PT_INTERP 3 /* the RTLD */ -#define PT_NOTE 4 /* auxiliary information */ -#define PT_SHLIB 5 /* reserved - purpose undefined */ -#define PT_PHDR 6 /* program header */ -#define PT_NUM 7 /* Number of segment types */ -#define PT_LOOS 0x60000000 /* reserved range for OS */ -#define PT_HIOS 0x6fffffff /* specific segment types */ -#define PT_LOPROC 0x70000000 /* reserved range for processor */ -#define PT_HIPROC 0x7fffffff /* specific segment types */ - -/* Segment flags - p_flags */ -#define PF_X 0x1 /* Executable */ -#define PF_W 0x2 /* Writable */ -#define PF_R 0x4 /* Readable */ -#define PF_MASKPROC 0xf0000000 /* reserved bits for processor */ - /* specific segment flags */ - -/* Dynamic structure */ -typedef struct { - Elf32_Sword d_tag; /* controls meaning of d_val */ - union { - Elf32_Word d_val; /* Multiple meanings - see d_tag */ - Elf32_Addr d_ptr; /* program virtual address */ - } d_un; -} Elf32_Dyn; - -typedef struct { - Elf64_Xword d_tag; /* controls meaning of d_val */ - union { - Elf64_Addr d_ptr; - Elf64_Xword d_val; - } d_un; -} Elf64_Dyn; - -/* Dynamic Array Tags - d_tag */ -#define DT_NULL 0 /* marks end of _DYNAMIC array */ -#define DT_NEEDED 1 /* string table offset of needed lib */ -#define DT_PLTRELSZ 2 /* size of relocation entries in PLT */ -#define DT_PLTGOT 3 /* address PLT/GOT */ -#define DT_HASH 4 /* address of symbol hash table */ -#define DT_STRTAB 5 /* address of string table */ -#define DT_SYMTAB 6 /* address of symbol table */ -#define DT_RELA 7 /* address of relocation table */ -#define DT_RELASZ 8 /* size of relocation table */ -#define DT_RELAENT 9 /* size of relocation entry */ -#define DT_STRSZ 10 /* size of string table */ -#define DT_SYMENT 11 /* size of symbol table entry */ -#define DT_INIT 12 /* address of initialization func. */ -#define DT_FINI 13 /* address of termination function */ -#define DT_SONAME 14 /* string table offset of shared obj */ -#define DT_RPATH 15 /* string table offset of library - search path */ -#define DT_SYMBOLIC 16 /* start sym search in shared obj. */ -#define DT_REL 17 /* address of rel. tbl. w addends */ -#define DT_RELSZ 18 /* size of DT_REL relocation table */ -#define DT_RELENT 19 /* size of DT_REL relocation entry */ -#define DT_PLTREL 20 /* PLT referenced relocation entry */ -#define DT_DEBUG 21 /* bugger */ -#define DT_TEXTREL 22 /* Allow rel. mod. to unwritable seg */ -#define DT_JMPREL 23 /* add. of PLT's relocation entries */ -#define DT_BIND_NOW 24 /* Bind now regardless of env setting */ -#define DT_NUM 25 /* Number used. */ -#define DT_LOPROC 0x70000000 /* reserved range for processor */ -#define DT_HIPROC 0x7fffffff /* specific dynamic array tags */ - -/* Standard ELF hashing function */ -unsigned int elf_hash(const unsigned char *name); - -/* - * Note Definitions - */ -typedef struct { - Elf32_Word namesz; - Elf32_Word descsz; - Elf32_Word type; -} Elf32_Note; - -typedef struct { - Elf64_Half namesz; - Elf64_Half descsz; - Elf64_Half type; -} Elf64_Note; - -/* - * XXX - these _KERNEL items aren't part of the ABI! - */ -#if defined(_KERNEL) || defined(_DYN_LOADER) - -#define ELF32_NO_ADDR ((u_long) ~0) /* Indicates addr. not yet filled in */ -#define ELF_AUX_ENTRIES 8 /* Size of aux array passed to loader */ - -typedef struct { - Elf32_Sword au_id; /* 32-bit id */ - Elf32_Word au_v; /* 32-bit value */ -} Aux32Info; - -#define ELF64_NO_ADDR ((__uint64_t) ~0)/* Indicates addr. not yet filled in */ -#define ELF64_AUX_ENTRIES 8 /* Size of aux array passed to loader */ - -typedef struct { - Elf64_Shalf au_id; /* 32-bit id */ - Elf64_Xword au_v; /* 64-bit id */ -} Aux64Info; - -enum AuxID { - AUX_null = 0, - AUX_ignore = 1, - AUX_execfd = 2, - AUX_phdr = 3, /* &phdr[0] */ - AUX_phent = 4, /* sizeof(phdr[0]) */ - AUX_phnum = 5, /* # phdr entries */ - AUX_pagesz = 6, /* PAGESIZE */ - AUX_base = 7, /* ld.so base addr */ - AUX_flags = 8, /* processor flags */ - AUX_entry = 9, /* a.out entry */ - AUX_sun_uid = 2000, /* euid */ - AUX_sun_ruid = 2001, /* ruid */ - AUX_sun_gid = 2002, /* egid */ - AUX_sun_rgid = 2003 /* rgid */ -}; - -struct elf_args { - u_long arg_entry; /* program entry point */ - u_long arg_interp; /* Interpreter load address */ - u_long arg_phaddr; /* program header address */ - u_long arg_phentsize; /* Size of program header */ - u_long arg_phnum; /* Number of program headers */ - u_long arg_os; /* OS tag */ -}; - -#endif - -#if !defined(ELFSIZE) && defined(ARCH_ELFSIZE) -#define ELFSIZE ARCH_ELFSIZE -#endif - -#if defined(ELFSIZE) -#define CONCAT(x,y) __CONCAT(x,y) -#define ELFNAME(x) CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x))) -#define ELFNAME2(x,y) CONCAT(x,CONCAT(_elf,CONCAT(ELFSIZE,CONCAT(_,y)))) -#define ELFNAMEEND(x) CONCAT(x,CONCAT(_elf,ELFSIZE)) -#define ELFDEFNNAME(x) CONCAT(ELF,CONCAT(ELFSIZE,CONCAT(_,x))) -#endif - -#if defined(ELFSIZE) && (ELFSIZE == 32) -#define Elf_Ehdr Elf32_Ehdr -#define Elf_Phdr Elf32_Phdr -#define Elf_Shdr Elf32_Shdr -#define Elf_Sym Elf32_Sym -#define Elf_Rel Elf32_Rel -#define Elf_RelA Elf32_Rela -#define Elf_Dyn Elf32_Dyn -#define Elf_Half Elf32_Half -#define Elf_Word Elf32_Word -#define Elf_Sword Elf32_Sword -#define Elf_Addr Elf32_Addr -#define Elf_Off Elf32_Off -#define Elf_Nhdr Elf32_Nhdr -#define Elf_Note Elf32_Note - -#define ELF_R_SYM ELF32_R_SYM -#define ELF_R_TYPE ELF32_R_TYPE -#define ELF_R_INFO ELF32_R_INFO -#define ELFCLASS ELFCLASS32 - -#define ELF_ST_BIND ELF32_ST_BIND -#define ELF_ST_TYPE ELF32_ST_TYPE -#define ELF_ST_INFO ELF32_ST_INFO - -#define AuxInfo Aux32Info -#elif defined(ELFSIZE) && (ELFSIZE == 64) -#define Elf_Ehdr Elf64_Ehdr -#define Elf_Phdr Elf64_Phdr -#define Elf_Shdr Elf64_Shdr -#define Elf_Sym Elf64_Sym -#define Elf_Rel Elf64_Rel -#define Elf_RelA Elf64_Rela -#define Elf_Dyn Elf64_Dyn -#define Elf_Half Elf64_Half -#define Elf_Word Elf64_Word -#define Elf_Sword Elf64_Sword -#define Elf_Addr Elf64_Addr -#define Elf_Off Elf64_Off -#define Elf_Nhdr Elf64_Nhdr -#define Elf_Note Elf64_Note - -#define ELF_R_SYM ELF64_R_SYM -#define ELF_R_TYPE ELF64_R_TYPE -#define ELF_R_INFO ELF64_R_INFO -#define ELFCLASS ELFCLASS64 - -#define ELF_ST_BIND ELF64_ST_BIND -#define ELF_ST_TYPE ELF64_ST_TYPE -#define ELF_ST_INFO ELF64_ST_INFO - -#define AuxInfo Aux64Info -#endif - -#ifndef _KERNEL -extern Elf_Dyn _DYNAMIC[]; -#endif - -#ifdef _KERNEL -#ifdef _KERN_DO_ELF64 -int exec_elf64_makecmds(struct proc *, struct exec_package *); -void *elf64_copyargs(struct exec_package *, struct ps_strings *, - void *, void *); -int exec_elf64_fixup(struct proc *, struct exec_package *); -char *elf64_check_brand(Elf64_Ehdr *); -int elf64_os_pt_note(struct proc *, struct exec_package *, Elf64_Ehdr *, - char *, size_t, size_t); -#endif -#ifdef _KERN_DO_ELF -int exec_elf32_makecmds(struct proc *, struct exec_package *); -void *elf32_copyargs(struct exec_package *, struct ps_strings *, - void *, void *); -int exec_elf32_fixup(struct proc *, struct exec_package *); -char *elf32_check_brand(Elf32_Ehdr *); -int elf32_os_pt_note(struct proc *, struct exec_package *, Elf32_Ehdr *, - char *, size_t, size_t); -#endif - -#endif /* _KERNEL */ - -#define ELF_TARG_VER 1 /* The ver for which this code is intended */ - -#endif /* _SYS_EXEC_ELF_H_ */ diff --git a/libc/include/sys/file.h b/libc/include/sys/file.h deleted file mode 100644 index 06937ffaa..000000000 --- a/libc/include/sys/file.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_FILE_H_ -#define _SYS_FILE_H_ - -#include -#include - -// ANDROID: needed for flock() -#include -#include - -#endif /* _SYS_FILE_H_ */ diff --git a/libc/include/sys/fsuid.h b/libc/include/sys/fsuid.h deleted file mode 100644 index 3257bc0be..000000000 --- a/libc/include/sys/fsuid.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_FSUID_H_ -#define _SYS_FSUID_H_ - -#include -#include - -__BEGIN_DECLS - -extern int setfsuid(uid_t); -extern int setfsgid(gid_t); - -__END_DECLS - -#endif /* _SYS_FSUID_H_ */ diff --git a/libc/include/sys/inotify.h b/libc/include/sys/inotify.h deleted file mode 100644 index 33f9e7422..000000000 --- a/libc/include/sys/inotify.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_INOTIFY_H_ -#define _SYS_INOTIFY_H_ - -#include -#include -#include - -__BEGIN_DECLS - -extern int inotify_init(void); -extern int inotify_add_watch(int, const char *, __u32); -extern int inotify_rm_watch(int, __u32); - -__END_DECLS - -#endif /* _SYS_INOTIFY_H_ */ diff --git a/libc/include/sys/ioctl.h b/libc/include/sys/ioctl.h deleted file mode 100644 index 9f685100e..000000000 --- a/libc/include/sys/ioctl.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_IOCTL_H_ -#define _SYS_IOCTL_H_ - -#include -#include -#include -#include -#include - -__BEGIN_DECLS - -extern int ioctl(int, int, ...); - -__END_DECLS - -#endif /* _SYS_IOCTL_H_ */ diff --git a/libc/include/sys/ioctl_compat.h b/libc/include/sys/ioctl_compat.h deleted file mode 100644 index d79b67adb..000000000 --- a/libc/include/sys/ioctl_compat.h +++ /dev/null @@ -1,168 +0,0 @@ -/* $NetBSD: ioctl_compat.h,v 1.15 2005/12/03 17:10:46 christos Exp $ */ - -/* - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ioctl_compat.h 8.4 (Berkeley) 1/21/94 - */ - -#ifndef _SYS_IOCTL_COMPAT_H_ -#define _SYS_IOCTL_COMPAT_H_ - -//#include -//#include - -struct tchars { - char t_intrc; /* interrupt */ - char t_quitc; /* quit */ - char t_startc; /* start output */ - char t_stopc; /* stop output */ - char t_eofc; /* end-of-file */ - char t_brkc; /* input delimiter (like nl) */ -}; - -struct ltchars { - char t_suspc; /* stop process signal */ - char t_dsuspc; /* delayed stop process signal */ - char t_rprntc; /* reprint line */ - char t_flushc; /* flush output (toggles) */ - char t_werasc; /* word erase */ - char t_lnextc; /* literal next character */ -}; - -/* - * Structure for TIOCGETP and TIOCSETP ioctls. - */ -#ifndef _SGTTYB_ -#define _SGTTYB_ -struct sgttyb { - char sg_ispeed; /* input speed */ - char sg_ospeed; /* output speed */ - char sg_erase; /* erase character */ - char sg_kill; /* kill character */ - short sg_flags; /* mode flags */ -}; -#endif - -#ifdef USE_OLD_TTY -# undef TIOCGETD -# define TIOCGETD _IOR('t', 0, int) /* get line discipline */ -# undef TIOCSETD -# define TIOCSETD _IOW('t', 1, int) /* set line discipline */ -#else -# define OTIOCGETD _IOR('t', 0, int) /* get line discipline */ -# define OTIOCSETD _IOW('t', 1, int) /* set line discipline */ -#endif -#define TIOCHPCL _IO('t', 2) /* hang up on last close */ -#define TIOCGETP _IOR('t', 8,struct sgttyb)/* get parameters -- gtty */ -#define TIOCSETP _IOW('t', 9,struct sgttyb)/* set parameters -- stty */ -#define TIOCSETN _IOW('t',10,struct sgttyb)/* as above, but no flushtty*/ -#define TIOCSETC _IOW('t',17,struct tchars)/* set special characters */ -#define TIOCGETC _IOR('t',18,struct tchars)/* get special characters */ -#if 0 -/* BUG: a bunch of these conflict with #defines in asm/termbits.h */ -#define TANDEM 0x00000001 /* send stopc on out q full */ -#define CBREAK 0x00000002 /* half-cooked mode */ -#define LCASE 0x00000004 /* simulate lower case */ -#define ECHO 0x00000008 /* enable echoing */ -#define CRMOD 0x00000010 /* map \r to \r\n on output */ -#define RAW 0x00000020 /* no i/o processing */ -#define ODDP 0x00000040 /* get/send odd parity */ -#define EVENP 0x00000080 /* get/send even parity */ -#define ANYP 0x000000c0 /* get any parity/send none */ -#define NLDELAY 0x00000300 /* \n delay */ -#define NL0 0x00000000 -#define NL1 0x00000100 /* tty 37 */ -#define NL2 0x00000200 /* vt05 */ -#define NL3 0x00000300 -#define TBDELAY 0x00000c00 /* horizontal tab delay */ -#define TAB0 0x00000000 -#define TAB1 0x00000400 /* tty 37 */ -#define TAB2 0x00000800 -#define XTABS 0x00000c00 /* expand tabs on output */ -#define CRDELAY 0x00003000 /* \r delay */ -#define CR0 0x00000000 -#define CR1 0x00001000 /* tn 300 */ -#define CR2 0x00002000 /* tty 37 */ -#define CR3 0x00003000 /* concept 100 */ -#define VTDELAY 0x00004000 /* vertical tab delay */ -#define FF0 0x00000000 -#define FF1 0x00004000 /* tty 37 */ -#define BSDELAY 0x00008000 /* \b delay */ -#define BS0 0x00000000 -#define BS1 0x00008000 -#define ALLDELAY (NLDELAY|TBDELAY|CRDELAY|VTDELAY|BSDELAY) -#define CRTBS 0x00010000 /* do backspacing for crt */ -#define PRTERA 0x00020000 /* \ ... / erase */ -#define CRTERA 0x00040000 /* " \b " to wipe out char */ -#define TILDE 0x00080000 /* hazeltine tilde kludge */ -#define MDMBUF 0x00100000 /* DTR/DCD hardware flow control */ -#define LITOUT 0x00200000 /* literal output */ -#define TOSTOP 0x00400000 /* stop background jobs on output */ -#define FLUSHO 0x00800000 /* output being flushed (state) */ -#define NOHANG 0x01000000 /* (no-op) was no SIGHUP on carrier drop */ -#define L001000 0x02000000 -#define CRTKIL 0x04000000 /* kill line with " \b " */ -#define PASS8 0x08000000 -#define CTLECH 0x10000000 /* echo control chars as ^X */ -#define PENDIN 0x20000000 /* re-echo input buffer at next read */ -#define DECCTQ 0x40000000 /* only ^Q starts after ^S */ -#define NOFLSH 0x80000000 /* don't flush output on signal */ -#endif -#define TIOCLBIS _IOW('t', 127, int) /* bis local mode bits */ -#define TIOCLBIC _IOW('t', 126, int) /* bic local mode bits */ -#define TIOCLSET _IOW('t', 125, int) /* set entire local mode word */ -#define TIOCLGET _IOR('t', 124, int) /* get local modes */ -#define LCRTBS (CRTBS>>16) -#define LPRTERA (PRTERA>>16) -#define LCRTERA (CRTERA>>16) -#define LTILDE (TILDE>>16) -#define LMDMBUF (MDMBUF>>16) -#define LLITOUT (LITOUT>>16) -#define LTOSTOP (TOSTOP>>16) -#define LFLUSHO (FLUSHO>>16) -#define LNOHANG (NOHANG>>16) -#define LCRTKIL (CRTKIL>>16) -#define LPASS8 (PASS8>>16) -#define LCTLECH (CTLECH>>16) -#define LPENDIN (PENDIN>>16) -#define LDECCTQ (DECCTQ>>16) -#define LNOFLSH (NOFLSH>>16) -#define TIOCSLTC _IOW('t',117,struct ltchars)/* set local special chars*/ -#define TIOCGLTC _IOR('t',116,struct ltchars)/* get local special chars*/ -#define OTIOCCONS _IO('t', 98) /* for hp300 -- sans int arg */ -#define OTTYDISC 0 -#define NETLDISC 1 -#define NTTYDISC 2 - -#endif /* !_SYS_IOCTL_COMPAT_H_ */ diff --git a/libc/include/sys/ipc.h b/libc/include/sys/ipc.h deleted file mode 100644 index c0ae0bac4..000000000 --- a/libc/include/sys/ipc.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_IPC_H -#define _SYS_IPC_H - -#include -#include -#include - -__BEGIN_DECLS - -extern key_t ftok(const char* path, int id); - -__END_DECLS - -#endif /* _SYS_IPC_H */ diff --git a/libc/include/sys/klog.h b/libc/include/sys/klog.h deleted file mode 100644 index 21bb7d9d9..000000000 --- a/libc/include/sys/klog.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_KLOG_H_ -#define _SYS_KLOG_H_ - -#include - -__BEGIN_DECLS - -#define KLOG_CLOSE 0 -#define KLOG_OPEN 1 -#define KLOG_READ 2 -#define KLOG_READ_ALL 3 -#define KLOG_READ_CLEAR 4 -#define KLOG_CLEAR 5 -#define KLOG_DISABLE 6 -#define KLOG_ENABLE 7 -#define KLOG_SETLEVEL 8 -#define KLOG_UNREADSIZE 9 -#define KLOG_WRITE 10 - -extern int klogctl(int, char *, int); - -__END_DECLS - -#endif /* _SYS_KLOG_H_ */ diff --git a/libc/include/sys/limits.h b/libc/include/sys/limits.h deleted file mode 100644 index 41d02ff3c..000000000 --- a/libc/include/sys/limits.h +++ /dev/null @@ -1,179 +0,0 @@ -/* $OpenBSD: limits.h,v 1.6 2005/12/13 00:35:23 millert Exp $ */ -/* - * Copyright (c) 2002 Marc Espie. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OPENBSD - * PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#ifndef _SYS_LIMITS_H_ -#define _SYS_LIMITS_H_ - -#include -#include - -/* Common definitions for limits.h. */ - -/* - * is meant to describe a specific architecture, - * but to be a safe include, that doesn't ever define anything that is - * user-visible (only typedefs and #define names that stays in the __xxx - * namespace). - * - * __machine_has_unsigned_chars (default is signed chars) - * __FLT_xxx/__DBL_xxx non standard values for floating - * points limits. - */ -#include - -/* Legacy */ -#include - -#define CHAR_BIT 8 /* number of bits in a char */ - -#define SCHAR_MAX 0x7f /* max value for a signed char */ -#define SCHAR_MIN (-0x7f-1) /* min value for a signed char */ - -#define UCHAR_MAX 0xffU /* max value for an unsigned char */ -#ifdef __machine_has_unsigned_chars -# define CHAR_MIN 0 /* min value for a char */ -# define CHAR_MAX 0xff /* max value for a char */ -#else -# define CHAR_MAX 0x7f -# define CHAR_MIN (-0x7f-1) -#endif - -#define USHRT_MAX 0xffffU /* max value for an unsigned short */ -#define SHRT_MAX 0x7fff /* max value for a short */ -#define SHRT_MIN (-0x7fff-1) /* min value for a short */ - -#define UINT_MAX 0xffffffffU /* max value for an unsigned int */ -#define INT_MAX 0x7fffffff /* max value for an int */ -#define INT_MIN (-0x7fffffff-1) /* min value for an int */ - -#ifdef __LP64__ -# define ULONG_MAX 0xffffffffffffffffUL - /* max value for unsigned long */ -# define LONG_MAX 0x7fffffffffffffffL - /* max value for a signed long */ -# define LONG_MIN (-0x7fffffffffffffffL-1) - /* min value for a signed long */ -#else -# define ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ -# define LONG_MAX 0x7fffffffL /* max value for a long */ -# define LONG_MIN (-0x7fffffffL-1)/* min value for a long */ -#endif - -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 -# define ULLONG_MAX 0xffffffffffffffffULL - /* max value for unsigned long long */ -# define LLONG_MAX 0x7fffffffffffffffLL - /* max value for a signed long long */ -# define LLONG_MIN (-0x7fffffffffffffffLL-1) - /* min value for a signed long long */ -#endif - -#if __BSD_VISIBLE -# define UID_MAX UINT_MAX /* max value for a uid_t */ -# define GID_MAX UINT_MAX /* max value for a gid_t */ -#endif - - -#ifdef __LP64__ -# define LONG_BIT 64 -#else -# define LONG_BIT 32 -#endif - -/* float.h defines these as well */ -# if !defined(DBL_DIG) -# if defined(__DBL_DIG) -# define DBL_DIG __DBL_DIG -# define DBL_MAX __DBL_MAX -# define DBL_MIN __DBL_MIN - -# define FLT_DIG __FLT_DIG -# define FLT_MAX __FLT_MAX -# define FLT_MIN __FLT_MIN -# else -# define DBL_DIG 15 -# define DBL_MAX 1.7976931348623157E+308 -# define DBL_MIN 2.2250738585072014E-308 - -# define FLT_DIG 6 -# define FLT_MAX 3.40282347E+38F -# define FLT_MIN 1.17549435E-38F -# endif -# endif - -/* Bionic: the following has been optimized out from our processed kernel headers */ - -#define CHILD_MAX 999 -#define OPEN_MAX 256 - -/* Bionic-specific definitions */ - -#define _POSIX_VERSION 200112L /* Posix C language bindings version */ -#define _POSIX2_VERSION -1 /* we don't support Posix command-line tools */ -#define _POSIX2_C_VERSION _POSIX_VERSION -#define _XOPEN_VERSION 500 /* by Posix definition */ -#define _XOPEN_XCU_VERSION -1 /* we don't support command-line utilities */ - -/* tell what we implement legacy stuff when appropriate */ -#if _POSIX_VERSION > 0 -#define _XOPEN_XPG2 1 -#define _XOPEN_XPG3 1 -#define _XOPEN_XPG4 1 -#define _XOPEN_UNIX 1 -#endif - -#define _XOPEN_ENH_I18N -1 /* we don't support internationalization in the C library */ -#define _XOPEN_CRYPT -1 /* don't support X/Open Encryption */ -#define _XOPEN_LEGACY -1 /* don't claim we support these, we have some of them but not all */ -#define _XOPEN_REALTIME -1 /* we don't support all these functions */ -#define _XOPEN_REALTIME_THREADS -1 /* same here */ - -#define _POSIX_REALTIME_SIGNALS -1 /* for now, this is not supported */ -#define _POSIX_PRIORITY_SCHEDULING 1 /* priority scheduling is a Linux feature */ -#define _POSIX_TIMERS 1 /* Posix timers are supported */ -#undef _POSIX_ASYNCHRONOUS_IO /* aio_ functions are not supported */ -#define _POSIX_SYNCHRONIZED_IO 1 /* synchronized i/o supported */ -#define _POSIX_FSYNC 1 /* fdatasync() supported */ -#define _POSIX_MAPPED_FILES 1 /* mmap-ed files supported */ - -/* XXX: TODO: complete and check list here */ - - -#define _POSIX_THREADS 1 /* we support threads */ -#define _POSIX_THREAD_STACKADDR 1 /* we support thread stack address */ -#define _POSIX_THREAD_STACKSIZE 1 /* we support thread stack size */ -#define _POSIX_THREAD_PRIO_INHERIT 200112L /* linux feature */ -#define _POSIX_THREAD_PRIO_PROTECT 200112L /* linux feature */ - -#undef _POSIX_PROCESS_SHARED /* we don't support process-shared synchronization */ -#undef _POSIX_THREAD_SAFE_FUNCTIONS /* most functions are, but not everything yet */ -#define _POSIX_CHOWN_RESTRICTED 1 /* yes, chown requires appropriate priviledges */ -#define _POSIX_NO_TRUNC 1 /* very long pathnames generate an error */ -#define _POSIX_SAVED_IDS 1 /* saved user ids is a Linux feature */ -#define _POSIX_JOB_CONTROL 1 /* job control is a Linux feature */ - - - -#endif diff --git a/libc/include/sys/linux-syscalls.h b/libc/include/sys/linux-syscalls.h deleted file mode 100644 index 7772f1ec2..000000000 --- a/libc/include/sys/linux-syscalls.h +++ /dev/null @@ -1,223 +0,0 @@ -/* auto-generated by gensyscalls.py, do not touch */ -#ifndef _BIONIC_LINUX_SYSCALLS_H_ - -#if !defined __ASM_ARM_UNISTD_H && !defined __ASM_I386_UNISTD_H -#if defined __arm__ && !defined __ARM_EABI__ && !defined __thumb__ - # define __NR_SYSCALL_BASE 0x900000 - #else - # define __NR_SYSCALL_BASE 0 - #endif - -#define __NR_exit (__NR_SYSCALL_BASE + 1) -#define __NR_fork (__NR_SYSCALL_BASE + 2) -#define __NR_clone (__NR_SYSCALL_BASE + 120) -#define __NR_execve (__NR_SYSCALL_BASE + 11) -#define __NR_setuid32 (__NR_SYSCALL_BASE + 213) -#define __NR_getuid32 (__NR_SYSCALL_BASE + 199) -#define __NR_getgid32 (__NR_SYSCALL_BASE + 200) -#define __NR_geteuid32 (__NR_SYSCALL_BASE + 201) -#define __NR_getegid32 (__NR_SYSCALL_BASE + 202) -#define __NR_getresuid32 (__NR_SYSCALL_BASE + 209) -#define __NR_getresgid32 (__NR_SYSCALL_BASE + 211) -#define __NR_gettid (__NR_SYSCALL_BASE + 224) -#define __NR_getgroups32 (__NR_SYSCALL_BASE + 205) -#define __NR_getpgid (__NR_SYSCALL_BASE + 132) -#define __NR_getppid (__NR_SYSCALL_BASE + 64) -#define __NR_setsid (__NR_SYSCALL_BASE + 66) -#define __NR_setgid32 (__NR_SYSCALL_BASE + 214) -#define __NR_setreuid32 (__NR_SYSCALL_BASE + 203) -#define __NR_setresuid32 (__NR_SYSCALL_BASE + 208) -#define __NR_setresgid32 (__NR_SYSCALL_BASE + 210) -#define __NR_brk (__NR_SYSCALL_BASE + 45) -#define __NR_ptrace (__NR_SYSCALL_BASE + 26) -#define __NR_getpriority (__NR_SYSCALL_BASE + 96) -#define __NR_setpriority (__NR_SYSCALL_BASE + 97) -#define __NR_setrlimit (__NR_SYSCALL_BASE + 75) -#define __NR_ugetrlimit (__NR_SYSCALL_BASE + 191) -#define __NR_getrusage (__NR_SYSCALL_BASE + 77) -#define __NR_setgroups32 (__NR_SYSCALL_BASE + 206) -#define __NR_setpgid (__NR_SYSCALL_BASE + 57) -#define __NR_setregid32 (__NR_SYSCALL_BASE + 204) -#define __NR_chroot (__NR_SYSCALL_BASE + 61) -#define __NR_prctl (__NR_SYSCALL_BASE + 172) -#define __NR_capget (__NR_SYSCALL_BASE + 184) -#define __NR_capset (__NR_SYSCALL_BASE + 185) -#define __NR_acct (__NR_SYSCALL_BASE + 51) -#define __NR_read (__NR_SYSCALL_BASE + 3) -#define __NR_write (__NR_SYSCALL_BASE + 4) -#define __NR_pread64 (__NR_SYSCALL_BASE + 180) -#define __NR_pwrite64 (__NR_SYSCALL_BASE + 181) -#define __NR_open (__NR_SYSCALL_BASE + 5) -#define __NR_close (__NR_SYSCALL_BASE + 6) -#define __NR_lseek (__NR_SYSCALL_BASE + 19) -#define __NR__llseek (__NR_SYSCALL_BASE + 140) -#define __NR_getpid (__NR_SYSCALL_BASE + 20) -#define __NR_mmap2 (__NR_SYSCALL_BASE + 192) -#define __NR_munmap (__NR_SYSCALL_BASE + 91) -#define __NR_mremap (__NR_SYSCALL_BASE + 163) -#define __NR_msync (__NR_SYSCALL_BASE + 144) -#define __NR_mprotect (__NR_SYSCALL_BASE + 125) -#define __NR_mlock (__NR_SYSCALL_BASE + 150) -#define __NR_munlock (__NR_SYSCALL_BASE + 151) -#define __NR_ioctl (__NR_SYSCALL_BASE + 54) -#define __NR_readv (__NR_SYSCALL_BASE + 145) -#define __NR_writev (__NR_SYSCALL_BASE + 146) -#define __NR_fcntl (__NR_SYSCALL_BASE + 55) -#define __NR_flock (__NR_SYSCALL_BASE + 143) -#define __NR_fchmod (__NR_SYSCALL_BASE + 94) -#define __NR_dup (__NR_SYSCALL_BASE + 41) -#define __NR_pipe (__NR_SYSCALL_BASE + 42) -#define __NR_dup2 (__NR_SYSCALL_BASE + 63) -#define __NR__newselect (__NR_SYSCALL_BASE + 142) -#define __NR_ftruncate (__NR_SYSCALL_BASE + 93) -#define __NR_fsync (__NR_SYSCALL_BASE + 118) -#define __NR_fchown32 (__NR_SYSCALL_BASE + 207) -#define __NR_sync (__NR_SYSCALL_BASE + 36) -#define __NR_fcntl64 (__NR_SYSCALL_BASE + 221) -#define __NR_sendfile (__NR_SYSCALL_BASE + 187) -#define __NR_link (__NR_SYSCALL_BASE + 9) -#define __NR_unlink (__NR_SYSCALL_BASE + 10) -#define __NR_chdir (__NR_SYSCALL_BASE + 12) -#define __NR_mknod (__NR_SYSCALL_BASE + 14) -#define __NR_chmod (__NR_SYSCALL_BASE + 15) -#define __NR_chown32 (__NR_SYSCALL_BASE + 212) -#define __NR_lchown32 (__NR_SYSCALL_BASE + 198) -#define __NR_mount (__NR_SYSCALL_BASE + 21) -#define __NR_umount2 (__NR_SYSCALL_BASE + 52) -#define __NR_fstat64 (__NR_SYSCALL_BASE + 197) -#define __NR_stat64 (__NR_SYSCALL_BASE + 195) -#define __NR_lstat64 (__NR_SYSCALL_BASE + 196) -#define __NR_mkdir (__NR_SYSCALL_BASE + 39) -#define __NR_readlink (__NR_SYSCALL_BASE + 85) -#define __NR_rmdir (__NR_SYSCALL_BASE + 40) -#define __NR_rename (__NR_SYSCALL_BASE + 38) -#define __NR_getcwd (__NR_SYSCALL_BASE + 183) -#define __NR_access (__NR_SYSCALL_BASE + 33) -#define __NR_symlink (__NR_SYSCALL_BASE + 83) -#define __NR_fchdir (__NR_SYSCALL_BASE + 133) -#define __NR_truncate (__NR_SYSCALL_BASE + 92) -#define __NR_pause (__NR_SYSCALL_BASE + 29) -#define __NR_gettimeofday (__NR_SYSCALL_BASE + 78) -#define __NR_settimeofday (__NR_SYSCALL_BASE + 79) -#define __NR_times (__NR_SYSCALL_BASE + 43) -#define __NR_nanosleep (__NR_SYSCALL_BASE + 162) -#define __NR_getitimer (__NR_SYSCALL_BASE + 105) -#define __NR_setitimer (__NR_SYSCALL_BASE + 104) -#define __NR_sigaction (__NR_SYSCALL_BASE + 67) -#define __NR_sigprocmask (__NR_SYSCALL_BASE + 126) -#define __NR_sigsuspend (__NR_SYSCALL_BASE + 72) -#define __NR_rt_sigaction (__NR_SYSCALL_BASE + 174) -#define __NR_rt_sigprocmask (__NR_SYSCALL_BASE + 175) -#define __NR_rt_sigtimedwait (__NR_SYSCALL_BASE + 177) -#define __NR_sigpending (__NR_SYSCALL_BASE + 73) -#define __NR_sched_setscheduler (__NR_SYSCALL_BASE + 156) -#define __NR_sched_getscheduler (__NR_SYSCALL_BASE + 157) -#define __NR_sched_yield (__NR_SYSCALL_BASE + 158) -#define __NR_sched_setparam (__NR_SYSCALL_BASE + 154) -#define __NR_sched_getparam (__NR_SYSCALL_BASE + 155) -#define __NR_sched_get_priority_max (__NR_SYSCALL_BASE + 159) -#define __NR_sched_get_priority_min (__NR_SYSCALL_BASE + 160) -#define __NR_sched_rr_get_interval (__NR_SYSCALL_BASE + 161) -#define __NR_uname (__NR_SYSCALL_BASE + 122) -#define __NR_wait4 (__NR_SYSCALL_BASE + 114) -#define __NR_umask (__NR_SYSCALL_BASE + 60) -#define __NR_reboot (__NR_SYSCALL_BASE + 88) -#define __NR_syslog (__NR_SYSCALL_BASE + 103) -#define __NR_init_module (__NR_SYSCALL_BASE + 128) -#define __NR_delete_module (__NR_SYSCALL_BASE + 129) -#define __NR_syslog (__NR_SYSCALL_BASE + 103) -#define __NR_futex (__NR_SYSCALL_BASE + 240) -#define __NR_poll (__NR_SYSCALL_BASE + 168) - -#ifdef __arm__ -#define __NR_exit_group (__NR_SYSCALL_BASE + 248) -#define __NR_waitid (__NR_SYSCALL_BASE + 280) -#define __NR_vfork (__NR_SYSCALL_BASE + 190) -#define __NR_openat (__NR_SYSCALL_BASE + 322) -#define __NR_madvise (__NR_SYSCALL_BASE + 220) -#define __NR_mincore (__NR_SYSCALL_BASE + 219) -#define __NR_getdents64 (__NR_SYSCALL_BASE + 217) -#define __NR_fstatfs64 (__NR_SYSCALL_BASE + 267) -#define __NR_fstatat64 (__NR_SYSCALL_BASE + 327) -#define __NR_mkdirat (__NR_SYSCALL_BASE + 323) -#define __NR_fchownat (__NR_SYSCALL_BASE + 325) -#define __NR_fchmodat (__NR_SYSCALL_BASE + 333) -#define __NR_renameat (__NR_SYSCALL_BASE + 329) -#define __NR_unlinkat (__NR_SYSCALL_BASE + 328) -#define __NR_statfs64 (__NR_SYSCALL_BASE + 266) -#define __NR_clock_gettime (__NR_SYSCALL_BASE + 263) -#define __NR_clock_settime (__NR_SYSCALL_BASE + 262) -#define __NR_clock_getres (__NR_SYSCALL_BASE + 264) -#define __NR_clock_nanosleep (__NR_SYSCALL_BASE + 265) -#define __NR_timer_create (__NR_SYSCALL_BASE + 257) -#define __NR_timer_settime (__NR_SYSCALL_BASE + 258) -#define __NR_timer_gettime (__NR_SYSCALL_BASE + 259) -#define __NR_timer_getoverrun (__NR_SYSCALL_BASE + 260) -#define __NR_timer_delete (__NR_SYSCALL_BASE + 261) -#define __NR_utimes (__NR_SYSCALL_BASE + 269) -#define __NR_socket (__NR_SYSCALL_BASE + 281) -#define __NR_socketpair (__NR_SYSCALL_BASE + 288) -#define __NR_bind (__NR_SYSCALL_BASE + 282) -#define __NR_connect (__NR_SYSCALL_BASE + 283) -#define __NR_listen (__NR_SYSCALL_BASE + 284) -#define __NR_accept (__NR_SYSCALL_BASE + 285) -#define __NR_getsockname (__NR_SYSCALL_BASE + 286) -#define __NR_getpeername (__NR_SYSCALL_BASE + 287) -#define __NR_sendto (__NR_SYSCALL_BASE + 290) -#define __NR_recvfrom (__NR_SYSCALL_BASE + 292) -#define __NR_shutdown (__NR_SYSCALL_BASE + 293) -#define __NR_setsockopt (__NR_SYSCALL_BASE + 294) -#define __NR_getsockopt (__NR_SYSCALL_BASE + 295) -#define __NR_sendmsg (__NR_SYSCALL_BASE + 296) -#define __NR_recvmsg (__NR_SYSCALL_BASE + 297) -#define __NR_epoll_create (__NR_SYSCALL_BASE + 250) -#define __NR_epoll_ctl (__NR_SYSCALL_BASE + 251) -#define __NR_epoll_wait (__NR_SYSCALL_BASE + 252) -#define __NR_inotify_init (__NR_SYSCALL_BASE + 316) -#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 317) -#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 318) -#define __NR_ARM_set_tls (__NR_SYSCALL_BASE + 983045) -#define __NR_ARM_cacheflush (__NR_SYSCALL_BASE + 983042) -#endif - -#ifdef __i386__ -#define __NR_exit_group (__NR_SYSCALL_BASE + 252) -#define __NR_waitpid (__NR_SYSCALL_BASE + 7) -#define __NR_waitid (__NR_SYSCALL_BASE + 284) -#define __NR_kill (__NR_SYSCALL_BASE + 37) -#define __NR_tkill (__NR_SYSCALL_BASE + 238) -#define __NR_set_thread_area (__NR_SYSCALL_BASE + 243) -#define __NR_openat (__NR_SYSCALL_BASE + 295) -#define __NR_madvise (__NR_SYSCALL_BASE + 219) -#define __NR_mincore (__NR_SYSCALL_BASE + 218) -#define __NR_getdents64 (__NR_SYSCALL_BASE + 220) -#define __NR_fstatfs64 (__NR_SYSCALL_BASE + 269) -#define __NR_fstatat64 (__NR_SYSCALL_BASE + 300) -#define __NR_mkdirat (__NR_SYSCALL_BASE + 296) -#define __NR_fchownat (__NR_SYSCALL_BASE + 298) -#define __NR_fchmodat (__NR_SYSCALL_BASE + 306) -#define __NR_renameat (__NR_SYSCALL_BASE + 302) -#define __NR_unlinkat (__NR_SYSCALL_BASE + 301) -#define __NR_statfs64 (__NR_SYSCALL_BASE + 268) -#define __NR_clock_gettime (__NR_SYSCALL_BASE + 265) -#define __NR_clock_settime (__NR_SYSCALL_BASE + 264) -#define __NR_clock_getres (__NR_SYSCALL_BASE + 266) -#define __NR_clock_nanosleep (__NR_SYSCALL_BASE + 267) -#define __NR_timer_create (__NR_SYSCALL_BASE + 259) -#define __NR_timer_settime (__NR_SYSCALL_BASE + 260) -#define __NR_timer_gettime (__NR_SYSCALL_BASE + 261) -#define __NR_timer_getoverrun (__NR_SYSCALL_BASE + 262) -#define __NR_timer_delete (__NR_SYSCALL_BASE + 263) -#define __NR_utimes (__NR_SYSCALL_BASE + 271) -#define __NR_socketcall (__NR_SYSCALL_BASE + 102) -#define __NR_epoll_create (__NR_SYSCALL_BASE + 254) -#define __NR_epoll_ctl (__NR_SYSCALL_BASE + 255) -#define __NR_epoll_wait (__NR_SYSCALL_BASE + 256) -#define __NR_inotify_init (__NR_SYSCALL_BASE + 291) -#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 292) -#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 293) -#endif - -#endif - -#endif /* _BIONIC_LINUX_SYSCALLS_H_ */ diff --git a/libc/include/sys/linux-unistd.h b/libc/include/sys/linux-unistd.h deleted file mode 100644 index 789271eef..000000000 --- a/libc/include/sys/linux-unistd.h +++ /dev/null @@ -1,204 +0,0 @@ -/* auto-generated by gensyscalls.py, do not touch */ -#ifndef _BIONIC_LINUX_UNISTD_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -void _exit (int); -void _exit_thread (int); -pid_t __fork (void); -pid_t _waitpid (pid_t, int*, int, struct rusage*); -int waitid (int, pid_t, struct siginfo_t*, int,void*); -pid_t __clone (int (*fn)(void*), void *child_stack, int flags, void *arg); -int execve (const char*, char* const*, char* const*); -int setuid (uid_t); -uid_t getuid (void); -gid_t getgid (void); -uid_t geteuid (void); -gid_t getegid (void); -uid_t getresuid (void); -gid_t getresgid (void); -pid_t gettid (void); -int getgroups (int, gid_t *); -pid_t getpgid (pid_t); -pid_t getppid (void); -pid_t setsid (void); -int setgid (gid_t); -int seteuid (uid_t); -int setreuid (uid_t, uid_t); -int setresuid (uid_t, uid_t, uid_t); -int setresgid (gid_t, gid_t, gid_t); -void* __brk (void*); -int kill (pid_t, int); -int tkill (pid_t tid, int sig); -int __ptrace (int request, int pid, void* addr, void* data); -int __set_thread_area (void* user_desc); -int __getpriority (int, int); -int setpriority (int, int, int); -int setrlimit (int resource, const struct rlimit *rlp); -int getrlimit (int resource, struct rlimit *rlp); -int getrusage (int who, struct rusage* r_usage); -int setgroups (int, const gid_t *); -pid_t getpgrp (void); -int setpgid (pid_t, pid_t); -pid_t vfork (void); -int setregid (gid_t, gid_t); -int chroot (const char *); -int prctl (int option, unsigned int arg2, unsigned int arg3, unsigned int arg4, unsigned int arg5); -int capget (cap_user_header_t header, cap_user_data_t data); -int capset (cap_user_header_t header, const cap_user_data_t data); -int acct (const char* filepath); -ssize_t read (int, void*, size_t); -ssize_t write (int, const void*, size_t); -ssize_t __pread64 (int, void *, size_t, off_t, off_t); -ssize_t __pwrite64 (int, void *, size_t, off_t, off_t); -int __open (const char*, int, mode_t); -int __openat (int, const char*, int, mode_t); -int close (int); -int creat (const char*, mode_t); -off_t lseek (int, off_t, int); -int __llseek (int, unsigned long, unsigned long, loff_t*, int); -pid_t getpid (void); -void * mmap (void *, size_t, int, int, int, long); -void * __mmap2 (void*, size_t, int, int, int, long); -int munmap (void *, size_t); -void * mremap (void *, size_t, size_t, unsigned long); -int msync (const void *, size_t, int); -int mprotect (const void *, size_t, int); -int madvise (const void *, size_t, int); -int mlock (const void *addr, size_t len); -int munlock (const void *addr, size_t len); -int mincore (void* start, size_t length, unsigned char* vec); -int __ioctl (int, int, void *); -int readv (int, const struct iovec *, int); -int writev (int, const struct iovec *, int); -int __fcntl (int, int, void*); -int flock (int, int); -int fchmod (int, mode_t); -int dup (int); -int pipe (int *); -int dup2 (int, int); -int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *); -int ftruncate (int, off_t); -int getdents (unsigned int, struct dirent *, unsigned int); -int fsync (int); -int fchown (int, uid_t, gid_t); -void sync (void); -int __fcntl64 (int, int, void *); -int fstatfs (int, size_t, struct statfs *); -ssize_t sendfile (int out_fd, int in_fd, off_t *offset, size_t count); -int fstatat (int dirfd, const char *path, struct stat *buf, int flags); -int mkdirat (int dirfd, const char *pathname, mode_t mode); -int fchownat (int dirfd, const char *path, uid_t owner, gid_t group, int flags); -int fchmodat (int dirfd, const char *path, mode_t mode, int flags); -int renameat (int olddirfd, const char *oldpath, int newdirfd, const char *newpath); -int link (const char*, const char*); -int unlink (const char*); -int unlinkat (int, const char *, int); -int chdir (const char*); -int mknod (const char*, mode_t, dev_t); -int chmod (const char*,mode_t); -int chown (const char *, uid_t, gid_t); -int lchown (const char*, uid_t, gid_t); -int mount (const char*, const char*, const char*, unsigned long, const void*); -int umount (const char*); -int umount2 (const char*, int); -int fstat (int, struct stat*); -int stat (const char *, struct stat *); -int lstat (const char *, struct stat *); -int mkdir (const char *, mode_t); -int readlink (const char *, char *, size_t); -int rmdir (const char *); -int rename (const char *, const char *); -int __getcwd (char * buf, size_t size); -int access (const char *, int); -int symlink (const char *, const char *); -int fchdir (int); -int truncate (const char*, off_t); -int __statfs64 (const char *, size_t, struct statfs *); -int pause (void); -int gettimeofday (struct timeval*, struct timezone*); -int settimeofday (const struct timeval*, const struct timezone*); -clock_t times (struct tms *); -int nanosleep (const struct timespec *, struct timespec *); -int clock_gettime (clockid_t clk_id, struct timespec *tp); -int clock_settime (clockid_t clk_id, const struct timespec *tp); -int clock_getres (clockid_t clk_id, struct timespec *res); -int clock_nanosleep (const struct timespec *req, struct timespec *rem); -int getitimer (int, const struct itimerval *); -int setitimer (int, const struct itimerval *, struct itimerval *); -int __timer_create (clockid_t clockid, struct sigevent *evp, timer_t *timerid); -int __timer_settime (timer_t, int, const struct itimerspec*, struct itimerspec*); -int __timer_gettime (timer_t, struct itimerspec*); -int __timer_getoverrun (timer_t); -int __timer_delete (timer_t); -int utimes (const char*, const struct timeval tvp[2]); -int sigaction (int, const struct sigaction *, struct sigaction *); -int sigprocmask (int, const sigset_t *, sigset_t *); -int __sigsuspend (int unused1, int unused2, unsigned mask); -int __rt_sigaction (int sig, const struct sigaction *act, struct sigaction *oact, size_t sigsetsize); -int __rt_sigprocmask (int how, const sigset_t *set, sigset_t *oset, size_t sigsetsize); -int __rt_sigtimedwait (const sigset_t *set, struct siginfo_t *info, struct timespec_t *timeout, size_t sigset_size); -int sigpending (sigset_t *); -int socket (int, int, int); -int socketpair (int, int, int, int*); -int bind (int, struct sockaddr *, int); -int connect (int, struct sockaddr *, socklen_t); -int listen (int, int); -int accept (int, struct sockaddr *, socklen_t *); -int getsockname (int, struct sockaddr *, socklen_t *); -int getpeername (int, struct sockaddr *, socklen_t *); -int sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t); -int recvfrom (int, void *, size_t, unsigned int, struct sockaddr *, socklen_t *); -int shutdown (int, int); -int setsockopt (int, int, int, const void *, socklen_t); -int getsockopt (int, int, int, void *, socklen_t *); -int sendmsg (int, const struct msghdr *, unsigned int); -int recvmsg (int, struct msghdr *, unsigned int); -int socket (int, int, int); -int bind (int, struct sockaddr *, int); -int connect (int, struct sockaddr *, socklen_t); -int listen (int, int); -int accept (int, struct sockaddr *, socklen_t *); -int getsockname (int, struct sockaddr *, socklen_t *); -int getpeername (int, struct sockaddr *, socklen_t *); -int socketpair (int, int, int, int*); -int sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t); -int recvfrom (int, void *, size_t, unsigned int, struct sockaddr *, socklen_t *); -int shutdown (int, int); -int setsockopt (int, int, int, const void *, socklen_t); -int getsockopt (int, int, int, void *, socklen_t *); -int sendmsg (int, const struct msghdr *, unsigned int); -int recvmsg (int, struct msghdr *, unsigned int); -int sched_setscheduler (pid_t pid, int policy, const struct sched_param *param); -int sched_getscheduler (pid_t pid); -int sched_yield (void); -int sched_setparam (pid_t pid, const struct sched_param *param); -int sched_getparam (pid_t pid, struct sched_param *param); -int sched_get_priority_max (int policy); -int sched_get_priority_min (int policy); -int sched_rr_get_interval (pid_t pid, struct timespec *interval); -int uname (struct utsname *); -pid_t __wait4 (pid_t pid, int *status, int options, struct rusage *rusage); -mode_t umask (mode_t); -int __reboot (int, int, int, void *); -int __syslog (int, char *, int); -int init_module (void *, unsigned long, const char *); -int delete_module (const char*, unsigned int); -int klogctl (int, char *, int); -int futex (void *, int, int, void *, void *, int); -int epoll_create (int size); -int epoll_ctl (int epfd, int op, int fd, struct epoll_event *event); -int epoll_wait (int epfd, struct epoll_event *events, int max, int timeout); -int inotify_init (void); -int inotify_add_watch (int, const char *, unsigned int); -int inotify_rm_watch (int, unsigned int); -int poll (struct pollfd *, unsigned int, long); -int __set_tls (void*); -int cacheflush (long start, long end, long flags); -#ifdef __cplusplus -} -#endif - -#endif /* _BIONIC_LINUX_UNISTD_H_ */ diff --git a/libc/include/sys/mman.h b/libc/include/sys/mman.h deleted file mode 100644 index 7a3297430..000000000 --- a/libc/include/sys/mman.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_MMAN_H_ -#define _SYS_MMAN_H_ - -#include -#include -#include -#include - -__BEGIN_DECLS - -#ifndef MAP_ANON -#define MAP_ANON MAP_ANONYMOUS -#endif - -#define MAP_FAILED ((void *)-1) - -#define MREMAP_MAYMOVE 1 -#define MREMAP_FIXED 2 - -extern void* mmap(void *, size_t, int, int, int, off_t); -extern int munmap(void *, size_t); -extern int msync(const void *, size_t, int); -extern int mprotect(const void *, size_t, int); -extern void* mremap(void *, size_t, size_t, unsigned long); - -extern int mlockall(int); -extern int munlockall(void); -extern int mlock(const void *, size_t); -extern int munlock(const void *, size_t); -extern int madvise(const void *, size_t, int); - -extern int mlock(const void *addr, size_t len); -extern int munlock(const void *addr, size_t len); - -extern int mincore(void* start, size_t length, unsigned char* vec); - -__END_DECLS - -#endif /* _SYS_MMAN_H_ */ diff --git a/libc/include/sys/mount.h b/libc/include/sys/mount.h deleted file mode 100644 index 62c4ee284..000000000 --- a/libc/include/sys/mount.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_MOUNT_H -#define _SYS_MOUNT_H - -#include -#include - -__BEGIN_DECLS - -/* - * These are the fs-independent mount-flags: up to 32 flags are supported - */ -#define MS_RDONLY 1 /* Mount read-only */ -#define MS_NOSUID 2 /* Ignore suid and sgid bits */ -#define MS_NODEV 4 /* Disallow access to device special files */ -#define MS_NOEXEC 8 /* Disallow program execution */ -#define MS_SYNCHRONOUS 16 /* Writes are synced at once */ -#define MS_REMOUNT 32 /* Alter flags of a mounted FS */ -#define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */ -#define MS_DIRSYNC 128 /* Directory modifications are synchronous */ -#define MS_NOATIME 1024 /* Do not update access times. */ -#define MS_NODIRATIME 2048 /* Do not update directory access times */ -#define MS_BIND 4096 -#define MS_MOVE 8192 -#define MS_REC 16384 -#define MS_VERBOSE 32768 -#define MS_POSIXACL (1<<16) /* VFS does not apply the umask */ -#define MS_ONE_SECOND (1<<17) /* fs has 1 sec a/m/ctime resolution */ -#define MS_ACTIVE (1<<30) -#define MS_NOUSER (1<<31) - -/* - * Superblock flags that can be altered by MS_REMOUNT - */ -#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME|MS_NODIRATIME) - -/* - * Old magic mount flag and mask - */ -#define MS_MGC_VAL 0xC0ED0000 -#define MS_MGC_MSK 0xffff0000 - -/* - * umount2() flags - */ -#define MNT_FORCE 1 /* Forcibly unmount */ -#define MNT_DETACH 2 /* Detach from tree only */ -#define MNT_EXPIRE 4 /* Mark for expiry */ - -/* - * Block device ioctls - */ -#define BLKROSET _IO(0x12, 93) /* Set device read-only (0 = read-write). */ -#define BLKROGET _IO(0x12, 94) /* Get read-only status (0 = read_write). */ -#define BLKRRPART _IO(0x12, 95) /* Re-read partition table. */ -#define BLKGETSIZE _IO(0x12, 96) /* Return device size. */ -#define BLKFLSBUF _IO(0x12, 97) /* Flush buffer cache. */ -#define BLKRASET _IO(0x12, 98) /* Set read ahead for block device. */ -#define BLKRAGET _IO(0x12, 99) /* Get current read ahead setting. */ - -/* - * Prototypes - */ -extern int mount(const char *, const char *, - const char *, unsigned long, - const void *); -extern int umount(const char *); -extern int umount2(const char *, int); -extern int pivot_root(const char *, const char *); - -__END_DECLS - -#endif /* _SYS_MOUNT_H */ diff --git a/libc/include/sys/param.h b/libc/include/sys/param.h deleted file mode 100644 index 3a815cb04..000000000 --- a/libc/include/sys/param.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_PARAM_H_ -#define _SYS_PARAM_H_ - -#include -#include - -#define MAXPATHLEN PATH_MAX -#define MAXSYMLINKS 8 - -#define ALIGNBYTES 3 -#define ALIGN(p) (((unsigned int)(p) + ALIGNBYTES) &~ ALIGNBYTES) - -#endif /* _SYS_PARAM_H_ */ diff --git a/libc/include/sys/poll.h b/libc/include/sys/poll.h deleted file mode 100644 index 779ec774f..000000000 --- a/libc/include/sys/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/sys/prctl.h b/libc/include/sys/prctl.h deleted file mode 100644 index ce85bf7e0..000000000 --- a/libc/include/sys/prctl.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_PRCTL_H -#define _SYS_PRCTL_H - -#include - -__BEGIN_DECLS - -extern int prctl(int option, unsigned long arg2, unsigned long arg3 , unsigned - long arg4, unsigned long arg5); - -__END_DECLS - -#endif /* _SYS_PRCTL_H */ - diff --git a/libc/include/sys/ptrace.h b/libc/include/sys/ptrace.h deleted file mode 100644 index 78a057a0b..000000000 --- a/libc/include/sys/ptrace.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_PTRACE_H_ -#define _SYS_PTRACE_H_ - -#include -#include -// For all of the defines -#include - -__BEGIN_DECLS - -#define PTRACE_POKEUSER PTRACE_POKEUSR -#define PTRACE_PEEKUSER PTRACE_PEEKUSR - -extern long ptrace(int request, pid_t pid, void *addr, void *data); - -__END_DECLS - -#endif /* _SYS_PTRACE_H_ */ diff --git a/libc/include/sys/reboot.h b/libc/include/sys/reboot.h deleted file mode 100644 index df81139da..000000000 --- a/libc/include/sys/reboot.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_REBOOT_H_ -#define _SYS_REBOOT_H_ - -#include -#include - -__BEGIN_DECLS - -/* use glibc names as well */ - -#define RB_AUTOBOOT LINUX_REBOOT_CMD_RESTART -#define RB_HALT_SYSTEM LINUX_REBOOT_CMD_HALT -#define RB_ENABLE_CAD LINUX_REBOOT_CMD_CAD_ON -#define RB_DISABLE_CAD LINUX_REBOOT_CMD_CAD_OFF -#define RB_POWER_OFF LINUX_REBOOT_CMD_POWER_OFF - -extern int reboot(int reboot_type); -extern int __reboot(int, int, int, void *); - -__END_DECLS - -#endif /* _SYS_REBOOT_H_ */ diff --git a/libc/include/sys/resource.h b/libc/include/sys/resource.h deleted file mode 100644 index a7de6f0ac..000000000 --- a/libc/include/sys/resource.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_RESOURCE_H_ -#define _SYS_RESOURCE_H_ - -#include -#include /* MUST be included before linux/resource.h */ - -/* TRICK AHEAD: defines a getrusage function with - * a non-standard signature. this is surprising because the - * syscall seems to use the standard one instead. - * once again, creative macro usage saves the days - */ -#define getrusage __kernel_getrusage -#include -#undef getrusage - -__BEGIN_DECLS - -extern int getpriority(int, int); -extern int setpriority(int, int, int); -extern int getrlimit(int resource, struct rlimit *rlp); -extern int setrlimit(int resource, const struct rlimit *rlp); -extern int getrusage(int who, struct rusage* r_usage); - -__END_DECLS - -#endif /* _SYS_RESOURCE_H_ */ diff --git a/libc/include/sys/select.h b/libc/include/sys/select.h deleted file mode 100644 index 52315b999..000000000 --- a/libc/include/sys/select.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SELECT_H_ -#define _SYS_SELECT_H_ - -#include -#include -#include - -__BEGIN_DECLS - -typedef __kernel_fd_set fd_set; - -extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); - -__END_DECLS - -#endif /* _SYS_SELECT_H_ */ diff --git a/libc/include/sys/sendfile.h b/libc/include/sys/sendfile.h deleted file mode 100644 index d5aba269d..000000000 --- a/libc/include/sys/sendfile.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SENDFILE_H_ -#define _SYS_SENDFILE_H_ - -#include -#include - -__BEGIN_DECLS - -extern ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count); - -__END_DECLS - -#endif /* _SYS_SENDFILE_H_ */ diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h deleted file mode 100644 index 208663ea2..000000000 --- a/libc/include/sys/socket.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SOCKET_H_ -#define _SYS_SOCKET_H_ - -#include -#include -#include - -__BEGIN_DECLS - -#define SOCK_STREAM 1 -#define SOCK_DGRAM 2 -#define SOCK_RAW 3 -#define SOCK_RDM 4 -#define SOCK_SEQPACKET 5 -#define SOCK_PACKET 10 - -#ifdef __i386__ -# define __socketcall extern __attribute__((__cdecl__)) -#else -# define __socketcall extern -#endif - -/* BIONIC: second argument to shutdown() */ -enum { - SHUT_RD = 0, /* no more receptions */ -#define SHUT_RD SHUT_RD - SHUT_WR, /* no more transmissions */ -#define SHUT_WR SHUT_WR - SHUT_RDWR /* no more receptions or transmissions */ -#define SHUT_RDWR SHUT_RDWR -}; - - -typedef int socklen_t; - -__socketcall int socket(int, int, int); -__socketcall int bind(int, const struct sockaddr *, int); -__socketcall int connect(int, const struct sockaddr *, socklen_t); -__socketcall int listen(int, int); -__socketcall int accept(int, struct sockaddr *, socklen_t *); -__socketcall int getsockname(int, struct sockaddr *, socklen_t *); -__socketcall int getpeername(int, struct sockaddr *, socklen_t *); -__socketcall int socketpair(int, int, int, int *); -__socketcall int shutdown(int, int); -__socketcall int setsockopt(int, int, int, const void *, socklen_t); -__socketcall int getsockopt(int, int, int, void *, socklen_t *); -__socketcall int sendmsg(int, const struct msghdr *, unsigned int); -__socketcall int recvmsg(int, struct msghdr *, unsigned int); - -extern ssize_t send(int, const void *, size_t, unsigned int); -extern ssize_t recv(int, void *, size_t, unsigned int); - -__socketcall ssize_t sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t); -__socketcall ssize_t recvfrom(int, void *, size_t, unsigned int, const struct sockaddr *, socklen_t *); - -#undef __socketcall - -__END_DECLS - -#endif /* _SYS_SOCKET_H */ diff --git a/libc/include/sys/socketcalls.h b/libc/include/sys/socketcalls.h deleted file mode 100644 index c74f463e8..000000000 --- a/libc/include/sys/socketcalls.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SOCKETCALLS_H_ -#define _SYS_SOCKETCALLS_H_ - -/* socketcalls by number */ - -#define SYS_SOCKET 1 /* sys_socket(2) */ -#define SYS_BIND 2 /* sys_bind(2) */ -#define SYS_CONNECT 3 /* sys_connect(2) */ -#define SYS_LISTEN 4 /* sys_listen(2) */ -#define SYS_ACCEPT 5 /* sys_accept(2) */ -#define SYS_GETSOCKNAME 6 /* sys_getsockname(2) */ -#define SYS_GETPEERNAME 7 /* sys_getpeername(2) */ -#define SYS_SOCKETPAIR 8 /* sys_socketpair(2) */ -#define SYS_SEND 9 /* sys_send(2) */ -#define SYS_RECV 10 /* sys_recv(2) */ -#define SYS_SENDTO 11 /* sys_sendto(2) */ -#define SYS_RECVFROM 12 /* sys_recvfrom(2) */ -#define SYS_SHUTDOWN 13 /* sys_shutdown(2) */ -#define SYS_SETSOCKOPT 14 /* sys_setsockopt(2) */ -#define SYS_GETSOCKOPT 15 /* sys_getsockopt(2) */ -#define SYS_SENDMSG 16 /* sys_sendmsg(2) */ -#define SYS_RECVMSG 17 /* sys_recvmsg(2) */ - -#endif /* _SYS_SOCKETCALLS_H_ */ diff --git a/libc/include/sys/stat.h b/libc/include/sys/stat.h deleted file mode 100644 index 23ab5aeec..000000000 --- a/libc/include/sys/stat.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_STAT_H_ -#define _SYS_STAT_H_ - -#include -#include -#include -#include - -#include - -__BEGIN_DECLS - -/* really matches stat64 in the kernel, hence the padding - * Note: The kernel zero's the padded region because glibc might read them - * in the hope that the kernel has stretched to using larger sizes. - */ -struct stat { - unsigned long long st_dev; - unsigned char __pad0[4]; - - unsigned long __st_ino; - unsigned int st_mode; - unsigned int st_nlink; - - unsigned long st_uid; - unsigned long st_gid; - - unsigned long long st_rdev; - unsigned char __pad3[4]; - - long long st_size; - unsigned long st_blksize; - unsigned long long st_blocks; - - unsigned long st_atime; - unsigned long st_atime_nsec; - - unsigned long st_mtime; - unsigned long st_mtime_nsec; - - unsigned long st_ctime; - unsigned long st_ctime_nsec; - - unsigned long long st_ino; -}; - -extern int chmod(const char *, mode_t); -extern int fchmod(int, mode_t); -extern int mkdir(const char *, mode_t); - -extern int stat(const char *, struct stat *); -extern int fstat(int, struct stat *); -extern int lstat(const char *, struct stat *); -extern int mknod(const char *, mode_t, dev_t); -extern mode_t umask(mode_t); - -#define stat64 stat -#define fstat64 fstat -#define lstat64 lstat - -static __inline__ int mkfifo(const char *__p, mode_t __m) -{ - return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t)0); -} - -extern int fstatat(int dirfd, const char *path, struct stat *buf, int flags); -extern int mkdirat(int dirfd, const char *pathname, mode_t mode); -extern int fchownat(int dirfd, const char *path, uid_t owner, gid_t group, int flags); -extern int fchmodat(int dirfd, const char *path, mode_t mode, int flags); -extern int renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath); - -__END_DECLS - -#endif /* _SYS_STAT_H_ */ diff --git a/libc/include/sys/statfs.h b/libc/include/sys/statfs.h deleted file mode 100644 index 53b3b5e4d..000000000 --- a/libc/include/sys/statfs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/include/sys/syscall.h b/libc/include/sys/syscall.h deleted file mode 100644 index 7055518b2..000000000 --- a/libc/include/sys/syscall.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SYSCALL_H_ -#define _SYS_SYSCALL_H_ - -#include -#include -#include -#include - -__BEGIN_DECLS - -int syscall(int number, ...); - -__END_DECLS - -#endif /* _SYS_SYSCALL_H_ */ diff --git a/libc/include/sys/sysconf.h b/libc/include/sys/sysconf.h deleted file mode 100644 index 2fc1b0888..000000000 --- a/libc/include/sys/sysconf.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SYSCONF_H_ -#define _SYS_SYSCONF_H_ - -#include - -__BEGIN_DECLS - -/* as listed by Posix sysconf() description */ -/* most of these will return -1 and ENOSYS */ - -#define _SC_ARG_MAX 0x0000 -#define _SC_BC_BASE_MAX 0x0001 -#define _SC_BC_DIM_MAX 0x0002 -#define _SC_BC_SCALE_MAX 0x0003 -#define _SC_BC_STRING_MAX 0x0004 -#define _SC_CHILD_MAX 0x0005 -#define _SC_CLK_TCK 0x0006 -#define _SC_COLL_WEIGHTS_MAX 0x0007 -#define _SC_EXPR_NEST_MAX 0x0008 -#define _SC_LINE_MAX 0x0009 -#define _SC_NGROUPS_MAX 0x000a -#define _SC_OPEN_MAX 0x000b -#define _SC_PASS_MAX 0x000c -#define _SC_2_C_BIND 0x000d -#define _SC_2_C_DEV 0x000e -#define _SC_2_C_VERSION 0x000f -#define _SC_2_CHAR_TERM 0x0010 -#define _SC_2_FORT_DEV 0x0011 -#define _SC_2_FORT_RUN 0x0012 -#define _SC_2_LOCALEDEF 0x0013 -#define _SC_2_SW_DEV 0x0014 -#define _SC_2_UPE 0x0015 -#define _SC_2_VERSION 0x0016 -#define _SC_JOB_CONTROL 0x0017 -#define _SC_SAVED_IDS 0x0018 -#define _SC_VERSION 0x0019 -#define _SC_RE_DUP_MAX 0x001a -#define _SC_STREAM_MAX 0x001b -#define _SC_TZNAME_MAX 0x001c -#define _SC_XOPEN_CRYPT 0x001d -#define _SC_XOPEN_ENH_I18N 0x001e -#define _SC_XOPEN_SHM 0x001f -#define _SC_XOPEN_VERSION 0x0020 -#define _SC_XOPEN_XCU_VERSION 0x0021 -#define _SC_XOPEN_REALTIME 0x0022 -#define _SC_XOPEN_REALTIME_THREADS 0x0023 -#define _SC_XOPEN_LEGACY 0x0024 -#define _SC_ATEXIT_MAX 0x0025 -#define _SC_IOV_MAX 0x0026 -#define _SC_PAGESIZE 0x0027 -#define _SC_PAGE_SIZE 0x0028 -#define _SC_XOPEN_UNIX 0x0029 -#define _SC_XBS5_ILP32_OFF32 0x002a -#define _SC_XBS5_ILP32_OFFBIG 0x002b -#define _SC_XBS5_LP64_OFF64 0x002c -#define _SC_XBS5_LPBIG_OFFBIG 0x002d -#define _SC_AIO_LISTIO_MAX 0x002e -#define _SC_AIO_MAX 0x002f -#define _SC_AIO_PRIO_DELTA_MAX 0x0030 -#define _SC_DELAYTIMER_MAX 0x0031 -#define _SC_MQ_OPEN_MAX 0x0032 -#define _SC_MQ_PRIO_MAX 0x0033 -#define _SC_RTSIG_MAX 0x0034 -#define _SC_SEM_NSEMS_MAX 0x0035 -#define _SC_SEM_VALUE_MAX 0x0036 -#define _SC_SIGQUEUE_MAX 0x0037 -#define _SC_TIMER_MAX 0x0038 -#define _SC_ASYNCHRONOUS_IO 0x0039 -#define _SC_FSYNC 0x003a -#define _SC_MAPPED_FILES 0x003b -#define _SC_MEMLOCK 0x003c -#define _SC_MEMLOCK_RANGE 0x003d -#define _SC_MEMORY_PROTECTION 0x003e -#define _SC_MESSAGE_PASSING 0x003f -#define _SC_PRIORITIZED_IO 0x0040 -#define _SC_PRIORITY_SCHEDULING 0x0041 -#define _SC_REALTIME_SIGNALS 0x0042 -#define _SC_SEMAPHORES 0x0043 -#define _SC_SHARED_MEMORY_OBJECTS 0x0044 -#define _SC_SYNCHRONIZED_IO 0x0045 -#define _SC_TIMERS 0x0046 -#define _SC_GETGR_R_SIZE_MAX 0x0047 -#define _SC_GETPW_R_SIZE_MAX 0x0048 -#define _SC_LOGIN_NAME_MAX 0x0049 -#define _SC_THREAD_DESTRUCTOR_ITERATIONS 0x004a -#define _SC_THREAD_KEYS_MAX 0x004b -#define _SC_THREAD_STACK_MIN 0x004c -#define _SC_THREAD_THREADS_MAX 0x004d -#define _SC_TTY_NAME_MAX 0x004e - -#define _SC_THREADS 0x004f -#define _SC_THREAD_ATTR_STACKADDR 0x0050 -#define _SC_THREAD_ATTR_STACKSIZE 0x0051 -#define _SC_THREAD_PRIORITY_SCHEDULING 0x0052 -#define _SC_THREAD_PRIO_INHERIT 0x0053 -#define _SC_THREAD_PRIO_PROTECT 0x0054 -#define _SC_THREAD_SAFE_FUNCTIONS 0x0055 - -#define _SC_NPROCESSORS_CONF 0x0060 -#define _SC_NPROCESSORS_ONLN 0x0061 -#define _SC_PHYS_PAGES 0x0062 -#define _SC_AVPHYS_PAGES 0x0063 - -extern int sysconf (int name); - -__END_DECLS - -#endif /* _SYS_SYSCONF_H_ */ diff --git a/libc/include/sys/sysinfo.h b/libc/include/sys/sysinfo.h deleted file mode 100644 index c7e46e6bf..000000000 --- a/libc/include/sys/sysinfo.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SYSINFO_H_ -#define _SYS_SYSINFO_H_ - -#include -#include - -__BEGIN_DECLS - -extern int sysinfo (struct sysinfo *info); - -__END_DECLS - -#endif /* _SYS_SYSINFO_H_ */ diff --git a/libc/include/sys/syslimits.h b/libc/include/sys/syslimits.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/sys/sysmacros.h b/libc/include/sys/sysmacros.h deleted file mode 100644 index 6f053a838..000000000 --- a/libc/include/sys/sysmacros.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_SYSMACROS_H_ -#define _SYS_SYSMACROS_H_ - -/* some rogue code includes this file directly :-( */ -#ifndef _SYS_TYPES_H_ -# include -#endif - -static __inline__ int major(dev_t _dev) -{ - return (_dev >> 8) & 0xfff; -} - -static __inline__ int minor(dev_t _dev) -{ - return (_dev & 0xff) | ((_dev >> 12) & 0xfff00); -} - -static __inline__ dev_t makedev(int __ma, int __mi) -{ - return ((__ma & 0xfff) << 8) | (__mi & 0xff) | ((__mi & 0xfff00) << 12); -} - -#endif /* _SYS_SYSMACROS_H_ */ - diff --git a/libc/include/sys/system_properties.h b/libc/include/sys/system_properties.h deleted file mode 100644 index 2eb00cdc0..000000000 --- a/libc/include/sys/system_properties.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _INCLUDE_SYS_SYSTEM_PROPERTIES_H -#define _INCLUDE_SYS_SYSTEM_PROPERTIES_H - -typedef struct prop_info prop_info; - -#define PROP_NAME_MAX 32 -#define PROP_VALUE_MAX 92 - -/* Look up a system property by name, copying its value and a -** \0 terminator to the provided pointer. The total bytes -** copied will be no greater than PROP_VALUE_MAX. Returns -** the string length of the value. A property that is not -** defined is identical to a property with a length 0 value. -*/ -int __system_property_get(const char *name, char *value); - -/* Return a pointer to the system property named name, if it -** exists, or NULL if there is no such property. Use -** __system_property_read() to obtain the string value from -** the returned prop_info pointer. -** -** It is safe to cache the prop_info pointer to avoid future -** lookups. These returned pointers will remain valid for -** the lifetime of the system. -*/ -const prop_info *__system_property_find(const char *name); - -/* Read the value of a system property. Returns the length -** of the value. Copies the value and \0 terminator into -** the provided value pointer. Total length (including -** terminator) will be no greater that PROP_VALUE_MAX. -** -** If name is nonzero, up to PROP_NAME_MAX bytes will be -** copied into the provided name pointer. The name will -** be \0 terminated. -*/ -int __system_property_read(const prop_info *pi, char *name, char *value); - -/* Return a prop_info for the nth system property, or NULL if -** there is no nth property. Use __system_property_read() to -** read the value of this property. -** -** This method is for inspecting and debugging the property -** system. Please use __system_property_find() instead. -** -** Order of results may change from call to call. This is -** not a bug. -*/ -const prop_info *__system_property_find_nth(unsigned n); - -#endif diff --git a/libc/include/sys/time.h b/libc/include/sys/time.h deleted file mode 100644 index 1f010d45e..000000000 --- a/libc/include/sys/time.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_TIME_H_ -#define _SYS_TIME_H_ - -#include -#include -#include - -__BEGIN_DECLS - -extern int gettimeofday(struct timeval *, struct timezone *); -extern int settimeofday(const struct timeval *, const struct timezone *); - -extern int getitimer(int, struct itimerval *); -extern int setitimer(int, const struct itimerval *, struct itimerval *); - -extern int utimes(const char *, const struct timeval *); - -#define timerclear(a) \ - ((a)->tv_sec = (a)->tv_usec = 0) - -#define timerisset(a) \ - ((a)->tv_sec != 0 || (a)->tv_usec != 0) - -#define timercmp(a, b, op) \ - ((a)->tv_sec == (b)->tv_sec \ - ? (a)->tv_usec op (b)->tv_usec \ - : (a)->tv_sec op (b)->tv_sec) - -#define timeradd(a, b, res) \ - do { \ - (res)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ - (res)->tv_usec = (a)->tv_usec + (b)->tv_usec; \ - if ((res)->tv_usec >= 1000000) { \ - (res)->tv_usec -= 1000000; \ - (res)->tv_sec += 1; \ - } \ - } while (0) - -#define timersub(a, b, res) \ - do { \ - (res)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (res)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((res)->tv_usec < 0) { \ - (res)->tv_usec += 1000000; \ - (res)->tv_sec -= 1; \ - } \ - } while (0) - -__END_DECLS - -#endif /* _SYS_TIME_H_ */ diff --git a/libc/include/sys/timeb.h b/libc/include/sys/timeb.h deleted file mode 100644 index f2cc39cc8..000000000 --- a/libc/include/sys/timeb.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_TIMEB_H -#define _SYS_TIMEB_H - -#include - -__BEGIN_DECLS - -struct timeb { - time_t time; - unsigned short millitm; - short timezone; - short dstflag; -}; - -extern int ftime(struct timeb* timebuf); - -__END_DECLS - -#endif /* _SYS_TIMEB_H */ diff --git a/libc/include/sys/times.h b/libc/include/sys/times.h deleted file mode 100644 index 1b9b8b265..000000000 --- a/libc/include/sys/times.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_TIMES_H_ -#define _SYS_TIMES_H_ - -#include -#include -#include - -__BEGIN_DECLS - -extern clock_t times(struct tms *); - -__END_DECLS - -#endif /* _SYS_TIMES_H_ */ diff --git a/libc/include/sys/ttychars.h b/libc/include/sys/ttychars.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/sys/ttydev.h b/libc/include/sys/ttydev.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h deleted file mode 100644 index b071ee912..000000000 --- a/libc/include/sys/types.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_TYPES_H_ -#define _SYS_TYPES_H_ - -#define __need_size_t -#define __need_ptrdiff_t -#include -#include -#include - -#include -#include -#include -#include - -typedef __u32 __kernel_dev_t; - -/* be careful with __kernel_gid_t and __kernel_uid_t - * these are defined as 16-bit for legacy reason, but - * the kernel uses 32-bits instead. - * - * 32-bit valuea are required for Android, so use - * __kernel_uid32_t and __kernel_gid32_t - */ - -typedef __kernel_blkcnt_t blkcnt_t; -typedef __kernel_blksize_t blksize_t; -typedef __kernel_clock_t clock_t; -typedef __kernel_clockid_t clockid_t; -typedef __kernel_dev_t dev_t; -typedef __kernel_fsblkcnt_t fsblkcnt_t; -typedef __kernel_fsfilcnt_t fsfilcnt_t; -typedef __kernel_gid32_t gid_t; -typedef __kernel_id_t id_t; -typedef __kernel_ino_t ino_t; -typedef __kernel_key_t key_t; -typedef __kernel_mode_t mode_t; -typedef __kernel_nlink_t nlink_t; -#define _OFF_T_DEFINED_ -typedef __kernel_off_t off_t; -typedef __kernel_loff_t loff_t; -typedef loff_t off64_t; /* GLibc-specific */ - -typedef __kernel_pid_t pid_t; - -/* while POSIX wants these in , we - * declare then in instead */ -#if 0 -typedef .... pthread_attr_t; -typedef .... pthread_cond_t; -typedef .... pthread_condattr_t; -typedef .... pthread_key_t; -typedef .... pthread_mutex_t; -typedef .... pthread_once_t; -typedef .... pthread_rwlock_t; -typedef .... pthread_rwlock_attr_t; -typedef .... pthread_t; -#endif - -#ifndef _SIZE_T_DEFINED_ -#define _SIZE_T_DEFINED_ -typedef unsigned int size_t; -#endif - -/* size_t is defined by the GCC-specific */ -#ifndef _SSIZE_T_DEFINED_ -#define _SSIZE_T_DEFINED_ -typedef long int ssize_t; -#endif - -typedef __kernel_suseconds_t suseconds_t; -typedef __kernel_time_t time_t; -typedef __kernel_uid32_t uid_t; -typedef signed long useconds_t; - -typedef __kernel_daddr_t daddr_t; -typedef __kernel_timer_t timer_t; -typedef __kernel_mqd_t mqd_t; - -typedef __kernel_caddr_t caddr_t; -typedef unsigned int uint_t; -typedef unsigned int uint; - -/* for some applications */ -#include - -#ifdef __BSD_VISIBLE -typedef unsigned char u_char; -typedef unsigned short u_short; -typedef unsigned int u_int; -typedef unsigned long u_long; - -typedef uint32_t u_int32_t; -typedef uint16_t u_int16_t; -typedef uint8_t u_int8_t; -typedef uint64_t u_int64_t; -#endif - -#endif diff --git a/libc/include/sys/uio.h b/libc/include/sys/uio.h deleted file mode 100644 index 025171638..000000000 --- a/libc/include/sys/uio.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_UIO_H_ -#define _SYS_UIO_H_ - -#include -#include -#include - -__BEGIN_DECLS - -int readv(int, const struct iovec *, int); -int writev(int, const struct iovec *, int); - -__END_DECLS - -#endif /* _SYS_UIO_H_ */ diff --git a/libc/include/sys/un.h b/libc/include/sys/un.h deleted file mode 100644 index 973861f10..000000000 --- a/libc/include/sys/un.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_UN_H_ -#define _SYS_UN_H_ - -#include - -#endif /* _SYS_UN_H_ */ diff --git a/libc/include/sys/utime.h b/libc/include/sys/utime.h deleted file mode 100644 index 9f8810e2e..000000000 --- a/libc/include/sys/utime.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_UTIME_H_ -#define _SYS_UTIME_H_ - -#include - -#endif /* _SYS_UTIME_H_ */ diff --git a/libc/include/sys/utsname.h b/libc/include/sys/utsname.h deleted file mode 100644 index d54a994e5..000000000 --- a/libc/include/sys/utsname.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_UTSNAME_H_ -#define _SYS_UTSNAME_H_ - -#include - -__BEGIN_DECLS - -#define SYS_NMLN 65 - -struct utsname { - char sysname [SYS_NMLN]; - char nodename [SYS_NMLN]; - char release [SYS_NMLN]; - char version [SYS_NMLN]; - char machine [SYS_NMLN]; - char domainname[SYS_NMLN]; -}; - -extern int uname(struct utsname *); - -__END_DECLS - -#endif /* _SYS_UTSNAME_H_ */ diff --git a/libc/include/sys/vfs.h b/libc/include/sys/vfs.h deleted file mode 100644 index 4adaf5fd7..000000000 --- a/libc/include/sys/vfs.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_VFS_H_ -#define _SYS_VFS_H_ - -#include -#include -#include - -__BEGIN_DECLS - -/* note: this corresponds to the kernel's statfs64 type */ -struct statfs { - uint32_t f_type; - uint32_t f_bsize; - uint64_t f_blocks; - uint64_t f_bfree; - uint64_t f_bavail; - uint64_t f_files; - uint64_t f_ffree; - __kernel_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; - uint32_t f_spare[5]; -}; - -#define ADFS_SUPER_MAGIC 0xadf5 -#define AFFS_SUPER_MAGIC 0xADFF -#define BEFS_SUPER_MAGIC 0x42465331 -#define BFS_MAGIC 0x1BADFACE -#define CIFS_MAGIC_NUMBER 0xFF534D42 -#define CODA_SUPER_MAGIC 0x73757245 -#define COH_SUPER_MAGIC 0x012FF7B7 -#define CRAMFS_MAGIC 0x28cd3d45 -#define DEVFS_SUPER_MAGIC 0x1373 -#define EFS_SUPER_MAGIC 0x00414A53 -#define EXT_SUPER_MAGIC 0x137D -#define EXT2_OLD_SUPER_MAGIC 0xEF51 -#define EXT2_SUPER_MAGIC 0xEF53 -#define EXT3_SUPER_MAGIC 0xEF53 -#define HFS_SUPER_MAGIC 0x4244 -#define HPFS_SUPER_MAGIC 0xF995E849 -#define HUGETLBFS_MAGIC 0x958458f6 -#define ISOFS_SUPER_MAGIC 0x9660 -#define JFFS2_SUPER_MAGIC 0x72b6 -#define JFS_SUPER_MAGIC 0x3153464a -#define MINIX_SUPER_MAGIC 0x137F /* orig. minix */ -#define MINIX_SUPER_MAGIC2 0x138F /* 30 char minix */ -#define MINIX2_SUPER_MAGIC 0x2468 /* minix V2 */ -#define MINIX2_SUPER_MAGIC2 0x2478 /* minix V2, 30 char names */ -#define MSDOS_SUPER_MAGIC 0x4d44 -#define NCP_SUPER_MAGIC 0x564c -#define NFS_SUPER_MAGIC 0x6969 -#define NTFS_SB_MAGIC 0x5346544e -#define OPENPROM_SUPER_MAGIC 0x9fa1 -#define PROC_SUPER_MAGIC 0x9fa0 -#define QNX4_SUPER_MAGIC 0x002f -#define REISERFS_SUPER_MAGIC 0x52654973 -#define ROMFS_MAGIC 0x7275 -#define SMB_SUPER_MAGIC 0x517B -#define SYSV2_SUPER_MAGIC 0x012FF7B6 -#define SYSV4_SUPER_MAGIC 0x012FF7B5 -#define TMPFS_MAGIC 0x01021994 -#define UDF_SUPER_MAGIC 0x15013346 -#define UFS_MAGIC 0x00011954 -#define USBDEVICE_SUPER_MAGIC 0x9fa2 -#define VXFS_SUPER_MAGIC 0xa501FCF5 -#define XENIX_SUPER_MAGIC 0x012FF7B4 -#define XFS_SUPER_MAGIC 0x58465342 -#define _XIAFS_SUPER_MAGIC 0x012FD16D - -extern int statfs(const char *, struct statfs *); -extern int fstatfs(int, struct statfs *); - -__END_DECLS - -#endif /* _SYS_VFS_H_ */ diff --git a/libc/include/sys/vt.h b/libc/include/sys/vt.h deleted file mode 100644 index b37a86903..000000000 --- a/libc/include/sys/vt.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include diff --git a/libc/include/sys/wait.h b/libc/include/sys/wait.h deleted file mode 100644 index 8ba1837fe..000000000 --- a/libc/include/sys/wait.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYS_WAIT_H_ -#define _SYS_WAIT_H_ - -#include -#include -#include -#include - -__BEGIN_DECLS - -#define WEXITSTATUS(s) (((s) & 0xff00) >> 8) -#define WCOREDUMP(s) ((s) & 0x80) -#define WTERMSIG(s) ((s) & 0x7f) -#define WSTOPSIG(s) WEXITSTATUS(s) - -#define WIFEXITED(s) (WTERMSIG(s) == 0) -#define WIFSTOPPED(s) (WTERMSIG(s) == 0x7f) -#define WIFSIGNALED(s) (WTERMSIG((s)+1) >= 2) - -extern pid_t wait(int *); -extern pid_t waitpid(pid_t, int *, int); -extern pid_t wait3(int *, int, struct rusage *); -extern pid_t wait4(pid_t, int *, int, struct rusage *); - -__END_DECLS - -#endif /* _SYS_WAIT_H_ */ diff --git a/libc/include/syslog.h b/libc/include/syslog.h deleted file mode 100644 index d35bc79af..000000000 --- a/libc/include/syslog.h +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _SYSLOG_H -#define _SYSLOG_H - -#include -#include -#include - -__BEGIN_DECLS - -/* Alert levels */ -#define LOG_EMERG 0 -#define LOG_ALERT 1 -#define LOG_CRIT 2 -#define LOG_ERR 3 -#define LOG_WARNING 4 -#define LOG_NOTICE 5 -#define LOG_INFO 6 -#define LOG_DEBUG 7 - -#define LOG_PRIMASK 7 -#define LOG_PRI(x) ((x) & LOG_PRIMASK) - - -/* Facilities; not actually used */ -#define LOG_KERN 0000 -#define LOG_USER 0010 -#define LOG_MAIL 0020 -#define LOG_DAEMON 0030 -#define LOG_AUTH 0040 -#define LOG_SYSLOG 0050 -#define LOG_LPR 0060 -#define LOG_NEWS 0070 -#define LOG_UUCP 0100 -#define LOG_CRON 0110 -#define LOG_AUTHPRIV 0120 -#define LOG_FTP 0130 -#define LOG_LOCAL0 0200 -#define LOG_LOCAL1 0210 -#define LOG_LOCAL2 0220 -#define LOG_LOCAL3 0230 -#define LOG_LOCAL4 0240 -#define LOG_LOCAL5 0250 -#define LOG_LOCAL6 0260 -#define LOG_LOCAL7 0270 - -#define LOG_FACMASK 01770 -#define LOG_FAC(x) (((x) >> 3) & (LOG_FACMASK >> 3)) - -#define LOG_MASK(pri) (1 << (pri)) /* mask for one priority */ -#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* all priorities through pri */ - -/* openlog() flags; only LOG_PID and LOG_PERROR supported */ -#define LOG_PID 0x01 /* include pid with message */ -#define LOG_CONS 0x02 /* write to console on logger error */ -#define LOG_ODELAY 0x04 /* delay connection until syslog() */ -#define LOG_NDELAY 0x08 /* open connection immediately */ -#define LOG_NOWAIT 0x10 /* wait for child processes (unused on linux) */ -#define LOG_PERROR 0x20 /* additional logging to stderr */ - -/* BIONIC: the following definitions are from OpenBSD's sys/syslog.h - */ -struct syslog_data { - int log_file; - int connected; - int opened; - int log_stat; - const char *log_tag; - int log_fac; - int log_mask; -}; - -#define SYSLOG_DATA_INIT {-1, 0, 0, 0, (const char *)0, LOG_USER, 0xff} - -#define _PATH_LOG "/dev/kmsg" - -extern void closelog(void); -extern void openlog(const char *, int, int); -extern int setlogmask(int); -extern void syslog(int, const char *, ...); -extern void vsyslog(int, const char *, va_list); -extern void closelog_r(struct syslog_data *); -extern void openlog_r(const char *, int, int, struct syslog_data *); -extern int setlogmask_r(int, struct syslog_data *); -extern void syslog_r(int, struct syslog_data *, const char *, ...); -extern void vsyslog_r(int, struct syslog_data *, const char *, va_list); - -__END_DECLS - -#endif /* _SYSLOG_H */ diff --git a/libc/include/termios.h b/libc/include/termios.h deleted file mode 100644 index ad1908995..000000000 --- a/libc/include/termios.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _TERMIOS_H_ -#define _TERMIOS_H_ - -#include -#include -#include -#include -#include - -__BEGIN_DECLS - -/* Redefine these to match their ioctl number */ -#undef TCSANOW -#define TCSANOW TCSETS - -#undef TCSADRAIN -#define TCSADRAIN TCSETSW - -#undef TCSAFLUSH -#define TCSAFLUSH TCSETSF - -static __inline__ int tcgetattr(int fd, struct termios *s) -{ - return ioctl(fd, TCGETS, s); -} - -static __inline__ int tcsetattr(int fd, int __opt, const struct termios *s) -{ - return ioctl(fd, __opt, (void *)s); -} - -static __inline__ int tcflow(int fd, int action) -{ - return ioctl(fd, TCXONC, (void *)(intptr_t)action); -} - -static __inline__ int tcflush(int fd, int __queue) -{ - return ioctl(fd, TCFLSH, (void *)(intptr_t)__queue); -} - -static __inline__ pid_t tcgetsid(int fd) -{ - pid_t _pid; - return ioctl(fd, TIOCGSID, &_pid) ? (pid_t)-1 : _pid; -} - -static __inline__ int tcsendbreak(int fd, int __duration) -{ - return ioctl(fd, TCSBRKP, (void *)(uintptr_t)__duration); -} - -static __inline__ speed_t cfgetospeed(const struct termios *s) -{ - return (speed_t)(s->c_cflag & CBAUD); -} - -static __inline__ int cfsetospeed(struct termios *s, speed_t speed) -{ - s->c_cflag = (s->c_cflag & ~CBAUD) | (speed & CBAUD); - return 0; -} - -static __inline__ speed_t cfgetispeed(const struct termios *s) -{ - return (speed_t)(s->c_cflag & CBAUD); -} - -static __inline__ int cfsetispeed(struct termios *s, speed_t speed) -{ - s->c_cflag = (s->c_cflag & ~CBAUD) | (speed & CBAUD); - return 0; -} - -static __inline__ void cfmakeraw(struct termios *s) -{ - s->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); - s->c_oflag &= ~OPOST; - s->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); - s->c_cflag &= ~(CSIZE|PARENB); - s->c_cflag |= CS8; -} - -__END_DECLS - -#endif /* _TERMIOS_H_ */ diff --git a/libc/include/time.h b/libc/include/time.h deleted file mode 100644 index 35c2358b2..000000000 --- a/libc/include/time.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _TIME_H_ -#define _TIME_H_ - -#include -#include - -#define __ARCH_SI_UID_T __kernel_uid32_t -#include -#undef __ARCH_SI_UID_T - -__BEGIN_DECLS - -extern time_t time(time_t *); -extern int nanosleep(const struct timespec *, struct timespec *); - -extern char *strtotimeval(const char *str, struct timeval *tv); - -struct tm { - int tm_sec; /* seconds */ - int tm_min; /* minutes */ - int tm_hour; /* hours */ - int tm_mday; /* day of the month */ - int tm_mon; /* month */ - int tm_year; /* year */ - int tm_wday; /* day of the week */ - int tm_yday; /* day in the year */ - int tm_isdst; /* daylight saving time */ - - long int tm_gmtoff; /* Seconds east of UTC. */ - const char *tm_zone; /* Timezone abbreviation. */ - -}; - -/* defining TM_ZONE indicates that we have a "timezone abbreviation" field in - * struct tm, the value should be the field name - */ -#define TM_ZONE tm_zone - -extern char* asctime(const struct tm* a); -extern char* asctime_r(const struct tm* a, char* buf); - -/* Return the difference between TIME1 and TIME0. */ -extern double difftime (time_t __time1, time_t __time0); -extern time_t mktime (struct tm *a); - -extern struct tm* localtime(const time_t *t); -extern struct tm* localtime_r(const time_t *timep, struct tm *result); - -extern struct tm* gmtime(const time_t *timep); -extern struct tm* gmtime_r(const time_t *timep, struct tm *result); - -extern char* strptime(const char *buf, const char *fmt, struct tm *tm); -extern size_t strftime(char *s, size_t max, const char *format, const struct tm *tm); - -extern char *ctime(const time_t *timep); -extern char *ctime_r(const time_t *timep, char *buf); - -/* global includes */ -extern char* tzname[]; -extern int daylight; -extern long int timezone; - -#define CLOCKS_PER_SEC 1000000 - -extern clock_t clock(); - -/* BIONIC: extra linux clock goodies */ -extern int clock_getres(int, struct timespec *); -extern int clock_gettime(int, struct timespec *); - -#define CLOCK_REALTIME 0 -#define CLOCK_MONOTONIC 1 -#define CLOCK_PROCESS_CPUTIME_ID 2 -#define CLOCK_THREAD_CPUTIME_ID 3 -#define CLOCK_REALTIME_HR 4 -#define CLOCK_MONOTONIC_HR 5 - -extern int timer_create(int, struct sigevent*, timer_t*); -extern int timer_delete(timer_t); -extern int timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue); -extern int timer_gettime(timer_t timerid, struct itimerspec *value); -extern int timer_getoverrun(timer_t timerid); - -__END_DECLS - -#endif /* _TIME_H_ */ diff --git a/libc/include/time64.h b/libc/include/time64.h deleted file mode 100644 index 9da4bc702..000000000 --- a/libc/include/time64.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - -Copyright (c) 2007-2008 Michael G Schwern - -This software originally derived from Paul Sheer's pivotal_gmtime_r.c. - -The MIT License: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -Origin: http://code.google.com/p/y2038 -Modified for Bionic by the Android Open Source Project - -*/ -#ifndef TIME64_H -#define TIME64_H - -#include -#include - -typedef int64_t time64_t; - -struct tm *gmtime64_r (const time64_t *, struct tm *); -struct tm *localtime64_r (const time64_t *, struct tm *); -struct tm *gmtime64 (const time64_t *); -struct tm *localtime64 (const time64_t *); - -char *asctime64 (const struct tm *); -char *asctime64_r (const struct tm *, char *); - -char *ctime64 (const time64_t*); -char *ctime64_r (const time64_t*, char*); - -time64_t timegm64 (const struct tm *); -time64_t mktime64 (const struct tm *); -time64_t timelocal64 (const struct tm *); - -#endif /* TIME64_H */ diff --git a/libc/include/unistd.h b/libc/include/unistd.h deleted file mode 100644 index 1ada37e51..000000000 --- a/libc/include/unistd.h +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _UNISTD_H_ -#define _UNISTD_H_ - -#include -#include -#include -#include -#include -#include -#include - -__BEGIN_DECLS - -/* Standard file descriptor numbers. */ -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 - -/* Values for whence in fseek and lseek */ -#define SEEK_SET 0 -#define SEEK_CUR 1 -#define SEEK_END 2 - -extern char **environ; -extern __noreturn void _exit(int); - -extern pid_t fork(void); -extern pid_t vfork(void); -extern pid_t getpid(void); -extern pid_t gettid(void); -extern pid_t getpgid(pid_t); -extern int setpgid(pid_t, pid_t); -extern pid_t getppid(void); -extern pid_t getpgrp(void); -extern int setpgrp(void); -extern pid_t setsid(void); -extern pid_t getsid(pid_t); - -extern int execv(const char *, char * const *); -extern int execvp(const char *, char * const *); -extern int execve(const char *, char * const *, char * const *); -extern int execvpe(const char *, char * const *, char * const *); -extern int execl(const char *, const char *, ...); -extern int execlp(const char *, const char *, ...); -extern int execle(const char *, const char *, ...); -extern int execlpe(const char *, const char *, ...); -extern int capget(cap_user_header_t hdrp, cap_user_data_t datap); -extern int capset(cap_user_header_t hdrp, const cap_user_data_t datap); -extern int prctl(int option, unsigned long arg2, unsigned long arg3, - unsigned long arg4, unsigned long arg5); - -extern int nice(int); - -extern int setuid(uid_t); -extern uid_t getuid(void); -extern int seteuid(uid_t); -extern uid_t geteuid(void); -extern int setgid(gid_t); -extern gid_t getgid(void); -extern int setegid(gid_t); -extern gid_t getegid(void); -extern int getgroups(int, gid_t *); -extern int setgroups(size_t, const gid_t *); -extern int setreuid(uid_t, uid_t); -extern int setregid(gid_t, gid_t); -extern int setresuid(uid_t, uid_t, uid_t); -extern int setresgid(gid_t, gid_t, gid_t); -extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); -extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); -extern int getfsuid(uid_t); -extern int setfsuid(uid_t); -extern int issetugid(void); -extern char* getlogin(void); -extern int getlogin_r(char* name, size_t namesize); - - -/* Macros for access() */ -#define R_OK 4 /* Read */ -#define W_OK 2 /* Write */ -#define X_OK 1 /* Execute */ -#define F_OK 0 /* Existence */ - -extern int access(const char *, int); -extern int link(const char *, const char *); -extern int unlink(const char *); -extern int chdir(const char *); -extern int fchdir(int); -extern int rmdir(const char *); -extern int pipe(int *); -extern int chroot(const char *); -extern int symlink(const char *, const char *); -extern int readlink(const char *, char *, size_t); -extern int chown(const char *, uid_t, gid_t); -extern int fchown(int, uid_t, gid_t); -extern int lchown(const char *, uid_t, gid_t); -extern char *getcwd(char *, size_t); - -extern int sync(void); - -extern int close(int); -extern off_t lseek(int, off_t, int); -extern loff_t lseek64(int, loff_t, int); - -extern ssize_t read(int, void *, size_t); -extern ssize_t write(int, const void *, size_t); -extern ssize_t pread(int, void *, size_t, off_t); -extern ssize_t pwrite(int, void *, size_t, off_t); - -extern int dup(int); -extern int dup2(int, int); -extern int fcntl(int, int, ...); -extern int ioctl(int, int, ...); -extern int flock(int, int); -extern int fsync(int); -extern int fdatasync(int); -extern int ftruncate(int, off_t); - -extern int pause(void); -extern unsigned int alarm(unsigned int); -extern unsigned int sleep(unsigned int); -extern void usleep(unsigned long); - -extern int gethostname(char *, size_t); -extern int sethostname(const char *, size_t); -extern int getdomainname(char *, size_t); -extern int setdomainname(const char *, size_t); - -extern int getdtablesize(void); - -extern void *__brk(void *); -extern int brk(void *); -extern void *sbrk(ptrdiff_t); - -extern int getopt(int, char * const *, const char *); -extern char *optarg; -extern int optind, opterr, optopt; - -extern int isatty(int); - -extern int acct(const char* filepath); - -static __inline__ int getpagesize(void) { - extern unsigned int __page_size; - return __page_size; -} -static __inline__ int __getpageshift(void) { - extern unsigned int __page_shift; - return __page_shift; -} - -extern int sysconf(int name); - -extern int daemon(int, int); - -/* A special syscall that is only available on the ARM, not x86 function. */ -extern int cacheflush(long start, long end, long flags); - -extern pid_t tcgetpgrp(int fd); -extern int tcsetpgrp(int fd, pid_t _pid); - -__END_DECLS - -#endif /* _UNISTD_H_ */ diff --git a/libc/include/util.h b/libc/include/util.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libc/include/utime.h b/libc/include/utime.h deleted file mode 100644 index fa7cd2f1b..000000000 --- a/libc/include/utime.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _UTIME_H_ -#define _UTIME_H_ - -#include -#include -#include - -__BEGIN_DECLS - -extern int utime(const char *, const struct utimbuf *); - -__END_DECLS - -#endif /* _UTIME_H_ */ - diff --git a/libc/include/utmp.h b/libc/include/utmp.h deleted file mode 100644 index e362b4021..000000000 --- a/libc/include/utmp.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _UTMP_H_ -#define _UTMP_H_ - -#include -#include -#include - -#define _PATH_UTMP "/var/run/utmp" -#define _PATH_WTMP "/var/log/wtmp" -#define _PATH_LASTLOG "/var/log/lastlog" - -#define UT_NAMESIZE 8 -#define UT_LINESIZE 8 -#define UT_HOSTSIZE 16 - -#define USER_PROCESS 7 - -struct lastlog -{ - time_t ll_time; - char ll_line[UT_LINESIZE]; - char ll_host[UT_HOSTSIZE]; -}; - -struct exit_status -{ - short int e_termination; - short int e_exit; -}; - - -struct utmp -{ - short int ut_type; - pid_t ut_pid; - char ut_line[UT_LINESIZE]; - char ut_id[4]; - char ut_user[UT_NAMESIZE]; - char ut_host[UT_HOSTSIZE]; - - struct exit_status ut_exit; - - long int ut_session; - struct timeval ut_tv; - - int32_t ut_addr_v6[4]; - char unsed[20]; -}; - - -#define ut_name ut_user -#define ut_time ut_tv.tv_sec -#define ut_addr ut_addr_v6[0] - -__BEGIN_DECLS - -int utmpname(const char*); -void setutent(); -struct utmp* getutent(); - -__END_DECLS - -#endif // _UTMP_H_ diff --git a/libc/include/wchar.h b/libc/include/wchar.h deleted file mode 100644 index e2feb6002..000000000 --- a/libc/include/wchar.h +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _WCHAR_H_ -#define _WCHAR_H_ - -#include -#include - -/* wchar_t is required in stdlib.h according to POSIX */ -#define __need___wchar_t -#include - -#include -#include -#include - -#include - -/* IMPORTANT: Any code that relies on wide character support is essentially - * non-portable and/or broken. the only reason this header exist - * is because I'm really a nice guy. However, I'm not nice enough - * to provide you with a real implementation. instead wchar_t == char - * and all wc functions are stubs to their "normal" equivalent... - */ - -__BEGIN_DECLS - -typedef int wint_t; -typedef struct { int dummy; } mbstate_t; - -typedef enum { - WC_TYPE_INVALID = 0, - WC_TYPE_ALNUM, - WC_TYPE_ALPHA, - WC_TYPE_BLANK, - WC_TYPE_CNTRL, - WC_TYPE_DIGIT, - WC_TYPE_GRAPH, - WC_TYPE_LOWER, - WC_TYPE_PRINT, - WC_TYPE_PUNCT, - WC_TYPE_SPACE, - WC_TYPE_UPPER, - WC_TYPE_XDIGIT, - WC_TYPE_MAX -} wctype_t; - -#define WCHAR_MAX 255 -#define WCHAR_MIN 0 -#define WEOF (-1) - -extern wint_t btowc(int); -extern int fwprintf(FILE *, const wchar_t *, ...); -extern int fwscanf(FILE *, const wchar_t *, ...); -extern int iswalnum(wint_t); -extern int iswalpha(wint_t); -extern int iswcntrl(wint_t); -extern int iswdigit(wint_t); -extern int iswgraph(wint_t); -extern int iswlower(wint_t); -extern int iswprint(wint_t); -extern int iswpunct(wint_t); -extern int iswspace(wint_t); -extern int iswupper(wint_t); -extern int iswxdigit(wint_t); -extern int iswctype(wint_t, wctype_t); -extern wint_t fgetwc(FILE *); -extern wchar_t *fgetws(wchar_t *, int, FILE *); -extern wint_t fputwc(wchar_t, FILE *); -extern int fputws(const wchar_t *, FILE *); -extern int fwide(FILE *, int); -extern wint_t getwc(FILE *); -extern wint_t getwchar(void); -extern int mbsinit(const mbstate_t *); -extern size_t mbrlen(const char *, size_t, mbstate_t *); -extern size_t mbrtowc(wchar_t *, const char *, size_t, mbstate_t *); -extern size_t mbsrtowcs(wchar_t *, const char **, size_t, mbstate_t *); -extern wint_t putwc(wchar_t, FILE *); -extern wint_t putwchar(wchar_t); -extern int swprintf(wchar_t *, size_t, const wchar_t *, ...); -extern int swscanf(const wchar_t *, const wchar_t *, ...); -extern wint_t towlower(wint_t); -extern wint_t towupper(wint_t); -extern wint_t ungetwc(wint_t, FILE *); -extern int vfwprintf(FILE *, const wchar_t *, va_list); -extern int vwprintf(const wchar_t *, va_list); -extern int vswprintf(wchar_t *, size_t, const wchar_t *, va_list); -extern size_t wcrtomb(char *, wchar_t, mbstate_t *); -extern wchar_t *wcscat(wchar_t *, const wchar_t *); -extern wchar_t *wcschr(const wchar_t *, wchar_t); -extern int wcscmp(const wchar_t *, const wchar_t *); -extern int wcscoll(const wchar_t *, const wchar_t *); -extern wchar_t *wcscpy(wchar_t *, const wchar_t *); -extern size_t wcscspn(const wchar_t *, const wchar_t *); -extern size_t wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *); -extern size_t wcslen(const wchar_t *); -extern wchar_t *wcsncat(wchar_t *, const wchar_t *, size_t); -extern int wcsncmp(const wchar_t *, const wchar_t *, size_t); -extern wchar_t *wcsncpy(wchar_t *, const wchar_t *, size_t); -extern wchar_t *wcspbrk(const wchar_t *, const wchar_t *); -extern wchar_t *wcsrchr(const wchar_t *, wchar_t); -extern size_t wcsrtombs(char *, const wchar_t **, size_t, mbstate_t *); -extern size_t wcsspn(const wchar_t *, const wchar_t *); -extern wchar_t *wcsstr(const wchar_t *, const wchar_t *); -extern double wcstod(const wchar_t *, wchar_t **); -extern wchar_t *wcstok(wchar_t *, const wchar_t *, wchar_t **); -extern long int wcstol(const wchar_t *, wchar_t **, int); -extern unsigned long int wcstoul(const wchar_t *, wchar_t **, int); -extern wchar_t *wcswcs(const wchar_t *, const wchar_t *); -extern int wcswidth(const wchar_t *, size_t); -extern size_t wcsxfrm(wchar_t *, const wchar_t *, size_t); -extern int wctob(wint_t); -extern wctype_t wctype(const char *); -extern int wcwidth(wchar_t); -extern wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); -extern int wmemcmp(const wchar_t *, const wchar_t *, size_t); -extern wchar_t *wmemcpy(wchar_t *, const wchar_t *, size_t); -extern wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); -extern wchar_t *wmemset(wchar_t *, wchar_t, size_t); -extern int wprintf(const wchar_t *, ...); -extern int wscanf(const wchar_t *, ...); - -/* No really supported. These are just for making libstdc++-v3 happy. */ -typedef void *wctrans_t; -extern wint_t towctrans(wint_t, wctrans_t); -extern wctrans_t wctrans (const char *); - -__END_DECLS - -#endif /* _WCHAR_H_ */ diff --git a/libc/include/wctype.h b/libc/include/wctype.h deleted file mode 100644 index b5f18a0e1..000000000 --- a/libc/include/wctype.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/libc/inet/bindresvport.c b/libc/inet/bindresvport.c deleted file mode 100644 index 5d9ad2bd8..000000000 --- a/libc/inet/bindresvport.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include - -#define START_PORT 600 -#define END_PORT IPPORT_RESERVED -#define NUM_PORTS (END_PORT - START_PORT) - -int bindresvport(int sd, struct sockaddr_in *sin) -{ - static short port; - struct sockaddr_in sin0; - int nn, ret; - - if (sin == NULL) { - sin = &sin0; - memset( sin, 0, sizeof *sin ); - sin->sin_family = AF_INET; - } else if (sin->sin_family != AF_INET) { - errno = EPFNOSUPPORT; - return -1; - } - - if (port == 0) { - port = START_PORT + (getpid() % NUM_PORTS); - } - - for (nn = NUM_PORTS; nn > 0; nn--, port++) - { - if (port == END_PORT) - port = START_PORT; - - sin->sin_port = htons(port); - do { - ret = bind(sd, (struct sockaddr*)sin, sizeof(*sin)); - } while (ret < 0 && errno == EINTR); - - if (!ret) - break; - } - return ret; -} diff --git a/libc/inet/inet_addr.c b/libc/inet/inet_addr.c deleted file mode 100644 index 8e480a454..000000000 --- a/libc/inet/inet_addr.c +++ /dev/null @@ -1,72 +0,0 @@ -/* $OpenBSD: inet_addr.c,v 1.9 2005/08/06 20:30:03 espie Exp $ */ - -/* - * ++Copyright++ 1983, 1990, 1993 - * - - * Copyright (c) 1983, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * - - * --Copyright-- - */ - -#include -#include -#include -#include -#include - -/* - * Ascii internet address interpretation routine. - * The value returned is in network order. - */ -in_addr_t -inet_addr(const char *cp) -{ - struct in_addr val; - - if (inet_aton(cp, &val)) - return (val.s_addr); - return (INADDR_NONE); -} diff --git a/libc/inet/inet_aton.c b/libc/inet/inet_aton.c deleted file mode 100644 index c456d07c3..000000000 --- a/libc/inet/inet_aton.c +++ /dev/null @@ -1,157 +0,0 @@ -/* $OpenBSD: inet_addr.c,v 1.9 2005/08/06 20:30:03 espie Exp $ */ - -/* - * ++Copyright++ 1983, 1990, 1993 - * - - * Copyright (c) 1983, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * - - * --Copyright-- - */ - -#include -#include -#include -#include -#include - -/* - * Check whether "cp" is a valid ascii representation - * of an Internet address and convert to a binary address. - * Returns 1 if the address is valid, 0 if not. - * This replaces inet_addr, the return value from which - * cannot distinguish between failure and a local broadcast address. - */ -int -inet_aton(const char *cp, struct in_addr *addr) -{ - in_addr_t val; - int base, n; - char c; - u_int parts[4]; - u_int *pp = parts; - - c = *cp; - for (;;) { - /* - * Collect number up to ``.''. - * Values are specified as for C: - * 0x=hex, 0=octal, isdigit=decimal. - */ - if (!isdigit(c)) - return (0); - val = 0; base = 10; - if (c == '0') { - c = *++cp; - if (c == 'x' || c == 'X') - base = 16, c = *++cp; - else - base = 8; - } - for (;;) { - if (isascii(c) && isdigit(c)) { - val = (val * base) + (c - '0'); - c = *++cp; - } else if (base == 16 && isascii(c) && isxdigit(c)) { - val = (val << 4) | - (c + 10 - (islower(c) ? 'a' : 'A')); - c = *++cp; - } else - break; - } - if (c == '.') { - /* - * Internet format: - * a.b.c.d - * a.b.c (with c treated as 16 bits) - * a.b (with b treated as 24 bits) - */ - if (pp >= parts + 3) - return (0); - *pp++ = val; - c = *++cp; - } else - break; - } - /* - * Check for trailing characters. - */ - if (c != '\0' && (!isascii(c) || !isspace(c))) - return (0); - /* - * Concoct the address according to - * the number of parts specified. - */ - n = pp - parts + 1; - switch (n) { - - case 0: - return (0); /* initial nondigit */ - - case 1: /* a -- 32 bits */ - break; - - case 2: /* a.b -- 8.24 bits */ - if ((val > 0xffffff) || (parts[0] > 0xff)) - return (0); - val |= parts[0] << 24; - break; - - case 3: /* a.b.c -- 8.8.16 bits */ - if ((val > 0xffff) || (parts[0] > 0xff) || (parts[1] > 0xff)) - return (0); - val |= (parts[0] << 24) | (parts[1] << 16); - break; - - case 4: /* a.b.c.d -- 8.8.8.8 bits */ - if ((val > 0xff) || (parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff)) - return (0); - val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8); - break; - } - if (addr) - addr->s_addr = htonl(val); - return (1); -} diff --git a/libc/inet/inet_ntoa.c b/libc/inet/inet_ntoa.c deleted file mode 100644 index ff5d93ded..000000000 --- a/libc/inet/inet_ntoa.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $OpenBSD: inet_ntoa.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Convert network-format internet address - * to base 256 d.d.d.d representation. - */ -#include -#include -#include -#include - -char * -inet_ntoa(struct in_addr in) -{ - static char b[18]; - char *p; - - p = (char *)∈ -#define UC(b) (((int)b)&0xff) - (void)snprintf(b, sizeof(b), - "%u.%u.%u.%u", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3])); - return (b); -} diff --git a/libc/inet/inet_ntop.c b/libc/inet/inet_ntop.c deleted file mode 100644 index 5748da3c4..000000000 --- a/libc/inet/inet_ntop.c +++ /dev/null @@ -1,197 +0,0 @@ -/* $OpenBSD: inet_ntop.c,v 1.7 2005/08/06 20:30:03 espie Exp $ */ - -/* Copyright (c) 1996 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include "arpa_nameser.h" -#include -#include -#include - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -static const char *inet_ntop4(const u_char *src, char *dst, size_t size); -static const char *inet_ntop6(const u_char *src, char *dst, size_t size); - -/* char * - * inet_ntop(af, src, dst, size) - * convert a network format address to presentation format. - * return: - * pointer to presentation format address (`dst'), or NULL (see errno). - * author: - * Paul Vixie, 1996. - */ -const char * -inet_ntop(int af, const void *src, char *dst, size_t size) -{ - switch (af) { - case AF_INET: - return (inet_ntop4(src, dst, size)); - case AF_INET6: - return (inet_ntop6(src, dst, size)); - default: - errno = EAFNOSUPPORT; - return (NULL); - } - /* NOTREACHED */ -} - -/* const char * - * inet_ntop4(src, dst, size) - * format an IPv4 address, more or less like inet_ntoa() - * return: - * `dst' (as a const) - * notes: - * (1) uses no statics - * (2) takes a u_char* not an in_addr as input - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop4(const u_char *src, char *dst, size_t size) -{ - static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof "255.255.255.255"]; - int l; - - l = snprintf(tmp, size, fmt, src[0], src[1], src[2], src[3]); - if (l <= 0 || (size_t)l >= size) { - errno = ENOSPC; - return (NULL); - } - strlcpy(dst, tmp, size); - return (dst); -} - -/* const char * - * inet_ntop6(src, dst, size) - * convert IPv6 binary address into presentation (printable) format - * author: - * Paul Vixie, 1996. - */ -static const char * -inet_ntop6(const u_char *src, char *dst, size_t size) -{ - /* - * Note that int32_t and int16_t need only be "at least" large enough - * to contain a value of the specified size. On some systems, like - * Crays, there is no such thing as an integer variable with 16 bits. - * Keep this in mind if you think this function should have been coded - * to use pointer overlays. All the world's not a VAX. - */ - char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"]; - char *tp, *ep; - struct { int base, len; } best, cur; - u_int words[IN6ADDRSZ / INT16SZ]; - int i; - int advance; - - /* - * Preprocess: - * Copy the input (bytewise) array into a wordwise array. - * Find the longest run of 0x00's in src[] for :: shorthanding. - */ - memset(words, '\0', sizeof words); - for (i = 0; i < IN6ADDRSZ; i++) - words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); - best.base = -1; - best.len = 0; - cur.base = -1; - cur.len = 0; - for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { - if (words[i] == 0) { - if (cur.base == -1) - cur.base = i, cur.len = 1; - else - cur.len++; - } else { - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - cur.base = -1; - } - } - } - if (cur.base != -1) { - if (best.base == -1 || cur.len > best.len) - best = cur; - } - if (best.base != -1 && best.len < 2) - best.base = -1; - - /* - * Format the result. - */ - tp = tmp; - ep = tmp + sizeof(tmp); - for (i = 0; i < (IN6ADDRSZ / INT16SZ) && tp < ep; i++) { - /* Are we inside the best run of 0x00's? */ - if (best.base != -1 && i >= best.base && - i < (best.base + best.len)) { - if (i == best.base) { - if (tp + 1 >= ep) - return (NULL); - *tp++ = ':'; - } - continue; - } - /* Are we following an initial run of 0x00s or any real hex? */ - if (i != 0) { - if (tp + 1 >= ep) - return (NULL); - *tp++ = ':'; - } - /* Is this address an encapsulated IPv4? */ - if (i == 6 && best.base == 0 && - (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { - if (!inet_ntop4(src+12, tp, (size_t)(ep - tp))) - return (NULL); - tp += strlen(tp); - break; - } - advance = snprintf(tp, ep - tp, "%x", words[i]); - if (advance <= 0 || advance >= ep - tp) - return (NULL); - tp += advance; - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) { - if (tp + 1 >= ep) - return (NULL); - *tp++ = ':'; - } - if (tp + 1 >= ep) - return (NULL); - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - if ((size_t)(tp - tmp) > size) { - errno = ENOSPC; - return (NULL); - } - strlcpy(dst, tmp, size); - return (dst); -} diff --git a/libc/inet/inet_pton.c b/libc/inet/inet_pton.c deleted file mode 100644 index 4caf9812b..000000000 --- a/libc/inet/inet_pton.c +++ /dev/null @@ -1,212 +0,0 @@ -/* $OpenBSD: inet_pton.c,v 1.7 2006/12/30 23:37:37 itojun Exp $ */ - -/* Copyright (c) 1996 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include "arpa_nameser.h" -#include -#include - -/* - * WARNING: Don't even consider trying to compile this on a system where - * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. - */ - -static int inet_pton4(const char *src, u_char *dst); -static int inet_pton6(const char *src, u_char *dst); - -/* int - * inet_pton(af, src, dst) - * convert from presentation format (which usually means ASCII printable) - * to network format (which is usually some kind of binary format). - * return: - * 1 if the address was valid for the specified address family - * 0 if the address wasn't valid (`dst' is untouched in this case) - * -1 if some other error occurred (`dst' is untouched in this case, too) - * author: - * Paul Vixie, 1996. - */ -int -inet_pton(int af, const char *src, void *dst) -{ - switch (af) { - case AF_INET: - return (inet_pton4(src, dst)); - case AF_INET6: - return (inet_pton6(src, dst)); - default: - errno = EAFNOSUPPORT; - return (-1); - } - /* NOTREACHED */ -} - -/* int - * inet_pton4(src, dst) - * like inet_aton() but without all the hexadecimal and shorthand. - * return: - * 1 if `src' is a valid dotted quad, else 0. - * notice: - * does not touch `dst' unless it's returning 1. - * author: - * Paul Vixie, 1996. - */ -static int -inet_pton4(const char *src, u_char *dst) -{ - static const char digits[] = "0123456789"; - int saw_digit, octets, ch; - u_char tmp[INADDRSZ], *tp; - - saw_digit = 0; - octets = 0; - *(tp = tmp) = 0; - while ((ch = *src++) != '\0') { - const char *pch; - - if ((pch = strchr(digits, ch)) != NULL) { - u_int new = *tp * 10 + (pch - digits); - - if (new > 255) - return (0); - if (! saw_digit) { - if (++octets > 4) - return (0); - saw_digit = 1; - } - *tp = new; - } else if (ch == '.' && saw_digit) { - if (octets == 4) - return (0); - *++tp = 0; - saw_digit = 0; - } else - return (0); - } - if (octets < 4) - return (0); - - memcpy(dst, tmp, INADDRSZ); - return (1); -} - -/* int - * inet_pton6(src, dst) - * convert presentation level address to network order binary form. - * return: - * 1 if `src' is a valid [RFC1884 2.2] address, else 0. - * notice: - * (1) does not touch `dst' unless it's returning 1. - * (2) :: in a full address is silently ignored. - * credit: - * inspired by Mark Andrews. - * author: - * Paul Vixie, 1996. - */ -static int -inet_pton6(const char *src, u_char *dst) -{ - static const char xdigits_l[] = "0123456789abcdef", - xdigits_u[] = "0123456789ABCDEF"; - u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp; - const char *xdigits, *curtok; - int ch, saw_xdigit, count_xdigit; - u_int val; - - memset((tp = tmp), '\0', IN6ADDRSZ); - endp = tp + IN6ADDRSZ; - colonp = NULL; - /* Leading :: requires some special handling. */ - if (*src == ':') - if (*++src != ':') - return (0); - curtok = src; - saw_xdigit = count_xdigit = 0; - val = 0; - while ((ch = *src++) != '\0') { - const char *pch; - - if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) - pch = strchr((xdigits = xdigits_u), ch); - if (pch != NULL) { - if (count_xdigit >= 4) - return (0); - val <<= 4; - val |= (pch - xdigits); - if (val > 0xffff) - return (0); - saw_xdigit = 1; - count_xdigit++; - continue; - } - if (ch == ':') { - curtok = src; - if (!saw_xdigit) { - if (colonp) - return (0); - colonp = tp; - continue; - } else if (*src == '\0') { - return (0); - } - if (tp + INT16SZ > endp) - return (0); - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - saw_xdigit = 0; - count_xdigit = 0; - val = 0; - continue; - } - if (ch == '.' && ((tp + INADDRSZ) <= endp) && - inet_pton4(curtok, tp) > 0) { - tp += INADDRSZ; - saw_xdigit = 0; - count_xdigit = 0; - break; /* '\0' was seen by inet_pton4(). */ - } - return (0); - } - if (saw_xdigit) { - if (tp + INT16SZ > endp) - return (0); - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - } - if (colonp != NULL) { - /* - * Since some memmove()'s erroneously fail to handle - * overlapping regions, we'll do the shift by hand. - */ - const int n = tp - colonp; - int i; - - for (i = 1; i <= n; i++) { - endp[- i] = colonp[n - i]; - colonp[n - i] = 0; - } - tp = endp; - } - if (tp != endp) - return (0); - memcpy(dst, tmp, IN6ADDRSZ); - return (1); -} diff --git a/libc/kernel/README.TXT b/libc/kernel/README.TXT deleted file mode 100644 index 76dfa4dbf..000000000 --- a/libc/kernel/README.TXT +++ /dev/null @@ -1,276 +0,0 @@ -Bionic comes with a set of 'clean' Linux kernel headers that can safely be -included by userland applications and libraries without fear of hideous -conflicts. for more information why this is needed, see the "RATIONALE" -section at the end of this document. - -these clean headers are automatically generated by several scripts located -in the 'bionic/kernel/tools' directory, which process a set of original -and unmodified kernel headers in order to get rid of many annoying -declarations and constructs that usually result in compilation failure. - -the 'clean headers' only contain type and macro definitions, with the -exception of a couple static inline functions used for performance -reason (e.g. optimized CPU-specific byte-swapping routines) - -they can be included from C++, or when compiling code in strict ANSI mode. -they can be also included before or after any Bionic C library header. - -the generation process works as follows: - - * 'bionic/kernel/original/' - contains a set of kernel headers as normally found in the 'include' - directory of a normal Linux kernel source tree. note that this should - only contain the files that are really needed by Android (use - 'find_headers.py' to find these automatically). - - * 'bionic/kernel/common' - contains the non-arch-specific clean headers and directories - (e.g. linux, asm-generic and mtd) - - *'bionic/kernel/arch-arm/' - contains the ARM-specific directory tree of clean headers. - - * 'bionic/kernel/arch-arm/asm' - contains the real ARM-specific headers - - * 'bionic/kernel/arch-x86' - similarly contains all headers and symlinks to be used on x86 - - * 'bionic/kernel/tools' contains various Python and shell scripts used - to manage and re-generate the headers - -the tools you can use are: - - * tools/find_users.py - scans a list of source files or directories and prints which ones do - include Linux headers. - - * tools/find_headers.py - scans a list of source files or directories and recursively finds all - the original kernel headers they need. - - * tools/clean_header.py - prints the clean version of a given kernel header. with the -u option, - this will also update the corresponding clean header file if its - content has changed. you can also process more than one file with -u - - * tools/update_all.py - automatically update all clean headers from the content of - 'bionic/kernel/original'. this is the script you're likely going to - run whenever you update the original headers. - -NOTE: - if ANDROID_PRODUCT_OUT is defined in your environment, both 'clean_header.py' - and 'update_all.py' will automatically issue "p4 add/edit/delete" commands - appropriately to reflect the changes being made. - - you will need to "p4 submit" manually though... - - -HOW TO BUILD BIONIC AND OTHER PROGRAMS WITH THE CLEAN HEADERS: -============================================================== - -add bionic/kernel/common and bionic/kernel/arch- to your C -include path. that should be enough. Note that Bionic will not compile properly -if you don't. - - -HOW TO SUPPORT ANOTHER ARCHITECTURE: -==================================== - -see the content of tools/defaults.py, you will need to make a few updates -here: - - - add a new item to the 'kernel_archs' list of supported architectures - - - add a proper definition for 'kernel_known__statics' with - relevant definitions. - - - update 'kernel_known_statics' to map "" to - 'kernel_known__statics' - -then, add the new architecture-specific headers to original/asm-. -(please ensure that these are really needed, e.g. with tools/find_headers.py) - -finally, run tools/update_all.py - - - -HOW TO UPDATE THE HEADERS WHEN NEEDED: -====================================== - -IMPORTANT IMPORTANT: - - WHEN UPDATING THE HEADERS, ALWAYS CHECK THAT THE NEW CLEAN HEADERS DO - NOT BREAK THE KERNEL <-> USER ABI, FOR EXAMPLE BY CHANGING THE SIZE - OF A GIVEN TYPE. THIS TASK CANNOT BE EASILY AUTOMATED AT THE MOMENT - -copy any updated kernel header into the corresponding location under -'bionic/kernel/original'. - -for any new kernel header you want to add, first run tools/find_headers.py to be -sure that it is really needed by the Android sources. then add it to -'bionic/kernel/original' - -then, run tools/update_all.py to re-run the auto-cleaning - - - -HOW THE CLEANUP PROCESS WORKS: -============================== - -this section describes the action performed by the cleanup program(s) when they -process the original kernel headers into clean ones: - -1. Optimize well-known macros (e.g. __KERNEL__, __KERNEL_STRICT_NAMES) - - this pass gets rid of everything that is guarded by a well-known macro - definition. this means that a block like - - #ifdef __KERNEL__ - .... - #endif - - will be totally omitted from the output. the optimizer is smart enough to - handle all complex C-preprocessor conditional expression appropriately. - this means that, for example: - - #if defined(__KERNEL__) || defined(FOO) - ... - #endif - - will be transformed into: - - #ifdef FOO - ... - #endif - - see tools/defaults.py for the list of well-known macros used in this pass, - in case you need to update it in the future. - - note that this also remove any reference to a kernel-specific configuration - macro like CONFIG_FOO from the clean headers. - - -2. remove variable and function declarations: - - this pass scans non-directive text and only keeps things that look like a - typedef/struct/union/enum declaration. this allows to get rid of any variable - or function declaration that should only be used within the kernel anyway - (and which normally *should* be guarded in a #ifdef __KERNEL__ ... #endif - block, if the kernel writers were not so messy) - - there are however a few exceptions: it is seldom useful to keep the definition - of some static inline functions performing very simple operations. a good - example is the optimized 32-bit byte-swap function found in - arch-arm/asm/byteorder.h - - the list of exceptions is in tools/defaults.py in case you need to update it - in the future. - - note that we do *not* remove macro definitions, including these macro that - perform a call to one of these kernel-header functions, or even define other - functions. we consider it safe since userland applications have no business - using them anyway. - - -3. whitespace cleanup: - - the final pass remove any comments and empty lines from the final headers. - - -4. add a standard disclaimer: - - prepended to each generated header, contains a message like - "do not edit directly - file was auto-generated by ...." - - -RATIONALE: -========== - -OVERVIEW OF THE CURRENT KERNEL HEADER MESS: -------------------------------------------- - -The original kernel headers are not easily usable from userland applications. -they contain many declarations and construct that will result in a compilation -failure or even worse, incorrect behaviour. for example: - -- some headers try to define Posix types (e.g. size_t, ssize_t) that can - conflict with the corresponding definitions provided by your C library. - -- some headers use constructs that cannot be compiled in ANSI C mode. - -- some headers use constructs do not compile with C++ at all. - -- some headers contain invalid "legacy" definitions for the benefit of old - C libraries (e.g. glibc5) but result in incorrect behaviour if used - directly. - - e.g. gid_t being defined in as a 16-bit type while the - kernel uses 32-bit ids. this results in problems when getgroups() or - setgroups() are called, since they operate on gid_t arrays. - -unfortunately, these headers are also the only source of some really extensive -constant and type definitions that are required by userland applications. -think any library/program that need to access ALSA, or Video4Linux, or -anything related to a specific device or Linux-specific system interface -(e.g. IOCTLS, etc...) - -As a consequence, every Linux distribution provides a set of patched kernel -headers to be used by userland applications (which installs in -/usr/include/linux/, /usr/include/asm/, etc...). these are manually maintained -by distribution packagers, and generated either manually or with various -scripts. these headers are also tailored to GNU LibC and cannot be reused -easily by Bionic. - -for a really long period, the kernel authors have stated that they don't want -to fix the problem, even when someone proposed a patch to start cleaning the -official headers. from their point of view this is purely a library author -problem. - -fortunately, enlightnment happened, and the kernel now provides a way to -install a set of "user-friendly" headers that are generated from the official -ones by stripping the __KERNEL__ protected declarations. - -unfortunately, this is not enough for Bionic because the result still contains -a few broken declarations that are difficult to route around. (see below for -a little bit of details). - -we plan to be able to support these kernel-generated user-land headers in the -future, but the priority on this issue is very low. - - -WHAT WE DO: ------------ - -so we're doomed to repeat the same effort than anyone else. the big difference -here is that we want to automate as much as possible the generation of the -clean headers to easily support additional architectures in the future, -and keep current with upstream changes in the header definitions with the -least possible hassle. - -of course, this is only a race to the bottom. the kernel maintainers still -feel free to randomly break the structure of their headers (e.g. moving the -location of some files) occasionally, so we'll need to keep up with that by -updating our build script/original headers as these cases happen. - -what we do is keep a set of "original" kernel headers, and process them -automatically to generate a set of "clean" headers that can be used from -userland and the C library. - -note that the "original" headers can be tweaked a little to avoid some subtle -issues. for example: - -- when the location of various USB-related headers changes in the kernel - source tree, we want to keep them at the same location in our generated - headers (there is no reason to break the userland API for something - like that). - -- sometimes, we prefer to take certain things out of blocks guarded by a - #ifdef __KERNEL__ .. #endif. for example, on recent kernels - only includes when in kernel mode. we make it available to - userland as well since some code out there assumes that this is the case. - -- sometimes, the header is simply incorrect (e.g. it uses a type without - including the header that defines it before-hand) - diff --git a/libc/kernel/arch-arm/asm/a.out.h b/libc/kernel/arch-arm/asm/a.out.h deleted file mode 100644 index e8f17dc1c..000000000 --- a/libc/kernel/arch-arm/asm/a.out.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARM_A_OUT_H__ -#define __ARM_A_OUT_H__ - -#include -#include - -struct exec -{ - __u32 a_info; - __u32 a_text; - __u32 a_data; - __u32 a_bss; - __u32 a_syms; - __u32 a_entry; - __u32 a_trsize; - __u32 a_drsize; -}; - -#define N_TXTADDR(a) (0x00008000) - -#define N_TRSIZE(a) ((a).a_trsize) -#define N_DRSIZE(a) ((a).a_drsize) -#define N_SYMSIZE(a) ((a).a_syms) - -#define M_ARM 103 - -#ifndef LIBRARY_START_TEXT -#define LIBRARY_START_TEXT (0x00c00000) -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/board-perseus2.h b/libc/kernel/arch-arm/asm/arch/board-perseus2.h deleted file mode 100644 index c6c5413fd..000000000 --- a/libc/kernel/arch-arm/asm/arch/board-perseus2.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_PERSEUS2_H -#define __ASM_ARCH_OMAP_PERSEUS2_H - -#include - -#ifndef OMAP_SDRAM_DEVICE -#define OMAP_SDRAM_DEVICE D256M_1X16_4B -#endif - -#define MAXIRQNUM IH_BOARD_BASE -#define MAXFIQNUM MAXIRQNUM -#define MAXSWINUM MAXIRQNUM - -#define NR_IRQS (MAXIRQNUM + 1) - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/board.h b/libc/kernel/arch-arm/asm/arch/board.h deleted file mode 100644 index a7a4c669a..000000000 --- a/libc/kernel/arch-arm/asm/arch/board.h +++ /dev/null @@ -1,163 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _OMAP_BOARD_H -#define _OMAP_BOARD_H - -#include - -#include - -#define OMAP_TAG_CLOCK 0x4f01 -#define OMAP_TAG_MMC 0x4f02 -#define OMAP_TAG_SERIAL_CONSOLE 0x4f03 -#define OMAP_TAG_USB 0x4f04 -#define OMAP_TAG_LCD 0x4f05 -#define OMAP_TAG_GPIO_SWITCH 0x4f06 -#define OMAP_TAG_UART 0x4f07 -#define OMAP_TAG_FBMEM 0x4f08 -#define OMAP_TAG_STI_CONSOLE 0x4f09 -#define OMAP_TAG_CAMERA_SENSOR 0x4f0a -#define OMAP_TAG_BT 0x4f0b - -#define OMAP_TAG_BOOT_REASON 0x4f80 -#define OMAP_TAG_FLASH_PART 0x4f81 -#define OMAP_TAG_VERSION_STR 0x4f82 - -struct omap_clock_config { - - u8 system_clock_type; -}; - -struct omap_mmc_conf { - unsigned enabled:1; - - unsigned nomux:1; - - unsigned cover:1; - - unsigned wire4:1; - s16 power_pin; - s16 switch_pin; - s16 wp_pin; -}; - -struct omap_mmc_config { - struct omap_mmc_conf mmc[2]; -}; - -struct omap_serial_console_config { - u8 console_uart; - u32 console_speed; -}; - -struct omap_sti_console_config { - unsigned enable:1; - u8 channel; -}; - -struct omap_camera_sensor_config { - u16 reset_gpio; - int (*power_on)(void * data); - int (*power_off)(void * data); -}; - -struct omap_usb_config { - - unsigned register_host:1; - unsigned register_dev:1; - u8 otg; - - u8 hmc_mode; - - u8 rwc; - - u8 pins[3]; -}; - -struct omap_lcd_config { - char panel_name[16]; - char ctrl_name[16]; - s16 nreset_gpio; - u8 data_lines; -}; - -struct device; -struct fb_info; -struct omap_backlight_config { - int default_intensity; - int (*set_power)(struct device *dev, int state); - int (*check_fb)(struct fb_info *fb); -}; - -struct omap_fbmem_config { - u32 start; - u32 size; -}; - -struct omap_pwm_led_platform_data { - const char *name; - int intensity_timer; - int blink_timer; - void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off); -}; - -struct omap_gpio_switch_config { - char name[12]; - u16 gpio; - int flags:4; - int type:4; - int key_code:24; -}; - -struct omap_uart_config { - - unsigned int enabled_uarts; -}; - -struct omap_flash_part_config { - char part_table[0]; -}; - -struct omap_boot_reason_config { - char reason_str[12]; -}; - -struct omap_version_config { - char component[12]; - char version[12]; -}; - -struct omap_board_config_entry { - u16 tag; - u16 len; - u8 data[0]; -}; - -struct omap_board_config_kernel { - u16 tag; - const void *data; -}; - -struct omap_bluetooth_config { - u8 chip_type; - u8 bt_uart; - u8 bd_addr[6]; - u8 bt_sysclk; - int bt_wakeup_gpio; - int host_wakeup_gpio; - int reset_gpio; -}; - -#define omap_get_config(tag, type) ((const type *) __omap_get_config((tag), sizeof(type), 0)) -#define omap_get_nr_config(tag, type, nr) ((const type *) __omap_get_config((tag), sizeof(type), (nr))) - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/cpu.h b/libc/kernel/arch-arm/asm/arch/cpu.h deleted file mode 100644 index fa7a40861..000000000 --- a/libc/kernel/arch-arm/asm/arch/cpu.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_CPU_H -#define __ASM_ARCH_OMAP_CPU_H - -#define omap2_cpu_rev() ((system_rev >> 8) & 0x0f) - -#undef MULTI_OMAP1 -#undef MULTI_OMAP2 -#undef OMAP_NAME - -#define GET_OMAP_CLASS (system_rev & 0xff) - -#define IS_OMAP_CLASS(class, id) static inline int is_omap ##class (void) { return (GET_OMAP_CLASS == (id)) ? 1 : 0; } - -#define GET_OMAP_SUBCLASS ((system_rev >> 20) & 0x0fff) - -#define IS_OMAP_SUBCLASS(subclass, id) static inline int is_omap ##subclass (void) { return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0; } - -#define cpu_is_omap7xx() 0 -#define cpu_is_omap15xx() 0 -#define cpu_is_omap16xx() 0 -#define cpu_is_omap24xx() 0 -#define cpu_is_omap242x() 0 -#define cpu_is_omap243x() 0 -#ifdef MULTI_OMAP1 -#else -#endif -#define GET_OMAP_TYPE ((system_rev >> 16) & 0xffff) -#define IS_OMAP_TYPE(type, id) static inline int is_omap ##type (void) { return (GET_OMAP_TYPE == (id)) ? 1 : 0; } -#define cpu_is_omap310() 0 -#define cpu_is_omap730() 0 -#define cpu_is_omap1510() 0 -#define cpu_is_omap1610() 0 -#define cpu_is_omap5912() 0 -#define cpu_is_omap1611() 0 -#define cpu_is_omap1621() 0 -#define cpu_is_omap1710() 0 -#define cpu_is_omap2420() 0 -#define cpu_is_omap2422() 0 -#define cpu_is_omap2423() 0 -#define cpu_is_omap2430() 0 -#ifdef MULTI_OMAP1 -#else -#endif -#define cpu_class_is_omap1() (cpu_is_omap730() || cpu_is_omap15xx() || cpu_is_omap16xx()) -#define cpu_class_is_omap2() cpu_is_omap24xx() -#endif diff --git a/libc/kernel/arch-arm/asm/arch/dma.h b/libc/kernel/arch-arm/asm/arch/dma.h deleted file mode 100644 index 5e5be7652..000000000 --- a/libc/kernel/arch-arm/asm/arch/dma.h +++ /dev/null @@ -1,318 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_DMA_H -#define __ASM_ARCH_DMA_H - -#define OMAP_DMA_BASE (0xfffed800) -#define OMAP_DMA_GCR (OMAP_DMA_BASE + 0x400) -#define OMAP_DMA_GSCR (OMAP_DMA_BASE + 0x404) -#define OMAP_DMA_GRST (OMAP_DMA_BASE + 0x408) -#define OMAP_DMA_HW_ID (OMAP_DMA_BASE + 0x442) -#define OMAP_DMA_PCH2_ID (OMAP_DMA_BASE + 0x444) -#define OMAP_DMA_PCH0_ID (OMAP_DMA_BASE + 0x446) -#define OMAP_DMA_PCH1_ID (OMAP_DMA_BASE + 0x448) -#define OMAP_DMA_PCHG_ID (OMAP_DMA_BASE + 0x44a) -#define OMAP_DMA_PCHD_ID (OMAP_DMA_BASE + 0x44c) -#define OMAP_DMA_CAPS_0_U (OMAP_DMA_BASE + 0x44e) -#define OMAP_DMA_CAPS_0_L (OMAP_DMA_BASE + 0x450) -#define OMAP_DMA_CAPS_1_U (OMAP_DMA_BASE + 0x452) -#define OMAP_DMA_CAPS_1_L (OMAP_DMA_BASE + 0x454) -#define OMAP_DMA_CAPS_2 (OMAP_DMA_BASE + 0x456) -#define OMAP_DMA_CAPS_3 (OMAP_DMA_BASE + 0x458) -#define OMAP_DMA_CAPS_4 (OMAP_DMA_BASE + 0x45a) -#define OMAP_DMA_PCH2_SR (OMAP_DMA_BASE + 0x460) -#define OMAP_DMA_PCH0_SR (OMAP_DMA_BASE + 0x480) -#define OMAP_DMA_PCH1_SR (OMAP_DMA_BASE + 0x482) -#define OMAP_DMA_PCHD_SR (OMAP_DMA_BASE + 0x4c0) - -#define OMAP24XX_DMA_BASE (L4_24XX_BASE + 0x56000) -#define OMAP_DMA4_REVISION (OMAP24XX_DMA_BASE + 0x00) -#define OMAP_DMA4_GCR_REG (OMAP24XX_DMA_BASE + 0x78) -#define OMAP_DMA4_IRQSTATUS_L0 (OMAP24XX_DMA_BASE + 0x08) -#define OMAP_DMA4_IRQSTATUS_L1 (OMAP24XX_DMA_BASE + 0x0c) -#define OMAP_DMA4_IRQSTATUS_L2 (OMAP24XX_DMA_BASE + 0x10) -#define OMAP_DMA4_IRQSTATUS_L3 (OMAP24XX_DMA_BASE + 0x14) -#define OMAP_DMA4_IRQENABLE_L0 (OMAP24XX_DMA_BASE + 0x18) -#define OMAP_DMA4_IRQENABLE_L1 (OMAP24XX_DMA_BASE + 0x1c) -#define OMAP_DMA4_IRQENABLE_L2 (OMAP24XX_DMA_BASE + 0x20) -#define OMAP_DMA4_IRQENABLE_L3 (OMAP24XX_DMA_BASE + 0x24) -#define OMAP_DMA4_SYSSTATUS (OMAP24XX_DMA_BASE + 0x28) -#define OMAP_DMA4_CAPS_0 (OMAP24XX_DMA_BASE + 0x64) -#define OMAP_DMA4_CAPS_2 (OMAP24XX_DMA_BASE + 0x6c) -#define OMAP_DMA4_CAPS_3 (OMAP24XX_DMA_BASE + 0x70) -#define OMAP_DMA4_CAPS_4 (OMAP24XX_DMA_BASE + 0x74) - -#define OMAP_LOGICAL_DMA_CH_COUNT 32 - -#define OMAP_DMA_CCR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x80) -#define OMAP_DMA_CLNK_CTRL_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x84) -#define OMAP_DMA_CICR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x88) -#define OMAP_DMA_CSR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x8c) -#define OMAP_DMA_CSDP_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x90) -#define OMAP_DMA_CEN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x94) -#define OMAP_DMA_CFN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x98) -#define OMAP_DMA_CSEI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xa4) -#define OMAP_DMA_CSFI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xa8) -#define OMAP_DMA_CDEI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xac) -#define OMAP_DMA_CDFI_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xb0) -#define OMAP_DMA_CSAC_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xb4) -#define OMAP_DMA_CDAC_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xb8) - -#define OMAP1_DMA_CSSA_L_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x08) -#define OMAP1_DMA_CSSA_U_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x0a) -#define OMAP1_DMA_CDSA_L_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x0c) -#define OMAP1_DMA_CDSA_U_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x0e) -#define OMAP1_DMA_COLOR_L_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x20) -#define OMAP1_DMA_CCR2_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x24) -#define OMAP1_DMA_COLOR_U_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x22) -#define OMAP1_DMA_LCH_CTRL_REG(n) __REG16(OMAP_DMA_BASE + 0x40 * (n) + 0x2a) - -#define OMAP2_DMA_CSSA_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0x9c) -#define OMAP2_DMA_CDSA_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xa0) -#define OMAP2_DMA_CCEN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xbc) -#define OMAP2_DMA_CCFN_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xc0) -#define OMAP2_DMA_COLOR_REG(n) __REG32(OMAP24XX_DMA_BASE + 0x60 * (n) + 0xc4) - -#define OMAP_DMA_NO_DEVICE 0 -#define OMAP_DMA_MCSI1_TX 1 -#define OMAP_DMA_MCSI1_RX 2 -#define OMAP_DMA_I2C_RX 3 -#define OMAP_DMA_I2C_TX 4 -#define OMAP_DMA_EXT_NDMA_REQ 5 -#define OMAP_DMA_EXT_NDMA_REQ2 6 -#define OMAP_DMA_UWIRE_TX 7 -#define OMAP_DMA_MCBSP1_TX 8 -#define OMAP_DMA_MCBSP1_RX 9 -#define OMAP_DMA_MCBSP3_TX 10 -#define OMAP_DMA_MCBSP3_RX 11 -#define OMAP_DMA_UART1_TX 12 -#define OMAP_DMA_UART1_RX 13 -#define OMAP_DMA_UART2_TX 14 -#define OMAP_DMA_UART2_RX 15 -#define OMAP_DMA_MCBSP2_TX 16 -#define OMAP_DMA_MCBSP2_RX 17 -#define OMAP_DMA_UART3_TX 18 -#define OMAP_DMA_UART3_RX 19 -#define OMAP_DMA_CAMERA_IF_RX 20 -#define OMAP_DMA_MMC_TX 21 -#define OMAP_DMA_MMC_RX 22 -#define OMAP_DMA_NAND 23 -#define OMAP_DMA_IRQ_LCD_LINE 24 -#define OMAP_DMA_MEMORY_STICK 25 -#define OMAP_DMA_USB_W2FC_RX0 26 -#define OMAP_DMA_USB_W2FC_RX1 27 -#define OMAP_DMA_USB_W2FC_RX2 28 -#define OMAP_DMA_USB_W2FC_TX0 29 -#define OMAP_DMA_USB_W2FC_TX1 30 -#define OMAP_DMA_USB_W2FC_TX2 31 - -#define OMAP_DMA_CRYPTO_DES_IN 32 -#define OMAP_DMA_SPI_TX 33 -#define OMAP_DMA_SPI_RX 34 -#define OMAP_DMA_CRYPTO_HASH 35 -#define OMAP_DMA_CCP_ATTN 36 -#define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37 -#define OMAP_DMA_CMT_APE_TX_CHAN_0 38 -#define OMAP_DMA_CMT_APE_RV_CHAN_0 39 -#define OMAP_DMA_CMT_APE_TX_CHAN_1 40 -#define OMAP_DMA_CMT_APE_RV_CHAN_1 41 -#define OMAP_DMA_CMT_APE_TX_CHAN_2 42 -#define OMAP_DMA_CMT_APE_RV_CHAN_2 43 -#define OMAP_DMA_CMT_APE_TX_CHAN_3 44 -#define OMAP_DMA_CMT_APE_RV_CHAN_3 45 -#define OMAP_DMA_CMT_APE_TX_CHAN_4 46 -#define OMAP_DMA_CMT_APE_RV_CHAN_4 47 -#define OMAP_DMA_CMT_APE_TX_CHAN_5 48 -#define OMAP_DMA_CMT_APE_RV_CHAN_5 49 -#define OMAP_DMA_CMT_APE_TX_CHAN_6 50 -#define OMAP_DMA_CMT_APE_RV_CHAN_6 51 -#define OMAP_DMA_CMT_APE_TX_CHAN_7 52 -#define OMAP_DMA_CMT_APE_RV_CHAN_7 53 -#define OMAP_DMA_MMC2_TX 54 -#define OMAP_DMA_MMC2_RX 55 -#define OMAP_DMA_CRYPTO_DES_OUT 56 - -#define OMAP24XX_DMA_NO_DEVICE 0 -#define OMAP24XX_DMA_XTI_DMA 1 -#define OMAP24XX_DMA_EXT_DMAREQ0 2 -#define OMAP24XX_DMA_EXT_DMAREQ1 3 -#define OMAP24XX_DMA_GPMC 4 -#define OMAP24XX_DMA_GFX 5 -#define OMAP24XX_DMA_DSS 6 -#define OMAP24XX_DMA_VLYNQ_TX 7 -#define OMAP24XX_DMA_CWT 8 -#define OMAP24XX_DMA_AES_TX 9 -#define OMAP24XX_DMA_AES_RX 10 -#define OMAP24XX_DMA_DES_TX 11 -#define OMAP24XX_DMA_DES_RX 12 -#define OMAP24XX_DMA_SHA1MD5_RX 13 -#define OMAP24XX_DMA_EXT_DMAREQ2 14 -#define OMAP24XX_DMA_EXT_DMAREQ3 15 -#define OMAP24XX_DMA_EXT_DMAREQ4 16 -#define OMAP24XX_DMA_EAC_AC_RD 17 -#define OMAP24XX_DMA_EAC_AC_WR 18 -#define OMAP24XX_DMA_EAC_MD_UL_RD 19 -#define OMAP24XX_DMA_EAC_MD_UL_WR 20 -#define OMAP24XX_DMA_EAC_MD_DL_RD 21 -#define OMAP24XX_DMA_EAC_MD_DL_WR 22 -#define OMAP24XX_DMA_EAC_BT_UL_RD 23 -#define OMAP24XX_DMA_EAC_BT_UL_WR 24 -#define OMAP24XX_DMA_EAC_BT_DL_RD 25 -#define OMAP24XX_DMA_EAC_BT_DL_WR 26 -#define OMAP24XX_DMA_I2C1_TX 27 -#define OMAP24XX_DMA_I2C1_RX 28 -#define OMAP24XX_DMA_I2C2_TX 29 -#define OMAP24XX_DMA_I2C2_RX 30 -#define OMAP24XX_DMA_MCBSP1_TX 31 -#define OMAP24XX_DMA_MCBSP1_RX 32 -#define OMAP24XX_DMA_MCBSP2_TX 33 -#define OMAP24XX_DMA_MCBSP2_RX 34 -#define OMAP24XX_DMA_SPI1_TX0 35 -#define OMAP24XX_DMA_SPI1_RX0 36 -#define OMAP24XX_DMA_SPI1_TX1 37 -#define OMAP24XX_DMA_SPI1_RX1 38 -#define OMAP24XX_DMA_SPI1_TX2 39 -#define OMAP24XX_DMA_SPI1_RX2 40 -#define OMAP24XX_DMA_SPI1_TX3 41 -#define OMAP24XX_DMA_SPI1_RX3 42 -#define OMAP24XX_DMA_SPI2_TX0 43 -#define OMAP24XX_DMA_SPI2_RX0 44 -#define OMAP24XX_DMA_SPI2_TX1 45 -#define OMAP24XX_DMA_SPI2_RX1 46 - -#define OMAP24XX_DMA_UART1_TX 49 -#define OMAP24XX_DMA_UART1_RX 50 -#define OMAP24XX_DMA_UART2_TX 51 -#define OMAP24XX_DMA_UART2_RX 52 -#define OMAP24XX_DMA_UART3_TX 53 -#define OMAP24XX_DMA_UART3_RX 54 -#define OMAP24XX_DMA_USB_W2FC_TX0 55 -#define OMAP24XX_DMA_USB_W2FC_RX0 56 -#define OMAP24XX_DMA_USB_W2FC_TX1 57 -#define OMAP24XX_DMA_USB_W2FC_RX1 58 -#define OMAP24XX_DMA_USB_W2FC_TX2 59 -#define OMAP24XX_DMA_USB_W2FC_RX2 60 -#define OMAP24XX_DMA_MMC1_TX 61 -#define OMAP24XX_DMA_MMC1_RX 62 -#define OMAP24XX_DMA_MS 63 -#define OMAP24XX_DMA_EXT_DMAREQ5 64 - -#define OMAP1510_DMA_LCD_BASE (0xfffedb00) -#define OMAP1510_DMA_LCD_CTRL (OMAP1510_DMA_LCD_BASE + 0x00) -#define OMAP1510_DMA_LCD_TOP_F1_L (OMAP1510_DMA_LCD_BASE + 0x02) -#define OMAP1510_DMA_LCD_TOP_F1_U (OMAP1510_DMA_LCD_BASE + 0x04) -#define OMAP1510_DMA_LCD_BOT_F1_L (OMAP1510_DMA_LCD_BASE + 0x06) -#define OMAP1510_DMA_LCD_BOT_F1_U (OMAP1510_DMA_LCD_BASE + 0x08) - -#define OMAP1610_DMA_LCD_BASE (0xfffee300) -#define OMAP1610_DMA_LCD_CSDP (OMAP1610_DMA_LCD_BASE + 0xc0) -#define OMAP1610_DMA_LCD_CCR (OMAP1610_DMA_LCD_BASE + 0xc2) -#define OMAP1610_DMA_LCD_CTRL (OMAP1610_DMA_LCD_BASE + 0xc4) -#define OMAP1610_DMA_LCD_TOP_B1_L (OMAP1610_DMA_LCD_BASE + 0xc8) -#define OMAP1610_DMA_LCD_TOP_B1_U (OMAP1610_DMA_LCD_BASE + 0xca) -#define OMAP1610_DMA_LCD_BOT_B1_L (OMAP1610_DMA_LCD_BASE + 0xcc) -#define OMAP1610_DMA_LCD_BOT_B1_U (OMAP1610_DMA_LCD_BASE + 0xce) -#define OMAP1610_DMA_LCD_TOP_B2_L (OMAP1610_DMA_LCD_BASE + 0xd0) -#define OMAP1610_DMA_LCD_TOP_B2_U (OMAP1610_DMA_LCD_BASE + 0xd2) -#define OMAP1610_DMA_LCD_BOT_B2_L (OMAP1610_DMA_LCD_BASE + 0xd4) -#define OMAP1610_DMA_LCD_BOT_B2_U (OMAP1610_DMA_LCD_BASE + 0xd6) -#define OMAP1610_DMA_LCD_SRC_EI_B1 (OMAP1610_DMA_LCD_BASE + 0xd8) -#define OMAP1610_DMA_LCD_SRC_FI_B1_L (OMAP1610_DMA_LCD_BASE + 0xda) -#define OMAP1610_DMA_LCD_SRC_EN_B1 (OMAP1610_DMA_LCD_BASE + 0xe0) -#define OMAP1610_DMA_LCD_SRC_FN_B1 (OMAP1610_DMA_LCD_BASE + 0xe4) -#define OMAP1610_DMA_LCD_LCH_CTRL (OMAP1610_DMA_LCD_BASE + 0xea) -#define OMAP1610_DMA_LCD_SRC_FI_B1_U (OMAP1610_DMA_LCD_BASE + 0xf4) - -#define OMAP1_DMA_TOUT_IRQ (1 << 0) -#define OMAP_DMA_DROP_IRQ (1 << 1) -#define OMAP_DMA_HALF_IRQ (1 << 2) -#define OMAP_DMA_FRAME_IRQ (1 << 3) -#define OMAP_DMA_LAST_IRQ (1 << 4) -#define OMAP_DMA_BLOCK_IRQ (1 << 5) -#define OMAP1_DMA_SYNC_IRQ (1 << 6) -#define OMAP2_DMA_PKT_IRQ (1 << 7) -#define OMAP2_DMA_TRANS_ERR_IRQ (1 << 8) -#define OMAP2_DMA_SECURE_ERR_IRQ (1 << 9) -#define OMAP2_DMA_SUPERVISOR_ERR_IRQ (1 << 10) -#define OMAP2_DMA_MISALIGNED_ERR_IRQ (1 << 11) - -#define OMAP_DMA_DATA_TYPE_S8 0x00 -#define OMAP_DMA_DATA_TYPE_S16 0x01 -#define OMAP_DMA_DATA_TYPE_S32 0x02 - -#define OMAP_DMA_SYNC_ELEMENT 0x00 -#define OMAP_DMA_SYNC_FRAME 0x01 -#define OMAP_DMA_SYNC_BLOCK 0x02 - -#define OMAP_DMA_PORT_EMIFF 0x00 -#define OMAP_DMA_PORT_EMIFS 0x01 -#define OMAP_DMA_PORT_OCP_T1 0x02 -#define OMAP_DMA_PORT_TIPB 0x03 -#define OMAP_DMA_PORT_OCP_T2 0x04 -#define OMAP_DMA_PORT_MPUI 0x05 - -#define OMAP_DMA_AMODE_CONSTANT 0x00 -#define OMAP_DMA_AMODE_POST_INC 0x01 -#define OMAP_DMA_AMODE_SINGLE_IDX 0x02 -#define OMAP_DMA_AMODE_DOUBLE_IDX 0x03 - -enum { - OMAP_LCD_DMA_B1_TOP, - OMAP_LCD_DMA_B1_BOTTOM, - OMAP_LCD_DMA_B2_TOP, - OMAP_LCD_DMA_B2_BOTTOM -}; - -enum omap_dma_burst_mode { - OMAP_DMA_DATA_BURST_DIS = 0, - OMAP_DMA_DATA_BURST_4, - OMAP_DMA_DATA_BURST_8, - OMAP_DMA_DATA_BURST_16, -}; - -enum omap_dma_color_mode { - OMAP_DMA_COLOR_DIS = 0, - OMAP_DMA_CONSTANT_FILL, - OMAP_DMA_TRANSPARENT_COPY -}; - -enum omap_dma_write_mode { - OMAP_DMA_WRITE_NON_POSTED = 0, - OMAP_DMA_WRITE_POSTED, - OMAP_DMA_WRITE_LAST_NON_POSTED -}; - -struct omap_dma_channel_params { - int data_type; - int elem_count; - int frame_count; - - int src_port; - int src_amode; - unsigned long src_start; - int src_ei; - int src_fi; - - int dst_port; - int dst_amode; - unsigned long dst_start; - int dst_ei; - int dst_fi; - - int trigger; - int sync_mode; - int src_or_dst_synch; - - int ie; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/fpga.h b/libc/kernel/arch-arm/asm/arch/fpga.h deleted file mode 100644 index a1b210dc7..000000000 --- a/libc/kernel/arch-arm/asm/arch/fpga.h +++ /dev/null @@ -1,160 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_FPGA_H -#define __ASM_ARCH_OMAP_FPGA_H - -#define omap1510_fpga_init_irq() (0) - -#define fpga_read(reg) __raw_readb(reg) -#define fpga_write(val, reg) __raw_writeb(val, reg) - -#define H2P2_DBG_FPGA_BASE 0xE8000000 -#define H2P2_DBG_FPGA_SIZE SZ_4K -#define H2P2_DBG_FPGA_START 0x04000000 - -#define H2P2_DBG_FPGA_ETHR_START (H2P2_DBG_FPGA_START + 0x300) -#define H2P2_DBG_FPGA_FPGA_REV (H2P2_DBG_FPGA_BASE + 0x10) -#define H2P2_DBG_FPGA_BOARD_REV (H2P2_DBG_FPGA_BASE + 0x12) -#define H2P2_DBG_FPGA_GPIO (H2P2_DBG_FPGA_BASE + 0x14) -#define H2P2_DBG_FPGA_LEDS (H2P2_DBG_FPGA_BASE + 0x16) -#define H2P2_DBG_FPGA_MISC_INPUTS (H2P2_DBG_FPGA_BASE + 0x18) -#define H2P2_DBG_FPGA_LAN_STATUS (H2P2_DBG_FPGA_BASE + 0x1A) -#define H2P2_DBG_FPGA_LAN_RESET (H2P2_DBG_FPGA_BASE + 0x1C) - -struct h2p2_dbg_fpga { - - u16 smc91x[8]; - - u16 fpga_rev; - u16 board_rev; - u16 gpio_outputs; - u16 leds; - - u16 misc_inputs; - u16 lan_status; - u16 lan_reset; - u16 reserved0; - - u16 ps2_data; - u16 ps2_ctrl; - -}; - -#define H2P2_DBG_FPGA_LED_GREEN (1 << 15) -#define H2P2_DBG_FPGA_LED_AMBER (1 << 14) -#define H2P2_DBG_FPGA_LED_RED (1 << 13) -#define H2P2_DBG_FPGA_LED_BLUE (1 << 12) - -#define H2P2_DBG_FPGA_LOAD_METER (1 << 0) -#define H2P2_DBG_FPGA_LOAD_METER_SIZE 11 -#define H2P2_DBG_FPGA_LOAD_METER_MASK ((1 << H2P2_DBG_FPGA_LOAD_METER_SIZE) - 1) - -#define H2P2_DBG_FPGA_P2_LED_TIMER (1 << 0) -#define H2P2_DBG_FPGA_P2_LED_IDLE (1 << 1) - -#define OMAP1510_FPGA_BASE 0xE8000000 -#define OMAP1510_FPGA_SIZE SZ_4K -#define OMAP1510_FPGA_START 0x08000000 - -#define OMAP1510_FPGA_REV_LOW (OMAP1510_FPGA_BASE + 0x0) -#define OMAP1510_FPGA_REV_HIGH (OMAP1510_FPGA_BASE + 0x1) - -#define OMAP1510_FPGA_LCD_PANEL_CONTROL (OMAP1510_FPGA_BASE + 0x2) -#define OMAP1510_FPGA_LED_DIGIT (OMAP1510_FPGA_BASE + 0x3) -#define INNOVATOR_FPGA_HID_SPI (OMAP1510_FPGA_BASE + 0x4) -#define OMAP1510_FPGA_POWER (OMAP1510_FPGA_BASE + 0x5) - -#define OMAP1510_FPGA_ISR_LO (OMAP1510_FPGA_BASE + 0x6) -#define OMAP1510_FPGA_ISR_HI (OMAP1510_FPGA_BASE + 0x7) - -#define OMAP1510_FPGA_IMR_LO (OMAP1510_FPGA_BASE + 0x8) -#define OMAP1510_FPGA_IMR_HI (OMAP1510_FPGA_BASE + 0x9) - -#define OMAP1510_FPGA_HOST_RESET (OMAP1510_FPGA_BASE + 0xa) -#define OMAP1510_FPGA_RST (OMAP1510_FPGA_BASE + 0xb) - -#define OMAP1510_FPGA_AUDIO (OMAP1510_FPGA_BASE + 0xc) -#define OMAP1510_FPGA_DIP (OMAP1510_FPGA_BASE + 0xe) -#define OMAP1510_FPGA_FPGA_IO (OMAP1510_FPGA_BASE + 0xf) -#define OMAP1510_FPGA_UART1 (OMAP1510_FPGA_BASE + 0x14) -#define OMAP1510_FPGA_UART2 (OMAP1510_FPGA_BASE + 0x15) -#define OMAP1510_FPGA_OMAP1510_STATUS (OMAP1510_FPGA_BASE + 0x16) -#define OMAP1510_FPGA_BOARD_REV (OMAP1510_FPGA_BASE + 0x18) -#define OMAP1510P1_PPT_DATA (OMAP1510_FPGA_BASE + 0x100) -#define OMAP1510P1_PPT_STATUS (OMAP1510_FPGA_BASE + 0x101) -#define OMAP1510P1_PPT_CONTROL (OMAP1510_FPGA_BASE + 0x102) - -#define OMAP1510_FPGA_TOUCHSCREEN (OMAP1510_FPGA_BASE + 0x204) - -#define INNOVATOR_FPGA_INFO (OMAP1510_FPGA_BASE + 0x205) -#define INNOVATOR_FPGA_LCD_BRIGHT_LO (OMAP1510_FPGA_BASE + 0x206) -#define INNOVATOR_FPGA_LCD_BRIGHT_HI (OMAP1510_FPGA_BASE + 0x207) -#define INNOVATOR_FPGA_LED_GRN_LO (OMAP1510_FPGA_BASE + 0x208) -#define INNOVATOR_FPGA_LED_GRN_HI (OMAP1510_FPGA_BASE + 0x209) -#define INNOVATOR_FPGA_LED_RED_LO (OMAP1510_FPGA_BASE + 0x20a) -#define INNOVATOR_FPGA_LED_RED_HI (OMAP1510_FPGA_BASE + 0x20b) -#define INNOVATOR_FPGA_CAM_USB_CONTROL (OMAP1510_FPGA_BASE + 0x20c) -#define INNOVATOR_FPGA_EXP_CONTROL (OMAP1510_FPGA_BASE + 0x20d) -#define INNOVATOR_FPGA_ISR2 (OMAP1510_FPGA_BASE + 0x20e) -#define INNOVATOR_FPGA_IMR2 (OMAP1510_FPGA_BASE + 0x210) - -#define OMAP1510_FPGA_ETHR_START (OMAP1510_FPGA_START + 0x300) - -#define OMAP1510_FPGA_RESET_VALUE 0x42 - -#define OMAP1510_FPGA_PCR_IF_PD0 (1 << 7) -#define OMAP1510_FPGA_PCR_COM2_EN (1 << 6) -#define OMAP1510_FPGA_PCR_COM1_EN (1 << 5) -#define OMAP1510_FPGA_PCR_EXP_PD0 (1 << 4) -#define OMAP1510_FPGA_PCR_EXP_PD1 (1 << 3) -#define OMAP1510_FPGA_PCR_48MHZ_CLK (1 << 2) -#define OMAP1510_FPGA_PCR_4MHZ_CLK (1 << 1) -#define OMAP1510_FPGA_PCR_RSRVD_BIT0 (1 << 0) - -#define OMAP1510_FPGA_HID_SCLK (1<<0) -#define OMAP1510_FPGA_HID_MOSI (1<<1) -#define OMAP1510_FPGA_HID_nSS (1<<2) -#define OMAP1510_FPGA_HID_nHSUS (1<<3) -#define OMAP1510_FPGA_HID_MISO (1<<4) -#define OMAP1510_FPGA_HID_ATN (1<<5) -#define OMAP1510_FPGA_HID_rsrvd (1<<6) -#define OMAP1510_FPGA_HID_RESETn (1<<7) - -#define OMAP1510_INT_FPGA (IH_GPIO_BASE + 13) - -#define OMAP1510_IH_FPGA_BASE IH_BOARD_BASE -#define OMAP1510_INT_FPGA_ATN (OMAP1510_IH_FPGA_BASE + 0) -#define OMAP1510_INT_FPGA_ACK (OMAP1510_IH_FPGA_BASE + 1) -#define OMAP1510_INT_FPGA2 (OMAP1510_IH_FPGA_BASE + 2) -#define OMAP1510_INT_FPGA3 (OMAP1510_IH_FPGA_BASE + 3) -#define OMAP1510_INT_FPGA4 (OMAP1510_IH_FPGA_BASE + 4) -#define OMAP1510_INT_FPGA5 (OMAP1510_IH_FPGA_BASE + 5) -#define OMAP1510_INT_FPGA6 (OMAP1510_IH_FPGA_BASE + 6) -#define OMAP1510_INT_FPGA7 (OMAP1510_IH_FPGA_BASE + 7) -#define OMAP1510_INT_FPGA8 (OMAP1510_IH_FPGA_BASE + 8) -#define OMAP1510_INT_FPGA9 (OMAP1510_IH_FPGA_BASE + 9) -#define OMAP1510_INT_FPGA10 (OMAP1510_IH_FPGA_BASE + 10) -#define OMAP1510_INT_FPGA11 (OMAP1510_IH_FPGA_BASE + 11) -#define OMAP1510_INT_FPGA12 (OMAP1510_IH_FPGA_BASE + 12) -#define OMAP1510_INT_ETHER (OMAP1510_IH_FPGA_BASE + 13) -#define OMAP1510_INT_FPGAUART1 (OMAP1510_IH_FPGA_BASE + 14) -#define OMAP1510_INT_FPGAUART2 (OMAP1510_IH_FPGA_BASE + 15) -#define OMAP1510_INT_FPGA_TS (OMAP1510_IH_FPGA_BASE + 16) -#define OMAP1510_INT_FPGA17 (OMAP1510_IH_FPGA_BASE + 17) -#define OMAP1510_INT_FPGA_CAM (OMAP1510_IH_FPGA_BASE + 18) -#define OMAP1510_INT_FPGA_RTC_A (OMAP1510_IH_FPGA_BASE + 19) -#define OMAP1510_INT_FPGA_RTC_B (OMAP1510_IH_FPGA_BASE + 20) -#define OMAP1510_INT_FPGA_CD (OMAP1510_IH_FPGA_BASE + 21) -#define OMAP1510_INT_FPGA22 (OMAP1510_IH_FPGA_BASE + 22) -#define OMAP1510_INT_FPGA23 (OMAP1510_IH_FPGA_BASE + 23) - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/gpio-switch.h b/libc/kernel/arch-arm/asm/arch/gpio-switch.h deleted file mode 100644 index 20ea3f278..000000000 --- a/libc/kernel/arch-arm/asm/arch/gpio-switch.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_GPIO_SWITCH_H -#define __ASM_ARCH_OMAP_GPIO_SWITCH_H - -#include - -#define OMAP_GPIO_SWITCH_TYPE_COVER 0x0000 -#define OMAP_GPIO_SWITCH_TYPE_CONNECTION 0x0001 -#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY 0x0002 -#define OMAP_GPIO_SWITCH_FLAG_INVERTED 0x0001 -#define OMAP_GPIO_SWITCH_FLAG_OUTPUT 0x0002 - -struct omap_gpio_switch { - const char *name; - s16 gpio; - unsigned flags:4; - unsigned type:4; - - u16 debounce_rising; - - u16 debounce_falling; - - void (* notify)(void *data, int state); - void *notify_data; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/gpio.h b/libc/kernel/arch-arm/asm/arch/gpio.h deleted file mode 100644 index 332246d7c..000000000 --- a/libc/kernel/arch-arm/asm/arch/gpio.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_GPIO_H -#define __ASM_ARCH_OMAP_GPIO_H - -#include -#include -#include - -#define OMAP_MPUIO_BASE (void __iomem *)0xfffb5000 - -#define OMAP_MPUIO_INPUT_LATCH 0x00 -#define OMAP_MPUIO_OUTPUT 0x04 -#define OMAP_MPUIO_IO_CNTL 0x08 -#define OMAP_MPUIO_KBR_LATCH 0x10 -#define OMAP_MPUIO_KBC 0x14 -#define OMAP_MPUIO_GPIO_EVENT_MODE 0x18 -#define OMAP_MPUIO_GPIO_INT_EDGE 0x1c -#define OMAP_MPUIO_KBD_INT 0x20 -#define OMAP_MPUIO_GPIO_INT 0x24 -#define OMAP_MPUIO_KBD_MASKIT 0x28 -#define OMAP_MPUIO_GPIO_MASKIT 0x2c -#define OMAP_MPUIO_GPIO_DEBOUNCING 0x30 -#define OMAP_MPUIO_LATCH 0x34 - -#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr)) -#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES) - -#define OMAP_GPIO_IRQ(nr) (OMAP_GPIO_IS_MPUIO(nr) ? IH_MPUIO_BASE + ((nr) & 0x0f) : IH_GPIO_BASE + (nr)) - -struct omap_machine_gpio_bank { - int start; - int end; - - void (*set_gpio_direction)(int gpio, int is_input); - void (*set_gpio_dataout)(int gpio, int enable); - int (*get_gpio_datain)(int gpio); -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/hardware.h b/libc/kernel/arch-arm/asm/arch/hardware.h deleted file mode 100644 index e515ee8eb..000000000 --- a/libc/kernel/arch-arm/asm/arch/hardware.h +++ /dev/null @@ -1,157 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_HARDWARE_H -#define __ASM_ARCH_OMAP_HARDWARE_H - -#include -#ifndef __ASSEMBLER__ -#include -#include -#endif -#include -#include - -#define OMAP_MPU_TIMER1_BASE (0xfffec500) -#define OMAP_MPU_TIMER2_BASE (0xfffec600) -#define OMAP_MPU_TIMER3_BASE (0xfffec700) -#define MPU_TIMER_FREE (1 << 6) -#define MPU_TIMER_CLOCK_ENABLE (1 << 5) -#define MPU_TIMER_AR (1 << 1) -#define MPU_TIMER_ST (1 << 0) - -#define CLKGEN_REG_BASE (0xfffece00) -#define ARM_CKCTL (CLKGEN_REG_BASE + 0x0) -#define ARM_IDLECT1 (CLKGEN_REG_BASE + 0x4) -#define ARM_IDLECT2 (CLKGEN_REG_BASE + 0x8) -#define ARM_EWUPCT (CLKGEN_REG_BASE + 0xC) -#define ARM_RSTCT1 (CLKGEN_REG_BASE + 0x10) -#define ARM_RSTCT2 (CLKGEN_REG_BASE + 0x14) -#define ARM_SYSST (CLKGEN_REG_BASE + 0x18) -#define ARM_IDLECT3 (CLKGEN_REG_BASE + 0x24) - -#define CK_RATEF 1 -#define CK_IDLEF 2 -#define CK_ENABLEF 4 -#define CK_SELECTF 8 -#define SETARM_IDLE_SHIFT - -#define DPLL_CTL (0xfffecf00) - -#define DSP_CONFIG_REG_BASE (0xe1008000) -#define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0) -#define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4) -#define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8) -#define DSP_RSTCT2 (DSP_CONFIG_REG_BASE + 0x14) - -#define ULPD_REG_BASE (0xfffe0800) -#define ULPD_IT_STATUS (ULPD_REG_BASE + 0x14) -#define ULPD_SETUP_ANALOG_CELL_3 (ULPD_REG_BASE + 0x24) -#define ULPD_CLOCK_CTRL (ULPD_REG_BASE + 0x30) -#define DIS_USB_PVCI_CLK (1 << 5) -#define USB_MCLK_EN (1 << 4) -#define ULPD_SOFT_REQ (ULPD_REG_BASE + 0x34) -#define SOFT_UDC_REQ (1 << 4) -#define SOFT_USB_CLK_REQ (1 << 3) -#define SOFT_DPLL_REQ (1 << 0) -#define ULPD_DPLL_CTRL (ULPD_REG_BASE + 0x3c) -#define ULPD_STATUS_REQ (ULPD_REG_BASE + 0x40) -#define ULPD_APLL_CTRL (ULPD_REG_BASE + 0x4c) -#define ULPD_POWER_CTRL (ULPD_REG_BASE + 0x50) -#define ULPD_SOFT_DISABLE_REQ_REG (ULPD_REG_BASE + 0x68) -#define DIS_MMC2_DPLL_REQ (1 << 11) -#define DIS_MMC1_DPLL_REQ (1 << 10) -#define DIS_UART3_DPLL_REQ (1 << 9) -#define DIS_UART2_DPLL_REQ (1 << 8) -#define DIS_UART1_DPLL_REQ (1 << 7) -#define DIS_USB_HOST_DPLL_REQ (1 << 6) -#define ULPD_SDW_CLK_DIV_CTRL_SEL (ULPD_REG_BASE + 0x74) -#define ULPD_CAM_CLK_CTRL (ULPD_REG_BASE + 0x7c) - -#define OMAP_MPU_WATCHDOG_BASE (0xfffec800) -#define OMAP_WDT_TIMER (OMAP_MPU_WATCHDOG_BASE + 0x0) -#define OMAP_WDT_LOAD_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4) -#define OMAP_WDT_READ_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4) -#define OMAP_WDT_TIMER_MODE (OMAP_MPU_WATCHDOG_BASE + 0x8) - -#define MOD_CONF_CTRL_0 0xfffe1080 -#define MOD_CONF_CTRL_1 0xfffe1110 - -#define FUNC_MUX_CTRL_0 0xfffe1000 -#define FUNC_MUX_CTRL_1 0xfffe1004 -#define FUNC_MUX_CTRL_2 0xfffe1008 -#define COMP_MODE_CTRL_0 0xfffe100c -#define FUNC_MUX_CTRL_3 0xfffe1010 -#define FUNC_MUX_CTRL_4 0xfffe1014 -#define FUNC_MUX_CTRL_5 0xfffe1018 -#define FUNC_MUX_CTRL_6 0xfffe101C -#define FUNC_MUX_CTRL_7 0xfffe1020 -#define FUNC_MUX_CTRL_8 0xfffe1024 -#define FUNC_MUX_CTRL_9 0xfffe1028 -#define FUNC_MUX_CTRL_A 0xfffe102C -#define FUNC_MUX_CTRL_B 0xfffe1030 -#define FUNC_MUX_CTRL_C 0xfffe1034 -#define FUNC_MUX_CTRL_D 0xfffe1038 -#define PULL_DWN_CTRL_0 0xfffe1040 -#define PULL_DWN_CTRL_1 0xfffe1044 -#define PULL_DWN_CTRL_2 0xfffe1048 -#define PULL_DWN_CTRL_3 0xfffe104c -#define PULL_DWN_CTRL_4 0xfffe10ac - -#define FUNC_MUX_CTRL_E 0xfffe1090 -#define FUNC_MUX_CTRL_F 0xfffe1094 -#define FUNC_MUX_CTRL_10 0xfffe1098 -#define FUNC_MUX_CTRL_11 0xfffe109c -#define FUNC_MUX_CTRL_12 0xfffe10a0 -#define PU_PD_SEL_0 0xfffe10b4 -#define PU_PD_SEL_1 0xfffe10b8 -#define PU_PD_SEL_2 0xfffe10bc -#define PU_PD_SEL_3 0xfffe10c0 -#define PU_PD_SEL_4 0xfffe10c4 - -#define OMAP_TIMER32K_BASE 0xFFFBC400 - -#define TIPB_PUBLIC_CNTL_BASE 0xfffed300 -#define MPU_PUBLIC_TIPB_CNTL (TIPB_PUBLIC_CNTL_BASE + 0x8) -#define TIPB_PRIVATE_CNTL_BASE 0xfffeca00 -#define MPU_PRIVATE_TIPB_CNTL (TIPB_PRIVATE_CNTL_BASE + 0x8) - -#define MPUI_BASE (0xfffec900) -#define MPUI_CTRL (MPUI_BASE + 0x0) -#define MPUI_DEBUG_ADDR (MPUI_BASE + 0x4) -#define MPUI_DEBUG_DATA (MPUI_BASE + 0x8) -#define MPUI_DEBUG_FLAG (MPUI_BASE + 0xc) -#define MPUI_STATUS_REG (MPUI_BASE + 0x10) -#define MPUI_DSP_STATUS (MPUI_BASE + 0x14) -#define MPUI_DSP_BOOT_CONFIG (MPUI_BASE + 0x18) -#define MPUI_DSP_API_CONFIG (MPUI_BASE + 0x1c) - -#define OMAP_LPG1_BASE 0xfffbd000 -#define OMAP_LPG2_BASE 0xfffbd800 -#define OMAP_LPG1_LCR (OMAP_LPG1_BASE + 0x00) -#define OMAP_LPG1_PMR (OMAP_LPG1_BASE + 0x04) -#define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00) -#define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) - -#define OMAP_PWL_BASE 0xfffb5800 -#define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00) -#define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04) - -#include "omap730.h" -#include "omap1510.h" -#include "omap24xx.h" -#include "omap16xx.h" - -#ifndef __ASSEMBLER__ - -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/io.h b/libc/kernel/arch-arm/asm/arch/io.h deleted file mode 100644 index 12ac3d41a..000000000 --- a/libc/kernel/arch-arm/asm/arch/io.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_ARCH_IO_H -#define __ASM_ARM_ARCH_IO_H - -#include - -#define IO_SPACE_LIMIT 0xffffffff - -#define __io(a) ((void __iomem *)(PCIO_BASE + (a))) -#define __mem_pci(a) (a) - -#define PCIO_BASE 0 - -#ifndef __ASSEMBLER__ - -#define omap_readb(a) (*(volatile unsigned char *)IO_ADDRESS(a)) -#define omap_readw(a) (*(volatile unsigned short *)IO_ADDRESS(a)) -#define omap_readl(a) (*(volatile unsigned int *)IO_ADDRESS(a)) - -#define omap_writeb(v,a) (*(volatile unsigned char *)IO_ADDRESS(a) = (v)) -#define omap_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v)) -#define omap_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v)) - -typedef struct { volatile u16 offset[256]; } __regbase16; -#define __REGV16(vaddr) ((__regbase16 *)((vaddr)&~0xff)) ->offset[((vaddr)&0xff)>>1] -#define __REG16(paddr) __REGV16(io_p2v(paddr)) - -typedef struct { volatile u8 offset[4096]; } __regbase8; -#define __REGV8(vaddr) ((__regbase8 *)((vaddr)&~4095)) ->offset[((vaddr)&4095)>>0] -#define __REG8(paddr) __REGV8(io_p2v(paddr)) - -typedef struct { volatile u32 offset[4096]; } __regbase32; -#define __REGV32(vaddr) ((__regbase32 *)((vaddr)&~4095)) ->offset[((vaddr)&4095)>>2] -#define __REG32(paddr) __REGV32(io_p2v(paddr)) - -#else - -#define __REG8(paddr) io_p2v(paddr) -#define __REG16(paddr) io_p2v(paddr) -#define __REG32(paddr) io_p2v(paddr) - -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/irqs.h b/libc/kernel/arch-arm/asm/arch/irqs.h deleted file mode 100644 index 3e9448735..000000000 --- a/libc/kernel/arch-arm/asm/arch/irqs.h +++ /dev/null @@ -1,242 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP15XX_IRQS_H -#define __ASM_ARCH_OMAP15XX_IRQS_H - -#define INT_CAMERA 1 -#define INT_FIQ 3 -#define INT_RTDX 6 -#define INT_DSP_MMU_ABORT 7 -#define INT_HOST 8 -#define INT_ABORT 9 -#define INT_DSP_MAILBOX1 10 -#define INT_DSP_MAILBOX2 11 -#define INT_BRIDGE_PRIV 13 -#define INT_GPIO_BANK1 14 -#define INT_UART3 15 -#define INT_TIMER3 16 -#define INT_DMA_CH0_6 19 -#define INT_DMA_CH1_7 20 -#define INT_DMA_CH2_8 21 -#define INT_DMA_CH3 22 -#define INT_DMA_CH4 23 -#define INT_DMA_CH5 24 -#define INT_DMA_LCD 25 -#define INT_TIMER1 26 -#define INT_WD_TIMER 27 -#define INT_BRIDGE_PUB 28 -#define INT_TIMER2 30 -#define INT_LCD_CTRL 31 - -#define INT_1510_IH2_IRQ 0 -#define INT_1510_RES2 2 -#define INT_1510_SPI_TX 4 -#define INT_1510_SPI_RX 5 -#define INT_1510_RES12 12 -#define INT_1510_LB_MMU 17 -#define INT_1510_RES18 18 -#define INT_1510_LOCAL_BUS 29 - -#define INT_1610_IH2_IRQ 0 -#define INT_1610_IH2_FIQ 2 -#define INT_1610_McBSP2_TX 4 -#define INT_1610_McBSP2_RX 5 -#define INT_1610_LCD_LINE 12 -#define INT_1610_GPTIMER1 17 -#define INT_1610_GPTIMER2 18 -#define INT_1610_SSR_FIFO_0 29 - -#define INT_730_IH2_FIQ 0 -#define INT_730_IH2_IRQ 1 -#define INT_730_USB_NON_ISO 2 -#define INT_730_USB_ISO 3 -#define INT_730_ICR 4 -#define INT_730_EAC 5 -#define INT_730_GPIO_BANK1 6 -#define INT_730_GPIO_BANK2 7 -#define INT_730_GPIO_BANK3 8 -#define INT_730_McBSP2TX 10 -#define INT_730_McBSP2RX 11 -#define INT_730_McBSP2RX_OVF 12 -#define INT_730_LCD_LINE 14 -#define INT_730_GSM_PROTECT 15 -#define INT_730_TIMER3 16 -#define INT_730_GPIO_BANK5 17 -#define INT_730_GPIO_BANK6 18 -#define INT_730_SPGIO_WR 29 - -#define IH2_BASE 32 - -#define INT_KEYBOARD (1 + IH2_BASE) -#define INT_uWireTX (2 + IH2_BASE) -#define INT_uWireRX (3 + IH2_BASE) -#define INT_I2C (4 + IH2_BASE) -#define INT_MPUIO (5 + IH2_BASE) -#define INT_USB_HHC_1 (6 + IH2_BASE) -#define INT_McBSP3TX (10 + IH2_BASE) -#define INT_McBSP3RX (11 + IH2_BASE) -#define INT_McBSP1TX (12 + IH2_BASE) -#define INT_McBSP1RX (13 + IH2_BASE) -#define INT_UART2 (14 + IH2_BASE) -#define INT_UART1 (15 + IH2_BASE) -#define INT_BT_MCSI1TX (16 + IH2_BASE) -#define INT_BT_MCSI1RX (17 + IH2_BASE) -#define INT_USB_W2FC (20 + IH2_BASE) -#define INT_1WIRE (21 + IH2_BASE) -#define INT_OS_TIMER (22 + IH2_BASE) -#define INT_MMC (23 + IH2_BASE) -#define INT_GAUGE_32K (24 + IH2_BASE) -#define INT_RTC_TIMER (25 + IH2_BASE) -#define INT_RTC_ALARM (26 + IH2_BASE) -#define INT_MEM_STICK (27 + IH2_BASE) -#define INT_DSP_MMU (28 + IH2_BASE) - -#define INT_1510_COM_SPI_RO (31 + IH2_BASE) - -#define INT_1610_FAC (0 + IH2_BASE) -#define INT_1610_USB_HHC_2 (7 + IH2_BASE) -#define INT_1610_USB_OTG (8 + IH2_BASE) -#define INT_1610_SoSSI (9 + IH2_BASE) -#define INT_1610_SoSSI_MATCH (19 + IH2_BASE) -#define INT_1610_McBSP2RX_OF (31 + IH2_BASE) -#define INT_1610_STI (32 + IH2_BASE) -#define INT_1610_STI_WAKEUP (33 + IH2_BASE) -#define INT_1610_GPTIMER3 (34 + IH2_BASE) -#define INT_1610_GPTIMER4 (35 + IH2_BASE) -#define INT_1610_GPTIMER5 (36 + IH2_BASE) -#define INT_1610_GPTIMER6 (37 + IH2_BASE) -#define INT_1610_GPTIMER7 (38 + IH2_BASE) -#define INT_1610_GPTIMER8 (39 + IH2_BASE) -#define INT_1610_GPIO_BANK2 (40 + IH2_BASE) -#define INT_1610_GPIO_BANK3 (41 + IH2_BASE) -#define INT_1610_MMC2 (42 + IH2_BASE) -#define INT_1610_CF (43 + IH2_BASE) -#define INT_1610_WAKE_UP_REQ (46 + IH2_BASE) -#define INT_1610_GPIO_BANK4 (48 + IH2_BASE) -#define INT_1610_SPI (49 + IH2_BASE) -#define INT_1610_DMA_CH6 (53 + IH2_BASE) -#define INT_1610_DMA_CH7 (54 + IH2_BASE) -#define INT_1610_DMA_CH8 (55 + IH2_BASE) -#define INT_1610_DMA_CH9 (56 + IH2_BASE) -#define INT_1610_DMA_CH10 (57 + IH2_BASE) -#define INT_1610_DMA_CH11 (58 + IH2_BASE) -#define INT_1610_DMA_CH12 (59 + IH2_BASE) -#define INT_1610_DMA_CH13 (60 + IH2_BASE) -#define INT_1610_DMA_CH14 (61 + IH2_BASE) -#define INT_1610_DMA_CH15 (62 + IH2_BASE) -#define INT_1610_NAND (63 + IH2_BASE) - -#define INT_730_HW_ERRORS (0 + IH2_BASE) -#define INT_730_NFIQ_PWR_FAIL (1 + IH2_BASE) -#define INT_730_CFCD (2 + IH2_BASE) -#define INT_730_CFIREQ (3 + IH2_BASE) -#define INT_730_I2C (4 + IH2_BASE) -#define INT_730_PCC (5 + IH2_BASE) -#define INT_730_MPU_EXT_NIRQ (6 + IH2_BASE) -#define INT_730_SPI_100K_1 (7 + IH2_BASE) -#define INT_730_SYREN_SPI (8 + IH2_BASE) -#define INT_730_VLYNQ (9 + IH2_BASE) -#define INT_730_GPIO_BANK4 (10 + IH2_BASE) -#define INT_730_McBSP1TX (11 + IH2_BASE) -#define INT_730_McBSP1RX (12 + IH2_BASE) -#define INT_730_McBSP1RX_OF (13 + IH2_BASE) -#define INT_730_UART_MODEM_IRDA_2 (14 + IH2_BASE) -#define INT_730_UART_MODEM_1 (15 + IH2_BASE) -#define INT_730_MCSI (16 + IH2_BASE) -#define INT_730_uWireTX (17 + IH2_BASE) -#define INT_730_uWireRX (18 + IH2_BASE) -#define INT_730_SMC_CD (19 + IH2_BASE) -#define INT_730_SMC_IREQ (20 + IH2_BASE) -#define INT_730_HDQ_1WIRE (21 + IH2_BASE) -#define INT_730_TIMER32K (22 + IH2_BASE) -#define INT_730_MMC_SDIO (23 + IH2_BASE) -#define INT_730_UPLD (24 + IH2_BASE) -#define INT_730_USB_HHC_1 (27 + IH2_BASE) -#define INT_730_USB_HHC_2 (28 + IH2_BASE) -#define INT_730_USB_GENI (29 + IH2_BASE) -#define INT_730_USB_OTG (30 + IH2_BASE) -#define INT_730_CAMERA_IF (31 + IH2_BASE) -#define INT_730_RNG (32 + IH2_BASE) -#define INT_730_DUAL_MODE_TIMER (33 + IH2_BASE) -#define INT_730_DBB_RF_EN (34 + IH2_BASE) -#define INT_730_MPUIO_KEYPAD (35 + IH2_BASE) -#define INT_730_SHA1_MD5 (36 + IH2_BASE) -#define INT_730_SPI_100K_2 (37 + IH2_BASE) -#define INT_730_RNG_IDLE (38 + IH2_BASE) -#define INT_730_MPUIO (39 + IH2_BASE) -#define INT_730_LLPC_LCD_CTRL_CAN_BE_OFF (40 + IH2_BASE) -#define INT_730_LLPC_OE_FALLING (41 + IH2_BASE) -#define INT_730_LLPC_OE_RISING (42 + IH2_BASE) -#define INT_730_LLPC_VSYNC (43 + IH2_BASE) -#define INT_730_WAKE_UP_REQ (46 + IH2_BASE) -#define INT_730_DMA_CH6 (53 + IH2_BASE) -#define INT_730_DMA_CH7 (54 + IH2_BASE) -#define INT_730_DMA_CH8 (55 + IH2_BASE) -#define INT_730_DMA_CH9 (56 + IH2_BASE) -#define INT_730_DMA_CH10 (57 + IH2_BASE) -#define INT_730_DMA_CH11 (58 + IH2_BASE) -#define INT_730_DMA_CH12 (59 + IH2_BASE) -#define INT_730_DMA_CH13 (60 + IH2_BASE) -#define INT_730_DMA_CH14 (61 + IH2_BASE) -#define INT_730_DMA_CH15 (62 + IH2_BASE) -#define INT_730_NAND (63 + IH2_BASE) - -#define INT_24XX_SYS_NIRQ 7 -#define INT_24XX_SDMA_IRQ0 12 -#define INT_24XX_SDMA_IRQ1 13 -#define INT_24XX_SDMA_IRQ2 14 -#define INT_24XX_SDMA_IRQ3 15 -#define INT_24XX_CAM_IRQ 24 -#define INT_24XX_DSS_IRQ 25 -#define INT_24XX_GPIO_BANK1 29 -#define INT_24XX_GPIO_BANK2 30 -#define INT_24XX_GPIO_BANK3 31 -#define INT_24XX_GPIO_BANK4 32 -#define INT_24XX_GPTIMER1 37 -#define INT_24XX_GPTIMER2 38 -#define INT_24XX_GPTIMER3 39 -#define INT_24XX_GPTIMER4 40 -#define INT_24XX_GPTIMER5 41 -#define INT_24XX_GPTIMER6 42 -#define INT_24XX_GPTIMER7 43 -#define INT_24XX_GPTIMER8 44 -#define INT_24XX_GPTIMER9 45 -#define INT_24XX_GPTIMER10 46 -#define INT_24XX_GPTIMER11 47 -#define INT_24XX_GPTIMER12 48 -#define INT_24XX_MCBSP1_IRQ_TX 59 -#define INT_24XX_MCBSP1_IRQ_RX 60 -#define INT_24XX_MCBSP2_IRQ_TX 62 -#define INT_24XX_MCBSP2_IRQ_RX 63 -#define INT_24XX_UART1_IRQ 72 -#define INT_24XX_UART2_IRQ 73 -#define INT_24XX_UART3_IRQ 74 -#define INT_24XX_MMC_IRQ 83 - -#define OMAP_MAX_GPIO_LINES 192 -#define IH_GPIO_BASE (128 + IH2_BASE) -#define IH_MPUIO_BASE (OMAP_MAX_GPIO_LINES + IH_GPIO_BASE) -#define IH_BOARD_BASE (16 + IH_MPUIO_BASE) - -#define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) - -#ifndef __ASSEMBLY__ - -#endif - -#include - -#ifndef NR_IRQS -#define NR_IRQS IH_BOARD_BASE -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/mcbsp.h b/libc/kernel/arch-arm/asm/arch/mcbsp.h deleted file mode 100644 index cae5e3b3e..000000000 --- a/libc/kernel/arch-arm/asm/arch/mcbsp.h +++ /dev/null @@ -1,185 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_MCBSP_H -#define __ASM_ARCH_OMAP_MCBSP_H - -#include - -#define OMAP730_MCBSP1_BASE 0xfffb1000 -#define OMAP730_MCBSP2_BASE 0xfffb1800 - -#define OMAP1510_MCBSP1_BASE 0xe1011800 -#define OMAP1510_MCBSP2_BASE 0xfffb1000 -#define OMAP1510_MCBSP3_BASE 0xe1017000 - -#define OMAP1610_MCBSP1_BASE 0xe1011800 -#define OMAP1610_MCBSP2_BASE 0xfffb1000 -#define OMAP1610_MCBSP3_BASE 0xe1017000 - -#define OMAP24XX_MCBSP1_BASE 0x48074000 -#define OMAP24XX_MCBSP2_BASE 0x48076000 - -#define OMAP_MCBSP_READ(base, reg) __raw_readw((base) + OMAP_MCBSP_REG_##reg) -#define OMAP_MCBSP_WRITE(base, reg, val) __raw_writew((val), (base) + OMAP_MCBSP_REG_##reg) - -#define RRST 0x0001 -#define RRDY 0x0002 -#define RFULL 0x0004 -#define RSYNC_ERR 0x0008 -#define RINTM(value) ((value)<<4) -#define ABIS 0x0040 -#define DXENA 0x0080 -#define CLKSTP(value) ((value)<<11) -#define RJUST(value) ((value)<<13) -#define DLB 0x8000 - -#define XRST 0x0001 -#define XRDY 0x0002 -#define XEMPTY 0x0004 -#define XSYNC_ERR 0x0008 -#define XINTM(value) ((value)<<4) -#define GRST 0x0040 -#define FRST 0x0080 -#define SOFT 0x0100 -#define FREE 0x0200 - -#define CLKRP 0x0001 -#define CLKXP 0x0002 -#define FSRP 0x0004 -#define FSXP 0x0008 -#define DR_STAT 0x0010 -#define DX_STAT 0x0020 -#define CLKS_STAT 0x0040 -#define SCLKME 0x0080 -#define CLKRM 0x0100 -#define CLKXM 0x0200 -#define FSRM 0x0400 -#define FSXM 0x0800 -#define RIOEN 0x1000 -#define XIOEN 0x2000 -#define IDLE_EN 0x4000 - -#define RWDLEN1(value) ((value)<<5) -#define RFRLEN1(value) ((value)<<8) - -#define XWDLEN1(value) ((value)<<5) -#define XFRLEN1(value) ((value)<<8) - -#define RDATDLY(value) (value) -#define RFIG 0x0004 -#define RCOMPAND(value) ((value)<<3) -#define RWDLEN2(value) ((value)<<5) -#define RFRLEN2(value) ((value)<<8) -#define RPHASE 0x8000 - -#define XDATDLY(value) (value) -#define XFIG 0x0004 -#define XCOMPAND(value) ((value)<<3) -#define XWDLEN2(value) ((value)<<5) -#define XFRLEN2(value) ((value)<<8) -#define XPHASE 0x8000 - -#define CLKGDV(value) (value) -#define FWID(value) ((value)<<8) - -#define FPER(value) (value) -#define FSGM 0x1000 -#define CLKSM 0x2000 -#define CLKSP 0x4000 -#define GSYNC 0x8000 - -#define RMCM 0x0001 -#define RCBLK(value) ((value)<<2) -#define RPABLK(value) ((value)<<5) -#define RPBBLK(value) ((value)<<7) - -#define XMCM(value) (value) -#define XCBLK(value) ((value)<<2) -#define XPABLK(value) ((value)<<5) -#define XPBBLK(value) ((value)<<7) - -struct omap_mcbsp_reg_cfg { - u16 spcr2; - u16 spcr1; - u16 rcr2; - u16 rcr1; - u16 xcr2; - u16 xcr1; - u16 srgr2; - u16 srgr1; - u16 mcr2; - u16 mcr1; - u16 pcr0; - u16 rcerc; - u16 rcerd; - u16 xcerc; - u16 xcerd; - u16 rcere; - u16 rcerf; - u16 xcere; - u16 xcerf; - u16 rcerg; - u16 rcerh; - u16 xcerg; - u16 xcerh; -}; - -typedef enum { - OMAP_MCBSP1 = 0, - OMAP_MCBSP2, - OMAP_MCBSP3, -} omap_mcbsp_id; - -typedef int __bitwise omap_mcbsp_io_type_t; -#define OMAP_MCBSP_IRQ_IO ((__force omap_mcbsp_io_type_t) 1) -#define OMAP_MCBSP_POLL_IO ((__force omap_mcbsp_io_type_t) 2) - -typedef enum { - OMAP_MCBSP_WORD_8 = 0, - OMAP_MCBSP_WORD_12, - OMAP_MCBSP_WORD_16, - OMAP_MCBSP_WORD_20, - OMAP_MCBSP_WORD_24, - OMAP_MCBSP_WORD_32, -} omap_mcbsp_word_length; - -typedef enum { - OMAP_MCBSP_CLK_RISING = 0, - OMAP_MCBSP_CLK_FALLING, -} omap_mcbsp_clk_polarity; - -typedef enum { - OMAP_MCBSP_FS_ACTIVE_HIGH = 0, - OMAP_MCBSP_FS_ACTIVE_LOW, -} omap_mcbsp_fs_polarity; - -typedef enum { - OMAP_MCBSP_CLK_STP_MODE_NO_DELAY = 0, - OMAP_MCBSP_CLK_STP_MODE_DELAY, -} omap_mcbsp_clk_stp_mode; - -typedef enum { - OMAP_MCBSP_SPI_MASTER = 0, - OMAP_MCBSP_SPI_SLAVE, -} omap_mcbsp_spi_mode; - -struct omap_mcbsp_spi_cfg { - omap_mcbsp_spi_mode spi_mode; - omap_mcbsp_clk_polarity rx_clock_polarity; - omap_mcbsp_clk_polarity tx_clock_polarity; - omap_mcbsp_fs_polarity fsx_polarity; - u8 clk_div; - omap_mcbsp_clk_stp_mode clk_stp_mode; - omap_mcbsp_word_length word_length; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/memory.h b/libc/kernel/arch-arm/asm/arch/memory.h deleted file mode 100644 index 8b064b80e..000000000 --- a/libc/kernel/arch-arm/asm/arch/memory.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define __virt_to_bus(x) __virt_to_phys(x) -#define __bus_to_virt(x) __phys_to_virt(x) - -#endif - diff --git a/libc/kernel/arch-arm/asm/arch/mtd-xip.h b/libc/kernel/arch-arm/asm/arch/mtd-xip.h deleted file mode 100644 index 9b60aefc6..000000000 --- a/libc/kernel/arch-arm/asm/arch/mtd-xip.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_OMAP_MTD_XIP_H__ -#define __ARCH_OMAP_MTD_XIP_H__ - -#include -#define OMAP_MPU_TIMER_BASE (0xfffec500) -#define OMAP_MPU_TIMER_OFFSET 0x100 - -typedef struct { - u32 cntl; - u32 load_tim; - u32 read_tim; -} xip_omap_mpu_timer_regs_t; - -#define xip_omap_mpu_timer_base(n) ((volatile xip_omap_mpu_timer_regs_t*)IO_ADDRESS(OMAP_MPU_TIMER_BASE + (n)*OMAP_MPU_TIMER_OFFSET)) - -#define xip_irqpending() (omap_readl(OMAP_IH1_ITR) & ~omap_readl(OMAP_IH1_MIR)) -#define xip_currtime() (~xip_omap_mpu_timer_read(0)) -#define xip_elapsed_since(x) (signed)((~xip_omap_mpu_timer_read(0) - (x)) / 6) -#define xip_cpu_idle() asm volatile ("mcr p15, 0, %0, c7, c0, 4" :: "r" (1)) -#endif diff --git a/libc/kernel/arch-arm/asm/arch/mux.h b/libc/kernel/arch-arm/asm/arch/mux.h deleted file mode 100644 index 72da54e60..000000000 --- a/libc/kernel/arch-arm/asm/arch/mux.h +++ /dev/null @@ -1,391 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_MUX_H -#define __ASM_ARCH_MUX_H - -#define PU_PD_SEL_NA 0 -#define PULL_DWN_CTRL_NA 0 - -#define MUX_REG(reg, mode_offset, mode) .mux_reg = FUNC_MUX_CTRL_##reg, .mask_offset = mode_offset, .mask = mode, - -#define PULL_REG(reg, bit, status) .pull_reg = PULL_DWN_CTRL_##reg, .pull_bit = bit, .pull_val = status, - -#define PU_PD_REG(reg, status) .pu_pd_reg = PU_PD_SEL_##reg, .pu_pd_val = status, - -#define MUX_REG_730(reg, mode_offset, mode) .mux_reg = OMAP730_IO_CONF_##reg, .mask_offset = mode_offset, .mask = mode, - -#define PULL_REG_730(reg, bit, status) .pull_reg = OMAP730_IO_CONF_##reg, .pull_bit = bit, .pull_val = status, - -#define MUX_CFG(desc, mux_reg, mode_offset, mode, pull_reg, pull_bit, pull_status, pu_pd_reg, pu_pd_status, debug_status) { .name = desc, .debug = debug_status, MUX_REG(mux_reg, mode_offset, mode) PULL_REG(pull_reg, pull_bit, !pull_status) PU_PD_REG(pu_pd_reg, pu_pd_status) }, - -#define MUX_CFG_730(desc, mux_reg, mode_offset, mode, pull_bit, pull_status, debug_status) { .name = desc, .debug = debug_status, MUX_REG_730(mux_reg, mode_offset, mode) PULL_REG_730(mux_reg, pull_bit, pull_status) PU_PD_REG(NA, 0) }, - -#define MUX_CFG_24XX(desc, reg_offset, mode, pull_en, pull_mode, dbg) { .name = desc, .debug = dbg, .mux_reg = reg_offset, .mask = mode, .pull_val = pull_en, .pu_pd_val = pull_mode, }, - -#define PULL_DISABLED 0 -#define PULL_ENABLED 1 - -#define PULL_DOWN 0 -#define PULL_UP 1 - -struct pin_config { - char *name; - unsigned char busy; - unsigned char debug; - - const char *mux_reg_name; - const unsigned int mux_reg; - const unsigned char mask_offset; - const unsigned char mask; - - const char *pull_name; - const unsigned int pull_reg; - const unsigned char pull_val; - const unsigned char pull_bit; - - const char *pu_pd_name; - const unsigned int pu_pd_reg; - const unsigned char pu_pd_val; -}; - -enum omap730_index { - - E2_730_KBR0, - J7_730_KBR1, - E1_730_KBR2, - F3_730_KBR3, - D2_730_KBR4, - AA20_730_KBR5, - V17_730_KBR6, - C2_730_KBC0, - D3_730_KBC1, - E4_730_KBC2, - F4_730_KBC3, - E3_730_KBC4, - - AA17_730_USB_DM, - W16_730_USB_PU_EN, - W17_730_USB_VBUSI, - - V19_730_GPIO_15, - M19_730_GPIO_77, - C21_730_GPIO_121_122, - K19_730_GPIO_126, - K15_730_GPIO_127, - - P15_730_GPIO_16_17, - - M15_730_GPIO_83, - N20_730_GPIO_82, - N18_730_GPIO_81, - N19_730_GPIO_80, - L15_730_GPIO_76, - - UART1_CTS_RTS, - OMAP_730_GPIOS_42_43, - UART1_TX_RX, - OMAP_730_GPIOS_40_41, - UART1_USB_RX_TX, - UART1_USB_RTS, - UART1_USB_CTS -}; - -enum omap1xxx_index { - - UART1_TX = 0, - UART1_RTS, - - UART2_TX, - UART2_RX, - UART2_CTS, - UART2_RTS, - - UART3_TX, - UART3_RX, - UART3_CTS, - UART3_RTS, - UART3_CLKREQ, - UART3_BCLK, - Y15_1610_UART3_RTS, - - PWT, - PWL, - - R18_USB_VBUS, - R18_1510_USB_GPIO0, - W4_USB_PUEN, - W4_USB_CLKO, - W4_USB_HIGHZ, - W4_GPIO58, - - USB1_SUSP, - USB1_SEO, - W13_1610_USB1_SE0, - USB1_TXEN, - USB1_TXD, - USB1_VP, - USB1_VM, - USB1_RCV, - USB1_SPEED, - R13_1610_USB1_SPEED, - R13_1710_USB1_SE0, - - USB2_SUSP, - USB2_VP, - USB2_TXEN, - USB2_VM, - USB2_RCV, - USB2_SEO, - USB2_TXD, - - R18_1510_GPIO0, - R19_1510_GPIO1, - M14_1510_GPIO2, - - P18_1610_GPIO3, - Y15_1610_GPIO17, - - R18_1710_GPIO0, - V2_1710_GPIO10, - N21_1710_GPIO14, - W15_1710_GPIO40, - - MPUIO2, - N15_1610_MPUIO2, - MPUIO4, - MPUIO5, - T20_1610_MPUIO5, - W11_1610_MPUIO6, - V10_1610_MPUIO7, - W11_1610_MPUIO9, - V10_1610_MPUIO10, - W10_1610_MPUIO11, - E20_1610_MPUIO13, - U20_1610_MPUIO14, - E19_1610_MPUIO15, - - MCBSP2_CLKR, - MCBSP2_CLKX, - MCBSP2_DR, - MCBSP2_DX, - MCBSP2_FSR, - MCBSP2_FSX, - - MCBSP3_CLKX, - - BALLOUT_V8_ARMIO3, - N20_HDQ, - - W8_1610_MMC2_DAT0, - V8_1610_MMC2_DAT1, - W15_1610_MMC2_DAT2, - R10_1610_MMC2_DAT3, - Y10_1610_MMC2_CLK, - Y8_1610_MMC2_CMD, - V9_1610_MMC2_CMDDIR, - V5_1610_MMC2_DATDIR0, - W19_1610_MMC2_DATDIR1, - R18_1610_MMC2_CLKIN, - - M19_1610_ETM_PSTAT0, - L15_1610_ETM_PSTAT1, - L18_1610_ETM_PSTAT2, - L19_1610_ETM_D0, - J19_1610_ETM_D6, - J18_1610_ETM_D7, - - P20_1610_GPIO4, - V9_1610_GPIO7, - W8_1610_GPIO9, - N20_1610_GPIO11, - N19_1610_GPIO13, - P10_1610_GPIO22, - V5_1610_GPIO24, - AA20_1610_GPIO_41, - W19_1610_GPIO48, - M7_1610_GPIO62, - V14_16XX_GPIO37, - R9_16XX_GPIO18, - L14_16XX_GPIO49, - - V19_1610_UWIRE_SCLK, - U18_1610_UWIRE_SDI, - W21_1610_UWIRE_SDO, - N14_1610_UWIRE_CS0, - P15_1610_UWIRE_CS3, - N15_1610_UWIRE_CS1, - - U19_1610_SPIF_SCK, - U18_1610_SPIF_DIN, - P20_1610_SPIF_DIN, - W21_1610_SPIF_DOUT, - R18_1610_SPIF_DOUT, - N14_1610_SPIF_CS0, - N15_1610_SPIF_CS1, - T19_1610_SPIF_CS2, - P15_1610_SPIF_CS3, - - L3_1610_FLASH_CS2B_OE, - M8_1610_FLASH_CS2B_WE, - - MMC_CMD, - MMC_DAT1, - MMC_DAT2, - MMC_DAT0, - MMC_CLK, - MMC_DAT3, - - M15_1710_MMC_CLKI, - P19_1710_MMC_CMDDIR, - P20_1710_MMC_DATDIR0, - - W9_USB0_TXEN, - AA9_USB0_VP, - Y5_USB0_RCV, - R9_USB0_VM, - V6_USB0_TXD, - W5_USB0_SE0, - V9_USB0_SPEED, - V9_USB0_SUSP, - - W9_USB2_TXEN, - AA9_USB2_VP, - Y5_USB2_RCV, - R9_USB2_VM, - V6_USB2_TXD, - W5_USB2_SE0, - - R13_1610_UART1_TX, - V14_16XX_UART1_RX, - R14_1610_UART1_CTS, - AA15_1610_UART1_RTS, - R9_16XX_UART2_RX, - L14_16XX_UART3_RX, - - I2C_SCL, - I2C_SDA, - - F18_1610_KBC0, - D20_1610_KBC1, - D19_1610_KBC2, - E18_1610_KBC3, - C21_1610_KBC4, - G18_1610_KBR0, - F19_1610_KBR1, - H14_1610_KBR2, - E20_1610_KBR3, - E19_1610_KBR4, - N19_1610_KBR5, - - T20_1610_LOW_PWR, - - V5_1710_MCLK_ON, - V5_1710_MCLK_OFF, - R10_1610_MCLK_ON, - R10_1610_MCLK_OFF, - - P11_1610_CF_CD2, - R11_1610_CF_IOIS16, - V10_1610_CF_IREQ, - W10_1610_CF_RESET, - W11_1610_CF_CD1, -}; - -enum omap24xx_index { - - M19_24XX_I2C1_SCL, - L15_24XX_I2C1_SDA, - J15_24XX_I2C2_SCL, - H19_24XX_I2C2_SDA, - - W19_24XX_SYS_NIRQ, - - W14_24XX_SYS_CLKOUT, - - L3_GPMC_WAIT0, - N7_GPMC_WAIT1, - M1_GPMC_WAIT2, - P1_GPMC_WAIT3, - - Y15_24XX_MCBSP2_CLKX, - R14_24XX_MCBSP2_FSX, - W15_24XX_MCBSP2_DR, - V15_24XX_MCBSP2_DX, - - M21_242X_GPIO11, - AA10_242X_GPIO13, - AA6_242X_GPIO14, - AA4_242X_GPIO15, - Y11_242X_GPIO16, - AA12_242X_GPIO17, - AA8_242X_GPIO58, - Y20_24XX_GPIO60, - W4__24XX_GPIO74, - M15_24XX_GPIO92, - V14_24XX_GPIO117, - - V4_242X_GPIO49, - W2_242X_GPIO50, - U4_242X_GPIO51, - V3_242X_GPIO52, - V2_242X_GPIO53, - V6_242X_GPIO53, - T4_242X_GPIO54, - Y4_242X_GPIO54, - T3_242X_GPIO55, - U2_242X_GPIO56, - - AA10_242X_DMAREQ0, - AA6_242X_DMAREQ1, - E4_242X_DMAREQ2, - G4_242X_DMAREQ3, - D3_242X_DMAREQ4, - E3_242X_DMAREQ5, - - P20_24XX_TSC_IRQ, - - K15_24XX_UART3_TX, - K14_24XX_UART3_RX, - - G19_24XX_MMC_CLKO, - H18_24XX_MMC_CMD, - F20_24XX_MMC_DAT0, - H14_24XX_MMC_DAT1, - E19_24XX_MMC_DAT2, - D19_24XX_MMC_DAT3, - F19_24XX_MMC_DAT_DIR0, - E20_24XX_MMC_DAT_DIR1, - F18_24XX_MMC_DAT_DIR2, - E18_24XX_MMC_DAT_DIR3, - G18_24XX_MMC_CMD_DIR, - H15_24XX_MMC_CLKI, - - T19_24XX_KBR0, - R19_24XX_KBR1, - V18_24XX_KBR2, - M21_24XX_KBR3, - E5__24XX_KBR4, - M18_24XX_KBR5, - R20_24XX_KBC0, - M14_24XX_KBC1, - H19_24XX_KBC2, - V17_24XX_KBC3, - P21_24XX_KBC4, - L14_24XX_KBC5, - N19_24XX_KBC6, - - B3__24XX_KBR5, - AA4_24XX_KBC2, - B13_24XX_KBC6, -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/omap24xx.h b/libc/kernel/arch-arm/asm/arch/omap24xx.h deleted file mode 100644 index 37def2fa9..000000000 --- a/libc/kernel/arch-arm/asm/arch/omap24xx.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP24XX_H -#define __ASM_ARCH_OMAP24XX_H - -#define L4_24XX_BASE 0x48000000 -#define L3_24XX_BASE 0x68000000 - -#define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000) -#define VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) -#define OMAP24XX_IVA_INTC_BASE 0x40000000 -#define IRQ_SIR_IRQ 0x0040 - -#define OMAP24XX_32KSYNCT_BASE (L4_24XX_BASE + 0x4000) -#define OMAP24XX_PRCM_BASE (L4_24XX_BASE + 0x8000) -#define OMAP24XX_SDRC_BASE (L3_24XX_BASE + 0x9000) - -#define OMAP242X_CONTROL_STATUS (L4_24XX_BASE + 0x2f8) - -#endif - diff --git a/libc/kernel/arch-arm/asm/arch/serial.h b/libc/kernel/arch-arm/asm/arch/serial.h deleted file mode 100644 index 6ab86135d..000000000 --- a/libc/kernel/arch-arm/asm/arch/serial.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_SERIAL_H -#define __ASM_ARCH_SERIAL_H - -#define OMAP_MAX_NR_PORTS 3 -#define OMAP1510_BASE_BAUD (12000000/16) -#define OMAP16XX_BASE_BAUD (48000000/16) - -#define is_omap_port(p) ({int __ret = 0; if (p == IO_ADDRESS(OMAP_UART1_BASE) || p == IO_ADDRESS(OMAP_UART2_BASE) || p == IO_ADDRESS(OMAP_UART3_BASE)) __ret = 1; __ret; }) - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/timex.h b/libc/kernel/arch-arm/asm/arch/timex.h deleted file mode 100644 index 2c9234c7b..000000000 --- a/libc/kernel/arch-arm/asm/arch/timex.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARCH_OMAP_TIMEX_H -#define __ASM_ARCH_OMAP_TIMEX_H - -#define CLOCK_TICK_RATE (HZ * 100000UL) - -#endif diff --git a/libc/kernel/arch-arm/asm/arch/vmalloc.h b/libc/kernel/arch-arm/asm/arch/vmalloc.h deleted file mode 100644 index f2b5b4479..000000000 --- a/libc/kernel/arch-arm/asm/arch/vmalloc.h +++ /dev/null @@ -1,13 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#define VMALLOC_END (PAGE_OFFSET + 0x10000000) - diff --git a/libc/kernel/arch-arm/asm/atomic.h b/libc/kernel/arch-arm/asm/atomic.h deleted file mode 100644 index 6f1921afb..000000000 --- a/libc/kernel/arch-arm/asm/atomic.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_ATOMIC_H -#define __ASM_ARM_ATOMIC_H - -#include - -typedef struct { volatile int counter; } atomic_t; - -#define ATOMIC_INIT(i) { (i) } - -#endif diff --git a/libc/kernel/arch-arm/asm/auxvec.h b/libc/kernel/arch-arm/asm/auxvec.h deleted file mode 100644 index c7e839cb7..000000000 --- a/libc/kernel/arch-arm/asm/auxvec.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASMARM_AUXVEC_H -#define __ASMARM_AUXVEC_H - -#endif diff --git a/libc/kernel/arch-arm/asm/bitops.h b/libc/kernel/arch-arm/asm/bitops.h deleted file mode 100644 index ff76a68df..000000000 --- a/libc/kernel/arch-arm/asm/bitops.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_BITOPS_H -#define __ASM_ARM_BITOPS_H - -#endif diff --git a/libc/kernel/arch-arm/asm/byteorder.h b/libc/kernel/arch-arm/asm/byteorder.h deleted file mode 100644 index 4da37bf8e..000000000 --- a/libc/kernel/arch-arm/asm/byteorder.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_BYTEORDER_H -#define __ASM_ARM_BYTEORDER_H - -#include -#include - -static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) -{ - __u32 t; - -#ifndef __thumb__ - if (!__builtin_constant_p(x)) { - - asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); - } else -#endif - t = x ^ ((x << 16) | (x >> 16)); - - x = (x << 24) | (x >> 8); - t &= ~0x00FF0000; - x ^= (t >> 8); - - return x; -} - -#define __arch__swab32(x) ___arch__swab32(x) - -#ifndef __STRICT_ANSI__ -#define __BYTEORDER_HAS_U64__ -#define __SWAB_64_THRU_32__ -#endif - -#ifdef __ARMEB__ -#include -#else -#include -#endif - -#endif - diff --git a/libc/kernel/arch-arm/asm/cache.h b/libc/kernel/arch-arm/asm/cache.h deleted file mode 100644 index be2642330..000000000 --- a/libc/kernel/arch-arm/asm/cache.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASMARM_CACHE_H -#define __ASMARM_CACHE_H - -#define L1_CACHE_SHIFT 5 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) - -#endif diff --git a/libc/kernel/arch-arm/asm/cacheflush.h b/libc/kernel/arch-arm/asm/cacheflush.h deleted file mode 100644 index 3ffa87a1b..000000000 --- a/libc/kernel/arch-arm/asm/cacheflush.h +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_CACHEFLUSH_H -#define _ASMARM_CACHEFLUSH_H - -#include -#include - -#include -#include - -#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) - -#undef _CACHE -#undef MULTI_CACHE - -#if !defined(_CACHE) && !defined(MULTI_CACHE) -#error Unknown cache maintainence model -#endif - -#define PG_dcache_dirty PG_arch_1 - -struct cpu_cache_fns { - void (*flush_kern_all)(void); - void (*flush_user_all)(void); - void (*flush_user_range)(unsigned long, unsigned long, unsigned int); - - void (*coherent_kern_range)(unsigned long, unsigned long); - void (*coherent_user_range)(unsigned long, unsigned long); - void (*flush_kern_dcache_page)(void *); - - void (*dma_inv_range)(unsigned long, unsigned long); - void (*dma_clean_range)(unsigned long, unsigned long); - void (*dma_flush_range)(unsigned long, unsigned long); -}; - -#ifdef MULTI_CACHE - -#define __cpuc_flush_kern_all cpu_cache.flush_kern_all -#define __cpuc_flush_user_all cpu_cache.flush_user_all -#define __cpuc_flush_user_range cpu_cache.flush_user_range -#define __cpuc_coherent_kern_range cpu_cache.coherent_kern_range -#define __cpuc_coherent_user_range cpu_cache.coherent_user_range -#define __cpuc_flush_dcache_page cpu_cache.flush_kern_dcache_page - -#define dmac_inv_range cpu_cache.dma_inv_range -#define dmac_clean_range cpu_cache.dma_clean_range -#define dmac_flush_range cpu_cache.dma_flush_range - -#else - -#define __cpuc_flush_kern_all __glue(_CACHE,_flush_kern_cache_all) -#define __cpuc_flush_user_all __glue(_CACHE,_flush_user_cache_all) -#define __cpuc_flush_user_range __glue(_CACHE,_flush_user_cache_range) -#define __cpuc_coherent_kern_range __glue(_CACHE,_coherent_kern_range) -#define __cpuc_coherent_user_range __glue(_CACHE,_coherent_user_range) -#define __cpuc_flush_dcache_page __glue(_CACHE,_flush_kern_dcache_page) - -#define dmac_inv_range __glue(_CACHE,_dma_inv_range) -#define dmac_clean_range __glue(_CACHE,_dma_clean_range) -#define dmac_flush_range __glue(_CACHE,_dma_flush_range) - -#endif - -#define flush_cache_vmap(start, end) flush_cache_all() -#define flush_cache_vunmap(start, end) flush_cache_all() - -#define copy_to_user_page(vma, page, vaddr, dst, src, len) do { memcpy(dst, src, len); flush_ptrace_access(vma, page, vaddr, dst, len, 1); } while (0) - -#define copy_from_user_page(vma, page, vaddr, dst, src, len) do { memcpy(dst, src, len); } while (0) - -#define flush_cache_all() __cpuc_flush_kern_all() -#define flush_cache_user_range(vma,start,end) __cpuc_coherent_user_range((start) & PAGE_MASK, PAGE_ALIGN(end)) -#define flush_icache_range(s,e) __cpuc_coherent_kern_range(s,e) -#define clean_dcache_area(start,size) cpu_dcache_clean_area(start, size) - -#define flush_dcache_mmap_lock(mapping) write_lock_irq(&(mapping)->tree_lock) -#define flush_dcache_mmap_unlock(mapping) write_unlock_irq(&(mapping)->tree_lock) - -#define flush_icache_user_range(vma,page,addr,len) flush_dcache_page(page) - -#define flush_icache_page(vma,page) do { } while (0) - -#define __cacheid_present(val) (val != read_cpuid(CPUID_ID)) -#define __cacheid_vivt(val) ((val & (15 << 25)) != (14 << 25)) -#define __cacheid_vipt(val) ((val & (15 << 25)) == (14 << 25)) -#define __cacheid_vipt_nonaliasing(val) ((val & (15 << 25 | 1 << 23)) == (14 << 25)) -#define __cacheid_vipt_aliasing(val) ((val & (15 << 25 | 1 << 23)) == (14 << 25 | 1 << 23)) - -#define cache_is_vivt() ({ unsigned int __val = read_cpuid(CPUID_CACHETYPE); (!__cacheid_present(__val)) || __cacheid_vivt(__val); }) - -#define cache_is_vipt() ({ unsigned int __val = read_cpuid(CPUID_CACHETYPE); __cacheid_present(__val) && __cacheid_vipt(__val); }) - -#define cache_is_vipt_nonaliasing() ({ unsigned int __val = read_cpuid(CPUID_CACHETYPE); __cacheid_present(__val) && __cacheid_vipt_nonaliasing(__val); }) - -#define cache_is_vipt_aliasing() ({ unsigned int __val = read_cpuid(CPUID_CACHETYPE); __cacheid_present(__val) && __cacheid_vipt_aliasing(__val); }) - -#endif diff --git a/libc/kernel/arch-arm/asm/cputime.h b/libc/kernel/arch-arm/asm/cputime.h deleted file mode 100644 index 4a4097fe8..000000000 --- a/libc/kernel/arch-arm/asm/cputime.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARM_CPUTIME_H -#define __ARM_CPUTIME_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/delay.h b/libc/kernel/arch-arm/asm/delay.h deleted file mode 100644 index 631fd9bad..000000000 --- a/libc/kernel/arch-arm/asm/delay.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_DELAY_H -#define __ASM_ARM_DELAY_H - -#include - -#define MAX_UDELAY_MS 2 - -#define udelay(n) (__builtin_constant_p(n) ? ((n) > (MAX_UDELAY_MS * 1000) ? __bad_udelay() : __const_udelay((n) * ((2199023U*HZ)>>11))) : __udelay(n)) - -#endif - diff --git a/libc/kernel/arch-arm/asm/div64.h b/libc/kernel/arch-arm/asm/div64.h deleted file mode 100644 index c03a0e47a..000000000 --- a/libc/kernel/arch-arm/asm/div64.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_DIV64 -#define __ASM_ARM_DIV64 - -#include - -#ifdef __ARMEB__ -#define __xh "r0" -#define __xl "r1" -#else -#define __xl "r0" -#define __xh "r1" -#endif - -#define do_div(n,base) ({ register unsigned int __base asm("r4") = base; register unsigned long long __n asm("r0") = n; register unsigned long long __res asm("r2"); register unsigned int __rem asm(__xh); asm( __asmeq("%0", __xh) __asmeq("%1", "r2") __asmeq("%2", "r0") __asmeq("%3", "r4") "bl __do_div64" : "=r" (__rem), "=r" (__res) : "r" (__n), "r" (__base) : "ip", "lr", "cc"); n = __res; __rem; }) - -#endif diff --git a/libc/kernel/arch-arm/asm/dma-mapping.h b/libc/kernel/arch-arm/asm/dma-mapping.h deleted file mode 100644 index 7e65009ba..000000000 --- a/libc/kernel/arch-arm/asm/dma-mapping.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef ASMARM_DMA_MAPPING_H -#define ASMARM_DMA_MAPPING_H - -#endif diff --git a/libc/kernel/arch-arm/asm/dma.h b/libc/kernel/arch-arm/asm/dma.h deleted file mode 100644 index 7eeeb780b..000000000 --- a/libc/kernel/arch-arm/asm/dma.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_DMA_H -#define __ASM_ARM_DMA_H - -typedef unsigned int dmach_t; - -#include -#include -#include -#include - -#ifndef MAX_DMA_ADDRESS -#define MAX_DMA_ADDRESS 0xffffffff -#endif - -typedef unsigned int dmamode_t; - -#define DMA_MODE_MASK 3 - -#define DMA_MODE_READ 0 -#define DMA_MODE_WRITE 1 -#define DMA_MODE_CASCADE 2 -#define DMA_AUTOINIT 4 - -#define clear_dma_ff(channel) - -#define set_dma_addr(channel, addr) __set_dma_addr(channel, bus_to_virt(addr)) - -#ifndef NO_DMA -#define NO_DMA 255 -#endif - -#define isa_dma_bridge_buggy (0) - -#endif diff --git a/libc/kernel/arch-arm/asm/domain.h b/libc/kernel/arch-arm/asm/domain.h deleted file mode 100644 index 973109e5b..000000000 --- a/libc/kernel/arch-arm/asm/domain.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_PROC_DOMAIN_H -#define __ASM_PROC_DOMAIN_H - -#define DOMAIN_KERNEL 0 -#define DOMAIN_TABLE 0 -#define DOMAIN_USER 1 -#define DOMAIN_IO 2 - -#define DOMAIN_NOACCESS 0 -#define DOMAIN_CLIENT 1 -#define DOMAIN_MANAGER 3 - -#define domain_val(dom,type) ((type) << (2*(dom))) - -#ifndef __ASSEMBLY__ - -#define set_domain(x) do { } while (0) -#define modify_domain(dom,type) do { } while (0) - -#endif -#endif diff --git a/libc/kernel/arch-arm/asm/dyntick.h b/libc/kernel/arch-arm/asm/dyntick.h deleted file mode 100644 index 1f323f2d8..000000000 --- a/libc/kernel/arch-arm/asm/dyntick.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_DYNTICK_H -#define _ASMARM_DYNTICK_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/elf.h b/libc/kernel/arch-arm/asm/elf.h deleted file mode 100644 index e9d095e6c..000000000 --- a/libc/kernel/arch-arm/asm/elf.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASMARM_ELF_H -#define __ASMARM_ELF_H - -#include -#include -#ifdef __KERNEL -#include -#endif - -typedef unsigned long elf_greg_t; -typedef unsigned long elf_freg_t[3]; - -#define EM_ARM 40 -#define EF_ARM_APCS26 0x08 -#define EF_ARM_SOFT_FLOAT 0x200 -#define EF_ARM_EABI_MASK 0xFF000000 - -#define R_ARM_NONE 0 -#define R_ARM_PC24 1 -#define R_ARM_ABS32 2 -#define R_ARM_CALL 28 -#define R_ARM_JUMP24 29 - -#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) -typedef elf_greg_t elf_gregset_t[ELF_NGREG]; - -typedef struct user_fp elf_fpregset_t; - -#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) ) - -#define ELF_CLASS ELFCLASS32 -#ifdef __ARMEB__ -#define ELF_DATA ELFDATA2MSB -#else -#define ELF_DATA ELFDATA2LSB -#endif -#define ELF_ARCH EM_ARM - -#define USE_ELF_CORE_DUMP -#define ELF_EXEC_PAGESIZE 4096 - -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) - -#define ELF_PLAT_INIT(_r, load_addr) (_r)->ARM_r0 = 0 - -#define ELF_HWCAP (elf_hwcap) - -#define ELF_PLATFORM_SIZE 8 - -#define ELF_PLATFORM (elf_platform) - -#endif diff --git a/libc/kernel/arch-arm/asm/errno.h b/libc/kernel/arch-arm/asm/errno.h deleted file mode 100644 index 6be70488e..000000000 --- a/libc/kernel/arch-arm/asm/errno.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARM_ERRNO_H -#define _ARM_ERRNO_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/fcntl.h b/libc/kernel/arch-arm/asm/fcntl.h deleted file mode 100644 index 42351eae3..000000000 --- a/libc/kernel/arch-arm/asm/fcntl.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARM_FCNTL_H -#define _ARM_FCNTL_H - -#define O_DIRECTORY 040000 -#define O_NOFOLLOW 0100000 -#define O_DIRECT 0200000 -#define O_LARGEFILE 0400000 - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/fpstate.h b/libc/kernel/arch-arm/asm/fpstate.h deleted file mode 100644 index b362b1494..000000000 --- a/libc/kernel/arch-arm/asm/fpstate.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_FPSTATE_H -#define __ASM_ARM_FPSTATE_H - -#ifndef __ASSEMBLY__ - -struct vfp_hard_struct { - __u64 fpregs[16]; -#if __LINUX_ARM_ARCH__ < 6 - __u32 fpmx_state; -#endif - __u32 fpexc; - __u32 fpscr; - - __u32 fpinst; - __u32 fpinst2; -}; - -union vfp_state { - struct vfp_hard_struct hard; -}; - -#define FP_HARD_SIZE 35 - -struct fp_hard_struct { - unsigned int save[FP_HARD_SIZE]; -}; - -#define FP_SOFT_SIZE 35 - -struct fp_soft_struct { - unsigned int save[FP_SOFT_SIZE]; -}; - -#define IWMMXT_SIZE 0x98 - -struct iwmmxt_struct { - unsigned int save[IWMMXT_SIZE / sizeof(unsigned int)]; -}; - -union fp_state { - struct fp_hard_struct hard; - struct fp_soft_struct soft; -}; - -#define FP_SIZE (sizeof(union fp_state) / sizeof(int)) - -struct crunch_state { - unsigned int mvdx[16][2]; - unsigned int mvax[4][3]; - unsigned int dspsc[2]; -}; - -#define CRUNCH_SIZE sizeof(struct crunch_state) - -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/glue.h b/libc/kernel/arch-arm/asm/glue.h deleted file mode 100644 index 1327b59d8..000000000 --- a/libc/kernel/arch-arm/asm/glue.h +++ /dev/null @@ -1,11 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ diff --git a/libc/kernel/arch-arm/asm/hardirq.h b/libc/kernel/arch-arm/asm/hardirq.h deleted file mode 100644 index 54207e325..000000000 --- a/libc/kernel/arch-arm/asm/hardirq.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_HARDIRQ_H -#define __ASM_HARDIRQ_H - -#include -#include -#include - -typedef struct { - unsigned int __softirq_pending; - unsigned int local_timer_irqs; -} ____cacheline_aligned irq_cpustat_t; - -#include - -#if NR_IRQS > 256 -#define HARDIRQ_BITS 9 -#else -#define HARDIRQ_BITS 8 -#endif - -#if 1 << HARDIRQ_BITS < NR_IRQS -#error HARDIRQ_BITS is too low! -#endif - -#define __ARCH_IRQ_EXIT_IRQS_DISABLED 1 - -#endif diff --git a/libc/kernel/arch-arm/asm/hardware.h b/libc/kernel/arch-arm/asm/hardware.h deleted file mode 100644 index 0b381d14e..000000000 --- a/libc/kernel/arch-arm/asm/hardware.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_HARDWARE_H -#define __ASM_HARDWARE_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/hw_irq.h b/libc/kernel/arch-arm/asm/hw_irq.h deleted file mode 100644 index a34b3902e..000000000 --- a/libc/kernel/arch-arm/asm/hw_irq.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARCH_ARM_HW_IRQ_H -#define _ARCH_ARM_HW_IRQ_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/ide.h b/libc/kernel/arch-arm/asm/ide.h deleted file mode 100644 index f52d5ca50..000000000 --- a/libc/kernel/arch-arm/asm/ide.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASMARM_IDE_H -#define __ASMARM_IDE_H - -#endif diff --git a/libc/kernel/arch-arm/asm/io.h b/libc/kernel/arch-arm/asm/io.h deleted file mode 100644 index 6794022dc..000000000 --- a/libc/kernel/arch-arm/asm/io.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_IO_H -#define __ASM_ARM_IO_H - -#endif diff --git a/libc/kernel/arch-arm/asm/ioctl.h b/libc/kernel/arch-arm/asm/ioctl.h deleted file mode 100644 index 6e446b6f6..000000000 --- a/libc/kernel/arch-arm/asm/ioctl.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-arm/asm/ioctls.h b/libc/kernel/arch-arm/asm/ioctls.h deleted file mode 100644 index 9df82bc2a..000000000 --- a/libc/kernel/arch-arm/asm/ioctls.h +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_IOCTLS_H -#define __ASM_ARM_IOCTLS_H - -#include - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425 -#define TIOCSBRK 0x5427 -#define TIOCCBRK 0x5428 -#define TIOCGSID 0x5429 -#define TIOCGPTN _IOR('T',0x30, unsigned int) -#define TIOCSPTLCK _IOW('T',0x31, int) - -#define FIONCLEX 0x5450 -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458 -#define TIOCSERGETLSR 0x5459 -#define TIOCSERGETMULTI 0x545A -#define TIOCSERSETMULTI 0x545B - -#define TIOCMIWAIT 0x545C -#define TIOCGICOUNT 0x545D -#define FIOQSIZE 0x545E - -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 - -#define TIOCSER_TEMT 0x01 - -#endif diff --git a/libc/kernel/arch-arm/asm/ipcbuf.h b/libc/kernel/arch-arm/asm/ipcbuf.h deleted file mode 100644 index 0e4750779..000000000 --- a/libc/kernel/arch-arm/asm/ipcbuf.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASMARM_IPCBUF_H -#define __ASMARM_IPCBUF_H - -struct ipc64_perm -{ - __kernel_key_t key; - __kernel_uid32_t uid; - __kernel_gid32_t gid; - __kernel_uid32_t cuid; - __kernel_gid32_t cgid; - __kernel_mode_t mode; - unsigned short __pad1; - unsigned short seq; - unsigned short __pad2; - unsigned long __unused1; - unsigned long __unused2; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/irq.h b/libc/kernel/arch-arm/asm/irq.h deleted file mode 100644 index 2085a2148..000000000 --- a/libc/kernel/arch-arm/asm/irq.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_IRQ_H -#define __ASM_ARM_IRQ_H - -#include - -#ifndef irq_canonicalize -#define irq_canonicalize(i) (i) -#endif - -#ifndef NR_IRQS -#define NR_IRQS 128 -#endif - -#ifndef NO_IRQ -#define NO_IRQ ((unsigned int)(-1)) -#endif - -struct irqaction; - -#define __IRQT_FALEDGE IRQ_TYPE_EDGE_FALLING -#define __IRQT_RISEDGE IRQ_TYPE_EDGE_RISING -#define __IRQT_LOWLVL IRQ_TYPE_LEVEL_LOW -#define __IRQT_HIGHLVL IRQ_TYPE_LEVEL_HIGH - -#define IRQT_NOEDGE (0) -#define IRQT_RISING (__IRQT_RISEDGE) -#define IRQT_FALLING (__IRQT_FALEDGE) -#define IRQT_BOTHEDGE (__IRQT_RISEDGE|__IRQT_FALEDGE) -#define IRQT_LOW (__IRQT_LOWLVL) -#define IRQT_HIGH (__IRQT_HIGHLVL) -#define IRQT_PROBE IRQ_TYPE_PROBE - -#endif - diff --git a/libc/kernel/arch-arm/asm/linkage.h b/libc/kernel/arch-arm/asm/linkage.h deleted file mode 100644 index 1fb628ea0..000000000 --- a/libc/kernel/arch-arm/asm/linkage.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_LINKAGE_H -#define __ASM_LINKAGE_H - -#define __ALIGN .align 0 -#define __ALIGN_STR ".align 0" - -#endif diff --git a/libc/kernel/arch-arm/asm/local.h b/libc/kernel/arch-arm/asm/local.h deleted file mode 100644 index 10d6a6051..000000000 --- a/libc/kernel/arch-arm/asm/local.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-arm/asm/locks.h b/libc/kernel/arch-arm/asm/locks.h deleted file mode 100644 index f48485cbf..000000000 --- a/libc/kernel/arch-arm/asm/locks.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_PROC_LOCKS_H -#define __ASM_PROC_LOCKS_H - -#if __LINUX_ARM_ARCH__ >= 6 - -#define __down_op(ptr,fail) ({ __asm__ __volatile__( "@ down_op\n" "1: ldrex lr, [%0]\n" " sub lr, lr, %1\n" " strex ip, lr, [%0]\n" " teq ip, #0\n" " bne 1b\n" " teq lr, #0\n" " movmi ip, %0\n" " blmi " #fail : : "r" (ptr), "I" (1) : "ip", "lr", "cc"); smp_mb(); }) - -#define __down_op_ret(ptr,fail) ({ unsigned int ret; __asm__ __volatile__( "@ down_op_ret\n" "1: ldrex lr, [%1]\n" " sub lr, lr, %2\n" " strex ip, lr, [%1]\n" " teq ip, #0\n" " bne 1b\n" " teq lr, #0\n" " movmi ip, %1\n" " movpl ip, #0\n" " blmi " #fail "\n" " mov %0, ip" : "=&r" (ret) : "r" (ptr), "I" (1) : "ip", "lr", "cc"); smp_mb(); ret; }) - -#define __up_op(ptr,wake) ({ smp_mb(); __asm__ __volatile__( "@ up_op\n" "1: ldrex lr, [%0]\n" " add lr, lr, %1\n" " strex ip, lr, [%0]\n" " teq ip, #0\n" " bne 1b\n" " cmp lr, #0\n" " movle ip, %0\n" " blle " #wake : : "r" (ptr), "I" (1) : "ip", "lr", "cc"); }) - -#define RW_LOCK_BIAS 0x01000000 -#define RW_LOCK_BIAS_STR "0x01000000" - -#define __down_op_write(ptr,fail) ({ __asm__ __volatile__( "@ down_op_write\n" "1: ldrex lr, [%0]\n" " sub lr, lr, %1\n" " strex ip, lr, [%0]\n" " teq ip, #0\n" " bne 1b\n" " teq lr, #0\n" " movne ip, %0\n" " blne " #fail : : "r" (ptr), "I" (RW_LOCK_BIAS) : "ip", "lr", "cc"); smp_mb(); }) - -#define __up_op_write(ptr,wake) ({ smp_mb(); __asm__ __volatile__( "@ up_op_write\n" "1: ldrex lr, [%0]\n" " adds lr, lr, %1\n" " strex ip, lr, [%0]\n" " teq ip, #0\n" " bne 1b\n" " movcs ip, %0\n" " blcs " #wake : : "r" (ptr), "I" (RW_LOCK_BIAS) : "ip", "lr", "cc"); }) - -#define __down_op_read(ptr,fail) __down_op(ptr, fail) - -#define __up_op_read(ptr,wake) ({ smp_mb(); __asm__ __volatile__( "@ up_op_read\n" "1: ldrex lr, [%0]\n" " add lr, lr, %1\n" " strex ip, lr, [%0]\n" " teq ip, #0\n" " bne 1b\n" " teq lr, #0\n" " moveq ip, %0\n" " bleq " #wake : : "r" (ptr), "I" (1) : "ip", "lr", "cc"); }) - -#else - -#define __down_op(ptr,fail) ({ __asm__ __volatile__( "@ down_op\n" " mrs ip, cpsr\n" " orr lr, ip, #128\n" " msr cpsr_c, lr\n" " ldr lr, [%0]\n" " subs lr, lr, %1\n" " str lr, [%0]\n" " msr cpsr_c, ip\n" " movmi ip, %0\n" " blmi " #fail : : "r" (ptr), "I" (1) : "ip", "lr", "cc"); smp_mb(); }) - -#define __down_op_ret(ptr,fail) ({ unsigned int ret; __asm__ __volatile__( "@ down_op_ret\n" " mrs ip, cpsr\n" " orr lr, ip, #128\n" " msr cpsr_c, lr\n" " ldr lr, [%1]\n" " subs lr, lr, %2\n" " str lr, [%1]\n" " msr cpsr_c, ip\n" " movmi ip, %1\n" " movpl ip, #0\n" " blmi " #fail "\n" " mov %0, ip" : "=&r" (ret) : "r" (ptr), "I" (1) : "ip", "lr", "cc"); smp_mb(); ret; }) - -#define __up_op(ptr,wake) ({ smp_mb(); __asm__ __volatile__( "@ up_op\n" " mrs ip, cpsr\n" " orr lr, ip, #128\n" " msr cpsr_c, lr\n" " ldr lr, [%0]\n" " adds lr, lr, %1\n" " str lr, [%0]\n" " msr cpsr_c, ip\n" " movle ip, %0\n" " blle " #wake : : "r" (ptr), "I" (1) : "ip", "lr", "cc"); }) - -#define RW_LOCK_BIAS 0x01000000 -#define RW_LOCK_BIAS_STR "0x01000000" - -#define __down_op_write(ptr,fail) ({ __asm__ __volatile__( "@ down_op_write\n" " mrs ip, cpsr\n" " orr lr, ip, #128\n" " msr cpsr_c, lr\n" " ldr lr, [%0]\n" " subs lr, lr, %1\n" " str lr, [%0]\n" " msr cpsr_c, ip\n" " movne ip, %0\n" " blne " #fail : : "r" (ptr), "I" (RW_LOCK_BIAS) : "ip", "lr", "cc"); smp_mb(); }) - -#define __up_op_write(ptr,wake) ({ __asm__ __volatile__( "@ up_op_write\n" " mrs ip, cpsr\n" " orr lr, ip, #128\n" " msr cpsr_c, lr\n" " ldr lr, [%0]\n" " adds lr, lr, %1\n" " str lr, [%0]\n" " msr cpsr_c, ip\n" " movcs ip, %0\n" " blcs " #wake : : "r" (ptr), "I" (RW_LOCK_BIAS) : "ip", "lr", "cc"); smp_mb(); }) - -#define __down_op_read(ptr,fail) __down_op(ptr, fail) - -#define __up_op_read(ptr,wake) ({ smp_mb(); __asm__ __volatile__( "@ up_op_read\n" " mrs ip, cpsr\n" " orr lr, ip, #128\n" " msr cpsr_c, lr\n" " ldr lr, [%0]\n" " adds lr, lr, %1\n" " str lr, [%0]\n" " msr cpsr_c, ip\n" " moveq ip, %0\n" " bleq " #wake : : "r" (ptr), "I" (1) : "ip", "lr", "cc"); }) - -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/mc146818rtc.h b/libc/kernel/arch-arm/asm/mc146818rtc.h deleted file mode 100644 index 5a8672422..000000000 --- a/libc/kernel/arch-arm/asm/mc146818rtc.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_MC146818RTC_H -#define _ASM_MC146818RTC_H - -#include -#include - -#ifndef RTC_PORT -#define RTC_PORT(x) (0x70 + (x)) -#define RTC_ALWAYS_BCD 1 -#endif - -#define CMOS_READ(addr) ({ outb_p((addr),RTC_PORT(0)); inb_p(RTC_PORT(1)); }) -#define CMOS_WRITE(val, addr) ({ outb_p((addr),RTC_PORT(0)); outb_p((val),RTC_PORT(1)); }) - -#endif diff --git a/libc/kernel/arch-arm/asm/memory.h b/libc/kernel/arch-arm/asm/memory.h deleted file mode 100644 index c1137a778..000000000 --- a/libc/kernel/arch-arm/asm/memory.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_MEMORY_H -#define __ASM_ARM_MEMORY_H - -#ifndef __ASSEMBLY__ -#define UL(x) (x##UL) -#else -#define UL(x) (x) -#endif - -#include -#include -#include - -#ifndef TASK_SIZE -#define TASK_SIZE (CONFIG_DRAM_SIZE) -#endif - -#ifndef TASK_UNMAPPED_BASE -#define TASK_UNMAPPED_BASE UL(0x00000000) -#endif - -#ifndef PHYS_OFFSET -#define PHYS_OFFSET (CONFIG_DRAM_BASE) -#endif - -#ifndef END_MEM -#define END_MEM (CONFIG_DRAM_BASE + CONFIG_DRAM_SIZE) -#endif - -#ifndef PAGE_OFFSET -#define PAGE_OFFSET (PHYS_OFFSET) -#endif - -#define MODULE_END (END_MEM) -#define MODULE_START (PHYS_OFFSET) - -#ifndef CONSISTENT_DMA_SIZE -#define CONSISTENT_DMA_SIZE SZ_2M -#endif - -#ifndef __virt_to_phys -#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) -#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET) -#endif - -#define __phys_to_pfn(paddr) ((paddr) >> PAGE_SHIFT) -#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) - -#ifndef __ASSEMBLY__ - -#ifndef ISA_DMA_THRESHOLD -#define ISA_DMA_THRESHOLD (0xffffffffULL) -#endif - -#ifndef arch_adjust_zones -#define arch_adjust_zones(node,size,holes) do { } while (0) -#endif - -#define PHYS_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT) - -#define __pa(x) __virt_to_phys((unsigned long)(x)) -#define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) -#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) -#define ARCH_PFN_OFFSET PHYS_PFN_OFFSET -#define pfn_valid(pfn) ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr)) -#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) -#define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) -#define PHYS_TO_NID(addr) (0) -#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) -#ifndef __arch_page_to_dma -#define page_to_dma(dev, page) ((dma_addr_t)__virt_to_bus((unsigned long)page_address(page))) -#define dma_to_virt(dev, addr) ((void *)__bus_to_virt(addr)) -#define virt_to_dma(dev, addr) ((dma_addr_t)__virt_to_bus((unsigned long)(addr))) -#else -#define page_to_dma(dev, page) (__arch_page_to_dma(dev, page)) -#define dma_to_virt(dev, addr) (__arch_dma_to_virt(dev, addr)) -#define virt_to_dma(dev, addr) (__arch_virt_to_dma(dev, addr)) -#endif -#ifndef arch_is_coherent -#define arch_is_coherent() 0 -#endif -#endif -#include -#endif diff --git a/libc/kernel/arch-arm/asm/mman.h b/libc/kernel/arch-arm/asm/mman.h deleted file mode 100644 index 8f71d1b60..000000000 --- a/libc/kernel/arch-arm/asm/mman.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARM_MMAN_H__ -#define __ARM_MMAN_H__ - -#include - -#define MAP_GROWSDOWN 0x0100 -#define MAP_DENYWRITE 0x0800 -#define MAP_EXECUTABLE 0x1000 -#define MAP_LOCKED 0x2000 -#define MAP_NORESERVE 0x4000 -#define MAP_POPULATE 0x8000 -#define MAP_NONBLOCK 0x10000 - -#define MCL_CURRENT 1 -#define MCL_FUTURE 2 - -#endif diff --git a/libc/kernel/arch-arm/asm/module.h b/libc/kernel/arch-arm/asm/module.h deleted file mode 100644 index 68b806a33..000000000 --- a/libc/kernel/arch-arm/asm/module.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_ARM_MODULE_H -#define _ASM_ARM_MODULE_H - -struct mod_arch_specific -{ - int foo; -}; - -#define Elf_Shdr Elf32_Shdr -#define Elf_Sym Elf32_Sym -#define Elf_Ehdr Elf32_Ehdr - -#define MODULE_ARCH_VERMAGIC "ARMv" __stringify(__LINUX_ARM_ARCH__) " " - -#endif diff --git a/libc/kernel/arch-arm/asm/msgbuf.h b/libc/kernel/arch-arm/asm/msgbuf.h deleted file mode 100644 index 84d614c7e..000000000 --- a/libc/kernel/arch-arm/asm/msgbuf.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_MSGBUF_H -#define _ASMARM_MSGBUF_H - -struct msqid64_ds { - struct ipc64_perm msg_perm; - __kernel_time_t msg_stime; - unsigned long __unused1; - __kernel_time_t msg_rtime; - unsigned long __unused2; - __kernel_time_t msg_ctime; - unsigned long __unused3; - unsigned long msg_cbytes; - unsigned long msg_qnum; - unsigned long msg_qbytes; - __kernel_pid_t msg_lspid; - __kernel_pid_t msg_lrpid; - unsigned long __unused4; - unsigned long __unused5; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/mtd-xip.h b/libc/kernel/arch-arm/asm/mtd-xip.h deleted file mode 100644 index 6c53f6f5f..000000000 --- a/libc/kernel/arch-arm/asm/mtd-xip.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARM_MTD_XIP_H__ -#define __ARM_MTD_XIP_H__ - -#include -#include - -#define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0) - -#endif diff --git a/libc/kernel/arch-arm/asm/page.h b/libc/kernel/arch-arm/asm/page.h deleted file mode 100644 index f9803437e..000000000 --- a/libc/kernel/arch-arm/asm/page.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_PAGE_H -#define _ASMARM_PAGE_H - -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - -#endif diff --git a/libc/kernel/arch-arm/asm/param.h b/libc/kernel/arch-arm/asm/param.h deleted file mode 100644 index 6814fe386..000000000 --- a/libc/kernel/arch-arm/asm/param.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_PARAM_H -#define __ASM_PARAM_H - -#define HZ 100 - -#define EXEC_PAGESIZE 4096 - -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - - -#endif - diff --git a/libc/kernel/arch-arm/asm/percpu.h b/libc/kernel/arch-arm/asm/percpu.h deleted file mode 100644 index 2500345ef..000000000 --- a/libc/kernel/arch-arm/asm/percpu.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARM_PERCPU -#define __ARM_PERCPU - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/pgalloc.h b/libc/kernel/arch-arm/asm/pgalloc.h deleted file mode 100644 index 5d45e650d..000000000 --- a/libc/kernel/arch-arm/asm/pgalloc.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_PGALLOC_H -#define _ASMARM_PGALLOC_H - -#include -#include -#include -#include -#include - -#define check_pgt_cache() do { } while (0) - -#endif diff --git a/libc/kernel/arch-arm/asm/pgtable-hwdef.h b/libc/kernel/arch-arm/asm/pgtable-hwdef.h deleted file mode 100644 index 47e867595..000000000 --- a/libc/kernel/arch-arm/asm/pgtable-hwdef.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_PGTABLE_HWDEF_H -#define _ASMARM_PGTABLE_HWDEF_H - -#define PMD_TYPE_MASK (3 << 0) -#define PMD_TYPE_FAULT (0 << 0) -#define PMD_TYPE_TABLE (1 << 0) -#define PMD_TYPE_SECT (2 << 0) -#define PMD_BIT4 (1 << 4) -#define PMD_DOMAIN(x) ((x) << 5) -#define PMD_PROTECTION (1 << 9) - -#define PMD_SECT_BUFFERABLE (1 << 2) -#define PMD_SECT_CACHEABLE (1 << 3) -#define PMD_SECT_XN (1 << 4) -#define PMD_SECT_AP_WRITE (1 << 10) -#define PMD_SECT_AP_READ (1 << 11) -#define PMD_SECT_TEX(x) ((x) << 12) -#define PMD_SECT_APX (1 << 15) -#define PMD_SECT_S (1 << 16) -#define PMD_SECT_nG (1 << 17) -#define PMD_SECT_SUPER (1 << 18) - -#define PMD_SECT_UNCACHED (0) -#define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE) -#define PMD_SECT_WT (PMD_SECT_CACHEABLE) -#define PMD_SECT_WB (PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) -#define PMD_SECT_MINICACHE (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE) -#define PMD_SECT_WBWA (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) -#define PMD_SECT_NONSHARED_DEV (PMD_SECT_TEX(2)) - -#define PTE_TYPE_MASK (3 << 0) -#define PTE_TYPE_FAULT (0 << 0) -#define PTE_TYPE_LARGE (1 << 0) -#define PTE_TYPE_SMALL (2 << 0) -#define PTE_TYPE_EXT (3 << 0) -#define PTE_BUFFERABLE (1 << 2) -#define PTE_CACHEABLE (1 << 3) - -#define PTE_EXT_XN (1 << 0) -#define PTE_EXT_AP_MASK (3 << 4) -#define PTE_EXT_AP0 (1 << 4) -#define PTE_EXT_AP1 (2 << 4) -#define PTE_EXT_AP_UNO_SRO (0 << 4) -#define PTE_EXT_AP_UNO_SRW (PTE_EXT_AP0) -#define PTE_EXT_AP_URO_SRW (PTE_EXT_AP1) -#define PTE_EXT_AP_URW_SRW (PTE_EXT_AP1|PTE_EXT_AP0) -#define PTE_EXT_TEX(x) ((x) << 6) -#define PTE_EXT_APX (1 << 9) -#define PTE_EXT_COHERENT (1 << 9) -#define PTE_EXT_SHARED (1 << 10) -#define PTE_EXT_NG (1 << 11) - -#define PTE_SMALL_AP_MASK (0xff << 4) -#define PTE_SMALL_AP_UNO_SRO (0x00 << 4) -#define PTE_SMALL_AP_UNO_SRW (0x55 << 4) -#define PTE_SMALL_AP_URO_SRW (0xaa << 4) -#define PTE_SMALL_AP_URW_SRW (0xff << 4) - -#endif diff --git a/libc/kernel/arch-arm/asm/pgtable.h b/libc/kernel/arch-arm/asm/pgtable.h deleted file mode 100644 index cbac6115a..000000000 --- a/libc/kernel/arch-arm/asm/pgtable.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_PGTABLE_H -#define _ASMARM_PGTABLE_H - -#include -#include - -#include "pgtable-nommu.h" - -#endif diff --git a/libc/kernel/arch-arm/asm/poll.h b/libc/kernel/arch-arm/asm/poll.h deleted file mode 100644 index c5b80a5ff..000000000 --- a/libc/kernel/arch-arm/asm/poll.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASMARM_POLL_H -#define __ASMARM_POLL_H - -#define POLLIN 0x0001 -#define POLLPRI 0x0002 -#define POLLOUT 0x0004 -#define POLLERR 0x0008 -#define POLLHUP 0x0010 -#define POLLNVAL 0x0020 - -#define POLLRDNORM 0x0040 -#define POLLRDBAND 0x0080 -#define POLLWRNORM 0x0100 -#define POLLWRBAND 0x0200 -#define POLLMSG 0x0400 -#define POLLREMOVE 0x1000 -#define POLLRDHUP 0x2000 - -struct pollfd { - int fd; - short events; - short revents; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/posix_types.h b/libc/kernel/arch-arm/asm/posix_types.h deleted file mode 100644 index bc852174f..000000000 --- a/libc/kernel/arch-arm/asm/posix_types.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_ARM_POSIX_TYPES_H -#define __ARCH_ARM_POSIX_TYPES_H - -typedef unsigned long __kernel_ino_t; -typedef unsigned short __kernel_mode_t; -typedef unsigned short __kernel_nlink_t; -typedef long __kernel_off_t; -typedef int __kernel_pid_t; -typedef unsigned short __kernel_ipc_pid_t; -typedef unsigned short __kernel_uid_t; -typedef unsigned short __kernel_gid_t; -typedef unsigned int __kernel_size_t; -typedef int __kernel_ssize_t; -typedef int __kernel_ptrdiff_t; -typedef long __kernel_time_t; -typedef long __kernel_suseconds_t; -typedef long __kernel_clock_t; -typedef int __kernel_timer_t; -typedef int __kernel_clockid_t; -typedef int __kernel_daddr_t; -typedef char * __kernel_caddr_t; -typedef unsigned short __kernel_uid16_t; -typedef unsigned short __kernel_gid16_t; -typedef unsigned int __kernel_uid32_t; -typedef unsigned int __kernel_gid32_t; - -typedef unsigned short __kernel_old_uid_t; -typedef unsigned short __kernel_old_gid_t; -typedef unsigned short __kernel_old_dev_t; - -#ifdef __GNUC__ -typedef long long __kernel_loff_t; -#endif - -typedef struct { -#ifdef __USE_ALL - int val[2]; -#else - int __val[2]; -#endif -} __kernel_fsid_t; - -#if !defined(__GLIBC__) || __GLIBC__ < 2 - -#undef __FD_SET -#define __FD_SET(fd, fdsetp) (((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] |= (1<<((fd) & 31))) - -#undef __FD_CLR -#define __FD_CLR(fd, fdsetp) (((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] &= ~(1<<((fd) & 31))) - -#undef __FD_ISSET -#define __FD_ISSET(fd, fdsetp) ((((fd_set *)(fdsetp))->fds_bits[(fd) >> 5] & (1<<((fd) & 31))) != 0) - -#undef __FD_ZERO -#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof (*(fd_set *)(fdsetp)))) - -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/proc-fns.h b/libc/kernel/arch-arm/asm/proc-fns.h deleted file mode 100644 index 4a560d06e..000000000 --- a/libc/kernel/arch-arm/asm/proc-fns.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_PROCFNS_H -#define __ASM_PROCFNS_H - -#endif diff --git a/libc/kernel/arch-arm/asm/processor.h b/libc/kernel/arch-arm/asm/processor.h deleted file mode 100644 index f93cbc14e..000000000 --- a/libc/kernel/arch-arm/asm/processor.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_PROCESSOR_H -#define __ASM_ARM_PROCESSOR_H - -#define current_text_addr() ({ __label__ _l; _l: &&_l;}) - -#endif diff --git a/libc/kernel/arch-arm/asm/procinfo.h b/libc/kernel/arch-arm/asm/procinfo.h deleted file mode 100644 index d774e0b6d..000000000 --- a/libc/kernel/arch-arm/asm/procinfo.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_PROCINFO_H -#define __ASM_PROCINFO_H - -#ifndef __ASSEMBLY__ - -struct cpu_tlb_fns; -struct cpu_user_fns; -struct cpu_cache_fns; -struct processor; - -struct proc_info_list { - unsigned int cpu_val; - unsigned int cpu_mask; - unsigned long __cpu_mm_mmu_flags; - unsigned long __cpu_io_mmu_flags; - unsigned long __cpu_flush; - const char *arch_name; - const char *elf_name; - unsigned int elf_hwcap; - const char *cpu_name; - struct processor *proc; - struct cpu_tlb_fns *tlb; - struct cpu_user_fns *user; - struct cpu_cache_fns *cache; -}; - -#endif - -#define HWCAP_SWP 1 -#define HWCAP_HALF 2 -#define HWCAP_THUMB 4 -#define HWCAP_26BIT 8 -#define HWCAP_FAST_MULT 16 -#define HWCAP_FPA 32 -#define HWCAP_VFP 64 -#define HWCAP_EDSP 128 -#define HWCAP_JAVA 256 -#define HWCAP_IWMMXT 512 - -#endif diff --git a/libc/kernel/arch-arm/asm/ptrace.h b/libc/kernel/arch-arm/asm/ptrace.h deleted file mode 100644 index c6dfea10a..000000000 --- a/libc/kernel/arch-arm/asm/ptrace.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_PTRACE_H -#define __ASM_ARM_PTRACE_H - -#define PTRACE_GETREGS 12 -#define PTRACE_SETREGS 13 -#define PTRACE_GETFPREGS 14 -#define PTRACE_SETFPREGS 15 - -#define PTRACE_GETWMMXREGS 18 -#define PTRACE_SETWMMXREGS 19 - -#define PTRACE_OLDSETOPTIONS 21 - -#define PTRACE_GET_THREAD_AREA 22 - -#define PTRACE_SET_SYSCALL 23 - -#define PTRACE_GETCRUNCHREGS 25 -#define PTRACE_SETCRUNCHREGS 26 - -#define USR26_MODE 0x00000000 -#define FIQ26_MODE 0x00000001 -#define IRQ26_MODE 0x00000002 -#define SVC26_MODE 0x00000003 -#define USR_MODE 0x00000010 -#define FIQ_MODE 0x00000011 -#define IRQ_MODE 0x00000012 -#define SVC_MODE 0x00000013 -#define ABT_MODE 0x00000017 -#define UND_MODE 0x0000001b -#define SYSTEM_MODE 0x0000001f -#define MODE32_BIT 0x00000010 -#define MODE_MASK 0x0000001f -#define PSR_T_BIT 0x00000020 -#define PSR_F_BIT 0x00000040 -#define PSR_I_BIT 0x00000080 -#define PSR_J_BIT 0x01000000 -#define PSR_Q_BIT 0x08000000 -#define PSR_V_BIT 0x10000000 -#define PSR_C_BIT 0x20000000 -#define PSR_Z_BIT 0x40000000 -#define PSR_N_BIT 0x80000000 -#define PCMASK 0 - -#define PSR_f 0xff000000 -#define PSR_s 0x00ff0000 -#define PSR_x 0x0000ff00 -#define PSR_c 0x000000ff - -#ifndef __ASSEMBLY__ - -struct pt_regs { - long uregs[18]; -}; - -#define ARM_cpsr uregs[16] -#define ARM_pc uregs[15] -#define ARM_lr uregs[14] -#define ARM_sp uregs[13] -#define ARM_ip uregs[12] -#define ARM_fp uregs[11] -#define ARM_r10 uregs[10] -#define ARM_r9 uregs[9] -#define ARM_r8 uregs[8] -#define ARM_r7 uregs[7] -#define ARM_r6 uregs[6] -#define ARM_r5 uregs[5] -#define ARM_r4 uregs[4] -#define ARM_r3 uregs[3] -#define ARM_r2 uregs[2] -#define ARM_r1 uregs[1] -#define ARM_r0 uregs[0] -#define ARM_ORIG_r0 uregs[17] - -#define pc_pointer(v) ((v) & ~PCMASK) - -#define instruction_pointer(regs) (pc_pointer((regs)->ARM_pc)) - -#define profile_pc(regs) instruction_pointer(regs) - -#endif - -#endif - diff --git a/libc/kernel/arch-arm/asm/resource.h b/libc/kernel/arch-arm/asm/resource.h deleted file mode 100644 index 7546dd4cd..000000000 --- a/libc/kernel/arch-arm/asm/resource.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARM_RESOURCE_H -#define _ARM_RESOURCE_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/scatterlist.h b/libc/kernel/arch-arm/asm/scatterlist.h deleted file mode 100644 index a2c06cae6..000000000 --- a/libc/kernel/arch-arm/asm/scatterlist.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SCATTERLIST_H -#define _ASMARM_SCATTERLIST_H - -#include -#include - -struct scatterlist { - struct page *page; - unsigned int offset; - dma_addr_t dma_address; - unsigned int length; -}; - -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) - -#endif diff --git a/libc/kernel/arch-arm/asm/semaphore.h b/libc/kernel/arch-arm/asm/semaphore.h deleted file mode 100644 index 7c5618a3a..000000000 --- a/libc/kernel/arch-arm/asm/semaphore.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_SEMAPHORE_H -#define __ASM_ARM_SEMAPHORE_H - -#include -#include -#include -#include - -#include -#include - -struct semaphore { - atomic_t count; - int sleepers; - wait_queue_head_t wait; -}; - -#define __SEMAPHORE_INIT(name, cnt) { .count = ATOMIC_INIT(cnt), .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), } - -#define __DECLARE_SEMAPHORE_GENERIC(name,count) struct semaphore name = __SEMAPHORE_INIT(name,count) - -#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) -#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) - -#endif diff --git a/libc/kernel/arch-arm/asm/sembuf.h b/libc/kernel/arch-arm/asm/sembuf.h deleted file mode 100644 index a2f5dd096..000000000 --- a/libc/kernel/arch-arm/asm/sembuf.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SEMBUF_H -#define _ASMARM_SEMBUF_H - -struct semid64_ds { - struct ipc64_perm sem_perm; - __kernel_time_t sem_otime; - unsigned long __unused1; - __kernel_time_t sem_ctime; - unsigned long __unused2; - unsigned long sem_nsems; - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/shmbuf.h b/libc/kernel/arch-arm/asm/shmbuf.h deleted file mode 100644 index 1d4d78c10..000000000 --- a/libc/kernel/arch-arm/asm/shmbuf.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SHMBUF_H -#define _ASMARM_SHMBUF_H - -struct shmid64_ds { - struct ipc64_perm shm_perm; - size_t shm_segsz; - __kernel_time_t shm_atime; - unsigned long __unused1; - __kernel_time_t shm_dtime; - unsigned long __unused2; - __kernel_time_t shm_ctime; - unsigned long __unused3; - __kernel_pid_t shm_cpid; - __kernel_pid_t shm_lpid; - unsigned long shm_nattch; - unsigned long __unused4; - unsigned long __unused5; -}; - -struct shminfo64 { - unsigned long shmmax; - unsigned long shmmin; - unsigned long shmmni; - unsigned long shmseg; - unsigned long shmall; - unsigned long __unused1; - unsigned long __unused2; - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/shmparam.h b/libc/kernel/arch-arm/asm/shmparam.h deleted file mode 100644 index ea53a8d57..000000000 --- a/libc/kernel/arch-arm/asm/shmparam.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SHMPARAM_H -#define _ASMARM_SHMPARAM_H - -#define SHMLBA (4 * PAGE_SIZE) - -#define __ARCH_FORCE_SHMLBA - -#endif diff --git a/libc/kernel/arch-arm/asm/sigcontext.h b/libc/kernel/arch-arm/asm/sigcontext.h deleted file mode 100644 index 3c4fcf3de..000000000 --- a/libc/kernel/arch-arm/asm/sigcontext.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SIGCONTEXT_H -#define _ASMARM_SIGCONTEXT_H - -struct sigcontext { - unsigned long trap_no; - unsigned long error_code; - unsigned long oldmask; - unsigned long arm_r0; - unsigned long arm_r1; - unsigned long arm_r2; - unsigned long arm_r3; - unsigned long arm_r4; - unsigned long arm_r5; - unsigned long arm_r6; - unsigned long arm_r7; - unsigned long arm_r8; - unsigned long arm_r9; - unsigned long arm_r10; - unsigned long arm_fp; - unsigned long arm_ip; - unsigned long arm_sp; - unsigned long arm_lr; - unsigned long arm_pc; - unsigned long arm_cpsr; - unsigned long fault_address; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/siginfo.h b/libc/kernel/arch-arm/asm/siginfo.h deleted file mode 100644 index 225685ee2..000000000 --- a/libc/kernel/arch-arm/asm/siginfo.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SIGINFO_H -#define _ASMARM_SIGINFO_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/signal.h b/libc/kernel/arch-arm/asm/signal.h deleted file mode 100644 index 212d9f169..000000000 --- a/libc/kernel/arch-arm/asm/signal.h +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SIGNAL_H -#define _ASMARM_SIGNAL_H - -#include - -struct siginfo; - -#define NSIG 32 -typedef unsigned long sigset_t; - -#define SIGHUP 1 -#define SIGINT 2 -#define SIGQUIT 3 -#define SIGILL 4 -#define SIGTRAP 5 -#define SIGABRT 6 -#define SIGIOT 6 -#define SIGBUS 7 -#define SIGFPE 8 -#define SIGKILL 9 -#define SIGUSR1 10 -#define SIGSEGV 11 -#define SIGUSR2 12 -#define SIGPIPE 13 -#define SIGALRM 14 -#define SIGTERM 15 -#define SIGSTKFLT 16 -#define SIGCHLD 17 -#define SIGCONT 18 -#define SIGSTOP 19 -#define SIGTSTP 20 -#define SIGTTIN 21 -#define SIGTTOU 22 -#define SIGURG 23 -#define SIGXCPU 24 -#define SIGXFSZ 25 -#define SIGVTALRM 26 -#define SIGPROF 27 -#define SIGWINCH 28 -#define SIGIO 29 -#define SIGPOLL SIGIO - -#define SIGPWR 30 -#define SIGSYS 31 -#define SIGUNUSED 31 - -#define SIGRTMIN 32 -#define SIGRTMAX _NSIG - -#define SIGSWI 32 - -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 -#define SA_THIRTYTWO 0x02000000 -#define SA_RESTORER 0x04000000 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - -#define SS_ONSTACK 1 -#define SS_DISABLE 2 - -#define MINSIGSTKSZ 2048 -#define SIGSTKSZ 8192 - -#include - -struct sigaction { - union { - __sighandler_t _sa_handler; - void (*_sa_sigaction)(int, struct siginfo *, void *); - } _u; - sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - -#define sa_handler _u._sa_handler -#define sa_sigaction _u._sa_sigaction - -typedef struct sigaltstack { - void __user *ss_sp; - int ss_flags; - size_t ss_size; -} stack_t; - -#endif diff --git a/libc/kernel/arch-arm/asm/sizes.h b/libc/kernel/arch-arm/asm/sizes.h deleted file mode 100644 index 90c1c71d8..000000000 --- a/libc/kernel/arch-arm/asm/sizes.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __sizes_h -#define __sizes_h 1 - -#define SZ_1K 0x00000400 -#define SZ_4K 0x00001000 -#define SZ_8K 0x00002000 -#define SZ_16K 0x00004000 -#define SZ_64K 0x00010000 -#define SZ_128K 0x00020000 -#define SZ_256K 0x00040000 -#define SZ_512K 0x00080000 - -#define SZ_1M 0x00100000 -#define SZ_2M 0x00200000 -#define SZ_4M 0x00400000 -#define SZ_8M 0x00800000 -#define SZ_16M 0x01000000 -#define SZ_32M 0x02000000 -#define SZ_64M 0x04000000 -#define SZ_128M 0x08000000 -#define SZ_256M 0x10000000 -#define SZ_512M 0x20000000 - -#define SZ_1G 0x40000000 -#define SZ_2G 0x80000000 - -#endif - diff --git a/libc/kernel/arch-arm/asm/smp.h b/libc/kernel/arch-arm/asm/smp.h deleted file mode 100644 index e6c1e41d2..000000000 --- a/libc/kernel/arch-arm/asm/smp.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_SMP_H -#define __ASM_ARM_SMP_H - -#include -#include -#include - -#include - -#error " included in non-SMP build" - -#define raw_smp_processor_id() (current_thread_info()->cpu) - -#define PROC_CHANGE_PENALTY 15 - -struct seq_file; - -struct secondary_data { - unsigned long pgdir; - void *stack; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/socket.h b/libc/kernel/arch-arm/asm/socket.h deleted file mode 100644 index 1f0050ae1..000000000 --- a/libc/kernel/arch-arm/asm/socket.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SOCKET_H -#define _ASMARM_SOCKET_H - -#include - -#define SOL_SOCKET 1 - -#define SO_DEBUG 1 -#define SO_REUSEADDR 2 -#define SO_TYPE 3 -#define SO_ERROR 4 -#define SO_DONTROUTE 5 -#define SO_BROADCAST 6 -#define SO_SNDBUF 7 -#define SO_RCVBUF 8 -#define SO_SNDBUFFORCE 32 -#define SO_RCVBUFFORCE 33 -#define SO_KEEPALIVE 9 -#define SO_OOBINLINE 10 -#define SO_NO_CHECK 11 -#define SO_PRIORITY 12 -#define SO_LINGER 13 -#define SO_BSDCOMPAT 14 - -#define SO_PASSCRED 16 -#define SO_PEERCRED 17 -#define SO_RCVLOWAT 18 -#define SO_SNDLOWAT 19 -#define SO_RCVTIMEO 20 -#define SO_SNDTIMEO 21 - -#define SO_SECURITY_AUTHENTICATION 22 -#define SO_SECURITY_ENCRYPTION_TRANSPORT 23 -#define SO_SECURITY_ENCRYPTION_NETWORK 24 - -#define SO_BINDTODEVICE 25 - -#define SO_ATTACH_FILTER 26 -#define SO_DETACH_FILTER 27 - -#define SO_PEERNAME 28 -#define SO_TIMESTAMP 29 -#define SCM_TIMESTAMP SO_TIMESTAMP - -#define SO_ACCEPTCONN 30 - -#define SO_PEERSEC 31 -#define SO_PASSSEC 34 - -#endif diff --git a/libc/kernel/arch-arm/asm/sockios.h b/libc/kernel/arch-arm/asm/sockios.h deleted file mode 100644 index cab86b8ef..000000000 --- a/libc/kernel/arch-arm/asm/sockios.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_ARM_SOCKIOS_H -#define __ARCH_ARM_SOCKIOS_H - -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 - -#endif diff --git a/libc/kernel/arch-arm/asm/spinlock.h b/libc/kernel/arch-arm/asm/spinlock.h deleted file mode 100644 index 3ae21735d..000000000 --- a/libc/kernel/arch-arm/asm/spinlock.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#if __LINUX_ARM_ARCH__ < 6 -#error SMP not supported on pre-ARMv6 CPUs -#endif - -#define __raw_spin_is_locked(x) ((x)->lock != 0) -#define __raw_spin_unlock_wait(lock) do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0) - -#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock) - -#define rwlock_is_locked(x) (*((volatile unsigned int *)(x)) != 0) -#define __raw_write_can_lock(x) ((x)->lock == 0x80000000) -#define __raw_read_can_lock(x) ((x)->lock < 0x80000000) -#endif diff --git a/libc/kernel/arch-arm/asm/spinlock_types.h b/libc/kernel/arch-arm/asm/spinlock_types.h deleted file mode 100644 index ee77f201c..000000000 --- a/libc/kernel/arch-arm/asm/spinlock_types.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_SPINLOCK_TYPES_H -#define __ASM_SPINLOCK_TYPES_H - -#ifndef __LINUX_SPINLOCK_TYPES_H -#error "please don't include this file directly" -#endif - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define __RAW_SPIN_LOCK_UNLOCKED { 0 } - -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define __RAW_RW_LOCK_UNLOCKED { 0 } - -#endif diff --git a/libc/kernel/arch-arm/asm/stat.h b/libc/kernel/arch-arm/asm/stat.h deleted file mode 100644 index 49b85f960..000000000 --- a/libc/kernel/arch-arm/asm/stat.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_STAT_H -#define _ASMARM_STAT_H - -struct __old_kernel_stat { - unsigned short st_dev; - unsigned short st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; - unsigned short st_rdev; - unsigned long st_size; - unsigned long st_atime; - unsigned long st_mtime; - unsigned long st_ctime; -}; - -#define STAT_HAVE_NSEC - -struct stat { -#ifdef __ARMEB__ - unsigned short st_dev; - unsigned short __pad1; -#else - unsigned long st_dev; -#endif - unsigned long st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; -#ifdef __ARMEB__ - unsigned short st_rdev; - unsigned short __pad2; -#else - unsigned long st_rdev; -#endif - unsigned long st_size; - unsigned long st_blksize; - unsigned long st_blocks; - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; - unsigned long st_mtime_nsec; - unsigned long st_ctime; - unsigned long st_ctime_nsec; - unsigned long __unused4; - unsigned long __unused5; -}; - -struct stat64 { - unsigned long long st_dev; - unsigned char __pad0[4]; - -#define STAT64_HAS_BROKEN_ST_INO 1 - unsigned long __st_ino; - unsigned int st_mode; - unsigned int st_nlink; - - unsigned long st_uid; - unsigned long st_gid; - - unsigned long long st_rdev; - unsigned char __pad3[4]; - - long long st_size; - unsigned long st_blksize; - unsigned long long st_blocks; - - unsigned long st_atime; - unsigned long st_atime_nsec; - - unsigned long st_mtime; - unsigned long st_mtime_nsec; - - unsigned long st_ctime; - unsigned long st_ctime_nsec; - - unsigned long long st_ino; -}; - -#endif diff --git a/libc/kernel/arch-arm/asm/statfs.h b/libc/kernel/arch-arm/asm/statfs.h deleted file mode 100644 index 7963eab26..000000000 --- a/libc/kernel/arch-arm/asm/statfs.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_STATFS_H -#define _ASMARM_STATFS_H - -struct statfs { - __u32 f_type; - __u32 f_bsize; - __u32 f_blocks; - __u32 f_bfree; - __u32 f_bavail; - __u32 f_files; - __u32 f_ffree; - __kernel_fsid_t f_fsid; - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -}; - -struct statfs64 { - __u32 f_type; - __u32 f_bsize; - __u64 f_blocks; - __u64 f_bfree; - __u64 f_bavail; - __u64 f_files; - __u64 f_ffree; - __kernel_fsid_t f_fsid; - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -} __attribute__ ((packed,aligned(4))); - -#endif diff --git a/libc/kernel/arch-arm/asm/suspend.h b/libc/kernel/arch-arm/asm/suspend.h deleted file mode 100644 index 156c171b7..000000000 --- a/libc/kernel/arch-arm/asm/suspend.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_SUSPEND_H -#define _ASMARM_SUSPEND_H - -#endif diff --git a/libc/kernel/arch-arm/asm/system.h b/libc/kernel/arch-arm/asm/system.h deleted file mode 100644 index 8e8503940..000000000 --- a/libc/kernel/arch-arm/asm/system.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_SYSTEM_H -#define __ASM_ARM_SYSTEM_H - -#endif diff --git a/libc/kernel/arch-arm/asm/termbits.h b/libc/kernel/arch-arm/asm/termbits.h deleted file mode 100644 index 640bd275e..000000000 --- a/libc/kernel/arch-arm/asm/termbits.h +++ /dev/null @@ -1,174 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_TERMBITS_H -#define __ASM_ARM_TERMBITS_H - -typedef unsigned char cc_t; -typedef unsigned int speed_t; -typedef unsigned int tcflag_t; - -#define NCCS 19 -struct termios { - tcflag_t c_iflag; - tcflag_t c_oflag; - tcflag_t c_cflag; - tcflag_t c_lflag; - cc_t c_line; - cc_t c_cc[NCCS]; -}; - -#define VINTR 0 -#define VQUIT 1 -#define VERASE 2 -#define VKILL 3 -#define VEOF 4 -#define VTIME 5 -#define VMIN 6 -#define VSWTC 7 -#define VSTART 8 -#define VSTOP 9 -#define VSUSP 10 -#define VEOL 11 -#define VREPRINT 12 -#define VDISCARD 13 -#define VWERASE 14 -#define VLNEXT 15 -#define VEOL2 16 - -#define IGNBRK 0000001 -#define BRKINT 0000002 -#define IGNPAR 0000004 -#define PARMRK 0000010 -#define INPCK 0000020 -#define ISTRIP 0000040 -#define INLCR 0000100 -#define IGNCR 0000200 -#define ICRNL 0000400 -#define IUCLC 0001000 -#define IXON 0002000 -#define IXANY 0004000 -#define IXOFF 0010000 -#define IMAXBEL 0020000 -#define IUTF8 0040000 - -#define OPOST 0000001 -#define OLCUC 0000002 -#define ONLCR 0000004 -#define OCRNL 0000010 -#define ONOCR 0000020 -#define ONLRET 0000040 -#define OFILL 0000100 -#define OFDEL 0000200 -#define NLDLY 0000400 -#define NL0 0000000 -#define NL1 0000400 -#define CRDLY 0003000 -#define CR0 0000000 -#define CR1 0001000 -#define CR2 0002000 -#define CR3 0003000 -#define TABDLY 0014000 -#define TAB0 0000000 -#define TAB1 0004000 -#define TAB2 0010000 -#define TAB3 0014000 -#define XTABS 0014000 -#define BSDLY 0020000 -#define BS0 0000000 -#define BS1 0020000 -#define VTDLY 0040000 -#define VT0 0000000 -#define VT1 0040000 -#define FFDLY 0100000 -#define FF0 0000000 -#define FF1 0100000 - -#define CBAUD 0010017 -#define B0 0000000 -#define B50 0000001 -#define B75 0000002 -#define B110 0000003 -#define B134 0000004 -#define B150 0000005 -#define B200 0000006 -#define B300 0000007 -#define B600 0000010 -#define B1200 0000011 -#define B1800 0000012 -#define B2400 0000013 -#define B4800 0000014 -#define B9600 0000015 -#define B19200 0000016 -#define B38400 0000017 -#define EXTA B19200 -#define EXTB B38400 -#define CSIZE 0000060 -#define CS5 0000000 -#define CS6 0000020 -#define CS7 0000040 -#define CS8 0000060 -#define CSTOPB 0000100 -#define CREAD 0000200 -#define PARENB 0000400 -#define PARODD 0001000 -#define HUPCL 0002000 -#define CLOCAL 0004000 -#define CBAUDEX 0010000 -#define B57600 0010001 -#define B115200 0010002 -#define B230400 0010003 -#define B460800 0010004 -#define B500000 0010005 -#define B576000 0010006 -#define B921600 0010007 -#define B1000000 0010010 -#define B1152000 0010011 -#define B1500000 0010012 -#define B2000000 0010013 -#define B2500000 0010014 -#define B3000000 0010015 -#define B3500000 0010016 -#define B4000000 0010017 -#define CIBAUD 002003600000 -#define CMSPAR 010000000000 -#define CRTSCTS 020000000000 - -#define ISIG 0000001 -#define ICANON 0000002 -#define XCASE 0000004 -#define ECHO 0000010 -#define ECHOE 0000020 -#define ECHOK 0000040 -#define ECHONL 0000100 -#define NOFLSH 0000200 -#define TOSTOP 0000400 -#define ECHOCTL 0001000 -#define ECHOPRT 0002000 -#define ECHOKE 0004000 -#define FLUSHO 0010000 -#define PENDIN 0040000 -#define IEXTEN 0100000 - -#define TCOOFF 0 -#define TCOON 1 -#define TCIOFF 2 -#define TCION 3 - -#define TCIFLUSH 0 -#define TCOFLUSH 1 -#define TCIOFLUSH 2 - -#define TCSANOW 0 -#define TCSADRAIN 1 -#define TCSAFLUSH 2 - -#endif diff --git a/libc/kernel/arch-arm/asm/termios.h b/libc/kernel/arch-arm/asm/termios.h deleted file mode 100644 index ba43ac272..000000000 --- a/libc/kernel/arch-arm/asm/termios.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_TERMIOS_H -#define __ASM_ARM_TERMIOS_H - -#include -#include - -struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; -}; - -#define NCC 8 -struct termio { - unsigned short c_iflag; - unsigned short c_oflag; - unsigned short c_cflag; - unsigned short c_lflag; - unsigned char c_line; - unsigned char c_cc[NCC]; -}; - -#define TIOCM_LE 0x001 -#define TIOCM_DTR 0x002 -#define TIOCM_RTS 0x004 -#define TIOCM_ST 0x008 -#define TIOCM_SR 0x010 -#define TIOCM_CTS 0x020 -#define TIOCM_CAR 0x040 -#define TIOCM_RNG 0x080 -#define TIOCM_DSR 0x100 -#define TIOCM_CD TIOCM_CAR -#define TIOCM_RI TIOCM_RNG -#define TIOCM_OUT1 0x2000 -#define TIOCM_OUT2 0x4000 -#define TIOCM_LOOP 0x8000 - -#define N_TTY 0 -#define N_SLIP 1 -#define N_MOUSE 2 -#define N_PPP 3 -#define N_STRIP 4 -#define N_AX25 5 -#define N_X25 6 -#define N_6PACK 7 -#define N_MASC 8 -#define N_R3964 9 -#define N_PROFIBUS_FDL 10 -#define N_IRDA 11 -#define N_SMSBLOCK 12 -#define N_HDLC 13 -#define N_SYNC_PPP 14 -#define N_HCI 15 - -#endif diff --git a/libc/kernel/arch-arm/asm/thread_info.h b/libc/kernel/arch-arm/asm/thread_info.h deleted file mode 100644 index a30d2dc7a..000000000 --- a/libc/kernel/arch-arm/asm/thread_info.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_THREAD_INFO_H -#define __ASM_ARM_THREAD_INFO_H - -#endif diff --git a/libc/kernel/arch-arm/asm/timex.h b/libc/kernel/arch-arm/asm/timex.h deleted file mode 100644 index 110c471a2..000000000 --- a/libc/kernel/arch-arm/asm/timex.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_TIMEX_H -#define _ASMARM_TIMEX_H - -#include - -typedef unsigned long cycles_t; - -#endif diff --git a/libc/kernel/arch-arm/asm/tlbflush.h b/libc/kernel/arch-arm/asm/tlbflush.h deleted file mode 100644 index 70a23dc8a..000000000 --- a/libc/kernel/arch-arm/asm/tlbflush.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_TLBFLUSH_H -#define _ASMARM_TLBFLUSH_H - -#define tlb_flush(tlb) ((void) tlb) - -#endif diff --git a/libc/kernel/arch-arm/asm/topology.h b/libc/kernel/arch-arm/asm/topology.h deleted file mode 100644 index 9eccfd414..000000000 --- a/libc/kernel/arch-arm/asm/topology.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_ARM_TOPOLOGY_H -#define _ASM_ARM_TOPOLOGY_H - -#include - -#endif diff --git a/libc/kernel/arch-arm/asm/types.h b/libc/kernel/arch-arm/asm/types.h deleted file mode 100644 index ec60f100c..000000000 --- a/libc/kernel/arch-arm/asm/types.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_TYPES_H -#define __ASM_ARM_TYPES_H - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#endif - -#endif - -#endif - diff --git a/libc/kernel/arch-arm/asm/uaccess.h b/libc/kernel/arch-arm/asm/uaccess.h deleted file mode 100644 index 21fc3f293..000000000 --- a/libc/kernel/arch-arm/asm/uaccess.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASMARM_UACCESS_H -#define _ASMARM_UACCESS_H - -#include -#include -#include -#include -#include - -#define VERIFY_READ 0 -#define VERIFY_WRITE 1 - -struct exception_table_entry -{ - unsigned long insn, fixup; -}; - -#define KERNEL_DS 0x00000000 -#define get_ds() (KERNEL_DS) - -#define USER_DS KERNEL_DS - -#define segment_eq(a,b) (1) -#define __addr_ok(addr) (1) -#define __range_ok(addr,size) (0) -#define get_fs() (KERNEL_DS) - -#define get_user(x,p) __get_user(x,p) -#define put_user(x,p) __put_user(x,p) -#define access_ok(type,addr,size) (__range_ok(addr,size) == 0) -#define __get_user(x,ptr) ({ long __gu_err = 0; __get_user_err((x),(ptr),__gu_err); __gu_err; }) -#define __get_user_error(x,ptr,err) ({ __get_user_err((x),(ptr),err); (void) 0; }) -#define __get_user_err(x,ptr,err) do { unsigned long __gu_addr = (unsigned long)(ptr); unsigned long __gu_val; __chk_user_ptr(ptr); switch (sizeof(*(ptr))) { case 1: __get_user_asm_byte(__gu_val,__gu_addr,err); break; case 2: __get_user_asm_half(__gu_val,__gu_addr,err); break; case 4: __get_user_asm_word(__gu_val,__gu_addr,err); break; default: (__gu_val) = __get_user_bad(); } (x) = (__typeof__(*(ptr)))__gu_val; } while (0) -#define __get_user_asm_byte(x,addr,err) __asm__ __volatile__( "1: ldrbt %1,[%2],#0\n" "2:\n" " .section .fixup,\"ax\"\n" " .align 2\n" "3: mov %0, %3\n" " mov %1, #0\n" " b 2b\n" " .previous\n" " .section __ex_table,\"a\"\n" " .align 3\n" " .long 1b, 3b\n" " .previous" : "+r" (err), "=&r" (x) : "r" (addr), "i" (-EFAULT) : "cc") -#ifndef __ARMEB__ -#define __get_user_asm_half(x,__gu_addr,err) ({ unsigned long __b1, __b2; __get_user_asm_byte(__b1, __gu_addr, err); __get_user_asm_byte(__b2, __gu_addr + 1, err); (x) = __b1 | (__b2 << 8); }) -#else -#define __get_user_asm_half(x,__gu_addr,err) ({ unsigned long __b1, __b2; __get_user_asm_byte(__b1, __gu_addr, err); __get_user_asm_byte(__b2, __gu_addr + 1, err); (x) = (__b1 << 8) | __b2; }) -#endif -#define __get_user_asm_word(x,addr,err) __asm__ __volatile__( "1: ldrt %1,[%2],#0\n" "2:\n" " .section .fixup,\"ax\"\n" " .align 2\n" "3: mov %0, %3\n" " mov %1, #0\n" " b 2b\n" " .previous\n" " .section __ex_table,\"a\"\n" " .align 3\n" " .long 1b, 3b\n" " .previous" : "+r" (err), "=&r" (x) : "r" (addr), "i" (-EFAULT) : "cc") -#define __put_user(x,ptr) ({ long __pu_err = 0; __put_user_err((x),(ptr),__pu_err); __pu_err; }) -#define __put_user_error(x,ptr,err) ({ __put_user_err((x),(ptr),err); (void) 0; }) -#define __put_user_err(x,ptr,err) do { unsigned long __pu_addr = (unsigned long)(ptr); __typeof__(*(ptr)) __pu_val = (x); __chk_user_ptr(ptr); switch (sizeof(*(ptr))) { case 1: __put_user_asm_byte(__pu_val,__pu_addr,err); break; case 2: __put_user_asm_half(__pu_val,__pu_addr,err); break; case 4: __put_user_asm_word(__pu_val,__pu_addr,err); break; case 8: __put_user_asm_dword(__pu_val,__pu_addr,err); break; default: __put_user_bad(); } } while (0) -#define __put_user_asm_byte(x,__pu_addr,err) __asm__ __volatile__( "1: strbt %1,[%2],#0\n" "2:\n" " .section .fixup,\"ax\"\n" " .align 2\n" "3: mov %0, %3\n" " b 2b\n" " .previous\n" " .section __ex_table,\"a\"\n" " .align 3\n" " .long 1b, 3b\n" " .previous" : "+r" (err) : "r" (x), "r" (__pu_addr), "i" (-EFAULT) : "cc") -#ifndef __ARMEB__ -#define __put_user_asm_half(x,__pu_addr,err) ({ unsigned long __temp = (unsigned long)(x); __put_user_asm_byte(__temp, __pu_addr, err); __put_user_asm_byte(__temp >> 8, __pu_addr + 1, err); }) -#else -#define __put_user_asm_half(x,__pu_addr,err) ({ unsigned long __temp = (unsigned long)(x); __put_user_asm_byte(__temp >> 8, __pu_addr, err); __put_user_asm_byte(__temp, __pu_addr + 1, err); }) -#endif -#define __put_user_asm_word(x,__pu_addr,err) __asm__ __volatile__( "1: strt %1,[%2],#0\n" "2:\n" " .section .fixup,\"ax\"\n" " .align 2\n" "3: mov %0, %3\n" " b 2b\n" " .previous\n" " .section __ex_table,\"a\"\n" " .align 3\n" " .long 1b, 3b\n" " .previous" : "+r" (err) : "r" (x), "r" (__pu_addr), "i" (-EFAULT) : "cc") -#ifndef __ARMEB__ -#define __reg_oper0 "%R2" -#define __reg_oper1 "%Q2" -#else -#define __reg_oper0 "%Q2" -#define __reg_oper1 "%R2" -#endif -#define __put_user_asm_dword(x,__pu_addr,err) __asm__ __volatile__( "1: strt " __reg_oper1 ", [%1], #4\n" "2: strt " __reg_oper0 ", [%1], #0\n" "3:\n" " .section .fixup,\"ax\"\n" " .align 2\n" "4: mov %0, %3\n" " b 3b\n" " .previous\n" " .section __ex_table,\"a\"\n" " .align 3\n" " .long 1b, 4b\n" " .long 2b, 4b\n" " .previous" : "+r" (err), "+r" (__pu_addr) : "r" (x), "i" (-EFAULT) : "cc") -#define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0) -#define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0) -#define __clear_user(addr,n) (memset((void __force *)addr, 0, n), 0) - -#define __copy_to_user_inatomic __copy_to_user -#define __copy_from_user_inatomic __copy_from_user -#define strlen_user(s) strnlen_user(s, ~0UL >> 1) -#endif diff --git a/libc/kernel/arch-arm/asm/unaligned.h b/libc/kernel/arch-arm/asm/unaligned.h deleted file mode 100644 index 8b9b096d9..000000000 --- a/libc/kernel/arch-arm/asm/unaligned.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_UNALIGNED_H -#define __ASM_ARM_UNALIGNED_H - -#include - -#define __get_unaligned_2_le(__p) (__p[0] | __p[1] << 8) - -#define __get_unaligned_2_be(__p) (__p[0] << 8 | __p[1]) - -#define __get_unaligned_4_le(__p) (__p[0] | __p[1] << 8 | __p[2] << 16 | __p[3] << 24) - -#define __get_unaligned_4_be(__p) (__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3]) - -#define __get_unaligned_le(ptr) ({ __typeof__(*(ptr)) __v; __u8 *__p = (__u8 *)(ptr); switch (sizeof(*(ptr))) { case 1: __v = *(ptr); break; case 2: __v = __get_unaligned_2_le(__p); break; case 4: __v = __get_unaligned_4_le(__p); break; case 8: { unsigned int __v1, __v2; __v2 = __get_unaligned_4_le((__p+4)); __v1 = __get_unaligned_4_le(__p); __v = ((unsigned long long)__v2 << 32 | __v1); } break; default: __v = __bug_unaligned_x(__p); break; } __v; }) - -#define __get_unaligned_be(ptr) ({ __typeof__(*(ptr)) __v; __u8 *__p = (__u8 *)(ptr); switch (sizeof(*(ptr))) { case 1: __v = *(ptr); break; case 2: __v = __get_unaligned_2_be(__p); break; case 4: __v = __get_unaligned_4_be(__p); break; case 8: { unsigned int __v1, __v2; __v2 = __get_unaligned_4_be(__p); __v1 = __get_unaligned_4_be((__p+4)); __v = ((unsigned long long)__v2 << 32 | __v1); } break; default: __v = __bug_unaligned_x(__p); break; } __v; }) - -#define __put_unaligned_le(val,ptr) ({ switch (sizeof(*(ptr))) { case 1: *(ptr) = (val); break; case 2: __put_unaligned_2_le((val),(__u8 *)(ptr)); break; case 4: __put_unaligned_4_le((val),(__u8 *)(ptr)); break; case 8: __put_unaligned_8_le((val),(__u8 *)(ptr)); break; default: __bug_unaligned_x(ptr); break; } (void) 0; }) -#define __put_unaligned_be(val,ptr) ({ switch (sizeof(*(ptr))) { case 1: *(ptr) = (val); break; case 2: __put_unaligned_2_be((val),(__u8 *)(ptr)); break; case 4: __put_unaligned_4_be((val),(__u8 *)(ptr)); break; case 8: __put_unaligned_8_be((val),(__u8 *)(ptr)); break; default: __bug_unaligned_x(ptr); break; } (void) 0; }) -#ifndef __ARMEB__ -#define get_unaligned __get_unaligned_le -#define put_unaligned __put_unaligned_le -#else -#define get_unaligned __get_unaligned_be -#define put_unaligned __put_unaligned_be -#endif -#endif diff --git a/libc/kernel/arch-arm/asm/unistd.h b/libc/kernel/arch-arm/asm/unistd.h deleted file mode 100644 index 9a30ddcb4..000000000 --- a/libc/kernel/arch-arm/asm/unistd.h +++ /dev/null @@ -1,359 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_ARM_UNISTD_H -#define __ASM_ARM_UNISTD_H - -#define __NR_OABI_SYSCALL_BASE 0x900000 - -#if defined(__thumb__) || defined(__ARM_EABI__) -#define __NR_SYSCALL_BASE 0 -#else -#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE -#endif - -#define __NR_restart_syscall (__NR_SYSCALL_BASE+ 0) -#define __NR_exit (__NR_SYSCALL_BASE+ 1) -#define __NR_fork (__NR_SYSCALL_BASE+ 2) -#define __NR_read (__NR_SYSCALL_BASE+ 3) -#define __NR_write (__NR_SYSCALL_BASE+ 4) -#define __NR_open (__NR_SYSCALL_BASE+ 5) -#define __NR_close (__NR_SYSCALL_BASE+ 6) - -#define __NR_creat (__NR_SYSCALL_BASE+ 8) -#define __NR_link (__NR_SYSCALL_BASE+ 9) -#define __NR_unlink (__NR_SYSCALL_BASE+ 10) -#define __NR_execve (__NR_SYSCALL_BASE+ 11) -#define __NR_chdir (__NR_SYSCALL_BASE+ 12) -#define __NR_time (__NR_SYSCALL_BASE+ 13) -#define __NR_mknod (__NR_SYSCALL_BASE+ 14) -#define __NR_chmod (__NR_SYSCALL_BASE+ 15) -#define __NR_lchown (__NR_SYSCALL_BASE+ 16) - -#define __NR_lseek (__NR_SYSCALL_BASE+ 19) -#define __NR_getpid (__NR_SYSCALL_BASE+ 20) -#define __NR_mount (__NR_SYSCALL_BASE+ 21) -#define __NR_umount (__NR_SYSCALL_BASE+ 22) -#define __NR_setuid (__NR_SYSCALL_BASE+ 23) -#define __NR_getuid (__NR_SYSCALL_BASE+ 24) -#define __NR_stime (__NR_SYSCALL_BASE+ 25) -#define __NR_ptrace (__NR_SYSCALL_BASE+ 26) -#define __NR_alarm (__NR_SYSCALL_BASE+ 27) - -#define __NR_pause (__NR_SYSCALL_BASE+ 29) -#define __NR_utime (__NR_SYSCALL_BASE+ 30) - -#define __NR_access (__NR_SYSCALL_BASE+ 33) -#define __NR_nice (__NR_SYSCALL_BASE+ 34) - -#define __NR_sync (__NR_SYSCALL_BASE+ 36) -#define __NR_kill (__NR_SYSCALL_BASE+ 37) -#define __NR_rename (__NR_SYSCALL_BASE+ 38) -#define __NR_mkdir (__NR_SYSCALL_BASE+ 39) -#define __NR_rmdir (__NR_SYSCALL_BASE+ 40) -#define __NR_dup (__NR_SYSCALL_BASE+ 41) -#define __NR_pipe (__NR_SYSCALL_BASE+ 42) -#define __NR_times (__NR_SYSCALL_BASE+ 43) - -#define __NR_brk (__NR_SYSCALL_BASE+ 45) -#define __NR_setgid (__NR_SYSCALL_BASE+ 46) -#define __NR_getgid (__NR_SYSCALL_BASE+ 47) - -#define __NR_geteuid (__NR_SYSCALL_BASE+ 49) -#define __NR_getegid (__NR_SYSCALL_BASE+ 50) -#define __NR_acct (__NR_SYSCALL_BASE+ 51) -#define __NR_umount2 (__NR_SYSCALL_BASE+ 52) - -#define __NR_ioctl (__NR_SYSCALL_BASE+ 54) -#define __NR_fcntl (__NR_SYSCALL_BASE+ 55) - -#define __NR_setpgid (__NR_SYSCALL_BASE+ 57) - -#define __NR_umask (__NR_SYSCALL_BASE+ 60) -#define __NR_chroot (__NR_SYSCALL_BASE+ 61) -#define __NR_ustat (__NR_SYSCALL_BASE+ 62) -#define __NR_dup2 (__NR_SYSCALL_BASE+ 63) -#define __NR_getppid (__NR_SYSCALL_BASE+ 64) -#define __NR_getpgrp (__NR_SYSCALL_BASE+ 65) -#define __NR_setsid (__NR_SYSCALL_BASE+ 66) -#define __NR_sigaction (__NR_SYSCALL_BASE+ 67) - -#define __NR_setreuid (__NR_SYSCALL_BASE+ 70) -#define __NR_setregid (__NR_SYSCALL_BASE+ 71) -#define __NR_sigsuspend (__NR_SYSCALL_BASE+ 72) -#define __NR_sigpending (__NR_SYSCALL_BASE+ 73) -#define __NR_sethostname (__NR_SYSCALL_BASE+ 74) -#define __NR_setrlimit (__NR_SYSCALL_BASE+ 75) -#define __NR_getrlimit (__NR_SYSCALL_BASE+ 76) -#define __NR_getrusage (__NR_SYSCALL_BASE+ 77) -#define __NR_gettimeofday (__NR_SYSCALL_BASE+ 78) -#define __NR_settimeofday (__NR_SYSCALL_BASE+ 79) -#define __NR_getgroups (__NR_SYSCALL_BASE+ 80) -#define __NR_setgroups (__NR_SYSCALL_BASE+ 81) -#define __NR_select (__NR_SYSCALL_BASE+ 82) -#define __NR_symlink (__NR_SYSCALL_BASE+ 83) - -#define __NR_readlink (__NR_SYSCALL_BASE+ 85) -#define __NR_uselib (__NR_SYSCALL_BASE+ 86) -#define __NR_swapon (__NR_SYSCALL_BASE+ 87) -#define __NR_reboot (__NR_SYSCALL_BASE+ 88) -#define __NR_readdir (__NR_SYSCALL_BASE+ 89) -#define __NR_mmap (__NR_SYSCALL_BASE+ 90) -#define __NR_munmap (__NR_SYSCALL_BASE+ 91) -#define __NR_truncate (__NR_SYSCALL_BASE+ 92) -#define __NR_ftruncate (__NR_SYSCALL_BASE+ 93) -#define __NR_fchmod (__NR_SYSCALL_BASE+ 94) -#define __NR_fchown (__NR_SYSCALL_BASE+ 95) -#define __NR_getpriority (__NR_SYSCALL_BASE+ 96) -#define __NR_setpriority (__NR_SYSCALL_BASE+ 97) - -#define __NR_statfs (__NR_SYSCALL_BASE+ 99) -#define __NR_fstatfs (__NR_SYSCALL_BASE+100) - -#define __NR_socketcall (__NR_SYSCALL_BASE+102) -#define __NR_syslog (__NR_SYSCALL_BASE+103) -#define __NR_setitimer (__NR_SYSCALL_BASE+104) -#define __NR_getitimer (__NR_SYSCALL_BASE+105) -#define __NR_stat (__NR_SYSCALL_BASE+106) -#define __NR_lstat (__NR_SYSCALL_BASE+107) -#define __NR_fstat (__NR_SYSCALL_BASE+108) - -#define __NR_vhangup (__NR_SYSCALL_BASE+111) - -#define __NR_syscall (__NR_SYSCALL_BASE+113) -#define __NR_wait4 (__NR_SYSCALL_BASE+114) -#define __NR_swapoff (__NR_SYSCALL_BASE+115) -#define __NR_sysinfo (__NR_SYSCALL_BASE+116) -#define __NR_ipc (__NR_SYSCALL_BASE+117) -#define __NR_fsync (__NR_SYSCALL_BASE+118) -#define __NR_sigreturn (__NR_SYSCALL_BASE+119) -#define __NR_clone (__NR_SYSCALL_BASE+120) -#define __NR_setdomainname (__NR_SYSCALL_BASE+121) -#define __NR_uname (__NR_SYSCALL_BASE+122) - -#define __NR_adjtimex (__NR_SYSCALL_BASE+124) -#define __NR_mprotect (__NR_SYSCALL_BASE+125) -#define __NR_sigprocmask (__NR_SYSCALL_BASE+126) - -#define __NR_init_module (__NR_SYSCALL_BASE+128) -#define __NR_delete_module (__NR_SYSCALL_BASE+129) - -#define __NR_quotactl (__NR_SYSCALL_BASE+131) -#define __NR_getpgid (__NR_SYSCALL_BASE+132) -#define __NR_fchdir (__NR_SYSCALL_BASE+133) -#define __NR_bdflush (__NR_SYSCALL_BASE+134) -#define __NR_sysfs (__NR_SYSCALL_BASE+135) -#define __NR_personality (__NR_SYSCALL_BASE+136) - -#define __NR_setfsuid (__NR_SYSCALL_BASE+138) -#define __NR_setfsgid (__NR_SYSCALL_BASE+139) -#define __NR__llseek (__NR_SYSCALL_BASE+140) -#define __NR_getdents (__NR_SYSCALL_BASE+141) -#define __NR__newselect (__NR_SYSCALL_BASE+142) -#define __NR_flock (__NR_SYSCALL_BASE+143) -#define __NR_msync (__NR_SYSCALL_BASE+144) -#define __NR_readv (__NR_SYSCALL_BASE+145) -#define __NR_writev (__NR_SYSCALL_BASE+146) -#define __NR_getsid (__NR_SYSCALL_BASE+147) -#define __NR_fdatasync (__NR_SYSCALL_BASE+148) -#define __NR__sysctl (__NR_SYSCALL_BASE+149) -#define __NR_mlock (__NR_SYSCALL_BASE+150) -#define __NR_munlock (__NR_SYSCALL_BASE+151) -#define __NR_mlockall (__NR_SYSCALL_BASE+152) -#define __NR_munlockall (__NR_SYSCALL_BASE+153) -#define __NR_sched_setparam (__NR_SYSCALL_BASE+154) -#define __NR_sched_getparam (__NR_SYSCALL_BASE+155) -#define __NR_sched_setscheduler (__NR_SYSCALL_BASE+156) -#define __NR_sched_getscheduler (__NR_SYSCALL_BASE+157) -#define __NR_sched_yield (__NR_SYSCALL_BASE+158) -#define __NR_sched_get_priority_max (__NR_SYSCALL_BASE+159) -#define __NR_sched_get_priority_min (__NR_SYSCALL_BASE+160) -#define __NR_sched_rr_get_interval (__NR_SYSCALL_BASE+161) -#define __NR_nanosleep (__NR_SYSCALL_BASE+162) -#define __NR_mremap (__NR_SYSCALL_BASE+163) -#define __NR_setresuid (__NR_SYSCALL_BASE+164) -#define __NR_getresuid (__NR_SYSCALL_BASE+165) - -#define __NR_poll (__NR_SYSCALL_BASE+168) -#define __NR_nfsservctl (__NR_SYSCALL_BASE+169) -#define __NR_setresgid (__NR_SYSCALL_BASE+170) -#define __NR_getresgid (__NR_SYSCALL_BASE+171) -#define __NR_prctl (__NR_SYSCALL_BASE+172) -#define __NR_rt_sigreturn (__NR_SYSCALL_BASE+173) -#define __NR_rt_sigaction (__NR_SYSCALL_BASE+174) -#define __NR_rt_sigprocmask (__NR_SYSCALL_BASE+175) -#define __NR_rt_sigpending (__NR_SYSCALL_BASE+176) -#define __NR_rt_sigtimedwait (__NR_SYSCALL_BASE+177) -#define __NR_rt_sigqueueinfo (__NR_SYSCALL_BASE+178) -#define __NR_rt_sigsuspend (__NR_SYSCALL_BASE+179) -#define __NR_pread64 (__NR_SYSCALL_BASE+180) -#define __NR_pwrite64 (__NR_SYSCALL_BASE+181) -#define __NR_chown (__NR_SYSCALL_BASE+182) -#define __NR_getcwd (__NR_SYSCALL_BASE+183) -#define __NR_capget (__NR_SYSCALL_BASE+184) -#define __NR_capset (__NR_SYSCALL_BASE+185) -#define __NR_sigaltstack (__NR_SYSCALL_BASE+186) -#define __NR_sendfile (__NR_SYSCALL_BASE+187) - -#define __NR_vfork (__NR_SYSCALL_BASE+190) -#define __NR_ugetrlimit (__NR_SYSCALL_BASE+191) -#define __NR_mmap2 (__NR_SYSCALL_BASE+192) -#define __NR_truncate64 (__NR_SYSCALL_BASE+193) -#define __NR_ftruncate64 (__NR_SYSCALL_BASE+194) -#define __NR_stat64 (__NR_SYSCALL_BASE+195) -#define __NR_lstat64 (__NR_SYSCALL_BASE+196) -#define __NR_fstat64 (__NR_SYSCALL_BASE+197) -#define __NR_lchown32 (__NR_SYSCALL_BASE+198) -#define __NR_getuid32 (__NR_SYSCALL_BASE+199) -#define __NR_getgid32 (__NR_SYSCALL_BASE+200) -#define __NR_geteuid32 (__NR_SYSCALL_BASE+201) -#define __NR_getegid32 (__NR_SYSCALL_BASE+202) -#define __NR_setreuid32 (__NR_SYSCALL_BASE+203) -#define __NR_setregid32 (__NR_SYSCALL_BASE+204) -#define __NR_getgroups32 (__NR_SYSCALL_BASE+205) -#define __NR_setgroups32 (__NR_SYSCALL_BASE+206) -#define __NR_fchown32 (__NR_SYSCALL_BASE+207) -#define __NR_setresuid32 (__NR_SYSCALL_BASE+208) -#define __NR_getresuid32 (__NR_SYSCALL_BASE+209) -#define __NR_setresgid32 (__NR_SYSCALL_BASE+210) -#define __NR_getresgid32 (__NR_SYSCALL_BASE+211) -#define __NR_chown32 (__NR_SYSCALL_BASE+212) -#define __NR_setuid32 (__NR_SYSCALL_BASE+213) -#define __NR_setgid32 (__NR_SYSCALL_BASE+214) -#define __NR_setfsuid32 (__NR_SYSCALL_BASE+215) -#define __NR_setfsgid32 (__NR_SYSCALL_BASE+216) -#define __NR_getdents64 (__NR_SYSCALL_BASE+217) -#define __NR_pivot_root (__NR_SYSCALL_BASE+218) -#define __NR_mincore (__NR_SYSCALL_BASE+219) -#define __NR_madvise (__NR_SYSCALL_BASE+220) -#define __NR_fcntl64 (__NR_SYSCALL_BASE+221) - -#define __NR_gettid (__NR_SYSCALL_BASE+224) -#define __NR_readahead (__NR_SYSCALL_BASE+225) -#define __NR_setxattr (__NR_SYSCALL_BASE+226) -#define __NR_lsetxattr (__NR_SYSCALL_BASE+227) -#define __NR_fsetxattr (__NR_SYSCALL_BASE+228) -#define __NR_getxattr (__NR_SYSCALL_BASE+229) -#define __NR_lgetxattr (__NR_SYSCALL_BASE+230) -#define __NR_fgetxattr (__NR_SYSCALL_BASE+231) -#define __NR_listxattr (__NR_SYSCALL_BASE+232) -#define __NR_llistxattr (__NR_SYSCALL_BASE+233) -#define __NR_flistxattr (__NR_SYSCALL_BASE+234) -#define __NR_removexattr (__NR_SYSCALL_BASE+235) -#define __NR_lremovexattr (__NR_SYSCALL_BASE+236) -#define __NR_fremovexattr (__NR_SYSCALL_BASE+237) -#define __NR_tkill (__NR_SYSCALL_BASE+238) -#define __NR_sendfile64 (__NR_SYSCALL_BASE+239) -#define __NR_futex (__NR_SYSCALL_BASE+240) -#define __NR_sched_setaffinity (__NR_SYSCALL_BASE+241) -#define __NR_sched_getaffinity (__NR_SYSCALL_BASE+242) -#define __NR_io_setup (__NR_SYSCALL_BASE+243) -#define __NR_io_destroy (__NR_SYSCALL_BASE+244) -#define __NR_io_getevents (__NR_SYSCALL_BASE+245) -#define __NR_io_submit (__NR_SYSCALL_BASE+246) -#define __NR_io_cancel (__NR_SYSCALL_BASE+247) -#define __NR_exit_group (__NR_SYSCALL_BASE+248) -#define __NR_lookup_dcookie (__NR_SYSCALL_BASE+249) -#define __NR_epoll_create (__NR_SYSCALL_BASE+250) -#define __NR_epoll_ctl (__NR_SYSCALL_BASE+251) -#define __NR_epoll_wait (__NR_SYSCALL_BASE+252) -#define __NR_remap_file_pages (__NR_SYSCALL_BASE+253) - -#define __NR_set_tid_address (__NR_SYSCALL_BASE+256) -#define __NR_timer_create (__NR_SYSCALL_BASE+257) -#define __NR_timer_settime (__NR_SYSCALL_BASE+258) -#define __NR_timer_gettime (__NR_SYSCALL_BASE+259) -#define __NR_timer_getoverrun (__NR_SYSCALL_BASE+260) -#define __NR_timer_delete (__NR_SYSCALL_BASE+261) -#define __NR_clock_settime (__NR_SYSCALL_BASE+262) -#define __NR_clock_gettime (__NR_SYSCALL_BASE+263) -#define __NR_clock_getres (__NR_SYSCALL_BASE+264) -#define __NR_clock_nanosleep (__NR_SYSCALL_BASE+265) -#define __NR_statfs64 (__NR_SYSCALL_BASE+266) -#define __NR_fstatfs64 (__NR_SYSCALL_BASE+267) -#define __NR_tgkill (__NR_SYSCALL_BASE+268) -#define __NR_utimes (__NR_SYSCALL_BASE+269) -#define __NR_arm_fadvise64_64 (__NR_SYSCALL_BASE+270) -#define __NR_pciconfig_iobase (__NR_SYSCALL_BASE+271) -#define __NR_pciconfig_read (__NR_SYSCALL_BASE+272) -#define __NR_pciconfig_write (__NR_SYSCALL_BASE+273) -#define __NR_mq_open (__NR_SYSCALL_BASE+274) -#define __NR_mq_unlink (__NR_SYSCALL_BASE+275) -#define __NR_mq_timedsend (__NR_SYSCALL_BASE+276) -#define __NR_mq_timedreceive (__NR_SYSCALL_BASE+277) -#define __NR_mq_notify (__NR_SYSCALL_BASE+278) -#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) -#define __NR_waitid (__NR_SYSCALL_BASE+280) -#define __NR_socket (__NR_SYSCALL_BASE+281) -#define __NR_bind (__NR_SYSCALL_BASE+282) -#define __NR_connect (__NR_SYSCALL_BASE+283) -#define __NR_listen (__NR_SYSCALL_BASE+284) -#define __NR_accept (__NR_SYSCALL_BASE+285) -#define __NR_getsockname (__NR_SYSCALL_BASE+286) -#define __NR_getpeername (__NR_SYSCALL_BASE+287) -#define __NR_socketpair (__NR_SYSCALL_BASE+288) -#define __NR_send (__NR_SYSCALL_BASE+289) -#define __NR_sendto (__NR_SYSCALL_BASE+290) -#define __NR_recv (__NR_SYSCALL_BASE+291) -#define __NR_recvfrom (__NR_SYSCALL_BASE+292) -#define __NR_shutdown (__NR_SYSCALL_BASE+293) -#define __NR_setsockopt (__NR_SYSCALL_BASE+294) -#define __NR_getsockopt (__NR_SYSCALL_BASE+295) -#define __NR_sendmsg (__NR_SYSCALL_BASE+296) -#define __NR_recvmsg (__NR_SYSCALL_BASE+297) -#define __NR_semop (__NR_SYSCALL_BASE+298) -#define __NR_semget (__NR_SYSCALL_BASE+299) -#define __NR_semctl (__NR_SYSCALL_BASE+300) -#define __NR_msgsnd (__NR_SYSCALL_BASE+301) -#define __NR_msgrcv (__NR_SYSCALL_BASE+302) -#define __NR_msgget (__NR_SYSCALL_BASE+303) -#define __NR_msgctl (__NR_SYSCALL_BASE+304) -#define __NR_shmat (__NR_SYSCALL_BASE+305) -#define __NR_shmdt (__NR_SYSCALL_BASE+306) -#define __NR_shmget (__NR_SYSCALL_BASE+307) -#define __NR_shmctl (__NR_SYSCALL_BASE+308) -#define __NR_add_key (__NR_SYSCALL_BASE+309) -#define __NR_request_key (__NR_SYSCALL_BASE+310) -#define __NR_keyctl (__NR_SYSCALL_BASE+311) -#define __NR_semtimedop (__NR_SYSCALL_BASE+312) -#define __NR_vserver (__NR_SYSCALL_BASE+313) -#define __NR_ioprio_set (__NR_SYSCALL_BASE+314) -#define __NR_ioprio_get (__NR_SYSCALL_BASE+315) -#define __NR_inotify_init (__NR_SYSCALL_BASE+316) -#define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317) -#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318) -#define __NR_mbind (__NR_SYSCALL_BASE+319) -#define __NR_get_mempolicy (__NR_SYSCALL_BASE+320) -#define __NR_set_mempolicy (__NR_SYSCALL_BASE+321) - -#define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000) -#define __ARM_NR_breakpoint (__ARM_NR_BASE+1) -#define __ARM_NR_cacheflush (__ARM_NR_BASE+2) -#define __ARM_NR_usr26 (__ARM_NR_BASE+3) -#define __ARM_NR_usr32 (__ARM_NR_BASE+4) -#define __ARM_NR_set_tls (__ARM_NR_BASE+5) - -#if defined(__ARM_EABI__) && !defined(__KERNEL__) -#undef __NR_time -#undef __NR_umount -#undef __NR_stime -#undef __NR_alarm -#undef __NR_utime -#undef __NR_getrlimit -#undef __NR_select -#undef __NR_readdir -#undef __NR_mmap -#undef __NR_socketcall -#undef __NR_syscall -#undef __NR_ipc -#endif - -#endif diff --git a/libc/kernel/arch-arm/asm/user.h b/libc/kernel/arch-arm/asm/user.h deleted file mode 100644 index 5f258505f..000000000 --- a/libc/kernel/arch-arm/asm/user.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARM_USER_H -#define _ARM_USER_H - -#include -#include - -struct user_fp { - struct fp_reg { - unsigned int sign1:1; - unsigned int unused:15; - unsigned int sign2:1; - unsigned int exponent:14; - unsigned int j:1; - unsigned int mantissa1:31; - unsigned int mantissa0:32; - } fpregs[8]; - unsigned int fpsr:32; - unsigned int fpcr:32; - unsigned char ftype[8]; - unsigned int init_flag; -}; - -struct user{ - - struct pt_regs regs; - - int u_fpvalid; - - unsigned long int u_tsize; - unsigned long int u_dsize; - unsigned long int u_ssize; - unsigned long start_code; - unsigned long start_stack; - long int signal; - int reserved; - struct pt_regs * u_ar0; - - unsigned long magic; - char u_comm[32]; - int u_debugreg[8]; - struct user_fp u_fp; - struct user_fp_struct * u_fp0; - -}; -#define NBPG PAGE_SIZE -#define UPAGES 1 -#define HOST_TEXT_START_ADDR (u.start_code) -#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) - -#endif diff --git a/libc/kernel/arch-arm/asm/vga.h b/libc/kernel/arch-arm/asm/vga.h deleted file mode 100644 index 7875dbf8f..000000000 --- a/libc/kernel/arch-arm/asm/vga.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef ASMARM_VGA_H -#define ASMARM_VGA_H - -#include -#include - -#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) - -#define vga_readb(x) (*((volatile unsigned char *)x)) -#define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x)) - -#endif diff --git a/libc/kernel/arch-x86/asm/a.out.h b/libc/kernel/arch-x86/asm/a.out.h deleted file mode 100644 index 6aecff73b..000000000 --- a/libc/kernel/arch-x86/asm/a.out.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_A_OUT_H -#define _ASM_X86_A_OUT_H - -struct exec -{ - unsigned int a_info; - unsigned a_text; - unsigned a_data; - unsigned a_bss; - unsigned a_syms; - unsigned a_entry; - unsigned a_trsize; - unsigned a_drsize; -}; - -#define N_TRSIZE(a) ((a).a_trsize) -#define N_DRSIZE(a) ((a).a_drsize) -#define N_SYMSIZE(a) ((a).a_syms) - -#endif diff --git a/libc/kernel/arch-x86/asm/acpi.h b/libc/kernel/arch-x86/asm/acpi.h deleted file mode 100644 index 0115ce9bd..000000000 --- a/libc/kernel/arch-x86/asm/acpi.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_ACPI_H -#define _ASM_X86_ACPI_H - -#include "acpi_64.h" - -#include - -#endif diff --git a/libc/kernel/arch-x86/asm/acpi_32.h b/libc/kernel/arch-x86/asm/acpi_32.h deleted file mode 100644 index fe0043cb6..000000000 --- a/libc/kernel/arch-x86/asm/acpi_32.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_ACPI_H -#define _ASM_ACPI_H - -#endif diff --git a/libc/kernel/arch-x86/asm/alternative.h b/libc/kernel/arch-x86/asm/alternative.h deleted file mode 100644 index 17c1dc5ed..000000000 --- a/libc/kernel/arch-x86/asm/alternative.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "alternative_64.h" diff --git a/libc/kernel/arch-x86/asm/alternative_32.h b/libc/kernel/arch-x86/asm/alternative_32.h deleted file mode 100644 index ef1311134..000000000 --- a/libc/kernel/arch-x86/asm/alternative_32.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_ALTERNATIVE_H -#define _I386_ALTERNATIVE_H - -#include -#include -#include - -struct alt_instr { - u8 *instr; - u8 *replacement; - u8 cpuid; - u8 instrlen; - u8 replacementlen; - u8 pad; -}; - -struct module; -#define alternative(oldinstr, newinstr, feature) asm volatile ("661:\n\t" oldinstr "\n662:\n" ".section .altinstructions,\"a\"\n" " .align 4\n" " .long 661b\n" " .long 663f\n" " .byte %c0\n" " .byte 662b-661b\n" " .byte 664f-663f\n" ".previous\n" ".section .altinstr_replacement,\"ax\"\n" "663:\n\t" newinstr "\n664:\n" ".previous" :: "i" (feature) : "memory") -#define alternative_input(oldinstr, newinstr, feature, input...) asm volatile ("661:\n\t" oldinstr "\n662:\n" ".section .altinstructions,\"a\"\n" " .align 4\n" " .long 661b\n" " .long 663f\n" " .byte %c0\n" " .byte 662b-661b\n" " .byte 664f-663f\n" ".previous\n" ".section .altinstr_replacement,\"ax\"\n" "663:\n\t" newinstr "\n664:\n" ".previous" :: "i" (feature), ##input) -#define alternative_io(oldinstr, newinstr, feature, output, input...) asm volatile ("661:\n\t" oldinstr "\n662:\n" ".section .altinstructions,\"a\"\n" " .align 4\n" " .long 661b\n" " .long 663f\n" " .byte %c[feat]\n" " .byte 662b-661b\n" " .byte 664f-663f\n" ".previous\n" ".section .altinstr_replacement,\"ax\"\n" "663:\n\t" newinstr "\n664:\n" ".previous" : output : [feat] "i" (feature), ##input) -#define ASM_OUTPUT2(a, b) a, b -#define LOCK_PREFIX "" - -#define __parainstructions NULL -#define __parainstructions_end NULL - -#endif diff --git a/libc/kernel/arch-x86/asm/apic.h b/libc/kernel/arch-x86/asm/apic.h deleted file mode 100644 index 5cb718197..000000000 --- a/libc/kernel/arch-x86/asm/apic.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "apic_64.h" diff --git a/libc/kernel/arch-x86/asm/apic_32.h b/libc/kernel/arch-x86/asm/apic_32.h deleted file mode 100644 index 02c9d9b3d..000000000 --- a/libc/kernel/arch-x86/asm/apic_32.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_APIC_H -#define __ASM_APIC_H - -#include -#include -#include -#include -#include -#include - -#define Dprintk(x...) - -#define APIC_QUIET 0 -#define APIC_VERBOSE 1 -#define APIC_DEBUG 2 - -#define apic_printk(v, s, a...) do { if ((v) <= apic_verbosity) printk(s, ##a); } while (0) - -#define local_apic_timer_c2_ok 1 -#endif diff --git a/libc/kernel/arch-x86/asm/apicdef.h b/libc/kernel/arch-x86/asm/apicdef.h deleted file mode 100644 index bd19f5ae0..000000000 --- a/libc/kernel/arch-x86/asm/apicdef.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "apicdef_64.h" diff --git a/libc/kernel/arch-x86/asm/apicdef_32.h b/libc/kernel/arch-x86/asm/apicdef_32.h deleted file mode 100644 index a4a5edb0c..000000000 --- a/libc/kernel/arch-x86/asm/apicdef_32.h +++ /dev/null @@ -1,372 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_APICDEF_H -#define __ASM_APICDEF_H - -#define APIC_DEFAULT_PHYS_BASE 0xfee00000 - -#define APIC_ID 0x20 -#define APIC_LVR 0x30 -#define APIC_LVR_MASK 0xFF00FF -#define GET_APIC_VERSION(x) ((x)&0xFF) -#define GET_APIC_MAXLVT(x) (((x)>>16)&0xFF) -#define APIC_INTEGRATED(x) ((x)&0xF0) -#define APIC_XAPIC(x) ((x) >= 0x14) -#define APIC_TASKPRI 0x80 -#define APIC_TPRI_MASK 0xFF -#define APIC_ARBPRI 0x90 -#define APIC_ARBPRI_MASK 0xFF -#define APIC_PROCPRI 0xA0 -#define APIC_EOI 0xB0 -#define APIC_EIO_ACK 0x0 -#define APIC_RRR 0xC0 -#define APIC_LDR 0xD0 -#define APIC_LDR_MASK (0xFF<<24) -#define GET_APIC_LOGICAL_ID(x) (((x)>>24)&0xFF) -#define SET_APIC_LOGICAL_ID(x) (((x)<<24)) -#define APIC_ALL_CPUS 0xFF -#define APIC_DFR 0xE0 -#define APIC_DFR_CLUSTER 0x0FFFFFFFul -#define APIC_DFR_FLAT 0xFFFFFFFFul -#define APIC_SPIV 0xF0 -#define APIC_SPIV_FOCUS_DISABLED (1<<9) -#define APIC_SPIV_APIC_ENABLED (1<<8) -#define APIC_ISR 0x100 -#define APIC_ISR_NR 0x8 -#define APIC_TMR 0x180 -#define APIC_IRR 0x200 -#define APIC_ESR 0x280 -#define APIC_ESR_SEND_CS 0x00001 -#define APIC_ESR_RECV_CS 0x00002 -#define APIC_ESR_SEND_ACC 0x00004 -#define APIC_ESR_RECV_ACC 0x00008 -#define APIC_ESR_SENDILL 0x00020 -#define APIC_ESR_RECVILL 0x00040 -#define APIC_ESR_ILLREGA 0x00080 -#define APIC_ICR 0x300 -#define APIC_DEST_SELF 0x40000 -#define APIC_DEST_ALLINC 0x80000 -#define APIC_DEST_ALLBUT 0xC0000 -#define APIC_ICR_RR_MASK 0x30000 -#define APIC_ICR_RR_INVALID 0x00000 -#define APIC_ICR_RR_INPROG 0x10000 -#define APIC_ICR_RR_VALID 0x20000 -#define APIC_INT_LEVELTRIG 0x08000 -#define APIC_INT_ASSERT 0x04000 -#define APIC_ICR_BUSY 0x01000 -#define APIC_DEST_LOGICAL 0x00800 -#define APIC_DM_FIXED 0x00000 -#define APIC_DM_LOWEST 0x00100 -#define APIC_DM_SMI 0x00200 -#define APIC_DM_REMRD 0x00300 -#define APIC_DM_NMI 0x00400 -#define APIC_DM_INIT 0x00500 -#define APIC_DM_STARTUP 0x00600 -#define APIC_DM_EXTINT 0x00700 -#define APIC_VECTOR_MASK 0x000FF -#define APIC_ICR2 0x310 -#define GET_APIC_DEST_FIELD(x) (((x)>>24)&0xFF) -#define SET_APIC_DEST_FIELD(x) ((x)<<24) -#define APIC_LVTT 0x320 -#define APIC_LVTTHMR 0x330 -#define APIC_LVTPC 0x340 -#define APIC_LVT0 0x350 -#define APIC_LVT_TIMER_BASE_MASK (0x3<<18) -#define GET_APIC_TIMER_BASE(x) (((x)>>18)&0x3) -#define SET_APIC_TIMER_BASE(x) (((x)<<18)) -#define APIC_TIMER_BASE_CLKIN 0x0 -#define APIC_TIMER_BASE_TMBASE 0x1 -#define APIC_TIMER_BASE_DIV 0x2 -#define APIC_LVT_TIMER_PERIODIC (1<<17) -#define APIC_LVT_MASKED (1<<16) -#define APIC_LVT_LEVEL_TRIGGER (1<<15) -#define APIC_LVT_REMOTE_IRR (1<<14) -#define APIC_INPUT_POLARITY (1<<13) -#define APIC_SEND_PENDING (1<<12) -#define APIC_MODE_MASK 0x700 -#define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7) -#define SET_APIC_DELIVERY_MODE(x,y) (((x)&~0x700)|((y)<<8)) -#define APIC_MODE_FIXED 0x0 -#define APIC_MODE_NMI 0x4 -#define APIC_MODE_EXTINT 0x7 -#define APIC_LVT1 0x360 -#define APIC_LVTERR 0x370 -#define APIC_TMICT 0x380 -#define APIC_TMCCT 0x390 -#define APIC_TDCR 0x3E0 -#define APIC_TDR_DIV_TMBASE (1<<2) -#define APIC_TDR_DIV_1 0xB -#define APIC_TDR_DIV_2 0x0 -#define APIC_TDR_DIV_4 0x1 -#define APIC_TDR_DIV_8 0x2 -#define APIC_TDR_DIV_16 0x3 -#define APIC_TDR_DIV_32 0x8 -#define APIC_TDR_DIV_64 0x9 -#define APIC_TDR_DIV_128 0xA - -#define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) - -#define MAX_IO_APICS 64 - -#define u32 unsigned int - -struct local_apic { - - struct { u32 __reserved[4]; } __reserved_01; - - struct { u32 __reserved[4]; } __reserved_02; - - struct { - u32 __reserved_1 : 24, - phys_apic_id : 4, - __reserved_2 : 4; - u32 __reserved[3]; - } id; - - const - struct { - u32 version : 8, - __reserved_1 : 8, - max_lvt : 8, - __reserved_2 : 8; - u32 __reserved[3]; - } version; - - struct { u32 __reserved[4]; } __reserved_03; - - struct { u32 __reserved[4]; } __reserved_04; - - struct { u32 __reserved[4]; } __reserved_05; - - struct { u32 __reserved[4]; } __reserved_06; - - struct { - u32 priority : 8, - __reserved_1 : 24; - u32 __reserved_2[3]; - } tpr; - - const - struct { - u32 priority : 8, - __reserved_1 : 24; - u32 __reserved_2[3]; - } apr; - - const - struct { - u32 priority : 8, - __reserved_1 : 24; - u32 __reserved_2[3]; - } ppr; - - struct { - u32 eoi; - u32 __reserved[3]; - } eoi; - - struct { u32 __reserved[4]; } __reserved_07; - - struct { - u32 __reserved_1 : 24, - logical_dest : 8; - u32 __reserved_2[3]; - } ldr; - - struct { - u32 __reserved_1 : 28, - model : 4; - u32 __reserved_2[3]; - } dfr; - - struct { - u32 spurious_vector : 8, - apic_enabled : 1, - focus_cpu : 1, - __reserved_2 : 22; - u32 __reserved_3[3]; - } svr; - - struct { - u32 bitfield; - u32 __reserved[3]; - } isr [8]; - - struct { - u32 bitfield; - u32 __reserved[3]; - } tmr [8]; - - struct { - u32 bitfield; - u32 __reserved[3]; - } irr [8]; - - union { - struct { - u32 send_cs_error : 1, - receive_cs_error : 1, - send_accept_error : 1, - receive_accept_error : 1, - __reserved_1 : 1, - send_illegal_vector : 1, - receive_illegal_vector : 1, - illegal_register_address : 1, - __reserved_2 : 24; - u32 __reserved_3[3]; - } error_bits; - struct { - u32 errors; - u32 __reserved_3[3]; - } all_errors; - } esr; - - struct { u32 __reserved[4]; } __reserved_08; - - struct { u32 __reserved[4]; } __reserved_09; - - struct { u32 __reserved[4]; } __reserved_10; - - struct { u32 __reserved[4]; } __reserved_11; - - struct { u32 __reserved[4]; } __reserved_12; - - struct { u32 __reserved[4]; } __reserved_13; - - struct { u32 __reserved[4]; } __reserved_14; - - struct { - u32 vector : 8, - delivery_mode : 3, - destination_mode : 1, - delivery_status : 1, - __reserved_1 : 1, - level : 1, - trigger : 1, - __reserved_2 : 2, - shorthand : 2, - __reserved_3 : 12; - u32 __reserved_4[3]; - } icr1; - - struct { - union { - u32 __reserved_1 : 24, - phys_dest : 4, - __reserved_2 : 4; - u32 __reserved_3 : 24, - logical_dest : 8; - } dest; - u32 __reserved_4[3]; - } icr2; - - struct { - u32 vector : 8, - __reserved_1 : 4, - delivery_status : 1, - __reserved_2 : 3, - mask : 1, - timer_mode : 1, - __reserved_3 : 14; - u32 __reserved_4[3]; - } lvt_timer; - - struct { - u32 vector : 8, - delivery_mode : 3, - __reserved_1 : 1, - delivery_status : 1, - __reserved_2 : 3, - mask : 1, - __reserved_3 : 15; - u32 __reserved_4[3]; - } lvt_thermal; - - struct { - u32 vector : 8, - delivery_mode : 3, - __reserved_1 : 1, - delivery_status : 1, - __reserved_2 : 3, - mask : 1, - __reserved_3 : 15; - u32 __reserved_4[3]; - } lvt_pc; - - struct { - u32 vector : 8, - delivery_mode : 3, - __reserved_1 : 1, - delivery_status : 1, - polarity : 1, - remote_irr : 1, - trigger : 1, - mask : 1, - __reserved_2 : 15; - u32 __reserved_3[3]; - } lvt_lint0; - - struct { - u32 vector : 8, - delivery_mode : 3, - __reserved_1 : 1, - delivery_status : 1, - polarity : 1, - remote_irr : 1, - trigger : 1, - mask : 1, - __reserved_2 : 15; - u32 __reserved_3[3]; - } lvt_lint1; - - struct { - u32 vector : 8, - __reserved_1 : 4, - delivery_status : 1, - __reserved_2 : 3, - mask : 1, - __reserved_3 : 15; - u32 __reserved_4[3]; - } lvt_error; - - struct { - u32 initial_count; - u32 __reserved_2[3]; - } timer_icr; - - const - struct { - u32 curr_count; - u32 __reserved_2[3]; - } timer_ccr; - - struct { u32 __reserved[4]; } __reserved_16; - - struct { u32 __reserved[4]; } __reserved_17; - - struct { u32 __reserved[4]; } __reserved_18; - - struct { u32 __reserved[4]; } __reserved_19; - - struct { - u32 divisor : 4, - __reserved_1 : 28; - u32 __reserved_2[3]; - } timer_dcr; - - struct { u32 __reserved[4]; } __reserved_20; - -} __attribute__ ((packed)); - -#undef u32 - -#endif diff --git a/libc/kernel/arch-x86/asm/atomic.h b/libc/kernel/arch-x86/asm/atomic.h deleted file mode 100644 index 00289cf4a..000000000 --- a/libc/kernel/arch-x86/asm/atomic.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "atomic_64.h" diff --git a/libc/kernel/arch-x86/asm/atomic_32.h b/libc/kernel/arch-x86/asm/atomic_32.h deleted file mode 100644 index 677aac8ec..000000000 --- a/libc/kernel/arch-x86/asm/atomic_32.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_I386_ATOMIC__ -#define __ARCH_I386_ATOMIC__ - -#include -#include -#include - -typedef struct { int counter; } atomic_t; - -#define ATOMIC_INIT(i) { (i) } - -#define atomic_read(v) ((v)->counter) - -#define atomic_set(v,i) (((v)->counter) = (i)) - -#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new))) -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new))) -#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -#define atomic_inc_return(v) (atomic_add_return(1,v)) -#define atomic_dec_return(v) (atomic_sub_return(1,v)) -#define atomic_clear_mask(mask, addr) __asm__ __volatile__(LOCK_PREFIX "andl %0,%1" : : "r" (~(mask)),"m" (*addr) : "memory") -#define atomic_set_mask(mask, addr) __asm__ __volatile__(LOCK_PREFIX "orl %0,%1" : : "r" (mask),"m" (*(addr)) : "memory") -#define smp_mb__before_atomic_dec() barrier() -#define smp_mb__after_atomic_dec() barrier() -#define smp_mb__before_atomic_inc() barrier() -#define smp_mb__after_atomic_inc() barrier() -#include -#endif diff --git a/libc/kernel/arch-x86/asm/auxvec.h b/libc/kernel/arch-x86/asm/auxvec.h deleted file mode 100644 index f065eb1bb..000000000 --- a/libc/kernel/arch-x86/asm/auxvec.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_AUXVEC_H -#define _ASM_X86_AUXVEC_H - -#ifdef __i386__ -#define AT_SYSINFO 32 -#endif -#define AT_SYSINFO_EHDR 33 - -#endif diff --git a/libc/kernel/arch-x86/asm/bitops.h b/libc/kernel/arch-x86/asm/bitops.h deleted file mode 100644 index 3b58565a1..000000000 --- a/libc/kernel/arch-x86/asm/bitops.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "bitops_64.h" diff --git a/libc/kernel/arch-x86/asm/bitops_32.h b/libc/kernel/arch-x86/asm/bitops_32.h deleted file mode 100644 index fa77fe298..000000000 --- a/libc/kernel/arch-x86/asm/bitops_32.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_BITOPS_H -#define _I386_BITOPS_H - -#ifndef _LINUX_BITOPS_H -#error only can be included directly -#endif - -#include -#include - -#define ADDR (*(volatile long *) addr) - -#define smp_mb__before_clear_bit() barrier() -#define smp_mb__after_clear_bit() barrier() -#define test_bit(nr,addr) (__builtin_constant_p(nr) ? constant_test_bit((nr),(addr)) : variable_test_bit((nr),(addr))) -#undef ADDR - -#include -#endif diff --git a/libc/kernel/arch-x86/asm/bug.h b/libc/kernel/arch-x86/asm/bug.h deleted file mode 100644 index 9247022b3..000000000 --- a/libc/kernel/arch-x86/asm/bug.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_BUG_H -#define _ASM_X86_BUG_H - -#include -#endif diff --git a/libc/kernel/arch-x86/asm/byteorder.h b/libc/kernel/arch-x86/asm/byteorder.h deleted file mode 100644 index a839798c8..000000000 --- a/libc/kernel/arch-x86/asm/byteorder.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_BYTEORDER_H -#define _ASM_X86_BYTEORDER_H - -#include -#include - -#ifdef __GNUC__ - -#ifdef __i386__ - -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) -{ - __asm__("xchgb %b0,%h0\n\t" - "rorl $16,%0\n\t" - "xchgb %b0,%h0" - :"=q" (x) - : "0" (x)); - return x; -} - -static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val) -{ - union { - struct { __u32 a,b; } s; - __u64 u; - } v; - v.u = val; - v.s.a = ___arch__swab32(v.s.a); - v.s.b = ___arch__swab32(v.s.b); - __asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); - return v.u; -} - -#else - -static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) -{ - __asm__("bswapq %0" : "=r" (x) : "0" (x)); - return x; -} - -static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) -{ - __asm__("bswapl %0" : "=r" (x) : "0" (x)); - return x; -} - -#endif - -#define __arch__swab64(x) ___arch__swab64(x) -#define __arch__swab32(x) ___arch__swab32(x) - -#define __BYTEORDER_HAS_U64__ - -#endif - -#include - -#endif diff --git a/libc/kernel/arch-x86/asm/cache.h b/libc/kernel/arch-x86/asm/cache.h deleted file mode 100644 index 2766a71ad..000000000 --- a/libc/kernel/arch-x86/asm/cache.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARCH_X86_CACHE_H -#define _ARCH_X86_CACHE_H - -#define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) - -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) - -#endif diff --git a/libc/kernel/arch-x86/asm/cacheflush.h b/libc/kernel/arch-x86/asm/cacheflush.h deleted file mode 100644 index 028277b5b..000000000 --- a/libc/kernel/arch-x86/asm/cacheflush.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_CACHEFLUSH_H -#define _ASM_X86_CACHEFLUSH_H - -#include - -#define flush_cache_all() do { } while (0) -#define flush_cache_mm(mm) do { } while (0) -#define flush_cache_dup_mm(mm) do { } while (0) -#define flush_cache_range(vma, start, end) do { } while (0) -#define flush_cache_page(vma, vmaddr, pfn) do { } while (0) -#define flush_dcache_page(page) do { } while (0) -#define flush_dcache_mmap_lock(mapping) do { } while (0) -#define flush_dcache_mmap_unlock(mapping) do { } while (0) -#define flush_icache_range(start, end) do { } while (0) -#define flush_icache_page(vma,pg) do { } while (0) -#define flush_icache_user_range(vma,pg,adr,len) do { } while (0) -#define flush_cache_vmap(start, end) do { } while (0) -#define flush_cache_vunmap(start, end) do { } while (0) - -#define copy_to_user_page(vma, page, vaddr, dst, src, len) memcpy(dst, src, len) -#define copy_from_user_page(vma, page, vaddr, dst, src, len) memcpy(dst, src, len) - -#endif diff --git a/libc/kernel/arch-x86/asm/cmpxchg.h b/libc/kernel/arch-x86/asm/cmpxchg.h deleted file mode 100644 index de059a2a6..000000000 --- a/libc/kernel/arch-x86/asm/cmpxchg.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "cmpxchg_64.h" diff --git a/libc/kernel/arch-x86/asm/cmpxchg_32.h b/libc/kernel/arch-x86/asm/cmpxchg_32.h deleted file mode 100644 index 3632f4c80..000000000 --- a/libc/kernel/arch-x86/asm/cmpxchg_32.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_CMPXCHG_H -#define __ASM_CMPXCHG_H - -#include - -#define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr)))) - -struct __xchg_dummy { unsigned long a[100]; }; -#define __xg(x) ((struct __xchg_dummy *)(x)) - -#define ll_low(x) *(((unsigned int*)&(x))+0) -#define ll_high(x) *(((unsigned int*)&(x))+1) -#define set_64bit(ptr,value) (__builtin_constant_p(value) ? __set_64bit_constant(ptr, value) : __set_64bit_var(ptr, value) ) -#define _set_64bit(ptr,value) (__builtin_constant_p(value) ? __set_64bit(ptr, (unsigned int)(value), (unsigned int)((value)>>32ULL) ) : __set_64bit(ptr, ll_low(value), ll_high(value)) ) - -#define cmpxchg(ptr,o,n) ({ __typeof__(*(ptr)) __ret; if (likely(boot_cpu_data.x86 > 3)) __ret = __cmpxchg((ptr), (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))); else __ret = cmpxchg_386((ptr), (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))); __ret; }) -#define cmpxchg_local(ptr,o,n) ({ __typeof__(*(ptr)) __ret; if (likely(boot_cpu_data.x86 > 3)) __ret = __cmpxchg_local((ptr), (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))); else __ret = cmpxchg_386((ptr), (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))); __ret; }) -#define cmpxchg64(ptr,o,n) ((__typeof__(*(ptr)))__cmpxchg64((ptr),(unsigned long long)(o), (unsigned long long)(n))) -#define cmpxchg64_local(ptr,o,n) ((__typeof__(*(ptr)))__cmpxchg64_local((ptr),(unsigned long long)(o), (unsigned long long)(n))) -#endif diff --git a/libc/kernel/arch-x86/asm/cpufeature.h b/libc/kernel/arch-x86/asm/cpufeature.h deleted file mode 100644 index 47af45749..000000000 --- a/libc/kernel/arch-x86/asm/cpufeature.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "cpufeature_64.h" diff --git a/libc/kernel/arch-x86/asm/cpufeature_32.h b/libc/kernel/arch-x86/asm/cpufeature_32.h deleted file mode 100644 index a8ebc405e..000000000 --- a/libc/kernel/arch-x86/asm/cpufeature_32.h +++ /dev/null @@ -1,151 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_I386_CPUFEATURE_H -#define __ASM_I386_CPUFEATURE_H - -#ifndef __ASSEMBLY__ -#include -#endif -#include - -#define NCAPINTS 8 - -#define X86_FEATURE_FPU (0*32+ 0) -#define X86_FEATURE_VME (0*32+ 1) -#define X86_FEATURE_DE (0*32+ 2) -#define X86_FEATURE_PSE (0*32+ 3) -#define X86_FEATURE_TSC (0*32+ 4) -#define X86_FEATURE_MSR (0*32+ 5) -#define X86_FEATURE_PAE (0*32+ 6) -#define X86_FEATURE_MCE (0*32+ 7) -#define X86_FEATURE_CX8 (0*32+ 8) -#define X86_FEATURE_APIC (0*32+ 9) -#define X86_FEATURE_SEP (0*32+11) -#define X86_FEATURE_MTRR (0*32+12) -#define X86_FEATURE_PGE (0*32+13) -#define X86_FEATURE_MCA (0*32+14) -#define X86_FEATURE_CMOV (0*32+15) -#define X86_FEATURE_PAT (0*32+16) -#define X86_FEATURE_PSE36 (0*32+17) -#define X86_FEATURE_PN (0*32+18) -#define X86_FEATURE_CLFLSH (0*32+19) -#define X86_FEATURE_DS (0*32+21) -#define X86_FEATURE_ACPI (0*32+22) -#define X86_FEATURE_MMX (0*32+23) -#define X86_FEATURE_FXSR (0*32+24) - -#define X86_FEATURE_XMM (0*32+25) -#define X86_FEATURE_XMM2 (0*32+26) -#define X86_FEATURE_SELFSNOOP (0*32+27) -#define X86_FEATURE_HT (0*32+28) -#define X86_FEATURE_ACC (0*32+29) -#define X86_FEATURE_IA64 (0*32+30) - -#define X86_FEATURE_SYSCALL (1*32+11) -#define X86_FEATURE_MP (1*32+19) -#define X86_FEATURE_NX (1*32+20) -#define X86_FEATURE_MMXEXT (1*32+22) -#define X86_FEATURE_RDTSCP (1*32+27) -#define X86_FEATURE_LM (1*32+29) -#define X86_FEATURE_3DNOWEXT (1*32+30) -#define X86_FEATURE_3DNOW (1*32+31) - -#define X86_FEATURE_RECOVERY (2*32+ 0) -#define X86_FEATURE_LONGRUN (2*32+ 1) -#define X86_FEATURE_LRTI (2*32+ 3) - -#define X86_FEATURE_CXMMX (3*32+ 0) -#define X86_FEATURE_K6_MTRR (3*32+ 1) -#define X86_FEATURE_CYRIX_ARR (3*32+ 2) -#define X86_FEATURE_CENTAUR_MCR (3*32+ 3) - -#define X86_FEATURE_K8 (3*32+ 4) -#define X86_FEATURE_K7 (3*32+ 5) -#define X86_FEATURE_P3 (3*32+ 6) -#define X86_FEATURE_P4 (3*32+ 7) -#define X86_FEATURE_CONSTANT_TSC (3*32+ 8) -#define X86_FEATURE_UP (3*32+ 9) -#define X86_FEATURE_FXSAVE_LEAK (3*32+10) -#define X86_FEATURE_ARCH_PERFMON (3*32+11) -#define X86_FEATURE_PEBS (3*32+12) -#define X86_FEATURE_BTS (3*32+13) - -#define X86_FEATURE_SYNC_RDTSC (3*32+15) -#define X86_FEATURE_REP_GOOD (3*32+16) - -#define X86_FEATURE_XMM3 (4*32+ 0) -#define X86_FEATURE_MWAIT (4*32+ 3) -#define X86_FEATURE_DSCPL (4*32+ 4) -#define X86_FEATURE_EST (4*32+ 7) -#define X86_FEATURE_TM2 (4*32+ 8) -#define X86_FEATURE_CID (4*32+10) -#define X86_FEATURE_CX16 (4*32+13) -#define X86_FEATURE_XTPR (4*32+14) -#define X86_FEATURE_DCA (4*32+18) - -#define X86_FEATURE_XSTORE (5*32+ 2) -#define X86_FEATURE_XSTORE_EN (5*32+ 3) -#define X86_FEATURE_XCRYPT (5*32+ 6) -#define X86_FEATURE_XCRYPT_EN (5*32+ 7) -#define X86_FEATURE_ACE2 (5*32+ 8) -#define X86_FEATURE_ACE2_EN (5*32+ 9) -#define X86_FEATURE_PHE (5*32+ 10) -#define X86_FEATURE_PHE_EN (5*32+ 11) -#define X86_FEATURE_PMM (5*32+ 12) -#define X86_FEATURE_PMM_EN (5*32+ 13) - -#define X86_FEATURE_LAHF_LM (6*32+ 0) -#define X86_FEATURE_CMP_LEGACY (6*32+ 1) - -#define X86_FEATURE_IDA (7*32+ 0) - -#define cpu_has(c, bit) (__builtin_constant_p(bit) && ( (((bit)>>5)==0 && (1UL<<((bit)&31) & REQUIRED_MASK0)) || (((bit)>>5)==1 && (1UL<<((bit)&31) & REQUIRED_MASK1)) || (((bit)>>5)==2 && (1UL<<((bit)&31) & REQUIRED_MASK2)) || (((bit)>>5)==3 && (1UL<<((bit)&31) & REQUIRED_MASK3)) || (((bit)>>5)==4 && (1UL<<((bit)&31) & REQUIRED_MASK4)) || (((bit)>>5)==5 && (1UL<<((bit)&31) & REQUIRED_MASK5)) || (((bit)>>5)==6 && (1UL<<((bit)&31) & REQUIRED_MASK6)) || (((bit)>>5)==7 && (1UL<<((bit)&31) & REQUIRED_MASK7)) ) ? 1 : test_bit(bit, (c)->x86_capability)) -#define boot_cpu_has(bit) cpu_has(&boot_cpu_data, bit) - -#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) -#define cpu_has_vme boot_cpu_has(X86_FEATURE_VME) -#define cpu_has_de boot_cpu_has(X86_FEATURE_DE) -#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE) -#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC) -#define cpu_has_pae boot_cpu_has(X86_FEATURE_PAE) -#define cpu_has_pge boot_cpu_has(X86_FEATURE_PGE) -#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC) -#define cpu_has_sep boot_cpu_has(X86_FEATURE_SEP) -#define cpu_has_mtrr boot_cpu_has(X86_FEATURE_MTRR) -#define cpu_has_mmx boot_cpu_has(X86_FEATURE_MMX) -#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR) -#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM) -#define cpu_has_xmm2 boot_cpu_has(X86_FEATURE_XMM2) -#define cpu_has_xmm3 boot_cpu_has(X86_FEATURE_XMM3) -#define cpu_has_ht boot_cpu_has(X86_FEATURE_HT) -#define cpu_has_mp boot_cpu_has(X86_FEATURE_MP) -#define cpu_has_nx boot_cpu_has(X86_FEATURE_NX) -#define cpu_has_k6_mtrr boot_cpu_has(X86_FEATURE_K6_MTRR) -#define cpu_has_cyrix_arr boot_cpu_has(X86_FEATURE_CYRIX_ARR) -#define cpu_has_centaur_mcr boot_cpu_has(X86_FEATURE_CENTAUR_MCR) -#define cpu_has_xstore boot_cpu_has(X86_FEATURE_XSTORE) -#define cpu_has_xstore_enabled boot_cpu_has(X86_FEATURE_XSTORE_EN) -#define cpu_has_xcrypt boot_cpu_has(X86_FEATURE_XCRYPT) -#define cpu_has_xcrypt_enabled boot_cpu_has(X86_FEATURE_XCRYPT_EN) -#define cpu_has_ace2 boot_cpu_has(X86_FEATURE_ACE2) -#define cpu_has_ace2_enabled boot_cpu_has(X86_FEATURE_ACE2_EN) -#define cpu_has_phe boot_cpu_has(X86_FEATURE_PHE) -#define cpu_has_phe_enabled boot_cpu_has(X86_FEATURE_PHE_EN) -#define cpu_has_pmm boot_cpu_has(X86_FEATURE_PMM) -#define cpu_has_pmm_enabled boot_cpu_has(X86_FEATURE_PMM_EN) -#define cpu_has_ds boot_cpu_has(X86_FEATURE_DS) -#define cpu_has_pebs boot_cpu_has(X86_FEATURE_PEBS) -#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLSH) -#define cpu_has_bts boot_cpu_has(X86_FEATURE_BTS) - -#endif - diff --git a/libc/kernel/arch-x86/asm/cputime.h b/libc/kernel/arch-x86/asm/cputime.h deleted file mode 100644 index 0e79e0bae..000000000 --- a/libc/kernel/arch-x86/asm/cputime.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/current.h b/libc/kernel/arch-x86/asm/current.h deleted file mode 100644 index b53c6fecb..000000000 --- a/libc/kernel/arch-x86/asm/current.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "current_64.h" diff --git a/libc/kernel/arch-x86/asm/current_32.h b/libc/kernel/arch-x86/asm/current_32.h deleted file mode 100644 index f74b371c9..000000000 --- a/libc/kernel/arch-x86/asm/current_32.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_CURRENT_H -#define _I386_CURRENT_H - -#include -#include - -struct task_struct; - -#define current get_current() -#endif diff --git a/libc/kernel/arch-x86/asm/delay.h b/libc/kernel/arch-x86/asm/delay.h deleted file mode 100644 index 7cb5f745d..000000000 --- a/libc/kernel/arch-x86/asm/delay.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_DELAY_H -#define _ASM_X86_DELAY_H - -#define udelay(n) (__builtin_constant_p(n) ? ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : __udelay(n)) - -#define ndelay(n) (__builtin_constant_p(n) ? ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : __ndelay(n)) - -#endif diff --git a/libc/kernel/arch-x86/asm/desc.h b/libc/kernel/arch-x86/asm/desc.h deleted file mode 100644 index e9d448b03..000000000 --- a/libc/kernel/arch-x86/asm/desc.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "desc_64.h" diff --git a/libc/kernel/arch-x86/asm/desc_32.h b/libc/kernel/arch-x86/asm/desc_32.h deleted file mode 100644 index f53191c2a..000000000 --- a/libc/kernel/arch-x86/asm/desc_32.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_DESC_H -#define __ARCH_DESC_H - -#include -#include - -#ifndef __ASSEMBLY__ - -#include -#include -#include - -#include - -struct Xgt_desc_struct { - unsigned short size; - unsigned long address __attribute__((packed)); - unsigned short pad; -} __attribute__ ((packed)); - -struct gdt_page -{ - struct desc_struct gdt[GDT_ENTRIES]; -} __attribute__((aligned(PAGE_SIZE))); - -#define DESCTYPE_LDT 0x82 -#define DESCTYPE_TSS 0x89 -#define DESCTYPE_TASK 0x85 -#define DESCTYPE_INT 0x8e -#define DESCTYPE_TRAP 0x8f -#define DESCTYPE_DPL3 0x60 -#define DESCTYPE_S 0x10 -#define load_TR_desc() native_load_tr_desc() -#define load_gdt(dtr) native_load_gdt(dtr) -#define load_idt(dtr) native_load_idt(dtr) -#define load_tr(tr) __asm__ __volatile("ltr %0"::"m" (tr)) -#define load_ldt(ldt) __asm__ __volatile("lldt %0"::"m" (ldt)) -#define store_gdt(dtr) native_store_gdt(dtr) -#define store_idt(dtr) native_store_idt(dtr) -#define store_tr(tr) (tr = native_store_tr()) -#define store_ldt(ldt) __asm__ ("sldt %0":"=m" (ldt)) -#define load_TLS(t, cpu) native_load_tls(t, cpu) -#define set_ldt native_set_ldt -#define write_ldt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b) -#define write_gdt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b) -#define write_idt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b) -#define set_tss_desc(cpu,addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr) -#define LDT_entry_a(info) ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff)) -#define LDT_entry_b(info) (((info)->base_addr & 0xff000000) | (((info)->base_addr & 0x00ff0000) >> 16) | ((info)->limit & 0xf0000) | (((info)->read_exec_only ^ 1) << 9) | ((info)->contents << 10) | (((info)->seg_not_present ^ 1) << 15) | ((info)->seg_32bit << 22) | ((info)->limit_in_pages << 23) | ((info)->useable << 20) | 0x7000) -#define LDT_empty(info) ( (info)->base_addr == 0 && (info)->limit == 0 && (info)->contents == 0 && (info)->read_exec_only == 1 && (info)->seg_32bit == 0 && (info)->limit_in_pages == 0 && (info)->seg_not_present == 1 && (info)->useable == 0 ) -#else -#define GET_DESC_BASE(idx, gdt, base, lo_w, lo_b, hi_b) movb idx*8+4(gdt), lo_b; movb idx*8+7(gdt), hi_b; shll $16, base; movw idx*8+2(gdt), lo_w; -#endif -#endif diff --git a/libc/kernel/arch-x86/asm/desc_defs.h b/libc/kernel/arch-x86/asm/desc_defs.h deleted file mode 100644 index bf6de4ad3..000000000 --- a/libc/kernel/arch-x86/asm/desc_defs.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_DESC_DEFS_H -#define __ARCH_DESC_DEFS_H - -#ifndef __ASSEMBLY__ - -#include - -struct desc_struct { - u16 limit0; - u16 base0; - unsigned base1 : 8, type : 4, s : 1, dpl : 2, p : 1; - unsigned limit : 4, avl : 1, l : 1, d : 1, g : 1, base2 : 8; -} __attribute__((packed)); - -struct n_desc_struct { - unsigned int a,b; -}; - -enum { - GATE_INTERRUPT = 0xE, - GATE_TRAP = 0xF, - GATE_CALL = 0xC, -}; - -struct gate_struct { - u16 offset_low; - u16 segment; - unsigned ist : 3, zero0 : 5, type : 5, dpl : 2, p : 1; - u16 offset_middle; - u32 offset_high; - u32 zero1; -} __attribute__((packed)); - -#define PTR_LOW(x) ((unsigned long)(x) & 0xFFFF) -#define PTR_MIDDLE(x) (((unsigned long)(x) >> 16) & 0xFFFF) -#define PTR_HIGH(x) ((unsigned long)(x) >> 32) - -enum { - DESC_TSS = 0x9, - DESC_LDT = 0x2, -}; - -struct ldttss_desc { - u16 limit0; - u16 base0; - unsigned base1 : 8, type : 5, dpl : 2, p : 1; - unsigned limit1 : 4, zero0 : 3, g : 1, base2 : 8; - u32 base3; - u32 zero1; -} __attribute__((packed)); - -struct desc_ptr { - unsigned short size; - unsigned long address; -} __attribute__((packed)) ; - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/div64.h b/libc/kernel/arch-x86/asm/div64.h deleted file mode 100644 index 3fef43ebe..000000000 --- a/libc/kernel/arch-x86/asm/div64.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_DIV64_H -#define _ASM_X86_DIV64_H - -#include - -#endif diff --git a/libc/kernel/arch-x86/asm/dma-mapping.h b/libc/kernel/arch-x86/asm/dma-mapping.h deleted file mode 100644 index 3da1da6e4..000000000 --- a/libc/kernel/arch-x86/asm/dma-mapping.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "dma-mapping_64.h" diff --git a/libc/kernel/arch-x86/asm/dma-mapping_32.h b/libc/kernel/arch-x86/asm/dma-mapping_32.h deleted file mode 100644 index 974a60b64..000000000 --- a/libc/kernel/arch-x86/asm/dma-mapping_32.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_I386_DMA_MAPPING_H -#define _ASM_I386_DMA_MAPPING_H - -#include -#include - -#include -#include -#include - -#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) -#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) - -#define dma_is_consistent(d, h) (1) -#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY - -#endif diff --git a/libc/kernel/arch-x86/asm/dma.h b/libc/kernel/arch-x86/asm/dma.h deleted file mode 100644 index ae51e02e7..000000000 --- a/libc/kernel/arch-x86/asm/dma.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "dma_64.h" diff --git a/libc/kernel/arch-x86/asm/dma_32.h b/libc/kernel/arch-x86/asm/dma_32.h deleted file mode 100644 index 9c24f5ef7..000000000 --- a/libc/kernel/arch-x86/asm/dma_32.h +++ /dev/null @@ -1,90 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_DMA_H -#define _ASM_DMA_H - -#include -#include -#include - -#ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER -#define dma_outb outb_p -#else -#define dma_outb outb -#endif - -#define dma_inb inb - -#define MAX_DMA_CHANNELS 8 - -#define MAX_DMA_ADDRESS (PAGE_OFFSET+0x1000000) - -#define IO_DMA1_BASE 0x00 -#define IO_DMA2_BASE 0xC0 - -#define DMA1_CMD_REG 0x08 -#define DMA1_STAT_REG 0x08 -#define DMA1_REQ_REG 0x09 -#define DMA1_MASK_REG 0x0A -#define DMA1_MODE_REG 0x0B -#define DMA1_CLEAR_FF_REG 0x0C -#define DMA1_TEMP_REG 0x0D -#define DMA1_RESET_REG 0x0D -#define DMA1_CLR_MASK_REG 0x0E -#define DMA1_MASK_ALL_REG 0x0F - -#define DMA2_CMD_REG 0xD0 -#define DMA2_STAT_REG 0xD0 -#define DMA2_REQ_REG 0xD2 -#define DMA2_MASK_REG 0xD4 -#define DMA2_MODE_REG 0xD6 -#define DMA2_CLEAR_FF_REG 0xD8 -#define DMA2_TEMP_REG 0xDA -#define DMA2_RESET_REG 0xDA -#define DMA2_CLR_MASK_REG 0xDC -#define DMA2_MASK_ALL_REG 0xDE - -#define DMA_ADDR_0 0x00 -#define DMA_ADDR_1 0x02 -#define DMA_ADDR_2 0x04 -#define DMA_ADDR_3 0x06 -#define DMA_ADDR_4 0xC0 -#define DMA_ADDR_5 0xC4 -#define DMA_ADDR_6 0xC8 -#define DMA_ADDR_7 0xCC - -#define DMA_CNT_0 0x01 -#define DMA_CNT_1 0x03 -#define DMA_CNT_2 0x05 -#define DMA_CNT_3 0x07 -#define DMA_CNT_4 0xC2 -#define DMA_CNT_5 0xC6 -#define DMA_CNT_6 0xCA -#define DMA_CNT_7 0xCE - -#define DMA_PAGE_0 0x87 -#define DMA_PAGE_1 0x83 -#define DMA_PAGE_2 0x81 -#define DMA_PAGE_3 0x82 -#define DMA_PAGE_5 0x8B -#define DMA_PAGE_6 0x89 -#define DMA_PAGE_7 0x8A - -#define DMA_MODE_READ 0x44 -#define DMA_MODE_WRITE 0x48 -#define DMA_MODE_CASCADE 0xC0 - -#define DMA_AUTOINIT 0x10 - -#define isa_dma_bridge_buggy (0) - -#endif diff --git a/libc/kernel/arch-x86/asm/dwarf2.h b/libc/kernel/arch-x86/asm/dwarf2.h deleted file mode 100644 index c937591ae..000000000 --- a/libc/kernel/arch-x86/asm/dwarf2.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "dwarf2_64.h" diff --git a/libc/kernel/arch-x86/asm/dwarf2_32.h b/libc/kernel/arch-x86/asm/dwarf2_32.h deleted file mode 100644 index a2dc3f120..000000000 --- a/libc/kernel/arch-x86/asm/dwarf2_32.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _DWARF2_H -#define _DWARF2_H - -#ifndef __ASSEMBLY__ -#warning "asm/dwarf2.h should be only included in pure assembly files" -#endif - -#define CFI_STARTPROC ignore -#define CFI_ENDPROC ignore -#define CFI_DEF_CFA ignore -#define CFI_DEF_CFA_REGISTER ignore -#define CFI_DEF_CFA_OFFSET ignore -#define CFI_ADJUST_CFA_OFFSET ignore -#define CFI_OFFSET ignore -#define CFI_REL_OFFSET ignore -#define CFI_REGISTER ignore -#define CFI_RESTORE ignore -#define CFI_REMEMBER_STATE ignore -#define CFI_RESTORE_STATE ignore -#define CFI_UNDEFINED ignore -#define CFI_SIGNAL_FRAME ignore -#endif diff --git a/libc/kernel/arch-x86/asm/e820.h b/libc/kernel/arch-x86/asm/e820.h deleted file mode 100644 index 8a88ff013..000000000 --- a/libc/kernel/arch-x86/asm/e820.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_E820_H -#define __ASM_E820_H -#define E820MAP 0x2d0 -#define E820MAX 128 -#define E820NR 0x1e8 - -#define E820_RAM 1 -#define E820_RESERVED 2 -#define E820_ACPI 3 -#define E820_NVS 4 - -#ifndef __ASSEMBLY__ -struct e820entry { - __u64 addr; - __u64 size; - __u32 type; -} __attribute__((packed)); - -struct e820map { - __u32 nr_map; - struct e820entry map[E820MAX]; -}; -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/elf.h b/libc/kernel/arch-x86/asm/elf.h deleted file mode 100644 index 6c6fbbf85..000000000 --- a/libc/kernel/arch-x86/asm/elf.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_ELF_H -#define _ASM_X86_ELF_H - -#include -#include -#include - -typedef unsigned long elf_greg_t; - -#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) -typedef elf_greg_t elf_gregset_t[ELF_NGREG]; - -typedef struct user_i387_struct elf_fpregset_t; - -#ifdef __i386__ - -typedef struct user_fxsr_struct elf_fpxregset_t; - -#define R_386_NONE 0 -#define R_386_32 1 -#define R_386_PC32 2 -#define R_386_GOT32 3 -#define R_386_PLT32 4 -#define R_386_COPY 5 -#define R_386_GLOB_DAT 6 -#define R_386_JMP_SLOT 7 -#define R_386_RELATIVE 8 -#define R_386_GOTOFF 9 -#define R_386_GOTPC 10 -#define R_386_NUM 11 - -#define ELF_CLASS ELFCLASS32 -#define ELF_DATA ELFDATA2LSB -#define ELF_ARCH EM_386 - -#else - -#define R_X86_64_NONE 0 -#define R_X86_64_64 1 -#define R_X86_64_PC32 2 -#define R_X86_64_GOT32 3 -#define R_X86_64_PLT32 4 -#define R_X86_64_COPY 5 -#define R_X86_64_GLOB_DAT 6 -#define R_X86_64_JUMP_SLOT 7 -#define R_X86_64_RELATIVE 8 -#define R_X86_64_GOTPCREL 9 -#define R_X86_64_32 10 -#define R_X86_64_32S 11 -#define R_X86_64_16 12 -#define R_X86_64_PC16 13 -#define R_X86_64_8 14 -#define R_X86_64_PC8 15 - -#define R_X86_64_NUM 16 - -#define ELF_CLASS ELFCLASS64 -#define ELF_DATA ELFDATA2LSB -#define ELF_ARCH EM_X86_64 - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/errno.h b/libc/kernel/arch-x86/asm/errno.h deleted file mode 100644 index e8f7425a8..000000000 --- a/libc/kernel/arch-x86/asm/errno.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/fcntl.h b/libc/kernel/arch-x86/asm/fcntl.h deleted file mode 100644 index 00630ade4..000000000 --- a/libc/kernel/arch-x86/asm/fcntl.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/fixmap.h b/libc/kernel/arch-x86/asm/fixmap.h deleted file mode 100644 index 19b9cc86e..000000000 --- a/libc/kernel/arch-x86/asm/fixmap.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "fixmap_64.h" diff --git a/libc/kernel/arch-x86/asm/fixmap_32.h b/libc/kernel/arch-x86/asm/fixmap_32.h deleted file mode 100644 index 95de8a078..000000000 --- a/libc/kernel/arch-x86/asm/fixmap_32.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_FIXMAP_H -#define _ASM_FIXMAP_H - -#define FIXADDR_USER_START __fix_to_virt(FIX_VDSO) -#define FIXADDR_USER_END __fix_to_virt(FIX_VDSO - 1) - -#ifndef __ASSEMBLY__ -#include -#include -#include -#include - -enum fixed_addresses { - FIX_HOLE, - FIX_VDSO, - FIX_DBGP_BASE, - FIX_EARLYCON_MEM_BASE, - __end_of_permanent_fixed_addresses, - -#define NR_FIX_BTMAPS 16 - FIX_BTMAP_END = __end_of_permanent_fixed_addresses, - FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS - 1, - FIX_WP_TEST, - __end_of_fixed_addresses -}; - -#define set_fixmap(idx, phys) __set_fixmap(idx, phys, PAGE_KERNEL) - -#define set_fixmap_nocache(idx, phys) __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) - -#define clear_fixmap(idx) __set_fixmap(idx, 0, __pgprot(0)) - -#define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP) - -#define __FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT) -#define __FIXADDR_BOOT_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) -#define FIXADDR_START (FIXADDR_TOP - __FIXADDR_SIZE) -#define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_SIZE) - -#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) -#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) - -#endif -#endif diff --git a/libc/kernel/arch-x86/asm/genapic.h b/libc/kernel/arch-x86/asm/genapic.h deleted file mode 100644 index 84e687e19..000000000 --- a/libc/kernel/arch-x86/asm/genapic.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "genapic_64.h" diff --git a/libc/kernel/arch-x86/asm/genapic_32.h b/libc/kernel/arch-x86/asm/genapic_32.h deleted file mode 100644 index 07801ea63..000000000 --- a/libc/kernel/arch-x86/asm/genapic_32.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENAPIC_H -#define _ASM_GENAPIC_H 1 - -#include - -struct mpc_config_translation; -struct mpc_config_bus; -struct mp_config_table; -struct mpc_config_processor; - -struct genapic { - char *name; - int (*probe)(void); - - int (*apic_id_registered)(void); - cpumask_t (*target_cpus)(void); - int int_delivery_mode; - int int_dest_mode; - int ESR_DISABLE; - int apic_destination_logical; - unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); - unsigned long (*check_apicid_present)(int apicid); - int no_balance_irq; - int no_ioapic_check; - void (*init_apic_ldr)(void); - physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map); - - void (*setup_apic_routing)(void); - int (*multi_timer_check)(int apic, int irq); - int (*apicid_to_node)(int logical_apicid); - int (*cpu_to_logical_apicid)(int cpu); - int (*cpu_present_to_apicid)(int mps_cpu); - physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); - int (*mpc_apic_id)(struct mpc_config_processor *m, - struct mpc_config_translation *t); - void (*setup_portio_remap)(void); - int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); - void (*enable_apic_mode)(void); - u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb); - - void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, - struct mpc_config_translation *); - void (*mpc_oem_pci_bus)(struct mpc_config_bus *, - struct mpc_config_translation *); - - int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, - char *productid); - int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); - - unsigned (*get_apic_id)(unsigned long x); - unsigned long apic_id_mask; - unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask); - -}; - -#define APICFUNC(x) .x = x, - -#define IPIFUNC(x) - -#define APIC_INIT(aname, aprobe) { .name = aname, .probe = aprobe, .int_delivery_mode = INT_DELIVERY_MODE, .int_dest_mode = INT_DEST_MODE, .no_balance_irq = NO_BALANCE_IRQ, .ESR_DISABLE = esr_disable, .apic_destination_logical = APIC_DEST_LOGICAL, APICFUNC(apic_id_registered) APICFUNC(target_cpus) APICFUNC(check_apicid_used) APICFUNC(check_apicid_present) APICFUNC(init_apic_ldr) APICFUNC(ioapic_phys_id_map) APICFUNC(setup_apic_routing) APICFUNC(multi_timer_check) APICFUNC(apicid_to_node) APICFUNC(cpu_to_logical_apicid) APICFUNC(cpu_present_to_apicid) APICFUNC(apicid_to_cpu_present) APICFUNC(mpc_apic_id) APICFUNC(setup_portio_remap) APICFUNC(check_phys_apicid_present) APICFUNC(mpc_oem_bus_info) APICFUNC(mpc_oem_pci_bus) APICFUNC(mps_oem_check) APICFUNC(get_apic_id) .apic_id_mask = APIC_ID_MASK, APICFUNC(cpu_mask_to_apicid) APICFUNC(acpi_madt_oem_check) IPIFUNC(send_IPI_mask) IPIFUNC(send_IPI_allbutself) IPIFUNC(send_IPI_all) APICFUNC(enable_apic_mode) APICFUNC(phys_pkg_id) } - -#endif diff --git a/libc/kernel/arch-x86/asm/hardirq.h b/libc/kernel/arch-x86/asm/hardirq.h deleted file mode 100644 index ee224f18c..000000000 --- a/libc/kernel/arch-x86/asm/hardirq.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "hardirq_64.h" diff --git a/libc/kernel/arch-x86/asm/hardirq_32.h b/libc/kernel/arch-x86/asm/hardirq_32.h deleted file mode 100644 index b682f662e..000000000 --- a/libc/kernel/arch-x86/asm/hardirq_32.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_HARDIRQ_H -#define __ASM_HARDIRQ_H - -#include -#include - -typedef struct { - unsigned int __softirq_pending; - unsigned long idle_timestamp; - unsigned int __nmi_count; - unsigned int apic_timer_irqs; - unsigned int irq0_irqs; - unsigned int irq_resched_count; - unsigned int irq_call_count; - unsigned int irq_tlb_count; - unsigned int irq_thermal_count; - unsigned int irq_spurious_count; -} ____cacheline_aligned irq_cpustat_t; - -#define __ARCH_IRQ_STAT -#define __IRQ_STAT(cpu, member) (per_cpu(irq_stat, cpu).member) - -#include - -#endif diff --git a/libc/kernel/arch-x86/asm/highmem.h b/libc/kernel/arch-x86/asm/highmem.h deleted file mode 100644 index f7388518b..000000000 --- a/libc/kernel/arch-x86/asm/highmem.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_HIGHMEM_H -#define _ASM_HIGHMEM_H - -#endif diff --git a/libc/kernel/arch-x86/asm/hw_irq.h b/libc/kernel/arch-x86/asm/hw_irq.h deleted file mode 100644 index ed937c7f7..000000000 --- a/libc/kernel/arch-x86/asm/hw_irq.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "hw_irq_64.h" diff --git a/libc/kernel/arch-x86/asm/hw_irq_32.h b/libc/kernel/arch-x86/asm/hw_irq_32.h deleted file mode 100644 index 6f584fc22..000000000 --- a/libc/kernel/arch-x86/asm/hw_irq_32.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_HW_IRQ_H -#define _ASM_HW_IRQ_H - -#include -#include -#include -#include - -#define NMI_VECTOR 0x02 - -#define IO_APIC_IRQ(x) (((x) >= 16) || ((1<<(x)) & io_apic_irqs)) - -#endif diff --git a/libc/kernel/arch-x86/asm/i387.h b/libc/kernel/arch-x86/asm/i387.h deleted file mode 100644 index 269255799..000000000 --- a/libc/kernel/arch-x86/asm/i387.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "i387_64.h" diff --git a/libc/kernel/arch-x86/asm/i387_32.h b/libc/kernel/arch-x86/asm/i387_32.h deleted file mode 100644 index 8563fb904..000000000 --- a/libc/kernel/arch-x86/asm/i387_32.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_I386_I387_H -#define __ASM_I386_I387_H - -#include -#include -#include -#include -#include -#include - -#define restore_fpu(tsk) alternative_input( "nop ; frstor %1", "fxrstor %1", X86_FEATURE_FXSR, "m" ((tsk)->thread.i387.fxsave)) - -#define kernel_fpu_end() do { stts(); preempt_enable(); } while(0) - -#define safe_address (kstat_cpu(0).cpustat.user) - -#define __unlazy_fpu( tsk ) do { if (task_thread_info(tsk)->status & TS_USEDFPU) { __save_init_fpu(tsk); stts(); } else tsk->fpu_counter = 0; } while (0) -#define __clear_fpu( tsk ) do { if (task_thread_info(tsk)->status & TS_USEDFPU) { asm volatile("fnclex ; fwait"); task_thread_info(tsk)->status &= ~TS_USEDFPU; stts(); } } while (0) -#define unlazy_fpu( tsk ) do { preempt_disable(); __unlazy_fpu(tsk); preempt_enable(); } while (0) -#define clear_fpu( tsk ) do { preempt_disable(); __clear_fpu( tsk ); preempt_enable(); } while (0) - -#endif diff --git a/libc/kernel/arch-x86/asm/i8253.h b/libc/kernel/arch-x86/asm/i8253.h deleted file mode 100644 index 93b1d1a3a..000000000 --- a/libc/kernel/arch-x86/asm/i8253.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_I8253_H__ -#define __ASM_I8253_H__ - -#define PIT_MODE 0x43 -#define PIT_CH0 0x40 -#define PIT_CH2 0x42 - -#endif diff --git a/libc/kernel/arch-x86/asm/i8259.h b/libc/kernel/arch-x86/asm/i8259.h deleted file mode 100644 index c2366ea88..000000000 --- a/libc/kernel/arch-x86/asm/i8259.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_I8259_H__ -#define __ASM_I8259_H__ - -#define __byte(x,y) (((unsigned char *) &(y))[x]) -#define cached_master_mask (__byte(0, cached_irq_mask)) -#define cached_slave_mask (__byte(1, cached_irq_mask)) - -#endif diff --git a/libc/kernel/arch-x86/asm/ia32_unistd.h b/libc/kernel/arch-x86/asm/ia32_unistd.h deleted file mode 100644 index 848d228d3..000000000 --- a/libc/kernel/arch-x86/asm/ia32_unistd.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_64_IA32_UNISTD_H_ -#define _ASM_X86_64_IA32_UNISTD_H_ - -#define __NR_ia32_restart_syscall 0 -#define __NR_ia32_exit 1 -#define __NR_ia32_read 3 -#define __NR_ia32_write 4 -#define __NR_ia32_sigreturn 119 -#define __NR_ia32_rt_sigreturn 173 - -#endif diff --git a/libc/kernel/arch-x86/asm/io.h b/libc/kernel/arch-x86/asm/io.h deleted file mode 100644 index ea52e66ea..000000000 --- a/libc/kernel/arch-x86/asm/io.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "io_64.h" diff --git a/libc/kernel/arch-x86/asm/io_32.h b/libc/kernel/arch-x86/asm/io_32.h deleted file mode 100644 index f7e0025a4..000000000 --- a/libc/kernel/arch-x86/asm/io_32.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_IO_H -#define _ASM_IO_H - -#include -#include - -#define IO_SPACE_LIMIT 0xffff - -#define XQUAD_PORTIO_BASE 0xfe400000 -#define XQUAD_PORTIO_QUAD 0x40000 - -#ifdef REALLY_SLOW_IO -#endif -#define __BUILDIO(bwl,bw,type) static inline void out##bwl(unsigned type value, int port) { out##bwl##_local(value, port); } static inline unsigned type in##bwl(int port) { return in##bwl##_local(port); } -#define BUILDIO(bwl,bw,type) static inline void out##bwl##_local(unsigned type value, int port) { __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); } static inline unsigned type in##bwl##_local(int port) { unsigned type value; __asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); return value; } static inline void out##bwl##_local_p(unsigned type value, int port) { out##bwl##_local(value, port); slow_down_io(); } static inline unsigned type in##bwl##_local_p(int port) { unsigned type value = in##bwl##_local(port); slow_down_io(); return value; } __BUILDIO(bwl,bw,type) static inline void out##bwl##_p(unsigned type value, int port) { out##bwl(value, port); slow_down_io(); } static inline unsigned type in##bwl##_p(int port) { unsigned type value = in##bwl(port); slow_down_io(); return value; } static inline void outs##bwl(int port, const void *addr, unsigned long count) { __asm__ __volatile__("rep; outs" #bwl : "+S"(addr), "+c"(count) : "d"(port)); } static inline void ins##bwl(int port, void *addr, unsigned long count) { __asm__ __volatile__("rep; ins" #bwl : "+D"(addr), "+c"(count) : "d"(port)); } -#endif diff --git a/libc/kernel/arch-x86/asm/io_apic.h b/libc/kernel/arch-x86/asm/io_apic.h deleted file mode 100644 index ed608d309..000000000 --- a/libc/kernel/arch-x86/asm/io_apic.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "io_apic_64.h" diff --git a/libc/kernel/arch-x86/asm/io_apic_32.h b/libc/kernel/arch-x86/asm/io_apic_32.h deleted file mode 100644 index cc858a36b..000000000 --- a/libc/kernel/arch-x86/asm/io_apic_32.h +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_IO_APIC_H -#define __ASM_IO_APIC_H - -#include -#include -#include - -union IO_APIC_reg_00 { - u32 raw; - struct { - u32 __reserved_2 : 14, - LTS : 1, - delivery_type : 1, - __reserved_1 : 8, - ID : 8; - } __attribute__ ((packed)) bits; -}; - -union IO_APIC_reg_01 { - u32 raw; - struct { - u32 version : 8, - __reserved_2 : 7, - PRQ : 1, - entries : 8, - __reserved_1 : 8; - } __attribute__ ((packed)) bits; -}; - -union IO_APIC_reg_02 { - u32 raw; - struct { - u32 __reserved_2 : 24, - arbitration : 4, - __reserved_1 : 4; - } __attribute__ ((packed)) bits; -}; - -union IO_APIC_reg_03 { - u32 raw; - struct { - u32 boot_DT : 1, - __reserved_1 : 31; - } __attribute__ ((packed)) bits; -}; - -enum ioapic_irq_destination_types { - dest_Fixed = 0, - dest_LowestPrio = 1, - dest_SMI = 2, - dest__reserved_1 = 3, - dest_NMI = 4, - dest_INIT = 5, - dest__reserved_2 = 6, - dest_ExtINT = 7 -}; - -struct IO_APIC_route_entry { - __u32 vector : 8, - delivery_mode : 3, - dest_mode : 1, - delivery_status : 1, - polarity : 1, - irr : 1, - trigger : 1, - mask : 1, - __reserved_2 : 15; - - union { struct { __u32 - __reserved_1 : 24, - physical_dest : 4, - __reserved_2 : 4; - } physical; - - struct { __u32 - __reserved_1 : 24, - logical_dest : 8; - } logical; - } dest; - -} __attribute__ ((packed)); - -#define io_apic_assign_pci_irqs 0 - -#endif diff --git a/libc/kernel/arch-x86/asm/ioctl.h b/libc/kernel/arch-x86/asm/ioctl.h deleted file mode 100644 index 6e446b6f6..000000000 --- a/libc/kernel/arch-x86/asm/ioctl.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/ioctls.h b/libc/kernel/arch-x86/asm/ioctls.h deleted file mode 100644 index 3aedc0477..000000000 --- a/libc/kernel/arch-x86/asm/ioctls.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_IOCTLS_H -#define _ASM_X86_IOCTLS_H - -#include - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425 - -#define TIOCSBRK 0x5427 -#define TIOCCBRK 0x5428 -#define TIOCGSID 0x5429 -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int) -#define TIOCSPTLCK _IOW('T',0x31, int) - -#define FIONCLEX 0x5450 -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458 -#define TIOCSERGETLSR 0x5459 -#define TIOCSERGETMULTI 0x545A -#define TIOCSERSETMULTI 0x545B - -#define TIOCMIWAIT 0x545C -#define TIOCGICOUNT 0x545D -#define TIOCGHAYESESP 0x545E -#define TIOCSHAYESESP 0x545F -#define FIOQSIZE 0x5460 - -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 - -#define TIOCSER_TEMT 0x01 - -#endif diff --git a/libc/kernel/arch-x86/asm/ipcbuf.h b/libc/kernel/arch-x86/asm/ipcbuf.h deleted file mode 100644 index 32342c190..000000000 --- a/libc/kernel/arch-x86/asm/ipcbuf.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_IPCBUF_H -#define _ASM_X86_IPCBUF_H - -struct ipc64_perm -{ - __kernel_key_t key; - __kernel_uid32_t uid; - __kernel_gid32_t gid; - __kernel_uid32_t cuid; - __kernel_gid32_t cgid; - __kernel_mode_t mode; - unsigned short __pad1; - unsigned short seq; - unsigned short __pad2; - unsigned long __unused1; - unsigned long __unused2; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/irq.h b/libc/kernel/arch-x86/asm/irq.h deleted file mode 100644 index 07a331de1..000000000 --- a/libc/kernel/arch-x86/asm/irq.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "irq_64.h" diff --git a/libc/kernel/arch-x86/asm/irq_32.h b/libc/kernel/arch-x86/asm/irq_32.h deleted file mode 100644 index 31410713a..000000000 --- a/libc/kernel/arch-x86/asm/irq_32.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_IRQ_H -#define _ASM_IRQ_H - -#include - -#include "irq_vectors.h" -#include - -#define irq_ctx_init(cpu) do { } while (0) -#define irq_ctx_exit(cpu) do { } while (0) - -#endif diff --git a/libc/kernel/arch-x86/asm/irqflags.h b/libc/kernel/arch-x86/asm/irqflags.h deleted file mode 100644 index 4f8466244..000000000 --- a/libc/kernel/arch-x86/asm/irqflags.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "irqflags_64.h" diff --git a/libc/kernel/arch-x86/asm/irqflags_32.h b/libc/kernel/arch-x86/asm/irqflags_32.h deleted file mode 100644 index 9002e44e3..000000000 --- a/libc/kernel/arch-x86/asm/irqflags_32.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_IRQFLAGS_H -#define _ASM_IRQFLAGS_H -#include - -#ifndef __ASSEMBLY__ -#endif -#ifndef __ASSEMBLY__ -#else -#define DISABLE_INTERRUPTS(clobbers) cli -#define ENABLE_INTERRUPTS(clobbers) sti -#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -#define INTERRUPT_RETURN iret -#define GET_CR0_INTO_EAX movl %cr0, %eax -#endif -#ifndef __ASSEMBLY__ -#define raw_local_save_flags(flags) do { (flags) = __raw_local_save_flags(); } while (0) -#define raw_local_irq_save(flags) do { (flags) = __raw_local_irq_save(); } while (0) -#endif -#define TRACE_IRQS_ON -#define TRACE_IRQS_OFF -#define LOCKDEP_SYS_EXIT -#endif diff --git a/libc/kernel/arch-x86/asm/ist.h b/libc/kernel/arch-x86/asm/ist.h deleted file mode 100644 index 0abab19bc..000000000 --- a/libc/kernel/arch-x86/asm/ist.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_IST_H -#define _ASM_IST_H - -#include - -struct ist_info { - __u32 signature; - __u32 command; - __u32 event; - __u32 perf_level; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/kmap_types.h b/libc/kernel/arch-x86/asm/kmap_types.h deleted file mode 100644 index c2313eec1..000000000 --- a/libc/kernel/arch-x86/asm/kmap_types.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_KMAP_TYPES_H -#define _ASM_X86_KMAP_TYPES_H - -#define D(n) - -enum km_type { -D(0) KM_BOUNCE_READ, -D(1) KM_SKB_SUNRPC_DATA, -D(2) KM_SKB_DATA_SOFTIRQ, -D(3) KM_USER0, -D(4) KM_USER1, -D(5) KM_BIO_SRC_IRQ, -D(6) KM_BIO_DST_IRQ, -D(7) KM_PTE0, -D(8) KM_PTE1, -D(9) KM_IRQ0, -D(10) KM_IRQ1, -D(11) KM_SOFTIRQ0, -D(12) KM_SOFTIRQ1, -D(13) KM_TYPE_NR -}; - -#undef D - -#endif diff --git a/libc/kernel/arch-x86/asm/ldt.h b/libc/kernel/arch-x86/asm/ldt.h deleted file mode 100644 index 19b91ab6a..000000000 --- a/libc/kernel/arch-x86/asm/ldt.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_LDT_H -#define _ASM_X86_LDT_H - -#define LDT_ENTRIES 8192 - -#define LDT_ENTRY_SIZE 8 - -#ifndef __ASSEMBLY__ - -struct user_desc { - unsigned int entry_number; - unsigned int base_addr; - unsigned int limit; - unsigned int seg_32bit:1; - unsigned int contents:2; - unsigned int read_exec_only:1; - unsigned int limit_in_pages:1; - unsigned int seg_not_present:1; - unsigned int useable:1; -#ifdef __x86_64__ - unsigned int lm:1; -#endif -}; - -#define MODIFY_LDT_CONTENTS_DATA 0 -#define MODIFY_LDT_CONTENTS_STACK 1 -#define MODIFY_LDT_CONTENTS_CODE 2 - -#endif -#endif diff --git a/libc/kernel/arch-x86/asm/linkage.h b/libc/kernel/arch-x86/asm/linkage.h deleted file mode 100644 index f149e4db1..000000000 --- a/libc/kernel/arch-x86/asm/linkage.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "linkage_64.h" diff --git a/libc/kernel/arch-x86/asm/linkage_32.h b/libc/kernel/arch-x86/asm/linkage_32.h deleted file mode 100644 index 6db10ee96..000000000 --- a/libc/kernel/arch-x86/asm/linkage_32.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_LINKAGE_H -#define __ASM_LINKAGE_H - -#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0))) -#define FASTCALL(x) x __attribute__((regparm(3))) -#define fastcall __attribute__((regparm(3))) - -#define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret)) - -#endif diff --git a/libc/kernel/arch-x86/asm/local.h b/libc/kernel/arch-x86/asm/local.h deleted file mode 100644 index 85080b86d..000000000 --- a/libc/kernel/arch-x86/asm/local.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "local_64.h" diff --git a/libc/kernel/arch-x86/asm/local_32.h b/libc/kernel/arch-x86/asm/local_32.h deleted file mode 100644 index fcad7537a..000000000 --- a/libc/kernel/arch-x86/asm/local_32.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARCH_I386_LOCAL_H -#define _ARCH_I386_LOCAL_H - -#include -#include -#include - -typedef struct -{ - atomic_long_t a; -} local_t; - -#define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) } - -#define local_read(l) atomic_long_read(&(l)->a) -#define local_set(l,i) atomic_long_set(&(l)->a, (i)) - -#define local_inc_return(l) (local_add_return(1,l)) -#define local_dec_return(l) (local_sub_return(1,l)) -#define local_cmpxchg(l, o, n) (cmpxchg_local(&((l)->a.counter), (o), (n))) -#define local_xchg(l, n) (xchg(&((l)->a.counter), (n))) -#define local_add_unless(l, a, u) ({ long c, old; c = local_read(l); for (;;) { if (unlikely(c == (u))) break; old = local_cmpxchg((l), c, c + (a)); if (likely(old == c)) break; c = old; } c != (u); }) -#define local_inc_not_zero(l) local_add_unless((l), 1, 0) -#define __local_inc(l) local_inc(l) -#define __local_dec(l) local_dec(l) -#define __local_add(i,l) local_add((i),(l)) -#define __local_sub(i,l) local_sub((i),(l)) -#define cpu_local_wrap_v(l) ({ local_t res__; preempt_disable(); res__ = (l); preempt_enable(); res__; }) -#define cpu_local_wrap(l) ({ preempt_disable(); l; preempt_enable(); }) -#define cpu_local_read(l) cpu_local_wrap_v(local_read(&__get_cpu_var(l))) -#define cpu_local_set(l, i) cpu_local_wrap(local_set(&__get_cpu_var(l), (i))) -#define cpu_local_inc(l) cpu_local_wrap(local_inc(&__get_cpu_var(l))) -#define cpu_local_dec(l) cpu_local_wrap(local_dec(&__get_cpu_var(l))) -#define cpu_local_add(i, l) cpu_local_wrap(local_add((i), &__get_cpu_var(l))) -#define cpu_local_sub(i, l) cpu_local_wrap(local_sub((i), &__get_cpu_var(l))) -#define __cpu_local_inc(l) cpu_local_inc(l) -#define __cpu_local_dec(l) cpu_local_dec(l) -#define __cpu_local_add(i, l) cpu_local_add((i), (l)) -#define __cpu_local_sub(i, l) cpu_local_sub((i), (l)) -#endif diff --git a/libc/kernel/arch-x86/asm/math_emu.h b/libc/kernel/arch-x86/asm/math_emu.h deleted file mode 100644 index 9380d19a6..000000000 --- a/libc/kernel/arch-x86/asm/math_emu.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_MATH_EMU_H -#define _I386_MATH_EMU_H - -#include - -struct info { - long ___orig_eip; - long ___ebx; - long ___ecx; - long ___edx; - long ___esi; - long ___edi; - long ___ebp; - long ___eax; - long ___ds; - long ___es; - long ___fs; - long ___orig_eax; - long ___eip; - long ___cs; - long ___eflags; - long ___esp; - long ___ss; - long ___vm86_es; - long ___vm86_ds; - long ___vm86_fs; - long ___vm86_gs; -}; -#endif diff --git a/libc/kernel/arch-x86/asm/mc146818rtc.h b/libc/kernel/arch-x86/asm/mc146818rtc.h deleted file mode 100644 index 849787796..000000000 --- a/libc/kernel/arch-x86/asm/mc146818rtc.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "mc146818rtc_64.h" diff --git a/libc/kernel/arch-x86/asm/mc146818rtc_32.h b/libc/kernel/arch-x86/asm/mc146818rtc_32.h deleted file mode 100644 index 899d60804..000000000 --- a/libc/kernel/arch-x86/asm/mc146818rtc_32.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_MC146818RTC_H -#define _ASM_MC146818RTC_H - -#include -#include -#include -#include - -#ifndef RTC_PORT -#define RTC_PORT(x) (0x70 + (x)) -#define RTC_ALWAYS_BCD 1 -#endif - -#ifdef __HAVE_ARCH_CMPXCHG - -#include - -#define lock_cmos_prefix(reg) do { unsigned long cmos_flags; local_irq_save(cmos_flags); lock_cmos(reg) -#define lock_cmos_suffix(reg) unlock_cmos(); local_irq_restore(cmos_flags); } while (0) -#else -#define lock_cmos_prefix(reg) do {} while (0) -#define lock_cmos_suffix(reg) do {} while (0) -#define lock_cmos(reg) -#define unlock_cmos() -#define do_i_have_lock_cmos() 0 -#define current_lock_cmos_reg() 0 -#endif -#define CMOS_READ(addr) rtc_cmos_read(addr) -#define CMOS_WRITE(val, addr) rtc_cmos_write(val, addr) - -#define RTC_IRQ 8 - -#endif diff --git a/libc/kernel/arch-x86/asm/mman.h b/libc/kernel/arch-x86/asm/mman.h deleted file mode 100644 index 7eda3195a..000000000 --- a/libc/kernel/arch-x86/asm/mman.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_MMAN_H -#define _ASM_X86_MMAN_H - -#include - -#define MAP_32BIT 0x40 - -#define MAP_GROWSDOWN 0x0100 -#define MAP_DENYWRITE 0x0800 -#define MAP_EXECUTABLE 0x1000 -#define MAP_LOCKED 0x2000 -#define MAP_NORESERVE 0x4000 -#define MAP_POPULATE 0x8000 -#define MAP_NONBLOCK 0x10000 - -#define MCL_CURRENT 1 -#define MCL_FUTURE 2 - -#endif diff --git a/libc/kernel/arch-x86/asm/mmsegment.h b/libc/kernel/arch-x86/asm/mmsegment.h deleted file mode 100644 index 76045c7ab..000000000 --- a/libc/kernel/arch-x86/asm/mmsegment.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_MMSEGMENT_H -#define _ASM_MMSEGMENT_H 1 - -typedef struct { - unsigned long seg; -} mm_segment_t; - -#endif diff --git a/libc/kernel/arch-x86/asm/mmu.h b/libc/kernel/arch-x86/asm/mmu.h deleted file mode 100644 index 30db10a49..000000000 --- a/libc/kernel/arch-x86/asm/mmu.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_MMU_H -#define _ASM_X86_MMU_H - -#include -#include - -typedef struct { - void *ldt; - int size; - struct mutex lock; - void *vdso; -} mm_context_t; - -#endif diff --git a/libc/kernel/arch-x86/asm/module.h b/libc/kernel/arch-x86/asm/module.h deleted file mode 100644 index ff292d4ee..000000000 --- a/libc/kernel/arch-x86/asm/module.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "module_64.h" diff --git a/libc/kernel/arch-x86/asm/module_32.h b/libc/kernel/arch-x86/asm/module_32.h deleted file mode 100644 index 2e267299b..000000000 --- a/libc/kernel/arch-x86/asm/module_32.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_I386_MODULE_H -#define _ASM_I386_MODULE_H - -struct mod_arch_specific -{ -}; - -#define Elf_Shdr Elf32_Shdr -#define Elf_Sym Elf32_Sym -#define Elf_Ehdr Elf32_Ehdr - -#error unknown processor family - -#define MODULE_STACKSIZE "" - -#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE - -#endif diff --git a/libc/kernel/arch-x86/asm/mpspec.h b/libc/kernel/arch-x86/asm/mpspec.h deleted file mode 100644 index 23365043f..000000000 --- a/libc/kernel/arch-x86/asm/mpspec.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "mpspec_64.h" diff --git a/libc/kernel/arch-x86/asm/mpspec_32.h b/libc/kernel/arch-x86/asm/mpspec_32.h deleted file mode 100644 index 7acbe8a78..000000000 --- a/libc/kernel/arch-x86/asm/mpspec_32.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_MPSPEC_H -#define __ASM_MPSPEC_H - -#include -#include -#include - -#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS) - -struct physid_mask -{ - unsigned long mask[PHYSID_ARRAY_SIZE]; -}; - -typedef struct physid_mask physid_mask_t; - -#define physid_set(physid, map) set_bit(physid, (map).mask) -#define physid_clear(physid, map) clear_bit(physid, (map).mask) -#define physid_isset(physid, map) test_bit(physid, (map).mask) -#define physid_test_and_set(physid, map) test_and_set_bit(physid, (map).mask) - -#define physids_and(dst, src1, src2) bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_APICS) -#define physids_or(dst, src1, src2) bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_APICS) -#define physids_clear(map) bitmap_zero((map).mask, MAX_APICS) -#define physids_complement(dst, src) bitmap_complement((dst).mask,(src).mask, MAX_APICS) -#define physids_empty(map) bitmap_empty((map).mask, MAX_APICS) -#define physids_equal(map1, map2) bitmap_equal((map1).mask, (map2).mask, MAX_APICS) -#define physids_weight(map) bitmap_weight((map).mask, MAX_APICS) -#define physids_shift_right(d, s, n) bitmap_shift_right((d).mask, (s).mask, n, MAX_APICS) -#define physids_shift_left(d, s, n) bitmap_shift_left((d).mask, (s).mask, n, MAX_APICS) -#define physids_coerce(map) ((map).mask[0]) - -#define physids_promote(physids) ({ physid_mask_t __physid_mask = PHYSID_MASK_NONE; __physid_mask.mask[0] = physids; __physid_mask; }) - -#define physid_mask_of_physid(physid) ({ physid_mask_t __physid_mask = PHYSID_MASK_NONE; physid_set(physid, __physid_mask); __physid_mask; }) - -#define PHYSID_MASK_ALL { {[0 ... PHYSID_ARRAY_SIZE-1] = ~0UL} } -#define PHYSID_MASK_NONE { {[0 ... PHYSID_ARRAY_SIZE-1] = 0UL} } - -#endif - diff --git a/libc/kernel/arch-x86/asm/mpspec_def.h b/libc/kernel/arch-x86/asm/mpspec_def.h deleted file mode 100644 index 1f15363c7..000000000 --- a/libc/kernel/arch-x86/asm/mpspec_def.h +++ /dev/null @@ -1,171 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_MPSPEC_DEF_H -#define __ASM_MPSPEC_DEF_H - -#define SMP_MAGIC_IDENT (('_'<<24)|('P'<<16)|('M'<<8)|'_') - -#define MAX_MPC_ENTRY 1024 -#define MAX_APICS 256 - -struct intel_mp_floating -{ - char mpf_signature[4]; - unsigned long mpf_physptr; - unsigned char mpf_length; - unsigned char mpf_specification; - unsigned char mpf_checksum; - unsigned char mpf_feature1; - unsigned char mpf_feature2; - unsigned char mpf_feature3; - unsigned char mpf_feature4; - unsigned char mpf_feature5; -}; - -struct mp_config_table -{ - char mpc_signature[4]; -#define MPC_SIGNATURE "PCMP" - unsigned short mpc_length; - char mpc_spec; - char mpc_checksum; - char mpc_oem[8]; - char mpc_productid[12]; - unsigned long mpc_oemptr; - unsigned short mpc_oemsize; - unsigned short mpc_oemcount; - unsigned long mpc_lapic; - unsigned long reserved; -}; - -#define MP_PROCESSOR 0 -#define MP_BUS 1 -#define MP_IOAPIC 2 -#define MP_INTSRC 3 -#define MP_LINTSRC 4 -#define MP_TRANSLATION 192 - -struct mpc_config_processor -{ - unsigned char mpc_type; - unsigned char mpc_apicid; - unsigned char mpc_apicver; - unsigned char mpc_cpuflag; -#define CPU_ENABLED 1 -#define CPU_BOOTPROCESSOR 2 - unsigned long mpc_cpufeature; -#define CPU_STEPPING_MASK 0x0F -#define CPU_MODEL_MASK 0xF0 -#define CPU_FAMILY_MASK 0xF00 - unsigned long mpc_featureflag; - unsigned long mpc_reserved[2]; -}; - -struct mpc_config_bus -{ - unsigned char mpc_type; - unsigned char mpc_busid; - unsigned char mpc_bustype[6]; -}; - -#define BUSTYPE_EISA "EISA" -#define BUSTYPE_ISA "ISA" -#define BUSTYPE_INTERN "INTERN" -#define BUSTYPE_MCA "MCA" -#define BUSTYPE_VL "VL" -#define BUSTYPE_PCI "PCI" -#define BUSTYPE_PCMCIA "PCMCIA" -#define BUSTYPE_CBUS "CBUS" -#define BUSTYPE_CBUSII "CBUSII" -#define BUSTYPE_FUTURE "FUTURE" -#define BUSTYPE_MBI "MBI" -#define BUSTYPE_MBII "MBII" -#define BUSTYPE_MPI "MPI" -#define BUSTYPE_MPSA "MPSA" -#define BUSTYPE_NUBUS "NUBUS" -#define BUSTYPE_TC "TC" -#define BUSTYPE_VME "VME" -#define BUSTYPE_XPRESS "XPRESS" - -struct mpc_config_ioapic -{ - unsigned char mpc_type; - unsigned char mpc_apicid; - unsigned char mpc_apicver; - unsigned char mpc_flags; -#define MPC_APIC_USABLE 0x01 - unsigned long mpc_apicaddr; -}; - -struct mpc_config_intsrc -{ - unsigned char mpc_type; - unsigned char mpc_irqtype; - unsigned short mpc_irqflag; - unsigned char mpc_srcbus; - unsigned char mpc_srcbusirq; - unsigned char mpc_dstapic; - unsigned char mpc_dstirq; -}; - -enum mp_irq_source_types { - mp_INT = 0, - mp_NMI = 1, - mp_SMI = 2, - mp_ExtINT = 3 -}; - -#define MP_IRQDIR_DEFAULT 0 -#define MP_IRQDIR_HIGH 1 -#define MP_IRQDIR_LOW 3 - -struct mpc_config_lintsrc -{ - unsigned char mpc_type; - unsigned char mpc_irqtype; - unsigned short mpc_irqflag; - unsigned char mpc_srcbusid; - unsigned char mpc_srcbusirq; - unsigned char mpc_destapic; -#define MP_APIC_ALL 0xFF - unsigned char mpc_destapiclint; -}; - -struct mp_config_oemtable -{ - char oem_signature[4]; -#define MPC_OEM_SIGNATURE "_OEM" - unsigned short oem_length; - char oem_rev; - char oem_checksum; - char mpc_oem[8]; -}; - -struct mpc_config_translation -{ - unsigned char mpc_type; - unsigned char trans_len; - unsigned char trans_type; - unsigned char trans_quad; - unsigned char trans_global; - unsigned char trans_local; - unsigned short trans_reserved; -}; - -enum mp_bustype { - MP_BUS_ISA = 1, - MP_BUS_EISA, - MP_BUS_PCI, - MP_BUS_MCA, -}; -#endif - diff --git a/libc/kernel/arch-x86/asm/msgbuf.h b/libc/kernel/arch-x86/asm/msgbuf.h deleted file mode 100644 index 8843e78ea..000000000 --- a/libc/kernel/arch-x86/asm/msgbuf.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_MSGBUF_H -#define _ASM_X86_MSGBUF_H - -struct msqid64_ds { - struct ipc64_perm msg_perm; - __kernel_time_t msg_stime; -#ifdef __i386__ - unsigned long __unused1; -#endif - __kernel_time_t msg_rtime; -#ifdef __i386__ - unsigned long __unused2; -#endif - __kernel_time_t msg_ctime; -#ifdef __i386__ - unsigned long __unused3; -#endif - unsigned long msg_cbytes; - unsigned long msg_qnum; - unsigned long msg_qbytes; - __kernel_pid_t msg_lspid; - __kernel_pid_t msg_lrpid; - unsigned long __unused4; - unsigned long __unused5; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/msr-index.h b/libc/kernel/arch-x86/asm/msr-index.h deleted file mode 100644 index 8ea204ed8..000000000 --- a/libc/kernel/arch-x86/asm/msr-index.h +++ /dev/null @@ -1,283 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_MSR_INDEX_H -#define __ASM_MSR_INDEX_H - -#define MSR_EFER 0xc0000080 -#define MSR_STAR 0xc0000081 -#define MSR_LSTAR 0xc0000082 -#define MSR_CSTAR 0xc0000083 -#define MSR_SYSCALL_MASK 0xc0000084 -#define MSR_FS_BASE 0xc0000100 -#define MSR_GS_BASE 0xc0000101 -#define MSR_KERNEL_GS_BASE 0xc0000102 - -#define _EFER_SCE 0 -#define _EFER_LME 8 -#define _EFER_LMA 10 -#define _EFER_NX 11 - -#define EFER_SCE (1<<_EFER_SCE) -#define EFER_LME (1<<_EFER_LME) -#define EFER_LMA (1<<_EFER_LMA) -#define EFER_NX (1<<_EFER_NX) - -#define MSR_IA32_PERFCTR0 0x000000c1 -#define MSR_IA32_PERFCTR1 0x000000c2 -#define MSR_FSB_FREQ 0x000000cd - -#define MSR_MTRRcap 0x000000fe -#define MSR_IA32_BBL_CR_CTL 0x00000119 - -#define MSR_IA32_SYSENTER_CS 0x00000174 -#define MSR_IA32_SYSENTER_ESP 0x00000175 -#define MSR_IA32_SYSENTER_EIP 0x00000176 - -#define MSR_IA32_MCG_CAP 0x00000179 -#define MSR_IA32_MCG_STATUS 0x0000017a -#define MSR_IA32_MCG_CTL 0x0000017b - -#define MSR_IA32_PEBS_ENABLE 0x000003f1 -#define MSR_IA32_DS_AREA 0x00000600 -#define MSR_IA32_PERF_CAPABILITIES 0x00000345 - -#define MSR_MTRRfix64K_00000 0x00000250 -#define MSR_MTRRfix16K_80000 0x00000258 -#define MSR_MTRRfix16K_A0000 0x00000259 -#define MSR_MTRRfix4K_C0000 0x00000268 -#define MSR_MTRRfix4K_C8000 0x00000269 -#define MSR_MTRRfix4K_D0000 0x0000026a -#define MSR_MTRRfix4K_D8000 0x0000026b -#define MSR_MTRRfix4K_E0000 0x0000026c -#define MSR_MTRRfix4K_E8000 0x0000026d -#define MSR_MTRRfix4K_F0000 0x0000026e -#define MSR_MTRRfix4K_F8000 0x0000026f -#define MSR_MTRRdefType 0x000002ff - -#define MSR_IA32_DEBUGCTLMSR 0x000001d9 -#define MSR_IA32_LASTBRANCHFROMIP 0x000001db -#define MSR_IA32_LASTBRANCHTOIP 0x000001dc -#define MSR_IA32_LASTINTFROMIP 0x000001dd -#define MSR_IA32_LASTINTTOIP 0x000001de - -#define MSR_IA32_MC0_CTL 0x00000400 -#define MSR_IA32_MC0_STATUS 0x00000401 -#define MSR_IA32_MC0_ADDR 0x00000402 -#define MSR_IA32_MC0_MISC 0x00000403 - -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_AMD64_IBSFETCHCTL 0xc0011030 -#define MSR_AMD64_IBSFETCHLINAD 0xc0011031 -#define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 -#define MSR_AMD64_IBSOPCTL 0xc0011033 -#define MSR_AMD64_IBSOPRIP 0xc0011034 -#define MSR_AMD64_IBSOPDATA 0xc0011035 -#define MSR_AMD64_IBSOPDATA2 0xc0011036 -#define MSR_AMD64_IBSOPDATA3 0xc0011037 -#define MSR_AMD64_IBSDCLINAD 0xc0011038 -#define MSR_AMD64_IBSDCPHYSAD 0xc0011039 -#define MSR_AMD64_IBSCTL 0xc001103a - -#define MSR_K8_TOP_MEM1 0xc001001a -#define MSR_K8_TOP_MEM2 0xc001001d -#define MSR_K8_SYSCFG 0xc0010010 -#define MSR_K8_HWCR 0xc0010015 -#define MSR_K8_ENABLE_C1E 0xc0010055 -#define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 -#define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 -#define K8_MTRR_RDMEM_WRMEM_MASK 0x18181818 - -#define MSR_K7_EVNTSEL0 0xc0010000 -#define MSR_K7_PERFCTR0 0xc0010004 -#define MSR_K7_EVNTSEL1 0xc0010001 -#define MSR_K7_PERFCTR1 0xc0010005 -#define MSR_K7_EVNTSEL2 0xc0010002 -#define MSR_K7_PERFCTR2 0xc0010006 -#define MSR_K7_EVNTSEL3 0xc0010003 -#define MSR_K7_PERFCTR3 0xc0010007 -#define MSR_K7_CLK_CTL 0xc001001b -#define MSR_K7_HWCR 0xc0010015 -#define MSR_K7_FID_VID_CTL 0xc0010041 -#define MSR_K7_FID_VID_STATUS 0xc0010042 - -#define MSR_K6_EFER 0xc0000080 -#define MSR_K6_STAR 0xc0000081 -#define MSR_K6_WHCR 0xc0000082 -#define MSR_K6_UWCCR 0xc0000085 -#define MSR_K6_EPMR 0xc0000086 -#define MSR_K6_PSOR 0xc0000087 -#define MSR_K6_PFIR 0xc0000088 - -#define MSR_IDT_FCR1 0x00000107 -#define MSR_IDT_FCR2 0x00000108 -#define MSR_IDT_FCR3 0x00000109 -#define MSR_IDT_FCR4 0x0000010a - -#define MSR_IDT_MCR0 0x00000110 -#define MSR_IDT_MCR1 0x00000111 -#define MSR_IDT_MCR2 0x00000112 -#define MSR_IDT_MCR3 0x00000113 -#define MSR_IDT_MCR4 0x00000114 -#define MSR_IDT_MCR5 0x00000115 -#define MSR_IDT_MCR6 0x00000116 -#define MSR_IDT_MCR7 0x00000117 -#define MSR_IDT_MCR_CTRL 0x00000120 - -#define MSR_VIA_FCR 0x00001107 -#define MSR_VIA_LONGHAUL 0x0000110a -#define MSR_VIA_RNG 0x0000110b -#define MSR_VIA_BCR2 0x00001147 - -#define MSR_TMTA_LONGRUN_CTRL 0x80868010 -#define MSR_TMTA_LONGRUN_FLAGS 0x80868011 -#define MSR_TMTA_LRTI_READOUT 0x80868018 -#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a - -#define MSR_IA32_P5_MC_ADDR 0x00000000 -#define MSR_IA32_P5_MC_TYPE 0x00000001 -#define MSR_IA32_TSC 0x00000010 -#define MSR_IA32_PLATFORM_ID 0x00000017 -#define MSR_IA32_EBL_CR_POWERON 0x0000002a - -#define MSR_IA32_APICBASE 0x0000001b -#define MSR_IA32_APICBASE_BSP (1<<8) -#define MSR_IA32_APICBASE_ENABLE (1<<11) -#define MSR_IA32_APICBASE_BASE (0xfffff<<12) - -#define MSR_IA32_UCODE_WRITE 0x00000079 -#define MSR_IA32_UCODE_REV 0x0000008b - -#define MSR_IA32_PERF_STATUS 0x00000198 -#define MSR_IA32_PERF_CTL 0x00000199 - -#define MSR_IA32_MPERF 0x000000e7 -#define MSR_IA32_APERF 0x000000e8 - -#define MSR_IA32_THERM_CONTROL 0x0000019a -#define MSR_IA32_THERM_INTERRUPT 0x0000019b -#define MSR_IA32_THERM_STATUS 0x0000019c -#define MSR_IA32_MISC_ENABLE 0x000001a0 - -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - -#define MSR_IA32_MCG_EAX 0x00000180 -#define MSR_IA32_MCG_EBX 0x00000181 -#define MSR_IA32_MCG_ECX 0x00000182 -#define MSR_IA32_MCG_EDX 0x00000183 -#define MSR_IA32_MCG_ESI 0x00000184 -#define MSR_IA32_MCG_EDI 0x00000185 -#define MSR_IA32_MCG_EBP 0x00000186 -#define MSR_IA32_MCG_ESP 0x00000187 -#define MSR_IA32_MCG_EFLAGS 0x00000188 -#define MSR_IA32_MCG_EIP 0x00000189 -#define MSR_IA32_MCG_RESERVED 0x0000018a - -#define MSR_P4_BPU_PERFCTR0 0x00000300 -#define MSR_P4_BPU_PERFCTR1 0x00000301 -#define MSR_P4_BPU_PERFCTR2 0x00000302 -#define MSR_P4_BPU_PERFCTR3 0x00000303 -#define MSR_P4_MS_PERFCTR0 0x00000304 -#define MSR_P4_MS_PERFCTR1 0x00000305 -#define MSR_P4_MS_PERFCTR2 0x00000306 -#define MSR_P4_MS_PERFCTR3 0x00000307 -#define MSR_P4_FLAME_PERFCTR0 0x00000308 -#define MSR_P4_FLAME_PERFCTR1 0x00000309 -#define MSR_P4_FLAME_PERFCTR2 0x0000030a -#define MSR_P4_FLAME_PERFCTR3 0x0000030b -#define MSR_P4_IQ_PERFCTR0 0x0000030c -#define MSR_P4_IQ_PERFCTR1 0x0000030d -#define MSR_P4_IQ_PERFCTR2 0x0000030e -#define MSR_P4_IQ_PERFCTR3 0x0000030f -#define MSR_P4_IQ_PERFCTR4 0x00000310 -#define MSR_P4_IQ_PERFCTR5 0x00000311 -#define MSR_P4_BPU_CCCR0 0x00000360 -#define MSR_P4_BPU_CCCR1 0x00000361 -#define MSR_P4_BPU_CCCR2 0x00000362 -#define MSR_P4_BPU_CCCR3 0x00000363 -#define MSR_P4_MS_CCCR0 0x00000364 -#define MSR_P4_MS_CCCR1 0x00000365 -#define MSR_P4_MS_CCCR2 0x00000366 -#define MSR_P4_MS_CCCR3 0x00000367 -#define MSR_P4_FLAME_CCCR0 0x00000368 -#define MSR_P4_FLAME_CCCR1 0x00000369 -#define MSR_P4_FLAME_CCCR2 0x0000036a -#define MSR_P4_FLAME_CCCR3 0x0000036b -#define MSR_P4_IQ_CCCR0 0x0000036c -#define MSR_P4_IQ_CCCR1 0x0000036d -#define MSR_P4_IQ_CCCR2 0x0000036e -#define MSR_P4_IQ_CCCR3 0x0000036f -#define MSR_P4_IQ_CCCR4 0x00000370 -#define MSR_P4_IQ_CCCR5 0x00000371 -#define MSR_P4_ALF_ESCR0 0x000003ca -#define MSR_P4_ALF_ESCR1 0x000003cb -#define MSR_P4_BPU_ESCR0 0x000003b2 -#define MSR_P4_BPU_ESCR1 0x000003b3 -#define MSR_P4_BSU_ESCR0 0x000003a0 -#define MSR_P4_BSU_ESCR1 0x000003a1 -#define MSR_P4_CRU_ESCR0 0x000003b8 -#define MSR_P4_CRU_ESCR1 0x000003b9 -#define MSR_P4_CRU_ESCR2 0x000003cc -#define MSR_P4_CRU_ESCR3 0x000003cd -#define MSR_P4_CRU_ESCR4 0x000003e0 -#define MSR_P4_CRU_ESCR5 0x000003e1 -#define MSR_P4_DAC_ESCR0 0x000003a8 -#define MSR_P4_DAC_ESCR1 0x000003a9 -#define MSR_P4_FIRM_ESCR0 0x000003a4 -#define MSR_P4_FIRM_ESCR1 0x000003a5 -#define MSR_P4_FLAME_ESCR0 0x000003a6 -#define MSR_P4_FLAME_ESCR1 0x000003a7 -#define MSR_P4_FSB_ESCR0 0x000003a2 -#define MSR_P4_FSB_ESCR1 0x000003a3 -#define MSR_P4_IQ_ESCR0 0x000003ba -#define MSR_P4_IQ_ESCR1 0x000003bb -#define MSR_P4_IS_ESCR0 0x000003b4 -#define MSR_P4_IS_ESCR1 0x000003b5 -#define MSR_P4_ITLB_ESCR0 0x000003b6 -#define MSR_P4_ITLB_ESCR1 0x000003b7 -#define MSR_P4_IX_ESCR0 0x000003c8 -#define MSR_P4_IX_ESCR1 0x000003c9 -#define MSR_P4_MOB_ESCR0 0x000003aa -#define MSR_P4_MOB_ESCR1 0x000003ab -#define MSR_P4_MS_ESCR0 0x000003c0 -#define MSR_P4_MS_ESCR1 0x000003c1 -#define MSR_P4_PMH_ESCR0 0x000003ac -#define MSR_P4_PMH_ESCR1 0x000003ad -#define MSR_P4_RAT_ESCR0 0x000003bc -#define MSR_P4_RAT_ESCR1 0x000003bd -#define MSR_P4_SAAT_ESCR0 0x000003ae -#define MSR_P4_SAAT_ESCR1 0x000003af -#define MSR_P4_SSU_ESCR0 0x000003be -#define MSR_P4_SSU_ESCR1 0x000003bf - -#define MSR_P4_TBPU_ESCR0 0x000003c2 -#define MSR_P4_TBPU_ESCR1 0x000003c3 -#define MSR_P4_TC_ESCR0 0x000003c4 -#define MSR_P4_TC_ESCR1 0x000003c5 -#define MSR_P4_U2L_ESCR0 0x000003b0 -#define MSR_P4_U2L_ESCR1 0x000003b1 - -#define MSR_CORE_PERF_FIXED_CTR0 0x00000309 -#define MSR_CORE_PERF_FIXED_CTR1 0x0000030a -#define MSR_CORE_PERF_FIXED_CTR2 0x0000030b -#define MSR_CORE_PERF_FIXED_CTR_CTRL 0x0000038d -#define MSR_CORE_PERF_GLOBAL_STATUS 0x0000038e -#define MSR_CORE_PERF_GLOBAL_CTRL 0x0000038f -#define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 - -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - -#endif diff --git a/libc/kernel/arch-x86/asm/msr.h b/libc/kernel/arch-x86/asm/msr.h deleted file mode 100644 index f1da91779..000000000 --- a/libc/kernel/arch-x86/asm/msr.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_X86_MSR_H_ -#define __ASM_X86_MSR_H_ - -#include - -#ifndef __ASSEMBLY__ -#include -#endif - -#ifdef __i386__ - -#else - -#ifndef __ASSEMBLY__ -#include - -#define rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) - -#define rdmsrl(msr,val) do { unsigned long a__,b__; __asm__ __volatile__("rdmsr" : "=a" (a__), "=d" (b__) : "c" (msr)); val = a__ | (b__<<32); } while(0) - -#define wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : : "c" (msr), "a" (val1), "d" (val2)) - -#define wrmsrl(msr,val) wrmsr(msr,(__u32)((__u64)(val)),((__u64)(val))>>32) - -#define rdtsc(low,high) __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high)) - -#define rdtscl(low) __asm__ __volatile__ ("rdtsc" : "=a" (low) : : "edx") - -#define rdtscp(low,high,aux) __asm__ __volatile__ (".byte 0x0f,0x01,0xf9" : "=a" (low), "=d" (high), "=c" (aux)) - -#define rdtscll(val) do { unsigned int __a,__d; __asm__ __volatile__("rdtsc" : "=a" (__a), "=d" (__d)); (val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); } while(0) - -#define rdtscpll(val, aux) do { unsigned long __a, __d; __asm__ __volatile__ (".byte 0x0f,0x01,0xf9" : "=a" (__a), "=d" (__d), "=c" (aux)); (val) = (__d << 32) | __a; } while (0) - -#define write_tsc(val1,val2) wrmsr(0x10, val1, val2) - -#define write_rdtscp_aux(val) wrmsr(0xc0000103, val, 0) - -#define rdpmc(counter,low,high) __asm__ __volatile__("rdpmc" : "=a" (low), "=d" (high) : "c" (counter)) - -#endif -#endif -#endif diff --git a/libc/kernel/arch-x86/asm/page.h b/libc/kernel/arch-x86/asm/page.h deleted file mode 100644 index e6dcf2730..000000000 --- a/libc/kernel/arch-x86/asm/page.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifdef __i386__ -#include "page_32.h" -#else -#include "page_64.h" -#endif diff --git a/libc/kernel/arch-x86/asm/page_32.h b/libc/kernel/arch-x86/asm/page_32.h deleted file mode 100644 index 718cf955a..000000000 --- a/libc/kernel/arch-x86/asm/page_32.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_PAGE_H -#define _I386_PAGE_H - -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - -#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1)) -#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT) - -#endif diff --git a/libc/kernel/arch-x86/asm/param.h b/libc/kernel/arch-x86/asm/param.h deleted file mode 100644 index 3fafd551d..000000000 --- a/libc/kernel/arch-x86/asm/param.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_PARAM_H -#define _ASM_X86_PARAM_H - -#ifndef HZ -#define HZ 100 -#endif - -#define EXEC_PAGESIZE 4096 - -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - - -#endif diff --git a/libc/kernel/arch-x86/asm/paravirt.h b/libc/kernel/arch-x86/asm/paravirt.h deleted file mode 100644 index ab0d08e17..000000000 --- a/libc/kernel/arch-x86/asm/paravirt.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_PARAVIRT_H -#define __ASM_PARAVIRT_H - -#endif diff --git a/libc/kernel/arch-x86/asm/pda.h b/libc/kernel/arch-x86/asm/pda.h deleted file mode 100644 index 671122452..000000000 --- a/libc/kernel/arch-x86/asm/pda.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef X86_64_PDA_H -#define X86_64_PDA_H - -#ifndef __ASSEMBLY__ -#include -#include -#include -#include - -struct x8664_pda { - struct task_struct *pcurrent; - unsigned long data_offset; - unsigned long kernelstack; - unsigned long oldrsp; - int irqcount; - int cpunumber; - char *irqstackptr; - int nodenumber; - unsigned int __softirq_pending; - unsigned int __nmi_count; - short mmu_state; - short isidle; - struct mm_struct *active_mm; - unsigned apic_timer_irqs; - unsigned irq0_irqs; - unsigned irq_resched_count; - unsigned irq_call_count; - unsigned irq_tlb_count; - unsigned irq_thermal_count; - unsigned irq_threshold_count; - unsigned irq_spurious_count; -} ____cacheline_aligned_in_smp; - -#define cpu_pda(i) (_cpu_pda[i]) - -#define pda_offset(field) offsetof(struct x8664_pda, field) - -#define pda_to_op(op,field,val) do { typedef typeof(_proxy_pda.field) T__; if (0) { T__ tmp__; tmp__ = (val); } switch (sizeof(_proxy_pda.field)) { case 2: asm(op "w %1,%%gs:%c2" : "+m" (_proxy_pda.field) : "ri" ((T__)val), "i"(pda_offset(field))); break; case 4: asm(op "l %1,%%gs:%c2" : "+m" (_proxy_pda.field) : "ri" ((T__)val), "i" (pda_offset(field))); break; case 8: asm(op "q %1,%%gs:%c2": "+m" (_proxy_pda.field) : "ri" ((T__)val), "i"(pda_offset(field))); break; default: __bad_pda_field(); } } while (0) - -#define pda_from_op(op,field) ({ typeof(_proxy_pda.field) ret__; switch (sizeof(_proxy_pda.field)) { case 2: asm(op "w %%gs:%c1,%0" : "=r" (ret__) : "i" (pda_offset(field)), "m" (_proxy_pda.field)); break; case 4: asm(op "l %%gs:%c1,%0": "=r" (ret__): "i" (pda_offset(field)), "m" (_proxy_pda.field)); break; case 8: asm(op "q %%gs:%c1,%0": "=r" (ret__) : "i" (pda_offset(field)), "m" (_proxy_pda.field)); break; default: __bad_pda_field(); } ret__; }) - -#define read_pda(field) pda_from_op("mov",field) -#define write_pda(field,val) pda_to_op("mov",field,val) -#define add_pda(field,val) pda_to_op("add",field,val) -#define sub_pda(field,val) pda_to_op("sub",field,val) -#define or_pda(field,val) pda_to_op("or",field,val) - -#define test_and_clear_bit_pda(bit,field) ({ int old__; asm volatile("btr %2,%%gs:%c3\n\tsbbl %0,%0" : "=r" (old__), "+m" (_proxy_pda.field) : "dIr" (bit), "i" (pda_offset(field)) : "memory"); old__; }) - -#endif - -#define PDA_STACKOFFSET (5*8) - -#endif diff --git a/libc/kernel/arch-x86/asm/percpu.h b/libc/kernel/arch-x86/asm/percpu.h deleted file mode 100644 index 7740e67d4..000000000 --- a/libc/kernel/arch-x86/asm/percpu.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "percpu_64.h" diff --git a/libc/kernel/arch-x86/asm/percpu_32.h b/libc/kernel/arch-x86/asm/percpu_32.h deleted file mode 100644 index 21135d6a6..000000000 --- a/libc/kernel/arch-x86/asm/percpu_32.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_I386_PERCPU__ -#define __ARCH_I386_PERCPU__ - -#ifdef __ASSEMBLY__ - -#define PER_CPU(var, reg) movl $per_cpu__##var, reg -#define PER_CPU_VAR(var) per_cpu__##var - -#else - -#include -#define __percpu_seg "" - -#define percpu_to_op(op,var,val) do { typedef typeof(var) T__; if (0) { T__ tmp__; tmp__ = (val); } switch (sizeof(var)) { case 1: asm(op "b %1,"__percpu_seg"%0" : "+m" (var) :"ri" ((T__)val)); break; case 2: asm(op "w %1,"__percpu_seg"%0" : "+m" (var) :"ri" ((T__)val)); break; case 4: asm(op "l %1,"__percpu_seg"%0" : "+m" (var) :"ri" ((T__)val)); break; default: __bad_percpu_size(); } } while (0) - -#define percpu_from_op(op,var) ({ typeof(var) ret__; switch (sizeof(var)) { case 1: asm(op "b "__percpu_seg"%1,%0" : "=r" (ret__) : "m" (var)); break; case 2: asm(op "w "__percpu_seg"%1,%0" : "=r" (ret__) : "m" (var)); break; case 4: asm(op "l "__percpu_seg"%1,%0" : "=r" (ret__) : "m" (var)); break; default: __bad_percpu_size(); } ret__; }) - -#define x86_read_percpu(var) percpu_from_op("mov", per_cpu__##var) -#define x86_write_percpu(var,val) percpu_to_op("mov", per_cpu__##var, val) -#define x86_add_percpu(var,val) percpu_to_op("add", per_cpu__##var, val) -#define x86_sub_percpu(var,val) percpu_to_op("sub", per_cpu__##var, val) -#define x86_or_percpu(var,val) percpu_to_op("or", per_cpu__##var, val) -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/pgalloc.h b/libc/kernel/arch-x86/asm/pgalloc.h deleted file mode 100644 index d5a032b67..000000000 --- a/libc/kernel/arch-x86/asm/pgalloc.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "pgalloc_64.h" diff --git a/libc/kernel/arch-x86/asm/pgalloc_32.h b/libc/kernel/arch-x86/asm/pgalloc_32.h deleted file mode 100644 index bc0f88482..000000000 --- a/libc/kernel/arch-x86/asm/pgalloc_32.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_PGALLOC_H -#define _I386_PGALLOC_H - -#include -#include - -#define paravirt_alloc_pt(mm, pfn) do { } while (0) -#define paravirt_alloc_pd(pfn) do { } while (0) -#define paravirt_alloc_pd(pfn) do { } while (0) -#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0) -#define paravirt_release_pt(pfn) do { } while (0) -#define paravirt_release_pd(pfn) do { } while (0) - -#define pmd_populate_kernel(mm, pmd, pte) do { paravirt_alloc_pt(mm, __pa(pte) >> PAGE_SHIFT); set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte))); } while (0) - -#define pmd_populate(mm, pmd, pte) do { paravirt_alloc_pt(mm, page_to_pfn(pte)); set_pmd(pmd, __pmd(_PAGE_TABLE + ((unsigned long long)page_to_pfn(pte) << (unsigned long long) PAGE_SHIFT))); } while (0) - -#define __pte_free_tlb(tlb,pte) do { paravirt_release_pt(page_to_pfn(pte)); tlb_remove_page((tlb),(pte)); } while (0) -#endif diff --git a/libc/kernel/arch-x86/asm/pgtable-2level-defs.h b/libc/kernel/arch-x86/asm/pgtable-2level-defs.h deleted file mode 100644 index 9edc6c522..000000000 --- a/libc/kernel/arch-x86/asm/pgtable-2level-defs.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_PGTABLE_2LEVEL_DEFS_H -#define _I386_PGTABLE_2LEVEL_DEFS_H - -#define SHARED_KERNEL_PMD 0 - -#define PGDIR_SHIFT 22 -#define PTRS_PER_PGD 1024 - -#define PTRS_PER_PTE 1024 - -#endif diff --git a/libc/kernel/arch-x86/asm/pgtable-2level.h b/libc/kernel/arch-x86/asm/pgtable-2level.h deleted file mode 100644 index 7ade4ed46..000000000 --- a/libc/kernel/arch-x86/asm/pgtable-2level.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_PGTABLE_2LEVEL_H -#define _I386_PGTABLE_2LEVEL_H - -#define pte_ERROR(e) printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low) -#define pgd_ERROR(e) printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) - -#define set_pte(pteptr, pteval) native_set_pte(pteptr, pteval) -#define set_pte_at(mm,addr,ptep,pteval) native_set_pte_at(mm, addr, ptep, pteval) -#define set_pmd(pmdptr, pmdval) native_set_pmd(pmdptr, pmdval) -#define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval) -#define set_pte_present(mm,addr,ptep,pteval) set_pte_at(mm,addr,ptep,pteval) -#define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0) -#define pmd_clear(xp) do { set_pmd(xp, __pmd(0)); } while (0) -#define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) -#define pte_page(x) pfn_to_page(pte_pfn(x)) -#define pte_none(x) (!(x).pte_low) -#define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT) -#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) -#define pfn_pmd(pfn, prot) __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) -#define PTE_FILE_MAX_BITS 29 -#define pte_to_pgoff(pte) ((((pte).pte_low >> 1) & 0x1f ) + (((pte).pte_low >> 8) << 5 )) -#define pgoff_to_pte(off) ((pte_t) { (((off) & 0x1f) << 1) + (((off) >> 5) << 8) + _PAGE_FILE }) -#define __swp_type(x) (((x).val >> 1) & 0x1f) -#define __swp_offset(x) ((x).val >> 8) -#define __swp_entry(type, offset) ((swp_entry_t) { ((type) << 1) | ((offset) << 8) }) -#define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte_low }) -#define __swp_entry_to_pte(x) ((pte_t) { (x).val }) -#endif diff --git a/libc/kernel/arch-x86/asm/pgtable.h b/libc/kernel/arch-x86/asm/pgtable.h deleted file mode 100644 index 797e47302..000000000 --- a/libc/kernel/arch-x86/asm/pgtable.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "pgtable_64.h" diff --git a/libc/kernel/arch-x86/asm/pgtable_32.h b/libc/kernel/arch-x86/asm/pgtable_32.h deleted file mode 100644 index c63ba938b..000000000 --- a/libc/kernel/arch-x86/asm/pgtable_32.h +++ /dev/null @@ -1,175 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_PGTABLE_H -#define _I386_PGTABLE_H - -#ifndef __ASSEMBLY__ -#include -#include -#include -#include - -#include -#include -#include -#include - -struct mm_struct; -struct vm_area_struct; - -#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) - -#include - -#define PGDIR_SIZE (1UL << PGDIR_SHIFT) -#define PGDIR_MASK (~(PGDIR_SIZE-1)) - -#define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) -#define FIRST_USER_ADDRESS 0 - -#define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT) -#define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS) - -#define TWOLEVEL_PGDIR_SHIFT 22 -#define BOOT_USER_PGD_PTRS (__PAGE_OFFSET >> TWOLEVEL_PGDIR_SHIFT) -#define BOOT_KERNEL_PGD_PTRS (1024-BOOT_USER_PGD_PTRS) - -#define VMALLOC_OFFSET (8*1024*1024) -#define VMALLOC_START (((unsigned long) high_memory + 2*VMALLOC_OFFSET-1) & ~(VMALLOC_OFFSET-1)) -#define VMALLOC_END (FIXADDR_START-2*PAGE_SIZE) - -#define _PAGE_BIT_PRESENT 0 -#define _PAGE_BIT_RW 1 -#define _PAGE_BIT_USER 2 -#define _PAGE_BIT_PWT 3 -#define _PAGE_BIT_PCD 4 -#define _PAGE_BIT_ACCESSED 5 -#define _PAGE_BIT_DIRTY 6 -#define _PAGE_BIT_PSE 7 -#define _PAGE_BIT_GLOBAL 8 -#define _PAGE_BIT_UNUSED1 9 -#define _PAGE_BIT_UNUSED2 10 -#define _PAGE_BIT_UNUSED3 11 -#define _PAGE_BIT_NX 63 - -#define _PAGE_PRESENT 0x001 -#define _PAGE_RW 0x002 -#define _PAGE_USER 0x004 -#define _PAGE_PWT 0x008 -#define _PAGE_PCD 0x010 -#define _PAGE_ACCESSED 0x020 -#define _PAGE_DIRTY 0x040 -#define _PAGE_PSE 0x080 -#define _PAGE_GLOBAL 0x100 -#define _PAGE_UNUSED1 0x200 -#define _PAGE_UNUSED2 0x400 -#define _PAGE_UNUSED3 0x800 - -#define _PAGE_FILE 0x040 -#define _PAGE_PROTNONE 0x080 -#define _PAGE_NX 0 - -#define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY) -#define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY) -#define _PAGE_CHG_MASK (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY) - -#define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED) -#define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED) - -#define PAGE_SHARED_EXEC __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED) -#define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX) -#define PAGE_COPY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED) -#define PAGE_COPY PAGE_COPY_NOEXEC -#define PAGE_READONLY __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX) -#define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED) - -#define _PAGE_KERNEL (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_NX) -#define _PAGE_KERNEL_EXEC (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED) - -#define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW) -#define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW) -#define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD) -#define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) -#define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE) - -#define PAGE_KERNEL __pgprot(__PAGE_KERNEL) -#define PAGE_KERNEL_RO __pgprot(__PAGE_KERNEL_RO) -#define PAGE_KERNEL_EXEC __pgprot(__PAGE_KERNEL_EXEC) -#define PAGE_KERNEL_RX __pgprot(__PAGE_KERNEL_RX) -#define PAGE_KERNEL_NOCACHE __pgprot(__PAGE_KERNEL_NOCACHE) -#define PAGE_KERNEL_LARGE __pgprot(__PAGE_KERNEL_LARGE) -#define PAGE_KERNEL_LARGE_EXEC __pgprot(__PAGE_KERNEL_LARGE_EXEC) - -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_READONLY_EXEC -#define __P101 PAGE_READONLY_EXEC -#define __P110 PAGE_COPY_EXEC -#define __P111 PAGE_COPY_EXEC - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY_EXEC -#define __S101 PAGE_READONLY_EXEC -#define __S110 PAGE_SHARED_EXEC -#define __S111 PAGE_SHARED_EXEC - -#undef TEST_ACCESS_OK - -#define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE)) - -#define pmd_none(x) (!(unsigned long)pmd_val(x)) -#define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT) -#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) - -#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) - -#include -#define pte_update(mm, addr, ptep) do { } while (0) -#define pte_update_defer(mm, addr, ptep) do { } while (0) -#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS -#define ptep_set_access_flags(vma, address, ptep, entry, dirty) ({ int __changed = !pte_same(*(ptep), entry); if (__changed && dirty) { (ptep)->pte_low = (entry).pte_low; pte_update_defer((vma)->vm_mm, (address), (ptep)); flush_tlb_page(vma, address); } __changed; }) -#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -#define ptep_test_and_clear_young(vma, addr, ptep) ({ int __ret = 0; if (pte_young(*(ptep))) __ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, &(ptep)->pte_low); if (__ret) pte_update((vma)->vm_mm, addr, ptep); __ret; }) -#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -#define ptep_clear_flush_young(vma, address, ptep) ({ int __young; __young = ptep_test_and_clear_young((vma), (address), (ptep)); if (__young) flush_tlb_page(vma, address); __young; }) -#define __HAVE_ARCH_PTEP_GET_AND_CLEAR -#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL -#define __HAVE_ARCH_PTEP_SET_WRPROTECT -#define pgprot_noncached(prot) ((boot_cpu_data.x86 > 3) ? (__pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT)) : (prot)) -#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) -#define pmd_large(pmd) ((pmd_val(pmd) & (_PAGE_PSE|_PAGE_PRESENT)) == (_PAGE_PSE|_PAGE_PRESENT)) -#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) -#define pgd_index_k(addr) pgd_index(addr) -#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address)) -#define pgd_offset_k(address) pgd_offset(&init_mm, address) -#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) -#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) -#define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) -#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) - - #define pte_offset_map(dir, address) ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) -#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address) -#define pte_unmap(pte) do { } while (0) -#define pte_unmap_nested(pte) do { } while (0) -#define kpte_clear_flush(ptep, vaddr) do { pte_clear(&init_mm, vaddr, ptep); __flush_tlb_one(vaddr); } while (0) -#define update_mmu_cache(vma,address,pte) do { } while (0) - -#endif -#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) remap_pfn_range(vma, vaddr, pfn, size, prot) -#include -#endif diff --git a/libc/kernel/arch-x86/asm/poll.h b/libc/kernel/arch-x86/asm/poll.h deleted file mode 100644 index 5b16673b5..000000000 --- a/libc/kernel/arch-x86/asm/poll.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/posix_types.h b/libc/kernel/arch-x86/asm/posix_types.h deleted file mode 100644 index 79bb4903f..000000000 --- a/libc/kernel/arch-x86/asm/posix_types.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifdef __i386__ -#include "posix_types_32.h" -#else -#include "posix_types_64.h" -#endif diff --git a/libc/kernel/arch-x86/asm/posix_types_32.h b/libc/kernel/arch-x86/asm/posix_types_32.h deleted file mode 100644 index 97a8b6919..000000000 --- a/libc/kernel/arch-x86/asm/posix_types_32.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ARCH_I386_POSIX_TYPES_H -#define __ARCH_I386_POSIX_TYPES_H - -typedef unsigned long __kernel_ino_t; -typedef unsigned short __kernel_mode_t; -typedef unsigned short __kernel_nlink_t; -typedef long __kernel_off_t; -typedef int __kernel_pid_t; -typedef unsigned short __kernel_ipc_pid_t; -typedef unsigned short __kernel_uid_t; -typedef unsigned short __kernel_gid_t; -typedef unsigned int __kernel_size_t; -typedef int __kernel_ssize_t; -typedef int __kernel_ptrdiff_t; -typedef long __kernel_time_t; -typedef long __kernel_suseconds_t; -typedef long __kernel_clock_t; -typedef int __kernel_timer_t; -typedef int __kernel_clockid_t; -typedef int __kernel_daddr_t; -typedef char * __kernel_caddr_t; -typedef unsigned short __kernel_uid16_t; -typedef unsigned short __kernel_gid16_t; -typedef unsigned int __kernel_uid32_t; -typedef unsigned int __kernel_gid32_t; - -typedef unsigned short __kernel_old_uid_t; -typedef unsigned short __kernel_old_gid_t; -typedef unsigned short __kernel_old_dev_t; - -#ifdef __GNUC__ -typedef long long __kernel_loff_t; -#endif - -typedef struct { -#ifdef __USE_ALL - int val[2]; -#else - int __val[2]; -#endif -} __kernel_fsid_t; - -#if !defined(__GLIBC__) || __GLIBC__ < 2 - -#undef __FD_SET -#define __FD_SET(fd,fdsetp) __asm__ __volatile__("btsl %1,%0": "+m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd))) - -#undef __FD_CLR -#define __FD_CLR(fd,fdsetp) __asm__ __volatile__("btrl %1,%0": "+m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd))) - -#undef __FD_ISSET -#define __FD_ISSET(fd,fdsetp) (__extension__ ({ unsigned char __result; __asm__ __volatile__("btl %1,%2 ; setb %0" :"=q" (__result) :"r" ((int) (fd)), "m" (*(__kernel_fd_set *) (fdsetp))); __result; })) - -#undef __FD_ZERO -#define __FD_ZERO(fdsetp) do { int __d0, __d1; __asm__ __volatile__("cld ; rep ; stosl" :"=m" (*(__kernel_fd_set *) (fdsetp)), "=&c" (__d0), "=&D" (__d1) :"a" (0), "1" (__FDSET_LONGS), "2" ((__kernel_fd_set *) (fdsetp)) : "memory"); } while (0) - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/prctl.h b/libc/kernel/arch-x86/asm/prctl.h deleted file mode 100644 index 8852ca703..000000000 --- a/libc/kernel/arch-x86/asm/prctl.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef X86_64_PRCTL_H -#define X86_64_PRCTL_H 1 - -#define ARCH_SET_GS 0x1001 -#define ARCH_SET_FS 0x1002 -#define ARCH_GET_FS 0x1003 -#define ARCH_GET_GS 0x1004 - -#endif diff --git a/libc/kernel/arch-x86/asm/processor-flags.h b/libc/kernel/arch-x86/asm/processor-flags.h deleted file mode 100644 index 79e8f7d7d..000000000 --- a/libc/kernel/arch-x86/asm/processor-flags.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_I386_PROCESSOR_FLAGS_H -#define __ASM_I386_PROCESSOR_FLAGS_H - -#define X86_EFLAGS_CF 0x00000001 -#define X86_EFLAGS_PF 0x00000004 -#define X86_EFLAGS_AF 0x00000010 -#define X86_EFLAGS_ZF 0x00000040 -#define X86_EFLAGS_SF 0x00000080 -#define X86_EFLAGS_TF 0x00000100 -#define X86_EFLAGS_IF 0x00000200 -#define X86_EFLAGS_DF 0x00000400 -#define X86_EFLAGS_OF 0x00000800 -#define X86_EFLAGS_IOPL 0x00003000 -#define X86_EFLAGS_NT 0x00004000 -#define X86_EFLAGS_RF 0x00010000 -#define X86_EFLAGS_VM 0x00020000 -#define X86_EFLAGS_AC 0x00040000 -#define X86_EFLAGS_VIF 0x00080000 -#define X86_EFLAGS_VIP 0x00100000 -#define X86_EFLAGS_ID 0x00200000 - -#define X86_CR0_PE 0x00000001 -#define X86_CR0_MP 0x00000002 -#define X86_CR0_EM 0x00000004 -#define X86_CR0_TS 0x00000008 -#define X86_CR0_ET 0x00000010 -#define X86_CR0_NE 0x00000020 -#define X86_CR0_WP 0x00010000 -#define X86_CR0_AM 0x00040000 -#define X86_CR0_NW 0x20000000 -#define X86_CR0_CD 0x40000000 -#define X86_CR0_PG 0x80000000 - -#define X86_CR3_PWT 0x00000008 -#define X86_CR3_PCD 0x00000010 - -#define X86_CR4_VME 0x00000001 -#define X86_CR4_PVI 0x00000002 -#define X86_CR4_TSD 0x00000004 -#define X86_CR4_DE 0x00000008 -#define X86_CR4_PSE 0x00000010 -#define X86_CR4_PAE 0x00000020 -#define X86_CR4_MCE 0x00000040 -#define X86_CR4_PGE 0x00000080 -#define X86_CR4_PCE 0x00000100 -#define X86_CR4_OSFXSR 0x00000200 -#define X86_CR4_OSXMMEXCPT 0x00000400 -#define X86_CR4_VMXE 0x00002000 - -#define X86_CR8_TPR 0x0000000F - -#define CX86_PCR0 0x20 -#define CX86_GCR 0xb8 -#define CX86_CCR0 0xc0 -#define CX86_CCR1 0xc1 -#define CX86_CCR2 0xc2 -#define CX86_CCR3 0xc3 -#define CX86_CCR4 0xe8 -#define CX86_CCR5 0xe9 -#define CX86_CCR6 0xea -#define CX86_CCR7 0xeb -#define CX86_PCR1 0xf0 -#define CX86_DIR0 0xfe -#define CX86_DIR1 0xff -#define CX86_ARR_BASE 0xc4 -#define CX86_RCR_BASE 0xdc - -#endif diff --git a/libc/kernel/arch-x86/asm/processor.h b/libc/kernel/arch-x86/asm/processor.h deleted file mode 100644 index 7d4774961..000000000 --- a/libc/kernel/arch-x86/asm/processor.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "processor_64.h" diff --git a/libc/kernel/arch-x86/asm/processor_32.h b/libc/kernel/arch-x86/asm/processor_32.h deleted file mode 100644 index 539edd1a0..000000000 --- a/libc/kernel/arch-x86/asm/processor_32.h +++ /dev/null @@ -1,324 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_I386_PROCESSOR_H -#define __ASM_I386_PROCESSOR_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct desc_struct { - unsigned long a,b; -}; - -#define desc_empty(desc) (!((desc)->a | (desc)->b)) - -#define desc_equal(desc1, desc2) (((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b)) - -#define current_text_addr() ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; }) - -struct cpuinfo_x86 { - __u8 x86; - __u8 x86_vendor; - __u8 x86_model; - __u8 x86_mask; - char wp_works_ok; - char hlt_works_ok; - char hard_math; - char rfu; - int cpuid_level; - unsigned long x86_capability[NCAPINTS]; - char x86_vendor_id[16]; - char x86_model_id[64]; - int x86_cache_size; - int x86_cache_alignment; - char fdiv_bug; - char f00f_bug; - char coma_bug; - char pad0; - int x86_power; - unsigned long loops_per_jiffy; - unsigned char x86_max_cores; - unsigned char apicid; - unsigned short x86_clflush_size; -} __attribute__((__aligned__(SMP_CACHE_BYTES))); - -#define X86_VENDOR_INTEL 0 -#define X86_VENDOR_CYRIX 1 -#define X86_VENDOR_AMD 2 -#define X86_VENDOR_UMC 3 -#define X86_VENDOR_NEXGEN 4 -#define X86_VENDOR_CENTAUR 5 -#define X86_VENDOR_TRANSMETA 7 -#define X86_VENDOR_NSC 8 -#define X86_VENDOR_NUM 9 -#define X86_VENDOR_UNKNOWN 0xff - -#define cpu_data(cpu) boot_cpu_data -#define current_cpu_data boot_cpu_data - -#define load_cr3(pgdir) write_cr3(__pa(pgdir)) - -#define TASK_SIZE (PAGE_OFFSET) - -#define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) - -#define HAVE_ARCH_PICK_MMAP_LAYOUT - -#define IO_BITMAP_BITS 65536 -#define IO_BITMAP_BYTES (IO_BITMAP_BITS/8) -#define IO_BITMAP_LONGS (IO_BITMAP_BYTES/sizeof(long)) -#define IO_BITMAP_OFFSET offsetof(struct tss_struct,io_bitmap) -#define INVALID_IO_BITMAP_OFFSET 0x8000 -#define INVALID_IO_BITMAP_OFFSET_LAZY 0x9000 - -struct i387_fsave_struct { - long cwd; - long swd; - long twd; - long fip; - long fcs; - long foo; - long fos; - long st_space[20]; - long status; -}; - -struct i387_fxsave_struct { - unsigned short cwd; - unsigned short swd; - unsigned short twd; - unsigned short fop; - long fip; - long fcs; - long foo; - long fos; - long mxcsr; - long mxcsr_mask; - long st_space[32]; - long xmm_space[32]; - long padding[56]; -} __attribute__ ((aligned (16))); - -struct i387_soft_struct { - long cwd; - long swd; - long twd; - long fip; - long fcs; - long foo; - long fos; - long st_space[20]; - unsigned char ftop, changed, lookahead, no_update, rm, alimit; - struct info *info; - unsigned long entry_eip; -}; - -union i387_union { - struct i387_fsave_struct fsave; - struct i387_fxsave_struct fxsave; - struct i387_soft_struct soft; -}; - -typedef struct { - unsigned long seg; -} mm_segment_t; - -struct thread_struct; - -struct i386_hw_tss { - unsigned short back_link,__blh; - unsigned long esp0; - unsigned short ss0,__ss0h; - unsigned long esp1; - unsigned short ss1,__ss1h; - unsigned long esp2; - unsigned short ss2,__ss2h; - unsigned long __cr3; - unsigned long eip; - unsigned long eflags; - unsigned long eax,ecx,edx,ebx; - unsigned long esp; - unsigned long ebp; - unsigned long esi; - unsigned long edi; - unsigned short es, __esh; - unsigned short cs, __csh; - unsigned short ss, __ssh; - unsigned short ds, __dsh; - unsigned short fs, __fsh; - unsigned short gs, __gsh; - unsigned short ldt, __ldth; - unsigned short trace, io_bitmap_base; -} __attribute__((packed)); - -struct tss_struct { - struct i386_hw_tss x86_tss; - - unsigned long io_bitmap[IO_BITMAP_LONGS + 1]; - - unsigned long io_bitmap_max; - struct thread_struct *io_bitmap_owner; - - unsigned long __cacheline_filler[35]; - - unsigned long stack[64]; -} __attribute__((packed)); - -#define ARCH_MIN_TASKALIGN 16 - -struct thread_struct { - - struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; - unsigned long esp0; - unsigned long sysenter_cs; - unsigned long eip; - unsigned long esp; - unsigned long fs; - unsigned long gs; - - unsigned long debugreg[8]; - - unsigned long cr2, trap_no, error_code; - - union i387_union i387; - - struct vm86_struct __user * vm86_info; - unsigned long screen_bitmap; - unsigned long v86flags, v86mask, saved_esp0; - unsigned int saved_fs, saved_gs; - - unsigned long *io_bitmap_ptr; - unsigned long iopl; - - unsigned long io_bitmap_max; -}; - -#define INIT_THREAD { .esp0 = sizeof(init_stack) + (long)&init_stack, .vm86_info = NULL, .sysenter_cs = __KERNEL_CS, .io_bitmap_ptr = NULL, .fs = __KERNEL_PERCPU, } - -#define INIT_TSS { .x86_tss = { .esp0 = sizeof(init_stack) + (long)&init_stack, .ss0 = __KERNEL_DS, .ss1 = __KERNEL_CS, .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, }, .io_bitmap = { [ 0 ... IO_BITMAP_LONGS] = ~0 }, } - -#define start_thread(regs, new_eip, new_esp) do { __asm__("movl %0,%%gs": :"r" (0)); regs->xfs = 0; set_fs(USER_DS); regs->xds = __USER_DS; regs->xes = __USER_DS; regs->xss = __USER_DS; regs->xcs = __USER_CS; regs->eip = new_eip; regs->esp = new_esp; } while (0) - -struct task_struct; -struct mm_struct; - -#define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) -#define KSTK_TOP(info) ({ unsigned long *__ptr = (unsigned long *)(info); (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); }) - -#define task_pt_regs(task) ({ struct pt_regs *__regs__; __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); __regs__ - 1; }) - -#define KSTK_EIP(task) (task_pt_regs(task)->eip) -#define KSTK_ESP(task) (task_pt_regs(task)->esp) - -struct microcode_header { - unsigned int hdrver; - unsigned int rev; - unsigned int date; - unsigned int sig; - unsigned int cksum; - unsigned int ldrver; - unsigned int pf; - unsigned int datasize; - unsigned int totalsize; - unsigned int reserved[3]; -}; - -struct microcode { - struct microcode_header hdr; - unsigned int bits[0]; -}; - -typedef struct microcode microcode_t; -typedef struct microcode_header microcode_header_t; - -struct extended_signature { - unsigned int sig; - unsigned int pf; - unsigned int cksum; -}; - -struct extended_sigtable { - unsigned int count; - unsigned int cksum; - unsigned int reserved[3]; - struct extended_signature sigs[0]; -}; - -#define cpu_relax() rep_nop() -#define paravirt_enabled() 0 -#define __cpuid native_cpuid -#define get_debugreg(var, register) (var) = native_get_debugreg(register) -#define set_debugreg(value, register) native_set_debugreg(register, value) -#define set_iopl_mask native_set_iopl_mask -#define GENERIC_NOP1 ".byte 0x90\n" -#define GENERIC_NOP2 ".byte 0x89,0xf6\n" -#define GENERIC_NOP3 ".byte 0x8d,0x76,0x00\n" -#define GENERIC_NOP4 ".byte 0x8d,0x74,0x26,0x00\n" -#define GENERIC_NOP5 GENERIC_NOP1 GENERIC_NOP4 -#define GENERIC_NOP6 ".byte 0x8d,0xb6,0x00,0x00,0x00,0x00\n" -#define GENERIC_NOP7 ".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00\n" -#define GENERIC_NOP8 GENERIC_NOP1 GENERIC_NOP7 -#define K8_NOP1 GENERIC_NOP1 -#define K8_NOP2 ".byte 0x66,0x90\n" -#define K8_NOP3 ".byte 0x66,0x66,0x90\n" -#define K8_NOP4 ".byte 0x66,0x66,0x66,0x90\n" -#define K8_NOP5 K8_NOP3 K8_NOP2 -#define K8_NOP6 K8_NOP3 K8_NOP3 -#define K8_NOP7 K8_NOP4 K8_NOP3 -#define K8_NOP8 K8_NOP4 K8_NOP4 -#define K7_NOP1 GENERIC_NOP1 -#define K7_NOP2 ".byte 0x8b,0xc0\n" -#define K7_NOP3 ".byte 0x8d,0x04,0x20\n" -#define K7_NOP4 ".byte 0x8d,0x44,0x20,0x00\n" -#define K7_NOP5 K7_NOP4 ASM_NOP1 -#define K7_NOP6 ".byte 0x8d,0x80,0,0,0,0\n" -#define K7_NOP7 ".byte 0x8D,0x04,0x05,0,0,0,0\n" -#define K7_NOP8 K7_NOP7 ASM_NOP1 -#define P6_NOP1 GENERIC_NOP1 -#define P6_NOP2 ".byte 0x66,0x90\n" -#define P6_NOP3 ".byte 0x0f,0x1f,0x00\n" -#define P6_NOP4 ".byte 0x0f,0x1f,0x40,0\n" -#define P6_NOP5 ".byte 0x0f,0x1f,0x44,0x00,0\n" -#define P6_NOP6 ".byte 0x66,0x0f,0x1f,0x44,0x00,0\n" -#define P6_NOP7 ".byte 0x0f,0x1f,0x80,0,0,0,0\n" -#define P6_NOP8 ".byte 0x0f,0x1f,0x84,0x00,0,0,0,0\n" -#define ASM_NOP1 GENERIC_NOP1 -#define ASM_NOP2 GENERIC_NOP2 -#define ASM_NOP3 GENERIC_NOP3 -#define ASM_NOP4 GENERIC_NOP4 -#define ASM_NOP5 GENERIC_NOP5 -#define ASM_NOP6 GENERIC_NOP6 -#define ASM_NOP7 GENERIC_NOP7 -#define ASM_NOP8 GENERIC_NOP8 -#define ASM_NOP_MAX 8 -#define ARCH_HAS_PREFETCH -#define ARCH_HAS_PREFETCH -#define ARCH_HAS_PREFETCHW -#define ARCH_HAS_SPINLOCK_PREFETCH -#define spin_lock_prefetch(x) prefetchw(x) - -#define cache_line_size() (boot_cpu_data.x86_cache_alignment) - -#endif diff --git a/libc/kernel/arch-x86/asm/ptrace-abi.h b/libc/kernel/arch-x86/asm/ptrace-abi.h deleted file mode 100644 index 3e6ea082d..000000000 --- a/libc/kernel/arch-x86/asm/ptrace-abi.h +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_PTRACE_ABI_H -#define _ASM_X86_PTRACE_ABI_H - -#ifdef __i386__ - -#define EBX 0 -#define ECX 1 -#define EDX 2 -#define ESI 3 -#define EDI 4 -#define EBP 5 -#define EAX 6 -#define DS 7 -#define ES 8 -#define FS 9 -#define GS 10 -#define ORIG_EAX 11 -#define EIP 12 -#define CS 13 -#define EFL 14 -#define UESP 15 -#define SS 16 -#define FRAME_SIZE 17 - -#else - -#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS) -#define R15 0 -#define R14 8 -#define R13 16 -#define R12 24 -#define RBP 32 -#define RBX 40 - -#define R11 48 -#define R10 56 -#define R9 64 -#define R8 72 -#define RAX 80 -#define RCX 88 -#define RDX 96 -#define RSI 104 -#define RDI 112 -#define ORIG_RAX 120 - -#define RIP 128 -#define CS 136 -#define EFLAGS 144 -#define RSP 152 -#define SS 160 -#define ARGOFFSET R11 -#endif - -#define FRAME_SIZE 168 - -#endif - -#define PTRACE_GETREGS 12 -#define PTRACE_SETREGS 13 -#define PTRACE_GETFPREGS 14 -#define PTRACE_SETFPREGS 15 -#define PTRACE_GETFPXREGS 18 -#define PTRACE_SETFPXREGS 19 - -#define PTRACE_OLDSETOPTIONS 21 - -#define PTRACE_GET_THREAD_AREA 25 -#define PTRACE_SET_THREAD_AREA 26 - -#ifdef __x86_64__ -#define PTRACE_ARCH_PRCTL 30 -#else -#define PTRACE_SYSEMU 31 -#define PTRACE_SYSEMU_SINGLESTEP 32 -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/ptrace.h b/libc/kernel/arch-x86/asm/ptrace.h deleted file mode 100644 index 4743e0fca..000000000 --- a/libc/kernel/arch-x86/asm/ptrace.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_PTRACE_H -#define _ASM_X86_PTRACE_H - -#include -#include - -#ifndef __ASSEMBLY__ - -#ifdef __i386__ - -struct pt_regs { - long ebx; - long ecx; - long edx; - long esi; - long edi; - long ebp; - long eax; - int xds; - int xes; - int xfs; - - long orig_eax; - long eip; - int xcs; - long eflags; - long esp; - int xss; -}; - -#else - -struct pt_regs { - unsigned long r15; - unsigned long r14; - unsigned long r13; - unsigned long r12; - unsigned long rbp; - unsigned long rbx; - - unsigned long r11; - unsigned long r10; - unsigned long r9; - unsigned long r8; - unsigned long rax; - unsigned long rcx; - unsigned long rdx; - unsigned long rsi; - unsigned long rdi; - unsigned long orig_rax; - - unsigned long rip; - unsigned long cs; - unsigned long eflags; - unsigned long rsp; - unsigned long ss; - -}; - -#endif -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/required-features.h b/libc/kernel/arch-x86/asm/required-features.h deleted file mode 100644 index a96517a0a..000000000 --- a/libc/kernel/arch-x86/asm/required-features.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_REQUIRED_FEATURES_H -#define _ASM_REQUIRED_FEATURES_H 1 - -#define NEED_FPU (1<<(X86_FEATURE_FPU & 31)) - -#define NEED_PAE 0 -#define NEED_CX8 0 - -#define NEED_CMOV 0 - -#define NEED_3DNOW 0 - -#define NEED_PSE 0 -#define NEED_MSR 0 -#define NEED_PGE 0 -#define NEED_FXSR 0 -#define NEED_XMM 0 -#define NEED_XMM2 0 -#define NEED_LM 0 - -#define REQUIRED_MASK0 (NEED_FPU|NEED_PSE|NEED_MSR|NEED_PAE| NEED_CX8|NEED_PGE|NEED_FXSR|NEED_CMOV| NEED_XMM|NEED_XMM2) -#define SSE_MASK (NEED_XMM|NEED_XMM2) - -#define REQUIRED_MASK1 (NEED_LM|NEED_3DNOW) - -#define REQUIRED_MASK2 0 -#define REQUIRED_MASK3 0 -#define REQUIRED_MASK4 0 -#define REQUIRED_MASK5 0 -#define REQUIRED_MASK6 0 -#define REQUIRED_MASK7 0 - -#endif diff --git a/libc/kernel/arch-x86/asm/resource.h b/libc/kernel/arch-x86/asm/resource.h deleted file mode 100644 index 29d9e12e8..000000000 --- a/libc/kernel/arch-x86/asm/resource.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/rwlock.h b/libc/kernel/arch-x86/asm/rwlock.h deleted file mode 100644 index 3693542bd..000000000 --- a/libc/kernel/arch-x86/asm/rwlock.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_RWLOCK_H -#define _ASM_X86_RWLOCK_H - -#define RW_LOCK_BIAS 0x01000000 -#define RW_LOCK_BIAS_STR "0x01000000" - -#endif diff --git a/libc/kernel/arch-x86/asm/scatterlist.h b/libc/kernel/arch-x86/asm/scatterlist.h deleted file mode 100644 index fa4d0cc60..000000000 --- a/libc/kernel/arch-x86/asm/scatterlist.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "scatterlist_64.h" diff --git a/libc/kernel/arch-x86/asm/scatterlist_32.h b/libc/kernel/arch-x86/asm/scatterlist_32.h deleted file mode 100644 index 29044c3e5..000000000 --- a/libc/kernel/arch-x86/asm/scatterlist_32.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_SCATTERLIST_H -#define _I386_SCATTERLIST_H - -#include - -struct scatterlist { - unsigned long page_link; - unsigned int offset; - dma_addr_t dma_address; - unsigned int length; -}; - -#define ARCH_HAS_SG_CHAIN - -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) - -#define ISA_DMA_THRESHOLD (0x00ffffff) - -#endif diff --git a/libc/kernel/arch-x86/asm/sections.h b/libc/kernel/arch-x86/asm/sections.h deleted file mode 100644 index a21da3eb9..000000000 --- a/libc/kernel/arch-x86/asm/sections.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/arch-x86/asm/segment.h b/libc/kernel/arch-x86/asm/segment.h deleted file mode 100644 index 6877a80b2..000000000 --- a/libc/kernel/arch-x86/asm/segment.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "segment_64.h" diff --git a/libc/kernel/arch-x86/asm/segment_32.h b/libc/kernel/arch-x86/asm/segment_32.h deleted file mode 100644 index 54b312bc2..000000000 --- a/libc/kernel/arch-x86/asm/segment_32.h +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_SEGMENT_H -#define _ASM_SEGMENT_H - -#define GDT_ENTRY_TLS_ENTRIES 3 -#define GDT_ENTRY_TLS_MIN 6 -#define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1) - -#define TLS_SIZE (GDT_ENTRY_TLS_ENTRIES * 8) - -#define GDT_ENTRY_DEFAULT_USER_CS 14 -#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS * 8 + 3) - -#define GDT_ENTRY_DEFAULT_USER_DS 15 -#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS * 8 + 3) - -#define GDT_ENTRY_KERNEL_BASE 12 - -#define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0) -#define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8) - -#define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1) -#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) - -#define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4) -#define GDT_ENTRY_LDT (GDT_ENTRY_KERNEL_BASE + 5) - -#define GDT_ENTRY_PNPBIOS_BASE (GDT_ENTRY_KERNEL_BASE + 6) -#define GDT_ENTRY_APMBIOS_BASE (GDT_ENTRY_KERNEL_BASE + 11) - -#define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) -#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) - -#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15) -#define __KERNEL_PERCPU 0 - -#define GDT_ENTRY_DOUBLEFAULT_TSS 31 - -#define GDT_ENTRIES 32 -#define GDT_SIZE (GDT_ENTRIES * 8) - -#define GDT_ENTRY_BOOT_CS 2 -#define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) - -#define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) -#define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) - -#define GDT_ENTRY_PNPBIOS_CS32 (GDT_ENTRY_PNPBIOS_BASE + 0) -#define GDT_ENTRY_PNPBIOS_CS16 (GDT_ENTRY_PNPBIOS_BASE + 1) -#define GDT_ENTRY_PNPBIOS_DS (GDT_ENTRY_PNPBIOS_BASE + 2) -#define GDT_ENTRY_PNPBIOS_TS1 (GDT_ENTRY_PNPBIOS_BASE + 3) -#define GDT_ENTRY_PNPBIOS_TS2 (GDT_ENTRY_PNPBIOS_BASE + 4) - -#define PNP_CS32 (GDT_ENTRY_PNPBIOS_CS32 * 8) -#define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16 * 8) -#define PNP_DS (GDT_ENTRY_PNPBIOS_DS * 8) -#define PNP_TS1 (GDT_ENTRY_PNPBIOS_TS1 * 8) -#define PNP_TS2 (GDT_ENTRY_PNPBIOS_TS2 * 8) - -#define IDT_ENTRIES 256 - -#define SEGMENT_RPL_MASK 0x3 - -#define SEGMENT_TI_MASK 0x4 - -#define USER_RPL 0x3 - -#define SEGMENT_LDT 0x4 -#define SEGMENT_GDT 0x0 - -#define get_kernel_rpl() 0 - -#define SEGMENT_IS_KERNEL_CODE(x) (((x) & 0xfc) == GDT_ENTRY_KERNEL_CS * 8) - -#define SEGMENT_IS_FLAT_CODE(x) (((x) & 0xec) == GDT_ENTRY_KERNEL_CS * 8) - -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8) - -#endif diff --git a/libc/kernel/arch-x86/asm/semaphore.h b/libc/kernel/arch-x86/asm/semaphore.h deleted file mode 100644 index 8b4c59572..000000000 --- a/libc/kernel/arch-x86/asm/semaphore.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "semaphore_64.h" diff --git a/libc/kernel/arch-x86/asm/semaphore_32.h b/libc/kernel/arch-x86/asm/semaphore_32.h deleted file mode 100644 index babe77964..000000000 --- a/libc/kernel/arch-x86/asm/semaphore_32.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_SEMAPHORE_H -#define _I386_SEMAPHORE_H - -#include - -#endif diff --git a/libc/kernel/arch-x86/asm/sembuf.h b/libc/kernel/arch-x86/asm/sembuf.h deleted file mode 100644 index 1695208aa..000000000 --- a/libc/kernel/arch-x86/asm/sembuf.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SEMBUF_H -#define _ASM_X86_SEMBUF_H - -struct semid64_ds { - struct ipc64_perm sem_perm; - __kernel_time_t sem_otime; - unsigned long __unused1; - __kernel_time_t sem_ctime; - unsigned long __unused2; - unsigned long sem_nsems; - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/setup.h b/libc/kernel/arch-x86/asm/setup.h deleted file mode 100644 index 696ed97e1..000000000 --- a/libc/kernel/arch-x86/asm/setup.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SETUP_H -#define _ASM_X86_SETUP_H - -#define COMMAND_LINE_SIZE 2048 - -#endif diff --git a/libc/kernel/arch-x86/asm/shmbuf.h b/libc/kernel/arch-x86/asm/shmbuf.h deleted file mode 100644 index 314ccb7d8..000000000 --- a/libc/kernel/arch-x86/asm/shmbuf.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SHMBUF_H -#define _ASM_X86_SHMBUF_H - -struct shmid64_ds { - struct ipc64_perm shm_perm; - size_t shm_segsz; - __kernel_time_t shm_atime; -#ifdef __i386__ - unsigned long __unused1; -#endif - __kernel_time_t shm_dtime; -#ifdef __i386__ - unsigned long __unused2; -#endif - __kernel_time_t shm_ctime; -#ifdef __i386__ - unsigned long __unused3; -#endif - __kernel_pid_t shm_cpid; - __kernel_pid_t shm_lpid; - unsigned long shm_nattch; - unsigned long __unused4; - unsigned long __unused5; -}; - -struct shminfo64 { - unsigned long shmmax; - unsigned long shmmin; - unsigned long shmmni; - unsigned long shmseg; - unsigned long shmall; - unsigned long __unused1; - unsigned long __unused2; - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/shmparam.h b/libc/kernel/arch-x86/asm/shmparam.h deleted file mode 100644 index e667ba1c8..000000000 --- a/libc/kernel/arch-x86/asm/shmparam.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SHMPARAM_H -#define _ASM_X86_SHMPARAM_H - -#define SHMLBA PAGE_SIZE - -#endif diff --git a/libc/kernel/arch-x86/asm/sigcontext.h b/libc/kernel/arch-x86/asm/sigcontext.h deleted file mode 100644 index a8f76f0c1..000000000 --- a/libc/kernel/arch-x86/asm/sigcontext.h +++ /dev/null @@ -1,132 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SIGCONTEXT_H -#define _ASM_X86_SIGCONTEXT_H - -#include -#include - -#ifdef __i386__ - -struct _fpreg { - unsigned short significand[4]; - unsigned short exponent; -}; - -struct _fpxreg { - unsigned short significand[4]; - unsigned short exponent; - unsigned short padding[3]; -}; - -struct _xmmreg { - unsigned long element[4]; -}; - -struct _fpstate { - - unsigned long cw; - unsigned long sw; - unsigned long tag; - unsigned long ipoff; - unsigned long cssel; - unsigned long dataoff; - unsigned long datasel; - struct _fpreg _st[8]; - unsigned short status; - unsigned short magic; - - unsigned long _fxsr_env[6]; - unsigned long mxcsr; - unsigned long reserved; - struct _fpxreg _fxsr_st[8]; - struct _xmmreg _xmm[8]; - unsigned long padding[56]; -}; - -#define X86_FXSR_MAGIC 0x0000 - -struct sigcontext { - unsigned short gs, __gsh; - unsigned short fs, __fsh; - unsigned short es, __esh; - unsigned short ds, __dsh; - unsigned long edi; - unsigned long esi; - unsigned long ebp; - unsigned long esp; - unsigned long ebx; - unsigned long edx; - unsigned long ecx; - unsigned long eax; - unsigned long trapno; - unsigned long err; - unsigned long eip; - unsigned short cs, __csh; - unsigned long eflags; - unsigned long esp_at_signal; - unsigned short ss, __ssh; - struct _fpstate __user * fpstate; - unsigned long oldmask; - unsigned long cr2; -}; - -#else - -struct _fpstate { - __u16 cwd; - __u16 swd; - __u16 twd; - __u16 fop; - __u64 rip; - __u64 rdp; - __u32 mxcsr; - __u32 mxcsr_mask; - __u32 st_space[32]; - __u32 xmm_space[64]; - __u32 reserved2[24]; -}; - -struct sigcontext { - unsigned long r8; - unsigned long r9; - unsigned long r10; - unsigned long r11; - unsigned long r12; - unsigned long r13; - unsigned long r14; - unsigned long r15; - unsigned long rdi; - unsigned long rsi; - unsigned long rbp; - unsigned long rbx; - unsigned long rdx; - unsigned long rax; - unsigned long rcx; - unsigned long rsp; - unsigned long rip; - unsigned long eflags; - unsigned short cs; - unsigned short gs; - unsigned short fs; - unsigned short __pad0; - unsigned long err; - unsigned long trapno; - unsigned long oldmask; - unsigned long cr2; - struct _fpstate __user *fpstate; - unsigned long reserved1[8]; -}; - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/siginfo.h b/libc/kernel/arch-x86/asm/siginfo.h deleted file mode 100644 index 0d21d227a..000000000 --- a/libc/kernel/arch-x86/asm/siginfo.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SIGINFO_H -#define _ASM_X86_SIGINFO_H - -#ifdef __x86_64__ -#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) -#endif - -#include - -#endif diff --git a/libc/kernel/arch-x86/asm/signal.h b/libc/kernel/arch-x86/asm/signal.h deleted file mode 100644 index 6d84eabbd..000000000 --- a/libc/kernel/arch-x86/asm/signal.h +++ /dev/null @@ -1,127 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SIGNAL_H -#define _ASM_X86_SIGNAL_H - -#ifndef __ASSEMBLY__ -#include -#include -#include - -struct siginfo; - -#define NSIG 32 -typedef unsigned long sigset_t; - -#endif - -#define SIGHUP 1 -#define SIGINT 2 -#define SIGQUIT 3 -#define SIGILL 4 -#define SIGTRAP 5 -#define SIGABRT 6 -#define SIGIOT 6 -#define SIGBUS 7 -#define SIGFPE 8 -#define SIGKILL 9 -#define SIGUSR1 10 -#define SIGSEGV 11 -#define SIGUSR2 12 -#define SIGPIPE 13 -#define SIGALRM 14 -#define SIGTERM 15 -#define SIGSTKFLT 16 -#define SIGCHLD 17 -#define SIGCONT 18 -#define SIGSTOP 19 -#define SIGTSTP 20 -#define SIGTTIN 21 -#define SIGTTOU 22 -#define SIGURG 23 -#define SIGXCPU 24 -#define SIGXFSZ 25 -#define SIGVTALRM 26 -#define SIGPROF 27 -#define SIGWINCH 28 -#define SIGIO 29 -#define SIGPOLL SIGIO - -#define SIGPWR 30 -#define SIGSYS 31 -#define SIGUNUSED 31 - -#define SIGRTMIN 32 -#define SIGRTMAX _NSIG - -#define SA_NOCLDSTOP 0x00000001u -#define SA_NOCLDWAIT 0x00000002u -#define SA_SIGINFO 0x00000004u -#define SA_ONSTACK 0x08000000u -#define SA_RESTART 0x10000000u -#define SA_NODEFER 0x40000000u -#define SA_RESETHAND 0x80000000u - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - -#define SA_RESTORER 0x04000000 - -#define SS_ONSTACK 1 -#define SS_DISABLE 2 - -#define MINSIGSTKSZ 2048 -#define SIGSTKSZ 8192 - -#include - -#ifndef __ASSEMBLY__ - -#ifdef __i386__ - -struct sigaction { - union { - __sighandler_t _sa_handler; - void (*_sa_sigaction)(int, struct siginfo *, void *); - } _u; - sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - -#define sa_handler _u._sa_handler -#define sa_sigaction _u._sa_sigaction - -#else - -struct sigaction { - __sighandler_t sa_handler; - unsigned long sa_flags; - __sigrestore_t sa_restorer; - sigset_t sa_mask; -}; - -struct k_sigaction { - struct sigaction sa; -}; - -#endif - -typedef struct sigaltstack { - void __user *ss_sp; - int ss_flags; - size_t ss_size; -} stack_t; - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/smp.h b/libc/kernel/arch-x86/asm/smp.h deleted file mode 100644 index 40d460133..000000000 --- a/libc/kernel/arch-x86/asm/smp.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "smp_64.h" diff --git a/libc/kernel/arch-x86/asm/smp_32.h b/libc/kernel/arch-x86/asm/smp_32.h deleted file mode 100644 index f093a240d..000000000 --- a/libc/kernel/arch-x86/asm/smp_32.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_SMP_H -#define __ASM_SMP_H - -#ifndef __ASSEMBLY__ -#include -#include -#include -#endif - -#define BAD_APICID 0xFFu - -#define safe_smp_processor_id() 0 -#define cpu_physical_id(cpu) boot_cpu_physical_apicid - -#define NO_PROC_ID 0xFF - -#ifndef __ASSEMBLY__ - -#define hard_smp_processor_id() 0 - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/socket.h b/libc/kernel/arch-x86/asm/socket.h deleted file mode 100644 index 27d243f14..000000000 --- a/libc/kernel/arch-x86/asm/socket.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_SOCKET_H -#define _ASM_SOCKET_H - -#include - -#define SOL_SOCKET 1 - -#define SO_DEBUG 1 -#define SO_REUSEADDR 2 -#define SO_TYPE 3 -#define SO_ERROR 4 -#define SO_DONTROUTE 5 -#define SO_BROADCAST 6 -#define SO_SNDBUF 7 -#define SO_RCVBUF 8 -#define SO_SNDBUFFORCE 32 -#define SO_RCVBUFFORCE 33 -#define SO_KEEPALIVE 9 -#define SO_OOBINLINE 10 -#define SO_NO_CHECK 11 -#define SO_PRIORITY 12 -#define SO_LINGER 13 -#define SO_BSDCOMPAT 14 - -#define SO_PASSCRED 16 -#define SO_PEERCRED 17 -#define SO_RCVLOWAT 18 -#define SO_SNDLOWAT 19 -#define SO_RCVTIMEO 20 -#define SO_SNDTIMEO 21 - -#define SO_SECURITY_AUTHENTICATION 22 -#define SO_SECURITY_ENCRYPTION_TRANSPORT 23 -#define SO_SECURITY_ENCRYPTION_NETWORK 24 - -#define SO_BINDTODEVICE 25 - -#define SO_ATTACH_FILTER 26 -#define SO_DETACH_FILTER 27 - -#define SO_PEERNAME 28 -#define SO_TIMESTAMP 29 -#define SCM_TIMESTAMP SO_TIMESTAMP - -#define SO_ACCEPTCONN 30 - -#define SO_PEERSEC 31 -#define SO_PASSSEC 34 -#define SO_TIMESTAMPNS 35 -#define SCM_TIMESTAMPNS SO_TIMESTAMPNS - -#endif diff --git a/libc/kernel/arch-x86/asm/sockios.h b/libc/kernel/arch-x86/asm/sockios.h deleted file mode 100644 index ebdfa98f4..000000000 --- a/libc/kernel/arch-x86/asm/sockios.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_SOCKIOS_H -#define _ASM_X86_SOCKIOS_H - -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 -#define SIOCGSTAMPNS 0x8907 - -#endif diff --git a/libc/kernel/arch-x86/asm/spinlock.h b/libc/kernel/arch-x86/asm/spinlock.h deleted file mode 100644 index 10d123aa7..000000000 --- a/libc/kernel/arch-x86/asm/spinlock.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "spinlock_64.h" diff --git a/libc/kernel/arch-x86/asm/spinlock_32.h b/libc/kernel/arch-x86/asm/spinlock_32.h deleted file mode 100644 index 171783e94..000000000 --- a/libc/kernel/arch-x86/asm/spinlock_32.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include -#include -#include -#include - -#define CLI_STRING "cli" -#define STI_STRING "sti" -#define CLI_STI_CLOBBERS -#define CLI_STI_INPUT_ARGS - -#define _raw_spin_relax(lock) cpu_relax() -#define _raw_read_relax(lock) cpu_relax() -#define _raw_write_relax(lock) cpu_relax() -#endif diff --git a/libc/kernel/arch-x86/asm/spinlock_types.h b/libc/kernel/arch-x86/asm/spinlock_types.h deleted file mode 100644 index ab914c4e8..000000000 --- a/libc/kernel/arch-x86/asm/spinlock_types.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_SPINLOCK_TYPES_H -#define __ASM_SPINLOCK_TYPES_H - -#ifndef __LINUX_SPINLOCK_TYPES_H -#error "please don't include this file directly" -#endif - -typedef struct { - unsigned int slock; -} raw_spinlock_t; - -#define __RAW_SPIN_LOCK_UNLOCKED { 1 } - -typedef struct { - unsigned int lock; -} raw_rwlock_t; - -#define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS } - -#endif diff --git a/libc/kernel/arch-x86/asm/stat.h b/libc/kernel/arch-x86/asm/stat.h deleted file mode 100644 index 837d716fa..000000000 --- a/libc/kernel/arch-x86/asm/stat.h +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_STAT_H -#define _ASM_X86_STAT_H - -#define STAT_HAVE_NSEC 1 - -#ifdef __i386__ -struct stat { - unsigned long st_dev; - unsigned long st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; - unsigned long st_rdev; - unsigned long st_size; - unsigned long st_blksize; - unsigned long st_blocks; - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; - unsigned long st_mtime_nsec; - unsigned long st_ctime; - unsigned long st_ctime_nsec; - unsigned long __unused4; - unsigned long __unused5; -}; - -#define STAT64_HAS_BROKEN_ST_INO 1 - -struct stat64 { - unsigned long long st_dev; - unsigned char __pad0[4]; - - unsigned long __st_ino; - - unsigned int st_mode; - unsigned int st_nlink; - - unsigned long st_uid; - unsigned long st_gid; - - unsigned long long st_rdev; - unsigned char __pad3[4]; - - long long st_size; - unsigned long st_blksize; - - unsigned long long st_blocks; - - unsigned long st_atime; - unsigned long st_atime_nsec; - - unsigned long st_mtime; - unsigned int st_mtime_nsec; - - unsigned long st_ctime; - unsigned long st_ctime_nsec; - - unsigned long long st_ino; -}; - -#else - -struct stat { - unsigned long st_dev; - unsigned long st_ino; - unsigned long st_nlink; - - unsigned int st_mode; - unsigned int st_uid; - unsigned int st_gid; - unsigned int __pad0; - unsigned long st_rdev; - long st_size; - long st_blksize; - long st_blocks; - - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; - unsigned long st_mtime_nsec; - unsigned long st_ctime; - unsigned long st_ctime_nsec; - long __unused[3]; -}; -#endif - -struct __old_kernel_stat { - unsigned short st_dev; - unsigned short st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; - unsigned short st_rdev; -#ifdef __i386__ - unsigned long st_size; - unsigned long st_atime; - unsigned long st_mtime; - unsigned long st_ctime; -#else - unsigned int st_size; - unsigned int st_atime; - unsigned int st_mtime; - unsigned int st_ctime; -#endif -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/statfs.h b/libc/kernel/arch-x86/asm/statfs.h deleted file mode 100644 index 592d864c5..000000000 --- a/libc/kernel/arch-x86/asm/statfs.h +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_STATFS_H -#define _ASM_X86_STATFS_H - -#ifdef __i386__ -#include -#else - -struct statfs { - long f_type; - long f_bsize; - long f_blocks; - long f_bfree; - long f_bavail; - long f_files; - long f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; - long f_frsize; - long f_spare[5]; -}; - -struct statfs64 { - long f_type; - long f_bsize; - long f_blocks; - long f_bfree; - long f_bavail; - long f_files; - long f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; - long f_frsize; - long f_spare[5]; -}; - -struct compat_statfs64 { - __u32 f_type; - __u32 f_bsize; - __u64 f_blocks; - __u64 f_bfree; - __u64 f_bavail; - __u64 f_files; - __u64 f_ffree; - __kernel_fsid_t f_fsid; - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -} __attribute__((packed)); - -#endif -#endif diff --git a/libc/kernel/arch-x86/asm/string.h b/libc/kernel/arch-x86/asm/string.h deleted file mode 100644 index 92fa29122..000000000 --- a/libc/kernel/arch-x86/asm/string.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "string_64.h" diff --git a/libc/kernel/arch-x86/asm/string_32.h b/libc/kernel/arch-x86/asm/string_32.h deleted file mode 100644 index 58a72d77f..000000000 --- a/libc/kernel/arch-x86/asm/string_32.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_STRING_H_ -#define _I386_STRING_H_ - -#endif diff --git a/libc/kernel/arch-x86/asm/swiotlb.h b/libc/kernel/arch-x86/asm/swiotlb.h deleted file mode 100644 index 5ee37b3aa..000000000 --- a/libc/kernel/arch-x86/asm/swiotlb.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_SWIOTLB_H -#define _ASM_SWIOTLB_H 1 - -#include - -#define swiotlb 0 - -#endif diff --git a/libc/kernel/arch-x86/asm/system.h b/libc/kernel/arch-x86/asm/system.h deleted file mode 100644 index 834193b3b..000000000 --- a/libc/kernel/arch-x86/asm/system.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "system_64.h" diff --git a/libc/kernel/arch-x86/asm/system_32.h b/libc/kernel/arch-x86/asm/system_32.h deleted file mode 100644 index d799ae648..000000000 --- a/libc/kernel/arch-x86/asm/system_32.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_SYSTEM_H -#define __ASM_SYSTEM_H - -#include -#include -#include -#include - -#define nop() __asm__ __volatile__ ("nop") -#define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2) -#define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2) -#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM) -#define read_barrier_depends() do { } while(0) -#define smp_mb() barrier() -#define smp_rmb() barrier() -#define smp_wmb() barrier() -#define smp_read_barrier_depends() do { } while(0) -#define set_mb(var, value) do { var = value; barrier(); } while (0) -#include -#define HAVE_DISABLE_HLT - -#endif diff --git a/libc/kernel/arch-x86/asm/termbits.h b/libc/kernel/arch-x86/asm/termbits.h deleted file mode 100644 index 6d7c5e8c1..000000000 --- a/libc/kernel/arch-x86/asm/termbits.h +++ /dev/null @@ -1,201 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_TERMBITS_H -#define _ASM_X86_TERMBITS_H - -#include - -typedef unsigned char cc_t; -typedef unsigned int speed_t; -typedef unsigned int tcflag_t; - -#define NCCS 19 -struct termios { - tcflag_t c_iflag; - tcflag_t c_oflag; - tcflag_t c_cflag; - tcflag_t c_lflag; - cc_t c_line; - cc_t c_cc[NCCS]; -}; - -struct termios2 { - tcflag_t c_iflag; - tcflag_t c_oflag; - tcflag_t c_cflag; - tcflag_t c_lflag; - cc_t c_line; - cc_t c_cc[NCCS]; - speed_t c_ispeed; - speed_t c_ospeed; -}; - -struct ktermios { - tcflag_t c_iflag; - tcflag_t c_oflag; - tcflag_t c_cflag; - tcflag_t c_lflag; - cc_t c_line; - cc_t c_cc[NCCS]; - speed_t c_ispeed; - speed_t c_ospeed; -}; - -#define VINTR 0 -#define VQUIT 1 -#define VERASE 2 -#define VKILL 3 -#define VEOF 4 -#define VTIME 5 -#define VMIN 6 -#define VSWTC 7 -#define VSTART 8 -#define VSTOP 9 -#define VSUSP 10 -#define VEOL 11 -#define VREPRINT 12 -#define VDISCARD 13 -#define VWERASE 14 -#define VLNEXT 15 -#define VEOL2 16 - -#define IGNBRK 0000001 -#define BRKINT 0000002 -#define IGNPAR 0000004 -#define PARMRK 0000010 -#define INPCK 0000020 -#define ISTRIP 0000040 -#define INLCR 0000100 -#define IGNCR 0000200 -#define ICRNL 0000400 -#define IUCLC 0001000 -#define IXON 0002000 -#define IXANY 0004000 -#define IXOFF 0010000 -#define IMAXBEL 0020000 -#define IUTF8 0040000 - -#define OPOST 0000001 -#define OLCUC 0000002 -#define ONLCR 0000004 -#define OCRNL 0000010 -#define ONOCR 0000020 -#define ONLRET 0000040 -#define OFILL 0000100 -#define OFDEL 0000200 -#define NLDLY 0000400 -#define NL0 0000000 -#define NL1 0000400 -#define CRDLY 0003000 -#define CR0 0000000 -#define CR1 0001000 -#define CR2 0002000 -#define CR3 0003000 -#define TABDLY 0014000 -#define TAB0 0000000 -#define TAB1 0004000 -#define TAB2 0010000 -#define TAB3 0014000 -#define XTABS 0014000 -#define BSDLY 0020000 -#define BS0 0000000 -#define BS1 0020000 -#define VTDLY 0040000 -#define VT0 0000000 -#define VT1 0040000 -#define FFDLY 0100000 -#define FF0 0000000 -#define FF1 0100000 - -#define CBAUD 0010017 -#define B0 0000000 -#define B50 0000001 -#define B75 0000002 -#define B110 0000003 -#define B134 0000004 -#define B150 0000005 -#define B200 0000006 -#define B300 0000007 -#define B600 0000010 -#define B1200 0000011 -#define B1800 0000012 -#define B2400 0000013 -#define B4800 0000014 -#define B9600 0000015 -#define B19200 0000016 -#define B38400 0000017 -#define EXTA B19200 -#define EXTB B38400 -#define CSIZE 0000060 -#define CS5 0000000 -#define CS6 0000020 -#define CS7 0000040 -#define CS8 0000060 -#define CSTOPB 0000100 -#define CREAD 0000200 -#define PARENB 0000400 -#define PARODD 0001000 -#define HUPCL 0002000 -#define CLOCAL 0004000 -#define CBAUDEX 0010000 -#define BOTHER 0010000 -#define B57600 0010001 -#define B115200 0010002 -#define B230400 0010003 -#define B460800 0010004 -#define B500000 0010005 -#define B576000 0010006 -#define B921600 0010007 -#define B1000000 0010010 -#define B1152000 0010011 -#define B1500000 0010012 -#define B2000000 0010013 -#define B2500000 0010014 -#define B3000000 0010015 -#define B3500000 0010016 -#define B4000000 0010017 -#define CIBAUD 002003600000 -#define CMSPAR 010000000000 -#define CRTSCTS 020000000000 - -#define IBSHIFT 16 - -#define ISIG 0000001 -#define ICANON 0000002 -#define XCASE 0000004 -#define ECHO 0000010 -#define ECHOE 0000020 -#define ECHOK 0000040 -#define ECHONL 0000100 -#define NOFLSH 0000200 -#define TOSTOP 0000400 -#define ECHOCTL 0001000 -#define ECHOPRT 0002000 -#define ECHOKE 0004000 -#define FLUSHO 0010000 -#define PENDIN 0040000 -#define IEXTEN 0100000 - -#define TCOOFF 0 -#define TCOON 1 -#define TCIOFF 2 -#define TCION 3 - -#define TCIFLUSH 0 -#define TCOFLUSH 1 -#define TCIOFLUSH 2 - -#define TCSANOW 0 -#define TCSADRAIN 1 -#define TCSAFLUSH 2 - -#endif diff --git a/libc/kernel/arch-x86/asm/termios.h b/libc/kernel/arch-x86/asm/termios.h deleted file mode 100644 index 4a38aeecd..000000000 --- a/libc/kernel/arch-x86/asm/termios.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_TERMIOS_H -#define _ASM_X86_TERMIOS_H - -#include -#include - -struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; -}; - -#define NCC 8 -struct termio { - unsigned short c_iflag; - unsigned short c_oflag; - unsigned short c_cflag; - unsigned short c_lflag; - unsigned char c_line; - unsigned char c_cc[NCC]; -}; - -#define TIOCM_LE 0x001 -#define TIOCM_DTR 0x002 -#define TIOCM_RTS 0x004 -#define TIOCM_ST 0x008 -#define TIOCM_SR 0x010 -#define TIOCM_CTS 0x020 -#define TIOCM_CAR 0x040 -#define TIOCM_RNG 0x080 -#define TIOCM_DSR 0x100 -#define TIOCM_CD TIOCM_CAR -#define TIOCM_RI TIOCM_RNG -#define TIOCM_OUT1 0x2000 -#define TIOCM_OUT2 0x4000 -#define TIOCM_LOOP 0x8000 - -#endif diff --git a/libc/kernel/arch-x86/asm/thread_info.h b/libc/kernel/arch-x86/asm/thread_info.h deleted file mode 100644 index ff46b08a8..000000000 --- a/libc/kernel/arch-x86/asm/thread_info.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "thread_info_64.h" diff --git a/libc/kernel/arch-x86/asm/thread_info_32.h b/libc/kernel/arch-x86/asm/thread_info_32.h deleted file mode 100644 index 5664ef80f..000000000 --- a/libc/kernel/arch-x86/asm/thread_info_32.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_THREAD_INFO_H -#define _ASM_THREAD_INFO_H - -#endif diff --git a/libc/kernel/arch-x86/asm/tlbflush.h b/libc/kernel/arch-x86/asm/tlbflush.h deleted file mode 100644 index fd6b22630..000000000 --- a/libc/kernel/arch-x86/asm/tlbflush.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "tlbflush_64.h" diff --git a/libc/kernel/arch-x86/asm/tlbflush_32.h b/libc/kernel/arch-x86/asm/tlbflush_32.h deleted file mode 100644 index 8ebff80ca..000000000 --- a/libc/kernel/arch-x86/asm/tlbflush_32.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_TLBFLUSH_H -#define _I386_TLBFLUSH_H - -#include -#include - -#define __flush_tlb() __native_flush_tlb() -#define __flush_tlb_global() __native_flush_tlb_global() -#define __flush_tlb_single(addr) __native_flush_tlb_single(addr) - -#define __native_flush_tlb() do { unsigned int tmpreg; __asm__ __volatile__( "movl %%cr3, %0; \n" "movl %0, %%cr3; # flush TLB \n" : "=r" (tmpreg) :: "memory"); } while (0) - -#define __native_flush_tlb_global() do { unsigned int tmpreg, cr4, cr4_orig; __asm__ __volatile__( "movl %%cr4, %2; # turn off PGE \n" "movl %2, %1; \n" "andl %3, %1; \n" "movl %1, %%cr4; \n" "movl %%cr3, %0; \n" "movl %0, %%cr3; # flush TLB \n" "movl %2, %%cr4; # turn PGE back on \n" : "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig) : "i" (~X86_CR4_PGE) : "memory"); } while (0) - -#define __native_flush_tlb_single(addr) __asm__ __volatile__("invlpg (%0)" ::"r" (addr) : "memory") - -#define __flush_tlb_all() do { if (cpu_has_pge) __flush_tlb_global(); else __flush_tlb(); } while (0) - -#define cpu_has_invlpg (boot_cpu_data.x86 > 3) - -#define __flush_tlb_one(addr) do { if (cpu_has_invlpg) __flush_tlb_single(addr); else __flush_tlb(); } while (0) - -#define TLB_FLUSH_ALL 0xffffffff - -#include - -#define flush_tlb() __flush_tlb() -#define flush_tlb_all() __flush_tlb_all() -#define local_flush_tlb() __flush_tlb() - -#define flush_tlb_others(mask, mm, va) native_flush_tlb_others(&mask, mm, va) -#endif diff --git a/libc/kernel/arch-x86/asm/tsc.h b/libc/kernel/arch-x86/asm/tsc.h deleted file mode 100644 index 2528cd172..000000000 --- a/libc/kernel/arch-x86/asm/tsc.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_TSC_H -#define _ASM_X86_TSC_H - -#include - -#define NS_SCALE 10 -#define US_SCALE 32 - -typedef unsigned long long cycles_t; - -#endif diff --git a/libc/kernel/arch-x86/asm/types.h b/libc/kernel/arch-x86/asm/types.h deleted file mode 100644 index 4af92b0cd..000000000 --- a/libc/kernel/arch-x86/asm/types.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_TYPES_H -#define _ASM_X86_TYPES_H - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#ifdef __i386__ -#ifdef __GNUC__ -__extension__ typedef __signed__ long long __s64; -__extension__ typedef unsigned long long __u64; -#endif -#else -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#endif - -#endif - -#endif diff --git a/libc/kernel/arch-x86/asm/uaccess.h b/libc/kernel/arch-x86/asm/uaccess.h deleted file mode 100644 index b2bec6995..000000000 --- a/libc/kernel/arch-x86/asm/uaccess.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include "uaccess_64.h" diff --git a/libc/kernel/arch-x86/asm/uaccess_32.h b/libc/kernel/arch-x86/asm/uaccess_32.h deleted file mode 100644 index 9827fc434..000000000 --- a/libc/kernel/arch-x86/asm/uaccess_32.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __i386_UACCESS_H -#define __i386_UACCESS_H - -#include -#include -#include -#include -#include - -#define VERIFY_READ 0 -#define VERIFY_WRITE 1 - -#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) - -#define KERNEL_DS MAKE_MM_SEG(0xFFFFFFFFUL) -#define USER_DS MAKE_MM_SEG(PAGE_OFFSET) - -#define get_ds() (KERNEL_DS) -#define get_fs() (current_thread_info()->addr_limit) -#define set_fs(x) (current_thread_info()->addr_limit = (x)) - -#define segment_eq(a,b) ((a).seg == (b).seg) - -#define __addr_ok(addr) ((unsigned long __force)(addr) < (current_thread_info()->addr_limit.seg)) - -#define __range_ok(addr,size) ({ unsigned long flag,roksum; __chk_user_ptr(addr); asm("addl %3,%1 ; sbbl %0,%0; cmpl %1,%4; sbbl $0,%0" :"=&r" (flag), "=r" (roksum) :"1" (addr),"g" ((int)(size)),"rm" (current_thread_info()->addr_limit.seg)); flag; }) - -#define access_ok(type,addr,size) (likely(__range_ok(addr,size) == 0)) - -struct exception_table_entry -{ - unsigned long insn, fixup; -}; - -#define __get_user_x(size,ret,x,ptr) __asm__ __volatile__("call __get_user_" #size :"=a" (ret),"=d" (x) :"0" (ptr)) - -#define get_user(x,ptr) ({ int __ret_gu; unsigned long __val_gu; __chk_user_ptr(ptr); switch(sizeof (*(ptr))) { case 1: __get_user_x(1,__ret_gu,__val_gu,ptr); break; case 2: __get_user_x(2,__ret_gu,__val_gu,ptr); break; case 4: __get_user_x(4,__ret_gu,__val_gu,ptr); break; default: __get_user_x(X,__ret_gu,__val_gu,ptr); break; } (x) = (__typeof__(*(ptr)))__val_gu; __ret_gu; }) - -#define __put_user_1(x, ptr) __asm__ __volatile__("call __put_user_1":"=a" (__ret_pu):"0" ((typeof(*(ptr)))(x)), "c" (ptr)) -#define __put_user_2(x, ptr) __asm__ __volatile__("call __put_user_2":"=a" (__ret_pu):"0" ((typeof(*(ptr)))(x)), "c" (ptr)) -#define __put_user_4(x, ptr) __asm__ __volatile__("call __put_user_4":"=a" (__ret_pu):"0" ((typeof(*(ptr)))(x)), "c" (ptr)) -#define __put_user_8(x, ptr) __asm__ __volatile__("call __put_user_8":"=a" (__ret_pu):"A" ((typeof(*(ptr)))(x)), "c" (ptr)) -#define __put_user_X(x, ptr) __asm__ __volatile__("call __put_user_X":"=a" (__ret_pu):"c" (ptr)) - -#define put_user(x,ptr) ({ int __ret_pu; __typeof__(*(ptr)) __pus_tmp = x; __ret_pu=0; if(unlikely(__copy_to_user_ll(ptr, &__pus_tmp, sizeof(*(ptr))) != 0)) __ret_pu=-EFAULT; __ret_pu; }) - -#define __get_user(x,ptr) __get_user_nocheck((x),(ptr),sizeof(*(ptr))) - -#define __put_user(x,ptr) __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) - -#define __put_user_nocheck(x,ptr,size) ({ long __pu_err; __put_user_size((x),(ptr),(size),__pu_err,-EFAULT); __pu_err; }) - -#define __put_user_u64(x, addr, err) __asm__ __volatile__( "1: movl %%eax,0(%2)\n" "2: movl %%edx,4(%2)\n" "3:\n" ".section .fixup,\"ax\"\n" "4: movl %3,%0\n" " jmp 3b\n" ".previous\n" ".section __ex_table,\"a\"\n" " .align 4\n" " .long 1b,4b\n" " .long 2b,4b\n" ".previous" : "=r"(err) : "A" (x), "r" (addr), "i"(-EFAULT), "0"(err)) - -#define __put_user_size(x,ptr,size,retval,errret) do { __typeof__(*(ptr)) __pus_tmp = x; retval = 0; if(unlikely(__copy_to_user_ll(ptr, &__pus_tmp, size) != 0)) retval = errret; } while (0) - -struct __large_struct { unsigned long buf[100]; }; -#define __m(x) (*(struct __large_struct __user *)(x)) - -#define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) __asm__ __volatile__( "1: mov"itype" %"rtype"1,%2\n" "2:\n" ".section .fixup,\"ax\"\n" "3: movl %3,%0\n" " jmp 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" " .align 4\n" " .long 1b,3b\n" ".previous" : "=r"(err) : ltype (x), "m"(__m(addr)), "i"(errret), "0"(err)) - -#define __get_user_nocheck(x,ptr,size) ({ long __gu_err; unsigned long __gu_val; __get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT); (x) = (__typeof__(*(ptr)))__gu_val; __gu_err; }) - -#define __get_user_size(x,ptr,size,retval,errret) do { retval = 0; __chk_user_ptr(ptr); switch (size) { case 1: __get_user_asm(x,ptr,retval,"b","b","=q",errret);break; case 2: __get_user_asm(x,ptr,retval,"w","w","=r",errret);break; case 4: __get_user_asm(x,ptr,retval,"l","","=r",errret);break; default: (x) = __get_user_bad(); } } while (0) - -#define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) __asm__ __volatile__( "1: mov"itype" %2,%"rtype"1\n" "2:\n" ".section .fixup,\"ax\"\n" "3: movl %3,%0\n" " xor"itype" %"rtype"1,%"rtype"1\n" " jmp 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" " .align 4\n" " .long 1b,3b\n" ".previous" : "=r"(err), ltype (x) : "m"(__m(addr)), "i"(errret), "0"(err)) - -#define ARCH_HAS_NOCACHE_UACCESS - -#define strlen_user(str) strnlen_user(str, LONG_MAX) - -#endif diff --git a/libc/kernel/arch-x86/asm/unaligned.h b/libc/kernel/arch-x86/asm/unaligned.h deleted file mode 100644 index ce7a8a772..000000000 --- a/libc/kernel/arch-x86/asm/unaligned.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_UNALIGNED_H -#define _ASM_X86_UNALIGNED_H - -#define get_unaligned(ptr) (*(ptr)) - -#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) )) - -#endif diff --git a/libc/kernel/arch-x86/asm/unistd.h b/libc/kernel/arch-x86/asm/unistd.h deleted file mode 100644 index 769f83618..000000000 --- a/libc/kernel/arch-x86/asm/unistd.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifdef __i386__ -#include "unistd_32.h" -#else -#include "unistd_64.h" -#endif diff --git a/libc/kernel/arch-x86/asm/unistd_32.h b/libc/kernel/arch-x86/asm/unistd_32.h deleted file mode 100644 index b3d8b19b5..000000000 --- a/libc/kernel/arch-x86/asm/unistd_32.h +++ /dev/null @@ -1,341 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_I386_UNISTD_H_ -#define _ASM_I386_UNISTD_H_ - -#define __NR_restart_syscall 0 -#define __NR_exit 1 -#define __NR_fork 2 -#define __NR_read 3 -#define __NR_write 4 -#define __NR_open 5 -#define __NR_close 6 -#define __NR_waitpid 7 -#define __NR_creat 8 -#define __NR_link 9 -#define __NR_unlink 10 -#define __NR_execve 11 -#define __NR_chdir 12 -#define __NR_time 13 -#define __NR_mknod 14 -#define __NR_chmod 15 -#define __NR_lchown 16 -#define __NR_break 17 -#define __NR_oldstat 18 -#define __NR_lseek 19 -#define __NR_getpid 20 -#define __NR_mount 21 -#define __NR_umount 22 -#define __NR_setuid 23 -#define __NR_getuid 24 -#define __NR_stime 25 -#define __NR_ptrace 26 -#define __NR_alarm 27 -#define __NR_oldfstat 28 -#define __NR_pause 29 -#define __NR_utime 30 -#define __NR_stty 31 -#define __NR_gtty 32 -#define __NR_access 33 -#define __NR_nice 34 -#define __NR_ftime 35 -#define __NR_sync 36 -#define __NR_kill 37 -#define __NR_rename 38 -#define __NR_mkdir 39 -#define __NR_rmdir 40 -#define __NR_dup 41 -#define __NR_pipe 42 -#define __NR_times 43 -#define __NR_prof 44 -#define __NR_brk 45 -#define __NR_setgid 46 -#define __NR_getgid 47 -#define __NR_signal 48 -#define __NR_geteuid 49 -#define __NR_getegid 50 -#define __NR_acct 51 -#define __NR_umount2 52 -#define __NR_lock 53 -#define __NR_ioctl 54 -#define __NR_fcntl 55 -#define __NR_mpx 56 -#define __NR_setpgid 57 -#define __NR_ulimit 58 -#define __NR_oldolduname 59 -#define __NR_umask 60 -#define __NR_chroot 61 -#define __NR_ustat 62 -#define __NR_dup2 63 -#define __NR_getppid 64 -#define __NR_getpgrp 65 -#define __NR_setsid 66 -#define __NR_sigaction 67 -#define __NR_sgetmask 68 -#define __NR_ssetmask 69 -#define __NR_setreuid 70 -#define __NR_setregid 71 -#define __NR_sigsuspend 72 -#define __NR_sigpending 73 -#define __NR_sethostname 74 -#define __NR_setrlimit 75 -#define __NR_getrlimit 76 -#define __NR_getrusage 77 -#define __NR_gettimeofday 78 -#define __NR_settimeofday 79 -#define __NR_getgroups 80 -#define __NR_setgroups 81 -#define __NR_select 82 -#define __NR_symlink 83 -#define __NR_oldlstat 84 -#define __NR_readlink 85 -#define __NR_uselib 86 -#define __NR_swapon 87 -#define __NR_reboot 88 -#define __NR_readdir 89 -#define __NR_mmap 90 -#define __NR_munmap 91 -#define __NR_truncate 92 -#define __NR_ftruncate 93 -#define __NR_fchmod 94 -#define __NR_fchown 95 -#define __NR_getpriority 96 -#define __NR_setpriority 97 -#define __NR_profil 98 -#define __NR_statfs 99 -#define __NR_fstatfs 100 -#define __NR_ioperm 101 -#define __NR_socketcall 102 -#define __NR_syslog 103 -#define __NR_setitimer 104 -#define __NR_getitimer 105 -#define __NR_stat 106 -#define __NR_lstat 107 -#define __NR_fstat 108 -#define __NR_olduname 109 -#define __NR_iopl 110 -#define __NR_vhangup 111 -#define __NR_idle 112 -#define __NR_vm86old 113 -#define __NR_wait4 114 -#define __NR_swapoff 115 -#define __NR_sysinfo 116 -#define __NR_ipc 117 -#define __NR_fsync 118 -#define __NR_sigreturn 119 -#define __NR_clone 120 -#define __NR_setdomainname 121 -#define __NR_uname 122 -#define __NR_modify_ldt 123 -#define __NR_adjtimex 124 -#define __NR_mprotect 125 -#define __NR_sigprocmask 126 -#define __NR_create_module 127 -#define __NR_init_module 128 -#define __NR_delete_module 129 -#define __NR_get_kernel_syms 130 -#define __NR_quotactl 131 -#define __NR_getpgid 132 -#define __NR_fchdir 133 -#define __NR_bdflush 134 -#define __NR_sysfs 135 -#define __NR_personality 136 -#define __NR_afs_syscall 137 -#define __NR_setfsuid 138 -#define __NR_setfsgid 139 -#define __NR__llseek 140 -#define __NR_getdents 141 -#define __NR__newselect 142 -#define __NR_flock 143 -#define __NR_msync 144 -#define __NR_readv 145 -#define __NR_writev 146 -#define __NR_getsid 147 -#define __NR_fdatasync 148 -#define __NR__sysctl 149 -#define __NR_mlock 150 -#define __NR_munlock 151 -#define __NR_mlockall 152 -#define __NR_munlockall 153 -#define __NR_sched_setparam 154 -#define __NR_sched_getparam 155 -#define __NR_sched_setscheduler 156 -#define __NR_sched_getscheduler 157 -#define __NR_sched_yield 158 -#define __NR_sched_get_priority_max 159 -#define __NR_sched_get_priority_min 160 -#define __NR_sched_rr_get_interval 161 -#define __NR_nanosleep 162 -#define __NR_mremap 163 -#define __NR_setresuid 164 -#define __NR_getresuid 165 -#define __NR_vm86 166 -#define __NR_query_module 167 -#define __NR_poll 168 -#define __NR_nfsservctl 169 -#define __NR_setresgid 170 -#define __NR_getresgid 171 -#define __NR_prctl 172 -#define __NR_rt_sigreturn 173 -#define __NR_rt_sigaction 174 -#define __NR_rt_sigprocmask 175 -#define __NR_rt_sigpending 176 -#define __NR_rt_sigtimedwait 177 -#define __NR_rt_sigqueueinfo 178 -#define __NR_rt_sigsuspend 179 -#define __NR_pread64 180 -#define __NR_pwrite64 181 -#define __NR_chown 182 -#define __NR_getcwd 183 -#define __NR_capget 184 -#define __NR_capset 185 -#define __NR_sigaltstack 186 -#define __NR_sendfile 187 -#define __NR_getpmsg 188 -#define __NR_putpmsg 189 -#define __NR_vfork 190 -#define __NR_ugetrlimit 191 -#define __NR_mmap2 192 -#define __NR_truncate64 193 -#define __NR_ftruncate64 194 -#define __NR_stat64 195 -#define __NR_lstat64 196 -#define __NR_fstat64 197 -#define __NR_lchown32 198 -#define __NR_getuid32 199 -#define __NR_getgid32 200 -#define __NR_geteuid32 201 -#define __NR_getegid32 202 -#define __NR_setreuid32 203 -#define __NR_setregid32 204 -#define __NR_getgroups32 205 -#define __NR_setgroups32 206 -#define __NR_fchown32 207 -#define __NR_setresuid32 208 -#define __NR_getresuid32 209 -#define __NR_setresgid32 210 -#define __NR_getresgid32 211 -#define __NR_chown32 212 -#define __NR_setuid32 213 -#define __NR_setgid32 214 -#define __NR_setfsuid32 215 -#define __NR_setfsgid32 216 -#define __NR_pivot_root 217 -#define __NR_mincore 218 -#define __NR_madvise 219 -#define __NR_madvise1 219 -#define __NR_getdents64 220 -#define __NR_fcntl64 221 - -#define __NR_gettid 224 -#define __NR_readahead 225 -#define __NR_setxattr 226 -#define __NR_lsetxattr 227 -#define __NR_fsetxattr 228 -#define __NR_getxattr 229 -#define __NR_lgetxattr 230 -#define __NR_fgetxattr 231 -#define __NR_listxattr 232 -#define __NR_llistxattr 233 -#define __NR_flistxattr 234 -#define __NR_removexattr 235 -#define __NR_lremovexattr 236 -#define __NR_fremovexattr 237 -#define __NR_tkill 238 -#define __NR_sendfile64 239 -#define __NR_futex 240 -#define __NR_sched_setaffinity 241 -#define __NR_sched_getaffinity 242 -#define __NR_set_thread_area 243 -#define __NR_get_thread_area 244 -#define __NR_io_setup 245 -#define __NR_io_destroy 246 -#define __NR_io_getevents 247 -#define __NR_io_submit 248 -#define __NR_io_cancel 249 -#define __NR_fadvise64 250 - -#define __NR_exit_group 252 -#define __NR_lookup_dcookie 253 -#define __NR_epoll_create 254 -#define __NR_epoll_ctl 255 -#define __NR_epoll_wait 256 -#define __NR_remap_file_pages 257 -#define __NR_set_tid_address 258 -#define __NR_timer_create 259 -#define __NR_timer_settime (__NR_timer_create+1) -#define __NR_timer_gettime (__NR_timer_create+2) -#define __NR_timer_getoverrun (__NR_timer_create+3) -#define __NR_timer_delete (__NR_timer_create+4) -#define __NR_clock_settime (__NR_timer_create+5) -#define __NR_clock_gettime (__NR_timer_create+6) -#define __NR_clock_getres (__NR_timer_create+7) -#define __NR_clock_nanosleep (__NR_timer_create+8) -#define __NR_statfs64 268 -#define __NR_fstatfs64 269 -#define __NR_tgkill 270 -#define __NR_utimes 271 -#define __NR_fadvise64_64 272 -#define __NR_vserver 273 -#define __NR_mbind 274 -#define __NR_get_mempolicy 275 -#define __NR_set_mempolicy 276 -#define __NR_mq_open 277 -#define __NR_mq_unlink (__NR_mq_open+1) -#define __NR_mq_timedsend (__NR_mq_open+2) -#define __NR_mq_timedreceive (__NR_mq_open+3) -#define __NR_mq_notify (__NR_mq_open+4) -#define __NR_mq_getsetattr (__NR_mq_open+5) -#define __NR_kexec_load 283 -#define __NR_waitid 284 - -#define __NR_add_key 286 -#define __NR_request_key 287 -#define __NR_keyctl 288 -#define __NR_ioprio_set 289 -#define __NR_ioprio_get 290 -#define __NR_inotify_init 291 -#define __NR_inotify_add_watch 292 -#define __NR_inotify_rm_watch 293 -#define __NR_migrate_pages 294 -#define __NR_openat 295 -#define __NR_mkdirat 296 -#define __NR_mknodat 297 -#define __NR_fchownat 298 -#define __NR_futimesat 299 -#define __NR_fstatat64 300 -#define __NR_unlinkat 301 -#define __NR_renameat 302 -#define __NR_linkat 303 -#define __NR_symlinkat 304 -#define __NR_readlinkat 305 -#define __NR_fchmodat 306 -#define __NR_faccessat 307 -#define __NR_pselect6 308 -#define __NR_ppoll 309 -#define __NR_unshare 310 -#define __NR_set_robust_list 311 -#define __NR_get_robust_list 312 -#define __NR_splice 313 -#define __NR_sync_file_range 314 -#define __NR_tee 315 -#define __NR_vmsplice 316 -#define __NR_move_pages 317 -#define __NR_getcpu 318 -#define __NR_epoll_pwait 319 -#define __NR_utimensat 320 -#define __NR_signalfd 321 -#define __NR_timerfd 322 -#define __NR_eventfd 323 -#define __NR_fallocate 324 - -#endif diff --git a/libc/kernel/arch-x86/asm/user.h b/libc/kernel/arch-x86/asm/user.h deleted file mode 100644 index 980b0aaad..000000000 --- a/libc/kernel/arch-x86/asm/user.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifdef __i386__ -#include "user_32.h" -#else -#include "user_64.h" -#endif diff --git a/libc/kernel/arch-x86/asm/user32.h b/libc/kernel/arch-x86/asm/user32.h deleted file mode 100644 index 89eabb183..000000000 --- a/libc/kernel/arch-x86/asm/user32.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef USER32_H -#define USER32_H 1 - -struct user_i387_ia32_struct { - u32 cwd; - u32 swd; - u32 twd; - u32 fip; - u32 fcs; - u32 foo; - u32 fos; - u32 st_space[20]; -}; - -struct user32_fxsr_struct { - unsigned short cwd; - unsigned short swd; - unsigned short twd; - unsigned short fop; - int fip; - int fcs; - int foo; - int fos; - int mxcsr; - int reserved; - int st_space[32]; - int xmm_space[32]; - int padding[56]; -}; - -struct user_regs_struct32 { - __u32 ebx, ecx, edx, esi, edi, ebp, eax; - unsigned short ds, __ds, es, __es; - unsigned short fs, __fs, gs, __gs; - __u32 orig_eax, eip; - unsigned short cs, __cs; - __u32 eflags, esp; - unsigned short ss, __ss; -}; - -struct user32 { - struct user_regs_struct32 regs; - int u_fpvalid; - - struct user_i387_ia32_struct i387; - - __u32 u_tsize; - __u32 u_dsize; - __u32 u_ssize; - __u32 start_code; - __u32 start_stack; - __u32 signal; - int reserved; - __u32 u_ar0; - - __u32 u_fpstate; - __u32 magic; - char u_comm[32]; - int u_debugreg[8]; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/user_32.h b/libc/kernel/arch-x86/asm/user_32.h deleted file mode 100644 index 8e0296c97..000000000 --- a/libc/kernel/arch-x86/asm/user_32.h +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _I386_USER_H -#define _I386_USER_H - -#include - -struct user_i387_struct { - long cwd; - long swd; - long twd; - long fip; - long fcs; - long foo; - long fos; - long st_space[20]; -}; - -struct user_fxsr_struct { - unsigned short cwd; - unsigned short swd; - unsigned short twd; - unsigned short fop; - long fip; - long fcs; - long foo; - long fos; - long mxcsr; - long reserved; - long st_space[32]; - long xmm_space[32]; - long padding[56]; -}; - -struct user_regs_struct { - long ebx, ecx, edx, esi, edi, ebp, eax; - unsigned short ds, __ds, es, __es; - unsigned short fs, __fs, gs, __gs; - long orig_eax, eip; - unsigned short cs, __cs; - long eflags, esp; - unsigned short ss, __ss; -}; - -struct user{ - - struct user_regs_struct regs; - - int u_fpvalid; - - struct user_i387_struct i387; - - unsigned long int u_tsize; - unsigned long int u_dsize; - unsigned long int u_ssize; - unsigned long start_code; - unsigned long start_stack; - long int signal; - int reserved; - struct user_pt_regs * u_ar0; - - struct user_i387_struct* u_fpstate; - unsigned long magic; - char u_comm[32]; - int u_debugreg[8]; -}; -#define NBPG PAGE_SIZE -#define UPAGES 1 -#define HOST_TEXT_START_ADDR (u.start_code) -#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) - -#endif diff --git a/libc/kernel/arch-x86/asm/vm86.h b/libc/kernel/arch-x86/asm/vm86.h deleted file mode 100644 index d0e71f13c..000000000 --- a/libc/kernel/arch-x86/asm/vm86.h +++ /dev/null @@ -1,113 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_VM86_H -#define _LINUX_VM86_H - -#define TF_MASK 0x00000100 -#define IF_MASK 0x00000200 -#define IOPL_MASK 0x00003000 -#define NT_MASK 0x00004000 -#define VM_MASK 0 -#define AC_MASK 0x00040000 -#define VIF_MASK 0x00080000 -#define VIP_MASK 0x00100000 -#define ID_MASK 0x00200000 - -#define BIOSSEG 0x0f000 - -#define CPU_086 0 -#define CPU_186 1 -#define CPU_286 2 -#define CPU_386 3 -#define CPU_486 4 -#define CPU_586 5 - -#define VM86_TYPE(retval) ((retval) & 0xff) -#define VM86_ARG(retval) ((retval) >> 8) - -#define VM86_SIGNAL 0 -#define VM86_UNKNOWN 1 -#define VM86_INTx 2 -#define VM86_STI 3 - -#define VM86_PICRETURN 4 -#define VM86_TRAP 6 - -#define VM86_PLUS_INSTALL_CHECK 0 -#define VM86_ENTER 1 -#define VM86_ENTER_NO_BYPASS 2 -#define VM86_REQUEST_IRQ 3 -#define VM86_FREE_IRQ 4 -#define VM86_GET_IRQ_BITS 5 -#define VM86_GET_AND_RESET_IRQ 6 - -struct vm86_regs { - - long ebx; - long ecx; - long edx; - long esi; - long edi; - long ebp; - long eax; - long __null_ds; - long __null_es; - long __null_fs; - long __null_gs; - long orig_eax; - long eip; - unsigned short cs, __csh; - long eflags; - long esp; - unsigned short ss, __ssh; - - unsigned short es, __esh; - unsigned short ds, __dsh; - unsigned short fs, __fsh; - unsigned short gs, __gsh; -}; - -struct revectored_struct { - unsigned long __map[8]; -}; - -struct vm86_struct { - struct vm86_regs regs; - unsigned long flags; - unsigned long screen_bitmap; - unsigned long cpu_type; - struct revectored_struct int_revectored; - struct revectored_struct int21_revectored; -}; - -#define VM86_SCREEN_BITMAP 0x0001 - -struct vm86plus_info_struct { - unsigned long force_return_for_pic:1; - unsigned long vm86dbg_active:1; - unsigned long vm86dbg_TFpendig:1; - unsigned long unused:28; - unsigned long is_vm86pus:1; - unsigned char vm86dbg_intxxtab[32]; -}; - -struct vm86plus_struct { - struct vm86_regs regs; - unsigned long flags; - unsigned long screen_bitmap; - unsigned long cpu_type; - struct revectored_struct int_revectored; - struct revectored_struct int21_revectored; - struct vm86plus_info_struct vm86plus; -}; - -#endif diff --git a/libc/kernel/arch-x86/asm/voyager.h b/libc/kernel/arch-x86/asm/voyager.h deleted file mode 100644 index c6f50a98d..000000000 --- a/libc/kernel/arch-x86/asm/voyager.h +++ /dev/null @@ -1,437 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#undef VOYAGER_DEBUG -#undef VOYAGER_CAT_DEBUG - -#ifdef VOYAGER_DEBUG -#define VDEBUG(x) printk x -#else -#define VDEBUG(x) -#endif - -#define VOYAGER_LEVEL5_AND_ABOVE 0x3435 -#define VOYAGER_LEVEL4 0x3360 - -#define VOYAGER_DINO 0x43 - -#define VOYAGER_MC_SETUP 0x96 - -#define VOYAGER_CAT_CONFIG_PORT 0x97 -#define VOYAGER_CAT_DESELECT 0xff -#define VOYAGER_SSPB_RELOCATION_PORT 0x98 - -#define VOYAGER_CAT_IRCYC 0x01 - -#define VOYAGER_CAT_DRCYC 0x02 - -#define VOYAGER_CAT_RUN 0x0F - -#define VOYAGER_CAT_END 0x80 - -#define VOYAGER_CAT_HOLD 0x90 - -#define VOYAGER_CAT_STEP 0xE0 - -#define VOYAGER_CAT_CLEMSON 0xFF - -#define VOYAGER_CAT_HEADER 0x7F - -#define VOYAGER_MIN_MODULE 0x10 -#define VOYAGER_MAX_MODULE 0x1f - -#define VOYAGER_ASIC_ID_REG 0x00 -#define VOYAGER_ASIC_TYPE_REG 0x01 - -#define VOYAGER_AUTO_INC_REG 0x02 -#define VOYAGER_AUTO_INC 0x04 -#define VOYAGER_NO_AUTO_INC 0xfb -#define VOYAGER_SUBADDRDATA 0x03 -#define VOYAGER_SCANPATH 0x05 -#define VOYAGER_CONNECT_ASIC 0x01 -#define VOYAGER_DISCONNECT_ASIC 0xfe -#define VOYAGER_SUBADDRLO 0x06 -#define VOYAGER_SUBADDRHI 0x07 -#define VOYAGER_SUBMODSELECT 0x08 -#define VOYAGER_SUBMODPRESENT 0x09 - -#define VOYAGER_SUBADDR_LO 0xff -#define VOYAGER_SUBADDR_HI 0xffff - -#define VOYAGER_MAX_SCAN_PATH 0x100 - -#define VOYAGER_MAX_REG_SIZE 4 - -#define VOYAGER_MAX_MODULES 16 - -#define VOYAGER_MAX_ASICS_PER_MODULE 7 - -#define VOYAGER_CAT_ID 0 -#define VOYAGER_PSI 0x1a - -#define VOYAGER_READ_CONFIG 0x1 -#define VOYAGER_WRITE_CONFIG 0x2 -#define VOYAGER_BYPASS 0xff - -typedef struct voyager_asic -{ - __u8 asic_addr; - __u8 asic_type; - __u8 asic_id; - __u8 jtag_id[4]; - __u8 asic_location; - __u8 bit_location; - __u8 ireg_length; - __u16 subaddr; - struct voyager_asic *next; -} voyager_asic_t; - -typedef struct voyager_module { - __u8 module_addr; - __u8 scan_path_connected; - __u16 ee_size; - __u16 num_asics; - __u16 inst_bits; - __u16 largest_reg; - __u16 smallest_reg; - voyager_asic_t *asic; - struct voyager_module *submodule; - struct voyager_module *next; -} voyager_module_t; - -typedef struct voyager_eeprom_hdr { - __u8 module_id[4]; - __u8 version_id; - __u8 config_id; - __u16 boundry_id; - __u16 ee_size; - __u8 assembly[11]; - __u8 assembly_rev; - __u8 tracer[4]; - __u16 assembly_cksum; - __u16 power_consump; - __u16 num_asics; - __u16 bist_time; - __u16 err_log_offset; - __u16 scan_path_offset; - __u16 cct_offset; - __u16 log_length; - __u16 xsum_end; - __u8 reserved[4]; - __u8 sflag; - __u8 part_number[13]; - __u8 version[10]; - __u8 signature[8]; - __u16 eeprom_chksum; - __u32 data_stamp_offset; - __u8 eflag ; -} __attribute__((packed)) voyager_eprom_hdr_t; - -#define VOYAGER_EPROM_SIZE_OFFSET ((__u16)(&(((voyager_eprom_hdr_t *)0)->ee_size))) -#define VOYAGER_XSUM_END_OFFSET 0x2a - -typedef struct voyager_sp_table { - __u8 asic_id; - __u8 bypass_flag; - __u16 asic_data_offset; - __u16 config_data_offset; -} __attribute__((packed)) voyager_sp_table_t; - -typedef struct voyager_jtag_table { - __u8 icode[4]; - __u8 runbist[4]; - __u8 intest[4]; - __u8 samp_preld[4]; - __u8 ireg_len; -} __attribute__((packed)) voyager_jtt_t; - -typedef struct voyager_asic_data_table { - __u8 jtag_id[4]; - __u16 length_bsr; - __u16 length_bist_reg; - __u32 bist_clk; - __u16 subaddr_bits; - __u16 seed_bits; - __u16 sig_bits; - __u16 jtag_offset; -} __attribute__((packed)) voyager_at_t; - -#define VOYAGER_WCBIC0 0x41 -#define VOYAGER_WCBIC1 0x49 -#define VOYAGER_WCBIC2 0x51 -#define VOYAGER_WCBIC3 0x59 -#define VOYAGER_WCBIC4 0x61 -#define VOYAGER_WCBIC5 0x69 -#define VOYAGER_WCBIC6 0x71 -#define VOYAGER_WCBIC7 0x79 - -#define VOYAGER_WCBIC_TOM_L 0x4 -#define VOYAGER_WCBIC_TOM_H 0x5 - -#define VOYAGER_VMC1 0x81 -#define VOYAGER_VMC2 0x91 -#define VOYAGER_VMC3 0xa1 -#define VOYAGER_VMC4 0xb1 - -#define VOYAGER_VMC_MEMORY_SETUP 0x9 -#define VMC_Interleaving 0x01 -#define VMC_4Way 0x02 -#define VMC_EvenCacheLines 0x04 -#define VMC_HighLine 0x08 -#define VMC_Start0_Enable 0x20 -#define VMC_Start1_Enable 0x40 -#define VMC_Vremap 0x80 -#define VOYAGER_VMC_BANK_DENSITY 0xa -#define VMC_BANK_EMPTY 0 -#define VMC_BANK_4MB 1 -#define VMC_BANK_16MB 2 -#define VMC_BANK_64MB 3 -#define VMC_BANK0_MASK 0x03 -#define VMC_BANK1_MASK 0x0C -#define VMC_BANK2_MASK 0x30 -#define VMC_BANK3_MASK 0xC0 - -#define VOYAGER_MMC_ASIC_ID 1 - -#define VOYAGER_MMC_MEMORY0_MODULE 0x14 -#define VOYAGER_MMC_MEMORY1_MODULE 0x15 - -#define VOYAGER_MMA_ASIC_ID 2 - -#define VOYAGER_QUAD_BASEBOARD 1 - -#define VOYAGER_QUAD_QDATA0 1 -#define VOYAGER_QUAD_QDATA1 2 -#define VOYAGER_QUAD_QABC 3 - -#define VOYAGER_PROCESSOR_PRESENT_MASK 0x88a -#define VOYAGER_MEMORY_CLICKMAP 0xa23 -#define VOYAGER_DUMP_LOCATION 0xb1a - -#define VOYAGER_SUS_IN_CONTROL_PORT 0x3ff -#define VOYAGER_IN_CONTROL_FLAG 0x80 - -#define VOYAGER_PSI_STATUS_REG 0x08 -#define PSI_DC_FAIL 0x01 -#define PSI_MON 0x02 -#define PSI_FAULT 0x04 -#define PSI_ALARM 0x08 -#define PSI_CURRENT 0x10 -#define PSI_DVM 0x20 -#define PSI_PSCFAULT 0x40 -#define PSI_STAT_CHG 0x80 - -#define VOYAGER_PSI_SUPPLY_REG 0x8000 - -#define PSI_FAIL_DC 0x01 -#define PSI_FAIL_AC 0x02 -#define PSI_MON_INT 0x04 -#define PSI_SWITCH_OFF 0x08 -#define PSI_HX_OFF 0x10 -#define PSI_SECURITY 0x20 -#define PSI_CMOS_BATT_LOW 0x40 -#define PSI_CMOS_BATT_FAIL 0x80 - -#define PSI_CLR_SWITCH_OFF 0x13 -#define PSI_CLR_HX_OFF 0x14 -#define PSI_CLR_CMOS_BATT_FAIL 0x17 - -#define VOYAGER_PSI_MASK 0x8001 -#define PSI_MASK_MASK 0x10 - -#define VOYAGER_PSI_AC_FAIL_REG 0x8004 -#define AC_FAIL_STAT_CHANGE 0x80 - -#define VOYAGER_PSI_GENERAL_REG 0x8007 - -#define PSI_SWITCH_ON 0x01 -#define PSI_SWITCH_ENABLED 0x02 -#define PSI_ALARM_ENABLED 0x08 -#define PSI_SECURE_ENABLED 0x10 -#define PSI_COLD_RESET 0x20 -#define PSI_COLD_START 0x80 - -#define PSI_POWER_DOWN 0x10 -#define PSI_SWITCH_DISABLE 0x01 -#define PSI_SWITCH_ENABLE 0x11 -#define PSI_CLEAR 0x12 -#define PSI_ALARM_DISABLE 0x03 -#define PSI_ALARM_ENABLE 0x13 -#define PSI_CLEAR_COLD_RESET 0x05 -#define PSI_SET_COLD_RESET 0x15 -#define PSI_CLEAR_COLD_START 0x07 -#define PSI_SET_COLD_START 0x17 - -struct voyager_bios_info { - __u8 len; - __u8 major; - __u8 minor; - __u8 debug; - __u8 num_classes; - __u8 class_1; - __u8 class_2; -}; - -#define NUMBER_OF_MC_BUSSES 2 -#define SLOTS_PER_MC_BUS 8 -#define MAX_CPUS 16 -#define MAX_PROCESSOR_BOARDS 4 -#define MAX_CACHE_LEVELS 4 -#define MAX_SHARED_CPUS 4 -#define NUMBER_OF_POS_REGS 8 - -typedef struct { - __u8 MC_Slot; - __u8 POS_Values[NUMBER_OF_POS_REGS]; -} __attribute__((packed)) MC_SlotInformation_t; - -struct QuadDescription { - __u8 Type; - __u8 StructureVersion; - __u32 CPI_BaseAddress; - __u32 LARC_BankSize; - __u32 LocalMemoryStateBits; - __u8 Slot; -} __attribute__((packed)); - -struct ProcBoardInfo { - __u8 Type; - __u8 StructureVersion; - __u8 NumberOfBoards; - struct QuadDescription QuadData[MAX_PROCESSOR_BOARDS]; -} __attribute__((packed)); - -struct CacheDescription { - __u8 Level; - __u32 TotalSize; - __u16 LineSize; - __u8 Associativity; - __u8 CacheType; - __u8 WriteType; - __u8 Number_CPUs_SharedBy; - __u8 Shared_CPUs_Hardware_IDs[MAX_SHARED_CPUS]; - -} __attribute__((packed)); - -struct CPU_Description { - __u8 CPU_HardwareId; - char *FRU_String; - __u8 NumberOfCacheLevels; - struct CacheDescription CacheLevelData[MAX_CACHE_LEVELS]; -} __attribute__((packed)); - -struct CPU_Info { - __u8 Type; - __u8 StructureVersion; - __u8 NumberOf_CPUs; - struct CPU_Description CPU_Data[MAX_CPUS]; -} __attribute__((packed)); - -typedef struct { - __u8 Mailbox_SUS; - __u8 Mailbox_OS; - __u8 SUS_MailboxVersion; - __u8 OS_MailboxVersion; - __u32 OS_Flags; - __u32 SUS_Flags; - __u32 WatchDogPeriod; - __u32 WatchDogCount; - __u32 MemoryFor_SUS_ErrorLog; - MC_SlotInformation_t MC_SlotInfo[NUMBER_OF_MC_BUSSES*SLOTS_PER_MC_BUS]; - - struct ProcBoardInfo *BoardData; - struct CPU_Info *CPU_Data; - -} Voyager_KernelSUS_Mbox_t; - -struct voyager_qic_cpi { - - struct { - __u32 pad1[3]; - __u32 cpi; - __u32 pad2[4]; - } qic_cpi[8]; -}; - -struct voyager_status { - __u32 power_fail:1; - __u32 switch_off:1; - __u32 request_from_kernel:1; -}; - -struct voyager_psi_regs { - __u8 cat_id; - __u8 cat_dev; - __u8 cat_control; - __u8 subaddr; - __u8 dummy4; - __u8 checkbit; - __u8 subaddr_low; - __u8 subaddr_high; - __u8 intstatus; - __u8 stat1; - __u8 stat3; - __u8 fault; - __u8 tms; - __u8 gen; - __u8 sysconf; - __u8 dummy15; -}; - -struct voyager_psi_subregs { - __u8 supply; - __u8 mask; - __u8 present; - __u8 DCfail; - __u8 ACfail; - __u8 fail; - __u8 UPSfail; - __u8 genstatus; -}; - -struct voyager_psi { - struct voyager_psi_regs regs; - struct voyager_psi_subregs subregs; -}; - -struct voyager_SUS { -#define VOYAGER_DUMP_BUTTON_NMI 0x1 -#define VOYAGER_SUS_VALID 0x2 -#define VOYAGER_SYSINT_COMPLETE 0x3 - __u8 SUS_mbox; -#define VOYAGER_NO_COMMAND 0x0 -#define VOYAGER_IGNORE_DUMP 0x1 -#define VOYAGER_DO_DUMP 0x2 -#define VOYAGER_SYSINT_HANDSHAKE 0x3 -#define VOYAGER_DO_MEM_DUMP 0x4 -#define VOYAGER_SYSINT_WAS_RECOVERED 0x5 - __u8 kernel_mbox; -#define VOYAGER_MAILBOX_VERSION 0x10 - __u8 SUS_version; - __u8 kernel_version; -#define VOYAGER_OS_HAS_SYSINT 0x1 -#define VOYAGER_OS_IN_PROGRESS 0x2 -#define VOYAGER_UPDATING_WDPERIOD 0x4 - __u32 kernel_flags; -#define VOYAGER_SUS_BOOTING 0x1 -#define VOYAGER_SUS_IN_PROGRESS 0x2 - __u32 SUS_flags; - __u32 watchdog_period; - __u32 watchdog_count; - __u32 SUS_errorlog; - -}; - -#define VOYAGER_PSI_READ 0 -#define VOYAGER_PSI_WRITE 1 -#define VOYAGER_PSI_SUBREAD 2 -#define VOYAGER_PSI_SUBWRITE 3 - diff --git a/libc/kernel/arch-x86/asm/vsyscall.h b/libc/kernel/arch-x86/asm/vsyscall.h deleted file mode 100644 index a7bee3b63..000000000 --- a/libc/kernel/arch-x86/asm/vsyscall.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_X86_64_VSYSCALL_H_ -#define _ASM_X86_64_VSYSCALL_H_ - -enum vsyscall_num { - __NR_vgettimeofday, - __NR_vtime, - __NR_vgetcpu, -}; - -#define VSYSCALL_START (-10UL << 20) -#define VSYSCALL_SIZE 1024 -#define VSYSCALL_END (-2UL << 20) -#define VSYSCALL_MAPPED_PAGES 1 -#define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr)) - -#endif diff --git a/libc/kernel/arch-x86/asm/xen/hypercall.h b/libc/kernel/arch-x86/asm/xen/hypercall.h deleted file mode 100644 index 3c523a8c1..000000000 --- a/libc/kernel/arch-x86/asm/xen/hypercall.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __HYPERCALL_H__ -#define __HYPERCALL_H__ - -#include -#include - -#include -#include -#include - -#define _hypercall0(type, name) ({ long __res; asm volatile ( "call %[call]" : "=a" (__res) : [call] "m" (hypercall_page[__HYPERVISOR_##name]) : "memory" ); (type)__res; }) - -#define _hypercall1(type, name, a1) ({ long __res, __ign1; asm volatile ( "call %[call]" : "=a" (__res), "=b" (__ign1) : "1" ((long)(a1)), [call] "m" (hypercall_page[__HYPERVISOR_##name]) : "memory" ); (type)__res; }) - -#define _hypercall2(type, name, a1, a2) ({ long __res, __ign1, __ign2; asm volatile ( "call %[call]" : "=a" (__res), "=b" (__ign1), "=c" (__ign2) : "1" ((long)(a1)), "2" ((long)(a2)), [call] "m" (hypercall_page[__HYPERVISOR_##name]) : "memory" ); (type)__res; }) - -#define _hypercall3(type, name, a1, a2, a3) ({ long __res, __ign1, __ign2, __ign3; asm volatile ( "call %[call]" : "=a" (__res), "=b" (__ign1), "=c" (__ign2), "=d" (__ign3) : "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), [call] "m" (hypercall_page[__HYPERVISOR_##name]) : "memory" ); (type)__res; }) - -#define _hypercall4(type, name, a1, a2, a3, a4) ({ long __res, __ign1, __ign2, __ign3, __ign4; asm volatile ( "call %[call]" : "=a" (__res), "=b" (__ign1), "=c" (__ign2), "=d" (__ign3), "=S" (__ign4) : "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), "4" ((long)(a4)), [call] "m" (hypercall_page[__HYPERVISOR_##name]) : "memory" ); (type)__res; }) - -#define _hypercall5(type, name, a1, a2, a3, a4, a5) ({ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; asm volatile ( "call %[call]" : "=a" (__res), "=b" (__ign1), "=c" (__ign2), "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) : "1" ((long)(a1)), "2" ((long)(a2)), "3" ((long)(a3)), "4" ((long)(a4)), "5" ((long)(a5)), [call] "m" (hypercall_page[__HYPERVISOR_##name]) : "memory" ); (type)__res; }) - -#endif diff --git a/libc/kernel/common/asm-generic/4level-fixup.h b/libc/kernel/common/asm-generic/4level-fixup.h deleted file mode 100644 index 91ae7f498..000000000 --- a/libc/kernel/common/asm-generic/4level-fixup.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _4LEVEL_FIXUP_H -#define _4LEVEL_FIXUP_H - -#define __ARCH_HAS_4LEVEL_HACK -#define __PAGETABLE_PUD_FOLDED - -#define PUD_SIZE PGDIR_SIZE -#define PUD_MASK PGDIR_MASK -#define PTRS_PER_PUD 1 - -#define pud_t pgd_t - -#define pmd_alloc(mm, pud, address) ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? NULL: pmd_offset(pud, address)) - -#define pud_alloc(mm, pgd, address) (pgd) -#define pud_offset(pgd, start) (pgd) -#define pud_none(pud) 0 -#define pud_bad(pud) 0 -#define pud_present(pud) 1 -#define pud_ERROR(pud) do { } while (0) -#define pud_clear(pud) pgd_clear(pud) - -#undef pud_free_tlb -#define pud_free_tlb(tlb, x) do { } while (0) -#define pud_free(x) do { } while (0) -#define __pud_free_tlb(tlb, x) do { } while (0) - -#undef pud_addr_end -#define pud_addr_end(addr, end) (end) - -#endif diff --git a/libc/kernel/common/asm-generic/audit_dir_write.h b/libc/kernel/common/asm-generic/audit_dir_write.h deleted file mode 100644 index 1327b59d8..000000000 --- a/libc/kernel/common/asm-generic/audit_dir_write.h +++ /dev/null @@ -1,11 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ diff --git a/libc/kernel/common/asm-generic/bitops/__ffs.h b/libc/kernel/common/asm-generic/bitops/__ffs.h deleted file mode 100644 index 3d135bdb9..000000000 --- a/libc/kernel/common/asm-generic/bitops/__ffs.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS___FFS_H_ -#define _ASM_GENERIC_BITOPS___FFS_H_ - -#include - -#if BITS_PER_LONG == 64 -#endif -#endif diff --git a/libc/kernel/common/asm-generic/bitops/atomic.h b/libc/kernel/common/asm-generic/bitops/atomic.h deleted file mode 100644 index 5f53ba925..000000000 --- a/libc/kernel/common/asm-generic/bitops/atomic.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_ATOMIC_H_ -#define _ASM_GENERIC_BITOPS_ATOMIC_H_ - -#include - -#define BITOP_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) -#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) - -#define _atomic_spin_lock_irqsave(l,f) do { local_irq_save(f); } while (0) -#define _atomic_spin_unlock_irqrestore(l,f) do { local_irq_restore(f); } while (0) - -#endif diff --git a/libc/kernel/common/asm-generic/bitops/ffz.h b/libc/kernel/common/asm-generic/bitops/ffz.h deleted file mode 100644 index 18da271e4..000000000 --- a/libc/kernel/common/asm-generic/bitops/ffz.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_FFZ_H_ -#define _ASM_GENERIC_BITOPS_FFZ_H_ - -#define ffz(x) __ffs(~(x)) - -#endif diff --git a/libc/kernel/common/asm-generic/bitops/find.h b/libc/kernel/common/asm-generic/bitops/find.h deleted file mode 100644 index 8361cfeab..000000000 --- a/libc/kernel/common/asm-generic/bitops/find.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_FIND_H_ -#define _ASM_GENERIC_BITOPS_FIND_H_ - -#define find_first_bit(addr, size) find_next_bit((addr), (size), 0) -#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0) - -#endif diff --git a/libc/kernel/common/asm-generic/bitops/fls.h b/libc/kernel/common/asm-generic/bitops/fls.h deleted file mode 100644 index 8adbf3186..000000000 --- a/libc/kernel/common/asm-generic/bitops/fls.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_FLS_H_ -#define _ASM_GENERIC_BITOPS_FLS_H_ - -#endif diff --git a/libc/kernel/common/asm-generic/bitops/fls64.h b/libc/kernel/common/asm-generic/bitops/fls64.h deleted file mode 100644 index af77098fe..000000000 --- a/libc/kernel/common/asm-generic/bitops/fls64.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_FLS64_H_ -#define _ASM_GENERIC_BITOPS_FLS64_H_ - -#include - -#endif diff --git a/libc/kernel/common/asm-generic/bitops/le.h b/libc/kernel/common/asm-generic/bitops/le.h deleted file mode 100644 index 97ca97368..000000000 --- a/libc/kernel/common/asm-generic/bitops/le.h +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_LE_H_ -#define _ASM_GENERIC_BITOPS_LE_H_ - -#include -#include - -#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) -#define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7) - -#ifdef __LITTLE_ENDIAN - -#define generic_test_le_bit(nr, addr) test_bit(nr, addr) -#define generic___set_le_bit(nr, addr) __set_bit(nr, addr) -#define generic___clear_le_bit(nr, addr) __clear_bit(nr, addr) - -#define generic_test_and_set_le_bit(nr, addr) test_and_set_bit(nr, addr) -#define generic_test_and_clear_le_bit(nr, addr) test_and_clear_bit(nr, addr) - -#define generic___test_and_set_le_bit(nr, addr) __test_and_set_bit(nr, addr) -#define generic___test_and_clear_le_bit(nr, addr) __test_and_clear_bit(nr, addr) - -#define generic_find_next_zero_le_bit(addr, size, offset) find_next_zero_bit(addr, size, offset) - -#elif defined(__BIG_ENDIAN) - -#define generic_test_le_bit(nr, addr) test_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) -#define generic___set_le_bit(nr, addr) __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) -#define generic___clear_le_bit(nr, addr) __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) - -#define generic_test_and_set_le_bit(nr, addr) test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) -#define generic_test_and_clear_le_bit(nr, addr) test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) - -#define generic___test_and_set_le_bit(nr, addr) __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) -#define generic___test_and_clear_le_bit(nr, addr) __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr)) - -#else -#error "Please fix " -#endif - -#define generic_find_first_zero_le_bit(addr, size) generic_find_next_zero_le_bit((addr), (size), 0) - -#endif diff --git a/libc/kernel/common/asm-generic/bitops/non-atomic.h b/libc/kernel/common/asm-generic/bitops/non-atomic.h deleted file mode 100644 index 727f7362d..000000000 --- a/libc/kernel/common/asm-generic/bitops/non-atomic.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ -#define _ASM_GENERIC_BITOPS_NON_ATOMIC_H_ - -#include - -#define BITOP_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) -#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) - -#endif diff --git a/libc/kernel/common/asm-generic/bug.h b/libc/kernel/common/asm-generic/bug.h deleted file mode 100644 index d91a135cf..000000000 --- a/libc/kernel/common/asm-generic/bug.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_BUG_H -#define _ASM_GENERIC_BUG_H - -#include - -#ifndef HAVE_ARCH_BUG -#define BUG() -#endif - -#ifndef HAVE_ARCH_BUG_ON -#define BUG_ON(condition) do { if (condition) ; } while(0) -#endif - -#ifndef HAVE_ARCH_WARN_ON -#define WARN_ON(condition) do { if (condition) ; } while(0) -#endif - -#define WARN_ON_ONCE(condition) ({ static int __warn_once = 1; int __ret = 0; if (unlikely((condition) && __warn_once)) { __warn_once = 0; WARN_ON(1); __ret = 1; } __ret; }) - -#define WARN_ON_SMP(x) do { } while (0) - -#endif diff --git a/libc/kernel/common/asm-generic/cputime.h b/libc/kernel/common/asm-generic/cputime.h deleted file mode 100644 index 0486b87b1..000000000 --- a/libc/kernel/common/asm-generic/cputime.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_CPUTIME_H -#define _ASM_GENERIC_CPUTIME_H - -#include -#include - -typedef unsigned long cputime_t; - -#define cputime_zero (0UL) -#define cputime_max ((~0UL >> 1) - 1) -#define cputime_add(__a, __b) ((__a) + (__b)) -#define cputime_sub(__a, __b) ((__a) - (__b)) -#define cputime_div(__a, __n) ((__a) / (__n)) -#define cputime_halve(__a) ((__a) >> 1) -#define cputime_eq(__a, __b) ((__a) == (__b)) -#define cputime_gt(__a, __b) ((__a) > (__b)) -#define cputime_ge(__a, __b) ((__a) >= (__b)) -#define cputime_lt(__a, __b) ((__a) < (__b)) -#define cputime_le(__a, __b) ((__a) <= (__b)) -#define cputime_to_jiffies(__ct) (__ct) -#define jiffies_to_cputime(__hz) (__hz) - -typedef u64 cputime64_t; - -#define cputime64_zero (0ULL) -#define cputime64_add(__a, __b) ((__a) + (__b)) -#define cputime64_sub(__a, __b) ((__a) - (__b)) -#define cputime64_to_jiffies64(__ct) (__ct) -#define jiffies64_to_cputime64(__jif) (__jif) -#define cputime_to_cputime64(__ct) ((u64) __ct) - -#define cputime_to_msecs(__ct) jiffies_to_msecs(__ct) -#define msecs_to_cputime(__msecs) msecs_to_jiffies(__msecs) - -#define cputime_to_secs(jif) ((jif) / HZ) -#define secs_to_cputime(sec) ((sec) * HZ) - -#define timespec_to_cputime(__val) timespec_to_jiffies(__val) -#define cputime_to_timespec(__ct,__val) jiffies_to_timespec(__ct,__val) - -#define timeval_to_cputime(__val) timeval_to_jiffies(__val) -#define cputime_to_timeval(__ct,__val) jiffies_to_timeval(__ct,__val) - -#define cputime_to_clock_t(__ct) jiffies_to_clock_t(__ct) -#define clock_t_to_cputime(__x) clock_t_to_jiffies(__x) - -#define cputime64_to_clock_t(__ct) jiffies_64_to_clock_t(__ct) - -#endif diff --git a/libc/kernel/common/asm-generic/emergency-restart.h b/libc/kernel/common/asm-generic/emergency-restart.h deleted file mode 100644 index 619c68241..000000000 --- a/libc/kernel/common/asm-generic/emergency-restart.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_EMERGENCY_RESTART_H -#define _ASM_GENERIC_EMERGENCY_RESTART_H - -#endif diff --git a/libc/kernel/common/asm-generic/errno-base.h b/libc/kernel/common/asm-generic/errno-base.h deleted file mode 100644 index 2fb4a3364..000000000 --- a/libc/kernel/common/asm-generic/errno-base.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_ERRNO_BASE_H -#define _ASM_GENERIC_ERRNO_BASE_H - -#define EPERM 1 -#define ENOENT 2 -#define ESRCH 3 -#define EINTR 4 -#define EIO 5 -#define ENXIO 6 -#define E2BIG 7 -#define ENOEXEC 8 -#define EBADF 9 -#define ECHILD 10 -#define EAGAIN 11 -#define ENOMEM 12 -#define EACCES 13 -#define EFAULT 14 -#define ENOTBLK 15 -#define EBUSY 16 -#define EEXIST 17 -#define EXDEV 18 -#define ENODEV 19 -#define ENOTDIR 20 -#define EISDIR 21 -#define EINVAL 22 -#define ENFILE 23 -#define EMFILE 24 -#define ENOTTY 25 -#define ETXTBSY 26 -#define EFBIG 27 -#define ENOSPC 28 -#define ESPIPE 29 -#define EROFS 30 -#define EMLINK 31 -#define EPIPE 32 -#define EDOM 33 -#define ERANGE 34 - -#endif diff --git a/libc/kernel/common/asm-generic/errno.h b/libc/kernel/common/asm-generic/errno.h deleted file mode 100644 index 11dd00f33..000000000 --- a/libc/kernel/common/asm-generic/errno.h +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_ERRNO_H -#define _ASM_GENERIC_ERRNO_H - -#include - -#define EDEADLK 35 -#define ENAMETOOLONG 36 -#define ENOLCK 37 -#define ENOSYS 38 -#define ENOTEMPTY 39 -#define ELOOP 40 -#define EWOULDBLOCK EAGAIN -#define ENOMSG 42 -#define EIDRM 43 -#define ECHRNG 44 -#define EL2NSYNC 45 -#define EL3HLT 46 -#define EL3RST 47 -#define ELNRNG 48 -#define EUNATCH 49 -#define ENOCSI 50 -#define EL2HLT 51 -#define EBADE 52 -#define EBADR 53 -#define EXFULL 54 -#define ENOANO 55 -#define EBADRQC 56 -#define EBADSLT 57 - -#define EDEADLOCK EDEADLK - -#define EBFONT 59 -#define ENOSTR 60 -#define ENODATA 61 -#define ETIME 62 -#define ENOSR 63 -#define ENONET 64 -#define ENOPKG 65 -#define EREMOTE 66 -#define ENOLINK 67 -#define EADV 68 -#define ESRMNT 69 -#define ECOMM 70 -#define EPROTO 71 -#define EMULTIHOP 72 -#define EDOTDOT 73 -#define EBADMSG 74 -#define EOVERFLOW 75 -#define ENOTUNIQ 76 -#define EBADFD 77 -#define EREMCHG 78 -#define ELIBACC 79 -#define ELIBBAD 80 -#define ELIBSCN 81 -#define ELIBMAX 82 -#define ELIBEXEC 83 -#define EILSEQ 84 -#define ERESTART 85 -#define ESTRPIPE 86 -#define EUSERS 87 -#define ENOTSOCK 88 -#define EDESTADDRREQ 89 -#define EMSGSIZE 90 -#define EPROTOTYPE 91 -#define ENOPROTOOPT 92 -#define EPROTONOSUPPORT 93 -#define ESOCKTNOSUPPORT 94 -#define EOPNOTSUPP 95 -#define EPFNOSUPPORT 96 -#define EAFNOSUPPORT 97 -#define EADDRINUSE 98 -#define EADDRNOTAVAIL 99 -#define ENETDOWN 100 -#define ENETUNREACH 101 -#define ENETRESET 102 -#define ECONNABORTED 103 -#define ECONNRESET 104 -#define ENOBUFS 105 -#define EISCONN 106 -#define ENOTCONN 107 -#define ESHUTDOWN 108 -#define ETOOMANYREFS 109 -#define ETIMEDOUT 110 -#define ECONNREFUSED 111 -#define EHOSTDOWN 112 -#define EHOSTUNREACH 113 -#define EALREADY 114 -#define EINPROGRESS 115 -#define ESTALE 116 -#define EUCLEAN 117 -#define ENOTNAM 118 -#define ENAVAIL 119 -#define EISNAM 120 -#define EREMOTEIO 121 -#define EDQUOT 122 - -#define ENOMEDIUM 123 -#define EMEDIUMTYPE 124 -#define ECANCELED 125 -#define ENOKEY 126 -#define EKEYEXPIRED 127 -#define EKEYREVOKED 128 -#define EKEYREJECTED 129 - -#define EOWNERDEAD 130 -#define ENOTRECOVERABLE 131 - -#endif diff --git a/libc/kernel/common/asm-generic/fcntl.h b/libc/kernel/common/asm-generic/fcntl.h deleted file mode 100644 index a53b536fb..000000000 --- a/libc/kernel/common/asm-generic/fcntl.h +++ /dev/null @@ -1,148 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_FCNTL_H -#define _ASM_GENERIC_FCNTL_H - -#include - -#define O_ACCMODE 00000003 -#define O_RDONLY 00000000 -#define O_WRONLY 00000001 -#define O_RDWR 00000002 -#ifndef O_CREAT -#define O_CREAT 00000100 -#endif -#ifndef O_EXCL -#define O_EXCL 00000200 -#endif -#ifndef O_NOCTTY -#define O_NOCTTY 00000400 -#endif -#ifndef O_TRUNC -#define O_TRUNC 00001000 -#endif -#ifndef O_APPEND -#define O_APPEND 00002000 -#endif -#ifndef O_NONBLOCK -#define O_NONBLOCK 00004000 -#endif -#ifndef O_SYNC -#define O_SYNC 00010000 -#endif -#ifndef FASYNC -#define FASYNC 00020000 -#endif -#ifndef O_DIRECT -#define O_DIRECT 00040000 -#endif -#ifndef O_LARGEFILE -#define O_LARGEFILE 00100000 -#endif -#ifndef O_DIRECTORY -#define O_DIRECTORY 00200000 -#endif -#ifndef O_NOFOLLOW -#define O_NOFOLLOW 00400000 -#endif -#ifndef O_NOATIME -#define O_NOATIME 01000000 -#endif -#ifndef O_NDELAY -#define O_NDELAY O_NONBLOCK -#endif - -#define F_DUPFD 0 -#define F_GETFD 1 -#define F_SETFD 2 -#define F_GETFL 3 -#define F_SETFL 4 -#ifndef F_GETLK -#define F_GETLK 5 -#define F_SETLK 6 -#define F_SETLKW 7 -#endif -#ifndef F_SETOWN -#define F_SETOWN 8 -#define F_GETOWN 9 -#endif -#ifndef F_SETSIG -#define F_SETSIG 10 -#define F_GETSIG 11 -#endif - -#define FD_CLOEXEC 1 - -#ifndef F_RDLCK -#define F_RDLCK 0 -#define F_WRLCK 1 -#define F_UNLCK 2 -#endif - -#ifndef F_EXLCK -#define F_EXLCK 4 -#define F_SHLCK 8 -#endif - -#ifndef F_INPROGRESS -#define F_INPROGRESS 16 -#endif - -#define LOCK_SH 1 -#define LOCK_EX 2 -#define LOCK_NB 4 -#define LOCK_UN 8 - -#define LOCK_MAND 32 -#define LOCK_READ 64 -#define LOCK_WRITE 128 -#define LOCK_RW 192 - -#define F_LINUX_SPECIFIC_BASE 1024 - -#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif - -struct flock { - short l_type; - short l_whence; - off_t l_start; - off_t l_len; - pid_t l_pid; - __ARCH_FLOCK_PAD -}; -#endif - -#ifndef F_GETLK64 -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -#endif - -#ifndef HAVE_ARCH_STRUCT_FLOCK64 -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD -#endif - -struct flock64 { - short l_type; - short l_whence; - loff_t l_start; - loff_t l_len; - pid_t l_pid; - __ARCH_FLOCK64_PAD -}; -#endif - -#endif diff --git a/libc/kernel/common/asm-generic/futex.h b/libc/kernel/common/asm-generic/futex.h deleted file mode 100644 index 05d3afed4..000000000 --- a/libc/kernel/common/asm-generic/futex.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_FUTEX_H -#define _ASM_GENERIC_FUTEX_H - -#endif diff --git a/libc/kernel/common/asm-generic/ioctl.h b/libc/kernel/common/asm-generic/ioctl.h deleted file mode 100644 index cba2b8ecf..000000000 --- a/libc/kernel/common/asm-generic/ioctl.h +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_IOCTL_H -#define _ASM_GENERIC_IOCTL_H - -#define _IOC_NRBITS 8 -#define _IOC_TYPEBITS 8 -#define _IOC_SIZEBITS 14 -#define _IOC_DIRBITS 2 - -#define _IOC_NRMASK ((1 << _IOC_NRBITS)-1) -#define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1) -#define _IOC_SIZEMASK ((1 << _IOC_SIZEBITS)-1) -#define _IOC_DIRMASK ((1 << _IOC_DIRBITS)-1) - -#define _IOC_NRSHIFT 0 -#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS) -#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS) -#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS) - -#define _IOC_NONE 0U -#define _IOC_WRITE 1U -#define _IOC_READ 2U - -#define _IOC(dir,type,nr,size) (((dir) << _IOC_DIRSHIFT) | ((type) << _IOC_TYPESHIFT) | ((nr) << _IOC_NRSHIFT) | ((size) << _IOC_SIZESHIFT)) - -extern unsigned int __invalid_size_argument_for_IOC; -#define _IOC_TYPECHECK(t) ((sizeof(t) == sizeof(t[1]) && sizeof(t) < (1 << _IOC_SIZEBITS)) ? sizeof(t) : __invalid_size_argument_for_IOC) - -#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) -#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size))) -#define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size))) -#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size))) -#define _IOR_BAD(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) -#define _IOW_BAD(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size)) -#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size)) - -#define _IOC_DIR(nr) (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK) -#define _IOC_TYPE(nr) (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK) -#define _IOC_NR(nr) (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK) -#define _IOC_SIZE(nr) (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK) - -#define IOC_IN (_IOC_WRITE << _IOC_DIRSHIFT) -#define IOC_OUT (_IOC_READ << _IOC_DIRSHIFT) -#define IOC_INOUT ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT) -#define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) -#define IOCSIZE_SHIFT (_IOC_SIZESHIFT) - -#endif diff --git a/libc/kernel/common/asm-generic/ipc.h b/libc/kernel/common/asm-generic/ipc.h deleted file mode 100644 index 57657a776..000000000 --- a/libc/kernel/common/asm-generic/ipc.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_IPC_H -#define _ASM_GENERIC_IPC_H - -struct ipc_kludge { - struct msgbuf __user *msgp; - long msgtyp; -}; - -#define SEMOP 1 -#define SEMGET 2 -#define SEMCTL 3 -#define SEMTIMEDOP 4 -#define MSGSND 11 -#define MSGRCV 12 -#define MSGGET 13 -#define MSGCTL 14 -#define SHMAT 21 -#define SHMDT 22 -#define SHMGET 23 -#define SHMCTL 24 - -#define DIPC 25 - -#define IPCCALL(version,op) ((version)<<16 | (op)) - -#endif diff --git a/libc/kernel/common/asm-generic/local.h b/libc/kernel/common/asm-generic/local.h deleted file mode 100644 index cae0d5416..000000000 --- a/libc/kernel/common/asm-generic/local.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_LOCAL_H -#define _ASM_GENERIC_LOCAL_H - -#include -#include -#include -#include - -typedef struct -{ - atomic_long_t a; -} local_t; - -#define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) } - -#define local_read(l) atomic_long_read(&(l)->a) -#define local_set(l,i) atomic_long_set((&(l)->a),(i)) -#define local_inc(l) atomic_long_inc(&(l)->a) -#define local_dec(l) atomic_long_dec(&(l)->a) -#define local_add(i,l) atomic_long_add((i),(&(l)->a)) -#define local_sub(i,l) atomic_long_sub((i),(&(l)->a)) - -#define __local_inc(l) local_set((l), local_read(l) + 1) -#define __local_dec(l) local_set((l), local_read(l) - 1) -#define __local_add(i,l) local_set((l), local_read(l) + (i)) -#define __local_sub(i,l) local_set((l), local_read(l) - (i)) - -#define cpu_local_read(v) local_read(&__get_cpu_var(v)) -#define cpu_local_set(v, i) local_set(&__get_cpu_var(v), (i)) -#define cpu_local_inc(v) local_inc(&__get_cpu_var(v)) -#define cpu_local_dec(v) local_dec(&__get_cpu_var(v)) -#define cpu_local_add(i, v) local_add((i), &__get_cpu_var(v)) -#define cpu_local_sub(i, v) local_sub((i), &__get_cpu_var(v)) - -#define __cpu_local_inc(v) __local_inc(&__get_cpu_var(v)) -#define __cpu_local_dec(v) __local_dec(&__get_cpu_var(v)) -#define __cpu_local_add(i, v) __local_add((i), &__get_cpu_var(v)) -#define __cpu_local_sub(i, v) __local_sub((i), &__get_cpu_var(v)) - -#endif diff --git a/libc/kernel/common/asm-generic/memory_model.h b/libc/kernel/common/asm-generic/memory_model.h deleted file mode 100644 index fa7602e67..000000000 --- a/libc/kernel/common/asm-generic/memory_model.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_MEMORY_MODEL_H -#define __ASM_MEMORY_MODEL_H - -#endif diff --git a/libc/kernel/common/asm-generic/mman.h b/libc/kernel/common/asm-generic/mman.h deleted file mode 100644 index 98d278303..000000000 --- a/libc/kernel/common/asm-generic/mman.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_MMAN_H -#define _ASM_GENERIC_MMAN_H - -#define PROT_READ 0x1 -#define PROT_WRITE 0x2 -#define PROT_EXEC 0x4 -#define PROT_SEM 0x8 -#define PROT_NONE 0x0 -#define PROT_GROWSDOWN 0x01000000 -#define PROT_GROWSUP 0x02000000 - -#define MAP_SHARED 0x01 -#define MAP_PRIVATE 0x02 -#define MAP_TYPE 0x0f -#define MAP_FIXED 0x10 -#define MAP_ANONYMOUS 0x20 - -#define MS_ASYNC 1 -#define MS_INVALIDATE 2 -#define MS_SYNC 4 - -#define MADV_NORMAL 0 -#define MADV_RANDOM 1 -#define MADV_SEQUENTIAL 2 -#define MADV_WILLNEED 3 -#define MADV_DONTNEED 4 - -#define MADV_REMOVE 9 -#define MADV_DONTFORK 10 -#define MADV_DOFORK 11 - -#define MAP_ANON MAP_ANONYMOUS -#define MAP_FILE 0 - -#endif diff --git a/libc/kernel/common/asm-generic/mutex-xchg.h b/libc/kernel/common/asm-generic/mutex-xchg.h deleted file mode 100644 index 63a557ec5..000000000 --- a/libc/kernel/common/asm-generic/mutex-xchg.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_MUTEX_XCHG_H -#define _ASM_GENERIC_MUTEX_XCHG_H - -#define __mutex_slowpath_needs_to_unlock() 0 -#endif diff --git a/libc/kernel/common/asm-generic/percpu.h b/libc/kernel/common/asm-generic/percpu.h deleted file mode 100644 index e49830003..000000000 --- a/libc/kernel/common/asm-generic/percpu.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_PERCPU_H_ -#define _ASM_GENERIC_PERCPU_H_ -#include - -#define __GENERIC_PER_CPU - -#define DEFINE_PER_CPU(type, name) __typeof__(type) per_cpu__##name - -#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) -#define __get_cpu_var(var) per_cpu__##var -#define __raw_get_cpu_var(var) per_cpu__##var - -#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name - -#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var) -#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var) - -#endif diff --git a/libc/kernel/common/asm-generic/pgtable-nopud.h b/libc/kernel/common/asm-generic/pgtable-nopud.h deleted file mode 100644 index 585f81654..000000000 --- a/libc/kernel/common/asm-generic/pgtable-nopud.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _PGTABLE_NOPUD_H -#define _PGTABLE_NOPUD_H - -#ifndef __ASSEMBLY__ - -#define __PAGETABLE_PUD_FOLDED - -typedef struct { pgd_t pgd; } pud_t; - -#define PUD_SHIFT PGDIR_SHIFT -#define PTRS_PER_PUD 1 -#define PUD_SIZE (1UL << PUD_SHIFT) -#define PUD_MASK (~(PUD_SIZE-1)) - -#define pud_ERROR(pud) (pgd_ERROR((pud).pgd)) -#define pgd_populate(mm, pgd, pud) do { } while (0) -#define set_pgd(pgdptr, pgdval) set_pud((pud_t *)(pgdptr), (pud_t) { pgdval }) -#define pud_val(x) (pgd_val((x).pgd)) -#define __pud(x) ((pud_t) { __pgd(x) } ) -#define pgd_page(pgd) (pud_page((pud_t){ pgd })) -#define pgd_page_kernel(pgd) (pud_page_kernel((pud_t){ pgd })) -#define pud_alloc_one(mm, address) NULL -#define pud_free(x) do { } while (0) -#define __pud_free_tlb(tlb, x) do { } while (0) -#undef pud_addr_end -#define pud_addr_end(addr, end) (end) -#endif -#endif diff --git a/libc/kernel/common/asm-generic/pgtable.h b/libc/kernel/common/asm-generic/pgtable.h deleted file mode 100644 index a21cdba0d..000000000 --- a/libc/kernel/common/asm-generic/pgtable.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_PGTABLE_H -#define _ASM_GENERIC_PGTABLE_H - -#ifndef __HAVE_ARCH_PTEP_ESTABLISH - -#ifndef __HAVE_ARCH_SET_PTE_ATOMIC -#define ptep_establish(__vma, __address, __ptep, __entry) do { set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); flush_tlb_page(__vma, __address); } while (0) -#else -#define ptep_establish(__vma, __address, __ptep, __entry) do { set_pte_atomic(__ptep, __entry); flush_tlb_page(__vma, __address); } while (0) -#endif -#endif - -#ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS - -#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) do { set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); flush_tlb_page(__vma, __address); } while (0) -#endif - -#ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG -#define ptep_test_and_clear_young(__vma, __address, __ptep) ({ pte_t __pte = *(__ptep); int r = 1; if (!pte_young(__pte)) r = 0; else set_pte_at((__vma)->vm_mm, (__address), (__ptep), pte_mkold(__pte)); r; }) -#endif - -#ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH -#define ptep_clear_flush_young(__vma, __address, __ptep) ({ int __young; __young = ptep_test_and_clear_young(__vma, __address, __ptep); if (__young) flush_tlb_page(__vma, __address); __young; }) -#endif - -#ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY -#define ptep_test_and_clear_dirty(__vma, __address, __ptep) ({ pte_t __pte = *__ptep; int r = 1; if (!pte_dirty(__pte)) r = 0; else set_pte_at((__vma)->vm_mm, (__address), (__ptep), pte_mkclean(__pte)); r; }) -#endif - -#ifndef __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH -#define ptep_clear_flush_dirty(__vma, __address, __ptep) ({ int __dirty; __dirty = ptep_test_and_clear_dirty(__vma, __address, __ptep); if (__dirty) flush_tlb_page(__vma, __address); __dirty; }) -#endif - -#ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR -#define ptep_get_and_clear(__mm, __address, __ptep) ({ pte_t __pte = *(__ptep); pte_clear((__mm), (__address), (__ptep)); __pte; }) -#endif - -#ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL -#define ptep_get_and_clear_full(__mm, __address, __ptep, __full) ({ pte_t __pte; __pte = ptep_get_and_clear((__mm), (__address), (__ptep)); __pte; }) -#endif - -#ifndef __HAVE_ARCH_PTE_CLEAR_FULL -#define pte_clear_full(__mm, __address, __ptep, __full) do { pte_clear((__mm), (__address), (__ptep)); } while (0) -#endif - -#ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH -#define ptep_clear_flush(__vma, __address, __ptep) ({ pte_t __pte; __pte = ptep_get_and_clear((__vma)->vm_mm, __address, __ptep); flush_tlb_page(__vma, __address); __pte; }) -#endif - -#ifndef __HAVE_ARCH_PTEP_SET_WRPROTECT -struct mm_struct; -#endif -#ifndef __HAVE_ARCH_PTE_SAME -#define pte_same(A,B) (pte_val(A) == pte_val(B)) -#endif -#ifndef __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY -#define page_test_and_clear_dirty(page) (0) -#define pte_maybe_dirty(pte) pte_dirty(pte) -#else -#define pte_maybe_dirty(pte) (1) -#endif -#ifndef __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG -#define page_test_and_clear_young(page) (0) -#endif -#ifndef __HAVE_ARCH_PGD_OFFSET_GATE -#define pgd_offset_gate(mm, addr) pgd_offset(mm, addr) -#endif -#ifndef __HAVE_ARCH_LAZY_MMU_PROT_UPDATE -#define lazy_mmu_prot_update(pte) do { } while (0) -#endif -#ifndef __HAVE_ARCH_MOVE_PTE -#define move_pte(pte, prot, old_addr, new_addr) (pte) -#endif -#define pgd_addr_end(addr, end) ({ unsigned long __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK; (__boundary - 1 < (end) - 1)? __boundary: (end); }) -#ifndef pud_addr_end -#define pud_addr_end(addr, end) ({ unsigned long __boundary = ((addr) + PUD_SIZE) & PUD_MASK; (__boundary - 1 < (end) - 1)? __boundary: (end); }) -#endif -#ifndef pmd_addr_end -#define pmd_addr_end(addr, end) ({ unsigned long __boundary = ((addr) + PMD_SIZE) & PMD_MASK; (__boundary - 1 < (end) - 1)? __boundary: (end); }) -#endif -#ifndef __ASSEMBLY__ - -#endif -#endif diff --git a/libc/kernel/common/asm-generic/poll.h b/libc/kernel/common/asm-generic/poll.h deleted file mode 100644 index b8cd3da85..000000000 --- a/libc/kernel/common/asm-generic/poll.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_GENERIC_POLL_H -#define __ASM_GENERIC_POLL_H - -#define POLLIN 0x0001 -#define POLLPRI 0x0002 -#define POLLOUT 0x0004 -#define POLLERR 0x0008 -#define POLLHUP 0x0010 -#define POLLNVAL 0x0020 - -#define POLLRDNORM 0x0040 -#define POLLRDBAND 0x0080 -#ifndef POLLWRNORM -#define POLLWRNORM 0x0100 -#endif -#ifndef POLLWRBAND -#define POLLWRBAND 0x0200 -#endif -#ifndef POLLMSG -#define POLLMSG 0x0400 -#endif -#ifndef POLLREMOVE -#define POLLREMOVE 0x1000 -#endif -#ifndef POLLRDHUP -#define POLLRDHUP 0x2000 -#endif - -struct pollfd { - int fd; - short events; - short revents; -}; - -#endif diff --git a/libc/kernel/common/asm-generic/resource.h b/libc/kernel/common/asm-generic/resource.h deleted file mode 100644 index a7f7decba..000000000 --- a/libc/kernel/common/asm-generic/resource.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_RESOURCE_H -#define _ASM_GENERIC_RESOURCE_H - -#define RLIMIT_CPU 0 -#define RLIMIT_FSIZE 1 -#define RLIMIT_DATA 2 -#define RLIMIT_STACK 3 -#define RLIMIT_CORE 4 - -#ifndef RLIMIT_RSS -#define RLIMIT_RSS 5 -#endif - -#ifndef RLIMIT_NPROC -#define RLIMIT_NPROC 6 -#endif - -#ifndef RLIMIT_NOFILE -#define RLIMIT_NOFILE 7 -#endif - -#ifndef RLIMIT_MEMLOCK -#define RLIMIT_MEMLOCK 8 -#endif - -#ifndef RLIMIT_AS -#define RLIMIT_AS 9 -#endif - -#define RLIMIT_LOCKS 10 -#define RLIMIT_SIGPENDING 11 -#define RLIMIT_MSGQUEUE 12 -#define RLIMIT_NICE 13 -#define RLIMIT_RTPRIO 14 - -#define RLIM_NLIMITS 15 - -#ifndef RLIM_INFINITY -#define RLIM_INFINITY (~0UL) -#endif - -#ifndef _STK_LIM_MAX -#define _STK_LIM_MAX RLIM_INFINITY -#endif - -#endif diff --git a/libc/kernel/common/asm-generic/sections.h b/libc/kernel/common/asm-generic/sections.h deleted file mode 100644 index e9eaa4668..000000000 --- a/libc/kernel/common/asm-generic/sections.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_SECTIONS_H_ -#define _ASM_GENERIC_SECTIONS_H_ - -#endif diff --git a/libc/kernel/common/asm-generic/siginfo.h b/libc/kernel/common/asm-generic/siginfo.h deleted file mode 100644 index d6743a732..000000000 --- a/libc/kernel/common/asm-generic/siginfo.h +++ /dev/null @@ -1,213 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_SIGINFO_H -#define _ASM_GENERIC_SIGINFO_H - -#include -#include - -typedef union sigval { - int sival_int; - void __user *sival_ptr; -} sigval_t; - -#ifndef __ARCH_SI_PREAMBLE_SIZE -#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int)) -#endif - -#define SI_MAX_SIZE 128 -#ifndef SI_PAD_SIZE -#define SI_PAD_SIZE ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int)) -#endif - -#ifndef __ARCH_SI_UID_T -#define __ARCH_SI_UID_T uid_t -#endif - -#ifndef __ARCH_SI_BAND_T -#define __ARCH_SI_BAND_T long -#endif - -#ifndef HAVE_ARCH_SIGINFO_T - -typedef struct siginfo { - int si_signo; - int si_errno; - int si_code; - - union { - int _pad[SI_PAD_SIZE]; - - struct { - pid_t _pid; - __ARCH_SI_UID_T _uid; - } _kill; - - struct { - timer_t _tid; - int _overrun; - char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)]; - sigval_t _sigval; - int _sys_private; - } _timer; - - struct { - pid_t _pid; - __ARCH_SI_UID_T _uid; - sigval_t _sigval; - } _rt; - - struct { - pid_t _pid; - __ARCH_SI_UID_T _uid; - int _status; - clock_t _utime; - clock_t _stime; - } _sigchld; - - struct { - void __user *_addr; -#ifdef __ARCH_SI_TRAPNO - int _trapno; -#endif - } _sigfault; - - struct { - __ARCH_SI_BAND_T _band; - int _fd; - } _sigpoll; - } _sifields; -} siginfo_t; - -#endif - -#define si_pid _sifields._kill._pid -#define si_uid _sifields._kill._uid -#define si_tid _sifields._timer._tid -#define si_overrun _sifields._timer._overrun -#define si_sys_private _sifields._timer._sys_private -#define si_status _sifields._sigchld._status -#define si_utime _sifields._sigchld._utime -#define si_stime _sifields._sigchld._stime -#define si_value _sifields._rt._sigval -#define si_int _sifields._rt._sigval.sival_int -#define si_ptr _sifields._rt._sigval.sival_ptr -#define si_addr _sifields._sigfault._addr -#ifdef __ARCH_SI_TRAPNO -#define si_trapno _sifields._sigfault._trapno -#endif -#define si_band _sifields._sigpoll._band -#define si_fd _sifields._sigpoll._fd - -#define __SI_KILL 0 -#define __SI_TIMER 0 -#define __SI_POLL 0 -#define __SI_FAULT 0 -#define __SI_CHLD 0 -#define __SI_RT 0 -#define __SI_MESGQ 0 -#define __SI_CODE(T,N) (N) - -#define SI_USER 0 -#define SI_KERNEL 0x80 -#define SI_QUEUE -1 -#define SI_TIMER __SI_CODE(__SI_TIMER,-2) -#define SI_MESGQ __SI_CODE(__SI_MESGQ,-3) -#define SI_ASYNCIO -4 -#define SI_SIGIO -5 -#define SI_TKILL -6 -#define SI_DETHREAD -7 - -#define SI_FROMUSER(siptr) ((siptr)->si_code <= 0) -#define SI_FROMKERNEL(siptr) ((siptr)->si_code > 0) - -#define ILL_ILLOPC (__SI_FAULT|1) -#define ILL_ILLOPN (__SI_FAULT|2) -#define ILL_ILLADR (__SI_FAULT|3) -#define ILL_ILLTRP (__SI_FAULT|4) -#define ILL_PRVOPC (__SI_FAULT|5) -#define ILL_PRVREG (__SI_FAULT|6) -#define ILL_COPROC (__SI_FAULT|7) -#define ILL_BADSTK (__SI_FAULT|8) -#define NSIGILL 8 - -#define FPE_INTDIV (__SI_FAULT|1) -#define FPE_INTOVF (__SI_FAULT|2) -#define FPE_FLTDIV (__SI_FAULT|3) -#define FPE_FLTOVF (__SI_FAULT|4) -#define FPE_FLTUND (__SI_FAULT|5) -#define FPE_FLTRES (__SI_FAULT|6) -#define FPE_FLTINV (__SI_FAULT|7) -#define FPE_FLTSUB (__SI_FAULT|8) -#define NSIGFPE 8 - -#define SEGV_MAPERR (__SI_FAULT|1) -#define SEGV_ACCERR (__SI_FAULT|2) -#define NSIGSEGV 2 - -#define BUS_ADRALN (__SI_FAULT|1) -#define BUS_ADRERR (__SI_FAULT|2) -#define BUS_OBJERR (__SI_FAULT|3) -#define NSIGBUS 3 - -#define TRAP_BRKPT (__SI_FAULT|1) -#define TRAP_TRACE (__SI_FAULT|2) -#define NSIGTRAP 2 - -#define CLD_EXITED (__SI_CHLD|1) -#define CLD_KILLED (__SI_CHLD|2) -#define CLD_DUMPED (__SI_CHLD|3) -#define CLD_TRAPPED (__SI_CHLD|4) -#define CLD_STOPPED (__SI_CHLD|5) -#define CLD_CONTINUED (__SI_CHLD|6) -#define NSIGCHLD 6 - -#define POLL_IN (__SI_POLL|1) -#define POLL_OUT (__SI_POLL|2) -#define POLL_MSG (__SI_POLL|3) -#define POLL_ERR (__SI_POLL|4) -#define POLL_PRI (__SI_POLL|5) -#define POLL_HUP (__SI_POLL|6) -#define NSIGPOLL 6 - -#define SIGEV_SIGNAL 0 -#define SIGEV_NONE 1 -#define SIGEV_THREAD 2 -#define SIGEV_THREAD_ID 4 - -#ifndef __ARCH_SIGEV_PREAMBLE_SIZE -#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(int) * 2 + sizeof(sigval_t)) -#endif - -#define SIGEV_MAX_SIZE 64 -#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) / sizeof(int)) - -typedef struct sigevent { - sigval_t sigev_value; - int sigev_signo; - int sigev_notify; - union { - int _pad[SIGEV_PAD_SIZE]; - int _tid; - - struct { - void (*_function)(sigval_t); - void *_attribute; - } _sigev_thread; - } _sigev_un; -} sigevent_t; - -#define sigev_notify_function _sigev_un._sigev_thread._function -#define sigev_notify_attributes _sigev_un._sigev_thread._attribute -#define sigev_notify_thread_id _sigev_un._tid - -#endif diff --git a/libc/kernel/common/asm-generic/signal.h b/libc/kernel/common/asm-generic/signal.h deleted file mode 100644 index 226d99c46..000000000 --- a/libc/kernel/common/asm-generic/signal.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ASM_GENERIC_SIGNAL_H -#define __ASM_GENERIC_SIGNAL_H - -#include - -#ifndef SIG_BLOCK -#define SIG_BLOCK 0 -#endif -#ifndef SIG_UNBLOCK -#define SIG_UNBLOCK 1 -#endif -#ifndef SIG_SETMASK -#define SIG_SETMASK 2 -#endif - -#ifndef __ASSEMBLY__ -typedef void __signalfn_t(int); -typedef __signalfn_t __user *__sighandler_t; - -typedef void __restorefn_t(void); -typedef __restorefn_t __user *__sigrestore_t; - -#define SIG_DFL ((__force __sighandler_t)0) -#define SIG_IGN ((__force __sighandler_t)1) -#define SIG_ERR ((__force __sighandler_t)-1) -#endif - -#endif diff --git a/libc/kernel/common/asm-generic/tlb.h b/libc/kernel/common/asm-generic/tlb.h deleted file mode 100644 index dc1e79f80..000000000 --- a/libc/kernel/common/asm-generic/tlb.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC__TLB_H -#define _ASM_GENERIC__TLB_H - -#include -#include -#include - -#define FREE_PTE_NR 1 -#define tlb_fast_mode(tlb) 1 - -struct mmu_gather { - struct mm_struct *mm; - unsigned int nr; - unsigned int need_flush; - unsigned int fullmm; - struct page * pages[FREE_PTE_NR]; -}; - -#define tlb_remove_tlb_entry(tlb, ptep, address) do { tlb->need_flush = 1; __tlb_remove_tlb_entry(tlb, ptep, address); } while (0) -#define pte_free_tlb(tlb, ptep) do { tlb->need_flush = 1; __pte_free_tlb(tlb, ptep); } while (0) -#ifndef __ARCH_HAS_4LEVEL_HACK -#define pud_free_tlb(tlb, pudp) do { tlb->need_flush = 1; __pud_free_tlb(tlb, pudp); } while (0) -#endif -#define pmd_free_tlb(tlb, pmdp) do { tlb->need_flush = 1; __pmd_free_tlb(tlb, pmdp); } while (0) -#define tlb_migrate_finish(mm) do {} while (0) -#endif diff --git a/libc/kernel/common/asm-generic/topology.h b/libc/kernel/common/asm-generic/topology.h deleted file mode 100644 index 089b1f28e..000000000 --- a/libc/kernel/common/asm-generic/topology.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_GENERIC_TOPOLOGY_H -#define _ASM_GENERIC_TOPOLOGY_H - -#ifndef cpu_to_node -#define cpu_to_node(cpu) (0) -#endif -#ifndef parent_node -#define parent_node(node) (0) -#endif -#ifndef node_to_cpumask -#define node_to_cpumask(node) (cpu_online_map) -#endif -#ifndef node_to_first_cpu -#define node_to_first_cpu(node) (0) -#endif -#ifndef pcibus_to_node -#define pcibus_to_node(node) (-1) -#endif - -#ifndef pcibus_to_cpumask -#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? CPU_MASK_ALL : node_to_cpumask(pcibus_to_node(bus)) ) -#endif - -#endif diff --git a/libc/kernel/common/asm-generic/xor.h b/libc/kernel/common/asm-generic/xor.h deleted file mode 100644 index 6b1e4e8d7..000000000 --- a/libc/kernel/common/asm-generic/xor.h +++ /dev/null @@ -1,14 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include - -#define XOR_TRY_TEMPLATES do { xor_speed(&xor_block_8regs); xor_speed(&xor_block_8regs_p); xor_speed(&xor_block_32regs); xor_speed(&xor_block_32regs_p); } while (0) diff --git a/libc/kernel/common/linux/a.out.h b/libc/kernel/common/linux/a.out.h deleted file mode 100644 index 73253043e..000000000 --- a/libc/kernel/common/linux/a.out.h +++ /dev/null @@ -1,220 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __A_OUT_GNU_H__ -#define __A_OUT_GNU_H__ - -#define __GNU_EXEC_MACROS__ - -#ifndef __STRUCT_EXEC_OVERRIDE__ - -#include - -#endif - -enum machine_type { -#ifdef M_OLDSUN2 - M__OLDSUN2 = M_OLDSUN2, -#else - M_OLDSUN2 = 0, -#endif -#ifdef M_68010 - M__68010 = M_68010, -#else - M_68010 = 1, -#endif -#ifdef M_68020 - M__68020 = M_68020, -#else - M_68020 = 2, -#endif -#ifdef M_SPARC - M__SPARC = M_SPARC, -#else - M_SPARC = 3, -#endif - - M_386 = 100, - M_MIPS1 = 151, - M_MIPS2 = 152 -}; - -#ifndef N_MAGIC -#define N_MAGIC(exec) ((exec).a_info & 0xffff) -#endif -#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) -#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) -#define N_SET_INFO(exec, magic, type, flags) ((exec).a_info = ((magic) & 0xffff) | (((int)(type) & 0xff) << 16) | (((flags) & 0xff) << 24)) -#define N_SET_MAGIC(exec, magic) ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) - -#define N_SET_MACHTYPE(exec, machtype) ((exec).a_info = ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) - -#define N_SET_FLAGS(exec, flags) ((exec).a_info = ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) - -#define OMAGIC 0407 - -#define NMAGIC 0410 - -#define ZMAGIC 0413 - -#define QMAGIC 0314 - -#define CMAGIC 0421 - -#ifndef N_BADMAG -#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC && N_MAGIC(x) != NMAGIC && N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC) -#endif - -#define _N_HDROFF(x) (1024 - sizeof (struct exec)) - -#ifndef N_TXTOFF -#define N_TXTOFF(x) (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) -#endif - -#ifndef N_DATOFF -#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) -#endif - -#ifndef N_TRELOFF -#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) -#endif - -#ifndef N_DRELOFF -#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) -#endif - -#ifndef N_SYMOFF -#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) -#endif - -#ifndef N_STROFF -#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) -#endif - -#ifndef N_TXTADDR -#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) -#endif - -#if defined(vax) || defined(hp300) || defined(pyr) -#define SEGMENT_SIZE page_size -#endif -#ifdef sony -#define SEGMENT_SIZE 0x2000 -#endif -#ifdef is68k -#define SEGMENT_SIZE 0x20000 -#endif -#if defined(m68k) && defined(PORTAR) -#define PAGE_SIZE 0x400 -#define SEGMENT_SIZE PAGE_SIZE -#endif - -#ifdef linux -#include -#if defined(__i386__) || defined(__mc68000__) -#define SEGMENT_SIZE 1024 -#else -#ifndef SEGMENT_SIZE -#define SEGMENT_SIZE PAGE_SIZE -#endif -#endif -#endif - -#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE) - -#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) - -#ifndef N_DATADDR -#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) -#endif - -#ifndef N_BSSADDR -#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) -#endif - -#ifndef N_NLIST_DECLARED -struct nlist { - union { - char *n_name; - struct nlist *n_next; - long n_strx; - } n_un; - unsigned char n_type; - char n_other; - short n_desc; - unsigned long n_value; -}; -#endif - -#ifndef N_UNDF -#define N_UNDF 0 -#endif -#ifndef N_ABS -#define N_ABS 2 -#endif -#ifndef N_TEXT -#define N_TEXT 4 -#endif -#ifndef N_DATA -#define N_DATA 6 -#endif -#ifndef N_BSS -#define N_BSS 8 -#endif -#ifndef N_FN -#define N_FN 15 -#endif - -#ifndef N_EXT -#define N_EXT 1 -#endif -#ifndef N_TYPE -#define N_TYPE 036 -#endif -#ifndef N_STAB -#define N_STAB 0340 -#endif - -#define N_INDR 0xa - -#define N_SETA 0x14 -#define N_SETT 0x16 -#define N_SETD 0x18 -#define N_SETB 0x1A - -#define N_SETV 0x1C - -#ifndef N_RELOCATION_INFO_DECLARED - -struct relocation_info -{ - - int r_address; - - unsigned int r_symbolnum:24; - - unsigned int r_pcrel:1; - - unsigned int r_length:2; - - unsigned int r_extern:1; - -#ifdef NS32K - unsigned r_bsr:1; - unsigned r_disp:1; - unsigned r_pad:2; -#else - unsigned int r_pad:4; -#endif -}; -#endif - -#endif diff --git a/libc/kernel/common/linux/aio_abi.h b/libc/kernel/common/linux/aio_abi.h deleted file mode 100644 index c92bc8f11..000000000 --- a/libc/kernel/common/linux/aio_abi.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX__AIO_ABI_H -#define __LINUX__AIO_ABI_H - -#include - -typedef unsigned long aio_context_t; - -enum { - IOCB_CMD_PREAD = 0, - IOCB_CMD_PWRITE = 1, - IOCB_CMD_FSYNC = 2, - IOCB_CMD_FDSYNC = 3, - - IOCB_CMD_NOOP = 6, -}; - -struct io_event { - __u64 data; - __u64 obj; - __s64 res; - __s64 res2; -}; - -#ifdef __LITTLE_ENDIAN -#define PADDED(x,y) x, y -#elif defined(__BIG_ENDIAN) -#define PADDED(x,y) y, x -#else -#error edit for your odd byteorder. -#endif - -struct iocb { - - __u64 aio_data; - __u32 PADDED(aio_key, aio_reserved1); - - __u16 aio_lio_opcode; - __s16 aio_reqprio; - __u32 aio_fildes; - - __u64 aio_buf; - __u64 aio_nbytes; - __s64 aio_offset; - - __u64 aio_reserved2; - __u64 aio_reserved3; -}; - -#undef IFBIG -#undef IFLITTLE - -#endif - diff --git a/libc/kernel/common/linux/akm8976.h b/libc/kernel/common/linux/akm8976.h deleted file mode 100644 index a5aa68ea5..000000000 --- a/libc/kernel/common/linux/akm8976.h +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef AKM8976_H -#define AKM8976_H - -#include - -#define AKECS_MODE_MEASURE 0x00 - -#define AKECS_MODE_PFFD 0x01 -#define AKECS_MODE_E2P_READ 0x02 -#define AKECS_MODE_POWERDOWN 0x03 - -#define AKECS_MODE_MEASURE_SNG 0x10 -#define AKECS_MODE_MEASURE_SEQ 0x11 - -#define CSPEC_AINT 0x01 -#define CSPEC_SNG_NUM 0x01 -#define CSPEC_SEQ_NUM 0x02 -#define CSPEC_SFRQ_32 0x00 -#define CSPEC_SFRQ_64 0x01 -#define CSPEC_MCS 0x07 -#define CSPEC_MKS 0x01 -#define CSPEC_INTEN 0x01 - -#define RBUFF_SIZE 31 -#define MAX_CALI_SIZE 0x1000U - -#define AKECS_REG_ST 0xC0 -#define AKECS_REG_TMPS 0xC1 -#define AKECS_REG_MS1 0xE0 -#define AKECS_REG_MS2 0xE1 -#define AKECS_REG_MS3 0xE2 - -#define AKMIO 0xA1 - -#define ECS_IOCTL_INIT _IO(AKMIO, 0x01) -#define ECS_IOCTL_WRITE _IOW(AKMIO, 0x02, char[5]) -#define ECS_IOCTL_READ _IOWR(AKMIO, 0x03, char[5]) -#define ECS_IOCTL_RESET _IO(AKMIO, 0x04) -#define ECS_IOCTL_INT_STATUS _IO(AKMIO, 0x05) -#define ECS_IOCTL_FFD_STATUS _IO(AKMIO, 0x06) -#define ECS_IOCTL_SET_MODE _IOW(AKMIO, 0x07, short) -#define ECS_IOCTL_GETDATA _IOR(AKMIO, 0x08, char[RBUFF_SIZE+1]) -#define ECS_IOCTL_GET_NUMFRQ _IOR(AKMIO, 0x09, char[2]) -#define ECS_IOCTL_SET_PERST _IO(AKMIO, 0x0A) -#define ECS_IOCTL_SET_G0RST _IO(AKMIO, 0x0B) -#define ECS_IOCTL_SET_YPR _IOW(AKMIO, 0x0C, short[12]) -#define ECS_IOCTL_GET_OPEN_STATUS _IOR(AKMIO, 0x0D, int) -#define ECS_IOCTL_GET_CLOSE_STATUS _IOR(AKMIO, 0x0E, int) -#define ECS_IOCTL_GET_CALI_DATA _IOR(AKMIO, 0x0F, char[MAX_CALI_SIZE]) -#define ECS_IOCTL_GET_DELAY _IOR(AKMIO, 0x30, short) - -#define ECS_IOCTL_APP_SET_MODE _IOW(AKMIO, 0x10, short) -#define ECS_IOCTL_APP_SET_MFLAG _IOW(AKMIO, 0x11, short) -#define ECS_IOCTL_APP_GET_MFLAG _IOW(AKMIO, 0x12, short) -#define ECS_IOCTL_APP_SET_AFLAG _IOW(AKMIO, 0x13, short) -#define ECS_IOCTL_APP_GET_AFLAG _IOR(AKMIO, 0x14, short) -#define ECS_IOCTL_APP_SET_TFLAG _IOR(AKMIO, 0x15, short) -#define ECS_IOCTL_APP_GET_TFLAG _IOR(AKMIO, 0x16, short) -#define ECS_IOCTL_APP_RESET_PEDOMETER _IO(AKMIO, 0x17) -#define ECS_IOCTL_APP_SET_DELAY _IOW(AKMIO, 0x18, short) -#define ECS_IOCTL_APP_GET_DELAY ECS_IOCTL_GET_DELAY -#define ECS_IOCTL_APP_SET_MVFLAG _IOW(AKMIO, 0x19, short) -#define ECS_IOCTL_APP_GET_MVFLAG _IOR(AKMIO, 0x1A, short) - -#define ECS_IOCTL_SET_STEP_CNT _IOW(AKMIO, 0x20, short) - -#define ECS_RST 146 -#define ECS_CLK_ON 155 -#define ECS_INTR 161 - -struct akm8976_platform_data { - int reset; - int clk_on; - int intr; -}; - -#endif - diff --git a/libc/kernel/common/linux/android_alarm.h b/libc/kernel/common/linux/android_alarm.h deleted file mode 100644 index 80828eab4..000000000 --- a/libc/kernel/common/linux/android_alarm.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ANDROID_ALARM_H -#define _LINUX_ANDROID_ALARM_H - -#include -#include - -typedef enum { - - ANDROID_ALARM_RTC_WAKEUP, - ANDROID_ALARM_RTC, - ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP, - ANDROID_ALARM_ELAPSED_REALTIME, - ANDROID_ALARM_SYSTEMTIME, - - ANDROID_ALARM_TYPE_COUNT, - -} android_alarm_type_t; - -typedef enum { - ANDROID_ALARM_RTC_WAKEUP_MASK = 1U << ANDROID_ALARM_RTC_WAKEUP, - ANDROID_ALARM_RTC_MASK = 1U << ANDROID_ALARM_RTC, - ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK = 1U << ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP, - ANDROID_ALARM_ELAPSED_REALTIME_MASK = 1U << ANDROID_ALARM_ELAPSED_REALTIME, - ANDROID_ALARM_SYSTEMTIME_MASK = 1U << ANDROID_ALARM_SYSTEMTIME, - ANDROID_ALARM_TIME_CHANGE_MASK = 1U << 16 -} android_alarm_return_flags_t; - -#define ANDROID_ALARM_CLEAR(type) _IO('a', 0 | ((type) << 4)) -#define ANDROID_ALARM_WAIT _IO('a', 1) -#define ANDROID_ALARM_SET(type) _IOW('a', 2 | ((type) << 4), struct timespec) -#define ANDROID_ALARM_SET_AND_WAIT(type) _IOW('a', 3 | ((type) << 4), struct timespec) -#define ANDROID_ALARM_GET_TIME(type) _IOW('a', 4 | ((type) << 4), struct timespec) -#define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec) -#define ANDROID_ALARM_SET_TIMEZONE _IOW('a', 6, struct timezone) - -#define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) -#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) - -#endif diff --git a/libc/kernel/common/linux/android_pmem.h b/libc/kernel/common/linux/android_pmem.h deleted file mode 100644 index 858857ef1..000000000 --- a/libc/kernel/common/linux/android_pmem.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ANDROID_PMEM_H_ -#define _ANDROID_PMEM_H_ - -#include - -#ifndef __user -#define __user -#endif - -struct pmem_region { - unsigned long offset; - unsigned long len; -}; - -#define PMEM_IOCTL_MAGIC 'p' -#define PMEM_GET_PHYS _IOW(PMEM_IOCTL_MAGIC, 1, struct pmem_region *) -#define PMEM_MAP _IOW(PMEM_IOCTL_MAGIC, 2, struct pmem_region *) -#define PMEM_GET_SIZE _IOW(PMEM_IOCTL_MAGIC, 3, struct pmem_region *) -#define PMEM_UNMAP _IOW(PMEM_IOCTL_MAGIC, 4, struct pmem_region *) - -#define PMEM_ALLOCATE _IOW(PMEM_IOCTL_MAGIC, 5, unsigned int) - -#define PMEM_CONNECT _IOW(PMEM_IOCTL_MAGIC, 6, unsigned int) - -#define PMEM_GET_TOTAL_SIZE _IOW(PMEM_IOCTL_MAGIC, 7, struct pmem_region *) - -#define HW3D_REVOKE_GPU _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int) -#define HW3D_GRANT_GPU _IOW(PMEM_IOCTL_MAGIC, 9, unsigned int) -#define HW3D_WAIT_IRQ _IOW(PMEM_IOCTL_MAGIC,10, unsigned int) - -struct android_pmem_platform_data; -struct pmem_file_operations { - int (*mmap) (struct file *, struct vm_area_struct *); - int (*open) (struct inode *, struct file *); - ssize_t (*read) (struct file *, char __user *, size_t, long long *); - int (*release) (struct inode *, struct file *); - long (*ioctl) (struct file *, unsigned int, unsigned long); -}; - -#endif - diff --git a/libc/kernel/common/linux/android_power.h b/libc/kernel/common/linux/android_power.h deleted file mode 100644 index 2e9032176..000000000 --- a/libc/kernel/common/linux/android_power.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ANDROID_POWER_H -#define _LINUX_ANDROID_POWER_H - -#include - -typedef struct -{ - struct list_head link; - int lock_count; - int flags; - const char *name; - int expires; -} android_suspend_lock_t; - -#define ANDROID_SUSPEND_LOCK_FLAG_COUNTED (1U << 0) -#define ANDROID_SUSPEND_LOCK_FLAG_USER_READABLE (1U << 1) -#define ANDROID_SUSPEND_LOCK_FLAG_USER_SET (1U << 2) -#define ANDROID_SUSPEND_LOCK_FLAG_USER_CLEAR (1U << 3) -#define ANDROID_SUSPEND_LOCK_FLAG_USER_INC (1U << 4) -#define ANDROID_SUSPEND_LOCK_FLAG_USER_DEC (1U << 5) -#define ANDROID_SUSPEND_LOCK_FLAG_USER_VISIBLE_MASK (0x1fU << 1) -#define ANDROID_SUSPEND_LOCK_AUTO_EXPIRE (1U << 6) - -typedef struct android_early_suspend android_early_suspend_t; -struct android_early_suspend -{ - struct list_head link; - int level; - void (*suspend)(android_early_suspend_t *h); - void (*resume)(android_early_suspend_t *h); -}; - -typedef enum { - ANDROID_CHARGING_STATE_UNKNOWN, - ANDROID_CHARGING_STATE_DISCHARGE, - ANDROID_CHARGING_STATE_MAINTAIN, - ANDROID_CHARGING_STATE_SLOW, - ANDROID_CHARGING_STATE_NORMAL, - ANDROID_CHARGING_STATE_FAST, - ANDROID_CHARGING_STATE_OVERHEAT -} android_charging_state_t; - -#endif - diff --git a/libc/kernel/common/linux/apm_bios.h b/libc/kernel/common/linux/apm_bios.h deleted file mode 100644 index d32b4aac6..000000000 --- a/libc/kernel/common/linux/apm_bios.h +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_APM_H -#define _LINUX_APM_H - -typedef unsigned short apm_event_t; -typedef unsigned short apm_eventinfo_t; - -#define APM_STATE_READY 0x0000 -#define APM_STATE_STANDBY 0x0001 -#define APM_STATE_SUSPEND 0x0002 -#define APM_STATE_OFF 0x0003 -#define APM_STATE_BUSY 0x0004 -#define APM_STATE_REJECT 0x0005 -#define APM_STATE_OEM_SYS 0x0020 -#define APM_STATE_OEM_DEV 0x0040 - -#define APM_STATE_DISABLE 0x0000 -#define APM_STATE_ENABLE 0x0001 - -#define APM_STATE_DISENGAGE 0x0000 -#define APM_STATE_ENGAGE 0x0001 - -#define APM_SYS_STANDBY 0x0001 -#define APM_SYS_SUSPEND 0x0002 -#define APM_NORMAL_RESUME 0x0003 -#define APM_CRITICAL_RESUME 0x0004 -#define APM_LOW_BATTERY 0x0005 -#define APM_POWER_STATUS_CHANGE 0x0006 -#define APM_UPDATE_TIME 0x0007 -#define APM_CRITICAL_SUSPEND 0x0008 -#define APM_USER_STANDBY 0x0009 -#define APM_USER_SUSPEND 0x000a -#define APM_STANDBY_RESUME 0x000b -#define APM_CAPABILITY_CHANGE 0x000c - -#define APM_SUCCESS 0x00 -#define APM_DISABLED 0x01 -#define APM_CONNECTED 0x02 -#define APM_NOT_CONNECTED 0x03 -#define APM_16_CONNECTED 0x05 -#define APM_16_UNSUPPORTED 0x06 -#define APM_32_CONNECTED 0x07 -#define APM_32_UNSUPPORTED 0x08 -#define APM_BAD_DEVICE 0x09 -#define APM_BAD_PARAM 0x0a -#define APM_NOT_ENGAGED 0x0b -#define APM_BAD_FUNCTION 0x0c -#define APM_RESUME_DISABLED 0x0d -#define APM_NO_ERROR 0x53 -#define APM_BAD_STATE 0x60 -#define APM_NO_EVENTS 0x80 -#define APM_NOT_PRESENT 0x86 - -#define APM_DEVICE_BIOS 0x0000 -#define APM_DEVICE_ALL 0x0001 -#define APM_DEVICE_DISPLAY 0x0100 -#define APM_DEVICE_STORAGE 0x0200 -#define APM_DEVICE_PARALLEL 0x0300 -#define APM_DEVICE_SERIAL 0x0400 -#define APM_DEVICE_NETWORK 0x0500 -#define APM_DEVICE_PCMCIA 0x0600 -#define APM_DEVICE_BATTERY 0x8000 -#define APM_DEVICE_OEM 0xe000 -#define APM_DEVICE_OLD_ALL 0xffff -#define APM_DEVICE_CLASS 0x00ff -#define APM_DEVICE_MASK 0xff00 - -#define APM_MAX_BATTERIES 2 - -#define APM_CAP_GLOBAL_STANDBY 0x0001 -#define APM_CAP_GLOBAL_SUSPEND 0x0002 -#define APM_CAP_RESUME_STANDBY_TIMER 0x0004 -#define APM_CAP_RESUME_SUSPEND_TIMER 0x0008 -#define APM_CAP_RESUME_STANDBY_RING 0x0010 -#define APM_CAP_RESUME_SUSPEND_RING 0x0020 -#define APM_CAP_RESUME_STANDBY_PCMCIA 0x0040 -#define APM_CAP_RESUME_SUSPEND_PCMCIA 0x0080 - -#include - -#define APM_IOC_STANDBY _IO('A', 1) -#define APM_IOC_SUSPEND _IO('A', 2) - -#endif diff --git a/libc/kernel/common/linux/ashmem.h b/libc/kernel/common/linux/ashmem.h deleted file mode 100644 index a57d1dee3..000000000 --- a/libc/kernel/common/linux/ashmem.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ASHMEM_H -#define _LINUX_ASHMEM_H - -#include -#include - -#define ASHMEM_NAME_LEN 256 - -#define ASHMEM_NAME_DEF "dev/ashmem" - -#define ASHMEM_NOT_PURGED 0 -#define ASHMEM_WAS_PURGED 1 - -#define ASHMEM_IS_UNPINNED 0 -#define ASHMEM_IS_PINNED 1 - -struct ashmem_pin { - __u32 offset; - __u32 len; -}; - -#define __ASHMEMIOC 0x77 - -#define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN]) -#define ASHMEM_GET_NAME _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN]) -#define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t) -#define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4) -#define ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned long) -#define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6) -#define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin) -#define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin) -#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9) -#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10) - -#endif diff --git a/libc/kernel/common/linux/ata.h b/libc/kernel/common/linux/ata.h deleted file mode 100644 index 76af57627..000000000 --- a/libc/kernel/common/linux/ata.h +++ /dev/null @@ -1,265 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_ATA_H__ -#define __LINUX_ATA_H__ - -#include - -#define ATA_DMA_BOUNDARY 0xffffUL -#define ATA_DMA_MASK 0xffffffffULL - -enum { - - ATA_MAX_DEVICES = 2, - ATA_MAX_PRD = 256, - ATA_SECT_SIZE = 512, - - ATA_ID_WORDS = 256, - ATA_ID_SERNO_OFS = 10, - ATA_ID_FW_REV_OFS = 23, - ATA_ID_PROD_OFS = 27, - ATA_ID_OLD_PIO_MODES = 51, - ATA_ID_FIELD_VALID = 53, - ATA_ID_MWDMA_MODES = 63, - ATA_ID_PIO_MODES = 64, - ATA_ID_EIDE_DMA_MIN = 65, - ATA_ID_EIDE_PIO = 67, - ATA_ID_EIDE_PIO_IORDY = 68, - ATA_ID_UDMA_MODES = 88, - ATA_ID_MAJOR_VER = 80, - ATA_ID_PIO4 = (1 << 1), - - ATA_PCI_CTL_OFS = 2, - ATA_SERNO_LEN = 20, - ATA_UDMA0 = (1 << 0), - ATA_UDMA1 = ATA_UDMA0 | (1 << 1), - ATA_UDMA2 = ATA_UDMA1 | (1 << 2), - ATA_UDMA3 = ATA_UDMA2 | (1 << 3), - ATA_UDMA4 = ATA_UDMA3 | (1 << 4), - ATA_UDMA5 = ATA_UDMA4 | (1 << 5), - ATA_UDMA6 = ATA_UDMA5 | (1 << 6), - ATA_UDMA7 = ATA_UDMA6 | (1 << 7), - - ATA_UDMA_MASK_40C = ATA_UDMA2, - - ATA_PRD_SZ = 8, - ATA_PRD_TBL_SZ = (ATA_MAX_PRD * ATA_PRD_SZ), - ATA_PRD_EOT = (1 << 31), - - ATA_DMA_TABLE_OFS = 4, - ATA_DMA_STATUS = 2, - ATA_DMA_CMD = 0, - ATA_DMA_WR = (1 << 3), - ATA_DMA_START = (1 << 0), - ATA_DMA_INTR = (1 << 2), - ATA_DMA_ERR = (1 << 1), - ATA_DMA_ACTIVE = (1 << 0), - - ATA_HOB = (1 << 7), - ATA_NIEN = (1 << 1), - ATA_LBA = (1 << 6), - ATA_DEV1 = (1 << 4), - ATA_DEVICE_OBS = (1 << 7) | (1 << 5), - ATA_DEVCTL_OBS = (1 << 3), - ATA_BUSY = (1 << 7), - ATA_DRDY = (1 << 6), - ATA_DF = (1 << 5), - ATA_DRQ = (1 << 3), - ATA_ERR = (1 << 0), - ATA_SRST = (1 << 2), - ATA_ICRC = (1 << 7), - ATA_UNC = (1 << 6), - ATA_IDNF = (1 << 4), - ATA_ABORTED = (1 << 2), - - ATA_REG_DATA = 0x00, - ATA_REG_ERR = 0x01, - ATA_REG_NSECT = 0x02, - ATA_REG_LBAL = 0x03, - ATA_REG_LBAM = 0x04, - ATA_REG_LBAH = 0x05, - ATA_REG_DEVICE = 0x06, - ATA_REG_STATUS = 0x07, - - ATA_REG_FEATURE = ATA_REG_ERR, - ATA_REG_CMD = ATA_REG_STATUS, - ATA_REG_BYTEL = ATA_REG_LBAM, - ATA_REG_BYTEH = ATA_REG_LBAH, - ATA_REG_DEVSEL = ATA_REG_DEVICE, - ATA_REG_IRQ = ATA_REG_NSECT, - - ATA_CMD_CHK_POWER = 0xE5, - ATA_CMD_STANDBY = 0xE2, - ATA_CMD_IDLE = 0xE3, - ATA_CMD_EDD = 0x90, - ATA_CMD_FLUSH = 0xE7, - ATA_CMD_FLUSH_EXT = 0xEA, - ATA_CMD_ID_ATA = 0xEC, - ATA_CMD_ID_ATAPI = 0xA1, - ATA_CMD_READ = 0xC8, - ATA_CMD_READ_EXT = 0x25, - ATA_CMD_WRITE = 0xCA, - ATA_CMD_WRITE_EXT = 0x35, - ATA_CMD_WRITE_FUA_EXT = 0x3D, - ATA_CMD_FPDMA_READ = 0x60, - ATA_CMD_FPDMA_WRITE = 0x61, - ATA_CMD_PIO_READ = 0x20, - ATA_CMD_PIO_READ_EXT = 0x24, - ATA_CMD_PIO_WRITE = 0x30, - ATA_CMD_PIO_WRITE_EXT = 0x34, - ATA_CMD_READ_MULTI = 0xC4, - ATA_CMD_READ_MULTI_EXT = 0x29, - ATA_CMD_WRITE_MULTI = 0xC5, - ATA_CMD_WRITE_MULTI_EXT = 0x39, - ATA_CMD_WRITE_MULTI_FUA_EXT = 0xCE, - ATA_CMD_SET_FEATURES = 0xEF, - ATA_CMD_PACKET = 0xA0, - ATA_CMD_VERIFY = 0x40, - ATA_CMD_VERIFY_EXT = 0x42, - ATA_CMD_STANDBYNOW1 = 0xE0, - ATA_CMD_IDLEIMMEDIATE = 0xE1, - ATA_CMD_INIT_DEV_PARAMS = 0x91, - ATA_CMD_READ_NATIVE_MAX = 0xF8, - ATA_CMD_READ_NATIVE_MAX_EXT = 0x27, - ATA_CMD_READ_LOG_EXT = 0x2f, - - ATA_LOG_SATA_NCQ = 0x10, - - SETFEATURES_XFER = 0x03, - XFER_UDMA_7 = 0x47, - XFER_UDMA_6 = 0x46, - XFER_UDMA_5 = 0x45, - XFER_UDMA_4 = 0x44, - XFER_UDMA_3 = 0x43, - XFER_UDMA_2 = 0x42, - XFER_UDMA_1 = 0x41, - XFER_UDMA_0 = 0x40, - XFER_MW_DMA_2 = 0x22, - XFER_MW_DMA_1 = 0x21, - XFER_MW_DMA_0 = 0x20, - XFER_SW_DMA_2 = 0x12, - XFER_SW_DMA_1 = 0x11, - XFER_SW_DMA_0 = 0x10, - XFER_PIO_4 = 0x0C, - XFER_PIO_3 = 0x0B, - XFER_PIO_2 = 0x0A, - XFER_PIO_1 = 0x09, - XFER_PIO_0 = 0x08, - XFER_PIO_SLOW = 0x00, - - SETFEATURES_WC_ON = 0x02, - SETFEATURES_WC_OFF = 0x82, - - ATAPI_PKT_DMA = (1 << 0), - ATAPI_DMADIR = (1 << 2), - ATAPI_CDB_LEN = 16, - - ATA_CBL_NONE = 0, - ATA_CBL_PATA40 = 1, - ATA_CBL_PATA80 = 2, - ATA_CBL_PATA_UNK = 3, - ATA_CBL_SATA = 4, - - SCR_STATUS = 0, - SCR_ERROR = 1, - SCR_CONTROL = 2, - SCR_ACTIVE = 3, - SCR_NOTIFICATION = 4, - - SERR_DATA_RECOVERED = (1 << 0), - SERR_COMM_RECOVERED = (1 << 1), - SERR_DATA = (1 << 8), - SERR_PERSISTENT = (1 << 9), - SERR_PROTOCOL = (1 << 10), - SERR_INTERNAL = (1 << 11), - SERR_PHYRDY_CHG = (1 << 16), - SERR_DEV_XCHG = (1 << 26), - - ATA_TFLAG_LBA48 = (1 << 0), - ATA_TFLAG_ISADDR = (1 << 1), - ATA_TFLAG_DEVICE = (1 << 2), - ATA_TFLAG_WRITE = (1 << 3), - ATA_TFLAG_LBA = (1 << 4), - ATA_TFLAG_FUA = (1 << 5), - ATA_TFLAG_POLLING = (1 << 6), -}; - -enum ata_tf_protocols { - - ATA_PROT_UNKNOWN, - ATA_PROT_NODATA, - ATA_PROT_PIO, - ATA_PROT_DMA, - ATA_PROT_NCQ, - ATA_PROT_ATAPI, - ATA_PROT_ATAPI_NODATA, - ATA_PROT_ATAPI_DMA, -}; - -enum ata_ioctls { - ATA_IOC_GET_IO32 = 0x309, - ATA_IOC_SET_IO32 = 0x324, -}; - -struct ata_prd { - u32 addr; - u32 flags_len; -}; - -struct ata_taskfile { - unsigned long flags; - u8 protocol; - - u8 ctl; - - u8 hob_feature; - u8 hob_nsect; - u8 hob_lbal; - u8 hob_lbam; - u8 hob_lbah; - - u8 feature; - u8 nsect; - u8 lbal; - u8 lbam; - u8 lbah; - - u8 device; - - u8 command; -}; - -#define ata_id_is_ata(id) (((id)[0] & (1 << 15)) == 0) -#define ata_id_is_cfa(id) ((id)[0] == 0x848A) -#define ata_id_is_sata(id) ((id)[93] == 0) -#define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6)) -#define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5)) -#define ata_id_hpa_enabled(id) ((id)[85] & (1 << 10)) -#define ata_id_has_fua(id) ((id)[84] & (1 << 6)) -#define ata_id_has_flush(id) ((id)[83] & (1 << 12)) -#define ata_id_has_flush_ext(id) ((id)[83] & (1 << 13)) -#define ata_id_has_lba48(id) ((id)[83] & (1 << 10)) -#define ata_id_has_hpa(id) ((id)[82] & (1 << 10)) -#define ata_id_has_wcache(id) ((id)[82] & (1 << 5)) -#define ata_id_has_pm(id) ((id)[82] & (1 << 3)) -#define ata_id_has_lba(id) ((id)[49] & (1 << 9)) -#define ata_id_has_dma(id) ((id)[49] & (1 << 8)) -#define ata_id_has_ncq(id) ((id)[76] & (1 << 8)) -#define ata_id_queue_depth(id) (((id)[75] & 0x1f) + 1) -#define ata_id_removeable(id) ((id)[0] & (1 << 7)) -#define ata_id_has_dword_io(id) ((id)[50] & (1 << 0)) -#define ata_id_u32(id,n) (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)])) -#define ata_id_u64(id,n) ( ((u64) (id)[(n) + 3] << 48) | ((u64) (id)[(n) + 2] << 32) | ((u64) (id)[(n) + 1] << 16) | ((u64) (id)[(n) + 0]) ) - -#define ata_id_cdb_intr(id) (((id)[0] & 0x60) == 0x20) - -#endif diff --git a/libc/kernel/common/linux/atm.h b/libc/kernel/common/linux/atm.h deleted file mode 100644 index c9bcd702f..000000000 --- a/libc/kernel/common/linux/atm.h +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ATM_H -#define _LINUX_ATM_H - -#include -#include -#include -#include - -#define ATM_CELL_SIZE 53 -#define ATM_CELL_PAYLOAD 48 -#define ATM_AAL0_SDU 52 -#define ATM_MAX_AAL34_PDU 65535 -#define ATM_AAL5_TRAILER 8 -#define ATM_MAX_AAL5_PDU 65535 -#define ATM_MAX_CDV 9999 -#define ATM_NOT_RSV_VCI 32 - -#define ATM_MAX_VPI 255 -#define ATM_MAX_VPI_NNI 4096 -#define ATM_MAX_VCI 65535 - -#define ATM_NO_AAL 0 -#define ATM_AAL0 13 -#define ATM_AAL1 1 -#define ATM_AAL2 2 -#define ATM_AAL34 3 -#define ATM_AAL5 5 - -#define __SO_ENCODE(l,n,t) ((((l) & 0x1FF) << 22) | ((n) << 16) | sizeof(t)) -#define __SO_LEVEL_MATCH(c,m) (((c) >> 22) == ((m) & 0x1FF)) -#define __SO_NUMBER(c) (((c) >> 16) & 0x3f) -#define __SO_SIZE(c) ((c) & 0x3fff) - -#define SO_SETCLP __SO_ENCODE(SOL_ATM,0,int) - -#define SO_CIRANGE __SO_ENCODE(SOL_ATM,1,struct atm_cirange) - -#define SO_ATMQOS __SO_ENCODE(SOL_ATM,2,struct atm_qos) - -#define SO_ATMSAP __SO_ENCODE(SOL_ATM,3,struct atm_sap) - -#define SO_ATMPVC __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc) - -#define SO_MULTIPOINT __SO_ENCODE(SOL_ATM, 5, int) - -#define ATM_HDR_GFC_MASK 0xf0000000 -#define ATM_HDR_GFC_SHIFT 28 -#define ATM_HDR_VPI_MASK 0x0ff00000 -#define ATM_HDR_VPI_SHIFT 20 -#define ATM_HDR_VCI_MASK 0x000ffff0 -#define ATM_HDR_VCI_SHIFT 4 -#define ATM_HDR_PTI_MASK 0x0000000e -#define ATM_HDR_PTI_SHIFT 1 -#define ATM_HDR_CLP 0x00000001 - -#define ATM_PTI_US0 0 -#define ATM_PTI_US1 1 -#define ATM_PTI_UCES0 2 -#define ATM_PTI_UCES1 3 -#define ATM_PTI_SEGF5 4 -#define ATM_PTI_E2EF5 5 -#define ATM_PTI_RSV_RM 6 -#define ATM_PTI_RSV 7 - -#define ATM_NONE 0 -#define ATM_UBR 1 -#define ATM_CBR 2 -#define ATM_VBR 3 -#define ATM_ABR 4 -#define ATM_ANYCLASS 5 - -#define ATM_MAX_PCR -1 - -struct atm_trafprm { - unsigned char traffic_class; - int max_pcr; - int pcr; - int min_pcr; - int max_cdv; - int max_sdu; - - unsigned int icr; - unsigned int tbe; - unsigned int frtt : 24; - unsigned int rif : 4; - unsigned int rdf : 4; - unsigned int nrm_pres :1; - unsigned int trm_pres :1; - unsigned int adtf_pres :1; - unsigned int cdf_pres :1; - unsigned int nrm :3; - unsigned int trm :3; - unsigned int adtf :10; - unsigned int cdf :3; - unsigned int spare :9; -}; - -struct atm_qos { - struct atm_trafprm txtp; - struct atm_trafprm rxtp __ATM_API_ALIGN; - - unsigned char aal __ATM_API_ALIGN; -}; - -#define ATM_ITF_ANY -1 -#define ATM_VPI_ANY -1 -#define ATM_VCI_ANY -1 -#define ATM_VPI_UNSPEC -2 -#define ATM_VCI_UNSPEC -2 - -struct sockaddr_atmpvc { - unsigned short sap_family; - struct { - short itf; - short vpi; - int vci; - } sap_addr __ATM_API_ALIGN; -}; - -#define ATM_ESA_LEN 20 -#define ATM_E164_LEN 12 - -#define ATM_AFI_DCC 0x39 -#define ATM_AFI_ICD 0x47 -#define ATM_AFI_E164 0x45 -#define ATM_AFI_LOCAL 0x49 - -#define ATM_AFI_DCC_GROUP 0xBD -#define ATM_AFI_ICD_GROUP 0xC5 -#define ATM_AFI_E164_GROUP 0xC3 -#define ATM_AFI_LOCAL_GROUP 0xC7 - -#define ATM_LIJ_NONE 0 -#define ATM_LIJ 1 -#define ATM_LIJ_RPJ 2 -#define ATM_LIJ_NJ 3 - -struct sockaddr_atmsvc { - unsigned short sas_family; - struct { - unsigned char prv[ATM_ESA_LEN]; - char pub[ATM_E164_LEN+1]; - - char lij_type; - uint32_t lij_id; - } sas_addr __ATM_API_ALIGN; -}; - -typedef unsigned short atm_backend_t; -#endif diff --git a/libc/kernel/common/linux/atmapi.h b/libc/kernel/common/linux/atmapi.h deleted file mode 100644 index bee5cae1d..000000000 --- a/libc/kernel/common/linux/atmapi.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ATMAPI_H -#define _LINUX_ATMAPI_H - -#if defined(__sparc__) || defined(__ia64__) - -#define __ATM_API_ALIGN __attribute__((aligned(8))) -#else -#define __ATM_API_ALIGN -#endif - -typedef struct { unsigned char _[8]; } __ATM_API_ALIGN atm_kptr_t; - -#endif diff --git a/libc/kernel/common/linux/atmdev.h b/libc/kernel/common/linux/atmdev.h deleted file mode 100644 index 27baeb01f..000000000 --- a/libc/kernel/common/linux/atmdev.h +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_ATMDEV_H -#define LINUX_ATMDEV_H - -#include -#include -#include - -#define ESI_LEN 6 - -#define ATM_OC3_PCR (155520000/270*260/8/53) - -#define ATM_25_PCR ((25600000/8-8000)/54) - -#define ATM_OC12_PCR (622080000/1080*1040/8/53) - -#define ATM_DS3_PCR (8000*12) - -#define __AAL_STAT_ITEMS __HANDLE_ITEM(tx); __HANDLE_ITEM(tx_err); __HANDLE_ITEM(rx); __HANDLE_ITEM(rx_err); __HANDLE_ITEM(rx_drop); - -struct atm_aal_stats { -#define __HANDLE_ITEM(i) int i - __AAL_STAT_ITEMS -#undef __HANDLE_ITEM -}; - -struct atm_dev_stats { - struct atm_aal_stats aal0; - struct atm_aal_stats aal34; - struct atm_aal_stats aal5; -} __ATM_API_ALIGN; - -#define ATM_GETLINKRATE _IOW('a',ATMIOC_ITF+1,struct atmif_sioc) - -#define ATM_GETNAMES _IOW('a',ATMIOC_ITF+3,struct atm_iobuf) - -#define ATM_GETTYPE _IOW('a',ATMIOC_ITF+4,struct atmif_sioc) - -#define ATM_GETESI _IOW('a',ATMIOC_ITF+5,struct atmif_sioc) - -#define ATM_GETADDR _IOW('a',ATMIOC_ITF+6,struct atmif_sioc) - -#define ATM_RSTADDR _IOW('a',ATMIOC_ITF+7,struct atmif_sioc) - -#define ATM_ADDADDR _IOW('a',ATMIOC_ITF+8,struct atmif_sioc) - -#define ATM_DELADDR _IOW('a',ATMIOC_ITF+9,struct atmif_sioc) - -#define ATM_GETCIRANGE _IOW('a',ATMIOC_ITF+10,struct atmif_sioc) - -#define ATM_SETCIRANGE _IOW('a',ATMIOC_ITF+11,struct atmif_sioc) - -#define ATM_SETESI _IOW('a',ATMIOC_ITF+12,struct atmif_sioc) - -#define ATM_SETESIF _IOW('a',ATMIOC_ITF+13,struct atmif_sioc) - -#define ATM_ADDLECSADDR _IOW('a', ATMIOC_ITF+14, struct atmif_sioc) - -#define ATM_DELLECSADDR _IOW('a', ATMIOC_ITF+15, struct atmif_sioc) - -#define ATM_GETLECSADDR _IOW('a', ATMIOC_ITF+16, struct atmif_sioc) - -#define ATM_GETSTAT _IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc) - -#define ATM_GETSTATZ _IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc) - -#define ATM_GETLOOP _IOW('a',ATMIOC_SARCOM+2,struct atmif_sioc) - -#define ATM_SETLOOP _IOW('a',ATMIOC_SARCOM+3,struct atmif_sioc) - -#define ATM_QUERYLOOP _IOW('a',ATMIOC_SARCOM+4,struct atmif_sioc) - -#define ATM_SETSC _IOW('a',ATMIOC_SPECIAL+1,int) - -#define ATM_SETBACKEND _IOW('a',ATMIOC_SPECIAL+2,atm_backend_t) - -#define ATM_NEWBACKENDIF _IOW('a',ATMIOC_SPECIAL+3,atm_backend_t) - -#define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) - -#define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) - -#define ATM_BACKEND_RAW 0 -#define ATM_BACKEND_PPP 1 -#define ATM_BACKEND_BR2684 2 - -#define ATM_ITFTYP_LEN 8 - -#define __ATM_LM_NONE 0 -#define __ATM_LM_AAL 1 -#define __ATM_LM_ATM 2 - -#define __ATM_LM_PHY 8 -#define __ATM_LM_ANALOG 16 - -#define __ATM_LM_MKLOC(n) ((n)) -#define __ATM_LM_MKRMT(n) ((n) << 8) - -#define __ATM_LM_XTLOC(n) ((n) & 0xff) -#define __ATM_LM_XTRMT(n) (((n) >> 8) & 0xff) - -#define ATM_LM_NONE 0 - -#define ATM_LM_LOC_AAL __ATM_LM_MKLOC(__ATM_LM_AAL) -#define ATM_LM_LOC_ATM __ATM_LM_MKLOC(__ATM_LM_ATM) -#define ATM_LM_LOC_PHY __ATM_LM_MKLOC(__ATM_LM_PHY) -#define ATM_LM_LOC_ANALOG __ATM_LM_MKLOC(__ATM_LM_ANALOG) - -#define ATM_LM_RMT_AAL __ATM_LM_MKRMT(__ATM_LM_AAL) -#define ATM_LM_RMT_ATM __ATM_LM_MKRMT(__ATM_LM_ATM) -#define ATM_LM_RMT_PHY __ATM_LM_MKRMT(__ATM_LM_PHY) -#define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG) - -struct atm_iobuf { - int length; - void __user *buffer; -}; - -#define ATM_CI_MAX -1 - -struct atm_cirange { - signed char vpi_bits; - signed char vci_bits; -}; - -#define ATM_SC_RX 1024 -#define ATM_SC_TX 2048 - -#define ATM_BACKLOG_DEFAULT 32 - -#define ATM_MF_IMMED 1 -#define ATM_MF_INC_RSV 2 -#define ATM_MF_INC_SHP 4 -#define ATM_MF_DEC_RSV 8 -#define ATM_MF_DEC_SHP 16 -#define ATM_MF_BWD 32 - -#define ATM_MF_SET (ATM_MF_INC_RSV | ATM_MF_INC_SHP | ATM_MF_DEC_RSV | ATM_MF_DEC_SHP | ATM_MF_BWD) - -#define ATM_VS_IDLE 0 -#define ATM_VS_CONNECTED 1 -#define ATM_VS_CLOSING 2 -#define ATM_VS_LISTEN 3 -#define ATM_VS_INUSE 4 -#define ATM_VS_BOUND 5 - -#define ATM_VS2TXT_MAP "IDLE", "CONNECTED", "CLOSING", "LISTEN", "INUSE", "BOUND" - -#define ATM_VF2TXT_MAP "ADDR", "READY", "PARTIAL", "REGIS", "RELEASED", "HASQOS", "LISTEN", "META", "256", "512", "1024", "2048", "SESSION", "HASSAP", "BOUND", "CLOSE" - -#endif diff --git a/libc/kernel/common/linux/atmioc.h b/libc/kernel/common/linux/atmioc.h deleted file mode 100644 index d004339f5..000000000 --- a/libc/kernel/common/linux/atmioc.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ATMIOC_H -#define _LINUX_ATMIOC_H - -#include - -#define ATMIOC_PHYCOM 0x00 -#define ATMIOC_PHYCOM_END 0x0f -#define ATMIOC_PHYTYP 0x10 -#define ATMIOC_PHYTYP_END 0x2f -#define ATMIOC_PHYPRV 0x30 -#define ATMIOC_PHYPRV_END 0x4f -#define ATMIOC_SARCOM 0x50 -#define ATMIOC_SARCOM_END 0x50 -#define ATMIOC_SARPRV 0x60 -#define ATMIOC_SARPRV_END 0x7f -#define ATMIOC_ITF 0x80 -#define ATMIOC_ITF_END 0x8f -#define ATMIOC_BACKEND 0x90 -#define ATMIOC_BACKEND_END 0xaf - -#define ATMIOC_AREQUIPA 0xc0 -#define ATMIOC_LANE 0xd0 -#define ATMIOC_MPOA 0xd8 -#define ATMIOC_CLIP 0xe0 -#define ATMIOC_CLIP_END 0xef -#define ATMIOC_SPECIAL 0xf0 -#define ATMIOC_SPECIAL_END 0xff - -#endif diff --git a/libc/kernel/common/linux/atmppp.h b/libc/kernel/common/linux/atmppp.h deleted file mode 100644 index 3330c32fb..000000000 --- a/libc/kernel/common/linux/atmppp.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ATMPPP_H -#define _LINUX_ATMPPP_H - -#include - -#define PPPOATM_ENCAPS_AUTODETECT (0) -#define PPPOATM_ENCAPS_VC (1) -#define PPPOATM_ENCAPS_LLC (2) - -struct atm_backend_ppp { - atm_backend_t backend_num; - int encaps; -}; - -#endif diff --git a/libc/kernel/common/linux/atmsap.h b/libc/kernel/common/linux/atmsap.h deleted file mode 100644 index 456f75f6f..000000000 --- a/libc/kernel/common/linux/atmsap.h +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ATMSAP_H -#define _LINUX_ATMSAP_H - -#include - -#define ATM_L2_NONE 0 -#define ATM_L2_ISO1745 0x01 -#define ATM_L2_Q291 0x02 -#define ATM_L2_X25_LL 0x06 -#define ATM_L2_X25_ML 0x07 -#define ATM_L2_LAPB 0x08 -#define ATM_L2_HDLC_ARM 0x09 -#define ATM_L2_HDLC_NRM 0x0a -#define ATM_L2_HDLC_ABM 0x0b -#define ATM_L2_ISO8802 0x0c -#define ATM_L2_X75 0x0d -#define ATM_L2_Q922 0x0e -#define ATM_L2_USER 0x10 -#define ATM_L2_ISO7776 0x11 - -#define ATM_L3_NONE 0 -#define ATM_L3_X25 0x06 -#define ATM_L3_ISO8208 0x07 -#define ATM_L3_X223 0x08 -#define ATM_L3_ISO8473 0x09 -#define ATM_L3_T70 0x0a -#define ATM_L3_TR9577 0x0b -#define ATM_L3_H310 0x0c -#define ATM_L3_H321 0x0d -#define ATM_L3_USER 0x10 - -#define ATM_HL_NONE 0 -#define ATM_HL_ISO 0x01 -#define ATM_HL_USER 0x02 -#define ATM_HL_HLP 0x03 -#define ATM_HL_VENDOR 0x04 - -#define ATM_IMD_NONE 0 -#define ATM_IMD_NORMAL 1 -#define ATM_IMD_EXTENDED 2 - -#define ATM_TT_NONE 0 -#define ATM_TT_RX 1 -#define ATM_TT_TX 2 -#define ATM_TT_RXTX 3 - -#define ATM_MC_NONE 0 -#define ATM_MC_TS 1 -#define ATM_MC_TS_FEC 2 -#define ATM_MC_PS 3 -#define ATM_MC_PS_FEC 4 -#define ATM_MC_H221 5 - -#define ATM_MAX_HLI 8 - -struct atm_blli { - unsigned char l2_proto; - union { - struct { - unsigned char mode; - - unsigned char window; - } itu; - unsigned char user; - } l2; - unsigned char l3_proto; - union { - struct { - unsigned char mode; - - unsigned char def_size; - - unsigned char window; - } itu; - unsigned char user; - struct { - unsigned char term_type; - unsigned char fw_mpx_cap; - - unsigned char bw_mpx_cap; - - } h310; - struct { - unsigned char ipi; - unsigned char snap[5]; - - } tr9577; - } l3; -} __ATM_API_ALIGN; - -struct atm_bhli { - unsigned char hl_type; - unsigned char hl_length; - - unsigned char hl_info[ATM_MAX_HLI]; -}; - -#define ATM_MAX_BLLI 3 - -struct atm_sap { - struct atm_bhli bhli; - struct atm_blli blli[ATM_MAX_BLLI] __ATM_API_ALIGN; - -}; - -#endif diff --git a/libc/kernel/common/linux/attribute_container.h b/libc/kernel/common/linux/attribute_container.h deleted file mode 100644 index 1a9bfb059..000000000 --- a/libc/kernel/common/linux/attribute_container.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ATTRIBUTE_CONTAINER_H_ -#define _ATTRIBUTE_CONTAINER_H_ - -#include -#include -#include -#include - -struct attribute_container { - struct list_head node; - struct klist containers; - struct class *class; - struct class_device_attribute **attrs; - int (*match)(struct attribute_container *, struct device *); -#define ATTRIBUTE_CONTAINER_NO_CLASSDEVS 0x01 - unsigned long flags; -}; - -struct attribute_container *attribute_container_classdev_to_container(struct class_device *); -struct class_device *attribute_container_find_class_device(struct attribute_container *, struct device *); -struct class_device_attribute **attribute_container_classdev_to_attrs(const struct class_device *classdev); - -#endif diff --git a/libc/kernel/common/linux/auto_fs.h b/libc/kernel/common/linux/auto_fs.h deleted file mode 100644 index 3711cc455..000000000 --- a/libc/kernel/common/linux/auto_fs.h +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_AUTO_FS_H -#define _LINUX_AUTO_FS_H - -#include - -#define AUTOFS_PROTO_VERSION 3 - -#define AUTOFS_MAX_PROTO_VERSION AUTOFS_PROTO_VERSION -#define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION - -#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) || defined(__powerpc__) || defined(__s390__) -typedef unsigned int autofs_wqt_t; -#else -typedef unsigned long autofs_wqt_t; -#endif - -#define autofs_ptype_missing 0 -#define autofs_ptype_expire 1 - -struct autofs_packet_hdr { - int proto_version; - int type; -}; - -struct autofs_packet_missing { - struct autofs_packet_hdr hdr; - autofs_wqt_t wait_queue_token; - int len; - char name[NAME_MAX+1]; -}; - -struct autofs_packet_expire { - struct autofs_packet_hdr hdr; - int len; - char name[NAME_MAX+1]; -}; - -#define AUTOFS_IOC_READY _IO(0x93,0x60) -#define AUTOFS_IOC_FAIL _IO(0x93,0x61) -#define AUTOFS_IOC_CATATONIC _IO(0x93,0x62) -#define AUTOFS_IOC_PROTOVER _IOR(0x93,0x63,int) -#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long) -#define AUTOFS_IOC_EXPIRE _IOR(0x93,0x65,struct autofs_packet_expire) - -#endif diff --git a/libc/kernel/common/linux/autoconf.h b/libc/kernel/common/linux/autoconf.h deleted file mode 100644 index 306bf12bf..000000000 --- a/libc/kernel/common/linux/autoconf.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_AUTOCONF_CRAP_GOES_HERE -#define LINUX_AUTOCONF_CRAP_GOES_HERE - -#define AUTOCONF_INCLUDED - -#endif diff --git a/libc/kernel/common/linux/auxvec.h b/libc/kernel/common/linux/auxvec.h deleted file mode 100644 index f8a07011e..000000000 --- a/libc/kernel/common/linux/auxvec.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_AUXVEC_H -#define _LINUX_AUXVEC_H - -#include - -#define AT_NULL 0 -#define AT_IGNORE 1 -#define AT_EXECFD 2 -#define AT_PHDR 3 -#define AT_PHENT 4 -#define AT_PHNUM 5 -#define AT_PAGESZ 6 -#define AT_BASE 7 -#define AT_FLAGS 8 -#define AT_ENTRY 9 -#define AT_NOTELF 10 -#define AT_UID 11 -#define AT_EUID 12 -#define AT_GID 13 -#define AT_EGID 14 -#define AT_PLATFORM 15 -#define AT_HWCAP 16 -#define AT_CLKTCK 17 - -#define AT_SECURE 23 - -#define AT_VECTOR_SIZE 44 - -#endif diff --git a/libc/kernel/common/linux/backing-dev.h b/libc/kernel/common/linux/backing-dev.h deleted file mode 100644 index 4996d2c0d..000000000 --- a/libc/kernel/common/linux/backing-dev.h +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BACKING_DEV_H -#define _LINUX_BACKING_DEV_H - -#include - -enum bdi_state { - BDI_pdflush, - BDI_write_congested, - BDI_read_congested, - BDI_unused, -}; - -typedef int (congested_fn)(void *, int); - -struct backing_dev_info { - unsigned long ra_pages; - unsigned long state; - unsigned int capabilities; - congested_fn *congested_fn; - void *congested_data; - void (*unplug_io_fn)(struct backing_dev_info *, struct page *); - void *unplug_io_data; -}; - -#define BDI_CAP_NO_ACCT_DIRTY 0x00000001 -#define BDI_CAP_NO_WRITEBACK 0x00000002 -#define BDI_CAP_MAP_COPY 0x00000004 -#define BDI_CAP_MAP_DIRECT 0x00000008 -#define BDI_CAP_READ_MAP 0x00000010 -#define BDI_CAP_WRITE_MAP 0x00000020 -#define BDI_CAP_EXEC_MAP 0x00000040 -#define BDI_CAP_VMFLAGS (BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP) - -#if defined(VM_MAYREAD) && BDI_CAP_READ_MAP != (VM_MAYREAD || BDI_CAP_WRITE_MAP != (VM_MAYWRITE || BDI_CAP_EXEC_MAP != VM_MAYEXEC)) -#error please change backing_dev_info::capabilities flags -#endif - -#define bdi_cap_writeback_dirty(bdi) (!((bdi)->capabilities & BDI_CAP_NO_WRITEBACK)) -#define bdi_cap_account_dirty(bdi) (!((bdi)->capabilities & BDI_CAP_NO_ACCT_DIRTY)) -#define mapping_cap_writeback_dirty(mapping) bdi_cap_writeback_dirty((mapping)->backing_dev_info) -#define mapping_cap_account_dirty(mapping) bdi_cap_account_dirty((mapping)->backing_dev_info) -#endif diff --git a/libc/kernel/common/linux/binder.h b/libc/kernel/common/linux/binder.h deleted file mode 100644 index b97eafb31..000000000 --- a/libc/kernel/common/linux/binder.h +++ /dev/null @@ -1,186 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BINDER_H -#define _LINUX_BINDER_H - -#include - -#define B_PACK_CHARS(c1, c2, c3, c4) ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4)) -#define B_TYPE_LARGE 0x85 - -enum { - BINDER_TYPE_BINDER = B_PACK_CHARS('s', 'b', '*', B_TYPE_LARGE), - BINDER_TYPE_WEAK_BINDER = B_PACK_CHARS('w', 'b', '*', B_TYPE_LARGE), - BINDER_TYPE_HANDLE = B_PACK_CHARS('s', 'h', '*', B_TYPE_LARGE), - BINDER_TYPE_WEAK_HANDLE = B_PACK_CHARS('w', 'h', '*', B_TYPE_LARGE), - BINDER_TYPE_FD = B_PACK_CHARS('f', 'd', '*', B_TYPE_LARGE), -}; - -enum { - FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff, - FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100, -}; - -struct flat_binder_object { - - unsigned long type; - unsigned long flags; - - union { - void *binder; - signed long handle; - }; - - void *cookie; -}; - -struct binder_write_read { - signed long write_size; - signed long write_consumed; - unsigned long write_buffer; - signed long read_size; - signed long read_consumed; - unsigned long read_buffer; -}; - -struct binder_version { - - signed long protocol_version; -}; - -#define BINDER_CURRENT_PROTOCOL_VERSION 7 - -#define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read) -#define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, int64_t) -#define BINDER_SET_MAX_THREADS _IOW('b', 5, size_t) -#define BINDER_SET_IDLE_PRIORITY _IOW('b', 6, int) -#define BINDER_SET_CONTEXT_MGR _IOW('b', 7, int) -#define BINDER_THREAD_EXIT _IOW('b', 8, int) -#define BINDER_VERSION _IOWR('b', 9, struct binder_version) - -enum transaction_flags { - TF_ONE_WAY = 0x01, - TF_ROOT_OBJECT = 0x04, - TF_STATUS_CODE = 0x08, - TF_ACCEPT_FDS = 0x10, -}; - -struct binder_transaction_data { - - union { - size_t handle; - void *ptr; - } target; - void *cookie; - unsigned int code; - - unsigned int flags; - pid_t sender_pid; - uid_t sender_euid; - size_t data_size; - size_t offsets_size; - - union { - struct { - - const void *buffer; - - const void *offsets; - } ptr; - uint8_t buf[8]; - } data; -}; - -struct binder_ptr_cookie { - void *ptr; - void *cookie; -}; - -struct binder_pri_desc { - int priority; - int desc; -}; - -struct binder_pri_ptr_cookie { - int priority; - void *ptr; - void *cookie; -}; - -enum BinderDriverReturnProtocol { - BR_ERROR = _IOR_BAD('r', 0, int), - - BR_OK = _IO('r', 1), - - BR_TRANSACTION = _IOR_BAD('r', 2, struct binder_transaction_data), - BR_REPLY = _IOR_BAD('r', 3, struct binder_transaction_data), - - BR_ACQUIRE_RESULT = _IOR_BAD('r', 4, int), - - BR_DEAD_REPLY = _IO('r', 5), - - BR_TRANSACTION_COMPLETE = _IO('r', 6), - - BR_INCREFS = _IOR_BAD('r', 7, struct binder_ptr_cookie), - BR_ACQUIRE = _IOR_BAD('r', 8, struct binder_ptr_cookie), - BR_RELEASE = _IOR_BAD('r', 9, struct binder_ptr_cookie), - BR_DECREFS = _IOR_BAD('r', 10, struct binder_ptr_cookie), - - BR_ATTEMPT_ACQUIRE = _IOR_BAD('r', 11, struct binder_pri_ptr_cookie), - - BR_NOOP = _IO('r', 12), - - BR_SPAWN_LOOPER = _IO('r', 13), - - BR_FINISHED = _IO('r', 14), - - BR_DEAD_BINDER = _IOR_BAD('r', 15, void *), - - BR_CLEAR_DEATH_NOTIFICATION_DONE = _IOR_BAD('r', 16, void *), - - BR_FAILED_REPLY = _IO('r', 17), - -}; - -enum BinderDriverCommandProtocol { - BC_TRANSACTION = _IOW_BAD('c', 0, struct binder_transaction_data), - BC_REPLY = _IOW_BAD('c', 1, struct binder_transaction_data), - - BC_ACQUIRE_RESULT = _IOW_BAD('c', 2, int), - - BC_FREE_BUFFER = _IOW_BAD('c', 3, int), - - BC_INCREFS = _IOW_BAD('c', 4, int), - BC_ACQUIRE = _IOW_BAD('c', 5, int), - BC_RELEASE = _IOW_BAD('c', 6, int), - BC_DECREFS = _IOW_BAD('c', 7, int), - - BC_INCREFS_DONE = _IOW_BAD('c', 8, struct binder_ptr_cookie), - BC_ACQUIRE_DONE = _IOW_BAD('c', 9, struct binder_ptr_cookie), - - BC_ATTEMPT_ACQUIRE = _IOW_BAD('c', 10, struct binder_pri_desc), - - BC_REGISTER_LOOPER = _IO('c', 11), - - BC_ENTER_LOOPER = _IO('c', 12), - BC_EXIT_LOOPER = _IO('c', 13), - - BC_REQUEST_DEATH_NOTIFICATION = _IOW_BAD('c', 14, struct binder_ptr_cookie), - - BC_CLEAR_DEATH_NOTIFICATION = _IOW_BAD('c', 15, struct binder_ptr_cookie), - - BC_DEAD_BINDER_DONE = _IOW_BAD('c', 16, void *), - -}; - -#endif - diff --git a/libc/kernel/common/linux/binfmts.h b/libc/kernel/common/linux/binfmts.h deleted file mode 100644 index 3335985d0..000000000 --- a/libc/kernel/common/linux/binfmts.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BINFMTS_H -#define _LINUX_BINFMTS_H - -#include - -struct pt_regs; - -#define MAX_ARG_PAGES 32 - -#define BINPRM_BUF_SIZE 128 - -#endif diff --git a/libc/kernel/common/linux/bio.h b/libc/kernel/common/linux/bio.h deleted file mode 100644 index 4e913146a..000000000 --- a/libc/kernel/common/linux/bio.h +++ /dev/null @@ -1,171 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_BIO_H -#define __LINUX_BIO_H - -#include -#include -#include - -#include - -#if defined(BIO_VMERGE_MAX_SIZE) && defined(BIO_VMERGE_BOUNDARY) -#define BIOVEC_VIRT_START_SIZE(x) (bvec_to_phys(x) & (BIO_VMERGE_BOUNDARY - 1)) -#define BIOVEC_VIRT_OVERSIZE(x) ((x) > BIO_VMERGE_MAX_SIZE) -#else -#define BIOVEC_VIRT_START_SIZE(x) 0 -#define BIOVEC_VIRT_OVERSIZE(x) 0 -#endif - -#ifndef BIO_VMERGE_BOUNDARY -#define BIO_VMERGE_BOUNDARY 0 -#endif - -#define BIO_DEBUG - -#ifdef BIO_DEBUG -#define BIO_BUG_ON BUG_ON -#else -#define BIO_BUG_ON -#endif - -#define BIO_MAX_PAGES 256 -#define BIO_MAX_SIZE (BIO_MAX_PAGES << PAGE_CACHE_SHIFT) -#define BIO_MAX_SECTORS (BIO_MAX_SIZE >> 9) - -struct bio_vec { - struct page *bv_page; - unsigned int bv_len; - unsigned int bv_offset; -}; - -struct bio_set; -struct bio; -typedef int (bio_end_io_t) (struct bio *, unsigned int, int); -typedef void (bio_destructor_t) (struct bio *); - -struct bio { - sector_t bi_sector; - struct bio *bi_next; - struct block_device *bi_bdev; - unsigned long bi_flags; - unsigned long bi_rw; - - unsigned short bi_vcnt; - unsigned short bi_idx; - - unsigned short bi_phys_segments; - - unsigned short bi_hw_segments; - - unsigned int bi_size; - - unsigned int bi_hw_front_size; - unsigned int bi_hw_back_size; - - unsigned int bi_max_vecs; - - struct bio_vec *bi_io_vec; - - bio_end_io_t *bi_end_io; - atomic_t bi_cnt; - - void *bi_private; - - bio_destructor_t *bi_destructor; -}; - -#define BIO_UPTODATE 0 -#define BIO_RW_BLOCK 1 -#define BIO_EOF 2 -#define BIO_SEG_VALID 3 -#define BIO_CLONED 4 -#define BIO_BOUNCED 5 -#define BIO_USER_MAPPED 6 -#define BIO_EOPNOTSUPP 7 -#define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag))) - -#define BIO_POOL_BITS (4) -#define BIO_POOL_OFFSET (BITS_PER_LONG - BIO_POOL_BITS) -#define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET) -#define BIO_POOL_IDX(bio) ((bio)->bi_flags >> BIO_POOL_OFFSET) - -#define BIO_RW 0 -#define BIO_RW_AHEAD 1 -#define BIO_RW_BARRIER 2 -#define BIO_RW_FAILFAST 3 -#define BIO_RW_SYNC 4 - -#define BIO_PRIO_SHIFT (8 * sizeof(unsigned long) - IOPRIO_BITS) -#define bio_prio(bio) ((bio)->bi_rw >> BIO_PRIO_SHIFT) -#define bio_prio_valid(bio) ioprio_valid(bio_prio(bio)) - -#define bio_set_prio(bio, prio) do { WARN_ON(prio >= (1 << IOPRIO_BITS)); (bio)->bi_rw &= ((1UL << BIO_PRIO_SHIFT) - 1); (bio)->bi_rw |= ((unsigned long) (prio) << BIO_PRIO_SHIFT); } while (0) - -#define bio_iovec_idx(bio, idx) (&((bio)->bi_io_vec[(idx)])) -#define bio_iovec(bio) bio_iovec_idx((bio), (bio)->bi_idx) -#define bio_page(bio) bio_iovec((bio))->bv_page -#define bio_offset(bio) bio_iovec((bio))->bv_offset -#define bio_segments(bio) ((bio)->bi_vcnt - (bio)->bi_idx) -#define bio_sectors(bio) ((bio)->bi_size >> 9) -#define bio_cur_sectors(bio) (bio_iovec(bio)->bv_len >> 9) -#define bio_data(bio) (page_address(bio_page((bio))) + bio_offset((bio))) -#define bio_barrier(bio) ((bio)->bi_rw & (1 << BIO_RW_BARRIER)) -#define bio_sync(bio) ((bio)->bi_rw & (1 << BIO_RW_SYNC)) -#define bio_failfast(bio) ((bio)->bi_rw & (1 << BIO_RW_FAILFAST)) -#define bio_rw_ahead(bio) ((bio)->bi_rw & (1 << BIO_RW_AHEAD)) - -#define bio_to_phys(bio) (page_to_phys(bio_page((bio))) + (unsigned long) bio_offset((bio))) -#define bvec_to_phys(bv) (page_to_phys((bv)->bv_page) + (unsigned long) (bv)->bv_offset) - -#define __bio_kmap_atomic(bio, idx, kmtype) (kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page, kmtype) + bio_iovec_idx((bio), (idx))->bv_offset) - -#define __bio_kunmap_atomic(addr, kmtype) kunmap_atomic(addr, kmtype) - -#define __BVEC_END(bio) bio_iovec_idx((bio), (bio)->bi_vcnt - 1) -#define __BVEC_START(bio) bio_iovec_idx((bio), (bio)->bi_idx) - -#ifndef BIOVEC_PHYS_MERGEABLE -#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) -#endif - -#define BIOVEC_VIRT_MERGEABLE(vec1, vec2) ((((bvec_to_phys((vec1)) + (vec1)->bv_len) | bvec_to_phys((vec2))) & (BIO_VMERGE_BOUNDARY - 1)) == 0) -#define __BIO_SEG_BOUNDARY(addr1, addr2, mask) (((addr1) | (mask)) == (((addr2) - 1) | (mask))) -#define BIOVEC_SEG_BOUNDARY(q, b1, b2) __BIO_SEG_BOUNDARY(bvec_to_phys((b1)), bvec_to_phys((b2)) + (b2)->bv_len, (q)->seg_boundary_mask) -#define BIO_SEG_BOUNDARY(q, b1, b2) BIOVEC_SEG_BOUNDARY((q), __BVEC_END((b1)), __BVEC_START((b2))) - -#define bio_io_error(bio, bytes) bio_endio((bio), (bytes), -EIO) - -#define __bio_for_each_segment(bvl, bio, i, start_idx) for (bvl = bio_iovec_idx((bio), (start_idx)), i = (start_idx); i < (bio)->bi_vcnt; bvl++, i++) - -#define bio_for_each_segment(bvl, bio, i) __bio_for_each_segment(bvl, bio, i, (bio)->bi_idx) - -#define bio_get(bio) atomic_inc(&(bio)->bi_cnt) - -struct bio_pair { - struct bio bio1, bio2; - struct bio_vec bv1, bv2; - atomic_t cnt; - int error; -}; - -struct request_queue; - -struct sg_iovec; - -#define bvec_kmap_irq(bvec, flags) (page_address((bvec)->bv_page) + (bvec)->bv_offset) -#define bvec_kunmap_irq(buf, flags) do { *(flags) = 0; } while (0) - -#define __bio_kunmap_irq(buf, flags) bvec_kunmap_irq(buf, flags) -#define bio_kmap_irq(bio, flags) __bio_kmap_irq((bio), (bio)->bi_idx, (flags)) -#define bio_kunmap_irq(buf,flags) __bio_kunmap_irq(buf, flags) -#endif diff --git a/libc/kernel/common/linux/bitmap.h b/libc/kernel/common/linux/bitmap.h deleted file mode 100644 index 246d158a0..000000000 --- a/libc/kernel/common/linux/bitmap.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_BITMAP_H -#define __LINUX_BITMAP_H - -#ifndef __ASSEMBLY__ - -#include -#include -#include - -#define BITMAP_LAST_WORD_MASK(nbits) ( ((nbits) % BITS_PER_LONG) ? (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL ) - -#endif -#endif diff --git a/libc/kernel/common/linux/bitops.h b/libc/kernel/common/linux/bitops.h deleted file mode 100644 index f8df614eb..000000000 --- a/libc/kernel/common/linux/bitops.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BITOPS_H -#define _LINUX_BITOPS_H -#include - -#include - -#endif diff --git a/libc/kernel/common/linux/blkdev.h b/libc/kernel/common/linux/blkdev.h deleted file mode 100644 index 30045246a..000000000 --- a/libc/kernel/common/linux/blkdev.h +++ /dev/null @@ -1,461 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BLKDEV_H -#define _LINUX_BLKDEV_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -struct scsi_ioctl_command; - -struct request_queue; -typedef struct request_queue request_queue_t; -struct elevator_queue; -typedef struct elevator_queue elevator_t; -struct request_pm_state; -struct blk_trace; - -#define BLKDEV_MIN_RQ 4 -#define BLKDEV_MAX_RQ 128 - -struct as_io_context { - spinlock_t lock; - - void (*dtor)(struct as_io_context *aic); - void (*exit)(struct as_io_context *aic); - - unsigned long state; - atomic_t nr_queued; - atomic_t nr_dispatched; - - unsigned long last_end_request; - unsigned long ttime_total; - unsigned long ttime_samples; - unsigned long ttime_mean; - - unsigned int seek_samples; - sector_t last_request_pos; - u64 seek_total; - sector_t seek_mean; -}; - -struct cfq_queue; -struct cfq_io_context { - struct rb_node rb_node; - void *key; - - struct cfq_queue *cfqq[2]; - - struct io_context *ioc; - - unsigned long last_end_request; - sector_t last_request_pos; - unsigned long last_queue; - - unsigned long ttime_total; - unsigned long ttime_samples; - unsigned long ttime_mean; - - unsigned int seek_samples; - u64 seek_total; - sector_t seek_mean; - - struct list_head queue_list; - - void (*dtor)(struct io_context *); - void (*exit)(struct io_context *); -}; - -struct io_context { - atomic_t refcount; - struct task_struct *task; - - int (*set_ioprio)(struct io_context *, unsigned int); - - unsigned long last_waited; - int nr_batch_requests; - - struct as_io_context *aic; - struct rb_root cic_root; -}; - -struct io_context *current_io_context(gfp_t gfp_flags); -struct io_context *get_io_context(gfp_t gfp_flags); - -struct request; -typedef void (rq_end_io_fn)(struct request *, int); - -struct request_list { - int count[2]; - int starved[2]; - int elvpriv; - mempool_t *rq_pool; - wait_queue_head_t wait[2]; -}; - -#define BLK_MAX_CDB 16 - -struct request { - struct list_head queuelist; - struct list_head donelist; - - unsigned long flags; - - sector_t sector; - unsigned long nr_sectors; - - unsigned int current_nr_sectors; - - sector_t hard_sector; - unsigned long hard_nr_sectors; - - unsigned int hard_cur_sectors; - - struct bio *bio; - struct bio *biotail; - - void *elevator_private; - void *completion_data; - - int rq_status; - int errors; - struct gendisk *rq_disk; - unsigned long start_time; - - unsigned short nr_phys_segments; - - unsigned short nr_hw_segments; - - unsigned short ioprio; - - int tag; - - int ref_count; - request_queue_t *q; - struct request_list *rl; - - struct completion *waiting; - void *special; - char *buffer; - - unsigned int cmd_len; - unsigned char cmd[BLK_MAX_CDB]; - - unsigned int data_len; - unsigned int sense_len; - void *data; - void *sense; - - unsigned int timeout; - int retries; - - rq_end_io_fn *end_io; - void *end_io_data; -}; - -enum rq_flag_bits { - __REQ_RW, - __REQ_FAILFAST, - __REQ_SORTED, - __REQ_SOFTBARRIER, - __REQ_HARDBARRIER, - __REQ_FUA, - __REQ_CMD, - __REQ_NOMERGE, - __REQ_STARTED, - __REQ_DONTPREP, - __REQ_QUEUED, - __REQ_ELVPRIV, - - __REQ_PC, - __REQ_BLOCK_PC, - __REQ_SENSE, - - __REQ_FAILED, - __REQ_QUIET, - __REQ_SPECIAL, - __REQ_DRIVE_CMD, - __REQ_DRIVE_TASK, - __REQ_DRIVE_TASKFILE, - __REQ_PREEMPT, - __REQ_PM_SUSPEND, - __REQ_PM_RESUME, - __REQ_PM_SHUTDOWN, - __REQ_ORDERED_COLOR, - __REQ_RW_SYNC, - __REQ_NR_BITS, -}; - -#define REQ_RW (1 << __REQ_RW) -#define REQ_FAILFAST (1 << __REQ_FAILFAST) -#define REQ_SORTED (1 << __REQ_SORTED) -#define REQ_SOFTBARRIER (1 << __REQ_SOFTBARRIER) -#define REQ_HARDBARRIER (1 << __REQ_HARDBARRIER) -#define REQ_FUA (1 << __REQ_FUA) -#define REQ_CMD (1 << __REQ_CMD) -#define REQ_NOMERGE (1 << __REQ_NOMERGE) -#define REQ_STARTED (1 << __REQ_STARTED) -#define REQ_DONTPREP (1 << __REQ_DONTPREP) -#define REQ_QUEUED (1 << __REQ_QUEUED) -#define REQ_ELVPRIV (1 << __REQ_ELVPRIV) -#define REQ_PC (1 << __REQ_PC) -#define REQ_BLOCK_PC (1 << __REQ_BLOCK_PC) -#define REQ_SENSE (1 << __REQ_SENSE) -#define REQ_FAILED (1 << __REQ_FAILED) -#define REQ_QUIET (1 << __REQ_QUIET) -#define REQ_SPECIAL (1 << __REQ_SPECIAL) -#define REQ_DRIVE_CMD (1 << __REQ_DRIVE_CMD) -#define REQ_DRIVE_TASK (1 << __REQ_DRIVE_TASK) -#define REQ_DRIVE_TASKFILE (1 << __REQ_DRIVE_TASKFILE) -#define REQ_PREEMPT (1 << __REQ_PREEMPT) -#define REQ_PM_SUSPEND (1 << __REQ_PM_SUSPEND) -#define REQ_PM_RESUME (1 << __REQ_PM_RESUME) -#define REQ_PM_SHUTDOWN (1 << __REQ_PM_SHUTDOWN) -#define REQ_ORDERED_COLOR (1 << __REQ_ORDERED_COLOR) -#define REQ_RW_SYNC (1 << __REQ_RW_SYNC) - -struct request_pm_state -{ - - int pm_step; - - u32 pm_state; - void* data; -}; - -#include - -typedef int (merge_request_fn) (request_queue_t *, struct request *, - struct bio *); -typedef int (merge_requests_fn) (request_queue_t *, struct request *, - struct request *); -typedef void (request_fn_proc) (request_queue_t *q); -typedef int (make_request_fn) (request_queue_t *q, struct bio *bio); -typedef int (prep_rq_fn) (request_queue_t *, struct request *); -typedef void (unplug_fn) (request_queue_t *); - -struct bio_vec; -typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *); -typedef void (activity_fn) (void *data, int rw); -typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *); -typedef void (prepare_flush_fn) (request_queue_t *, struct request *); -typedef void (softirq_done_fn)(struct request *); - -enum blk_queue_state { - Queue_down, - Queue_up, -}; - -struct blk_queue_tag { - struct request **tag_index; - unsigned long *tag_map; - struct list_head busy_list; - int busy; - int max_depth; - int real_max_depth; - atomic_t refcnt; -}; - -struct request_queue -{ - - struct list_head queue_head; - struct request *last_merge; - elevator_t *elevator; - - struct request_list rq; - - request_fn_proc *request_fn; - merge_request_fn *back_merge_fn; - merge_request_fn *front_merge_fn; - merge_requests_fn *merge_requests_fn; - make_request_fn *make_request_fn; - prep_rq_fn *prep_rq_fn; - unplug_fn *unplug_fn; - merge_bvec_fn *merge_bvec_fn; - activity_fn *activity_fn; - issue_flush_fn *issue_flush_fn; - prepare_flush_fn *prepare_flush_fn; - softirq_done_fn *softirq_done_fn; - - sector_t end_sector; - struct request *boundary_rq; - - struct timer_list unplug_timer; - int unplug_thresh; - unsigned long unplug_delay; - struct work_struct unplug_work; - - struct backing_dev_info backing_dev_info; - - void *queuedata; - - void *activity_data; - - unsigned long bounce_pfn; - gfp_t bounce_gfp; - - unsigned long queue_flags; - - spinlock_t __queue_lock; - spinlock_t *queue_lock; - - struct kobject kobj; - - unsigned long nr_requests; - unsigned int nr_congestion_on; - unsigned int nr_congestion_off; - unsigned int nr_batching; - - unsigned int max_sectors; - unsigned int max_hw_sectors; - unsigned short max_phys_segments; - unsigned short max_hw_segments; - unsigned short hardsect_size; - unsigned int max_segment_size; - - unsigned long seg_boundary_mask; - unsigned int dma_alignment; - - struct blk_queue_tag *queue_tags; - - unsigned int nr_sorted; - unsigned int in_flight; - - unsigned int sg_timeout; - unsigned int sg_reserved_size; - int node; - - struct blk_trace *blk_trace; - - unsigned int ordered, next_ordered, ordseq; - int orderr, ordcolor; - struct request pre_flush_rq, bar_rq, post_flush_rq; - struct request *orig_bar_rq; - unsigned int bi_size; - - struct mutex sysfs_lock; -}; - -#define RQ_INACTIVE (-1) -#define RQ_ACTIVE 1 - -#define QUEUE_FLAG_CLUSTER 0 -#define QUEUE_FLAG_QUEUED 1 -#define QUEUE_FLAG_STOPPED 2 -#define QUEUE_FLAG_READFULL 3 -#define QUEUE_FLAG_WRITEFULL 4 -#define QUEUE_FLAG_DEAD 5 -#define QUEUE_FLAG_REENTER 6 -#define QUEUE_FLAG_PLUGGED 7 -#define QUEUE_FLAG_ELVSWITCH 8 - -enum { - - QUEUE_ORDERED_NONE = 0x00, - QUEUE_ORDERED_DRAIN = 0x01, - QUEUE_ORDERED_TAG = 0x02, - - QUEUE_ORDERED_PREFLUSH = 0x10, - QUEUE_ORDERED_POSTFLUSH = 0x20, - QUEUE_ORDERED_FUA = 0x40, - - QUEUE_ORDERED_DRAIN_FLUSH = QUEUE_ORDERED_DRAIN | - QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH, - QUEUE_ORDERED_DRAIN_FUA = QUEUE_ORDERED_DRAIN | - QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA, - QUEUE_ORDERED_TAG_FLUSH = QUEUE_ORDERED_TAG | - QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH, - QUEUE_ORDERED_TAG_FUA = QUEUE_ORDERED_TAG | - QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA, - - QUEUE_ORDSEQ_STARTED = 0x01, - QUEUE_ORDSEQ_DRAIN = 0x02, - QUEUE_ORDSEQ_PREFLUSH = 0x04, - QUEUE_ORDSEQ_BAR = 0x08, - QUEUE_ORDSEQ_POSTFLUSH = 0x10, - QUEUE_ORDSEQ_DONE = 0x20, -}; - -#define blk_queue_plugged(q) test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags) -#define blk_queue_tagged(q) test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags) -#define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) -#define blk_queue_flushing(q) ((q)->ordseq) - -#define blk_fs_request(rq) ((rq)->flags & REQ_CMD) -#define blk_pc_request(rq) ((rq)->flags & REQ_BLOCK_PC) -#define blk_noretry_request(rq) ((rq)->flags & REQ_FAILFAST) -#define blk_rq_started(rq) ((rq)->flags & REQ_STARTED) - -#define blk_account_rq(rq) (blk_rq_started(rq) && blk_fs_request(rq)) - -#define blk_pm_suspend_request(rq) ((rq)->flags & REQ_PM_SUSPEND) -#define blk_pm_resume_request(rq) ((rq)->flags & REQ_PM_RESUME) -#define blk_pm_request(rq) ((rq)->flags & (REQ_PM_SUSPEND | REQ_PM_RESUME)) - -#define blk_sorted_rq(rq) ((rq)->flags & REQ_SORTED) -#define blk_barrier_rq(rq) ((rq)->flags & REQ_HARDBARRIER) -#define blk_fua_rq(rq) ((rq)->flags & REQ_FUA) - -#define list_entry_rq(ptr) list_entry((ptr), struct request, queuelist) - -#define rq_data_dir(rq) ((rq)->flags & 1) - -#define RQ_NOMERGE_FLAGS (REQ_NOMERGE | REQ_STARTED | REQ_HARDBARRIER | REQ_SOFTBARRIER) -#define rq_mergeable(rq) (!((rq)->flags & RQ_NOMERGE_FLAGS) && blk_fs_request((rq))) -#define blk_queue_headactive(q, head_active) -#define BLKPREP_OK 0 -#define BLKPREP_KILL 1 -#define BLKPREP_DEFER 2 - -#define BLK_BOUNCE_HIGH ((u64)blk_max_low_pfn << PAGE_SHIFT) -#define BLK_BOUNCE_ANY ((u64)blk_max_pfn << PAGE_SHIFT) -#define BLK_BOUNCE_ISA (ISA_DMA_THRESHOLD) - -#define rq_for_each_bio(_bio, rq) if ((rq->bio)) for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next) - -#define end_io_error(uptodate) (unlikely((uptodate) <= 0)) - -#define blk_queue_tag_depth(q) ((q)->queue_tags->busy) -#define blk_queue_tag_queue(q) ((q)->queue_tags->busy < (q)->queue_tags->max_depth) -#define blk_rq_tagged(rq) ((rq)->flags & REQ_QUEUED) - -#define MAX_PHYS_SEGMENTS 128 -#define MAX_HW_SEGMENTS 128 -#define SAFE_MAX_SECTORS 255 -#define BLK_DEF_MAX_SECTORS 1024 - -#define MAX_SEGMENT_SIZE 65536 - -#define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist) - -#define blk_finished_io(nsects) do { } while (0) -#define blk_started_io(nsects) do { } while (0) - -#define sector_div(n, b)( { int _res; _res = (n) % (b); (n) /= (b); _res; } ) - -#define MODULE_ALIAS_BLOCKDEV(major,minor) MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor)) -#define MODULE_ALIAS_BLOCKDEV_MAJOR(major) MODULE_ALIAS("block-major-" __stringify(major) "-*") - -#endif diff --git a/libc/kernel/common/linux/blkpg.h b/libc/kernel/common/linux/blkpg.h deleted file mode 100644 index 45a4a477c..000000000 --- a/libc/kernel/common/linux/blkpg.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BLKPG_H -#define _LINUX_BLKPG_H - -#include -#include - -#define BLKPG _IO(0x12,105) - -struct blkpg_ioctl_arg { - int op; - int flags; - int datalen; - void __user *data; -}; - -#define BLKPG_ADD_PARTITION 1 -#define BLKPG_DEL_PARTITION 2 - -#define BLKPG_DEVNAMELTH 64 -#define BLKPG_VOLNAMELTH 64 - -struct blkpg_partition { - long long start; - long long length; - int pno; - char devname[BLKPG_DEVNAMELTH]; - char volname[BLKPG_VOLNAMELTH]; -}; - -#endif diff --git a/libc/kernel/common/linux/blockgroup_lock.h b/libc/kernel/common/linux/blockgroup_lock.h deleted file mode 100644 index c81402052..000000000 --- a/libc/kernel/common/linux/blockgroup_lock.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BLOCKGROUP_LOCK_H -#define _LINUX_BLOCKGROUP_LOCK_H - -#include -#include - -#define NR_BG_LOCKS 1 - -struct bgl_lock { - spinlock_t lock; -} ____cacheline_aligned_in_smp; - -struct blockgroup_lock { - struct bgl_lock locks[NR_BG_LOCKS]; -}; - -#define sb_bgl_lock(sb, block_group) (&(sb)->s_blockgroup_lock.locks[(block_group) & (NR_BG_LOCKS-1)].lock) -#endif diff --git a/libc/kernel/common/linux/byteorder/big_endian.h b/libc/kernel/common/linux/byteorder/big_endian.h deleted file mode 100644 index ee0d8806e..000000000 --- a/libc/kernel/common/linux/byteorder/big_endian.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H -#define _LINUX_BYTEORDER_BIG_ENDIAN_H - -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN 4321 -#endif -#ifndef __BIG_ENDIAN_BITFIELD -#define __BIG_ENDIAN_BITFIELD -#endif - -#include -#include - -#define __constant_htonl(x) ((__force __be32)(__u32)(x)) -#define __constant_ntohl(x) ((__force __u32)(__be32)(x)) -#define __constant_htons(x) ((__force __be16)(__u16)(x)) -#define __constant_ntohs(x) ((__force __u16)(__be16)(x)) -#define __constant_cpu_to_le64(x) ((__force __le64)___constant_swab64((x))) -#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64)(__le64)(x)) -#define __constant_cpu_to_le32(x) ((__force __le32)___constant_swab32((x))) -#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32)(__le32)(x)) -#define __constant_cpu_to_le16(x) ((__force __le16)___constant_swab16((x))) -#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16)(__le16)(x)) -#define __constant_cpu_to_be64(x) ((__force __be64)(__u64)(x)) -#define __constant_be64_to_cpu(x) ((__force __u64)(__be64)(x)) -#define __constant_cpu_to_be32(x) ((__force __be32)(__u32)(x)) -#define __constant_be32_to_cpu(x) ((__force __u32)(__be32)(x)) -#define __constant_cpu_to_be16(x) ((__force __be16)(__u16)(x)) -#define __constant_be16_to_cpu(x) ((__force __u16)(__be16)(x)) -#define __cpu_to_le64(x) ((__force __le64)__swab64((x))) -#define __le64_to_cpu(x) __swab64((__force __u64)(__le64)(x)) -#define __cpu_to_le32(x) ((__force __le32)__swab32((x))) -#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x)) -#define __cpu_to_le16(x) ((__force __le16)__swab16((x))) -#define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x)) -#define __cpu_to_be64(x) ((__force __be64)(__u64)(x)) -#define __be64_to_cpu(x) ((__force __u64)(__be64)(x)) -#define __cpu_to_be32(x) ((__force __be32)(__u32)(x)) -#define __be32_to_cpu(x) ((__force __u32)(__be32)(x)) -#define __cpu_to_be16(x) ((__force __be16)(__u16)(x)) -#define __be16_to_cpu(x) ((__force __u16)(__be16)(x)) - -#define __cpu_to_le64s(x) __swab64s((x)) -#define __le64_to_cpus(x) __swab64s((x)) -#define __cpu_to_le32s(x) __swab32s((x)) -#define __le32_to_cpus(x) __swab32s((x)) -#define __cpu_to_le16s(x) __swab16s((x)) -#define __le16_to_cpus(x) __swab16s((x)) -#define __cpu_to_be64s(x) do {} while (0) -#define __be64_to_cpus(x) do {} while (0) -#define __cpu_to_be32s(x) do {} while (0) -#define __be32_to_cpus(x) do {} while (0) -#define __cpu_to_be16s(x) do {} while (0) -#define __be16_to_cpus(x) do {} while (0) -#include -#endif diff --git a/libc/kernel/common/linux/byteorder/generic.h b/libc/kernel/common/linux/byteorder/generic.h deleted file mode 100644 index ac469ff42..000000000 --- a/libc/kernel/common/linux/byteorder/generic.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BYTEORDER_GENERIC_H -#define _LINUX_BYTEORDER_GENERIC_H - -#endif diff --git a/libc/kernel/common/linux/byteorder/little_endian.h b/libc/kernel/common/linux/byteorder/little_endian.h deleted file mode 100644 index 2c26e9cbf..000000000 --- a/libc/kernel/common/linux/byteorder/little_endian.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H -#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H - -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN 1234 -#endif -#ifndef __LITTLE_ENDIAN_BITFIELD -#define __LITTLE_ENDIAN_BITFIELD -#endif - -#include -#include - -#define __constant_htonl(x) ((__force __be32)___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x)) -#define __constant_htons(x) ((__force __be16)___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x)) -#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x)) -#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x)) -#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x)) -#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x)) -#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x)) -#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x)) -#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x)) -#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x)) -#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x)) -#define __cpu_to_le64(x) ((__force __le64)(__u64)(x)) -#define __le64_to_cpu(x) ((__force __u64)(__le64)(x)) -#define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) -#define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) -#define __cpu_to_le16(x) ((__force __le16)(__u16)(x)) -#define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) -#define __cpu_to_be64(x) ((__force __be64)__swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x)) -#define __cpu_to_be32(x) ((__force __be32)__swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x)) -#define __cpu_to_be16(x) ((__force __be16)__swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x)) - -#define __cpu_to_le64s(x) do {} while (0) -#define __le64_to_cpus(x) do {} while (0) -#define __cpu_to_le32s(x) do {} while (0) -#define __le32_to_cpus(x) do {} while (0) -#define __cpu_to_le16s(x) do {} while (0) -#define __le16_to_cpus(x) do {} while (0) -#define __cpu_to_be64s(x) __swab64s((x)) -#define __be64_to_cpus(x) __swab64s((x)) -#define __cpu_to_be32s(x) __swab32s((x)) -#define __be32_to_cpus(x) __swab32s((x)) -#define __cpu_to_be16s(x) __swab16s((x)) -#define __be16_to_cpus(x) __swab16s((x)) -#include -#endif diff --git a/libc/kernel/common/linux/byteorder/swab.h b/libc/kernel/common/linux/byteorder/swab.h deleted file mode 100644 index 37336b590..000000000 --- a/libc/kernel/common/linux/byteorder/swab.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BYTEORDER_SWAB_H -#define _LINUX_BYTEORDER_SWAB_H - -#include - -#define ___swab16(x) ({ __u16 __x = (x); ((__u16)( (((__u16)(__x) & (__u16)0x00ffU) << 8) | (((__u16)(__x) & (__u16)0xff00U) >> 8) )); }) - -#define ___swab32(x) ({ __u32 __x = (x); ((__u32)( (((__u32)(__x) & (__u32)0x000000ffUL) << 24) | (((__u32)(__x) & (__u32)0x0000ff00UL) << 8) | (((__u32)(__x) & (__u32)0x00ff0000UL) >> 8) | (((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); }) - -#define ___swab64(x) ({ __u64 __x = (x); ((__u64)( (__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) | (__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | (__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | (__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) << 8) | (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >> 8) | (__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | (__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | (__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); }) - -#define ___constant_swab16(x) ((__u16)( (((__u16)(x) & (__u16)0x00ffU) << 8) | (((__u16)(x) & (__u16)0xff00U) >> 8) )) -#define ___constant_swab32(x) ((__u32)( (((__u32)(x) & (__u32)0x000000ffUL) << 24) | (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | (((__u32)(x) & (__u32)0xff000000UL) >> 24) )) -#define ___constant_swab64(x) ((__u64)( (__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | (__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | (__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | (__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | (__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | (__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | (__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) )) - -#ifndef __arch__swab16 -#define __arch__swab16(x) ({ __u16 __tmp = (x) ; ___swab16(__tmp); }) -#endif -#ifndef __arch__swab32 -#define __arch__swab32(x) ({ __u32 __tmp = (x) ; ___swab32(__tmp); }) -#endif -#ifndef __arch__swab64 -#define __arch__swab64(x) ({ __u64 __tmp = (x) ; ___swab64(__tmp); }) -#endif - -#ifndef __arch__swab16p -#define __arch__swab16p(x) __arch__swab16(*(x)) -#endif -#ifndef __arch__swab32p -#define __arch__swab32p(x) __arch__swab32(*(x)) -#endif -#ifndef __arch__swab64p -#define __arch__swab64p(x) __arch__swab64(*(x)) -#endif - -#ifndef __arch__swab16s -#define __arch__swab16s(x) do { *(x) = __arch__swab16p((x)); } while (0) -#endif -#ifndef __arch__swab32s -#define __arch__swab32s(x) do { *(x) = __arch__swab32p((x)); } while (0) -#endif -#ifndef __arch__swab64s -#define __arch__swab64s(x) do { *(x) = __arch__swab64p((x)); } while (0) -#endif - -#if defined(__GNUC__) && defined(__OPTIMIZE__) -#define __swab16(x) (__builtin_constant_p((__u16)(x)) ? ___swab16((x)) : __fswab16((x))) -#define __swab32(x) (__builtin_constant_p((__u32)(x)) ? ___swab32((x)) : __fswab32((x))) -#define __swab64(x) (__builtin_constant_p((__u64)(x)) ? ___swab64((x)) : __fswab64((x))) -#else -#define __swab16(x) __fswab16(x) -#define __swab32(x) __fswab32(x) -#define __swab64(x) __fswab64(x) -#endif - -#ifdef __BYTEORDER_HAS_U64__ -#ifdef __SWAB_64_THRU_32__ -#else -#endif -#endif -#endif diff --git a/libc/kernel/common/linux/byteorder/swabb.h b/libc/kernel/common/linux/byteorder/swabb.h deleted file mode 100644 index c5b6a3ebb..000000000 --- a/libc/kernel/common/linux/byteorder/swabb.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_BYTEORDER_SWABB_H -#define _LINUX_BYTEORDER_SWABB_H - -#define ___swahw32(x) ({ __u32 __x = (x); ((__u32)( (((__u32)(__x) & (__u32)0x0000ffffUL) << 16) | (((__u32)(__x) & (__u32)0xffff0000UL) >> 16) )); }) -#define ___swahb32(x) ({ __u32 __x = (x); ((__u32)( (((__u32)(__x) & (__u32)0x00ff00ffUL) << 8) | (((__u32)(__x) & (__u32)0xff00ff00UL) >> 8) )); }) - -#define ___constant_swahw32(x) ((__u32)( (((__u32)(x) & (__u32)0x0000ffffUL) << 16) | (((__u32)(x) & (__u32)0xffff0000UL) >> 16) )) -#define ___constant_swahb32(x) ((__u32)( (((__u32)(x) & (__u32)0x00ff00ffUL) << 8) | (((__u32)(x) & (__u32)0xff00ff00UL) >> 8) )) - -#ifndef __arch__swahw32 -#define __arch__swahw32(x) ___swahw32(x) -#endif -#ifndef __arch__swahb32 -#define __arch__swahb32(x) ___swahb32(x) -#endif - -#ifndef __arch__swahw32p -#define __arch__swahw32p(x) __swahw32(*(x)) -#endif -#ifndef __arch__swahb32p -#define __arch__swahb32p(x) __swahb32(*(x)) -#endif - -#ifndef __arch__swahw32s -#define __arch__swahw32s(x) do { *(x) = __swahw32p((x)); } while (0) -#endif -#ifndef __arch__swahb32s -#define __arch__swahb32s(x) do { *(x) = __swahb32p((x)); } while (0) -#endif - -#if defined(__GNUC__) && defined(__OPTIMIZE__) -#define __swahw32(x) (__builtin_constant_p((__u32)(x)) ? ___swahw32((x)) : __fswahw32((x))) -#define __swahb32(x) (__builtin_constant_p((__u32)(x)) ? ___swahb32((x)) : __fswahb32((x))) -#else -#define __swahw32(x) __fswahw32(x) -#define __swahb32(x) __fswahb32(x) -#endif - -#ifdef __BYTEORDER_HAS_U64__ -#endif -#endif diff --git a/libc/kernel/common/linux/cache.h b/libc/kernel/common/linux/cache.h deleted file mode 100644 index d2818559e..000000000 --- a/libc/kernel/common/linux/cache.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_CACHE_H -#define __LINUX_CACHE_H - -#include -#include - -#ifndef L1_CACHE_ALIGN -#define L1_CACHE_ALIGN(x) ALIGN(x, L1_CACHE_BYTES) -#endif - -#ifndef SMP_CACHE_BYTES -#define SMP_CACHE_BYTES L1_CACHE_BYTES -#endif - -#ifndef __read_mostly -#define __read_mostly -#endif - -#ifndef ____cacheline_aligned -#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) -#endif - -#ifndef ____cacheline_aligned_in_smp -#define ____cacheline_aligned_in_smp -#endif - -#ifndef __cacheline_aligned -#define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES), __section__(".data.cacheline_aligned"))) -#endif - -#ifndef __cacheline_aligned_in_smp -#define __cacheline_aligned_in_smp -#endif - -#ifndef INTERNODE_CACHE_SHIFT -#define INTERNODE_CACHE_SHIFT L1_CACHE_SHIFT -#endif - -#ifndef ____cacheline_internodealigned_in_smp -#define ____cacheline_internodealigned_in_smp -#endif - -#endif diff --git a/libc/kernel/common/linux/calc64.h b/libc/kernel/common/linux/calc64.h deleted file mode 100644 index 9f726aa57..000000000 --- a/libc/kernel/common/linux/calc64.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CALC64_H -#define _LINUX_CALC64_H - -#include -#include - -#ifndef div_long_long_rem -#define div_long_long_rem(dividend, divisor, remainder) do_div_llr((dividend), divisor, remainder) - -#endif -#endif diff --git a/libc/kernel/common/linux/capability.h b/libc/kernel/common/linux/capability.h deleted file mode 100644 index 605bc27b4..000000000 --- a/libc/kernel/common/linux/capability.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CAPABILITY_H -#define _LINUX_CAPABILITY_H - -#include -#include - -#define _LINUX_CAPABILITY_VERSION 0x19980330 - -typedef struct __user_cap_header_struct { - __u32 version; - int pid; -} __user *cap_user_header_t; - -typedef struct __user_cap_data_struct { - __u32 effective; - __u32 permitted; - __u32 inheritable; -} __user *cap_user_data_t; - -#define CAP_CHOWN 0 - -#define CAP_DAC_OVERRIDE 1 - -#define CAP_DAC_READ_SEARCH 2 - -#define CAP_FOWNER 3 - -#define CAP_FSETID 4 - -#define CAP_FS_MASK 0x1f - -#define CAP_KILL 5 - -#define CAP_SETGID 6 - -#define CAP_SETUID 7 - -#define CAP_SETPCAP 8 - -#define CAP_LINUX_IMMUTABLE 9 - -#define CAP_NET_BIND_SERVICE 10 - -#define CAP_NET_BROADCAST 11 - -#define CAP_NET_ADMIN 12 - -#define CAP_NET_RAW 13 - -#define CAP_IPC_LOCK 14 - -#define CAP_IPC_OWNER 15 - -#define CAP_SYS_MODULE 16 - -#define CAP_SYS_RAWIO 17 - -#define CAP_SYS_CHROOT 18 - -#define CAP_SYS_PTRACE 19 - -#define CAP_SYS_PACCT 20 - -#define CAP_SYS_ADMIN 21 - -#define CAP_SYS_BOOT 22 - -#define CAP_SYS_NICE 23 - -#define CAP_SYS_RESOURCE 24 - -#define CAP_SYS_TIME 25 - -#define CAP_SYS_TTY_CONFIG 26 - -#define CAP_MKNOD 27 - -#define CAP_LEASE 28 - -#define CAP_AUDIT_WRITE 29 - -#define CAP_AUDIT_CONTROL 30 - -#endif diff --git a/libc/kernel/common/linux/capi.h b/libc/kernel/common/linux/capi.h deleted file mode 100644 index 5591cf684..000000000 --- a/libc/kernel/common/linux/capi.h +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_CAPI_H__ -#define __LINUX_CAPI_H__ - -#include -#include -#include - -typedef struct capi_register_params { - __u32 level3cnt; - __u32 datablkcnt; - __u32 datablklen; -} capi_register_params; - -#define CAPI_REGISTER _IOW('C',0x01,struct capi_register_params) - -#define CAPI_MANUFACTURER_LEN 64 - -#define CAPI_GET_MANUFACTURER _IOWR('C',0x06,int) - -typedef struct capi_version { - __u32 majorversion; - __u32 minorversion; - __u32 majormanuversion; - __u32 minormanuversion; -} capi_version; - -#define CAPI_GET_VERSION _IOWR('C',0x07,struct capi_version) - -#define CAPI_SERIAL_LEN 8 -#define CAPI_GET_SERIAL _IOWR('C',0x08,int) - -typedef struct capi_profile { - __u16 ncontroller; - __u16 nbchannel; - __u32 goptions; - __u32 support1; - __u32 support2; - __u32 support3; - __u32 reserved[6]; - __u32 manu[5]; -} capi_profile; - -#define CAPI_GET_PROFILE _IOWR('C',0x09,struct capi_profile) - -typedef struct capi_manufacturer_cmd { - unsigned long cmd; - void __user *data; -} capi_manufacturer_cmd; - -#define CAPI_MANUFACTURER_CMD _IOWR('C',0x20, struct capi_manufacturer_cmd) - -#define CAPI_GET_ERRCODE _IOR('C',0x21, __u16) - -#define CAPI_INSTALLED _IOR('C',0x22, __u16) - -typedef union capi_ioctl_struct { - __u32 contr; - capi_register_params rparams; - __u8 manufacturer[CAPI_MANUFACTURER_LEN]; - capi_version version; - __u8 serial[CAPI_SERIAL_LEN]; - capi_profile profile; - capi_manufacturer_cmd cmd; - __u16 errcode; -} capi_ioctl_struct; - -#define CAPIFLAG_HIGHJACKING 0x0001 - -#define CAPI_GET_FLAGS _IOR('C',0x23, unsigned) -#define CAPI_SET_FLAGS _IOR('C',0x24, unsigned) -#define CAPI_CLR_FLAGS _IOR('C',0x25, unsigned) - -#define CAPI_NCCI_OPENCOUNT _IOR('C',0x26, unsigned) - -#define CAPI_NCCI_GETUNIT _IOR('C',0x27, unsigned) - -#endif diff --git a/libc/kernel/common/linux/cdev.h b/libc/kernel/common/linux/cdev.h deleted file mode 100644 index 7a71c7e7e..000000000 --- a/libc/kernel/common/linux/cdev.h +++ /dev/null @@ -1,14 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CDEV_H -#define _LINUX_CDEV_H -#endif diff --git a/libc/kernel/common/linux/cdrom.h b/libc/kernel/common/linux/cdrom.h deleted file mode 100644 index cc70c9f59..000000000 --- a/libc/kernel/common/linux/cdrom.h +++ /dev/null @@ -1,718 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CDROM_H -#define _LINUX_CDROM_H - -#include - -#define EDRIVE_CANT_DO_THIS EOPNOTSUPP - -#define CDROMPAUSE 0x5301 -#define CDROMRESUME 0x5302 -#define CDROMPLAYMSF 0x5303 -#define CDROMPLAYTRKIND 0x5304 -#define CDROMREADTOCHDR 0x5305 -#define CDROMREADTOCENTRY 0x5306 -#define CDROMSTOP 0x5307 -#define CDROMSTART 0x5308 -#define CDROMEJECT 0x5309 -#define CDROMVOLCTRL 0x530a -#define CDROMSUBCHNL 0x530b -#define CDROMREADMODE2 0x530c -#define CDROMREADMODE1 0x530d -#define CDROMREADAUDIO 0x530e -#define CDROMEJECT_SW 0x530f -#define CDROMMULTISESSION 0x5310 -#define CDROM_GET_MCN 0x5311 -#define CDROM_GET_UPC CDROM_GET_MCN -#define CDROMRESET 0x5312 -#define CDROMVOLREAD 0x5313 -#define CDROMREADRAW 0x5314 - -#define CDROMREADCOOKED 0x5315 -#define CDROMSEEK 0x5316 - -#define CDROMPLAYBLK 0x5317 - -#define CDROMREADALL 0x5318 - -#define CDROMGETSPINDOWN 0x531d -#define CDROMSETSPINDOWN 0x531e - -#define CDROMCLOSETRAY 0x5319 -#define CDROM_SET_OPTIONS 0x5320 -#define CDROM_CLEAR_OPTIONS 0x5321 -#define CDROM_SELECT_SPEED 0x5322 -#define CDROM_SELECT_DISC 0x5323 -#define CDROM_MEDIA_CHANGED 0x5325 -#define CDROM_DRIVE_STATUS 0x5326 -#define CDROM_DISC_STATUS 0x5327 -#define CDROM_CHANGER_NSLOTS 0x5328 -#define CDROM_LOCKDOOR 0x5329 -#define CDROM_DEBUG 0x5330 -#define CDROM_GET_CAPABILITY 0x5331 - -#define CDROMAUDIOBUFSIZ 0x5382 - -#define DVD_READ_STRUCT 0x5390 -#define DVD_WRITE_STRUCT 0x5391 -#define DVD_AUTH 0x5392 - -#define CDROM_SEND_PACKET 0x5393 -#define CDROM_NEXT_WRITABLE 0x5394 -#define CDROM_LAST_WRITTEN 0x5395 - -struct cdrom_msf0 -{ - __u8 minute; - __u8 second; - __u8 frame; -}; - -union cdrom_addr -{ - struct cdrom_msf0 msf; - int lba; -}; - -struct cdrom_msf -{ - __u8 cdmsf_min0; - __u8 cdmsf_sec0; - __u8 cdmsf_frame0; - __u8 cdmsf_min1; - __u8 cdmsf_sec1; - __u8 cdmsf_frame1; -}; - -struct cdrom_ti -{ - __u8 cdti_trk0; - __u8 cdti_ind0; - __u8 cdti_trk1; - __u8 cdti_ind1; -}; - -struct cdrom_tochdr -{ - __u8 cdth_trk0; - __u8 cdth_trk1; -}; - -struct cdrom_volctrl -{ - __u8 channel0; - __u8 channel1; - __u8 channel2; - __u8 channel3; -}; - -struct cdrom_subchnl -{ - __u8 cdsc_format; - __u8 cdsc_audiostatus; - __u8 cdsc_adr: 4; - __u8 cdsc_ctrl: 4; - __u8 cdsc_trk; - __u8 cdsc_ind; - union cdrom_addr cdsc_absaddr; - union cdrom_addr cdsc_reladdr; -}; - -struct cdrom_tocentry -{ - __u8 cdte_track; - __u8 cdte_adr :4; - __u8 cdte_ctrl :4; - __u8 cdte_format; - union cdrom_addr cdte_addr; - __u8 cdte_datamode; -}; - -struct cdrom_read -{ - int cdread_lba; - char *cdread_bufaddr; - int cdread_buflen; -}; - -struct cdrom_read_audio -{ - union cdrom_addr addr; - __u8 addr_format; - int nframes; - __u8 __user *buf; -}; - -struct cdrom_multisession -{ - union cdrom_addr addr; - __u8 xa_flag; - __u8 addr_format; -}; - -struct cdrom_mcn -{ - __u8 medium_catalog_number[14]; -}; - -struct cdrom_blk -{ - unsigned from; - unsigned short len; -}; - -#define CDROM_PACKET_SIZE 12 - -#define CGC_DATA_UNKNOWN 0 -#define CGC_DATA_WRITE 1 -#define CGC_DATA_READ 2 -#define CGC_DATA_NONE 3 - -struct cdrom_generic_command -{ - unsigned char cmd[CDROM_PACKET_SIZE]; - unsigned char __user *buffer; - unsigned int buflen; - int stat; - struct request_sense __user *sense; - unsigned char data_direction; - int quiet; - int timeout; - void __user *reserved[1]; -}; - -#define CD_MINS 74 -#define CD_SECS 60 -#define CD_FRAMES 75 -#define CD_SYNC_SIZE 12 -#define CD_MSF_OFFSET 150 -#define CD_CHUNK_SIZE 24 -#define CD_NUM_OF_CHUNKS 98 -#define CD_FRAMESIZE_SUB 96 -#define CD_HEAD_SIZE 4 -#define CD_SUBHEAD_SIZE 8 -#define CD_EDC_SIZE 4 -#define CD_ZERO_SIZE 8 -#define CD_ECC_SIZE 276 -#define CD_FRAMESIZE 2048 -#define CD_FRAMESIZE_RAW 2352 -#define CD_FRAMESIZE_RAWER 2646 - -#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) -#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) - -#define CD_XA_HEAD (CD_HEAD_SIZE+CD_SUBHEAD_SIZE) -#define CD_XA_TAIL (CD_EDC_SIZE+CD_ECC_SIZE) -#define CD_XA_SYNC_HEAD (CD_SYNC_SIZE+CD_XA_HEAD) - -#define CDROM_LBA 0x01 -#define CDROM_MSF 0x02 - -#define CDROM_DATA_TRACK 0x04 - -#define CDROM_LEADOUT 0xAA - -#define CDROM_AUDIO_INVALID 0x00 -#define CDROM_AUDIO_PLAY 0x11 -#define CDROM_AUDIO_PAUSED 0x12 -#define CDROM_AUDIO_COMPLETED 0x13 -#define CDROM_AUDIO_ERROR 0x14 -#define CDROM_AUDIO_NO_STATUS 0x15 - -#define CDC_CLOSE_TRAY 0x1 -#define CDC_OPEN_TRAY 0x2 -#define CDC_LOCK 0x4 -#define CDC_SELECT_SPEED 0x8 -#define CDC_SELECT_DISC 0x10 -#define CDC_MULTI_SESSION 0x20 -#define CDC_MCN 0x40 -#define CDC_MEDIA_CHANGED 0x80 -#define CDC_PLAY_AUDIO 0x100 -#define CDC_RESET 0x200 -#define CDC_DRIVE_STATUS 0x800 -#define CDC_GENERIC_PACKET 0x1000 -#define CDC_CD_R 0x2000 -#define CDC_CD_RW 0x4000 -#define CDC_DVD 0x8000 -#define CDC_DVD_R 0x10000 -#define CDC_DVD_RAM 0x20000 -#define CDC_MO_DRIVE 0x40000 -#define CDC_MRW 0x80000 -#define CDC_MRW_W 0x100000 -#define CDC_RAM 0x200000 - -#define CDS_NO_INFO 0 -#define CDS_NO_DISC 1 -#define CDS_TRAY_OPEN 2 -#define CDS_DRIVE_NOT_READY 3 -#define CDS_DISC_OK 4 - -#define CDS_AUDIO 100 -#define CDS_DATA_1 101 -#define CDS_DATA_2 102 -#define CDS_XA_2_1 103 -#define CDS_XA_2_2 104 -#define CDS_MIXED 105 - -#define CDO_AUTO_CLOSE 0x1 -#define CDO_AUTO_EJECT 0x2 -#define CDO_USE_FFLAGS 0x4 -#define CDO_LOCK 0x8 -#define CDO_CHECK_TYPE 0x10 - -#define CDSL_NONE ((int) (~0U>>1)-1) -#define CDSL_CURRENT ((int) (~0U>>1)) - -#define CD_PART_MAX 64 -#define CD_PART_MASK (CD_PART_MAX - 1) - -#define GPCMD_BLANK 0xa1 -#define GPCMD_CLOSE_TRACK 0x5b -#define GPCMD_FLUSH_CACHE 0x35 -#define GPCMD_FORMAT_UNIT 0x04 -#define GPCMD_GET_CONFIGURATION 0x46 -#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a -#define GPCMD_GET_PERFORMANCE 0xac -#define GPCMD_INQUIRY 0x12 -#define GPCMD_LOAD_UNLOAD 0xa6 -#define GPCMD_MECHANISM_STATUS 0xbd -#define GPCMD_MODE_SELECT_10 0x55 -#define GPCMD_MODE_SENSE_10 0x5a -#define GPCMD_PAUSE_RESUME 0x4b -#define GPCMD_PLAY_AUDIO_10 0x45 -#define GPCMD_PLAY_AUDIO_MSF 0x47 -#define GPCMD_PLAY_AUDIO_TI 0x48 -#define GPCMD_PLAY_CD 0xbc -#define GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL 0x1e -#define GPCMD_READ_10 0x28 -#define GPCMD_READ_12 0xa8 -#define GPCMD_READ_BUFFER_CAPACITY 0x5c -#define GPCMD_READ_CDVD_CAPACITY 0x25 -#define GPCMD_READ_CD 0xbe -#define GPCMD_READ_CD_MSF 0xb9 -#define GPCMD_READ_DISC_INFO 0x51 -#define GPCMD_READ_DVD_STRUCTURE 0xad -#define GPCMD_READ_FORMAT_CAPACITIES 0x23 -#define GPCMD_READ_HEADER 0x44 -#define GPCMD_READ_TRACK_RZONE_INFO 0x52 -#define GPCMD_READ_SUBCHANNEL 0x42 -#define GPCMD_READ_TOC_PMA_ATIP 0x43 -#define GPCMD_REPAIR_RZONE_TRACK 0x58 -#define GPCMD_REPORT_KEY 0xa4 -#define GPCMD_REQUEST_SENSE 0x03 -#define GPCMD_RESERVE_RZONE_TRACK 0x53 -#define GPCMD_SEND_CUE_SHEET 0x5d -#define GPCMD_SCAN 0xba -#define GPCMD_SEEK 0x2b -#define GPCMD_SEND_DVD_STRUCTURE 0xbf -#define GPCMD_SEND_EVENT 0xa2 -#define GPCMD_SEND_KEY 0xa3 -#define GPCMD_SEND_OPC 0x54 -#define GPCMD_SET_READ_AHEAD 0xa7 -#define GPCMD_SET_STREAMING 0xb6 -#define GPCMD_START_STOP_UNIT 0x1b -#define GPCMD_STOP_PLAY_SCAN 0x4e -#define GPCMD_TEST_UNIT_READY 0x00 -#define GPCMD_VERIFY_10 0x2f -#define GPCMD_WRITE_10 0x2a -#define GPCMD_WRITE_AND_VERIFY_10 0x2e - -#define GPCMD_SET_SPEED 0xbb - -#define GPCMD_PLAYAUDIO_TI 0x48 - -#define GPCMD_GET_MEDIA_STATUS 0xda - -#define GPMODE_VENDOR_PAGE 0x00 -#define GPMODE_R_W_ERROR_PAGE 0x01 -#define GPMODE_WRITE_PARMS_PAGE 0x05 -#define GPMODE_WCACHING_PAGE 0x08 -#define GPMODE_AUDIO_CTL_PAGE 0x0e -#define GPMODE_POWER_PAGE 0x1a -#define GPMODE_FAULT_FAIL_PAGE 0x1c -#define GPMODE_TO_PROTECT_PAGE 0x1d -#define GPMODE_CAPABILITIES_PAGE 0x2a -#define GPMODE_ALL_PAGES 0x3f - -#define GPMODE_CDROM_PAGE 0x0d - -#define DVD_STRUCT_PHYSICAL 0x00 -#define DVD_STRUCT_COPYRIGHT 0x01 -#define DVD_STRUCT_DISCKEY 0x02 -#define DVD_STRUCT_BCA 0x03 -#define DVD_STRUCT_MANUFACT 0x04 - -struct dvd_layer { - __u8 book_version : 4; - __u8 book_type : 4; - __u8 min_rate : 4; - __u8 disc_size : 4; - __u8 layer_type : 4; - __u8 track_path : 1; - __u8 nlayers : 2; - __u8 track_density : 4; - __u8 linear_density : 4; - __u8 bca : 1; - __u32 start_sector; - __u32 end_sector; - __u32 end_sector_l0; -}; - -#define DVD_LAYERS 4 - -struct dvd_physical { - __u8 type; - __u8 layer_num; - struct dvd_layer layer[DVD_LAYERS]; -}; - -struct dvd_copyright { - __u8 type; - - __u8 layer_num; - __u8 cpst; - __u8 rmi; -}; - -struct dvd_disckey { - __u8 type; - - unsigned agid : 2; - __u8 value[2048]; -}; - -struct dvd_bca { - __u8 type; - - int len; - __u8 value[188]; -}; - -struct dvd_manufact { - __u8 type; - - __u8 layer_num; - int len; - __u8 value[2048]; -}; - -typedef union { - __u8 type; - - struct dvd_physical physical; - struct dvd_copyright copyright; - struct dvd_disckey disckey; - struct dvd_bca bca; - struct dvd_manufact manufact; -} dvd_struct; - -#define DVD_LU_SEND_AGID 0 -#define DVD_HOST_SEND_CHALLENGE 1 -#define DVD_LU_SEND_KEY1 2 -#define DVD_LU_SEND_CHALLENGE 3 -#define DVD_HOST_SEND_KEY2 4 - -#define DVD_AUTH_ESTABLISHED 5 -#define DVD_AUTH_FAILURE 6 - -#define DVD_LU_SEND_TITLE_KEY 7 -#define DVD_LU_SEND_ASF 8 -#define DVD_INVALIDATE_AGID 9 -#define DVD_LU_SEND_RPC_STATE 10 -#define DVD_HOST_SEND_RPC_STATE 11 - -typedef __u8 dvd_key[5]; -typedef __u8 dvd_challenge[10]; - -struct dvd_lu_send_agid { - __u8 type; - unsigned agid : 2; -}; - -struct dvd_host_send_challenge { - __u8 type; - unsigned agid : 2; - - dvd_challenge chal; -}; - -struct dvd_send_key { - __u8 type; - unsigned agid : 2; - - dvd_key key; -}; - -struct dvd_lu_send_challenge { - __u8 type; - unsigned agid : 2; - - dvd_challenge chal; -}; - -#define DVD_CPM_NO_COPYRIGHT 0 -#define DVD_CPM_COPYRIGHTED 1 - -#define DVD_CP_SEC_NONE 0 -#define DVD_CP_SEC_EXIST 1 - -#define DVD_CGMS_UNRESTRICTED 0 -#define DVD_CGMS_SINGLE 2 -#define DVD_CGMS_RESTRICTED 3 - -struct dvd_lu_send_title_key { - __u8 type; - unsigned agid : 2; - - dvd_key title_key; - int lba; - unsigned cpm : 1; - unsigned cp_sec : 1; - unsigned cgms : 2; -}; - -struct dvd_lu_send_asf { - __u8 type; - unsigned agid : 2; - - unsigned asf : 1; -}; - -struct dvd_host_send_rpcstate { - __u8 type; - __u8 pdrc; -}; - -struct dvd_lu_send_rpcstate { - __u8 type : 2; - __u8 vra : 3; - __u8 ucca : 3; - __u8 region_mask; - __u8 rpc_scheme; -}; - -typedef union { - __u8 type; - - struct dvd_lu_send_agid lsa; - struct dvd_host_send_challenge hsc; - struct dvd_send_key lsk; - struct dvd_lu_send_challenge lsc; - struct dvd_send_key hsk; - struct dvd_lu_send_title_key lstk; - struct dvd_lu_send_asf lsasf; - struct dvd_host_send_rpcstate hrpcs; - struct dvd_lu_send_rpcstate lrpcs; -} dvd_authinfo; - -struct request_sense { -#ifdef __BIG_ENDIAN_BITFIELD - __u8 valid : 1; - __u8 error_code : 7; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 error_code : 7; - __u8 valid : 1; -#endif - __u8 segment_number; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved1 : 2; - __u8 ili : 1; - __u8 reserved2 : 1; - __u8 sense_key : 4; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 sense_key : 4; - __u8 reserved2 : 1; - __u8 ili : 1; - __u8 reserved1 : 2; -#endif - __u8 information[4]; - __u8 add_sense_len; - __u8 command_info[4]; - __u8 asc; - __u8 ascq; - __u8 fruc; - __u8 sks[3]; - __u8 asb[46]; -}; - -#define CDF_RWRT 0x0020 -#define CDF_HWDM 0x0024 -#define CDF_MRW 0x0028 - -#define CDM_MRW_NOTMRW 0 -#define CDM_MRW_BGFORMAT_INACTIVE 1 -#define CDM_MRW_BGFORMAT_ACTIVE 2 -#define CDM_MRW_BGFORMAT_COMPLETE 3 - -#define MRW_LBA_DMA 0 -#define MRW_LBA_GAA 1 - -#define MRW_MODE_PC_PRE1 0x2c -#define MRW_MODE_PC 0x03 - -struct mrw_feature_desc { - __u16 feature_code; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved1 : 2; - __u8 feature_version : 4; - __u8 persistent : 1; - __u8 curr : 1; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 curr : 1; - __u8 persistent : 1; - __u8 feature_version : 4; - __u8 reserved1 : 2; -#endif - __u8 add_len; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved2 : 7; - __u8 write : 1; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 write : 1; - __u8 reserved2 : 7; -#endif - __u8 reserved3; - __u8 reserved4; - __u8 reserved5; -}; - -struct rwrt_feature_desc { - __u16 feature_code; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved1 : 2; - __u8 feature_version : 4; - __u8 persistent : 1; - __u8 curr : 1; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 curr : 1; - __u8 persistent : 1; - __u8 feature_version : 4; - __u8 reserved1 : 2; -#endif - __u8 add_len; - __u32 last_lba; - __u32 block_size; - __u16 blocking; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved2 : 7; - __u8 page_present : 1; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 page_present : 1; - __u8 reserved2 : 7; -#endif - __u8 reserved3; -}; - -typedef struct { - __u16 disc_information_length; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved1 : 3; - __u8 erasable : 1; - __u8 border_status : 2; - __u8 disc_status : 2; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 disc_status : 2; - __u8 border_status : 2; - __u8 erasable : 1; - __u8 reserved1 : 3; -#else -#error "Please fix " -#endif - __u8 n_first_track; - __u8 n_sessions_lsb; - __u8 first_track_lsb; - __u8 last_track_lsb; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 did_v : 1; - __u8 dbc_v : 1; - __u8 uru : 1; - __u8 reserved2 : 2; - __u8 dbit : 1; - __u8 mrw_status : 2; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 mrw_status : 2; - __u8 dbit : 1; - __u8 reserved2 : 2; - __u8 uru : 1; - __u8 dbc_v : 1; - __u8 did_v : 1; -#endif - __u8 disc_type; - __u8 n_sessions_msb; - __u8 first_track_msb; - __u8 last_track_msb; - __u32 disc_id; - __u32 lead_in; - __u32 lead_out; - __u8 disc_bar_code[8]; - __u8 reserved3; - __u8 n_opc; -} disc_information; - -typedef struct { - __u16 track_information_length; - __u8 track_lsb; - __u8 session_lsb; - __u8 reserved1; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 reserved2 : 2; - __u8 damage : 1; - __u8 copy : 1; - __u8 track_mode : 4; - __u8 rt : 1; - __u8 blank : 1; - __u8 packet : 1; - __u8 fp : 1; - __u8 data_mode : 4; - __u8 reserved3 : 6; - __u8 lra_v : 1; - __u8 nwa_v : 1; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 track_mode : 4; - __u8 copy : 1; - __u8 damage : 1; - __u8 reserved2 : 2; - __u8 data_mode : 4; - __u8 fp : 1; - __u8 packet : 1; - __u8 blank : 1; - __u8 rt : 1; - __u8 nwa_v : 1; - __u8 lra_v : 1; - __u8 reserved3 : 6; -#endif - __u32 track_start; - __u32 next_writable; - __u32 free_blocks; - __u32 fixed_packet_size; - __u32 track_size; - __u32 last_rec_address; -} track_information; - -struct feature_header { - __u32 data_len; - __u8 reserved1; - __u8 reserved2; - __u16 curr_profile; -}; - -struct mode_page_header { - __u16 mode_data_length; - __u8 medium_type; - __u8 reserved1; - __u8 reserved2; - __u8 reserved3; - __u16 desc_length; -}; - -#endif diff --git a/libc/kernel/common/linux/circ_buf.h b/libc/kernel/common/linux/circ_buf.h deleted file mode 100644 index 438250cfc..000000000 --- a/libc/kernel/common/linux/circ_buf.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CIRC_BUF_H -#define _LINUX_CIRC_BUF_H 1 - -struct circ_buf { - char *buf; - int head; - int tail; -}; - -#define CIRC_CNT(head,tail,size) (((head) - (tail)) & ((size)-1)) - -#define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) - -#define CIRC_CNT_TO_END(head,tail,size) ({int end = (size) - (tail); int n = ((head) + end) & ((size)-1); n < end ? n : end;}) - -#define CIRC_SPACE_TO_END(head,tail,size) ({int end = (size) - 1 - (head); int n = (end + (tail)) & ((size)-1); n <= end ? n : end+1;}) - -#endif diff --git a/libc/kernel/common/linux/clk.h b/libc/kernel/common/linux/clk.h deleted file mode 100644 index 2b8f436cf..000000000 --- a/libc/kernel/common/linux/clk.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_CLK_H -#define __LINUX_CLK_H - -struct device; - -struct clk; - -struct clk *clk_get(struct device *dev, const char *id); - -struct clk *clk_get_parent(struct clk *clk); - -#endif diff --git a/libc/kernel/common/linux/coda.h b/libc/kernel/common/linux/coda.h deleted file mode 100644 index e7e89f948..000000000 --- a/libc/kernel/common/linux/coda.h +++ /dev/null @@ -1,594 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _CODA_HEADER_ -#define _CODA_HEADER_ - -#if defined(__NetBSD__) || (defined(DJGPP) || defined(__CYGWIN32__)) && !defined(KERNEL) -#include -#endif - -#ifndef CODA_MAXSYMLINKS -#define CODA_MAXSYMLINKS 10 -#endif - -#if defined(DJGPP) || defined(__CYGWIN32__) -#ifdef KERNEL -typedef unsigned long u_long; -typedef unsigned int u_int; -typedef unsigned short u_short; -typedef u_long ino_t; -typedef u_long dev_t; -typedef void * caddr_t; -#ifdef DOS -typedef unsigned __int64 u_quad_t; -#else -typedef unsigned long long u_quad_t; -#endif - -#define inline - -struct timespec { - long ts_sec; - long ts_nsec; -}; -#else -#include -typedef unsigned long long u_quad_t; -#endif -#endif - -#ifdef __linux__ -#include -#define cdev_t u_quad_t -#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2) -#define _UQUAD_T_ 1 -typedef unsigned long long u_quad_t; -#endif -#else -#define cdev_t dev_t -#endif - -#ifdef __CYGWIN32__ -struct timespec { - time_t tv_sec; - long tv_nsec; -}; -#endif - -#ifndef __BIT_TYPES_DEFINED__ -#define __BIT_TYPES_DEFINED__ -typedef signed char int8_t; -typedef unsigned char u_int8_t; -typedef short int16_t; -typedef unsigned short u_int16_t; -typedef int int32_t; -typedef unsigned int u_int32_t; -#endif - -#define CODA_MAXNAMLEN 255 -#define CODA_MAXPATHLEN 1024 -#define CODA_MAXSYMLINK 10 - -#define C_O_READ 0x001 -#define C_O_WRITE 0x002 -#define C_O_TRUNC 0x010 -#define C_O_EXCL 0x100 -#define C_O_CREAT 0x200 - -#define C_M_READ 00400 -#define C_M_WRITE 00200 - -#define C_A_C_OK 8 -#define C_A_R_OK 4 -#define C_A_W_OK 2 -#define C_A_X_OK 1 -#define C_A_F_OK 0 - -#ifndef _VENUS_DIRENT_T_ -#define _VENUS_DIRENT_T_ 1 -struct venus_dirent { - u_int32_t d_fileno; - u_int16_t d_reclen; - u_int8_t d_type; - u_int8_t d_namlen; - char d_name[CODA_MAXNAMLEN + 1]; -}; -#undef DIRSIZ -#define DIRSIZ(dp) ((sizeof (struct venus_dirent) - (CODA_MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3)) - -#define CDT_UNKNOWN 0 -#define CDT_FIFO 1 -#define CDT_CHR 2 -#define CDT_DIR 4 -#define CDT_BLK 6 -#define CDT_REG 8 -#define CDT_LNK 10 -#define CDT_SOCK 12 -#define CDT_WHT 14 - -#define IFTOCDT(mode) (((mode) & 0170000) >> 12) -#define CDTTOIF(dirtype) ((dirtype) << 12) - -#endif - -#ifndef _VUID_T_ -#define _VUID_T_ -typedef u_int32_t vuid_t; -typedef u_int32_t vgid_t; -#endif - -struct CodaFid { - u_int32_t opaque[4]; -}; - -#define coda_f2i(fid) (fid ? (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]) : 0) - -#ifndef _VENUS_VATTR_T_ -#define _VENUS_VATTR_T_ - -enum coda_vtype { C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD }; - -struct coda_vattr { - long va_type; - u_short va_mode; - short va_nlink; - vuid_t va_uid; - vgid_t va_gid; - long va_fileid; - u_quad_t va_size; - long va_blocksize; - struct timespec va_atime; - struct timespec va_mtime; - struct timespec va_ctime; - u_long va_gen; - u_long va_flags; - cdev_t va_rdev; - u_quad_t va_bytes; - u_quad_t va_filerev; -}; - -#endif - -struct coda_statfs { - int32_t f_blocks; - int32_t f_bfree; - int32_t f_bavail; - int32_t f_files; - int32_t f_ffree; -}; - -#define CODA_ROOT 2 -#define CODA_OPEN_BY_FD 3 -#define CODA_OPEN 4 -#define CODA_CLOSE 5 -#define CODA_IOCTL 6 -#define CODA_GETATTR 7 -#define CODA_SETATTR 8 -#define CODA_ACCESS 9 -#define CODA_LOOKUP 10 -#define CODA_CREATE 11 -#define CODA_REMOVE 12 -#define CODA_LINK 13 -#define CODA_RENAME 14 -#define CODA_MKDIR 15 -#define CODA_RMDIR 16 -#define CODA_SYMLINK 18 -#define CODA_READLINK 19 -#define CODA_FSYNC 20 -#define CODA_VGET 22 -#define CODA_SIGNAL 23 -#define CODA_REPLACE 24 -#define CODA_FLUSH 25 -#define CODA_PURGEUSER 26 -#define CODA_ZAPFILE 27 -#define CODA_ZAPDIR 28 -#define CODA_PURGEFID 30 -#define CODA_OPEN_BY_PATH 31 -#define CODA_RESOLVE 32 -#define CODA_REINTEGRATE 33 -#define CODA_STATFS 34 -#define CODA_STORE 35 -#define CODA_RELEASE 36 -#define CODA_NCALLS 37 - -#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID) - -#define VC_MAXDATASIZE 8192 -#define VC_MAXMSGSIZE sizeof(union inputArgs)+sizeof(union outputArgs) + VC_MAXDATASIZE - -#define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t) - -#define CODA_KERNEL_VERSION 3 - -struct coda_in_hdr { - u_int32_t opcode; - u_int32_t unique; - pid_t pid; - pid_t pgid; - vuid_t uid; -}; - -struct coda_out_hdr { - u_int32_t opcode; - u_int32_t unique; - u_int32_t result; -}; - -struct coda_root_out { - struct coda_out_hdr oh; - struct CodaFid VFid; -}; - -struct coda_root_in { - struct coda_in_hdr in; -}; - -struct coda_open_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_open_out { - struct coda_out_hdr oh; - cdev_t dev; - ino_t inode; -}; - -struct coda_store_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_store_out { - struct coda_out_hdr out; -}; - -struct coda_release_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_release_out { - struct coda_out_hdr out; -}; - -struct coda_close_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_close_out { - struct coda_out_hdr out; -}; - -struct coda_ioctl_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int cmd; - int len; - int rwflag; - char *data; -}; - -struct coda_ioctl_out { - struct coda_out_hdr oh; - int len; - caddr_t data; -}; - -struct coda_getattr_in { - struct coda_in_hdr ih; - struct CodaFid VFid; -}; - -struct coda_getattr_out { - struct coda_out_hdr oh; - struct coda_vattr attr; -}; - -struct coda_setattr_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - struct coda_vattr attr; -}; - -struct coda_setattr_out { - struct coda_out_hdr out; -}; - -struct coda_access_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_access_out { - struct coda_out_hdr out; -}; - -#define CLU_CASE_SENSITIVE 0x01 -#define CLU_CASE_INSENSITIVE 0x02 - -struct coda_lookup_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int name; - int flags; -}; - -struct coda_lookup_out { - struct coda_out_hdr oh; - struct CodaFid VFid; - int vtype; -}; - -struct coda_create_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - struct coda_vattr attr; - int excl; - int mode; - int name; -}; - -struct coda_create_out { - struct coda_out_hdr oh; - struct CodaFid VFid; - struct coda_vattr attr; -}; - -struct coda_remove_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int name; -}; - -struct coda_remove_out { - struct coda_out_hdr out; -}; - -struct coda_link_in { - struct coda_in_hdr ih; - struct CodaFid sourceFid; - struct CodaFid destFid; - int tname; -}; - -struct coda_link_out { - struct coda_out_hdr out; -}; - -struct coda_rename_in { - struct coda_in_hdr ih; - struct CodaFid sourceFid; - int srcname; - struct CodaFid destFid; - int destname; -}; - -struct coda_rename_out { - struct coda_out_hdr out; -}; - -struct coda_mkdir_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - struct coda_vattr attr; - int name; -}; - -struct coda_mkdir_out { - struct coda_out_hdr oh; - struct CodaFid VFid; - struct coda_vattr attr; -}; - -struct coda_rmdir_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int name; -}; - -struct coda_rmdir_out { - struct coda_out_hdr out; -}; - -struct coda_symlink_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int srcname; - struct coda_vattr attr; - int tname; -}; - -struct coda_symlink_out { - struct coda_out_hdr out; -}; - -struct coda_readlink_in { - struct coda_in_hdr ih; - struct CodaFid VFid; -}; - -struct coda_readlink_out { - struct coda_out_hdr oh; - int count; - caddr_t data; -}; - -struct coda_fsync_in { - struct coda_in_hdr ih; - struct CodaFid VFid; -}; - -struct coda_fsync_out { - struct coda_out_hdr out; -}; - -struct coda_vget_in { - struct coda_in_hdr ih; - struct CodaFid VFid; -}; - -struct coda_vget_out { - struct coda_out_hdr oh; - struct CodaFid VFid; - int vtype; -}; - -struct coda_purgeuser_out { - struct coda_out_hdr oh; - vuid_t uid; -}; - -struct coda_zapfile_out { - struct coda_out_hdr oh; - struct CodaFid CodaFid; -}; - -struct coda_zapdir_out { - struct coda_out_hdr oh; - struct CodaFid CodaFid; -}; - -struct coda_purgefid_out { - struct coda_out_hdr oh; - struct CodaFid CodaFid; -}; - -struct coda_replace_out { - struct coda_out_hdr oh; - struct CodaFid NewFid; - struct CodaFid OldFid; -}; - -struct coda_open_by_fd_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_open_by_fd_out { - struct coda_out_hdr oh; - int fd; - -}; - -struct coda_open_by_path_in { - struct coda_in_hdr ih; - struct CodaFid VFid; - int flags; -}; - -struct coda_open_by_path_out { - struct coda_out_hdr oh; - int path; -}; - -struct coda_statfs_in { - struct coda_in_hdr in; -}; - -struct coda_statfs_out { - struct coda_out_hdr oh; - struct coda_statfs stat; -}; - -#define CODA_NOCACHE 0x80000000 - -union inputArgs { - struct coda_in_hdr ih; - struct coda_open_in coda_open; - struct coda_store_in coda_store; - struct coda_release_in coda_release; - struct coda_close_in coda_close; - struct coda_ioctl_in coda_ioctl; - struct coda_getattr_in coda_getattr; - struct coda_setattr_in coda_setattr; - struct coda_access_in coda_access; - struct coda_lookup_in coda_lookup; - struct coda_create_in coda_create; - struct coda_remove_in coda_remove; - struct coda_link_in coda_link; - struct coda_rename_in coda_rename; - struct coda_mkdir_in coda_mkdir; - struct coda_rmdir_in coda_rmdir; - struct coda_symlink_in coda_symlink; - struct coda_readlink_in coda_readlink; - struct coda_fsync_in coda_fsync; - struct coda_vget_in coda_vget; - struct coda_open_by_fd_in coda_open_by_fd; - struct coda_open_by_path_in coda_open_by_path; - struct coda_statfs_in coda_statfs; -}; - -union outputArgs { - struct coda_out_hdr oh; - struct coda_root_out coda_root; - struct coda_open_out coda_open; - struct coda_ioctl_out coda_ioctl; - struct coda_getattr_out coda_getattr; - struct coda_lookup_out coda_lookup; - struct coda_create_out coda_create; - struct coda_mkdir_out coda_mkdir; - struct coda_readlink_out coda_readlink; - struct coda_vget_out coda_vget; - struct coda_purgeuser_out coda_purgeuser; - struct coda_zapfile_out coda_zapfile; - struct coda_zapdir_out coda_zapdir; - struct coda_purgefid_out coda_purgefid; - struct coda_replace_out coda_replace; - struct coda_open_by_fd_out coda_open_by_fd; - struct coda_open_by_path_out coda_open_by_path; - struct coda_statfs_out coda_statfs; -}; - -union coda_downcalls { - - struct coda_purgeuser_out purgeuser; - struct coda_zapfile_out zapfile; - struct coda_zapdir_out zapdir; - struct coda_purgefid_out purgefid; - struct coda_replace_out replace; -}; - -#define PIOCPARM_MASK 0x0000ffff -struct ViceIoctl { - void __user *in; - void __user *out; - u_short in_size; - u_short out_size; -}; - -struct PioctlData { - const char __user *path; - int follow; - struct ViceIoctl vi; -}; - -#define CODA_CONTROL ".CONTROL" -#define CODA_CONTROLLEN 8 -#define CTL_INO -1 - -#define CODA_MOUNT_VERSION 1 - -struct coda_mount_data { - int version; - int fd; -}; - -#endif - diff --git a/libc/kernel/common/linux/coda_fs_i.h b/libc/kernel/common/linux/coda_fs_i.h deleted file mode 100644 index 28b0e59c6..000000000 --- a/libc/kernel/common/linux/coda_fs_i.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CODA_FS_I -#define _LINUX_CODA_FS_I - -#endif diff --git a/libc/kernel/common/linux/compat.h b/libc/kernel/common/linux/compat.h deleted file mode 100644 index d30b550f0..000000000 --- a/libc/kernel/common/linux/compat.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_COMPAT_H -#define _LINUX_COMPAT_H - -#endif diff --git a/libc/kernel/common/linux/compiler-gcc.h b/libc/kernel/common/linux/compiler-gcc.h deleted file mode 100644 index 0dd4a6278..000000000 --- a/libc/kernel/common/linux/compiler-gcc.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#define barrier() __asm__ __volatile__("": : :"memory") - -#define RELOC_HIDE(ptr, off) ({ unsigned long __ptr; __asm__ ("" : "=r"(__ptr) : "0"(ptr)); (typeof(ptr)) (__ptr + (off)); }) - -#define inline inline __attribute__((always_inline)) -#define __inline__ __inline__ __attribute__((always_inline)) -#define __inline __inline __attribute__((always_inline)) -#define __deprecated __attribute__((deprecated)) -#define noinline __attribute__((noinline)) -#define __attribute_pure__ __attribute__((pure)) -#define __attribute_const__ __attribute__((__const__)) diff --git a/libc/kernel/common/linux/compiler.h b/libc/kernel/common/linux/compiler.h deleted file mode 100644 index 4055e33f7..000000000 --- a/libc/kernel/common/linux/compiler.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_COMPILER_H -#define __LINUX_COMPILER_H - -#ifndef __ASSEMBLY__ - -#define __user -#define __kernel -#define __safe -#define __force -#define __nocast -#define __iomem -#define __chk_user_ptr(x) (void)0 -#define __chk_io_ptr(x) (void)0 -#define __builtin_warning(x, y...) (1) -#define __acquires(x) -#define __releases(x) -#define __acquire(x) (void)0 -#define __release(x) (void)0 -#define __cond_lock(x) (x) - -#endif - -#ifndef __attribute_const__ -#define __attribute_const__ -#endif - -#endif diff --git a/libc/kernel/common/linux/completion.h b/libc/kernel/common/linux/completion.h deleted file mode 100644 index ee1821181..000000000 --- a/libc/kernel/common/linux/completion.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_COMPLETION_H -#define __LINUX_COMPLETION_H - -#include - -struct completion { - unsigned int done; - wait_queue_head_t wait; -}; - -#define COMPLETION_INITIALIZER(work) { 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) } - -#define COMPLETION_INITIALIZER_ONSTACK(work) ({ init_completion(&work); work; }) - -#define DECLARE_COMPLETION(work) struct completion work = COMPLETION_INITIALIZER(work) - -#define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work) - -#define INIT_COMPLETION(x) ((x).done = 0) - -#endif diff --git a/libc/kernel/common/linux/config.h b/libc/kernel/common/linux/config.h deleted file mode 100644 index 7aa105679..000000000 --- a/libc/kernel/common/linux/config.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CONFIG_H -#define _LINUX_CONFIG_H - -#include - -#endif diff --git a/libc/kernel/common/linux/console_struct.h b/libc/kernel/common/linux/console_struct.h deleted file mode 100644 index 50e4cbe65..000000000 --- a/libc/kernel/common/linux/console_struct.h +++ /dev/null @@ -1,121 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include -#include - -struct vt_struct; - -#define NPAR 16 - -struct vc_data { - unsigned short vc_num; - unsigned int vc_cols; - unsigned int vc_rows; - unsigned int vc_size_row; - unsigned int vc_scan_lines; - unsigned long vc_origin; - unsigned long vc_scr_end; - unsigned long vc_visible_origin; - unsigned int vc_top, vc_bottom; - const struct consw *vc_sw; - unsigned short *vc_screenbuf; - unsigned int vc_screenbuf_size; - unsigned char vc_mode; - - unsigned char vc_attr; - unsigned char vc_def_color; - unsigned char vc_color; - unsigned char vc_s_color; - unsigned char vc_ulcolor; - unsigned char vc_halfcolor; - - unsigned int vc_cursor_type; - unsigned short vc_complement_mask; - unsigned short vc_s_complement_mask; - unsigned int vc_x, vc_y; - unsigned int vc_saved_x, vc_saved_y; - unsigned long vc_pos; - - unsigned short vc_hi_font_mask; - struct console_font vc_font; - unsigned short vc_video_erase_char; - - unsigned int vc_state; - unsigned int vc_npar,vc_par[NPAR]; - struct tty_struct *vc_tty; - - struct vt_mode vt_mode; - int vt_pid; - int vt_newvt; - wait_queue_head_t paste_wait; - - unsigned int vc_charset : 1; - unsigned int vc_s_charset : 1; - unsigned int vc_disp_ctrl : 1; - unsigned int vc_toggle_meta : 1; - unsigned int vc_decscnm : 1; - unsigned int vc_decom : 1; - unsigned int vc_decawm : 1; - unsigned int vc_deccm : 1; - unsigned int vc_decim : 1; - unsigned int vc_deccolm : 1; - - unsigned int vc_intensity : 2; - unsigned int vc_underline : 1; - unsigned int vc_blink : 1; - unsigned int vc_reverse : 1; - unsigned int vc_s_intensity : 2; - unsigned int vc_s_underline : 1; - unsigned int vc_s_blink : 1; - unsigned int vc_s_reverse : 1; - - unsigned int vc_ques : 1; - unsigned int vc_need_wrap : 1; - unsigned int vc_can_do_color : 1; - unsigned int vc_report_mouse : 2; - unsigned int vc_kmalloced : 1; - unsigned char vc_utf : 1; - unsigned char vc_utf_count; - int vc_utf_char; - unsigned int vc_tab_stop[8]; - unsigned char vc_palette[16*3]; - unsigned short * vc_translate; - unsigned char vc_G0_charset; - unsigned char vc_G1_charset; - unsigned char vc_saved_G0; - unsigned char vc_saved_G1; - unsigned int vc_bell_pitch; - unsigned int vc_bell_duration; - struct vc_data **vc_display_fg; - unsigned long vc_uni_pagedir; - unsigned long *vc_uni_pagedir_loc; - -}; - -struct vc { - struct vc_data *d; - -}; - -#define CUR_DEF 0 -#define CUR_NONE 1 -#define CUR_UNDERLINE 2 -#define CUR_LOWER_THIRD 3 -#define CUR_LOWER_HALF 4 -#define CUR_TWO_THIRDS 5 -#define CUR_BLOCK 6 -#define CUR_HWMASK 0x0f -#define CUR_SWMASK 0xfff0 - -#define CUR_DEFAULT CUR_UNDERLINE - -#define CON_IS_VISIBLE(conp) (*conp->vc_display_fg == conp) diff --git a/libc/kernel/common/linux/cpu.h b/libc/kernel/common/linux/cpu.h deleted file mode 100644 index f7e3889f0..000000000 --- a/libc/kernel/common/linux/cpu.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CPU_H_ -#define _LINUX_CPU_H_ - -#include -#include -#include -#include -#include - -struct cpu { - int node_id; - int no_control; - struct sys_device sysdev; -}; - -struct notifier_block; - -#define lock_cpu_hotplug() do { } while (0) -#define unlock_cpu_hotplug() do { } while (0) -#define lock_cpu_hotplug_interruptible() 0 -#define hotcpu_notifier(fn, pri) do { } while (0) -#define register_hotcpu_notifier(nb) do { } while (0) -#define unregister_hotcpu_notifier(nb) do { } while (0) - -#endif diff --git a/libc/kernel/common/linux/cpumask.h b/libc/kernel/common/linux/cpumask.h deleted file mode 100644 index 541940a35..000000000 --- a/libc/kernel/common/linux/cpumask.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_CPUMASK_H -#define __LINUX_CPUMASK_H - -#include -#include -#include - -typedef struct { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t; - -#define cpu_set(cpu, dst) __cpu_set((cpu), &(dst)) -#define cpu_clear(cpu, dst) __cpu_clear((cpu), &(dst)) -#define cpus_setall(dst) __cpus_setall(&(dst), NR_CPUS) -#define cpus_clear(dst) __cpus_clear(&(dst), NR_CPUS) -#define cpu_isset(cpu, cpumask) test_bit((cpu), (cpumask).bits) -#define cpu_test_and_set(cpu, cpumask) __cpu_test_and_set((cpu), &(cpumask)) -#define cpus_and(dst, src1, src2) __cpus_and(&(dst), &(src1), &(src2), NR_CPUS) -#define cpus_or(dst, src1, src2) __cpus_or(&(dst), &(src1), &(src2), NR_CPUS) -#define cpus_xor(dst, src1, src2) __cpus_xor(&(dst), &(src1), &(src2), NR_CPUS) -#define cpus_andnot(dst, src1, src2) __cpus_andnot(&(dst), &(src1), &(src2), NR_CPUS) -#define cpus_complement(dst, src) __cpus_complement(&(dst), &(src), NR_CPUS) -#define cpus_equal(src1, src2) __cpus_equal(&(src1), &(src2), NR_CPUS) -#define cpus_intersects(src1, src2) __cpus_intersects(&(src1), &(src2), NR_CPUS) -#define cpus_subset(src1, src2) __cpus_subset(&(src1), &(src2), NR_CPUS) -#define cpus_empty(src) __cpus_empty(&(src), NR_CPUS) -#define cpus_full(cpumask) __cpus_full(&(cpumask), NR_CPUS) -#define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS) -#define cpus_shift_right(dst, src, n) __cpus_shift_right(&(dst), &(src), (n), NR_CPUS) -#define cpus_shift_left(dst, src, n) __cpus_shift_left(&(dst), &(src), (n), NR_CPUS) -#define first_cpu(src) 0 -#define next_cpu(n, src) 1 -#define cpumask_of_cpu(cpu) ({ typeof(_unused_cpumask_arg_) m; if (sizeof(m) == sizeof(unsigned long)) { m.bits[0] = 1UL<<(cpu); } else { cpus_clear(m); cpu_set((cpu), m); } m; }) -#define CPU_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(NR_CPUS) -#if NR_CPUS <= BITS_PER_LONG -#define CPU_MASK_ALL (cpumask_t) { { [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD } } -#else -#define CPU_MASK_ALL (cpumask_t) { { [0 ... BITS_TO_LONGS(NR_CPUS)-2] = ~0UL, [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD } } -#endif -#define CPU_MASK_NONE (cpumask_t) { { [0 ... BITS_TO_LONGS(NR_CPUS)-1] = 0UL } } -#define CPU_MASK_CPU0 (cpumask_t) { { [0] = 1UL } } -#define cpus_addr(src) ((src).bits) -#define cpumask_scnprintf(buf, len, src) __cpumask_scnprintf((buf), (len), &(src), NR_CPUS) -#define cpumask_parse(ubuf, ulen, dst) __cpumask_parse((ubuf), (ulen), &(dst), NR_CPUS) -#define cpulist_scnprintf(buf, len, src) __cpulist_scnprintf((buf), (len), &(src), NR_CPUS) -#define cpulist_parse(buf, dst) __cpulist_parse((buf), &(dst), NR_CPUS) -#define cpu_remap(oldbit, old, new) __cpu_remap((oldbit), &(old), &(new), NR_CPUS) -#define cpus_remap(dst, src, old, new) __cpus_remap(&(dst), &(src), &(old), &(new), NR_CPUS) -#if NR_CPUS > 1 -#define for_each_cpu_mask(cpu, mask) for ((cpu) = first_cpu(mask); (cpu) < NR_CPUS; (cpu) = next_cpu((cpu), (mask))) -#else -#define for_each_cpu_mask(cpu, mask) for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask) -#endif - -#if NR_CPUS > 1 -#define num_online_cpus() cpus_weight(cpu_online_map) -#define num_possible_cpus() cpus_weight(cpu_possible_map) -#define num_present_cpus() cpus_weight(cpu_present_map) -#define cpu_online(cpu) cpu_isset((cpu), cpu_online_map) -#define cpu_possible(cpu) cpu_isset((cpu), cpu_possible_map) -#define cpu_present(cpu) cpu_isset((cpu), cpu_present_map) -#else -#define num_online_cpus() 1 -#define num_possible_cpus() 1 -#define num_present_cpus() 1 -#define cpu_online(cpu) ((cpu) == 0) -#define cpu_possible(cpu) ((cpu) == 0) -#define cpu_present(cpu) ((cpu) == 0) -#endif - -#define highest_possible_processor_id() 0 -#define any_online_cpu(mask) 0 - -#define for_each_possible_cpu(cpu) for_each_cpu_mask((cpu), cpu_possible_map) -#define for_each_online_cpu(cpu) for_each_cpu_mask((cpu), cpu_online_map) -#define for_each_present_cpu(cpu) for_each_cpu_mask((cpu), cpu_present_map) - -#endif diff --git a/libc/kernel/common/linux/ctype.h b/libc/kernel/common/linux/ctype.h deleted file mode 100644 index 4644d122d..000000000 --- a/libc/kernel/common/linux/ctype.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_CTYPE_H -#define _LINUX_CTYPE_H - -#define _U 0x01 -#define _L 0x02 -#define _D 0x04 -#define _C 0x08 -#define _P 0x10 -#define _S 0x20 -#define _X 0x40 -#define _SP 0x80 - -#define __ismask(x) (_ctype[(int)(unsigned char)(x)]) - -#define isalnum(c) ((__ismask(c)&(_U|_L|_D)) != 0) -#define isalpha(c) ((__ismask(c)&(_U|_L)) != 0) -#define iscntrl(c) ((__ismask(c)&(_C)) != 0) -#define isdigit(c) ((__ismask(c)&(_D)) != 0) -#define isgraph(c) ((__ismask(c)&(_P|_U|_L|_D)) != 0) -#define islower(c) ((__ismask(c)&(_L)) != 0) -#define isprint(c) ((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0) -#define ispunct(c) ((__ismask(c)&(_P)) != 0) -#define isspace(c) ((__ismask(c)&(_S)) != 0) -#define isupper(c) ((__ismask(c)&(_U)) != 0) -#define isxdigit(c) ((__ismask(c)&(_D|_X)) != 0) - -#define isascii(c) (((unsigned char)(c))<=0x7f) -#define toascii(c) (((unsigned char)(c))&0x7f) - -#define tolower(c) __tolower(c) -#define toupper(c) __toupper(c) -#endif diff --git a/libc/kernel/common/linux/dccp.h b/libc/kernel/common/linux/dccp.h deleted file mode 100644 index 5e3377782..000000000 --- a/libc/kernel/common/linux/dccp.h +++ /dev/null @@ -1,135 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_DCCP_H -#define _LINUX_DCCP_H - -#include -#include - -struct dccp_hdr { - __be16 dccph_sport, - dccph_dport; - __u8 dccph_doff; -#ifdef __LITTLE_ENDIAN_BITFIELD - __u8 dccph_cscov:4, - dccph_ccval:4; -#elif defined(__BIG_ENDIAN_BITFIELD) - __u8 dccph_ccval:4, - dccph_cscov:4; -#else -#error "Adjust your defines" -#endif - __u16 dccph_checksum; -#ifdef __LITTLE_ENDIAN_BITFIELD - __u8 dccph_x:1, - dccph_type:4, - dccph_reserved:3; -#elif defined(__BIG_ENDIAN_BITFIELD) - __u8 dccph_reserved:3, - dccph_type:4, - dccph_x:1; -#else -#error "Adjust your defines" -#endif - __u8 dccph_seq2; - __be16 dccph_seq; -}; - -struct dccp_hdr_ext { - __be32 dccph_seq_low; -}; - -struct dccp_hdr_request { - __be32 dccph_req_service; -}; - -struct dccp_hdr_ack_bits { - __be16 dccph_reserved1; - __be16 dccph_ack_nr_high; - __be32 dccph_ack_nr_low; -}; - -struct dccp_hdr_response { - struct dccp_hdr_ack_bits dccph_resp_ack; - __be32 dccph_resp_service; -}; - -struct dccp_hdr_reset { - struct dccp_hdr_ack_bits dccph_reset_ack; - __u8 dccph_reset_code, - dccph_reset_data[3]; -}; - -enum dccp_pkt_type { - DCCP_PKT_REQUEST = 0, - DCCP_PKT_RESPONSE, - DCCP_PKT_DATA, - DCCP_PKT_ACK, - DCCP_PKT_DATAACK, - DCCP_PKT_CLOSEREQ, - DCCP_PKT_CLOSE, - DCCP_PKT_RESET, - DCCP_PKT_SYNC, - DCCP_PKT_SYNCACK, - DCCP_PKT_INVALID, -}; - -#define DCCP_NR_PKT_TYPES DCCP_PKT_INVALID - -enum { - DCCPO_PADDING = 0, - DCCPO_MANDATORY = 1, - DCCPO_MIN_RESERVED = 3, - DCCPO_MAX_RESERVED = 31, - DCCPO_CHANGE_L = 32, - DCCPO_CONFIRM_L = 33, - DCCPO_CHANGE_R = 34, - DCCPO_CONFIRM_R = 35, - DCCPO_NDP_COUNT = 37, - DCCPO_ACK_VECTOR_0 = 38, - DCCPO_ACK_VECTOR_1 = 39, - DCCPO_TIMESTAMP = 41, - DCCPO_TIMESTAMP_ECHO = 42, - DCCPO_ELAPSED_TIME = 43, - DCCPO_MAX = 45, - DCCPO_MIN_CCID_SPECIFIC = 128, - DCCPO_MAX_CCID_SPECIFIC = 255, -}; - -enum { - DCCPF_RESERVED = 0, - DCCPF_CCID = 1, - DCCPF_SEQUENCE_WINDOW = 3, - DCCPF_ACK_RATIO = 5, - DCCPF_SEND_ACK_VECTOR = 6, - DCCPF_SEND_NDP_COUNT = 7, - - DCCPF_MIN_CCID_SPECIFIC = 128, - DCCPF_MAX_CCID_SPECIFIC = 255, -}; - -struct dccp_so_feat { - __u8 dccpsf_feat; - __u8 *dccpsf_val; - __u8 dccpsf_len; -}; - -#define DCCP_SOCKOPT_PACKET_SIZE 1 -#define DCCP_SOCKOPT_SERVICE 2 -#define DCCP_SOCKOPT_CHANGE_L 3 -#define DCCP_SOCKOPT_CHANGE_R 4 -#define DCCP_SOCKOPT_CCID_RX_INFO 128 -#define DCCP_SOCKOPT_CCID_TX_INFO 192 - -#define DCCP_SERVICE_LIST_MAX_LEN 32 - -#endif diff --git a/libc/kernel/common/linux/debug_locks.h b/libc/kernel/common/linux/debug_locks.h deleted file mode 100644 index 2d55fcd4f..000000000 --- a/libc/kernel/common/linux/debug_locks.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_DEBUG_LOCKING_H -#define __LINUX_DEBUG_LOCKING_H - -struct task_struct; - -#define _RET_IP_ (unsigned long)__builtin_return_address(0) -#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) - -#define DEBUG_LOCKS_WARN_ON(c) ({ int __ret = 0; if (unlikely(c)) { if (debug_locks_off()) WARN_ON(1); __ret = 1; } __ret; }) - -#define SMP_DEBUG_LOCKS_WARN_ON(c) do { } while (0) - -#define locking_selftest() do { } while (0) - -#endif diff --git a/libc/kernel/common/linux/delay.h b/libc/kernel/common/linux/delay.h deleted file mode 100644 index e032b6f30..000000000 --- a/libc/kernel/common/linux/delay.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_DELAY_H -#define _LINUX_DELAY_H - -#include - -#ifndef MAX_UDELAY_MS -#define MAX_UDELAY_MS 5 -#endif - -#ifndef mdelay -#define mdelay(n) ( (__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : ({unsigned long __ms=(n); while (__ms--) udelay(1000);})) -#endif - -#ifndef ndelay -#define ndelay(x) udelay(((x)+999)/1000) -#endif - -#endif diff --git a/libc/kernel/common/linux/device.h b/libc/kernel/common/linux/device.h deleted file mode 100644 index 641932298..000000000 --- a/libc/kernel/common/linux/device.h +++ /dev/null @@ -1,222 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _DEVICE_H_ -#define _DEVICE_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define DEVICE_NAME_SIZE 50 -#define DEVICE_NAME_HALF __stringify(20) -#define DEVICE_ID_SIZE 32 -#define BUS_ID_SIZE KOBJ_NAME_LEN - -struct device; -struct device_driver; -struct class; -struct class_device; - -struct bus_type { - const char * name; - - struct subsystem subsys; - struct kset drivers; - struct kset devices; - struct klist klist_devices; - struct klist klist_drivers; - - struct bus_attribute * bus_attrs; - struct device_attribute * dev_attrs; - struct driver_attribute * drv_attrs; - - int (*match)(struct device * dev, struct device_driver * drv); - int (*uevent)(struct device *dev, char **envp, - int num_envp, char *buffer, int buffer_size); - int (*probe)(struct device * dev); - int (*remove)(struct device * dev); - void (*shutdown)(struct device * dev); - int (*suspend)(struct device * dev, pm_message_t state); - int (*resume)(struct device * dev); -}; - -struct device * bus_find_device(struct bus_type *bus, struct device *start, - void *data, int (*match)(struct device *, void *)); - -struct bus_attribute { - struct attribute attr; - ssize_t (*show)(struct bus_type *, char * buf); - ssize_t (*store)(struct bus_type *, const char * buf, size_t count); -}; - -#define BUS_ATTR(_name,_mode,_show,_store) struct bus_attribute bus_attr_##_name = __ATTR(_name,_mode,_show,_store) - -struct device_driver { - const char * name; - struct bus_type * bus; - - struct completion unloaded; - struct kobject kobj; - struct klist klist_devices; - struct klist_node knode_bus; - - struct module * owner; - - int (*probe) (struct device * dev); - int (*remove) (struct device * dev); - void (*shutdown) (struct device * dev); - int (*suspend) (struct device * dev, pm_message_t state); - int (*resume) (struct device * dev); -}; - -struct driver_attribute { - struct attribute attr; - ssize_t (*show)(struct device_driver *, char * buf); - ssize_t (*store)(struct device_driver *, const char * buf, size_t count); -}; - -#define DRIVER_ATTR(_name,_mode,_show,_store) struct driver_attribute driver_attr_##_name = __ATTR(_name,_mode,_show,_store) - -struct device * driver_find_device(struct device_driver *drv, - struct device *start, void *data, - int (*match)(struct device *, void *)); - -struct class { - const char * name; - struct module * owner; - - struct subsystem subsys; - struct list_head children; - struct list_head devices; - struct list_head interfaces; - struct semaphore sem; - - struct class_attribute * class_attrs; - struct class_device_attribute * class_dev_attrs; - - int (*uevent)(struct class_device *dev, char **envp, - int num_envp, char *buffer, int buffer_size); - - void (*release)(struct class_device *dev); - void (*class_release)(struct class *class); -}; - -struct class_attribute { - struct attribute attr; - ssize_t (*show)(struct class *, char * buf); - ssize_t (*store)(struct class *, const char * buf, size_t count); -}; - -#define CLASS_ATTR(_name,_mode,_show,_store) struct class_attribute class_attr_##_name = __ATTR(_name,_mode,_show,_store) - -struct class_device_attribute { - struct attribute attr; - ssize_t (*show)(struct class_device *, char * buf); - ssize_t (*store)(struct class_device *, const char * buf, size_t count); -}; - -#define CLASS_DEVICE_ATTR(_name,_mode,_show,_store) struct class_device_attribute class_device_attr_##_name = __ATTR(_name,_mode,_show,_store) - -struct class_device { - struct list_head node; - - struct kobject kobj; - struct class * class; - dev_t devt; - struct class_device_attribute *devt_attr; - struct class_device_attribute uevent_attr; - struct device * dev; - void * class_data; - struct class_device *parent; - struct attribute_group ** groups; - - void (*release)(struct class_device *dev); - int (*uevent)(struct class_device *dev, char **envp, - int num_envp, char *buffer, int buffer_size); - char class_id[BUS_ID_SIZE]; -}; - -struct class_interface { - struct list_head node; - struct class *class; - - int (*add) (struct class_device *, struct class_interface *); - void (*remove) (struct class_device *, struct class_interface *); -}; - -struct device_attribute { - struct attribute attr; - ssize_t (*show)(struct device *dev, struct device_attribute *attr, - char *buf); - ssize_t (*store)(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count); -}; - -#define DEVICE_ATTR(_name,_mode,_show,_store) struct device_attribute dev_attr_##_name = __ATTR(_name,_mode,_show,_store) - -struct device { - struct klist klist_children; - struct klist_node knode_parent; - struct klist_node knode_driver; - struct klist_node knode_bus; - struct device * parent; - - struct kobject kobj; - char bus_id[BUS_ID_SIZE]; - struct device_attribute uevent_attr; - struct device_attribute *devt_attr; - - struct semaphore sem; - - struct bus_type * bus; - struct device_driver *driver; - void *driver_data; - void *platform_data; - void *firmware_data; - struct dev_pm_info power; - - u64 *dma_mask; - u64 coherent_dma_mask; - - struct list_head dma_pools; - - struct dma_coherent_mem *dma_mem; - - struct list_head node; - struct class *class; - dev_t devt; - - void (*release)(struct device * dev); -}; - -#define dev_printk(level, dev, format, arg...) printk(level "%s %s: " format , dev_driver_string(dev) , (dev)->bus_id , ## arg) - -#ifdef DEBUG -#define dev_dbg(dev, format, arg...) dev_printk(KERN_DEBUG , dev , format , ## arg) -#else -#define dev_dbg(dev, format, arg...) do { (void)(dev); } while (0) -#endif - -#define dev_err(dev, format, arg...) dev_printk(KERN_ERR , dev , format , ## arg) -#define dev_info(dev, format, arg...) dev_printk(KERN_INFO , dev , format , ## arg) -#define dev_warn(dev, format, arg...) dev_printk(KERN_WARNING , dev , format , ## arg) -#define dev_notice(dev, format, arg...) dev_printk(KERN_NOTICE , dev , format , ## arg) - -#define MODULE_ALIAS_CHARDEV(major,minor) MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor)) -#define MODULE_ALIAS_CHARDEV_MAJOR(major) MODULE_ALIAS("char-major-" __stringify(major) "-*") -#endif diff --git a/libc/kernel/common/linux/dirent.h b/libc/kernel/common/linux/dirent.h deleted file mode 100644 index 2dace186b..000000000 --- a/libc/kernel/common/linux/dirent.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_DIRENT_H -#define _LINUX_DIRENT_H - -struct dirent { - long d_ino; - __kernel_off_t d_off; - unsigned short d_reclen; - char d_name[256]; -}; - -struct dirent64 { - __u64 d_ino; - __s64 d_off; - unsigned short d_reclen; - unsigned char d_type; - char d_name[256]; -}; - -#endif diff --git a/libc/kernel/common/linux/dm-ioctl.h b/libc/kernel/common/linux/dm-ioctl.h deleted file mode 100644 index ead7744b1..000000000 --- a/libc/kernel/common/linux/dm-ioctl.h +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_DM_IOCTL_V4_H -#define _LINUX_DM_IOCTL_V4_H - -#include - -#define DM_DIR "mapper" -#define DM_MAX_TYPE_NAME 16 -#define DM_NAME_LEN 128 -#define DM_UUID_LEN 129 - -struct dm_ioctl { - - uint32_t version[3]; - uint32_t data_size; - - uint32_t data_start; - - uint32_t target_count; - int32_t open_count; - uint32_t flags; - uint32_t event_nr; - uint32_t padding; - - uint64_t dev; - - char name[DM_NAME_LEN]; - char uuid[DM_UUID_LEN]; - char data[7]; -}; - -struct dm_target_spec { - uint64_t sector_start; - uint64_t length; - int32_t status; - - uint32_t next; - - char target_type[DM_MAX_TYPE_NAME]; - -}; - -struct dm_target_deps { - uint32_t count; - uint32_t padding; - uint64_t dev[0]; -}; - -struct dm_name_list { - uint64_t dev; - uint32_t next; - char name[0]; -}; - -struct dm_target_versions { - uint32_t next; - uint32_t version[3]; - - char name[0]; -}; - -struct dm_target_msg { - uint64_t sector; - - char message[0]; -}; - -enum { - - DM_VERSION_CMD = 0, - DM_REMOVE_ALL_CMD, - DM_LIST_DEVICES_CMD, - - DM_DEV_CREATE_CMD, - DM_DEV_REMOVE_CMD, - DM_DEV_RENAME_CMD, - DM_DEV_SUSPEND_CMD, - DM_DEV_STATUS_CMD, - DM_DEV_WAIT_CMD, - - DM_TABLE_LOAD_CMD, - DM_TABLE_CLEAR_CMD, - DM_TABLE_DEPS_CMD, - DM_TABLE_STATUS_CMD, - - DM_LIST_VERSIONS_CMD, - DM_TARGET_MSG_CMD, - DM_DEV_SET_GEOMETRY_CMD -}; - -#define DM_IOCTL 0xfd - -#define DM_VERSION _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl) -#define DM_REMOVE_ALL _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl) -#define DM_LIST_DEVICES _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl) - -#define DM_DEV_CREATE _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl) -#define DM_DEV_REMOVE _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl) -#define DM_DEV_RENAME _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl) -#define DM_DEV_SUSPEND _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl) -#define DM_DEV_STATUS _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl) -#define DM_DEV_WAIT _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl) - -#define DM_TABLE_LOAD _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl) -#define DM_TABLE_CLEAR _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl) -#define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) -#define DM_TABLE_STATUS _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl) - -#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl) - -#define DM_TARGET_MSG _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl) -#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) - -#define DM_VERSION_MAJOR 4 -#define DM_VERSION_MINOR 14 -#define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2008-04-23)" - -#define DM_READONLY_FLAG (1 << 0) -#define DM_SUSPEND_FLAG (1 << 1) -#define DM_PERSISTENT_DEV_FLAG (1 << 3) - -#define DM_STATUS_TABLE_FLAG (1 << 4) - -#define DM_ACTIVE_PRESENT_FLAG (1 << 5) -#define DM_INACTIVE_PRESENT_FLAG (1 << 6) - -#define DM_BUFFER_FULL_FLAG (1 << 8) - -#define DM_SKIP_BDGET_FLAG (1 << 9) - -#define DM_SKIP_LOCKFS_FLAG (1 << 10) - -#define DM_NOFLUSH_FLAG (1 << 11) - -#endif diff --git a/libc/kernel/common/linux/dma-mapping.h b/libc/kernel/common/linux/dma-mapping.h deleted file mode 100644 index 643225921..000000000 --- a/libc/kernel/common/linux/dma-mapping.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ASM_LINUX_DMA_MAPPING_H -#define _ASM_LINUX_DMA_MAPPING_H - -#include -#include - -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, - DMA_NONE = 3, -}; - -#define DMA_64BIT_MASK 0xffffffffffffffffULL -#define DMA_48BIT_MASK 0x0000ffffffffffffULL -#define DMA_40BIT_MASK 0x000000ffffffffffULL -#define DMA_39BIT_MASK 0x0000007fffffffffULL -#define DMA_32BIT_MASK 0x00000000ffffffffULL -#define DMA_31BIT_MASK 0x000000007fffffffULL -#define DMA_30BIT_MASK 0x000000003fffffffULL -#define DMA_29BIT_MASK 0x000000001fffffffULL -#define DMA_28BIT_MASK 0x000000000fffffffULL -#define DMA_24BIT_MASK 0x0000000000ffffffULL - -#include - -#define dma_sync_single dma_sync_single_for_cpu -#define dma_sync_sg dma_sync_sg_for_cpu - -#define DMA_MEMORY_MAP 0x01 -#define DMA_MEMORY_IO 0x02 -#define DMA_MEMORY_INCLUDES_CHILDREN 0x04 -#define DMA_MEMORY_EXCLUSIVE 0x08 - -#ifndef ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY -#endif -#endif diff --git a/libc/kernel/common/linux/dmaengine.h b/libc/kernel/common/linux/dmaengine.h deleted file mode 100644 index 549fea92d..000000000 --- a/libc/kernel/common/linux/dmaengine.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef DMAENGINE_H -#define DMAENGINE_H - -#endif diff --git a/libc/kernel/common/linux/efs_dir.h b/libc/kernel/common/linux/efs_dir.h deleted file mode 100644 index 5be27625e..000000000 --- a/libc/kernel/common/linux/efs_dir.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __EFS_DIR_H__ -#define __EFS_DIR_H__ - -#define EFS_DIRBSIZE_BITS EFS_BLOCKSIZE_BITS -#define EFS_DIRBSIZE (1 << EFS_DIRBSIZE_BITS) - -struct efs_dentry { - __be32 inode; - unsigned char namelen; - char name[3]; -}; - -#define EFS_DENTSIZE (sizeof(struct efs_dentry) - 3 + 1) -#define EFS_MAXNAMELEN ((1 << (sizeof(char) * 8)) - 1) - -#define EFS_DIRBLK_HEADERSIZE 4 -#define EFS_DIRBLK_MAGIC 0xbeef - -struct efs_dir { - __be16 magic; - unsigned char firstused; - unsigned char slots; - - unsigned char space[EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE]; -}; - -#define EFS_MAXENTS ((EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE) / (EFS_DENTSIZE + sizeof(char))) - -#define EFS_SLOTAT(dir, slot) EFS_REALOFF((dir)->space[slot]) - -#define EFS_REALOFF(offset) ((offset << 1)) - -#endif - diff --git a/libc/kernel/common/linux/efs_fs_i.h b/libc/kernel/common/linux/efs_fs_i.h deleted file mode 100644 index 6d88d28ae..000000000 --- a/libc/kernel/common/linux/efs_fs_i.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __EFS_FS_I_H__ -#define __EFS_FS_I_H__ - -typedef int32_t efs_block_t; -typedef uint32_t efs_ino_t; - -#define EFS_DIRECTEXTENTS 12 - -typedef union extent_u { - unsigned char raw[8]; - struct extent_s { - unsigned int ex_magic:8; - unsigned int ex_bn:24; - unsigned int ex_length:8; - unsigned int ex_offset:24; - } cooked; -} efs_extent; - -typedef struct edevs { - __be16 odev; - __be32 ndev; -} efs_devs; - -struct efs_dinode { - __be16 di_mode; - __be16 di_nlink; - __be16 di_uid; - __be16 di_gid; - __be32 di_size; - __be32 di_atime; - __be32 di_mtime; - __be32 di_ctime; - __be32 di_gen; - __be16 di_numextents; - u_char di_version; - u_char di_spare; - union di_addr { - efs_extent di_extents[EFS_DIRECTEXTENTS]; - efs_devs di_dev; - } di_u; -}; - -struct efs_inode_info { - int numextents; - int lastextent; - - efs_extent extents[EFS_DIRECTEXTENTS]; - struct inode vfs_inode; -}; - -#endif - diff --git a/libc/kernel/common/linux/efs_fs_sb.h b/libc/kernel/common/linux/efs_fs_sb.h deleted file mode 100644 index f7960c007..000000000 --- a/libc/kernel/common/linux/efs_fs_sb.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __EFS_FS_SB_H__ -#define __EFS_FS_SB_H__ - -#define EFS_SUPER_MAGIC 0x414A53 - -#define EFS_MAGIC 0x072959 -#define EFS_NEWMAGIC 0x07295a - -#define IS_EFS_MAGIC(x) ((x == EFS_MAGIC) || (x == EFS_NEWMAGIC)) - -#define EFS_SUPER 1 -#define EFS_ROOTINODE 2 - -struct efs_super { - __be32 fs_size; - __be32 fs_firstcg; - __be32 fs_cgfsize; - __be16 fs_cgisize; - __be16 fs_sectors; - __be16 fs_heads; - __be16 fs_ncg; - __be16 fs_dirty; - __be32 fs_time; - __be32 fs_magic; - char fs_fname[6]; - char fs_fpack[6]; - __be32 fs_bmsize; - __be32 fs_tfree; - __be32 fs_tinode; - __be32 fs_bmblock; - __be32 fs_replsb; - __be32 fs_lastialloc; - char fs_spare[20]; - __be32 fs_checksum; -}; - -struct efs_sb_info { - __u32 fs_magic; - __u32 fs_start; - __u32 first_block; - __u32 total_blocks; - __u32 group_size; - __u32 data_free; - __u32 inode_free; - __u16 inode_blocks; - __u16 total_groups; -}; - -#endif - diff --git a/libc/kernel/common/linux/elevator.h b/libc/kernel/common/linux/elevator.h deleted file mode 100644 index 2e79ce989..000000000 --- a/libc/kernel/common/linux/elevator.h +++ /dev/null @@ -1,109 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ELEVATOR_H -#define _LINUX_ELEVATOR_H - -typedef int (elevator_merge_fn) (request_queue_t *, struct request **, - struct bio *); - -typedef void (elevator_merge_req_fn) (request_queue_t *, struct request *, struct request *); - -typedef void (elevator_merged_fn) (request_queue_t *, struct request *); - -typedef int (elevator_dispatch_fn) (request_queue_t *, int); - -typedef void (elevator_add_req_fn) (request_queue_t *, struct request *); -typedef int (elevator_queue_empty_fn) (request_queue_t *); -typedef struct request *(elevator_request_list_fn) (request_queue_t *, struct request *); -typedef void (elevator_completed_req_fn) (request_queue_t *, struct request *); -typedef int (elevator_may_queue_fn) (request_queue_t *, int, struct bio *); - -typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, gfp_t); -typedef void (elevator_put_req_fn) (request_queue_t *, struct request *); -typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *); -typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *); - -typedef void *(elevator_init_fn) (request_queue_t *, elevator_t *); -typedef void (elevator_exit_fn) (elevator_t *); - -struct elevator_ops -{ - elevator_merge_fn *elevator_merge_fn; - elevator_merged_fn *elevator_merged_fn; - elevator_merge_req_fn *elevator_merge_req_fn; - - elevator_dispatch_fn *elevator_dispatch_fn; - elevator_add_req_fn *elevator_add_req_fn; - elevator_activate_req_fn *elevator_activate_req_fn; - elevator_deactivate_req_fn *elevator_deactivate_req_fn; - - elevator_queue_empty_fn *elevator_queue_empty_fn; - elevator_completed_req_fn *elevator_completed_req_fn; - - elevator_request_list_fn *elevator_former_req_fn; - elevator_request_list_fn *elevator_latter_req_fn; - - elevator_set_req_fn *elevator_set_req_fn; - elevator_put_req_fn *elevator_put_req_fn; - - elevator_may_queue_fn *elevator_may_queue_fn; - - elevator_init_fn *elevator_init_fn; - elevator_exit_fn *elevator_exit_fn; - void (*trim)(struct io_context *); -}; - -#define ELV_NAME_MAX (16) - -struct elv_fs_entry { - struct attribute attr; - ssize_t (*show)(elevator_t *, char *); - ssize_t (*store)(elevator_t *, const char *, size_t); -}; - -struct elevator_type -{ - struct list_head list; - struct elevator_ops ops; - struct elevator_type *elevator_type; - struct elv_fs_entry *elevator_attrs; - char elevator_name[ELV_NAME_MAX]; - struct module *elevator_owner; -}; - -struct elevator_queue -{ - struct elevator_ops *ops; - void *elevator_data; - struct kobject kobj; - struct elevator_type *elevator_type; - struct mutex sysfs_lock; -}; - -#define ELEVATOR_NO_MERGE 0 -#define ELEVATOR_FRONT_MERGE 1 -#define ELEVATOR_BACK_MERGE 2 - -#define ELEVATOR_INSERT_FRONT 1 -#define ELEVATOR_INSERT_BACK 2 -#define ELEVATOR_INSERT_SORT 3 -#define ELEVATOR_INSERT_REQUEUE 4 - -enum { - ELV_MQUEUE_MAY, - ELV_MQUEUE_NO, - ELV_MQUEUE_MUST, -}; - -#define rq_end_sector(rq) ((rq)->sector + (rq)->nr_sectors) - -#endif diff --git a/libc/kernel/common/linux/elf-em.h b/libc/kernel/common/linux/elf-em.h deleted file mode 100644 index e151fdf82..000000000 --- a/libc/kernel/common/linux/elf-em.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ELF_EM_H -#define _LINUX_ELF_EM_H - -#define EM_NONE 0 -#define EM_M32 1 -#define EM_SPARC 2 -#define EM_386 3 -#define EM_68K 4 -#define EM_88K 5 -#define EM_486 6 -#define EM_860 7 -#define EM_MIPS 8 - -#define EM_MIPS_RS3_LE 10 -#define EM_MIPS_RS4_BE 10 - -#define EM_PARISC 15 -#define EM_SPARC32PLUS 18 -#define EM_PPC 20 -#define EM_PPC64 21 -#define EM_SH 42 -#define EM_SPARCV9 43 -#define EM_IA_64 50 -#define EM_X86_64 62 -#define EM_S390 22 -#define EM_CRIS 76 -#define EM_V850 87 -#define EM_M32R 88 -#define EM_H8_300 46 -#define EM_FRV 0x5441 - -#define EM_ALPHA 0x9026 - -#define EM_CYGNUS_V850 0x9080 - -#define EM_CYGNUS_M32R 0x9041 - -#define EM_S390_OLD 0xA390 - -#endif diff --git a/libc/kernel/common/linux/elf.h b/libc/kernel/common/linux/elf.h deleted file mode 100644 index f16b43928..000000000 --- a/libc/kernel/common/linux/elf.h +++ /dev/null @@ -1,361 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ELF_H -#define _LINUX_ELF_H - -#include -#include -#include -#include - -#ifndef elf_read_implies_exec - -#define elf_read_implies_exec(ex, have_pt_gnu_stack) 0 -#endif - -typedef __u32 Elf32_Addr; -typedef __u16 Elf32_Half; -typedef __u32 Elf32_Off; -typedef __s32 Elf32_Sword; -typedef __u32 Elf32_Word; - -typedef __u64 Elf64_Addr; -typedef __u16 Elf64_Half; -typedef __s16 Elf64_SHalf; -typedef __u64 Elf64_Off; -typedef __s32 Elf64_Sword; -typedef __u32 Elf64_Word; -typedef __u64 Elf64_Xword; -typedef __s64 Elf64_Sxword; - -#define PT_NULL 0 -#define PT_LOAD 1 -#define PT_DYNAMIC 2 -#define PT_INTERP 3 -#define PT_NOTE 4 -#define PT_SHLIB 5 -#define PT_PHDR 6 -#define PT_TLS 7 -#define PT_LOOS 0x60000000 -#define PT_HIOS 0x6fffffff -#define PT_LOPROC 0x70000000 -#define PT_HIPROC 0x7fffffff -#define PT_GNU_EH_FRAME 0x6474e550 - -#define PT_GNU_STACK (PT_LOOS + 0x474e551) - -#define ET_NONE 0 -#define ET_REL 1 -#define ET_EXEC 2 -#define ET_DYN 3 -#define ET_CORE 4 -#define ET_LOPROC 0xff00 -#define ET_HIPROC 0xffff - -#define DT_NULL 0 -#define DT_NEEDED 1 -#define DT_PLTRELSZ 2 -#define DT_PLTGOT 3 -#define DT_HASH 4 -#define DT_STRTAB 5 -#define DT_SYMTAB 6 -#define DT_RELA 7 -#define DT_RELASZ 8 -#define DT_RELAENT 9 -#define DT_STRSZ 10 -#define DT_SYMENT 11 -#define DT_INIT 12 -#define DT_FINI 13 -#define DT_SONAME 14 -#define DT_RPATH 15 -#define DT_SYMBOLIC 16 -#define DT_REL 17 -#define DT_RELSZ 18 -#define DT_RELENT 19 -#define DT_PLTREL 20 -#define DT_DEBUG 21 -#define DT_TEXTREL 22 -#define DT_JMPREL 23 -#define DT_LOPROC 0x70000000 -#define DT_HIPROC 0x7fffffff - -#define STB_LOCAL 0 -#define STB_GLOBAL 1 -#define STB_WEAK 2 - -#define STT_NOTYPE 0 -#define STT_OBJECT 1 -#define STT_FUNC 2 -#define STT_SECTION 3 -#define STT_FILE 4 -#define STT_COMMON 5 -#define STT_TLS 6 - -#define ELF_ST_BIND(x) ((x) >> 4) -#define ELF_ST_TYPE(x) (((unsigned int) x) & 0xf) -#define ELF32_ST_BIND(x) ELF_ST_BIND(x) -#define ELF32_ST_TYPE(x) ELF_ST_TYPE(x) -#define ELF64_ST_BIND(x) ELF_ST_BIND(x) -#define ELF64_ST_TYPE(x) ELF_ST_TYPE(x) - -typedef struct dynamic{ - Elf32_Sword d_tag; - union{ - Elf32_Sword d_val; - Elf32_Addr d_ptr; - } d_un; -} Elf32_Dyn; - -typedef struct { - Elf64_Sxword d_tag; - union { - Elf64_Xword d_val; - Elf64_Addr d_ptr; - } d_un; -} Elf64_Dyn; - -#define ELF32_R_SYM(x) ((x) >> 8) -#define ELF32_R_TYPE(x) ((x) & 0xff) - -#define ELF64_R_SYM(i) ((i) >> 32) -#define ELF64_R_TYPE(i) ((i) & 0xffffffff) - -typedef struct elf32_rel { - Elf32_Addr r_offset; - Elf32_Word r_info; -} Elf32_Rel; - -typedef struct elf64_rel { - Elf64_Addr r_offset; - Elf64_Xword r_info; -} Elf64_Rel; - -typedef struct elf32_rela{ - Elf32_Addr r_offset; - Elf32_Word r_info; - Elf32_Sword r_addend; -} Elf32_Rela; - -typedef struct elf64_rela { - Elf64_Addr r_offset; - Elf64_Xword r_info; - Elf64_Sxword r_addend; -} Elf64_Rela; - -typedef struct elf32_sym{ - Elf32_Word st_name; - Elf32_Addr st_value; - Elf32_Word st_size; - unsigned char st_info; - unsigned char st_other; - Elf32_Half st_shndx; -} Elf32_Sym; - -typedef struct elf64_sym { - Elf64_Word st_name; - unsigned char st_info; - unsigned char st_other; - Elf64_Half st_shndx; - Elf64_Addr st_value; - Elf64_Xword st_size; -} Elf64_Sym; - -#define EI_NIDENT 16 - -typedef struct elf32_hdr{ - unsigned char e_ident[EI_NIDENT]; - Elf32_Half e_type; - Elf32_Half e_machine; - Elf32_Word e_version; - Elf32_Addr e_entry; - Elf32_Off e_phoff; - Elf32_Off e_shoff; - Elf32_Word e_flags; - Elf32_Half e_ehsize; - Elf32_Half e_phentsize; - Elf32_Half e_phnum; - Elf32_Half e_shentsize; - Elf32_Half e_shnum; - Elf32_Half e_shstrndx; -} Elf32_Ehdr; - -typedef struct elf64_hdr { - unsigned char e_ident[16]; - Elf64_Half e_type; - Elf64_Half e_machine; - Elf64_Word e_version; - Elf64_Addr e_entry; - Elf64_Off e_phoff; - Elf64_Off e_shoff; - Elf64_Word e_flags; - Elf64_Half e_ehsize; - Elf64_Half e_phentsize; - Elf64_Half e_phnum; - Elf64_Half e_shentsize; - Elf64_Half e_shnum; - Elf64_Half e_shstrndx; -} Elf64_Ehdr; - -#define PF_R 0x4 -#define PF_W 0x2 -#define PF_X 0x1 - -typedef struct elf32_phdr{ - Elf32_Word p_type; - Elf32_Off p_offset; - Elf32_Addr p_vaddr; - Elf32_Addr p_paddr; - Elf32_Word p_filesz; - Elf32_Word p_memsz; - Elf32_Word p_flags; - Elf32_Word p_align; -} Elf32_Phdr; - -typedef struct elf64_phdr { - Elf64_Word p_type; - Elf64_Word p_flags; - Elf64_Off p_offset; - Elf64_Addr p_vaddr; - Elf64_Addr p_paddr; - Elf64_Xword p_filesz; - Elf64_Xword p_memsz; - Elf64_Xword p_align; -} Elf64_Phdr; - -#define SHT_NULL 0 -#define SHT_PROGBITS 1 -#define SHT_SYMTAB 2 -#define SHT_STRTAB 3 -#define SHT_RELA 4 -#define SHT_HASH 5 -#define SHT_DYNAMIC 6 -#define SHT_NOTE 7 -#define SHT_NOBITS 8 -#define SHT_REL 9 -#define SHT_SHLIB 10 -#define SHT_DYNSYM 11 -#define SHT_NUM 12 -#define SHT_LOPROC 0x70000000 -#define SHT_HIPROC 0x7fffffff -#define SHT_LOUSER 0x80000000 -#define SHT_HIUSER 0xffffffff - -#define SHF_WRITE 0x1 -#define SHF_ALLOC 0x2 -#define SHF_EXECINSTR 0x4 -#define SHF_MASKPROC 0xf0000000 - -#define SHN_UNDEF 0 -#define SHN_LORESERVE 0xff00 -#define SHN_LOPROC 0xff00 -#define SHN_HIPROC 0xff1f -#define SHN_ABS 0xfff1 -#define SHN_COMMON 0xfff2 -#define SHN_HIRESERVE 0xffff - -typedef struct { - Elf32_Word sh_name; - Elf32_Word sh_type; - Elf32_Word sh_flags; - Elf32_Addr sh_addr; - Elf32_Off sh_offset; - Elf32_Word sh_size; - Elf32_Word sh_link; - Elf32_Word sh_info; - Elf32_Word sh_addralign; - Elf32_Word sh_entsize; -} Elf32_Shdr; - -typedef struct elf64_shdr { - Elf64_Word sh_name; - Elf64_Word sh_type; - Elf64_Xword sh_flags; - Elf64_Addr sh_addr; - Elf64_Off sh_offset; - Elf64_Xword sh_size; - Elf64_Word sh_link; - Elf64_Word sh_info; - Elf64_Xword sh_addralign; - Elf64_Xword sh_entsize; -} Elf64_Shdr; - -#define EI_MAG0 0 -#define EI_MAG1 1 -#define EI_MAG2 2 -#define EI_MAG3 3 -#define EI_CLASS 4 -#define EI_DATA 5 -#define EI_VERSION 6 -#define EI_OSABI 7 -#define EI_PAD 8 - -#define ELFMAG0 0x7f -#define ELFMAG1 'E' -#define ELFMAG2 'L' -#define ELFMAG3 'F' -#define ELFMAG "\177ELF" -#define SELFMAG 4 - -#define ELFCLASSNONE 0 -#define ELFCLASS32 1 -#define ELFCLASS64 2 -#define ELFCLASSNUM 3 - -#define ELFDATANONE 0 -#define ELFDATA2LSB 1 -#define ELFDATA2MSB 2 - -#define EV_NONE 0 -#define EV_CURRENT 1 -#define EV_NUM 2 - -#define ELFOSABI_NONE 0 -#define ELFOSABI_LINUX 3 - -#ifndef ELF_OSABI -#define ELF_OSABI ELFOSABI_NONE -#endif - -#define NT_PRSTATUS 1 -#define NT_PRFPREG 2 -#define NT_PRPSINFO 3 -#define NT_TASKSTRUCT 4 -#define NT_AUXV 6 -#define NT_PRXFPREG 0x46e62b7f - -typedef struct elf32_note { - Elf32_Word n_namesz; - Elf32_Word n_descsz; - Elf32_Word n_type; -} Elf32_Nhdr; - -typedef struct elf64_note { - Elf64_Word n_namesz; - Elf64_Word n_descsz; - Elf64_Word n_type; -} Elf64_Nhdr; - -#if ELF_CLASS == ELFCLASS32 - -#define elfhdr elf32_hdr -#define elf_phdr elf32_phdr -#define elf_note elf32_note - -#else - -#define elfhdr elf64_hdr -#define elf_phdr elf64_phdr -#define elf_note elf64_note - -#endif - -#endif diff --git a/libc/kernel/common/linux/err.h b/libc/kernel/common/linux/err.h deleted file mode 100644 index 1aa4f9b04..000000000 --- a/libc/kernel/common/linux/err.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ERR_H -#define _LINUX_ERR_H - -#include - -#include - -#define MAX_ERRNO 4095 - -#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO) - -#endif diff --git a/libc/kernel/common/linux/errno.h b/libc/kernel/common/linux/errno.h deleted file mode 100644 index 72ee6426c..000000000 --- a/libc/kernel/common/linux/errno.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ERRNO_H -#define _LINUX_ERRNO_H - -#include - -#endif diff --git a/libc/kernel/common/linux/errqueue.h b/libc/kernel/common/linux/errqueue.h deleted file mode 100644 index 03b2e4288..000000000 --- a/libc/kernel/common/linux/errqueue.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ERRQUEUE_H -#define _LINUX_ERRQUEUE_H 1 - -struct sock_extended_err -{ - __u32 ee_errno; - __u8 ee_origin; - __u8 ee_type; - __u8 ee_code; - __u8 ee_pad; - __u32 ee_info; - __u32 ee_data; -}; - -#define SO_EE_ORIGIN_NONE 0 -#define SO_EE_ORIGIN_LOCAL 1 -#define SO_EE_ORIGIN_ICMP 2 -#define SO_EE_ORIGIN_ICMP6 3 - -#define SO_EE_OFFENDER(ee) ((struct sockaddr*)((ee)+1)) - -#endif diff --git a/libc/kernel/common/linux/etherdevice.h b/libc/kernel/common/linux/etherdevice.h deleted file mode 100644 index d087e8fef..000000000 --- a/libc/kernel/common/linux/etherdevice.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ETHERDEVICE_H -#define _LINUX_ETHERDEVICE_H - -#include -#include -#include - -#endif diff --git a/libc/kernel/common/linux/ext2_fs.h b/libc/kernel/common/linux/ext2_fs.h deleted file mode 100644 index c21b09a56..000000000 --- a/libc/kernel/common/linux/ext2_fs.h +++ /dev/null @@ -1,378 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_EXT2_FS_H -#define _LINUX_EXT2_FS_H - -#include - -#undef EXT2FS_DEBUG - -#define EXT2_PREALLOCATE -#define EXT2_DEFAULT_PREALLOC_BLOCKS 8 - -#define EXT2FS_DATE "95/08/09" -#define EXT2FS_VERSION "0.5b" - -#ifdef EXT2FS_DEBUG -#define ext2_debug(f, a...) { printk ("EXT2-fs DEBUG (%s, %d): %s:", __FILE__, __LINE__, __FUNCTION__); printk (f, ## a); } -#else -#define ext2_debug(f, a...) -#endif - -#define EXT2_BAD_INO 1 -#define EXT2_ROOT_INO 2 -#define EXT2_BOOT_LOADER_INO 5 -#define EXT2_UNDEL_DIR_INO 6 - -#define EXT2_GOOD_OLD_FIRST_INO 11 - -#define EXT2_SUPER_MAGIC 0xEF53 - -#define EXT2_SB(sb) (sb) - -#define EXT2_LINK_MAX 32000 - -#define EXT2_MIN_BLOCK_SIZE 1024 -#define EXT2_MAX_BLOCK_SIZE 4096 -#define EXT2_MIN_BLOCK_LOG_SIZE 10 -#define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) -#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) -#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) -#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size) -#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino) - -#define EXT2_MIN_FRAG_SIZE 1024 -#define EXT2_MAX_FRAG_SIZE 4096 -#define EXT2_MIN_FRAG_LOG_SIZE 10 -#define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) -#define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) - -struct ext2_group_desc -{ - __le32 bg_block_bitmap; - __le32 bg_inode_bitmap; - __le32 bg_inode_table; - __le16 bg_free_blocks_count; - __le16 bg_free_inodes_count; - __le16 bg_used_dirs_count; - __le16 bg_pad; - __le32 bg_reserved[3]; -}; - -#define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) -#define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) -#define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) - -#define EXT2_NDIR_BLOCKS 12 -#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS -#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) -#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) -#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - -#define EXT2_SECRM_FL 0x00000001 -#define EXT2_UNRM_FL 0x00000002 -#define EXT2_COMPR_FL 0x00000004 -#define EXT2_SYNC_FL 0x00000008 -#define EXT2_IMMUTABLE_FL 0x00000010 -#define EXT2_APPEND_FL 0x00000020 -#define EXT2_NODUMP_FL 0x00000040 -#define EXT2_NOATIME_FL 0x00000080 - -#define EXT2_DIRTY_FL 0x00000100 -#define EXT2_COMPRBLK_FL 0x00000200 -#define EXT2_NOCOMP_FL 0x00000400 -#define EXT2_ECOMPR_FL 0x00000800 - -#define EXT2_BTREE_FL 0x00001000 -#define EXT2_INDEX_FL 0x00001000 -#define EXT2_IMAGIC_FL 0x00002000 -#define EXT2_JOURNAL_DATA_FL 0x00004000 -#define EXT2_NOTAIL_FL 0x00008000 -#define EXT2_DIRSYNC_FL 0x00010000 -#define EXT2_TOPDIR_FL 0x00020000 -#define EXT2_RESERVED_FL 0x80000000 - -#define EXT2_FL_USER_VISIBLE 0x0003DFFF -#define EXT2_FL_USER_MODIFIABLE 0x000380FF - -#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) -#define EXT2_IOC_SETFLAGS _IOW('f', 2, long) -#define EXT2_IOC_GETVERSION _IOR('v', 1, long) -#define EXT2_IOC_SETVERSION _IOW('v', 2, long) - -struct ext2_inode { - __le16 i_mode; - __le16 i_uid; - __le32 i_size; - __le32 i_atime; - __le32 i_ctime; - __le32 i_mtime; - __le32 i_dtime; - __le16 i_gid; - __le16 i_links_count; - __le32 i_blocks; - __le32 i_flags; - union { - struct { - __le32 l_i_reserved1; - } linux1; - struct { - __le32 h_i_translator; - } hurd1; - struct { - __le32 m_i_reserved1; - } masix1; - } osd1; - __le32 i_block[EXT2_N_BLOCKS]; - __le32 i_generation; - __le32 i_file_acl; - __le32 i_dir_acl; - __le32 i_faddr; - union { - struct { - __u8 l_i_frag; - __u8 l_i_fsize; - __u16 i_pad1; - __le16 l_i_uid_high; - __le16 l_i_gid_high; - __u32 l_i_reserved2; - } linux2; - struct { - __u8 h_i_frag; - __u8 h_i_fsize; - __le16 h_i_mode_high; - __le16 h_i_uid_high; - __le16 h_i_gid_high; - __le32 h_i_author; - } hurd2; - struct { - __u8 m_i_frag; - __u8 m_i_fsize; - __u16 m_pad1; - __u32 m_i_reserved2[2]; - } masix2; - } osd2; -}; - -#define i_size_high i_dir_acl - -#ifdef __linux__ -#define i_reserved1 osd1.linux1.l_i_reserved1 -#define i_frag osd2.linux2.l_i_frag -#define i_fsize osd2.linux2.l_i_fsize -#define i_uid_low i_uid -#define i_gid_low i_gid -#define i_uid_high osd2.linux2.l_i_uid_high -#define i_gid_high osd2.linux2.l_i_gid_high -#define i_reserved2 osd2.linux2.l_i_reserved2 -#endif - -#ifdef __hurd__ -#define i_translator osd1.hurd1.h_i_translator -#define i_frag osd2.hurd2.h_i_frag; -#define i_fsize osd2.hurd2.h_i_fsize; -#define i_uid_high osd2.hurd2.h_i_uid_high -#define i_gid_high osd2.hurd2.h_i_gid_high -#define i_author osd2.hurd2.h_i_author -#endif - -#ifdef __masix__ -#define i_reserved1 osd1.masix1.m_i_reserved1 -#define i_frag osd2.masix2.m_i_frag -#define i_fsize osd2.masix2.m_i_fsize -#define i_reserved2 osd2.masix2.m_i_reserved2 -#endif - -#define EXT2_VALID_FS 0x0001 -#define EXT2_ERROR_FS 0x0002 - -#define EXT2_MOUNT_CHECK 0x000001 -#define EXT2_MOUNT_OLDALLOC 0x000002 -#define EXT2_MOUNT_GRPID 0x000004 -#define EXT2_MOUNT_DEBUG 0x000008 -#define EXT2_MOUNT_ERRORS_CONT 0x000010 -#define EXT2_MOUNT_ERRORS_RO 0x000020 -#define EXT2_MOUNT_ERRORS_PANIC 0x000040 -#define EXT2_MOUNT_MINIX_DF 0x000080 -#define EXT2_MOUNT_NOBH 0x000100 -#define EXT2_MOUNT_NO_UID32 0x000200 -#define EXT2_MOUNT_XATTR_USER 0x004000 -#define EXT2_MOUNT_POSIX_ACL 0x008000 -#define EXT2_MOUNT_XIP 0x010000 -#define EXT2_MOUNT_USRQUOTA 0x020000 -#define EXT2_MOUNT_GRPQUOTA 0x040000 - -#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -#define set_opt(o, opt) o |= EXT2_MOUNT_##opt -#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_##opt) - -#define EXT2_DFL_MAX_MNT_COUNT 20 -#define EXT2_DFL_CHECKINTERVAL 0 - -#define EXT2_ERRORS_CONTINUE 1 -#define EXT2_ERRORS_RO 2 -#define EXT2_ERRORS_PANIC 3 -#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE - -struct ext2_super_block { - __le32 s_inodes_count; - __le32 s_blocks_count; - __le32 s_r_blocks_count; - __le32 s_free_blocks_count; - __le32 s_free_inodes_count; - __le32 s_first_data_block; - __le32 s_log_block_size; - __le32 s_log_frag_size; - __le32 s_blocks_per_group; - __le32 s_frags_per_group; - __le32 s_inodes_per_group; - __le32 s_mtime; - __le32 s_wtime; - __le16 s_mnt_count; - __le16 s_max_mnt_count; - __le16 s_magic; - __le16 s_state; - __le16 s_errors; - __le16 s_minor_rev_level; - __le32 s_lastcheck; - __le32 s_checkinterval; - __le32 s_creator_os; - __le32 s_rev_level; - __le16 s_def_resuid; - __le16 s_def_resgid; - - __le32 s_first_ino; - __le16 s_inode_size; - __le16 s_block_group_nr; - __le32 s_feature_compat; - __le32 s_feature_incompat; - __le32 s_feature_ro_compat; - __u8 s_uuid[16]; - char s_volume_name[16]; - char s_last_mounted[64]; - __le32 s_algorithm_usage_bitmap; - - __u8 s_prealloc_blocks; - __u8 s_prealloc_dir_blocks; - __u16 s_padding1; - - __u8 s_journal_uuid[16]; - __u32 s_journal_inum; - __u32 s_journal_dev; - __u32 s_last_orphan; - __u32 s_hash_seed[4]; - __u8 s_def_hash_version; - __u8 s_reserved_char_pad; - __u16 s_reserved_word_pad; - __le32 s_default_mount_opts; - __le32 s_first_meta_bg; - __u32 s_reserved[190]; -}; - -#define EXT2_OS_LINUX 0 -#define EXT2_OS_HURD 1 -#define EXT2_OS_MASIX 2 -#define EXT2_OS_FREEBSD 3 -#define EXT2_OS_LITES 4 - -#define EXT2_GOOD_OLD_REV 0 -#define EXT2_DYNAMIC_REV 1 - -#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV -#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV - -#define EXT2_GOOD_OLD_INODE_SIZE 128 - -#define EXT2_HAS_COMPAT_FEATURE(sb,mask) ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) -#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) -#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) -#define EXT2_SET_COMPAT_FEATURE(sb,mask) EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask) -#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask) -#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask) -#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask) -#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask) -#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask) - -#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 -#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 -#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 -#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 -#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010 -#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 -#define EXT2_FEATURE_COMPAT_ANY 0xffffffff - -#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 -#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 -#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 -#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff - -#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 -#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 -#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 -#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 -#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010 -#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff - -#define EXT2_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR -#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| EXT2_FEATURE_INCOMPAT_META_BG) -#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| EXT2_FEATURE_RO_COMPAT_LARGE_FILE| EXT2_FEATURE_RO_COMPAT_BTREE_DIR) -#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP -#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP - -#define EXT2_DEF_RESUID 0 -#define EXT2_DEF_RESGID 0 - -#define EXT2_DEFM_DEBUG 0x0001 -#define EXT2_DEFM_BSDGROUPS 0x0002 -#define EXT2_DEFM_XATTR_USER 0x0004 -#define EXT2_DEFM_ACL 0x0008 -#define EXT2_DEFM_UID16 0x0010 - -#define EXT3_DEFM_JMODE 0x0060 -#define EXT3_DEFM_JMODE_DATA 0x0020 -#define EXT3_DEFM_JMODE_ORDERED 0x0040 -#define EXT3_DEFM_JMODE_WBACK 0x0060 - -#define EXT2_NAME_LEN 255 - -struct ext2_dir_entry { - __le32 inode; - __le16 rec_len; - __le16 name_len; - char name[EXT2_NAME_LEN]; -}; - -struct ext2_dir_entry_2 { - __le32 inode; - __le16 rec_len; - __u8 name_len; - __u8 file_type; - char name[EXT2_NAME_LEN]; -}; - -enum { - EXT2_FT_UNKNOWN, - EXT2_FT_REG_FILE, - EXT2_FT_DIR, - EXT2_FT_CHRDEV, - EXT2_FT_BLKDEV, - EXT2_FT_FIFO, - EXT2_FT_SOCK, - EXT2_FT_SYMLINK, - EXT2_FT_MAX -}; - -#define EXT2_DIR_PAD 4 -#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) -#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & ~EXT2_DIR_ROUND) - -#endif diff --git a/libc/kernel/common/linux/ext3_fs.h b/libc/kernel/common/linux/ext3_fs.h deleted file mode 100644 index 8016fd130..000000000 --- a/libc/kernel/common/linux/ext3_fs.h +++ /dev/null @@ -1,448 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_EXT3_FS_H -#define _LINUX_EXT3_FS_H - -#include - -#undef EXT3FS_DEBUG - -#define EXT3_DEFAULT_RESERVE_BLOCKS 8 - -#define EXT3_MAX_RESERVE_BLOCKS 1027 -#define EXT3_RESERVE_WINDOW_NOT_ALLOCATED 0 - -#define CONFIG_EXT3_INDEX - -#ifdef EXT3FS_DEBUG -#define ext3_debug(f, a...) do { printk (KERN_DEBUG "EXT3-fs DEBUG (%s, %d): %s:", __FILE__, __LINE__, __FUNCTION__); printk (KERN_DEBUG f, ## a); } while (0) -#else -#define ext3_debug(f, a...) do {} while (0) -#endif - -#define EXT3_BAD_INO 1 -#define EXT3_ROOT_INO 2 -#define EXT3_BOOT_LOADER_INO 5 -#define EXT3_UNDEL_DIR_INO 6 -#define EXT3_RESIZE_INO 7 -#define EXT3_JOURNAL_INO 8 - -#define EXT3_GOOD_OLD_FIRST_INO 11 - -#define EXT3_SUPER_MAGIC 0xEF53 - -#define EXT3_LINK_MAX 32000 - -#define EXT3_MIN_BLOCK_SIZE 1024 -#define EXT3_MAX_BLOCK_SIZE 4096 -#define EXT3_MIN_BLOCK_LOG_SIZE 10 -#define EXT3_BLOCK_SIZE(s) (EXT3_MIN_BLOCK_SIZE << (s)->s_log_block_size) -#define EXT3_ADDR_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (__u32)) -#define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) -#define EXT3_INODE_SIZE(s) (((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? EXT3_GOOD_OLD_INODE_SIZE : (s)->s_inode_size) -#define EXT3_FIRST_INO(s) (((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? EXT3_GOOD_OLD_FIRST_INO : (s)->s_first_ino) - -#define EXT3_MIN_FRAG_SIZE 1024 -#define EXT3_MAX_FRAG_SIZE 4096 -#define EXT3_MIN_FRAG_LOG_SIZE 10 -#define EXT3_FRAG_SIZE(s) (EXT3_MIN_FRAG_SIZE << (s)->s_log_frag_size) -#define EXT3_FRAGS_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / EXT3_FRAG_SIZE(s)) - -struct ext3_group_desc -{ - __le32 bg_block_bitmap; - __le32 bg_inode_bitmap; - __le32 bg_inode_table; - __le16 bg_free_blocks_count; - __le16 bg_free_inodes_count; - __le16 bg_used_dirs_count; - __u16 bg_pad; - __le32 bg_reserved[3]; -}; - -#define EXT3_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) -#define EXT3_DESC_PER_BLOCK(s) (EXT3_BLOCK_SIZE(s) / sizeof (struct ext3_group_desc)) -#define EXT3_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) - -#define EXT3_NDIR_BLOCKS 12 -#define EXT3_IND_BLOCK EXT3_NDIR_BLOCKS -#define EXT3_DIND_BLOCK (EXT3_IND_BLOCK + 1) -#define EXT3_TIND_BLOCK (EXT3_DIND_BLOCK + 1) -#define EXT3_N_BLOCKS (EXT3_TIND_BLOCK + 1) - -#define EXT3_SECRM_FL 0x00000001 -#define EXT3_UNRM_FL 0x00000002 -#define EXT3_COMPR_FL 0x00000004 -#define EXT3_SYNC_FL 0x00000008 -#define EXT3_IMMUTABLE_FL 0x00000010 -#define EXT3_APPEND_FL 0x00000020 -#define EXT3_NODUMP_FL 0x00000040 -#define EXT3_NOATIME_FL 0x00000080 - -#define EXT3_DIRTY_FL 0x00000100 -#define EXT3_COMPRBLK_FL 0x00000200 -#define EXT3_NOCOMPR_FL 0x00000400 -#define EXT3_ECOMPR_FL 0x00000800 - -#define EXT3_INDEX_FL 0x00001000 -#define EXT3_IMAGIC_FL 0x00002000 -#define EXT3_JOURNAL_DATA_FL 0x00004000 -#define EXT3_NOTAIL_FL 0x00008000 -#define EXT3_DIRSYNC_FL 0x00010000 -#define EXT3_TOPDIR_FL 0x00020000 -#define EXT3_RESERVED_FL 0x80000000 - -#define EXT3_FL_USER_VISIBLE 0x0003DFFF -#define EXT3_FL_USER_MODIFIABLE 0x000380FF - -#define EXT3_STATE_JDATA 0x00000001 -#define EXT3_STATE_NEW 0x00000002 -#define EXT3_STATE_XATTR 0x00000004 - -struct ext3_new_group_input { - __u32 group; - __u32 block_bitmap; - __u32 inode_bitmap; - __u32 inode_table; - __u32 blocks_count; - __u16 reserved_blocks; - __u16 unused; -}; - -struct ext3_new_group_data { - __u32 group; - __u32 block_bitmap; - __u32 inode_bitmap; - __u32 inode_table; - __u32 blocks_count; - __u16 reserved_blocks; - __u16 unused; - __u32 free_blocks_count; -}; - -#define EXT3_IOC_GETFLAGS _IOR('f', 1, long) -#define EXT3_IOC_SETFLAGS _IOW('f', 2, long) -#define EXT3_IOC_GETVERSION _IOR('f', 3, long) -#define EXT3_IOC_SETVERSION _IOW('f', 4, long) -#define EXT3_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) -#define EXT3_IOC_GROUP_ADD _IOW('f', 8,struct ext3_new_group_input) -#define EXT3_IOC_GETVERSION_OLD _IOR('v', 1, long) -#define EXT3_IOC_SETVERSION_OLD _IOW('v', 2, long) -#define EXT3_IOC_GETRSVSZ _IOR('f', 5, long) -#define EXT3_IOC_SETRSVSZ _IOW('f', 6, long) - -struct ext3_mount_options { - unsigned long s_mount_opt; - uid_t s_resuid; - gid_t s_resgid; - unsigned long s_commit_interval; -}; - -struct ext3_inode { - __le16 i_mode; - __le16 i_uid; - __le32 i_size; - __le32 i_atime; - __le32 i_ctime; - __le32 i_mtime; - __le32 i_dtime; - __le16 i_gid; - __le16 i_links_count; - __le32 i_blocks; - __le32 i_flags; - union { - struct { - __u32 l_i_reserved1; - } linux1; - struct { - __u32 h_i_translator; - } hurd1; - struct { - __u32 m_i_reserved1; - } masix1; - } osd1; - __le32 i_block[EXT3_N_BLOCKS]; - __le32 i_generation; - __le32 i_file_acl; - __le32 i_dir_acl; - __le32 i_faddr; - union { - struct { - __u8 l_i_frag; - __u8 l_i_fsize; - __u16 i_pad1; - __le16 l_i_uid_high; - __le16 l_i_gid_high; - __u32 l_i_reserved2; - } linux2; - struct { - __u8 h_i_frag; - __u8 h_i_fsize; - __u16 h_i_mode_high; - __u16 h_i_uid_high; - __u16 h_i_gid_high; - __u32 h_i_author; - } hurd2; - struct { - __u8 m_i_frag; - __u8 m_i_fsize; - __u16 m_pad1; - __u32 m_i_reserved2[2]; - } masix2; - } osd2; - __le16 i_extra_isize; - __le16 i_pad1; -}; - -#define i_size_high i_dir_acl - -#ifdef __linux__ -#define i_reserved1 osd1.linux1.l_i_reserved1 -#define i_frag osd2.linux2.l_i_frag -#define i_fsize osd2.linux2.l_i_fsize -#define i_uid_low i_uid -#define i_gid_low i_gid -#define i_uid_high osd2.linux2.l_i_uid_high -#define i_gid_high osd2.linux2.l_i_gid_high -#define i_reserved2 osd2.linux2.l_i_reserved2 - -#elif defined(__GNU__) - -#define i_translator osd1.hurd1.h_i_translator -#define i_frag osd2.hurd2.h_i_frag; -#define i_fsize osd2.hurd2.h_i_fsize; -#define i_uid_high osd2.hurd2.h_i_uid_high -#define i_gid_high osd2.hurd2.h_i_gid_high -#define i_author osd2.hurd2.h_i_author - -#elif defined(__masix__) - -#define i_reserved1 osd1.masix1.m_i_reserved1 -#define i_frag osd2.masix2.m_i_frag -#define i_fsize osd2.masix2.m_i_fsize -#define i_reserved2 osd2.masix2.m_i_reserved2 - -#endif - -#define EXT3_VALID_FS 0x0001 -#define EXT3_ERROR_FS 0x0002 -#define EXT3_ORPHAN_FS 0x0004 - -#define EXT3_MOUNT_CHECK 0x00001 -#define EXT3_MOUNT_OLDALLOC 0x00002 -#define EXT3_MOUNT_GRPID 0x00004 -#define EXT3_MOUNT_DEBUG 0x00008 -#define EXT3_MOUNT_ERRORS_CONT 0x00010 -#define EXT3_MOUNT_ERRORS_RO 0x00020 -#define EXT3_MOUNT_ERRORS_PANIC 0x00040 -#define EXT3_MOUNT_MINIX_DF 0x00080 -#define EXT3_MOUNT_NOLOAD 0x00100 -#define EXT3_MOUNT_ABORT 0x00200 -#define EXT3_MOUNT_DATA_FLAGS 0x00C00 -#define EXT3_MOUNT_JOURNAL_DATA 0x00400 -#define EXT3_MOUNT_ORDERED_DATA 0x00800 -#define EXT3_MOUNT_WRITEBACK_DATA 0x00C00 -#define EXT3_MOUNT_UPDATE_JOURNAL 0x01000 -#define EXT3_MOUNT_NO_UID32 0x02000 -#define EXT3_MOUNT_XATTR_USER 0x04000 -#define EXT3_MOUNT_POSIX_ACL 0x08000 -#define EXT3_MOUNT_RESERVATION 0x10000 -#define EXT3_MOUNT_BARRIER 0x20000 -#define EXT3_MOUNT_NOBH 0x40000 -#define EXT3_MOUNT_QUOTA 0x80000 -#define EXT3_MOUNT_USRQUOTA 0x100000 -#define EXT3_MOUNT_GRPQUOTA 0x200000 - -#ifndef _LINUX_EXT2_FS_H -#define clear_opt(o, opt) o &= ~EXT3_MOUNT_##opt -#define set_opt(o, opt) o |= EXT3_MOUNT_##opt -#define test_opt(sb, opt) (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_##opt) -#else -#define EXT2_MOUNT_NOLOAD EXT3_MOUNT_NOLOAD -#define EXT2_MOUNT_ABORT EXT3_MOUNT_ABORT -#define EXT2_MOUNT_DATA_FLAGS EXT3_MOUNT_DATA_FLAGS -#endif - -#define ext3_set_bit ext2_set_bit -#define ext3_set_bit_atomic ext2_set_bit_atomic -#define ext3_clear_bit ext2_clear_bit -#define ext3_clear_bit_atomic ext2_clear_bit_atomic -#define ext3_test_bit ext2_test_bit -#define ext3_find_first_zero_bit ext2_find_first_zero_bit -#define ext3_find_next_zero_bit ext2_find_next_zero_bit - -#define EXT3_DFL_MAX_MNT_COUNT 20 -#define EXT3_DFL_CHECKINTERVAL 0 - -#define EXT3_ERRORS_CONTINUE 1 -#define EXT3_ERRORS_RO 2 -#define EXT3_ERRORS_PANIC 3 -#define EXT3_ERRORS_DEFAULT EXT3_ERRORS_CONTINUE - -struct ext3_super_block { - __le32 s_inodes_count; - __le32 s_blocks_count; - __le32 s_r_blocks_count; - __le32 s_free_blocks_count; - __le32 s_free_inodes_count; - __le32 s_first_data_block; - __le32 s_log_block_size; - __le32 s_log_frag_size; - __le32 s_blocks_per_group; - __le32 s_frags_per_group; - __le32 s_inodes_per_group; - __le32 s_mtime; - __le32 s_wtime; - __le16 s_mnt_count; - __le16 s_max_mnt_count; - __le16 s_magic; - __le16 s_state; - __le16 s_errors; - __le16 s_minor_rev_level; - __le32 s_lastcheck; - __le32 s_checkinterval; - __le32 s_creator_os; - __le32 s_rev_level; - __le16 s_def_resuid; - __le16 s_def_resgid; - - __le32 s_first_ino; - __le16 s_inode_size; - __le16 s_block_group_nr; - __le32 s_feature_compat; - __le32 s_feature_incompat; - __le32 s_feature_ro_compat; - __u8 s_uuid[16]; - char s_volume_name[16]; - char s_last_mounted[64]; - __le32 s_algorithm_usage_bitmap; - - __u8 s_prealloc_blocks; - __u8 s_prealloc_dir_blocks; - __u16 s_reserved_gdt_blocks; - - __u8 s_journal_uuid[16]; - __le32 s_journal_inum; - __le32 s_journal_dev; - __le32 s_last_orphan; - __le32 s_hash_seed[4]; - __u8 s_def_hash_version; - __u8 s_reserved_char_pad; - __u16 s_reserved_word_pad; - __le32 s_default_mount_opts; - __le32 s_first_meta_bg; - __u32 s_reserved[190]; -}; - -#define EXT3_SB(sb) (sb) - -#define NEXT_ORPHAN(inode) EXT3_I(inode)->i_dtime - -#define EXT3_OS_LINUX 0 -#define EXT3_OS_HURD 1 -#define EXT3_OS_MASIX 2 -#define EXT3_OS_FREEBSD 3 -#define EXT3_OS_LITES 4 - -#define EXT3_GOOD_OLD_REV 0 -#define EXT3_DYNAMIC_REV 1 - -#define EXT3_CURRENT_REV EXT3_GOOD_OLD_REV -#define EXT3_MAX_SUPP_REV EXT3_DYNAMIC_REV - -#define EXT3_GOOD_OLD_INODE_SIZE 128 - -#define EXT3_HAS_COMPAT_FEATURE(sb,mask) ( EXT3_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) -#define EXT3_HAS_RO_COMPAT_FEATURE(sb,mask) ( EXT3_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) -#define EXT3_HAS_INCOMPAT_FEATURE(sb,mask) ( EXT3_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) -#define EXT3_SET_COMPAT_FEATURE(sb,mask) EXT3_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask) -#define EXT3_SET_RO_COMPAT_FEATURE(sb,mask) EXT3_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask) -#define EXT3_SET_INCOMPAT_FEATURE(sb,mask) EXT3_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask) -#define EXT3_CLEAR_COMPAT_FEATURE(sb,mask) EXT3_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask) -#define EXT3_CLEAR_RO_COMPAT_FEATURE(sb,mask) EXT3_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask) -#define EXT3_CLEAR_INCOMPAT_FEATURE(sb,mask) EXT3_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask) - -#define EXT3_FEATURE_COMPAT_DIR_PREALLOC 0x0001 -#define EXT3_FEATURE_COMPAT_IMAGIC_INODES 0x0002 -#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 -#define EXT3_FEATURE_COMPAT_EXT_ATTR 0x0008 -#define EXT3_FEATURE_COMPAT_RESIZE_INODE 0x0010 -#define EXT3_FEATURE_COMPAT_DIR_INDEX 0x0020 - -#define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 -#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 -#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 - -#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001 -#define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 -#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 -#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 -#define EXT3_FEATURE_INCOMPAT_META_BG 0x0010 - -#define EXT3_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR -#define EXT3_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_FILETYPE| EXT3_FEATURE_INCOMPAT_RECOVER| EXT3_FEATURE_INCOMPAT_META_BG) -#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| EXT3_FEATURE_RO_COMPAT_LARGE_FILE| EXT3_FEATURE_RO_COMPAT_BTREE_DIR) - -#define EXT3_DEF_RESUID 0 -#define EXT3_DEF_RESGID 0 - -#define EXT3_DEFM_DEBUG 0x0001 -#define EXT3_DEFM_BSDGROUPS 0x0002 -#define EXT3_DEFM_XATTR_USER 0x0004 -#define EXT3_DEFM_ACL 0x0008 -#define EXT3_DEFM_UID16 0x0010 -#define EXT3_DEFM_JMODE 0x0060 -#define EXT3_DEFM_JMODE_DATA 0x0020 -#define EXT3_DEFM_JMODE_ORDERED 0x0040 -#define EXT3_DEFM_JMODE_WBACK 0x0060 - -#define EXT3_NAME_LEN 255 - -struct ext3_dir_entry { - __le32 inode; - __le16 rec_len; - __le16 name_len; - char name[EXT3_NAME_LEN]; -}; - -struct ext3_dir_entry_2 { - __le32 inode; - __le16 rec_len; - __u8 name_len; - __u8 file_type; - char name[EXT3_NAME_LEN]; -}; - -#define EXT3_FT_UNKNOWN 0 -#define EXT3_FT_REG_FILE 1 -#define EXT3_FT_DIR 2 -#define EXT3_FT_CHRDEV 3 -#define EXT3_FT_BLKDEV 4 -#define EXT3_FT_FIFO 5 -#define EXT3_FT_SOCK 6 -#define EXT3_FT_SYMLINK 7 - -#define EXT3_FT_MAX 8 - -#define EXT3_DIR_PAD 4 -#define EXT3_DIR_ROUND (EXT3_DIR_PAD - 1) -#define EXT3_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT3_DIR_ROUND) & ~EXT3_DIR_ROUND) - -#define is_dx(dir) 0 -#define EXT3_DIR_LINK_MAX(dir) ((dir)->i_nlink >= EXT3_LINK_MAX) -#define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2) - -#define DX_HASH_LEGACY 0 -#define DX_HASH_HALF_MD4 1 -#define DX_HASH_TEA 2 - -#endif diff --git a/libc/kernel/common/linux/fadvise.h b/libc/kernel/common/linux/fadvise.h deleted file mode 100644 index 25a0a4c2c..000000000 --- a/libc/kernel/common/linux/fadvise.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef FADVISE_H_INCLUDED -#define FADVISE_H_INCLUDED - -#define POSIX_FADV_NORMAL 0 -#define POSIX_FADV_RANDOM 1 -#define POSIX_FADV_SEQUENTIAL 2 -#define POSIX_FADV_WILLNEED 3 - -#ifdef __s390x__ -#define POSIX_FADV_DONTNEED 6 -#define POSIX_FADV_NOREUSE 7 -#else -#define POSIX_FADV_DONTNEED 4 -#define POSIX_FADV_NOREUSE 5 -#endif - -#endif diff --git a/libc/kernel/common/linux/fb.h b/libc/kernel/common/linux/fb.h deleted file mode 100644 index 336c439b4..000000000 --- a/libc/kernel/common/linux/fb.h +++ /dev/null @@ -1,347 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_FB_H -#define _LINUX_FB_H - -#include - -#define FB_MAJOR 29 -#define FB_MAX 32 - -#define FBIOGET_VSCREENINFO 0x4600 -#define FBIOPUT_VSCREENINFO 0x4601 -#define FBIOGET_FSCREENINFO 0x4602 -#define FBIOGETCMAP 0x4604 -#define FBIOPUTCMAP 0x4605 -#define FBIOPAN_DISPLAY 0x4606 -#define FBIO_CURSOR _IOWR('F', 0x08, struct fb_cursor) - -#define FBIOGET_CON2FBMAP 0x460F -#define FBIOPUT_CON2FBMAP 0x4610 -#define FBIOBLANK 0x4611 -#define FBIOGET_VBLANK _IOR('F', 0x12, struct fb_vblank) -#define FBIO_ALLOC 0x4613 -#define FBIO_FREE 0x4614 -#define FBIOGET_GLYPH 0x4615 -#define FBIOGET_HWCINFO 0x4616 -#define FBIOPUT_MODEINFO 0x4617 -#define FBIOGET_DISPINFO 0x4618 - -#define FB_TYPE_PACKED_PIXELS 0 -#define FB_TYPE_PLANES 1 -#define FB_TYPE_INTERLEAVED_PLANES 2 -#define FB_TYPE_TEXT 3 -#define FB_TYPE_VGA_PLANES 4 - -#define FB_AUX_TEXT_MDA 0 -#define FB_AUX_TEXT_CGA 1 -#define FB_AUX_TEXT_S3_MMIO 2 -#define FB_AUX_TEXT_MGA_STEP16 3 -#define FB_AUX_TEXT_MGA_STEP8 4 - -#define FB_AUX_VGA_PLANES_VGA4 0 -#define FB_AUX_VGA_PLANES_CFB4 1 -#define FB_AUX_VGA_PLANES_CFB8 2 - -#define FB_VISUAL_MONO01 0 -#define FB_VISUAL_MONO10 1 -#define FB_VISUAL_TRUECOLOR 2 -#define FB_VISUAL_PSEUDOCOLOR 3 -#define FB_VISUAL_DIRECTCOLOR 4 -#define FB_VISUAL_STATIC_PSEUDOCOLOR 5 - -#define FB_ACCEL_NONE 0 -#define FB_ACCEL_ATARIBLITT 1 -#define FB_ACCEL_AMIGABLITT 2 -#define FB_ACCEL_S3_TRIO64 3 -#define FB_ACCEL_NCR_77C32BLT 4 -#define FB_ACCEL_S3_VIRGE 5 -#define FB_ACCEL_ATI_MACH64GX 6 -#define FB_ACCEL_DEC_TGA 7 -#define FB_ACCEL_ATI_MACH64CT 8 -#define FB_ACCEL_ATI_MACH64VT 9 -#define FB_ACCEL_ATI_MACH64GT 10 -#define FB_ACCEL_SUN_CREATOR 11 -#define FB_ACCEL_SUN_CGSIX 12 -#define FB_ACCEL_SUN_LEO 13 -#define FB_ACCEL_IMS_TWINTURBO 14 -#define FB_ACCEL_3DLABS_PERMEDIA2 15 -#define FB_ACCEL_MATROX_MGA2064W 16 -#define FB_ACCEL_MATROX_MGA1064SG 17 -#define FB_ACCEL_MATROX_MGA2164W 18 -#define FB_ACCEL_MATROX_MGA2164W_AGP 19 -#define FB_ACCEL_MATROX_MGAG100 20 -#define FB_ACCEL_MATROX_MGAG200 21 -#define FB_ACCEL_SUN_CG14 22 -#define FB_ACCEL_SUN_BWTWO 23 -#define FB_ACCEL_SUN_CGTHREE 24 -#define FB_ACCEL_SUN_TCX 25 -#define FB_ACCEL_MATROX_MGAG400 26 -#define FB_ACCEL_NV3 27 -#define FB_ACCEL_NV4 28 -#define FB_ACCEL_NV5 29 -#define FB_ACCEL_CT_6555x 30 -#define FB_ACCEL_3DFX_BANSHEE 31 -#define FB_ACCEL_ATI_RAGE128 32 -#define FB_ACCEL_IGS_CYBER2000 33 -#define FB_ACCEL_IGS_CYBER2010 34 -#define FB_ACCEL_IGS_CYBER5000 35 -#define FB_ACCEL_SIS_GLAMOUR 36 -#define FB_ACCEL_3DLABS_PERMEDIA3 37 -#define FB_ACCEL_ATI_RADEON 38 -#define FB_ACCEL_I810 39 -#define FB_ACCEL_SIS_GLAMOUR_2 40 -#define FB_ACCEL_SIS_XABRE 41 -#define FB_ACCEL_I830 42 -#define FB_ACCEL_NV_10 43 -#define FB_ACCEL_NV_20 44 -#define FB_ACCEL_NV_30 45 -#define FB_ACCEL_NV_40 46 -#define FB_ACCEL_XGI_VOLARI_V 47 -#define FB_ACCEL_XGI_VOLARI_Z 48 -#define FB_ACCEL_OMAP1610 49 -#define FB_ACCEL_NEOMAGIC_NM2070 90 -#define FB_ACCEL_NEOMAGIC_NM2090 91 -#define FB_ACCEL_NEOMAGIC_NM2093 92 -#define FB_ACCEL_NEOMAGIC_NM2097 93 -#define FB_ACCEL_NEOMAGIC_NM2160 94 -#define FB_ACCEL_NEOMAGIC_NM2200 95 -#define FB_ACCEL_NEOMAGIC_NM2230 96 -#define FB_ACCEL_NEOMAGIC_NM2360 97 -#define FB_ACCEL_NEOMAGIC_NM2380 98 - -#define FB_ACCEL_SAVAGE4 0x80 -#define FB_ACCEL_SAVAGE3D 0x81 -#define FB_ACCEL_SAVAGE3D_MV 0x82 -#define FB_ACCEL_SAVAGE2000 0x83 -#define FB_ACCEL_SAVAGE_MX_MV 0x84 -#define FB_ACCEL_SAVAGE_MX 0x85 -#define FB_ACCEL_SAVAGE_IX_MV 0x86 -#define FB_ACCEL_SAVAGE_IX 0x87 -#define FB_ACCEL_PROSAVAGE_PM 0x88 -#define FB_ACCEL_PROSAVAGE_KM 0x89 -#define FB_ACCEL_S3TWISTER_P 0x8a -#define FB_ACCEL_S3TWISTER_K 0x8b -#define FB_ACCEL_SUPERSAVAGE 0x8c -#define FB_ACCEL_PROSAVAGE_DDR 0x8d -#define FB_ACCEL_PROSAVAGE_DDRK 0x8e - -struct fb_fix_screeninfo { - char id[16]; - unsigned long smem_start; - - __u32 smem_len; - __u32 type; - __u32 type_aux; - __u32 visual; - __u16 xpanstep; - __u16 ypanstep; - __u16 ywrapstep; - __u32 line_length; - unsigned long mmio_start; - - __u32 mmio_len; - __u32 accel; - - __u16 reserved[3]; -}; - -struct fb_bitfield { - __u32 offset; - __u32 length; - __u32 msb_right; - -}; - -#define FB_NONSTD_HAM 1 - -#define FB_ACTIVATE_NOW 0 -#define FB_ACTIVATE_NXTOPEN 1 -#define FB_ACTIVATE_TEST 2 -#define FB_ACTIVATE_MASK 15 - -#define FB_ACTIVATE_VBL 16 -#define FB_CHANGE_CMAP_VBL 32 -#define FB_ACTIVATE_ALL 64 -#define FB_ACTIVATE_FORCE 128 -#define FB_ACTIVATE_INV_MODE 256 - -#define FB_ACCELF_TEXT 1 - -#define FB_SYNC_HOR_HIGH_ACT 1 -#define FB_SYNC_VERT_HIGH_ACT 2 -#define FB_SYNC_EXT 4 -#define FB_SYNC_COMP_HIGH_ACT 8 -#define FB_SYNC_BROADCAST 16 - -#define FB_SYNC_ON_GREEN 32 - -#define FB_VMODE_NONINTERLACED 0 -#define FB_VMODE_INTERLACED 1 -#define FB_VMODE_DOUBLE 2 -#define FB_VMODE_MASK 255 - -#define FB_VMODE_YWRAP 256 -#define FB_VMODE_SMOOTH_XPAN 512 -#define FB_VMODE_CONUPDATE 512 - -#define FB_ROTATE_UR 0 -#define FB_ROTATE_CW 1 -#define FB_ROTATE_UD 2 -#define FB_ROTATE_CCW 3 - -#define PICOS2KHZ(a) (1000000000UL/(a)) -#define KHZ2PICOS(a) (1000000000UL/(a)) - -struct fb_var_screeninfo { - __u32 xres; - __u32 yres; - __u32 xres_virtual; - __u32 yres_virtual; - __u32 xoffset; - __u32 yoffset; - - __u32 bits_per_pixel; - __u32 grayscale; - - struct fb_bitfield red; - struct fb_bitfield green; - struct fb_bitfield blue; - struct fb_bitfield transp; - - __u32 nonstd; - - __u32 activate; - - __u32 height; - __u32 width; - - __u32 accel_flags; - - __u32 pixclock; - __u32 left_margin; - __u32 right_margin; - __u32 upper_margin; - __u32 lower_margin; - __u32 hsync_len; - __u32 vsync_len; - __u32 sync; - __u32 vmode; - __u32 rotate; - __u32 reserved[5]; -}; - -struct fb_cmap { - __u32 start; - __u32 len; - __u16 *red; - __u16 *green; - __u16 *blue; - __u16 *transp; -}; - -struct fb_con2fbmap { - __u32 console; - __u32 framebuffer; -}; - -#define VESA_NO_BLANKING 0 -#define VESA_VSYNC_SUSPEND 1 -#define VESA_HSYNC_SUSPEND 2 -#define VESA_POWERDOWN 3 - -enum { - - FB_BLANK_UNBLANK = VESA_NO_BLANKING, - - FB_BLANK_NORMAL = VESA_NO_BLANKING + 1, - - FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1, - - FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1, - - FB_BLANK_POWERDOWN = VESA_POWERDOWN + 1 -}; - -#define FB_VBLANK_VBLANKING 0x001 -#define FB_VBLANK_HBLANKING 0x002 -#define FB_VBLANK_HAVE_VBLANK 0x004 -#define FB_VBLANK_HAVE_HBLANK 0x008 -#define FB_VBLANK_HAVE_COUNT 0x010 -#define FB_VBLANK_HAVE_VCOUNT 0x020 -#define FB_VBLANK_HAVE_HCOUNT 0x040 -#define FB_VBLANK_VSYNCING 0x080 -#define FB_VBLANK_HAVE_VSYNC 0x100 - -struct fb_vblank { - __u32 flags; - __u32 count; - __u32 vcount; - __u32 hcount; - __u32 reserved[4]; -}; - -#define ROP_COPY 0 -#define ROP_XOR 1 - -struct fb_copyarea { - __u32 dx; - __u32 dy; - __u32 width; - __u32 height; - __u32 sx; - __u32 sy; -}; - -struct fb_fillrect { - __u32 dx; - __u32 dy; - __u32 width; - __u32 height; - __u32 color; - __u32 rop; -}; - -struct fb_image { - __u32 dx; - __u32 dy; - __u32 width; - __u32 height; - __u32 fg_color; - __u32 bg_color; - __u8 depth; - const char *data; - struct fb_cmap cmap; -}; - -#define FB_CUR_SETIMAGE 0x01 -#define FB_CUR_SETPOS 0x02 -#define FB_CUR_SETHOT 0x04 -#define FB_CUR_SETCMAP 0x08 -#define FB_CUR_SETSHAPE 0x10 -#define FB_CUR_SETSIZE 0x20 -#define FB_CUR_SETALL 0xFF - -struct fbcurpos { - __u16 x, y; -}; - -struct fb_cursor { - __u16 set; - __u16 enable; - __u16 rop; - const char *mask; - struct fbcurpos hot; - struct fb_image image; -}; - -#endif diff --git a/libc/kernel/common/linux/fcntl.h b/libc/kernel/common/linux/fcntl.h deleted file mode 100644 index 323e87aca..000000000 --- a/libc/kernel/common/linux/fcntl.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_FCNTL_H -#define _LINUX_FCNTL_H - -#include - -#define F_SETLEASE (F_LINUX_SPECIFIC_BASE+0) -#define F_GETLEASE (F_LINUX_SPECIFIC_BASE+1) - -#define F_NOTIFY (F_LINUX_SPECIFIC_BASE+2) - -#define DN_ACCESS 0x00000001 -#define DN_MODIFY 0x00000002 -#define DN_CREATE 0x00000004 -#define DN_DELETE 0x00000008 -#define DN_RENAME 0x00000010 -#define DN_ATTRIB 0x00000020 -#define DN_MULTISHOT 0x80000000 - -#define AT_FDCWD -100 -#define AT_SYMLINK_NOFOLLOW 0x100 -#define AT_REMOVEDIR 0x200 -#define AT_SYMLINK_FOLLOW 0x400 - -#endif diff --git a/libc/kernel/common/linux/fd.h b/libc/kernel/common/linux/fd.h deleted file mode 100644 index f3bedd148..000000000 --- a/libc/kernel/common/linux/fd.h +++ /dev/null @@ -1,258 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_FD_H -#define _LINUX_FD_H - -#include -#include - -struct floppy_struct { - unsigned int size, - sect, - head, - track, - stretch; -#define FD_STRETCH 1 -#define FD_SWAPSIDES 2 -#define FD_ZEROBASED 4 - - unsigned char gap, - - rate, -#define FD_2M 0x4 -#define FD_SIZECODEMASK 0x38 -#define FD_SIZECODE(floppy) (((((floppy)->rate&FD_SIZECODEMASK)>> 3)+ 2) %8) -#define FD_SECTSIZE(floppy) ( (floppy)->rate & FD_2M ? 512 : 128 << FD_SIZECODE(floppy) ) -#define FD_PERP 0x40 - - spec1, - fmt_gap; - const char * name; -}; - -#define FDCLRPRM _IO(2, 0x41) - -#define FDSETPRM _IOW(2, 0x42, struct floppy_struct) -#define FDSETMEDIAPRM FDSETPRM - -#define FDDEFPRM _IOW(2, 0x43, struct floppy_struct) -#define FDGETPRM _IOR(2, 0x04, struct floppy_struct) -#define FDDEFMEDIAPRM FDDEFPRM -#define FDGETMEDIAPRM FDGETPRM - -#define FDMSGON _IO(2,0x45) -#define FDMSGOFF _IO(2,0x46) - -#define FD_FILL_BYTE 0xF6 - -struct format_descr { - unsigned int device,head,track; -}; - -#define FDFMTBEG _IO(2,0x47) - -#define FDFMTTRK _IOW(2,0x48, struct format_descr) - -#define FDFMTEND _IO(2,0x49) - -struct floppy_max_errors { - unsigned int - abort, - read_track, - reset, - recal, - - reporting; - -}; - -#define FDSETEMSGTRESH _IO(2,0x4a) - -#define FDFLUSH _IO(2,0x4b) - -#define FDSETMAXERRS _IOW(2, 0x4c, struct floppy_max_errors) -#define FDGETMAXERRS _IOR(2, 0x0e, struct floppy_max_errors) - -typedef char floppy_drive_name[16]; -#define FDGETDRVTYP _IOR(2, 0x0f, floppy_drive_name) - -struct floppy_drive_params { - signed char cmos; - - unsigned long max_dtr; - unsigned long hlt; - unsigned long hut; - unsigned long srt; - - unsigned long spinup; - unsigned long spindown; - unsigned char spindown_offset; - unsigned char select_delay; - unsigned char rps; - unsigned char tracks; - unsigned long timeout; - - unsigned char interleave_sect; - - struct floppy_max_errors max_errors; - - char flags; - -#define FTD_MSG 0x10 -#define FD_BROKEN_DCL 0x20 -#define FD_DEBUG 0x02 -#define FD_SILENT_DCL_CLEAR 0x4 -#define FD_INVERTED_DCL 0x80 - - char read_track; - - short autodetect[8]; - - int checkfreq; - int native_format; -}; - -enum { - FD_NEED_TWADDLE_BIT, - FD_VERIFY_BIT, - FD_DISK_NEWCHANGE_BIT, - FD_UNUSED_BIT, - FD_DISK_CHANGED_BIT, - FD_DISK_WRITABLE_BIT -}; - -#define FDSETDRVPRM _IOW(2, 0x90, struct floppy_drive_params) -#define FDGETDRVPRM _IOR(2, 0x11, struct floppy_drive_params) - -struct floppy_drive_struct { - unsigned long flags; - -#define FD_NEED_TWADDLE (1 << FD_NEED_TWADDLE_BIT) -#define FD_VERIFY (1 << FD_VERIFY_BIT) -#define FD_DISK_NEWCHANGE (1 << FD_DISK_NEWCHANGE_BIT) -#define FD_DISK_CHANGED (1 << FD_DISK_CHANGED_BIT) -#define FD_DISK_WRITABLE (1 << FD_DISK_WRITABLE_BIT) - - unsigned long spinup_date; - unsigned long select_date; - unsigned long first_read_date; - short probed_format; - short track; - short maxblock; - short maxtrack; - int generation; - - int keep_data; - - int fd_ref; - int fd_device; - unsigned long last_checked; - - char *dmabuf; - int bufblocks; -}; - -#define FDGETDRVSTAT _IOR(2, 0x12, struct floppy_drive_struct) -#define FDPOLLDRVSTAT _IOR(2, 0x13, struct floppy_drive_struct) - -enum reset_mode { - FD_RESET_IF_NEEDED, - FD_RESET_IF_RAWCMD, - FD_RESET_ALWAYS -}; -#define FDRESET _IO(2, 0x54) - -struct floppy_fdc_state { - int spec1; - int spec2; - int dtr; - unsigned char version; - unsigned char dor; - unsigned long address; - unsigned int rawcmd:2; - unsigned int reset:1; - unsigned int need_configure:1; - unsigned int perp_mode:2; - unsigned int has_fifo:1; - unsigned int driver_version; -#define FD_DRIVER_VERSION 0x100 - - unsigned char track[4]; - -}; - -#define FDGETFDCSTAT _IOR(2, 0x15, struct floppy_fdc_state) - -struct floppy_write_errors { - - unsigned int write_errors; - - unsigned long first_error_sector; - int first_error_generation; - unsigned long last_error_sector; - int last_error_generation; - - unsigned int badness; -}; - -#define FDWERRORCLR _IO(2, 0x56) - -#define FDWERRORGET _IOR(2, 0x17, struct floppy_write_errors) - -#define FDHAVEBATCHEDRAWCMD - -struct floppy_raw_cmd { - unsigned int flags; -#define FD_RAW_READ 1 -#define FD_RAW_WRITE 2 -#define FD_RAW_NO_MOTOR 4 -#define FD_RAW_DISK_CHANGE 4 -#define FD_RAW_INTR 8 -#define FD_RAW_SPIN 0x10 -#define FD_RAW_NO_MOTOR_AFTER 0x20 -#define FD_RAW_NEED_DISK 0x40 -#define FD_RAW_NEED_SEEK 0x80 - -#define FD_RAW_MORE 0x100 -#define FD_RAW_STOP_IF_FAILURE 0x200 -#define FD_RAW_STOP_IF_SUCCESS 0x400 -#define FD_RAW_SOFTFAILURE 0x800 - -#define FD_RAW_FAILURE 0x10000 -#define FD_RAW_HARDFAILURE 0x20000 - - void __user *data; - char *kernel_data; - struct floppy_raw_cmd *next; - long length; - long phys_length; - int buffer_length; - - unsigned char rate; - unsigned char cmd_count; - unsigned char cmd[16]; - unsigned char reply_count; - unsigned char reply[16]; - int track; - int resultcode; - - int reserved1; - int reserved2; -}; - -#define FDRAWCMD _IO(2, 0x58) - -#define FDTWADDLE _IO(2, 0x59) - -#define FDEJECT _IO(2, 0x5a) - -#endif diff --git a/libc/kernel/common/linux/file.h b/libc/kernel/common/linux/file.h deleted file mode 100644 index 87e570b2d..000000000 --- a/libc/kernel/common/linux/file.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_FILE_H -#define __LINUX_FILE_H - -#include -#include -#include -#include -#include -#include - -#define NR_OPEN_DEFAULT BITS_PER_LONG - -struct embedded_fd_set { - unsigned long fds_bits[1]; -}; - -#define EMBEDDED_FD_SET_SIZE (BITS_PER_BYTE * sizeof(struct embedded_fd_set)) - -struct fdtable { - unsigned int max_fds; - int max_fdset; - struct file ** fd; - fd_set *close_on_exec; - fd_set *open_fds; - struct rcu_head rcu; - struct files_struct *free_files; - struct fdtable *next; -}; - -struct files_struct { - - atomic_t count; - struct fdtable *fdt; - struct fdtable fdtab; - - spinlock_t file_lock ____cacheline_aligned_in_smp; - int next_fd; - struct embedded_fd_set close_on_exec_init; - struct embedded_fd_set open_fds_init; - struct file * fd_array[NR_OPEN_DEFAULT]; -}; - -#define files_fdtable(files) (rcu_dereference((files)->fdt)) - -struct kmem_cache; - -#define fcheck(fd) fcheck_files(current->files, fd) - -struct task_struct; - -struct files_struct *get_files_struct(struct task_struct *); - -#endif diff --git a/libc/kernel/common/linux/filter.h b/libc/kernel/common/linux/filter.h deleted file mode 100644 index e858a0f07..000000000 --- a/libc/kernel/common/linux/filter.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_FILTER_H__ -#define __LINUX_FILTER_H__ - -#include -#include - -#define BPF_MAJOR_VERSION 1 -#define BPF_MINOR_VERSION 1 - -struct sock_filter -{ - __u16 code; - __u8 jt; - __u8 jf; - __u32 k; -}; - -struct sock_fprog -{ - unsigned short len; - struct sock_filter __user *filter; -}; - -#define BPF_CLASS(code) ((code) & 0x07) -#define BPF_LD 0x00 -#define BPF_LDX 0x01 -#define BPF_ST 0x02 -#define BPF_STX 0x03 -#define BPF_ALU 0x04 -#define BPF_JMP 0x05 -#define BPF_RET 0x06 -#define BPF_MISC 0x07 - -#define BPF_SIZE(code) ((code) & 0x18) -#define BPF_W 0x00 -#define BPF_H 0x08 -#define BPF_B 0x10 -#define BPF_MODE(code) ((code) & 0xe0) -#define BPF_IMM 0x00 -#define BPF_ABS 0x20 -#define BPF_IND 0x40 -#define BPF_MEM 0x60 -#define BPF_LEN 0x80 -#define BPF_MSH 0xa0 - -#define BPF_OP(code) ((code) & 0xf0) -#define BPF_ADD 0x00 -#define BPF_SUB 0x10 -#define BPF_MUL 0x20 -#define BPF_DIV 0x30 -#define BPF_OR 0x40 -#define BPF_AND 0x50 -#define BPF_LSH 0x60 -#define BPF_RSH 0x70 -#define BPF_NEG 0x80 -#define BPF_JA 0x00 -#define BPF_JEQ 0x10 -#define BPF_JGT 0x20 -#define BPF_JGE 0x30 -#define BPF_JSET 0x40 -#define BPF_SRC(code) ((code) & 0x08) -#define BPF_K 0x00 -#define BPF_X 0x08 - -#define BPF_RVAL(code) ((code) & 0x18) -#define BPF_A 0x10 - -#define BPF_MISCOP(code) ((code) & 0xf8) -#define BPF_TAX 0x00 -#define BPF_TXA 0x80 - -#ifndef BPF_MAXINSNS -#define BPF_MAXINSNS 4096 -#endif - -#ifndef BPF_STMT -#define BPF_STMT(code, k) { (unsigned short)(code), 0, 0, k } -#endif -#ifndef BPF_JUMP -#define BPF_JUMP(code, k, jt, jf) { (unsigned short)(code), jt, jf, k } -#endif - -#define BPF_MEMWORDS 16 - -#define SKF_AD_OFF (-0x1000) -#define SKF_AD_PROTOCOL 0 -#define SKF_AD_PKTTYPE 4 -#define SKF_AD_IFINDEX 8 -#define SKF_AD_MAX 12 -#define SKF_NET_OFF (-0x100000) -#define SKF_LL_OFF (-0x200000) - -#endif diff --git a/libc/kernel/common/linux/fs.h b/libc/kernel/common/linux/fs.h deleted file mode 100644 index 8d375b5a9..000000000 --- a/libc/kernel/common/linux/fs.h +++ /dev/null @@ -1,162 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_FS_H -#define _LINUX_FS_H - -#include -#include - -#undef NR_OPEN -#define NR_OPEN (1024*1024) -#define INR_OPEN 1024 - -#define BLOCK_SIZE_BITS 10 -#define BLOCK_SIZE (1<i_sb->s_flags & (flg)) - -#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY) -#define IS_SYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS) || ((inode)->i_flags & S_SYNC)) -#define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || ((inode)->i_flags & (S_SYNC|S_DIRSYNC))) -#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) - -#define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) -#define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) -#define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE) -#define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) - -#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -#define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME) -#define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE) -#define IS_PRIVATE(inode) ((inode)->i_flags & S_PRIVATE) - -#define BLKROSET _IO(0x12,93) -#define BLKROGET _IO(0x12,94) -#define BLKRRPART _IO(0x12,95) -#define BLKGETSIZE _IO(0x12,96) -#define BLKFLSBUF _IO(0x12,97) -#define BLKRASET _IO(0x12,98) -#define BLKRAGET _IO(0x12,99) -#define BLKFRASET _IO(0x12,100) -#define BLKFRAGET _IO(0x12,101) -#define BLKSECTSET _IO(0x12,102) -#define BLKSECTGET _IO(0x12,103) -#define BLKSSZGET _IO(0x12,104) - -#define BLKBSZGET _IOR(0x12,112,size_t) -#define BLKBSZSET _IOW(0x12,113,size_t) -#define BLKGETSIZE64 _IOR(0x12,114,size_t) -#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup) -#define BLKTRACESTART _IO(0x12,116) -#define BLKTRACESTOP _IO(0x12,117) -#define BLKTRACETEARDOWN _IO(0x12,118) - -#define BMAP_IOCTL 1 -#define FIBMAP _IO(0x00,1) -#define FIGETBSZ _IO(0x00,2) - -#define SYNC_FILE_RANGE_WAIT_BEFORE 1 -#define SYNC_FILE_RANGE_WRITE 2 -#define SYNC_FILE_RANGE_WAIT_AFTER 4 - -#endif diff --git a/libc/kernel/common/linux/ftape.h b/libc/kernel/common/linux/ftape.h deleted file mode 100644 index bb1527ca5..000000000 --- a/libc/kernel/common/linux/ftape.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _FTAPE_H -#define _FTAPE_H - -#define FTAPE_VERSION "ftape v3.04d 25/11/97" - -#include -#include - -#define FT_SECTOR(x) (x+1) -#define FT_SECTOR_SIZE 1024 -#define FT_SECTORS_PER_SEGMENT 32 -#define FT_ECC_SECTORS 3 -#define FT_SEGMENT_SIZE ((FT_SECTORS_PER_SEGMENT - FT_ECC_SECTORS) * FT_SECTOR_SIZE) -#define FT_BUFF_SIZE (FT_SECTORS_PER_SEGMENT * FT_SECTOR_SIZE) - -#define FTAPE_SEL_A 0 -#define FTAPE_SEL_B 1 -#define FTAPE_SEL_C 2 -#define FTAPE_SEL_D 3 -#define FTAPE_SEL_MASK 3 -#define FTAPE_SEL(unit) ((unit) & FTAPE_SEL_MASK) -#define FTAPE_NO_REWIND 4 - -typedef union { - struct { - __u8 error; - __u8 command; - } error; - long space; -} ft_drive_error; -typedef union { - struct { - __u8 drive_status; - __u8 drive_config; - __u8 tape_status; - } status; - long space; -} ft_drive_status; - -#endif diff --git a/libc/kernel/common/linux/futex.h b/libc/kernel/common/linux/futex.h deleted file mode 100644 index 30f9e590d..000000000 --- a/libc/kernel/common/linux/futex.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_FUTEX_H -#define _LINUX_FUTEX_H - -#include - -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 -#define FUTEX_FD 2 -#define FUTEX_REQUEUE 3 -#define FUTEX_CMP_REQUEUE 4 -#define FUTEX_WAKE_OP 5 -#define FUTEX_LOCK_PI 6 -#define FUTEX_UNLOCK_PI 7 -#define FUTEX_TRYLOCK_PI 8 - -struct robust_list { - struct robust_list __user *next; -}; - -struct robust_list_head { - - struct robust_list list; - - long futex_offset; - - struct robust_list __user *list_op_pending; -}; - -#define FUTEX_WAITERS 0x80000000 - -#define FUTEX_OWNER_DIED 0x40000000 - -#define FUTEX_TID_MASK 0x3fffffff - -#define ROBUST_LIST_LIMIT 2048 - -#define FUTEX_OP_SET 0 -#define FUTEX_OP_ADD 1 -#define FUTEX_OP_OR 2 -#define FUTEX_OP_ANDN 3 -#define FUTEX_OP_XOR 4 -#define FUTEX_OP_OPARG_SHIFT 8 -#define FUTEX_OP_CMP_EQ 0 -#define FUTEX_OP_CMP_NE 1 -#define FUTEX_OP_CMP_LT 2 -#define FUTEX_OP_CMP_LE 3 -#define FUTEX_OP_CMP_GT 4 -#define FUTEX_OP_CMP_GE 5 -#define FUTEX_OP(op, oparg, cmp, cmparg) (((op & 0xf) << 28) | ((cmp & 0xf) << 24) | ((oparg & 0xfff) << 12) | (cmparg & 0xfff)) -#endif diff --git a/libc/kernel/common/linux/genhd.h b/libc/kernel/common/linux/genhd.h deleted file mode 100644 index a3a3924d5..000000000 --- a/libc/kernel/common/linux/genhd.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_GENHD_H -#define _LINUX_GENHD_H - -#include - -enum { - - DOS_EXTENDED_PARTITION = 5, - LINUX_EXTENDED_PARTITION = 0x85, - WIN98_EXTENDED_PARTITION = 0x0f, - - LINUX_SWAP_PARTITION = 0x82, - LINUX_RAID_PARTITION = 0xfd, - - SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION, - NEW_SOLARIS_X86_PARTITION = 0xbf, - - DM6_AUX1PARTITION = 0x51, - DM6_AUX3PARTITION = 0x53, - DM6_PARTITION = 0x54, - EZD_PARTITION = 0x55, - - FREEBSD_PARTITION = 0xa5, - OPENBSD_PARTITION = 0xa6, - NETBSD_PARTITION = 0xa9, - BSDI_PARTITION = 0xb7, - MINIX_PARTITION = 0x81, - UNIXWARE_PARTITION = 0x63, -}; - -struct partition { - unsigned char boot_ind; - unsigned char head; - unsigned char sector; - unsigned char cyl; - unsigned char sys_ind; - unsigned char end_head; - unsigned char end_sector; - unsigned char end_cyl; - unsigned int start_sect; - unsigned int nr_sects; -} __attribute__((packed)); - -#endif diff --git a/libc/kernel/common/linux/gfp.h b/libc/kernel/common/linux/gfp.h deleted file mode 100644 index 0a59fe918..000000000 --- a/libc/kernel/common/linux/gfp.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_GFP_H -#define __LINUX_GFP_H - -#include -#include -#include - -struct vm_area_struct; - -#define __GFP_DMA ((__force gfp_t)0x01u) -#define __GFP_HIGHMEM ((__force gfp_t)0x02u) -#if BITS_PER_LONG < 64 -#define __GFP_DMA32 ((__force gfp_t)0x00) -#else -#define __GFP_DMA32 ((__force gfp_t)0x04) -#endif - -#define __GFP_WAIT ((__force gfp_t)0x10u) -#define __GFP_HIGH ((__force gfp_t)0x20u) -#define __GFP_IO ((__force gfp_t)0x40u) -#define __GFP_FS ((__force gfp_t)0x80u) -#define __GFP_COLD ((__force gfp_t)0x100u) -#define __GFP_NOWARN ((__force gfp_t)0x200u) -#define __GFP_REPEAT ((__force gfp_t)0x400u) -#define __GFP_NOFAIL ((__force gfp_t)0x800u) -#define __GFP_NORETRY ((__force gfp_t)0x1000u) -#define __GFP_NO_GROW ((__force gfp_t)0x2000u) -#define __GFP_COMP ((__force gfp_t)0x4000u) -#define __GFP_ZERO ((__force gfp_t)0x8000u) -#define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) -#define __GFP_HARDWALL ((__force gfp_t)0x20000u) - -#define __GFP_BITS_SHIFT 20 -#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) - -#define GFP_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS| __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| __GFP_NOMEMALLOC|__GFP_HARDWALL) - -#define GFP_NOWAIT (GFP_ATOMIC & ~__GFP_HIGH) - -#define GFP_ATOMIC (__GFP_HIGH) -#define GFP_NOIO (__GFP_WAIT) -#define GFP_NOFS (__GFP_WAIT | __GFP_IO) -#define GFP_KERNEL (__GFP_WAIT | __GFP_IO | __GFP_FS) -#define GFP_USER (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL) -#define GFP_HIGHUSER (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL | __GFP_HIGHMEM) - -#define GFP_DMA __GFP_DMA - -#define GFP_DMA32 __GFP_DMA32 - -#ifndef HAVE_ARCH_FREE_PAGE -#endif - -#define alloc_pages(gfp_mask, order) alloc_pages_node(numa_node_id(), gfp_mask, order) -#define alloc_page_vma(gfp_mask, vma, addr) alloc_pages(gfp_mask, 0) -#define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0) - -#define __get_free_page(gfp_mask) __get_free_pages((gfp_mask),0) - -#define __get_dma_pages(gfp_mask, order) __get_free_pages((gfp_mask) | GFP_DMA,(order)) - -#define __free_page(page) __free_pages((page), 0) -#define free_page(addr) free_pages((addr),0) - -#endif diff --git a/libc/kernel/common/linux/hardirq.h b/libc/kernel/common/linux/hardirq.h deleted file mode 100644 index c0566b0ef..000000000 --- a/libc/kernel/common/linux/hardirq.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_HARDIRQ_H -#define LINUX_HARDIRQ_H - -#include -#include -#include -#include -#include - -#define PREEMPT_BITS 8 -#define SOFTIRQ_BITS 8 - -#ifndef HARDIRQ_BITS -#define HARDIRQ_BITS 12 - -#if 1 << HARDIRQ_BITS < NR_IRQS -#error HARDIRQ_BITS is too low! -#endif -#endif - -#define PREEMPT_SHIFT 0 -#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS) -#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS) - -#define __IRQ_MASK(x) ((1UL << (x))-1) - -#define PREEMPT_MASK (__IRQ_MASK(PREEMPT_BITS) << PREEMPT_SHIFT) -#define SOFTIRQ_MASK (__IRQ_MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT) -#define HARDIRQ_MASK (__IRQ_MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT) - -#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT) -#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT) -#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) - -#if PREEMPT_ACTIVE < 1 << HARDIRQ_SHIFT + HARDIRQ_BITS -#error PREEMPT_ACTIVE is too low! -#endif - -#define hardirq_count() (preempt_count() & HARDIRQ_MASK) -#define softirq_count() (preempt_count() & SOFTIRQ_MASK) -#define irq_count() (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK)) - -#define in_irq() (hardirq_count()) -#define in_softirq() (softirq_count()) -#define in_interrupt() (irq_count()) - -#define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0) - -#define preemptible() 0 -#define IRQ_EXIT_OFFSET HARDIRQ_OFFSET - -#define synchronize_irq(irq) barrier() - -struct task_struct; - -#define irq_enter() do { account_system_vtime(current); add_preempt_count(HARDIRQ_OFFSET); trace_hardirq_enter(); } while (0) -#define __irq_exit() do { trace_hardirq_exit(); account_system_vtime(current); sub_preempt_count(HARDIRQ_OFFSET); } while (0) - -#define nmi_enter() do { lockdep_off(); irq_enter(); } while (0) -#define nmi_exit() do { __irq_exit(); lockdep_on(); } while (0) - -#endif diff --git a/libc/kernel/common/linux/hdlc/ioctl.h b/libc/kernel/common/linux/hdlc/ioctl.h deleted file mode 100644 index c15a67f39..000000000 --- a/libc/kernel/common/linux/hdlc/ioctl.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __HDLC_IOCTL_H__ -#define __HDLC_IOCTL_H__ - -typedef struct { - unsigned int clock_rate; - unsigned int clock_type; - unsigned short loopback; -} sync_serial_settings; - -typedef struct { - unsigned int clock_rate; - unsigned int clock_type; - unsigned short loopback; - unsigned int slot_map; -} te1_settings; - -typedef struct { - unsigned short encoding; - unsigned short parity; -} raw_hdlc_proto; - -typedef struct { - unsigned int t391; - unsigned int t392; - unsigned int n391; - unsigned int n392; - unsigned int n393; - unsigned short lmi; - unsigned short dce; -} fr_proto; - -typedef struct { - unsigned int dlci; -} fr_proto_pvc; - -typedef struct { - unsigned int dlci; - char master[IFNAMSIZ]; -}fr_proto_pvc_info; - -typedef struct { - unsigned int interval; - unsigned int timeout; -} cisco_proto; - -#endif diff --git a/libc/kernel/common/linux/hdreg.h b/libc/kernel/common/linux/hdreg.h deleted file mode 100644 index a684ee995..000000000 --- a/libc/kernel/common/linux/hdreg.h +++ /dev/null @@ -1,432 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_HDREG_H -#define _LINUX_HDREG_H - -#define HDIO_DRIVE_CMD_HDR_SIZE (4 * sizeof(u8)) -#define HDIO_DRIVE_HOB_HDR_SIZE (8 * sizeof(u8)) -#define HDIO_DRIVE_TASK_HDR_SIZE (8 * sizeof(u8)) - -#define IDE_DRIVE_TASK_INVALID -1 -#define IDE_DRIVE_TASK_NO_DATA 0 -#define IDE_DRIVE_TASK_SET_XFER 1 - -#define IDE_DRIVE_TASK_IN 2 - -#define IDE_DRIVE_TASK_OUT 3 -#define IDE_DRIVE_TASK_RAW_WRITE 4 - -#define IDE_TASKFILE_STD_IN_FLAGS 0xFE -#define IDE_HOB_STD_IN_FLAGS 0x3C -#define IDE_TASKFILE_STD_OUT_FLAGS 0xFE -#define IDE_HOB_STD_OUT_FLAGS 0x3C - -typedef unsigned char task_ioreg_t; -typedef unsigned long sata_ioreg_t; - -typedef union ide_reg_valid_s { - unsigned all : 16; - struct { - unsigned data : 1; - unsigned error_feature : 1; - unsigned sector : 1; - unsigned nsector : 1; - unsigned lcyl : 1; - unsigned hcyl : 1; - unsigned select : 1; - unsigned status_command : 1; - - unsigned data_hob : 1; - unsigned error_feature_hob : 1; - unsigned sector_hob : 1; - unsigned nsector_hob : 1; - unsigned lcyl_hob : 1; - unsigned hcyl_hob : 1; - unsigned select_hob : 1; - unsigned control_hob : 1; - } b; -} ide_reg_valid_t; - -typedef struct ide_task_request_s { - task_ioreg_t io_ports[8]; - task_ioreg_t hob_ports[8]; - ide_reg_valid_t out_flags; - ide_reg_valid_t in_flags; - int data_phase; - int req_cmd; - unsigned long out_size; - unsigned long in_size; -} ide_task_request_t; - -typedef struct ide_ioctl_request_s { - ide_task_request_t *task_request; - unsigned char *out_buffer; - unsigned char *in_buffer; -} ide_ioctl_request_t; - -struct hd_drive_cmd_hdr { - task_ioreg_t command; - task_ioreg_t sector_number; - task_ioreg_t feature; - task_ioreg_t sector_count; -}; - -typedef struct hd_drive_task_hdr { - task_ioreg_t data; - task_ioreg_t feature; - task_ioreg_t sector_count; - task_ioreg_t sector_number; - task_ioreg_t low_cylinder; - task_ioreg_t high_cylinder; - task_ioreg_t device_head; - task_ioreg_t command; -} task_struct_t; - -typedef struct hd_drive_hob_hdr { - task_ioreg_t data; - task_ioreg_t feature; - task_ioreg_t sector_count; - task_ioreg_t sector_number; - task_ioreg_t low_cylinder; - task_ioreg_t high_cylinder; - task_ioreg_t device_head; - task_ioreg_t control; -} hob_struct_t; - -#define TASKFILE_INVALID 0x7fff -#define TASKFILE_48 0x8000 - -#define TASKFILE_NO_DATA 0x0000 - -#define TASKFILE_IN 0x0001 -#define TASKFILE_MULTI_IN 0x0002 - -#define TASKFILE_OUT 0x0004 -#define TASKFILE_MULTI_OUT 0x0008 -#define TASKFILE_IN_OUT 0x0010 - -#define TASKFILE_IN_DMA 0x0020 -#define TASKFILE_OUT_DMA 0x0040 -#define TASKFILE_IN_DMAQ 0x0080 -#define TASKFILE_OUT_DMAQ 0x0100 - -#define TASKFILE_P_IN 0x0200 -#define TASKFILE_P_OUT 0x0400 -#define TASKFILE_P_IN_DMA 0x0800 -#define TASKFILE_P_OUT_DMA 0x1000 -#define TASKFILE_P_IN_DMAQ 0x2000 -#define TASKFILE_P_OUT_DMAQ 0x4000 - -#define WIN_NOP 0x00 - -#define CFA_REQ_EXT_ERROR_CODE 0x03 - -#define WIN_SRST 0x08 -#define WIN_DEVICE_RESET 0x08 - -#define WIN_RECAL 0x10 -#define WIN_RESTORE WIN_RECAL - -#define WIN_READ 0x20 -#define WIN_READ_ONCE 0x21 -#define WIN_READ_LONG 0x22 -#define WIN_READ_LONG_ONCE 0x23 -#define WIN_READ_EXT 0x24 -#define WIN_READDMA_EXT 0x25 -#define WIN_READDMA_QUEUED_EXT 0x26 -#define WIN_READ_NATIVE_MAX_EXT 0x27 - -#define WIN_MULTREAD_EXT 0x29 - -#define WIN_WRITE 0x30 -#define WIN_WRITE_ONCE 0x31 -#define WIN_WRITE_LONG 0x32 -#define WIN_WRITE_LONG_ONCE 0x33 -#define WIN_WRITE_EXT 0x34 -#define WIN_WRITEDMA_EXT 0x35 -#define WIN_WRITEDMA_QUEUED_EXT 0x36 -#define WIN_SET_MAX_EXT 0x37 -#define CFA_WRITE_SECT_WO_ERASE 0x38 -#define WIN_MULTWRITE_EXT 0x39 - -#define WIN_WRITE_VERIFY 0x3C - -#define WIN_VERIFY 0x40 -#define WIN_VERIFY_ONCE 0x41 -#define WIN_VERIFY_EXT 0x42 - -#define WIN_FORMAT 0x50 - -#define WIN_INIT 0x60 - -#define WIN_SEEK 0x70 - -#define CFA_TRANSLATE_SECTOR 0x87 -#define WIN_DIAGNOSE 0x90 -#define WIN_SPECIFY 0x91 -#define WIN_DOWNLOAD_MICROCODE 0x92 -#define WIN_STANDBYNOW2 0x94 -#define WIN_STANDBY2 0x96 -#define WIN_SETIDLE2 0x97 -#define WIN_CHECKPOWERMODE2 0x98 -#define WIN_SLEEPNOW2 0x99 - -#define WIN_PACKETCMD 0xA0 -#define WIN_PIDENTIFY 0xA1 -#define WIN_QUEUED_SERVICE 0xA2 -#define WIN_SMART 0xB0 -#define CFA_ERASE_SECTORS 0xC0 -#define WIN_MULTREAD 0xC4 -#define WIN_MULTWRITE 0xC5 -#define WIN_SETMULT 0xC6 -#define WIN_READDMA_QUEUED 0xC7 -#define WIN_READDMA 0xC8 -#define WIN_READDMA_ONCE 0xC9 -#define WIN_WRITEDMA 0xCA -#define WIN_WRITEDMA_ONCE 0xCB -#define WIN_WRITEDMA_QUEUED 0xCC -#define CFA_WRITE_MULTI_WO_ERASE 0xCD -#define WIN_GETMEDIASTATUS 0xDA -#define WIN_ACKMEDIACHANGE 0xDB -#define WIN_POSTBOOT 0xDC -#define WIN_PREBOOT 0xDD -#define WIN_DOORLOCK 0xDE -#define WIN_DOORUNLOCK 0xDF -#define WIN_STANDBYNOW1 0xE0 -#define WIN_IDLEIMMEDIATE 0xE1 -#define WIN_STANDBY 0xE2 -#define WIN_SETIDLE1 0xE3 -#define WIN_READ_BUFFER 0xE4 -#define WIN_CHECKPOWERMODE1 0xE5 -#define WIN_SLEEPNOW1 0xE6 -#define WIN_FLUSH_CACHE 0xE7 -#define WIN_WRITE_BUFFER 0xE8 -#define WIN_WRITE_SAME 0xE9 - -#define WIN_FLUSH_CACHE_EXT 0xEA -#define WIN_IDENTIFY 0xEC -#define WIN_MEDIAEJECT 0xED -#define WIN_IDENTIFY_DMA 0xEE -#define WIN_SETFEATURES 0xEF -#define EXABYTE_ENABLE_NEST 0xF0 -#define WIN_SECURITY_SET_PASS 0xF1 -#define WIN_SECURITY_UNLOCK 0xF2 -#define WIN_SECURITY_ERASE_PREPARE 0xF3 -#define WIN_SECURITY_ERASE_UNIT 0xF4 -#define WIN_SECURITY_FREEZE_LOCK 0xF5 -#define WIN_SECURITY_DISABLE 0xF6 -#define WIN_READ_NATIVE_MAX 0xF8 -#define WIN_SET_MAX 0xF9 -#define DISABLE_SEAGATE 0xFB - -#define SMART_READ_VALUES 0xD0 -#define SMART_READ_THRESHOLDS 0xD1 -#define SMART_AUTOSAVE 0xD2 -#define SMART_SAVE 0xD3 -#define SMART_IMMEDIATE_OFFLINE 0xD4 -#define SMART_READ_LOG_SECTOR 0xD5 -#define SMART_WRITE_LOG_SECTOR 0xD6 -#define SMART_WRITE_THRESHOLDS 0xD7 -#define SMART_ENABLE 0xD8 -#define SMART_DISABLE 0xD9 -#define SMART_STATUS 0xDA -#define SMART_AUTO_OFFLINE 0xDB - -#define SMART_LCYL_PASS 0x4F -#define SMART_HCYL_PASS 0xC2 - -#define SETFEATURES_EN_8BIT 0x01 -#define SETFEATURES_EN_WCACHE 0x02 -#define SETFEATURES_DIS_DEFECT 0x04 -#define SETFEATURES_EN_APM 0x05 -#define SETFEATURES_EN_SAME_R 0x22 -#define SETFEATURES_DIS_MSN 0x31 -#define SETFEATURES_DIS_RETRY 0x33 -#define SETFEATURES_EN_AAM 0x42 -#define SETFEATURES_RW_LONG 0x44 -#define SETFEATURES_SET_CACHE 0x54 -#define SETFEATURES_DIS_RLA 0x55 -#define SETFEATURES_EN_RI 0x5D -#define SETFEATURES_EN_SI 0x5E -#define SETFEATURES_DIS_RPOD 0x66 -#define SETFEATURES_DIS_ECC 0x77 -#define SETFEATURES_DIS_8BIT 0x81 -#define SETFEATURES_DIS_WCACHE 0x82 -#define SETFEATURES_EN_DEFECT 0x84 -#define SETFEATURES_DIS_APM 0x85 -#define SETFEATURES_EN_ECC 0x88 -#define SETFEATURES_EN_MSN 0x95 -#define SETFEATURES_EN_RETRY 0x99 -#define SETFEATURES_EN_RLA 0xAA -#define SETFEATURES_PREFETCH 0xAB -#define SETFEATURES_EN_REST 0xAC -#define SETFEATURES_4B_RW_LONG 0xBB -#define SETFEATURES_DIS_AAM 0xC2 -#define SETFEATURES_EN_RPOD 0xCC -#define SETFEATURES_DIS_RI 0xDD -#define SETFEATURES_EN_SAME_M 0xDD -#define SETFEATURES_DIS_SI 0xDE - -#define SECURITY_SET_PASSWORD 0xBA -#define SECURITY_UNLOCK 0xBB -#define SECURITY_ERASE_PREPARE 0xBC -#define SECURITY_ERASE_UNIT 0xBD -#define SECURITY_FREEZE_LOCK 0xBE -#define SECURITY_DISABLE_PASSWORD 0xBF - -struct hd_geometry { - unsigned char heads; - unsigned char sectors; - unsigned short cylinders; - unsigned long start; -}; - -#define HDIO_GETGEO 0x0301 -#define HDIO_GET_UNMASKINTR 0x0302 -#define HDIO_GET_MULTCOUNT 0x0304 -#define HDIO_GET_QDMA 0x0305 - -#define HDIO_SET_XFER 0x0306 - -#define HDIO_OBSOLETE_IDENTITY 0x0307 -#define HDIO_GET_KEEPSETTINGS 0x0308 -#define HDIO_GET_32BIT 0x0309 -#define HDIO_GET_NOWERR 0x030a -#define HDIO_GET_DMA 0x030b -#define HDIO_GET_NICE 0x030c -#define HDIO_GET_IDENTITY 0x030d -#define HDIO_GET_WCACHE 0x030e -#define HDIO_GET_ACOUSTIC 0x030f -#define HDIO_GET_ADDRESS 0x0310 - -#define HDIO_GET_BUSSTATE 0x031a -#define HDIO_TRISTATE_HWIF 0x031b -#define HDIO_DRIVE_RESET 0x031c -#define HDIO_DRIVE_TASKFILE 0x031d -#define HDIO_DRIVE_TASK 0x031e -#define HDIO_DRIVE_CMD 0x031f -#define HDIO_DRIVE_CMD_AEB HDIO_DRIVE_TASK - -#define HDIO_SET_MULTCOUNT 0x0321 -#define HDIO_SET_UNMASKINTR 0x0322 -#define HDIO_SET_KEEPSETTINGS 0x0323 -#define HDIO_SET_32BIT 0x0324 -#define HDIO_SET_NOWERR 0x0325 -#define HDIO_SET_DMA 0x0326 -#define HDIO_SET_PIO_MODE 0x0327 -#define HDIO_SCAN_HWIF 0x0328 -#define HDIO_SET_NICE 0x0329 -#define HDIO_UNREGISTER_HWIF 0x032a -#define HDIO_SET_WCACHE 0x032b -#define HDIO_SET_ACOUSTIC 0x032c -#define HDIO_SET_BUSSTATE 0x032d -#define HDIO_SET_QDMA 0x032e -#define HDIO_SET_ADDRESS 0x032f - -enum { - BUSSTATE_OFF = 0, - BUSSTATE_ON, - BUSSTATE_TRISTATE -}; - -#define __NEW_HD_DRIVE_ID - -struct hd_driveid { - unsigned short config; - unsigned short cyls; - unsigned short reserved2; - unsigned short heads; - unsigned short track_bytes; - unsigned short sector_bytes; - unsigned short sectors; - unsigned short vendor0; - unsigned short vendor1; - unsigned short vendor2; - unsigned char serial_no[20]; - unsigned short buf_type; - unsigned short buf_size; - unsigned short ecc_bytes; - unsigned char fw_rev[8]; - unsigned char model[40]; - unsigned char max_multsect; - unsigned char vendor3; - unsigned short dword_io; - unsigned char vendor4; - unsigned char capability; - unsigned short reserved50; - unsigned char vendor5; - unsigned char tPIO; - unsigned char vendor6; - unsigned char tDMA; - unsigned short field_valid; - unsigned short cur_cyls; - unsigned short cur_heads; - unsigned short cur_sectors; - unsigned short cur_capacity0; - unsigned short cur_capacity1; - unsigned char multsect; - unsigned char multsect_valid; - unsigned int lba_capacity; - unsigned short dma_1word; - unsigned short dma_mword; - unsigned short eide_pio_modes; - unsigned short eide_dma_min; - unsigned short eide_dma_time; - unsigned short eide_pio; - unsigned short eide_pio_iordy; - unsigned short words69_70[2]; - - unsigned short words71_74[4]; - unsigned short queue_depth; - unsigned short words76_79[4]; - unsigned short major_rev_num; - unsigned short minor_rev_num; - unsigned short command_set_1; - unsigned short command_set_2; - unsigned short cfsse; - unsigned short cfs_enable_1; - unsigned short cfs_enable_2; - unsigned short csf_default; - unsigned short dma_ultra; - unsigned short trseuc; - unsigned short trsEuc; - unsigned short CurAPMvalues; - unsigned short mprc; - unsigned short hw_config; - unsigned short acoustic; - unsigned short msrqs; - unsigned short sxfert; - unsigned short sal; - unsigned int spg; - unsigned long long lba_capacity_2; - unsigned short words104_125[22]; - unsigned short last_lun; - unsigned short word127; - unsigned short dlf; - unsigned short csfo; - unsigned short words130_155[26]; - unsigned short word156; - unsigned short words157_159[3]; - unsigned short cfa_power; - unsigned short words161_175[15]; - unsigned short words176_205[30]; - unsigned short words206_254[49]; - unsigned short integrity_word; -}; - -#define IDE_NICE_DSC_OVERLAP (0) -#define IDE_NICE_ATAPI_OVERLAP (1) -#define IDE_NICE_0 (2) -#define IDE_NICE_1 (3) -#define IDE_NICE_2 (4) - -#endif diff --git a/libc/kernel/common/linux/hdsmart.h b/libc/kernel/common/linux/hdsmart.h deleted file mode 100644 index 6cbc6538b..000000000 --- a/libc/kernel/common/linux/hdsmart.h +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_HDSMART_H -#define _LINUX_HDSMART_H - -#define OFFLINE_FULL_SCAN 0 -#define SHORT_SELF_TEST 1 -#define EXTEND_SELF_TEST 2 -#define SHORT_CAPTIVE_SELF_TEST 129 -#define EXTEND_CAPTIVE_SELF_TEST 130 - -typedef struct ata_smart_attribute_s { - unsigned char id; - unsigned short status_flag; - unsigned char normalized; - unsigned char worse_normal; - unsigned char raw[6]; - unsigned char reserv; -} __attribute__ ((packed)) ata_smart_attribute_t; - -typedef struct ata_smart_values_s { - unsigned short revnumber; - ata_smart_attribute_t vendor_attributes [30]; - unsigned char offline_data_collection_status; - unsigned char self_test_exec_status; - unsigned short total_time_to_complete_off_line; - unsigned char vendor_specific_366; - unsigned char offline_data_collection_capability; - unsigned short smart_capability; - unsigned char errorlog_capability; - unsigned char vendor_specific_371; - unsigned char short_test_completion_time; - unsigned char extend_test_completion_time; - unsigned char reserved_374_385 [12]; - unsigned char vendor_specific_386_509 [125]; - unsigned char chksum; -} __attribute__ ((packed)) ata_smart_values_t; - -typedef struct ata_smart_threshold_entry_s { - unsigned char id; - unsigned char normalized_threshold; - unsigned char reserved[10]; -} __attribute__ ((packed)) ata_smart_threshold_entry_t; - -typedef struct ata_smart_thresholds_s { - unsigned short revnumber; - ata_smart_threshold_entry_t thres_entries[30]; - unsigned char reserved[149]; - unsigned char chksum; -} __attribute__ ((packed)) ata_smart_thresholds_t; - -typedef struct ata_smart_errorlog_command_struct_s { - unsigned char devicecontrolreg; - unsigned char featuresreg; - unsigned char sector_count; - unsigned char sector_number; - unsigned char cylinder_low; - unsigned char cylinder_high; - unsigned char drive_head; - unsigned char commandreg; - unsigned int timestamp; -} __attribute__ ((packed)) ata_smart_errorlog_command_struct_t; - -typedef struct ata_smart_errorlog_error_struct_s { - unsigned char error_condition; - unsigned char extended_error[14]; - unsigned char state; - unsigned short timestamp; -} __attribute__ ((packed)) ata_smart_errorlog_error_struct_t; - -typedef struct ata_smart_errorlog_struct_s { - ata_smart_errorlog_command_struct_t commands[6]; - ata_smart_errorlog_error_struct_t error_struct; -} __attribute__ ((packed)) ata_smart_errorlog_struct_t; - -typedef struct ata_smart_errorlog_s { - unsigned char revnumber; - unsigned char error_log_pointer; - ata_smart_errorlog_struct_t errorlog_struct[5]; - unsigned short ata_error_count; - unsigned short non_fatal_count; - unsigned short drive_timeout_count; - unsigned char reserved[53]; - unsigned char chksum; -} __attribute__ ((packed)) ata_smart_errorlog_t; - -typedef struct ata_smart_selftestlog_struct_s { - unsigned char selftestnumber; - unsigned char selfteststatus; - unsigned short timestamp; - unsigned char selftestfailurecheckpoint; - unsigned int lbafirstfailure; - unsigned char vendorspecific[15]; -} __attribute__ ((packed)) ata_smart_selftestlog_struct_t; - -typedef struct ata_smart_selftestlog_s { - unsigned short revnumber; - ata_smart_selftestlog_struct_t selftest_struct[21]; - unsigned char vendorspecific[2]; - unsigned char mostrecenttest; - unsigned char resevered[2]; - unsigned char chksum; -} __attribute__ ((packed)) ata_smart_selftestlog_t; - -#endif diff --git a/libc/kernel/common/linux/highmem.h b/libc/kernel/common/linux/highmem.h deleted file mode 100644 index d4a34ca64..000000000 --- a/libc/kernel/common/linux/highmem.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_HIGHMEM_H -#define _LINUX_HIGHMEM_H - -#include -#include - -#include - -#ifndef ARCH_HAS_FLUSH_ANON_PAGE -#endif -#ifndef ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE -#endif -#define kunmap(page) do { (void) (page); } while (0) -#define kmap_atomic(page, idx) page_address(page) -#define kunmap_atomic(addr, idx) do { } while (0) -#define kmap_atomic_pfn(pfn, idx) page_address(pfn_to_page(pfn)) -#define kmap_atomic_to_page(ptr) virt_to_page(ptr) -#ifndef __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE -#endif -#endif diff --git a/libc/kernel/common/linux/hil.h b/libc/kernel/common/linux/hil.h deleted file mode 100644 index a0b3b975f..000000000 --- a/libc/kernel/common/linux/hil.h +++ /dev/null @@ -1,256 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _HIL_H_ -#define _HIL_H_ - -#include - -#define HIL_CLOCK 8MHZ -#define HIL_EK1_CLOCK 30HZ -#define HIL_EK2_CLOCK 60HZ - -#define HIL_TIMEOUT_DEV 5 -#define HIL_TIMEOUT_DEVS 10 -#define HIL_TIMEOUT_NORESP 10 -#define HIL_TIMEOUT_DEVS_DATA 16 -#define HIL_TIMEOUT_SELFTEST 200 - -#define HIL_WIRE_PACKET_LEN 15 -enum hil_wire_bitpos { - HIL_WIRE_START = 0, - HIL_WIRE_ADDR2, - HIL_WIRE_ADDR1, - HIL_WIRE_ADDR0, - HIL_WIRE_COMMAND, - HIL_WIRE_DATA7, - HIL_WIRE_DATA6, - HIL_WIRE_DATA5, - HIL_WIRE_DATA4, - HIL_WIRE_DATA3, - HIL_WIRE_DATA2, - HIL_WIRE_DATA1, - HIL_WIRE_DATA0, - HIL_WIRE_PARITY, - HIL_WIRE_STOP -}; - -enum hil_pkt_bitpos { - HIL_PKT_CMD = 0x00000800, - HIL_PKT_ADDR2 = 0x00000400, - HIL_PKT_ADDR1 = 0x00000200, - HIL_PKT_ADDR0 = 0x00000100, - HIL_PKT_ADDR_MASK = 0x00000700, - HIL_PKT_ADDR_SHIFT = 8, - HIL_PKT_DATA7 = 0x00000080, - HIL_PKT_DATA6 = 0x00000040, - HIL_PKT_DATA5 = 0x00000020, - HIL_PKT_DATA4 = 0x00000010, - HIL_PKT_DATA3 = 0x00000008, - HIL_PKT_DATA2 = 0x00000004, - HIL_PKT_DATA1 = 0x00000002, - HIL_PKT_DATA0 = 0x00000001, - HIL_PKT_DATA_MASK = 0x000000FF, - HIL_PKT_DATA_SHIFT = 0 -}; - -enum hil_error_bitpos { - HIL_ERR_OB = 0x00000800, - HIL_ERR_INT = 0x00010000, - HIL_ERR_NMI = 0x00020000, - HIL_ERR_LERR = 0x00040000, - HIL_ERR_PERR = 0x01000000, - HIL_ERR_FERR = 0x02000000, - HIL_ERR_FOF = 0x04000000 -}; - -enum hil_control_bitpos { - HIL_CTRL_TEST = 0x00010000, - HIL_CTRL_IPF = 0x00040000, - HIL_CTRL_APE = 0x02000000 -}; - -#define HIL_DO_ALTER_CTRL 0x40000000 -#define HIL_CTRL_ONLY 0xc0000000 - -typedef u32 hil_packet; - -enum hil_command { - HIL_CMD_IFC = 0x00, - HIL_CMD_EPT = 0x01, - HIL_CMD_ELB = 0x02, - HIL_CMD_IDD = 0x03, - HIL_CMD_DSR = 0x04, - HIL_CMD_PST = 0x05, - HIL_CMD_RRG = 0x06, - HIL_CMD_WRG = 0x07, - HIL_CMD_ACF = 0x08, - HIL_CMDID_ACF = 0x07, - HIL_CMD_POL = 0x10, - HIL_CMDCT_POL = 0x0f, - HIL_CMD_RPL = 0x20, - HIL_CMDCT_RPL = 0x0f, - HIL_CMD_RNM = 0x30, - HIL_CMD_RST = 0x31, - HIL_CMD_EXD = 0x32, - HIL_CMD_RSC = 0x33, - - HIL_CMD_DKA = 0x3d, - HIL_CMD_EK1 = 0x3e, - HIL_CMD_EK2 = 0x3f, - HIL_CMD_PR1 = 0x40, - HIL_CMD_PR2 = 0x41, - HIL_CMD_PR3 = 0x42, - HIL_CMD_PR4 = 0x43, - HIL_CMD_PR5 = 0x44, - HIL_CMD_PR6 = 0x45, - HIL_CMD_PR7 = 0x46, - HIL_CMD_PRM = 0x47, - HIL_CMD_AK1 = 0x48, - HIL_CMD_AK2 = 0x49, - HIL_CMD_AK3 = 0x4a, - HIL_CMD_AK4 = 0x4b, - HIL_CMD_AK5 = 0x4c, - HIL_CMD_AK6 = 0x4d, - HIL_CMD_AK7 = 0x4e, - HIL_CMD_ACK = 0x4f, - - HIL_CMD_RIO = 0xfa, - HIL_CMD_SHR = 0xfb, - HIL_CMD_TER = 0xfc, - HIL_CMD_CAE = 0xfd, - HIL_CMD_DHR = 0xfe, - -}; - -#define HIL_IDD_DID_TYPE_MASK 0xe0 -#define HIL_IDD_DID_TYPE_KB_INTEGRAL 0xa0 -#define HIL_IDD_DID_TYPE_KB_ITF 0xc0 -#define HIL_IDD_DID_TYPE_KB_RSVD 0xe0 -#define HIL_IDD_DID_TYPE_KB_LANG_MASK 0x1f -#define HIL_IDD_DID_KBLANG_USE_ESD 0x00 -#define HIL_IDD_DID_TYPE_ABS 0x80 -#define HIL_IDD_DID_ABS_RSVD1_MASK 0xf8 -#define HIL_IDD_DID_ABS_RSVD1 0x98 -#define HIL_IDD_DID_ABS_TABLET_MASK 0xf8 -#define HIL_IDD_DID_ABS_TABLET 0x90 -#define HIL_IDD_DID_ABS_TSCREEN_MASK 0xfc -#define HIL_IDD_DID_ABS_TSCREEN 0x8c -#define HIL_IDD_DID_ABS_RSVD2_MASK 0xfc -#define HIL_IDD_DID_ABS_RSVD2 0x88 -#define HIL_IDD_DID_ABS_RSVD3_MASK 0xfc -#define HIL_IDD_DID_ABS_RSVD3 0x80 -#define HIL_IDD_DID_TYPE_REL 0x60 -#define HIL_IDD_DID_REL_RSVD1_MASK 0xf0 -#define HIL_IDD_DID_REL_RSVD1 0x70 -#define HIL_IDD_DID_REL_RSVD2_MASK 0xfc -#define HIL_IDD_DID_REL_RSVD2 0x6c -#define HIL_IDD_DID_REL_MOUSE_MASK 0xfc -#define HIL_IDD_DID_REL_MOUSE 0x68 -#define HIL_IDD_DID_REL_QUAD_MASK 0xf8 -#define HIL_IDD_DID_REL_QUAD 0x60 -#define HIL_IDD_DID_TYPE_CHAR 0x40 -#define HIL_IDD_DID_CHAR_BARCODE_MASK 0xfc -#define HIL_IDD_DID_CHAR_BARCODE 0x5c -#define HIL_IDD_DID_CHAR_RSVD1_MASK 0xfc -#define HIL_IDD_DID_CHAR_RSVD1 0x58 -#define HIL_IDD_DID_CHAR_RSVD2_MASK 0xf8 -#define HIL_IDD_DID_CHAR_RSVD2 0x50 -#define HIL_IDD_DID_CHAR_RSVD3_MASK 0xf0 -#define HIL_IDD_DID_CHAR_RSVD3 0x40 -#define HIL_IDD_DID_TYPE_OTHER 0x20 -#define HIL_IDD_DID_OTHER_RSVD1_MASK 0xf0 -#define HIL_IDD_DID_OTHER_RSVD1 0x30 -#define HIL_IDD_DID_OTHER_BARCODE_MASK 0xfc -#define HIL_IDD_DID_OTHER_BARCODE 0x2c -#define HIL_IDD_DID_OTHER_RSVD2_MASK 0xfc -#define HIL_IDD_DID_OTHER_RSVD2 0x28 -#define HIL_IDD_DID_OTHER_RSVD3_MASK 0xf8 -#define HIL_IDD_DID_OTHER_RSVD3 0x20 -#define HIL_IDD_DID_TYPE_KEYPAD 0x00 - -#define HIL_IDD_HEADER_AXSET_MASK 0x03 -#define HIL_IDD_HEADER_RSC 0x04 -#define HIL_IDD_HEADER_EXD 0x08 -#define HIL_IDD_HEADER_IOD 0x10 -#define HIL_IDD_HEADER_16BIT 0x20 -#define HIL_IDD_HEADER_ABS 0x40 -#define HIL_IDD_HEADER_2X_AXIS 0x80 - -#define HIL_IDD_IOD_NBUTTON_MASK 0x07 -#define HIL_IDD_IOD_PROXIMITY 0x08 -#define HIL_IDD_IOD_PROMPT_MASK 0x70 -#define HIL_IDD_IOD_PROMPT_SHIFT 4 -#define HIL_IDD_IOD_PROMPT 0x80 - -#define HIL_IDD_NUM_AXES_PER_SET(header_packet) ((header_packet) & HIL_IDD_HEADER_AXSET_MASK) - -#define HIL_IDD_NUM_AXSETS(header_packet) (2 - !((header_packet) & HIL_IDD_HEADER_2X_AXIS)) - -#define HIL_IDD_LEN(header_packet) ((4 - !(header_packet & HIL_IDD_HEADER_IOD) - 2 * !(HIL_IDD_NUM_AXES_PER_SET(header_packet))) + 2 * HIL_IDD_NUM_AXES_PER_SET(header_packet) * !!((header_packet) & HIL_IDD_HEADER_ABS)) - -#define HIL_IDD_AXIS_COUNTS_PER_M(header_ptr) (!(HIL_IDD_NUM_AXSETS(*(header_ptr))) ? -1 : (((*(header_ptr + 1) & HIL_PKT_DATA_MASK) + ((*(header_ptr + 2) & HIL_PKT_DATA_MASK)) << 8) * ((*(header_ptr) & HIL_IDD_HEADER_16BIT) ? 100 : 1))) - -#define HIL_IDD_AXIS_MAX(header_ptr, __axnum) ((!(*(header_ptr) & HIL_IDD_HEADER_ABS) || (HIL_IDD_NUM_AXES_PER_SET(*(header_ptr)) <= __axnum)) ? 0 : ((HIL_PKT_DATA_MASK & *((header_ptr) + 3 + 2 * __axnum)) + ((HIL_PKT_DATA_MASK & *((header_ptr) + 4 + 2 * __axnum)) << 8))) - -#define HIL_IDD_IOD(header_ptr) (*(header_ptr + HIL_IDD_LEN((*header_ptr)) - 1)) - -#define HIL_IDD_HAS_GEN_PROMPT(header_ptr) ((*header_ptr & HIL_IDD_HEADER_IOD) && (HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_PROMPT)) - -#define HIL_IDD_HAS_GEN_PROXIMITY(header_ptr) ((*header_ptr & HIL_IDD_HEADER_IOD) && (HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_PROXIMITY)) - -#define HIL_IDD_NUM_BUTTONS(header_ptr) ((*header_ptr & HIL_IDD_HEADER_IOD) ? (HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_NBUTTON_MASK) : 0) - -#define HIL_IDD_NUM_PROMPTS(header_ptr) ((*header_ptr & HIL_IDD_HEADER_IOD) ? ((HIL_IDD_IOD(header_ptr) & HIL_IDD_IOD_NPROMPT_MASK) >> HIL_IDD_IOD_PROMPT_SHIFT) : 0) - -#define HIL_EXD_HEADER_WRG 0x03 -#define HIL_EXD_HEADER_WRG_TYPE1 0x01 -#define HIL_EXD_HEADER_WRG_TYPE2 0x02 -#define HIL_EXD_HEADER_RRG 0x04 -#define HIL_EXD_HEADER_RNM 0x10 -#define HIL_EXD_HEADER_RST 0x20 -#define HIL_EXD_HEADER_LOCALE 0x40 - -#define HIL_EXD_NUM_RRG(header_ptr) ((*header_ptr & HIL_EXD_HEADER_RRG) ? (*(header_ptr + 1) & HIL_PKT_DATA_MASK) : 0) - -#define HIL_EXD_NUM_WWG(header_ptr) ((*header_ptr & HIL_EXD_HEADER_WRG) ? (*(header_ptr + 2 - !(*header_ptr & HIL_EXD_HEADER_RRG)) & HIL_PKT_DATA_MASK) : 0) - -#define HIL_EXD_LEN(header_ptr) (!!(*header_ptr & HIL_EXD_HEADER_RRG) + !!(*header_ptr & HIL_EXD_HEADER_WRG) + !!(*header_ptr & HIL_EXD_HEADER_LOCALE) + 2 * !!(*header_ptr & HIL_EXD_HEADER_WRG_TYPE2) + 1) - -#define HIL_EXD_LOCALE(header_ptr) (!(*header_ptr & HIL_EXD_HEADER_LOCALE) ? -1 : (*(header_ptr + HIL_EXD_LEN(header_ptr) - 1) & HIL_PKT_DATA_MASK)) - -#define HIL_EXD_WRG_TYPE2_LEN(header_ptr) (!(*header_ptr & HIL_EXD_HEADER_WRG_TYPE2) ? -1 : (*(header_ptr + HIL_EXD_LEN(header_ptr) - 2 - !!(*header_ptr & HIL_EXD_HEADER_LOCALE)) & HIL_PKT_DATA_MASK) + ((*(header_ptr + HIL_EXD_LEN(header_ptr) - 1 - !!(*header_ptr & HIL_EXD_HEADER_LOCALE)) & HIL_PKT_DATA_MASK) << 8)) - -#define HIL_LOCALE_MAX 0x1f - -#define HIL_LOCALE_MAP "", "", "", "swiss.french", "portuguese", "arabic", "hebrew", "english.canadian", "turkish", "greek", "thai", "italian", "korean", "dutch", "swedish", "german", "chinese", "chinese", "swiss.french", "spanish", "swiss.german", "flemish", "finnish", "english.uk", "french.canadian", "swiss.german", "norwegian", "french", "danish", "japanese", "spanish", "english.us" - -#define HIL_KEYCODES_SET1_TBLSIZE 128 -#define HIL_KEYCODES_SET1 KEY_5, KEY_RESERVED, KEY_RIGHTALT, KEY_LEFTALT, KEY_RIGHTSHIFT, KEY_LEFTSHIFT, KEY_LEFTCTRL, KEY_SYSRQ, KEY_KP4, KEY_KP8, KEY_KP5, KEY_KP9, KEY_KP6, KEY_KP7, KEY_KPCOMMA, KEY_KPENTER, KEY_KP1, KEY_KPSLASH, KEY_KP2, KEY_KPPLUS, KEY_KP3, KEY_KPASTERISK, KEY_KP0, KEY_KPMINUS, KEY_B, KEY_V, KEY_C, KEY_X, KEY_Z, KEY_RESERVED, KEY_RESERVED, KEY_ESC, KEY_6, KEY_F10, KEY_3, KEY_F11, KEY_KPDOT, KEY_F9, KEY_TAB , KEY_F12, KEY_H, KEY_G, KEY_F, KEY_D, KEY_S, KEY_A, KEY_RESERVED, KEY_CAPSLOCK, KEY_U, KEY_Y, KEY_T, KEY_R, KEY_E, KEY_W, KEY_Q, KEY_TAB, KEY_7, KEY_6, KEY_5, KEY_4, KEY_3, KEY_2, KEY_1, KEY_GRAVE, KEY_F13, KEY_F14, KEY_F15, KEY_F16, KEY_F17, KEY_F18, KEY_F19, KEY_F20, KEY_MENU, KEY_F4, KEY_F3, KEY_F2, KEY_F1, KEY_VOLUMEUP, KEY_STOP, KEY_SENDFILE, KEY_SYSRQ, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_VOLUMEDOWN, KEY_DEL_EOL, KEY_DEL_EOS, KEY_8, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, KEY_BACKSPACE, KEY_INS_LINE, KEY_DEL_LINE, KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSLASH, KEY_INSERT, KEY_DELETE, KEY_J, KEY_K, KEY_L, KEY_SEMICOLON, KEY_APOSTROPHE, KEY_ENTER, KEY_HOME, KEY_PAGEUP, KEY_M, KEY_COMMA, KEY_DOT, KEY_SLASH, KEY_BACKSLASH, KEY_SELECT, KEY_102ND, KEY_PAGEDOWN, KEY_N, KEY_SPACE, KEY_NEXT, KEY_RESERVED, KEY_LEFT, KEY_DOWN, KEY_UP, KEY_RIGHT - -#define HIL_KEYCODES_SET3_TBLSIZE 128 -#define HIL_KEYCODES_SET3 KEY_RESERVED, KEY_ESC, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, KEY_BACKSPACE, KEY_TAB, KEY_Q, KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_ENTER, KEY_LEFTCTRL, KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_SEMICOLON, KEY_APOSTROPHE,KEY_GRAVE, KEY_LEFTSHIFT, KEY_BACKSLASH, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMMA, KEY_DOT, KEY_SLASH, KEY_RIGHTSHIFT, KEY_KPASTERISK, KEY_LEFTALT, KEY_SPACE, KEY_CAPSLOCK, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_KP7, KEY_KP8, KEY_KP9, KEY_KPMINUS, KEY_KP4, KEY_KP5, KEY_KP6, KEY_KPPLUS, KEY_KP1, KEY_KP2, KEY_KP3, KEY_KP0, KEY_KPDOT, KEY_SYSRQ, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_UP, KEY_LEFT, KEY_DOWN, KEY_RIGHT, KEY_HOME, KEY_PAGEUP, KEY_END, KEY_PAGEDOWN, KEY_INSERT, KEY_DELETE, KEY_102ND, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED - -#define HIL_POL_NUM_AXES_MASK 0x03 -#define HIL_POL_CTS 0x04 -#define HIL_POL_STATUS_PENDING 0x08 -#define HIL_POL_CHARTYPE_MASK 0x70 -#define HIL_POL_CHARTYPE_NONE 0x00 -#define HIL_POL_CHARTYPE_RSVD1 0x10 -#define HIL_POL_CHARTYPE_ASCII 0x20 -#define HIL_POL_CHARTYPE_BINARY 0x30 -#define HIL_POL_CHARTYPE_SET1 0x40 -#define HIL_POL_CHARTYPE_RSVD2 0x50 -#define HIL_POL_CHARTYPE_SET2 0x60 -#define HIL_POL_CHARTYPE_SET3 0x70 -#define HIL_POL_AXIS_ALT 0x80 - -#endif diff --git a/libc/kernel/common/linux/i2c.h b/libc/kernel/common/linux/i2c.h deleted file mode 100644 index 9513fc645..000000000 --- a/libc/kernel/common/linux/i2c.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_I2C_H -#define _LINUX_I2C_H - -#include - -struct i2c_msg { - __u16 addr; - __u16 flags; -#define I2C_M_TEN 0x10 -#define I2C_M_RD 0x01 -#define I2C_M_NOSTART 0x4000 -#define I2C_M_REV_DIR_ADDR 0x2000 -#define I2C_M_IGNORE_NAK 0x1000 -#define I2C_M_NO_RD_ACK 0x0800 - __u16 len; - __u8 *buf; -}; - -#define I2C_FUNC_I2C 0x00000001 -#define I2C_FUNC_10BIT_ADDR 0x00000002 -#define I2C_FUNC_PROTOCOL_MANGLING 0x00000004 -#define I2C_FUNC_SMBUS_HWPEC_CALC 0x00000008 -#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL 0x00008000 -#define I2C_FUNC_SMBUS_QUICK 0x00010000 -#define I2C_FUNC_SMBUS_READ_BYTE 0x00020000 -#define I2C_FUNC_SMBUS_WRITE_BYTE 0x00040000 -#define I2C_FUNC_SMBUS_READ_BYTE_DATA 0x00080000 -#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA 0x00100000 -#define I2C_FUNC_SMBUS_READ_WORD_DATA 0x00200000 -#define I2C_FUNC_SMBUS_WRITE_WORD_DATA 0x00400000 -#define I2C_FUNC_SMBUS_PROC_CALL 0x00800000 -#define I2C_FUNC_SMBUS_READ_BLOCK_DATA 0x01000000 -#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000 -#define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 -#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 -#define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 0x10000000 -#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 - -#define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE) -#define I2C_FUNC_SMBUS_BYTE_DATA (I2C_FUNC_SMBUS_READ_BYTE_DATA | I2C_FUNC_SMBUS_WRITE_BYTE_DATA) -#define I2C_FUNC_SMBUS_WORD_DATA (I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA) -#define I2C_FUNC_SMBUS_BLOCK_DATA (I2C_FUNC_SMBUS_READ_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_BLOCK_DATA) -#define I2C_FUNC_SMBUS_I2C_BLOCK (I2C_FUNC_SMBUS_READ_I2C_BLOCK | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK) -#define I2C_FUNC_SMBUS_I2C_BLOCK_2 (I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2) - -#define I2C_FUNC_SMBUS_EMUL (I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_PROC_CALL | I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | I2C_FUNC_SMBUS_I2C_BLOCK) - -#define I2C_SMBUS_BLOCK_MAX 32 -union i2c_smbus_data { - __u8 byte; - __u16 word; - __u8 block[I2C_SMBUS_BLOCK_MAX + 2]; - -}; - -#define I2C_SMBUS_READ 1 -#define I2C_SMBUS_WRITE 0 - -#define I2C_SMBUS_QUICK 0 -#define I2C_SMBUS_BYTE 1 -#define I2C_SMBUS_BYTE_DATA 2 -#define I2C_SMBUS_WORD_DATA 3 -#define I2C_SMBUS_PROC_CALL 4 -#define I2C_SMBUS_BLOCK_DATA 5 -#define I2C_SMBUS_I2C_BLOCK_DATA 6 -#define I2C_SMBUS_BLOCK_PROC_CALL 7 - -#define I2C_RETRIES 0x0701 - -#define I2C_TIMEOUT 0x0702 - -#define I2C_SLAVE 0x0703 - -#define I2C_SLAVE_FORCE 0x0706 - -#define I2C_TENBIT 0x0704 - -#define I2C_FUNCS 0x0705 -#define I2C_RDWR 0x0707 -#define I2C_PEC 0x0708 - -#define I2C_SMBUS 0x0720 - -#endif diff --git a/libc/kernel/common/linux/icmp.h b/libc/kernel/common/linux/icmp.h deleted file mode 100644 index c5b58bb67..000000000 --- a/libc/kernel/common/linux/icmp.h +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ICMP_H -#define _LINUX_ICMP_H - -#include - -#define ICMP_ECHOREPLY 0 -#define ICMP_DEST_UNREACH 3 -#define ICMP_SOURCE_QUENCH 4 -#define ICMP_REDIRECT 5 -#define ICMP_ECHO 8 -#define ICMP_TIME_EXCEEDED 11 -#define ICMP_PARAMETERPROB 12 -#define ICMP_TIMESTAMP 13 -#define ICMP_TIMESTAMPREPLY 14 -#define ICMP_INFO_REQUEST 15 -#define ICMP_INFO_REPLY 16 -#define ICMP_ADDRESS 17 -#define ICMP_ADDRESSREPLY 18 -#define NR_ICMP_TYPES 18 - -#define ICMP_NET_UNREACH 0 -#define ICMP_HOST_UNREACH 1 -#define ICMP_PROT_UNREACH 2 -#define ICMP_PORT_UNREACH 3 -#define ICMP_FRAG_NEEDED 4 -#define ICMP_SR_FAILED 5 -#define ICMP_NET_UNKNOWN 6 -#define ICMP_HOST_UNKNOWN 7 -#define ICMP_HOST_ISOLATED 8 -#define ICMP_NET_ANO 9 -#define ICMP_HOST_ANO 10 -#define ICMP_NET_UNR_TOS 11 -#define ICMP_HOST_UNR_TOS 12 -#define ICMP_PKT_FILTERED 13 -#define ICMP_PREC_VIOLATION 14 -#define ICMP_PREC_CUTOFF 15 -#define NR_ICMP_UNREACH 15 - -#define ICMP_REDIR_NET 0 -#define ICMP_REDIR_HOST 1 -#define ICMP_REDIR_NETTOS 2 -#define ICMP_REDIR_HOSTTOS 3 - -#define ICMP_EXC_TTL 0 -#define ICMP_EXC_FRAGTIME 1 - -struct icmphdr { - __u8 type; - __u8 code; - __u16 checksum; - union { - struct { - __u16 id; - __u16 sequence; - } echo; - __u32 gateway; - struct { - __u16 __unused_field; - __u16 mtu; - } frag; - } un; -}; - -#define ICMP_FILTER 1 - -struct icmp_filter { - __u32 data; -}; - -#endif diff --git a/libc/kernel/common/linux/if.h b/libc/kernel/common/linux/if.h deleted file mode 100644 index 47c29d99d..000000000 --- a/libc/kernel/common/linux/if.h +++ /dev/null @@ -1,176 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_H -#define _LINUX_IF_H - -#include -#include -#include - -#define IFNAMSIZ 16 -#include - -#define IFF_UP 0x1 -#define IFF_BROADCAST 0x2 -#define IFF_DEBUG 0x4 -#define IFF_LOOPBACK 0x8 -#define IFF_POINTOPOINT 0x10 -#define IFF_NOTRAILERS 0x20 -#define IFF_RUNNING 0x40 -#define IFF_NOARP 0x80 -#define IFF_PROMISC 0x100 -#define IFF_ALLMULTI 0x200 - -#define IFF_MASTER 0x400 -#define IFF_SLAVE 0x800 - -#define IFF_MULTICAST 0x1000 - -#define IFF_PORTSEL 0x2000 -#define IFF_AUTOMEDIA 0x4000 -#define IFF_DYNAMIC 0x8000 - -#define IFF_LOWER_UP 0x10000 -#define IFF_DORMANT 0x20000 - -#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST| IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) - -#define IFF_802_1Q_VLAN 0x1 -#define IFF_EBRIDGE 0x2 -#define IFF_SLAVE_INACTIVE 0x4 -#define IFF_MASTER_8023AD 0x8 -#define IFF_MASTER_ALB 0x10 - -#define IF_GET_IFACE 0x0001 -#define IF_GET_PROTO 0x0002 - -#define IF_IFACE_V35 0x1000 -#define IF_IFACE_V24 0x1001 -#define IF_IFACE_X21 0x1002 -#define IF_IFACE_T1 0x1003 -#define IF_IFACE_E1 0x1004 -#define IF_IFACE_SYNC_SERIAL 0x1005 -#define IF_IFACE_X21D 0x1006 - -#define IF_PROTO_HDLC 0x2000 -#define IF_PROTO_PPP 0x2001 -#define IF_PROTO_CISCO 0x2002 -#define IF_PROTO_FR 0x2003 -#define IF_PROTO_FR_ADD_PVC 0x2004 -#define IF_PROTO_FR_DEL_PVC 0x2005 -#define IF_PROTO_X25 0x2006 -#define IF_PROTO_HDLC_ETH 0x2007 -#define IF_PROTO_FR_ADD_ETH_PVC 0x2008 -#define IF_PROTO_FR_DEL_ETH_PVC 0x2009 -#define IF_PROTO_FR_PVC 0x200A -#define IF_PROTO_FR_ETH_PVC 0x200B -#define IF_PROTO_RAW 0x200C - -enum { - IF_OPER_UNKNOWN, - IF_OPER_NOTPRESENT, - IF_OPER_DOWN, - IF_OPER_LOWERLAYERDOWN, - IF_OPER_TESTING, - IF_OPER_DORMANT, - IF_OPER_UP, -}; - -enum { - IF_LINK_MODE_DEFAULT, - IF_LINK_MODE_DORMANT, -}; - -struct ifmap -{ - unsigned long mem_start; - unsigned long mem_end; - unsigned short base_addr; - unsigned char irq; - unsigned char dma; - unsigned char port; - -}; - -struct if_settings -{ - unsigned int type; - unsigned int size; - union { - - raw_hdlc_proto __user *raw_hdlc; - cisco_proto __user *cisco; - fr_proto __user *fr; - fr_proto_pvc __user *fr_pvc; - fr_proto_pvc_info __user *fr_pvc_info; - - sync_serial_settings __user *sync; - te1_settings __user *te1; - } ifs_ifsu; -}; - -struct ifreq -{ -#define IFHWADDRLEN 6 - union - { - char ifrn_name[IFNAMSIZ]; - } ifr_ifrn; - - union { - struct sockaddr ifru_addr; - struct sockaddr ifru_dstaddr; - struct sockaddr ifru_broadaddr; - struct sockaddr ifru_netmask; - struct sockaddr ifru_hwaddr; - short ifru_flags; - int ifru_ivalue; - int ifru_mtu; - struct ifmap ifru_map; - char ifru_slave[IFNAMSIZ]; - char ifru_newname[IFNAMSIZ]; - void __user * ifru_data; - struct if_settings ifru_settings; - } ifr_ifru; -}; - -#define ifr_name ifr_ifrn.ifrn_name -#define ifr_hwaddr ifr_ifru.ifru_hwaddr -#define ifr_addr ifr_ifru.ifru_addr -#define ifr_dstaddr ifr_ifru.ifru_dstaddr -#define ifr_broadaddr ifr_ifru.ifru_broadaddr -#define ifr_netmask ifr_ifru.ifru_netmask -#define ifr_flags ifr_ifru.ifru_flags -#define ifr_metric ifr_ifru.ifru_ivalue -#define ifr_mtu ifr_ifru.ifru_mtu -#define ifr_map ifr_ifru.ifru_map -#define ifr_slave ifr_ifru.ifru_slave -#define ifr_data ifr_ifru.ifru_data -#define ifr_ifindex ifr_ifru.ifru_ivalue -#define ifr_bandwidth ifr_ifru.ifru_ivalue -#define ifr_qlen ifr_ifru.ifru_ivalue -#define ifr_newname ifr_ifru.ifru_newname -#define ifr_settings ifr_ifru.ifru_settings - -struct ifconf -{ - int ifc_len; - union - { - char __user *ifcu_buf; - struct ifreq __user *ifcu_req; - } ifc_ifcu; -}; -#define ifc_buf ifc_ifcu.ifcu_buf -#define ifc_req ifc_ifcu.ifcu_req - -#endif diff --git a/libc/kernel/common/linux/if_arcnet.h b/libc/kernel/common/linux/if_arcnet.h deleted file mode 100644 index a1ad877d4..000000000 --- a/libc/kernel/common/linux/if_arcnet.h +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_ARCNET_H -#define _LINUX_IF_ARCNET_H - -#include - -#define ARC_P_IP 212 -#define ARC_P_IPV6 196 -#define ARC_P_ARP 213 -#define ARC_P_RARP 214 -#define ARC_P_IPX 250 -#define ARC_P_NOVELL_EC 236 - -#define ARC_P_IP_RFC1051 240 -#define ARC_P_ARP_RFC1051 241 - -#define ARC_P_ETHER 232 - -#define ARC_P_DATAPOINT_BOOT 0 -#define ARC_P_DATAPOINT_MOUNT 1 -#define ARC_P_POWERLAN_BEACON 8 -#define ARC_P_POWERLAN_BEACON2 243 -#define ARC_P_LANSOFT 251 -#define ARC_P_ATALK 0xDD - -#define ARCNET_ALEN 1 - -struct arc_rfc1201 -{ - uint8_t proto; - uint8_t split_flag; - uint16_t sequence; - uint8_t payload[0]; -}; -#define RFC1201_HDR_SIZE 4 - -struct arc_rfc1051 -{ - uint8_t proto; - uint8_t payload[0]; -}; -#define RFC1051_HDR_SIZE 1 - -struct arc_eth_encap -{ - uint8_t proto; - struct ethhdr eth; - uint8_t payload[0]; -}; -#define ETH_ENCAP_HDR_SIZE 14 - -struct arc_cap -{ - uint8_t proto; - uint8_t cookie[sizeof(int)]; - union { - uint8_t ack; - uint8_t raw[0]; - } mes; -}; - -struct arc_hardware -{ - uint8_t source, - dest, - offset[2]; -}; -#define ARC_HDR_SIZE 4 - -struct archdr -{ - - struct arc_hardware hard; - - union { - struct arc_rfc1201 rfc1201; - struct arc_rfc1051 rfc1051; - struct arc_eth_encap eth_encap; - struct arc_cap cap; - uint8_t raw[0]; - } soft; -}; - -#endif diff --git a/libc/kernel/common/linux/if_arp.h b/libc/kernel/common/linux/if_arp.h deleted file mode 100644 index 1da50f57b..000000000 --- a/libc/kernel/common/linux/if_arp.h +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_ARP_H -#define _LINUX_IF_ARP_H - -#include - -#define ARPHRD_NETROM 0 -#define ARPHRD_ETHER 1 -#define ARPHRD_EETHER 2 -#define ARPHRD_AX25 3 -#define ARPHRD_PRONET 4 -#define ARPHRD_CHAOS 5 -#define ARPHRD_IEEE802 6 -#define ARPHRD_ARCNET 7 -#define ARPHRD_APPLETLK 8 -#define ARPHRD_DLCI 15 -#define ARPHRD_ATM 19 -#define ARPHRD_METRICOM 23 -#define ARPHRD_IEEE1394 24 -#define ARPHRD_EUI64 27 -#define ARPHRD_INFINIBAND 32 - -#define ARPHRD_SLIP 256 -#define ARPHRD_CSLIP 257 -#define ARPHRD_SLIP6 258 -#define ARPHRD_CSLIP6 259 -#define ARPHRD_RSRVD 260 -#define ARPHRD_ADAPT 264 -#define ARPHRD_ROSE 270 -#define ARPHRD_X25 271 -#define ARPHRD_HWX25 272 -#define ARPHRD_PPP 512 -#define ARPHRD_CISCO 513 -#define ARPHRD_HDLC ARPHRD_CISCO -#define ARPHRD_LAPB 516 -#define ARPHRD_DDCMP 517 -#define ARPHRD_RAWHDLC 518 - -#define ARPHRD_TUNNEL 768 -#define ARPHRD_TUNNEL6 769 -#define ARPHRD_FRAD 770 -#define ARPHRD_SKIP 771 -#define ARPHRD_LOOPBACK 772 -#define ARPHRD_LOCALTLK 773 -#define ARPHRD_FDDI 774 -#define ARPHRD_BIF 775 -#define ARPHRD_SIT 776 -#define ARPHRD_IPDDP 777 -#define ARPHRD_IPGRE 778 -#define ARPHRD_PIMREG 779 -#define ARPHRD_HIPPI 780 -#define ARPHRD_ASH 781 -#define ARPHRD_ECONET 782 -#define ARPHRD_IRDA 783 - -#define ARPHRD_FCPP 784 -#define ARPHRD_FCAL 785 -#define ARPHRD_FCPL 786 -#define ARPHRD_FCFABRIC 787 - -#define ARPHRD_IEEE802_TR 800 -#define ARPHRD_IEEE80211 801 -#define ARPHRD_IEEE80211_PRISM 802 -#define ARPHRD_IEEE80211_RADIOTAP 803 - -#define ARPHRD_VOID 0xFFFF -#define ARPHRD_NONE 0xFFFE - -#define ARPOP_REQUEST 1 -#define ARPOP_REPLY 2 -#define ARPOP_RREQUEST 3 -#define ARPOP_RREPLY 4 -#define ARPOP_InREQUEST 8 -#define ARPOP_InREPLY 9 -#define ARPOP_NAK 10 - -struct arpreq { - struct sockaddr arp_pa; - struct sockaddr arp_ha; - int arp_flags; - struct sockaddr arp_netmask; - char arp_dev[16]; -}; - -struct arpreq_old { - struct sockaddr arp_pa; - struct sockaddr arp_ha; - int arp_flags; - struct sockaddr arp_netmask; -}; - -#define ATF_COM 0x02 -#define ATF_PERM 0x04 -#define ATF_PUBL 0x08 -#define ATF_USETRAILERS 0x10 -#define ATF_NETMASK 0x20 -#define ATF_DONTPUB 0x40 - -struct arphdr -{ - unsigned short ar_hrd; - unsigned short ar_pro; - unsigned char ar_hln; - unsigned char ar_pln; - unsigned short ar_op; - -}; - -#endif diff --git a/libc/kernel/common/linux/if_bridge.h b/libc/kernel/common/linux/if_bridge.h deleted file mode 100644 index 93f94947b..000000000 --- a/libc/kernel/common/linux/if_bridge.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_BRIDGE_H -#define _LINUX_IF_BRIDGE_H - -#include - -#define SYSFS_BRIDGE_ATTR "bridge" -#define SYSFS_BRIDGE_FDB "brforward" -#define SYSFS_BRIDGE_PORT_SUBDIR "brif" -#define SYSFS_BRIDGE_PORT_ATTR "brport" -#define SYSFS_BRIDGE_PORT_LINK "bridge" - -#define BRCTL_VERSION 1 - -#define BRCTL_GET_VERSION 0 -#define BRCTL_GET_BRIDGES 1 -#define BRCTL_ADD_BRIDGE 2 -#define BRCTL_DEL_BRIDGE 3 -#define BRCTL_ADD_IF 4 -#define BRCTL_DEL_IF 5 -#define BRCTL_GET_BRIDGE_INFO 6 -#define BRCTL_GET_PORT_LIST 7 -#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 -#define BRCTL_SET_BRIDGE_HELLO_TIME 9 -#define BRCTL_SET_BRIDGE_MAX_AGE 10 -#define BRCTL_SET_AGEING_TIME 11 -#define BRCTL_SET_GC_INTERVAL 12 -#define BRCTL_GET_PORT_INFO 13 -#define BRCTL_SET_BRIDGE_STP_STATE 14 -#define BRCTL_SET_BRIDGE_PRIORITY 15 -#define BRCTL_SET_PORT_PRIORITY 16 -#define BRCTL_SET_PATH_COST 17 -#define BRCTL_GET_FDB_ENTRIES 18 - -#define BR_STATE_DISABLED 0 -#define BR_STATE_LISTENING 1 -#define BR_STATE_LEARNING 2 -#define BR_STATE_FORWARDING 3 -#define BR_STATE_BLOCKING 4 - -struct __bridge_info -{ - __u64 designated_root; - __u64 bridge_id; - __u32 root_path_cost; - __u32 max_age; - __u32 hello_time; - __u32 forward_delay; - __u32 bridge_max_age; - __u32 bridge_hello_time; - __u32 bridge_forward_delay; - __u8 topology_change; - __u8 topology_change_detected; - __u8 root_port; - __u8 stp_enabled; - __u32 ageing_time; - __u32 gc_interval; - __u32 hello_timer_value; - __u32 tcn_timer_value; - __u32 topology_change_timer_value; - __u32 gc_timer_value; -}; - -struct __port_info -{ - __u64 designated_root; - __u64 designated_bridge; - __u16 port_id; - __u16 designated_port; - __u32 path_cost; - __u32 designated_cost; - __u8 state; - __u8 top_change_ack; - __u8 config_pending; - __u8 unused0; - __u32 message_age_timer_value; - __u32 forward_delay_timer_value; - __u32 hold_timer_value; -}; - -struct __fdb_entry -{ - __u8 mac_addr[6]; - __u8 port_no; - __u8 is_local; - __u32 ageing_timer_value; - __u32 unused; -}; - -#endif diff --git a/libc/kernel/common/linux/if_ether.h b/libc/kernel/common/linux/if_ether.h deleted file mode 100644 index ff89c3d9c..000000000 --- a/libc/kernel/common/linux/if_ether.h +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_ETHER_H -#define _LINUX_IF_ETHER_H - -#include - -#define ETH_ALEN 6 -#define ETH_HLEN 14 -#define ETH_ZLEN 60 -#define ETH_DATA_LEN 1500 -#define ETH_FRAME_LEN 1514 - -#define ETH_P_LOOP 0x0060 -#define ETH_P_PUP 0x0200 -#define ETH_P_PUPAT 0x0201 -#define ETH_P_IP 0x0800 -#define ETH_P_X25 0x0805 -#define ETH_P_ARP 0x0806 -#define ETH_P_BPQ 0x08FF -#define ETH_P_IEEEPUP 0x0a00 -#define ETH_P_IEEEPUPAT 0x0a01 -#define ETH_P_DEC 0x6000 -#define ETH_P_DNA_DL 0x6001 -#define ETH_P_DNA_RC 0x6002 -#define ETH_P_DNA_RT 0x6003 -#define ETH_P_LAT 0x6004 -#define ETH_P_DIAG 0x6005 -#define ETH_P_CUST 0x6006 -#define ETH_P_SCA 0x6007 -#define ETH_P_RARP 0x8035 -#define ETH_P_ATALK 0x809B -#define ETH_P_AARP 0x80F3 -#define ETH_P_8021Q 0x8100 -#define ETH_P_IPX 0x8137 -#define ETH_P_IPV6 0x86DD -#define ETH_P_SLOW 0x8809 -#define ETH_P_WCCP 0x883E -#define ETH_P_PPP_DISC 0x8863 -#define ETH_P_PPP_SES 0x8864 -#define ETH_P_MPLS_UC 0x8847 -#define ETH_P_MPLS_MC 0x8848 -#define ETH_P_ATMMPOA 0x884c -#define ETH_P_ATMFATE 0x8884 -#define ETH_P_AOE 0x88A2 -#define ETH_P_TIPC 0x88CA - -#define ETH_P_802_3 0x0001 -#define ETH_P_AX25 0x0002 -#define ETH_P_ALL 0x0003 -#define ETH_P_802_2 0x0004 -#define ETH_P_SNAP 0x0005 -#define ETH_P_DDCMP 0x0006 -#define ETH_P_WAN_PPP 0x0007 -#define ETH_P_PPP_MP 0x0008 -#define ETH_P_LOCALTALK 0x0009 -#define ETH_P_PPPTALK 0x0010 -#define ETH_P_TR_802_2 0x0011 -#define ETH_P_MOBITEX 0x0015 -#define ETH_P_CONTROL 0x0016 -#define ETH_P_IRDA 0x0017 -#define ETH_P_ECONET 0x0018 -#define ETH_P_HDLC 0x0019 -#define ETH_P_ARCNET 0x001A - -struct ethhdr { - unsigned char h_dest[ETH_ALEN]; - unsigned char h_source[ETH_ALEN]; - __be16 h_proto; -} __attribute__((packed)); - -#endif diff --git a/libc/kernel/common/linux/if_fc.h b/libc/kernel/common/linux/if_fc.h deleted file mode 100644 index a6a47b495..000000000 --- a/libc/kernel/common/linux/if_fc.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_FC_H -#define _LINUX_IF_FC_H - -#define FC_ALEN 6 -#define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) -#define FC_ID_LEN 3 - -#define EXTENDED_SAP 0xAA -#define UI_CMD 0x03 - -struct fch_hdr { - __u8 daddr[FC_ALEN]; - __u8 saddr[FC_ALEN]; -}; - -struct fcllc { - __u8 dsap; - __u8 ssap; - __u8 llc; - __u8 protid[3]; - __be16 ethertype; -}; - -#endif diff --git a/libc/kernel/common/linux/if_fddi.h b/libc/kernel/common/linux/if_fddi.h deleted file mode 100644 index f59492f8e..000000000 --- a/libc/kernel/common/linux/if_fddi.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_FDDI_H -#define _LINUX_IF_FDDI_H - -#define FDDI_K_ALEN 6 -#define FDDI_K_8022_HLEN 16 -#define FDDI_K_SNAP_HLEN 21 -#define FDDI_K_8022_ZLEN 16 -#define FDDI_K_SNAP_ZLEN 21 -#define FDDI_K_8022_DLEN 4475 -#define FDDI_K_SNAP_DLEN 4470 -#define FDDI_K_LLC_ZLEN 13 -#define FDDI_K_LLC_LEN 4491 - -#define FDDI_FC_K_VOID 0x00 -#define FDDI_FC_K_NON_RESTRICTED_TOKEN 0x80 -#define FDDI_FC_K_RESTRICTED_TOKEN 0xC0 -#define FDDI_FC_K_SMT_MIN 0x41 -#define FDDI_FC_K_SMT_MAX 0x4F -#define FDDI_FC_K_MAC_MIN 0xC1 -#define FDDI_FC_K_MAC_MAX 0xCF -#define FDDI_FC_K_ASYNC_LLC_MIN 0x50 -#define FDDI_FC_K_ASYNC_LLC_DEF 0x54 -#define FDDI_FC_K_ASYNC_LLC_MAX 0x5F -#define FDDI_FC_K_SYNC_LLC_MIN 0xD0 -#define FDDI_FC_K_SYNC_LLC_MAX 0xD7 -#define FDDI_FC_K_IMPLEMENTOR_MIN 0x60 -#define FDDI_FC_K_IMPLEMENTOR_MAX 0x6F -#define FDDI_FC_K_RESERVED_MIN 0x70 -#define FDDI_FC_K_RESERVED_MAX 0x7F - -#define FDDI_EXTENDED_SAP 0xAA -#define FDDI_UI_CMD 0x03 - -struct fddi_8022_1_hdr - { - __u8 dsap; - __u8 ssap; - __u8 ctrl; - } __attribute__ ((packed)); - -struct fddi_8022_2_hdr - { - __u8 dsap; - __u8 ssap; - __u8 ctrl_1; - __u8 ctrl_2; - } __attribute__ ((packed)); - -#define FDDI_K_OUI_LEN 3 -struct fddi_snap_hdr - { - __u8 dsap; - __u8 ssap; - __u8 ctrl; - __u8 oui[FDDI_K_OUI_LEN]; - __be16 ethertype; - } __attribute__ ((packed)); - -struct fddihdr - { - __u8 fc; - __u8 daddr[FDDI_K_ALEN]; - __u8 saddr[FDDI_K_ALEN]; - union - { - struct fddi_8022_1_hdr llc_8022_1; - struct fddi_8022_2_hdr llc_8022_2; - struct fddi_snap_hdr llc_snap; - } hdr; - } __attribute__ ((packed)); - -#endif diff --git a/libc/kernel/common/linux/if_hippi.h b/libc/kernel/common/linux/if_hippi.h deleted file mode 100644 index 52d36f677..000000000 --- a/libc/kernel/common/linux/if_hippi.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_HIPPI_H -#define _LINUX_IF_HIPPI_H - -#include - -#define HIPPI_ALEN 6 -#define HIPPI_HLEN sizeof(struct hippi_hdr) -#define HIPPI_ZLEN 0 -#define HIPPI_DATA_LEN 65280 -#define HIPPI_FRAME_LEN (HIPPI_DATA_LEN + HIPPI_HLEN) - -#define HIPPI_EXTENDED_SAP 0xAA -#define HIPPI_UI_CMD 0x03 - -struct hipnet_statistics -{ - int rx_packets; - int tx_packets; - int rx_errors; - int tx_errors; - int rx_dropped; - int tx_dropped; - - int rx_length_errors; - int rx_over_errors; - int rx_crc_errors; - int rx_frame_errors; - int rx_fifo_errors; - int rx_missed_errors; - - int tx_aborted_errors; - int tx_carrier_errors; - int tx_fifo_errors; - int tx_heartbeat_errors; - int tx_window_errors; -}; - -struct hippi_fp_hdr -{ - __be32 fixed; - __be32 d2_size; -} __attribute__ ((packed)); - -struct hippi_le_hdr -{ -#ifdef __BIG_ENDIAN_BITFIELD - __u8 fc:3; - __u8 double_wide:1; - __u8 message_type:4; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 message_type:4; - __u8 double_wide:1; - __u8 fc:3; -#endif - __u8 dest_switch_addr[3]; -#ifdef __BIG_ENDIAN_BITFIELD - __u8 dest_addr_type:4, - src_addr_type:4; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - __u8 src_addr_type:4, - dest_addr_type:4; -#endif - __u8 src_switch_addr[3]; - __u16 reserved; - __u8 daddr[HIPPI_ALEN]; - __u16 locally_administered; - __u8 saddr[HIPPI_ALEN]; -} __attribute__ ((packed)); - -#define HIPPI_OUI_LEN 3 - -struct hippi_snap_hdr -{ - __u8 dsap; - __u8 ssap; - __u8 ctrl; - __u8 oui[HIPPI_OUI_LEN]; - __be16 ethertype; -} __attribute__ ((packed)); - -struct hippi_hdr -{ - struct hippi_fp_hdr fp; - struct hippi_le_hdr le; - struct hippi_snap_hdr snap; -} __attribute__ ((packed)); - -#endif diff --git a/libc/kernel/common/linux/if_packet.h b/libc/kernel/common/linux/if_packet.h deleted file mode 100644 index 1aa3bea29..000000000 --- a/libc/kernel/common/linux/if_packet.h +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_IF_PACKET_H -#define __LINUX_IF_PACKET_H - -struct sockaddr_pkt -{ - unsigned short spkt_family; - unsigned char spkt_device[14]; - unsigned short spkt_protocol; -}; - -struct sockaddr_ll -{ - unsigned short sll_family; - unsigned short sll_protocol; - int sll_ifindex; - unsigned short sll_hatype; - unsigned char sll_pkttype; - unsigned char sll_halen; - unsigned char sll_addr[8]; -}; - -#define PACKET_HOST 0 -#define PACKET_BROADCAST 1 -#define PACKET_MULTICAST 2 -#define PACKET_OTHERHOST 3 -#define PACKET_OUTGOING 4 - -#define PACKET_LOOPBACK 5 -#define PACKET_FASTROUTE 6 - -#define PACKET_ADD_MEMBERSHIP 1 -#define PACKET_DROP_MEMBERSHIP 2 -#define PACKET_RECV_OUTPUT 3 - -#define PACKET_RX_RING 5 -#define PACKET_STATISTICS 6 -#define PACKET_COPY_THRESH 7 - -struct tpacket_stats -{ - unsigned int tp_packets; - unsigned int tp_drops; -}; - -struct tpacket_hdr -{ - unsigned long tp_status; -#define TP_STATUS_KERNEL 0 -#define TP_STATUS_USER 1 -#define TP_STATUS_COPY 2 -#define TP_STATUS_LOSING 4 -#define TP_STATUS_CSUMNOTREADY 8 - unsigned int tp_len; - unsigned int tp_snaplen; - unsigned short tp_mac; - unsigned short tp_net; - unsigned int tp_sec; - unsigned int tp_usec; -}; - -#define TPACKET_ALIGNMENT 16 -#define TPACKET_ALIGN(x) (((x)+TPACKET_ALIGNMENT-1)&~(TPACKET_ALIGNMENT-1)) -#define TPACKET_HDRLEN (TPACKET_ALIGN(sizeof(struct tpacket_hdr)) + sizeof(struct sockaddr_ll)) - -struct tpacket_req -{ - unsigned int tp_block_size; - unsigned int tp_block_nr; - unsigned int tp_frame_size; - unsigned int tp_frame_nr; -}; - -struct packet_mreq -{ - int mr_ifindex; - unsigned short mr_type; - unsigned short mr_alen; - unsigned char mr_address[8]; -}; - -#define PACKET_MR_MULTICAST 0 -#define PACKET_MR_PROMISC 1 -#define PACKET_MR_ALLMULTI 2 - -#endif diff --git a/libc/kernel/common/linux/if_ppp.h b/libc/kernel/common/linux/if_ppp.h deleted file mode 100644 index 9f35c976f..000000000 --- a/libc/kernel/common/linux/if_ppp.h +++ /dev/null @@ -1,116 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IF_PPP_H_ -#define _IF_PPP_H_ - -#include - -#define PPP_MTU 1500 -#define PPP_MAXMRU 65000 -#define PROTO_IPX 0x002b -#define PROTO_DNA_RT 0x0027 - -#define SC_COMP_PROT 0x00000001 -#define SC_COMP_AC 0x00000002 -#define SC_COMP_TCP 0x00000004 -#define SC_NO_TCP_CCID 0x00000008 -#define SC_REJ_COMP_AC 0x00000010 -#define SC_REJ_COMP_TCP 0x00000020 -#define SC_CCP_OPEN 0x00000040 -#define SC_CCP_UP 0x00000080 -#define SC_ENABLE_IP 0x00000100 -#define SC_LOOP_TRAFFIC 0x00000200 -#define SC_MULTILINK 0x00000400 -#define SC_MP_SHORTSEQ 0x00000800 -#define SC_COMP_RUN 0x00001000 -#define SC_DECOMP_RUN 0x00002000 -#define SC_MP_XSHORTSEQ 0x00004000 -#define SC_DEBUG 0x00010000 -#define SC_LOG_INPKT 0x00020000 -#define SC_LOG_OUTPKT 0x00040000 -#define SC_LOG_RAWIN 0x00080000 -#define SC_LOG_FLUSH 0x00100000 -#define SC_SYNC 0x00200000 -#define SC_MUST_COMP 0x00400000 -#define SC_MASK 0x0f600fff - -#define SC_XMIT_BUSY 0x10000000 -#define SC_RCV_ODDP 0x08000000 -#define SC_RCV_EVNP 0x04000000 -#define SC_RCV_B7_1 0x02000000 -#define SC_RCV_B7_0 0x01000000 -#define SC_DC_FERROR 0x00800000 -#define SC_DC_ERROR 0x00400000 - -struct npioctl { - int protocol; - enum NPmode mode; -}; - -struct ppp_option_data { - __u8 __user *ptr; - __u32 length; - int transmit; -}; - -struct ifpppstatsreq { - struct ifreq b; - struct ppp_stats stats; -}; - -struct ifpppcstatsreq { - struct ifreq b; - struct ppp_comp_stats stats; -}; - -#define ifr__name b.ifr_ifrn.ifrn_name -#define stats_ptr b.ifr_ifru.ifru_data - -#define PPPIOCGFLAGS _IOR('t', 90, int) -#define PPPIOCSFLAGS _IOW('t', 89, int) -#define PPPIOCGASYNCMAP _IOR('t', 88, int) -#define PPPIOCSASYNCMAP _IOW('t', 87, int) -#define PPPIOCGUNIT _IOR('t', 86, int) -#define PPPIOCGRASYNCMAP _IOR('t', 85, int) -#define PPPIOCSRASYNCMAP _IOW('t', 84, int) -#define PPPIOCGMRU _IOR('t', 83, int) -#define PPPIOCSMRU _IOW('t', 82, int) -#define PPPIOCSMAXCID _IOW('t', 81, int) -#define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm) -#define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm) -#define PPPIOCXFERUNIT _IO('t', 78) -#define PPPIOCSCOMPRESS _IOW('t', 77, struct ppp_option_data) -#define PPPIOCGNPMODE _IOWR('t', 76, struct npioctl) -#define PPPIOCSNPMODE _IOW('t', 75, struct npioctl) -#define PPPIOCSPASS _IOW('t', 71, struct sock_fprog) -#define PPPIOCSACTIVE _IOW('t', 70, struct sock_fprog) -#define PPPIOCGDEBUG _IOR('t', 65, int) -#define PPPIOCSDEBUG _IOW('t', 64, int) -#define PPPIOCGIDLE _IOR('t', 63, struct ppp_idle) -#define PPPIOCNEWUNIT _IOWR('t', 62, int) -#define PPPIOCATTACH _IOW('t', 61, int) -#define PPPIOCDETACH _IOW('t', 60, int) -#define PPPIOCSMRRU _IOW('t', 59, int) -#define PPPIOCCONNECT _IOW('t', 58, int) -#define PPPIOCDISCONN _IO('t', 57) -#define PPPIOCATTCHAN _IOW('t', 56, int) -#define PPPIOCGCHAN _IOR('t', 55, int) - -#define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0) -#define SIOCGPPPVER (SIOCDEVPRIVATE + 1) -#define SIOCGPPPCSTATS (SIOCDEVPRIVATE + 2) - -#ifndef ifr_mtu -#define ifr_mtu ifr_ifru.ifru_metric -#endif - -#endif diff --git a/libc/kernel/common/linux/if_tr.h b/libc/kernel/common/linux/if_tr.h deleted file mode 100644 index 7d6319a6c..000000000 --- a/libc/kernel/common/linux/if_tr.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_TR_H -#define _LINUX_IF_TR_H - -#include - -#define TR_ALEN 6 -#define TR_HLEN (sizeof(struct trh_hdr)+sizeof(struct trllc)) -#define AC 0x10 -#define LLC_FRAME 0x40 - -#define EXTENDED_SAP 0xAA -#define UI_CMD 0x03 - -struct trh_hdr { - __u8 ac; - __u8 fc; - __u8 daddr[TR_ALEN]; - __u8 saddr[TR_ALEN]; - __be16 rcf; - __be16 rseg[8]; -}; - -struct trllc { - __u8 dsap; - __u8 ssap; - __u8 llc; - __u8 protid[3]; - __be16 ethertype; -}; - -struct tr_statistics { - unsigned long rx_packets; - unsigned long tx_packets; - unsigned long rx_bytes; - unsigned long tx_bytes; - unsigned long rx_errors; - unsigned long tx_errors; - unsigned long rx_dropped; - unsigned long tx_dropped; - unsigned long multicast; - unsigned long transmit_collision; - - unsigned long line_errors; - unsigned long internal_errors; - unsigned long burst_errors; - unsigned long A_C_errors; - unsigned long abort_delimiters; - unsigned long lost_frames; - unsigned long recv_congest_count; - unsigned long frame_copied_errors; - unsigned long frequency_errors; - unsigned long token_errors; - unsigned long dummy1; -}; - -#define TR_RII 0x80 -#define TR_RCF_DIR_BIT 0x80 -#define TR_RCF_LEN_MASK 0x1f00 -#define TR_RCF_BROADCAST 0x8000 -#define TR_RCF_LIMITED_BROADCAST 0xC000 -#define TR_RCF_FRAME2K 0x20 -#define TR_RCF_BROADCAST_MASK 0xC000 -#define TR_MAXRIFLEN 18 - -#endif diff --git a/libc/kernel/common/linux/if_tun.h b/libc/kernel/common/linux/if_tun.h deleted file mode 100644 index c5db4e02f..000000000 --- a/libc/kernel/common/linux/if_tun.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __IF_TUN_H -#define __IF_TUN_H - -#define TUN_READQ_SIZE 500 - -#define TUN_TUN_DEV 0x0001 -#define TUN_TAP_DEV 0x0002 -#define TUN_TYPE_MASK 0x000f - -#define TUN_FASYNC 0x0010 -#define TUN_NOCHECKSUM 0x0020 -#define TUN_NO_PI 0x0040 -#define TUN_ONE_QUEUE 0x0080 -#define TUN_PERSIST 0x0100 - -#define TUNSETNOCSUM _IOW('T', 200, int) -#define TUNSETDEBUG _IOW('T', 201, int) -#define TUNSETIFF _IOW('T', 202, int) -#define TUNSETPERSIST _IOW('T', 203, int) -#define TUNSETOWNER _IOW('T', 204, int) -#define TUNSETLINK _IOW('T', 205, int) - -#define IFF_TUN 0x0001 -#define IFF_TAP 0x0002 -#define IFF_NO_PI 0x1000 -#define IFF_ONE_QUEUE 0x2000 - -struct tun_pi { - unsigned short flags; - unsigned short proto; -}; -#define TUN_PKT_STRIP 0x0001 - -#endif diff --git a/libc/kernel/common/linux/if_vlan.h b/libc/kernel/common/linux/if_vlan.h deleted file mode 100644 index d3d2df239..000000000 --- a/libc/kernel/common/linux/if_vlan.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IF_VLAN_H_ -#define _LINUX_IF_VLAN_H_ - -enum vlan_ioctl_cmds { - ADD_VLAN_CMD, - DEL_VLAN_CMD, - SET_VLAN_INGRESS_PRIORITY_CMD, - SET_VLAN_EGRESS_PRIORITY_CMD, - GET_VLAN_INGRESS_PRIORITY_CMD, - GET_VLAN_EGRESS_PRIORITY_CMD, - SET_VLAN_NAME_TYPE_CMD, - SET_VLAN_FLAG_CMD, - GET_VLAN_REALDEV_NAME_CMD, - GET_VLAN_VID_CMD -}; - -enum vlan_name_types { - VLAN_NAME_TYPE_PLUS_VID, - VLAN_NAME_TYPE_RAW_PLUS_VID, - VLAN_NAME_TYPE_PLUS_VID_NO_PAD, - VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, - VLAN_NAME_TYPE_HIGHEST -}; - -struct vlan_ioctl_args { - int cmd; - char device1[24]; - - union { - char device2[24]; - int VID; - unsigned int skb_priority; - unsigned int name_type; - unsigned int bind_type; - unsigned int flag; - } u; - - short vlan_qos; -}; - -#endif diff --git a/libc/kernel/common/linux/in.h b/libc/kernel/common/linux/in.h deleted file mode 100644 index 894e2da48..000000000 --- a/libc/kernel/common/linux/in.h +++ /dev/null @@ -1,211 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IN_H -#define _LINUX_IN_H - -#include -#include - -enum { - IPPROTO_IP = 0, - IPPROTO_ICMP = 1, - IPPROTO_IGMP = 2, - IPPROTO_IPIP = 4, - IPPROTO_TCP = 6, - IPPROTO_EGP = 8, - IPPROTO_PUP = 12, - IPPROTO_UDP = 17, - IPPROTO_IDP = 22, - IPPROTO_DCCP = 33, - IPPROTO_RSVP = 46, - IPPROTO_GRE = 47, - - IPPROTO_IPV6 = 41, - - IPPROTO_ESP = 50, - IPPROTO_AH = 51, - IPPROTO_PIM = 103, - - IPPROTO_COMP = 108, - IPPROTO_SCTP = 132, - - IPPROTO_RAW = 255, - IPPROTO_MAX -}; - -struct in_addr { - __u32 s_addr; -}; - -#define IP_TOS 1 -#define IP_TTL 2 -#define IP_HDRINCL 3 -#define IP_OPTIONS 4 -#define IP_ROUTER_ALERT 5 -#define IP_RECVOPTS 6 -#define IP_RETOPTS 7 -#define IP_PKTINFO 8 -#define IP_PKTOPTIONS 9 -#define IP_MTU_DISCOVER 10 -#define IP_RECVERR 11 -#define IP_RECVTTL 12 -#define IP_RECVTOS 13 -#define IP_MTU 14 -#define IP_FREEBIND 15 -#define IP_IPSEC_POLICY 16 -#define IP_XFRM_POLICY 17 -#define IP_PASSSEC 18 - -#define IP_RECVRETOPTS IP_RETOPTS - -#define IP_PMTUDISC_DONT 0 -#define IP_PMTUDISC_WANT 1 -#define IP_PMTUDISC_DO 2 - -#define IP_MULTICAST_IF 32 -#define IP_MULTICAST_TTL 33 -#define IP_MULTICAST_LOOP 34 -#define IP_ADD_MEMBERSHIP 35 -#define IP_DROP_MEMBERSHIP 36 -#define IP_UNBLOCK_SOURCE 37 -#define IP_BLOCK_SOURCE 38 -#define IP_ADD_SOURCE_MEMBERSHIP 39 -#define IP_DROP_SOURCE_MEMBERSHIP 40 -#define IP_MSFILTER 41 -#define MCAST_JOIN_GROUP 42 -#define MCAST_BLOCK_SOURCE 43 -#define MCAST_UNBLOCK_SOURCE 44 -#define MCAST_LEAVE_GROUP 45 -#define MCAST_JOIN_SOURCE_GROUP 46 -#define MCAST_LEAVE_SOURCE_GROUP 47 -#define MCAST_MSFILTER 48 - -#define MCAST_EXCLUDE 0 -#define MCAST_INCLUDE 1 - -#define IP_DEFAULT_MULTICAST_TTL 1 -#define IP_DEFAULT_MULTICAST_LOOP 1 - -struct ip_mreq -{ - struct in_addr imr_multiaddr; - struct in_addr imr_interface; -}; - -struct ip_mreqn -{ - struct in_addr imr_multiaddr; - struct in_addr imr_address; - int imr_ifindex; -}; - -struct ip_mreq_source { - __u32 imr_multiaddr; - __u32 imr_interface; - __u32 imr_sourceaddr; -}; - -struct ip_msfilter { - __u32 imsf_multiaddr; - __u32 imsf_interface; - __u32 imsf_fmode; - __u32 imsf_numsrc; - __u32 imsf_slist[1]; -}; - -#define IP_MSFILTER_SIZE(numsrc) (sizeof(struct ip_msfilter) - sizeof(__u32) + (numsrc) * sizeof(__u32)) - -struct group_req -{ - __u32 gr_interface; - struct __kernel_sockaddr_storage gr_group; -}; - -struct group_source_req -{ - __u32 gsr_interface; - struct __kernel_sockaddr_storage gsr_group; - struct __kernel_sockaddr_storage gsr_source; -}; - -struct group_filter -{ - __u32 gf_interface; - struct __kernel_sockaddr_storage gf_group; - __u32 gf_fmode; - __u32 gf_numsrc; - struct __kernel_sockaddr_storage gf_slist[1]; -}; - -#define GROUP_FILTER_SIZE(numsrc) (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) - -struct in_pktinfo -{ - int ipi_ifindex; - struct in_addr ipi_spec_dst; - struct in_addr ipi_addr; -}; - -#define __SOCK_SIZE__ 16 -struct sockaddr_in { - sa_family_t sin_family; - unsigned short int sin_port; - struct in_addr sin_addr; - - unsigned char __pad[__SOCK_SIZE__ - sizeof(short int) - - sizeof(unsigned short int) - sizeof(struct in_addr)]; -}; -#define sin_zero __pad - -#define IN_CLASSA(a) ((((long int) (a)) & 0x80000000) == 0) -#define IN_CLASSA_NET 0xff000000 -#define IN_CLASSA_NSHIFT 24 -#define IN_CLASSA_HOST (0xffffffff & ~IN_CLASSA_NET) -#define IN_CLASSA_MAX 128 - -#define IN_CLASSB(a) ((((long int) (a)) & 0xc0000000) == 0x80000000) -#define IN_CLASSB_NET 0xffff0000 -#define IN_CLASSB_NSHIFT 16 -#define IN_CLASSB_HOST (0xffffffff & ~IN_CLASSB_NET) -#define IN_CLASSB_MAX 65536 - -#define IN_CLASSC(a) ((((long int) (a)) & 0xe0000000) == 0xc0000000) -#define IN_CLASSC_NET 0xffffff00 -#define IN_CLASSC_NSHIFT 8 -#define IN_CLASSC_HOST (0xffffffff & ~IN_CLASSC_NET) - -#define IN_CLASSD(a) ((((long int) (a)) & 0xf0000000) == 0xe0000000) -#define IN_MULTICAST(a) IN_CLASSD(a) -#define IN_MULTICAST_NET 0xF0000000 - -#define IN_EXPERIMENTAL(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000) -#define IN_BADCLASS(a) IN_EXPERIMENTAL((a)) - -#define INADDR_ANY ((unsigned long int) 0x00000000) - -#define INADDR_BROADCAST ((unsigned long int) 0xffffffff) - -#define INADDR_NONE ((unsigned long int) 0xffffffff) - -#define IN_LOOPBACKNET 127 - -#define INADDR_LOOPBACK 0x7f000001 -#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000) - -#define INADDR_UNSPEC_GROUP 0xe0000000U -#define INADDR_ALLHOSTS_GROUP 0xe0000001U -#define INADDR_ALLRTRS_GROUP 0xe0000002U -#define INADDR_MAX_LOCAL_GROUP 0xe00000ffU - -#include - -#endif diff --git a/libc/kernel/common/linux/in6.h b/libc/kernel/common/linux/in6.h deleted file mode 100644 index ceaeb7da3..000000000 --- a/libc/kernel/common/linux/in6.h +++ /dev/null @@ -1,158 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IN6_H -#define _LINUX_IN6_H - -#include - -struct in6_addr -{ - union - { - __u8 u6_addr8[16]; - __u16 u6_addr16[8]; - __u32 u6_addr32[4]; - } in6_u; -#define s6_addr in6_u.u6_addr8 -#define s6_addr16 in6_u.u6_addr16 -#define s6_addr32 in6_u.u6_addr32 -}; - -#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } - -struct sockaddr_in6 { - unsigned short int sin6_family; - __u16 sin6_port; - __u32 sin6_flowinfo; - struct in6_addr sin6_addr; - __u32 sin6_scope_id; -}; - -struct ipv6_mreq { - - struct in6_addr ipv6mr_multiaddr; - - int ipv6mr_ifindex; -}; - -#define ipv6mr_acaddr ipv6mr_multiaddr - -struct in6_flowlabel_req -{ - struct in6_addr flr_dst; - __u32 flr_label; - __u8 flr_action; - __u8 flr_share; - __u16 flr_flags; - __u16 flr_expires; - __u16 flr_linger; - __u32 __flr_pad; - -}; - -#define IPV6_FL_A_GET 0 -#define IPV6_FL_A_PUT 1 -#define IPV6_FL_A_RENEW 2 - -#define IPV6_FL_F_CREATE 1 -#define IPV6_FL_F_EXCL 2 - -#define IPV6_FL_S_NONE 0 -#define IPV6_FL_S_EXCL 1 -#define IPV6_FL_S_PROCESS 2 -#define IPV6_FL_S_USER 3 -#define IPV6_FL_S_ANY 255 - -#define IPV6_FLOWINFO_FLOWLABEL 0x000fffff -#define IPV6_FLOWINFO_PRIORITY 0x0ff00000 - -#define IPV6_PRIORITY_UNCHARACTERIZED 0x0000 -#define IPV6_PRIORITY_FILLER 0x0100 -#define IPV6_PRIORITY_UNATTENDED 0x0200 -#define IPV6_PRIORITY_RESERVED1 0x0300 -#define IPV6_PRIORITY_BULK 0x0400 -#define IPV6_PRIORITY_RESERVED2 0x0500 -#define IPV6_PRIORITY_INTERACTIVE 0x0600 -#define IPV6_PRIORITY_CONTROL 0x0700 -#define IPV6_PRIORITY_8 0x0800 -#define IPV6_PRIORITY_9 0x0900 -#define IPV6_PRIORITY_10 0x0a00 -#define IPV6_PRIORITY_11 0x0b00 -#define IPV6_PRIORITY_12 0x0c00 -#define IPV6_PRIORITY_13 0x0d00 -#define IPV6_PRIORITY_14 0x0e00 -#define IPV6_PRIORITY_15 0x0f00 - -#define IPPROTO_HOPOPTS 0 -#define IPPROTO_ROUTING 43 -#define IPPROTO_FRAGMENT 44 -#define IPPROTO_ICMPV6 58 -#define IPPROTO_NONE 59 -#define IPPROTO_DSTOPTS 60 - -#define IPV6_TLV_PAD0 0 -#define IPV6_TLV_PADN 1 -#define IPV6_TLV_ROUTERALERT 5 -#define IPV6_TLV_JUMBO 194 - -#define IPV6_ADDRFORM 1 -#define IPV6_2292PKTINFO 2 -#define IPV6_2292HOPOPTS 3 -#define IPV6_2292DSTOPTS 4 -#define IPV6_2292RTHDR 5 -#define IPV6_2292PKTOPTIONS 6 -#define IPV6_CHECKSUM 7 -#define IPV6_2292HOPLIMIT 8 -#define IPV6_NEXTHOP 9 -#define IPV6_AUTHHDR 10 -#define IPV6_FLOWINFO 11 - -#define IPV6_UNICAST_HOPS 16 -#define IPV6_MULTICAST_IF 17 -#define IPV6_MULTICAST_HOPS 18 -#define IPV6_MULTICAST_LOOP 19 -#define IPV6_ADD_MEMBERSHIP 20 -#define IPV6_DROP_MEMBERSHIP 21 -#define IPV6_ROUTER_ALERT 22 -#define IPV6_MTU_DISCOVER 23 -#define IPV6_MTU 24 -#define IPV6_RECVERR 25 -#define IPV6_V6ONLY 26 -#define IPV6_JOIN_ANYCAST 27 -#define IPV6_LEAVE_ANYCAST 28 - -#define IPV6_PMTUDISC_DONT 0 -#define IPV6_PMTUDISC_WANT 1 -#define IPV6_PMTUDISC_DO 2 - -#define IPV6_FLOWLABEL_MGR 32 -#define IPV6_FLOWINFO_SEND 33 - -#define IPV6_IPSEC_POLICY 34 -#define IPV6_XFRM_POLICY 35 - -#define IPV6_RECVPKTINFO 49 -#define IPV6_PKTINFO 50 -#define IPV6_RECVHOPLIMIT 51 -#define IPV6_HOPLIMIT 52 -#define IPV6_RECVHOPOPTS 53 -#define IPV6_HOPOPTS 54 -#define IPV6_RTHDRDSTOPTS 55 -#define IPV6_RECVRTHDR 56 -#define IPV6_RTHDR 57 -#define IPV6_RECVDSTOPTS 58 -#define IPV6_DSTOPTS 59 - -#define IPV6_RECVTCLASS 66 -#define IPV6_TCLASS 67 - -#endif diff --git a/libc/kernel/common/linux/init.h b/libc/kernel/common/linux/init.h deleted file mode 100644 index 846c4eb5e..000000000 --- a/libc/kernel/common/linux/init.h +++ /dev/null @@ -1,137 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_INIT_H -#define _LINUX_INIT_H - -#include - -#define __init __attribute__ ((__section__ (".init.text"))) -#define __initdata __attribute__ ((__section__ (".init.data"))) -#define __exitdata __attribute__ ((__section__(".exit.data"))) -#define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit"))) - -#ifdef MODULE -#define __exit __attribute__ ((__section__(".exit.text"))) -#else -#define __exit __attribute_used__ __attribute__ ((__section__(".exit.text"))) -#endif - -#define __INIT .section ".init.text","ax" -#define __FINIT .previous -#define __INITDATA .section ".init.data","aw" - -#ifndef __ASSEMBLY__ - -typedef int (*initcall_t)(void); -typedef void (*exitcall_t)(void); - -#endif - -#ifndef MODULE - -#ifndef __ASSEMBLY__ - -#define __define_initcall(level,fn) static initcall_t __initcall_##fn __attribute_used__ __attribute__((__section__(".initcall" level ".init"))) = fn - -#define core_initcall(fn) __define_initcall("1",fn) -#define postcore_initcall(fn) __define_initcall("2",fn) -#define arch_initcall(fn) __define_initcall("3",fn) -#define subsys_initcall(fn) __define_initcall("4",fn) -#define fs_initcall(fn) __define_initcall("5",fn) -#define device_initcall(fn) __define_initcall("6",fn) -#define late_initcall(fn) __define_initcall("7",fn) - -#define __initcall(fn) device_initcall(fn) - -#define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn - -#define console_initcall(fn) static initcall_t __initcall_##fn __attribute_used__ __attribute__((__section__(".con_initcall.init")))=fn - -#define security_initcall(fn) static initcall_t __initcall_##fn __attribute_used__ __attribute__((__section__(".security_initcall.init"))) = fn - -struct obs_kernel_param { - const char *str; - int (*setup_func)(char *); - int early; -}; - -#define __setup_param(str, unique_id, fn, early) static char __setup_str_##unique_id[] __initdata = str; static struct obs_kernel_param __setup_##unique_id __attribute_used__ __attribute__((__section__(".init.setup"))) __attribute__((aligned((sizeof(long))))) = { __setup_str_##unique_id, fn, early } - -#define __setup_null_param(str, unique_id) __setup_param(str, unique_id, NULL, 0) - -#define __setup(str, fn) __setup_param(str, fn, fn, 0) - -#define __obsolete_setup(str) __setup_null_param(str, __LINE__) - -#define early_param(str, fn) __setup_param(str, fn, fn, 1) - -#endif - -#define module_init(x) __initcall(x); - -#define module_exit(x) __exitcall(x); - -#else - -#define core_initcall(fn) module_init(fn) -#define postcore_initcall(fn) module_init(fn) -#define arch_initcall(fn) module_init(fn) -#define subsys_initcall(fn) module_init(fn) -#define fs_initcall(fn) module_init(fn) -#define device_initcall(fn) module_init(fn) -#define late_initcall(fn) module_init(fn) - -#define security_initcall(fn) module_init(fn) - -#define module_init(initfn) static inline initcall_t __inittest(void) { return initfn; } int init_module(void) __attribute__((alias(#initfn))); - -#define module_exit(exitfn) static inline exitcall_t __exittest(void) { return exitfn; } void cleanup_module(void) __attribute__((alias(#exitfn))); - -#define __setup_param(str, unique_id, fn) -#define __setup_null_param(str, unique_id) -#define __setup(str, func) -#define __obsolete_setup(str) -#endif - -#define __nosavedata __attribute__ ((__section__ (".data.nosave"))) - -#define __init_or_module __init -#define __initdata_or_module __initdata - -#define __devinit __init -#define __devinitdata __initdata -#define __devexit __exit -#define __devexitdata __exitdata - -#define __cpuinit __init -#define __cpuinitdata __initdata -#define __cpuexit __exit -#define __cpuexitdata __exitdata - -#define __meminit __init -#define __meminitdata __initdata -#define __memexit __exit -#define __memexitdata __exitdata - -#ifdef MODULE -#define __devexit_p(x) x -#else -#define __devexit_p(x) NULL -#endif - -#ifdef MODULE -#define __exit_p(x) x -#else -#define __exit_p(x) NULL -#endif - -#endif diff --git a/libc/kernel/common/linux/inotify.h b/libc/kernel/common/linux/inotify.h deleted file mode 100644 index db534173d..000000000 --- a/libc/kernel/common/linux/inotify.h +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_INOTIFY_H -#define _LINUX_INOTIFY_H - -#include - -struct inotify_event { - __s32 wd; - __u32 mask; - __u32 cookie; - __u32 len; - char name[0]; -}; - -#define IN_ACCESS 0x00000001 -#define IN_MODIFY 0x00000002 -#define IN_ATTRIB 0x00000004 -#define IN_CLOSE_WRITE 0x00000008 -#define IN_CLOSE_NOWRITE 0x00000010 -#define IN_OPEN 0x00000020 -#define IN_MOVED_FROM 0x00000040 -#define IN_MOVED_TO 0x00000080 -#define IN_CREATE 0x00000100 -#define IN_DELETE 0x00000200 -#define IN_DELETE_SELF 0x00000400 -#define IN_MOVE_SELF 0x00000800 - -#define IN_UNMOUNT 0x00002000 -#define IN_Q_OVERFLOW 0x00004000 -#define IN_IGNORED 0x00008000 - -#define IN_CLOSE (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) -#define IN_MOVE (IN_MOVED_FROM | IN_MOVED_TO) - -#define IN_ONLYDIR 0x01000000 -#define IN_DONT_FOLLOW 0x02000000 -#define IN_MASK_ADD 0x20000000 -#define IN_ISDIR 0x40000000 -#define IN_ONESHOT 0x80000000 - -#define IN_ALL_EVENTS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | IN_MOVE_SELF) - -#endif diff --git a/libc/kernel/common/linux/input.h b/libc/kernel/common/linux/input.h deleted file mode 100644 index 96dae1450..000000000 --- a/libc/kernel/common/linux/input.h +++ /dev/null @@ -1,715 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _INPUT_H -#define _INPUT_H - -#include -#include -#include -#include - -struct input_event { - struct timeval time; - __u16 type; - __u16 code; - __s32 value; -}; - -#define EV_VERSION 0x010000 - -struct input_id { - __u16 bustype; - __u16 vendor; - __u16 product; - __u16 version; -}; - -struct input_absinfo { - __s32 value; - __s32 minimum; - __s32 maximum; - __s32 fuzz; - __s32 flat; -}; - -#define EVIOCGVERSION _IOR('E', 0x01, int) -#define EVIOCGID _IOR('E', 0x02, struct input_id) -#define EVIOCGREP _IOR('E', 0x03, int[2]) -#define EVIOCSREP _IOW('E', 0x03, int[2]) -#define EVIOCGKEYCODE _IOR('E', 0x04, int[2]) -#define EVIOCSKEYCODE _IOW('E', 0x04, int[2]) - -#define EVIOCGNAME(len) _IOC(_IOC_READ, 'E', 0x06, len) -#define EVIOCGPHYS(len) _IOC(_IOC_READ, 'E', 0x07, len) -#define EVIOCGUNIQ(len) _IOC(_IOC_READ, 'E', 0x08, len) - -#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len) -#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len) -#define EVIOCGSND(len) _IOC(_IOC_READ, 'E', 0x1a, len) -#define EVIOCGSW(len) _IOC(_IOC_READ, 'E', 0x1b, len) - -#define EVIOCGBIT(ev,len) _IOC(_IOC_READ, 'E', 0x20 + ev, len) -#define EVIOCGABS(abs) _IOR('E', 0x40 + abs, struct input_absinfo) -#define EVIOCSABS(abs) _IOW('E', 0xc0 + abs, struct input_absinfo) - -#define EVIOCSFF _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect)) -#define EVIOCRMFF _IOW('E', 0x81, int) -#define EVIOCGEFFECTS _IOR('E', 0x84, int) - -#define EVIOCGRAB _IOW('E', 0x90, int) - -#define EV_SYN 0x00 -#define EV_KEY 0x01 -#define EV_REL 0x02 -#define EV_ABS 0x03 -#define EV_MSC 0x04 -#define EV_SW 0x05 -#define EV_LED 0x11 -#define EV_SND 0x12 -#define EV_REP 0x14 -#define EV_FF 0x15 -#define EV_PWR 0x16 -#define EV_FF_STATUS 0x17 -#define EV_MAX 0x1f - -#define SYN_REPORT 0 -#define SYN_CONFIG 1 - -#define KEY_RESERVED 0 -#define KEY_ESC 1 -#define KEY_1 2 -#define KEY_2 3 -#define KEY_3 4 -#define KEY_4 5 -#define KEY_5 6 -#define KEY_6 7 -#define KEY_7 8 -#define KEY_8 9 -#define KEY_9 10 -#define KEY_0 11 -#define KEY_MINUS 12 -#define KEY_EQUAL 13 -#define KEY_BACKSPACE 14 -#define KEY_TAB 15 -#define KEY_Q 16 -#define KEY_W 17 -#define KEY_E 18 -#define KEY_R 19 -#define KEY_T 20 -#define KEY_Y 21 -#define KEY_U 22 -#define KEY_I 23 -#define KEY_O 24 -#define KEY_P 25 -#define KEY_LEFTBRACE 26 -#define KEY_RIGHTBRACE 27 -#define KEY_ENTER 28 -#define KEY_LEFTCTRL 29 -#define KEY_A 30 -#define KEY_S 31 -#define KEY_D 32 -#define KEY_F 33 -#define KEY_G 34 -#define KEY_H 35 -#define KEY_J 36 -#define KEY_K 37 -#define KEY_L 38 -#define KEY_SEMICOLON 39 -#define KEY_APOSTROPHE 40 -#define KEY_GRAVE 41 -#define KEY_LEFTSHIFT 42 -#define KEY_BACKSLASH 43 -#define KEY_Z 44 -#define KEY_X 45 -#define KEY_C 46 -#define KEY_V 47 -#define KEY_B 48 -#define KEY_N 49 -#define KEY_M 50 -#define KEY_COMMA 51 -#define KEY_DOT 52 -#define KEY_SLASH 53 -#define KEY_RIGHTSHIFT 54 -#define KEY_KPASTERISK 55 -#define KEY_LEFTALT 56 -#define KEY_SPACE 57 -#define KEY_CAPSLOCK 58 -#define KEY_F1 59 -#define KEY_F2 60 -#define KEY_F3 61 -#define KEY_F4 62 -#define KEY_F5 63 -#define KEY_F6 64 -#define KEY_F7 65 -#define KEY_F8 66 -#define KEY_F9 67 -#define KEY_F10 68 -#define KEY_NUMLOCK 69 -#define KEY_SCROLLLOCK 70 -#define KEY_KP7 71 -#define KEY_KP8 72 -#define KEY_KP9 73 -#define KEY_KPMINUS 74 -#define KEY_KP4 75 -#define KEY_KP5 76 -#define KEY_KP6 77 -#define KEY_KPPLUS 78 -#define KEY_KP1 79 -#define KEY_KP2 80 -#define KEY_KP3 81 -#define KEY_KP0 82 -#define KEY_KPDOT 83 - -#define KEY_ZENKAKUHANKAKU 85 -#define KEY_102ND 86 -#define KEY_F11 87 -#define KEY_F12 88 -#define KEY_RO 89 -#define KEY_KATAKANA 90 -#define KEY_HIRAGANA 91 -#define KEY_HENKAN 92 -#define KEY_KATAKANAHIRAGANA 93 -#define KEY_MUHENKAN 94 -#define KEY_KPJPCOMMA 95 -#define KEY_KPENTER 96 -#define KEY_RIGHTCTRL 97 -#define KEY_KPSLASH 98 -#define KEY_SYSRQ 99 -#define KEY_RIGHTALT 100 -#define KEY_LINEFEED 101 -#define KEY_HOME 102 -#define KEY_UP 103 -#define KEY_PAGEUP 104 -#define KEY_LEFT 105 -#define KEY_RIGHT 106 -#define KEY_END 107 -#define KEY_DOWN 108 -#define KEY_PAGEDOWN 109 -#define KEY_INSERT 110 -#define KEY_DELETE 111 -#define KEY_MACRO 112 -#define KEY_MUTE 113 -#define KEY_VOLUMEDOWN 114 -#define KEY_VOLUMEUP 115 -#define KEY_POWER 116 -#define KEY_KPEQUAL 117 -#define KEY_KPPLUSMINUS 118 -#define KEY_PAUSE 119 - -#define KEY_KPCOMMA 121 -#define KEY_HANGEUL 122 -#define KEY_HANGUEL KEY_HANGEUL -#define KEY_HANJA 123 -#define KEY_YEN 124 -#define KEY_LEFTMETA 125 -#define KEY_RIGHTMETA 126 -#define KEY_COMPOSE 127 - -#define KEY_STOP 128 -#define KEY_AGAIN 129 -#define KEY_PROPS 130 -#define KEY_UNDO 131 -#define KEY_FRONT 132 -#define KEY_COPY 133 -#define KEY_OPEN 134 -#define KEY_PASTE 135 -#define KEY_FIND 136 -#define KEY_CUT 137 -#define KEY_HELP 138 -#define KEY_MENU 139 -#define KEY_CALC 140 -#define KEY_SETUP 141 -#define KEY_SLEEP 142 -#define KEY_WAKEUP 143 -#define KEY_FILE 144 -#define KEY_SENDFILE 145 -#define KEY_DELETEFILE 146 -#define KEY_XFER 147 -#define KEY_PROG1 148 -#define KEY_PROG2 149 -#define KEY_WWW 150 -#define KEY_MSDOS 151 -#define KEY_COFFEE 152 -#define KEY_DIRECTION 153 -#define KEY_CYCLEWINDOWS 154 -#define KEY_MAIL 155 -#define KEY_BOOKMARKS 156 -#define KEY_COMPUTER 157 -#define KEY_BACK 158 -#define KEY_FORWARD 159 -#define KEY_CLOSECD 160 -#define KEY_EJECTCD 161 -#define KEY_EJECTCLOSECD 162 -#define KEY_NEXTSONG 163 -#define KEY_PLAYPAUSE 164 -#define KEY_PREVIOUSSONG 165 -#define KEY_STOPCD 166 -#define KEY_RECORD 167 -#define KEY_REWIND 168 -#define KEY_PHONE 169 -#define KEY_ISO 170 -#define KEY_CONFIG 171 -#define KEY_HOMEPAGE 172 -#define KEY_REFRESH 173 -#define KEY_EXIT 174 -#define KEY_MOVE 175 -#define KEY_EDIT 176 -#define KEY_SCROLLUP 177 -#define KEY_SCROLLDOWN 178 -#define KEY_KPLEFTPAREN 179 -#define KEY_KPRIGHTPAREN 180 -#define KEY_NEW 181 -#define KEY_REDO 182 - -#define KEY_F13 183 -#define KEY_F14 184 -#define KEY_F15 185 -#define KEY_F16 186 -#define KEY_F17 187 -#define KEY_F18 188 -#define KEY_F19 189 -#define KEY_F20 190 -#define KEY_F21 191 -#define KEY_F22 192 -#define KEY_F23 193 -#define KEY_F24 194 - -#define KEY_PLAYCD 200 -#define KEY_PAUSECD 201 -#define KEY_PROG3 202 -#define KEY_PROG4 203 -#define KEY_SUSPEND 205 -#define KEY_CLOSE 206 -#define KEY_PLAY 207 -#define KEY_FASTFORWARD 208 -#define KEY_BASSBOOST 209 -#define KEY_PRINT 210 -#define KEY_HP 211 -#define KEY_CAMERA 212 -#define KEY_SOUND 213 -#define KEY_QUESTION 214 -#define KEY_EMAIL 215 -#define KEY_CHAT 216 -#define KEY_SEARCH 217 -#define KEY_CONNECT 218 -#define KEY_FINANCE 219 -#define KEY_SPORT 220 -#define KEY_SHOP 221 -#define KEY_ALTERASE 222 -#define KEY_CANCEL 223 -#define KEY_BRIGHTNESSDOWN 224 -#define KEY_BRIGHTNESSUP 225 -#define KEY_MEDIA 226 - -#define KEY_STAR 227 -#define KEY_SHARP 228 -#define KEY_SOFT1 229 -#define KEY_SOFT2 230 -#define KEY_SEND 231 -#define KEY_CENTER 232 -#define KEY_HEADSETHOOK 233 -#define KEY_0_5 234 -#define KEY_2_5 235 - -#define KEY_SWITCHVIDEOMODE 236 -#define KEY_KBDILLUMTOGGLE 237 -#define KEY_KBDILLUMDOWN 238 -#define KEY_KBDILLUMUP 239 - -#define KEY_SEND 231 -#define KEY_REPLY 232 -#define KEY_FORWARDMAIL 233 -#define KEY_SAVE 234 -#define KEY_DOCUMENTS 235 - -#define KEY_BATTERY 236 - -#define KEY_UNKNOWN 240 - -#define BTN_MISC 0x100 -#define BTN_0 0x100 -#define BTN_1 0x101 -#define BTN_2 0x102 -#define BTN_3 0x103 -#define BTN_4 0x104 -#define BTN_5 0x105 -#define BTN_6 0x106 -#define BTN_7 0x107 -#define BTN_8 0x108 -#define BTN_9 0x109 - -#define BTN_MOUSE 0x110 -#define BTN_LEFT 0x110 -#define BTN_RIGHT 0x111 -#define BTN_MIDDLE 0x112 -#define BTN_SIDE 0x113 -#define BTN_EXTRA 0x114 -#define BTN_FORWARD 0x115 -#define BTN_BACK 0x116 -#define BTN_TASK 0x117 - -#define BTN_JOYSTICK 0x120 -#define BTN_TRIGGER 0x120 -#define BTN_THUMB 0x121 -#define BTN_THUMB2 0x122 -#define BTN_TOP 0x123 -#define BTN_TOP2 0x124 -#define BTN_PINKIE 0x125 -#define BTN_BASE 0x126 -#define BTN_BASE2 0x127 -#define BTN_BASE3 0x128 -#define BTN_BASE4 0x129 -#define BTN_BASE5 0x12a -#define BTN_BASE6 0x12b -#define BTN_DEAD 0x12f - -#define BTN_GAMEPAD 0x130 -#define BTN_A 0x130 -#define BTN_B 0x131 -#define BTN_C 0x132 -#define BTN_X 0x133 -#define BTN_Y 0x134 -#define BTN_Z 0x135 -#define BTN_TL 0x136 -#define BTN_TR 0x137 -#define BTN_TL2 0x138 -#define BTN_TR2 0x139 -#define BTN_SELECT 0x13a -#define BTN_START 0x13b -#define BTN_MODE 0x13c -#define BTN_THUMBL 0x13d -#define BTN_THUMBR 0x13e - -#define BTN_DIGI 0x140 -#define BTN_TOOL_PEN 0x140 -#define BTN_TOOL_RUBBER 0x141 -#define BTN_TOOL_BRUSH 0x142 -#define BTN_TOOL_PENCIL 0x143 -#define BTN_TOOL_AIRBRUSH 0x144 -#define BTN_TOOL_FINGER 0x145 -#define BTN_TOOL_MOUSE 0x146 -#define BTN_TOOL_LENS 0x147 -#define BTN_TOUCH 0x14a -#define BTN_STYLUS 0x14b -#define BTN_STYLUS2 0x14c -#define BTN_TOOL_DOUBLETAP 0x14d -#define BTN_TOOL_TRIPLETAP 0x14e - -#define BTN_WHEEL 0x150 -#define BTN_GEAR_DOWN 0x150 -#define BTN_GEAR_UP 0x151 - -#define KEY_OK 0x160 -#define KEY_SELECT 0x161 -#define KEY_GOTO 0x162 -#define KEY_CLEAR 0x163 -#define KEY_POWER2 0x164 -#define KEY_OPTION 0x165 -#define KEY_INFO 0x166 -#define KEY_TIME 0x167 -#define KEY_VENDOR 0x168 -#define KEY_ARCHIVE 0x169 -#define KEY_PROGRAM 0x16a -#define KEY_CHANNEL 0x16b -#define KEY_FAVORITES 0x16c -#define KEY_EPG 0x16d -#define KEY_PVR 0x16e -#define KEY_MHP 0x16f -#define KEY_LANGUAGE 0x170 -#define KEY_TITLE 0x171 -#define KEY_SUBTITLE 0x172 -#define KEY_ANGLE 0x173 -#define KEY_ZOOM 0x174 -#define KEY_MODE 0x175 -#define KEY_KEYBOARD 0x176 -#define KEY_SCREEN 0x177 -#define KEY_PC 0x178 -#define KEY_TV 0x179 -#define KEY_TV2 0x17a -#define KEY_VCR 0x17b -#define KEY_VCR2 0x17c -#define KEY_SAT 0x17d -#define KEY_SAT2 0x17e -#define KEY_CD 0x17f -#define KEY_TAPE 0x180 -#define KEY_RADIO 0x181 -#define KEY_TUNER 0x182 -#define KEY_PLAYER 0x183 -#define KEY_TEXT 0x184 -#define KEY_DVD 0x185 -#define KEY_AUX 0x186 -#define KEY_MP3 0x187 -#define KEY_AUDIO 0x188 -#define KEY_VIDEO 0x189 -#define KEY_DIRECTORY 0x18a -#define KEY_LIST 0x18b -#define KEY_MEMO 0x18c -#define KEY_CALENDAR 0x18d -#define KEY_RED 0x18e -#define KEY_GREEN 0x18f -#define KEY_YELLOW 0x190 -#define KEY_BLUE 0x191 -#define KEY_CHANNELUP 0x192 -#define KEY_CHANNELDOWN 0x193 -#define KEY_FIRST 0x194 -#define KEY_LAST 0x195 -#define KEY_AB 0x196 -#define KEY_NEXT 0x197 -#define KEY_RESTART 0x198 -#define KEY_SLOW 0x199 -#define KEY_SHUFFLE 0x19a -#define KEY_BREAK 0x19b -#define KEY_PREVIOUS 0x19c -#define KEY_DIGITS 0x19d -#define KEY_TEEN 0x19e -#define KEY_TWEN 0x19f - -#define KEY_DEL_EOL 0x1c0 -#define KEY_DEL_EOS 0x1c1 -#define KEY_INS_LINE 0x1c2 -#define KEY_DEL_LINE 0x1c3 - -#define KEY_FN 0x1d0 -#define KEY_FN_ESC 0x1d1 -#define KEY_FN_F1 0x1d2 -#define KEY_FN_F2 0x1d3 -#define KEY_FN_F3 0x1d4 -#define KEY_FN_F4 0x1d5 -#define KEY_FN_F5 0x1d6 -#define KEY_FN_F6 0x1d7 -#define KEY_FN_F7 0x1d8 -#define KEY_FN_F8 0x1d9 -#define KEY_FN_F9 0x1da -#define KEY_FN_F10 0x1db -#define KEY_FN_F11 0x1dc -#define KEY_FN_F12 0x1dd -#define KEY_FN_1 0x1de -#define KEY_FN_2 0x1df -#define KEY_FN_D 0x1e0 -#define KEY_FN_E 0x1e1 -#define KEY_FN_F 0x1e2 -#define KEY_FN_S 0x1e3 -#define KEY_FN_B 0x1e4 - -#define KEY_BRL_DOT1 0x1f1 -#define KEY_BRL_DOT2 0x1f2 -#define KEY_BRL_DOT3 0x1f3 -#define KEY_BRL_DOT4 0x1f4 -#define KEY_BRL_DOT5 0x1f5 -#define KEY_BRL_DOT6 0x1f6 -#define KEY_BRL_DOT7 0x1f7 -#define KEY_BRL_DOT8 0x1f8 - -#define KEY_MIN_INTERESTING KEY_MUTE -#define KEY_MAX 0x1ff - -#define REL_X 0x00 -#define REL_Y 0x01 -#define REL_Z 0x02 -#define REL_RX 0x03 -#define REL_RY 0x04 -#define REL_RZ 0x05 -#define REL_HWHEEL 0x06 -#define REL_DIAL 0x07 -#define REL_WHEEL 0x08 -#define REL_MISC 0x09 -#define REL_MAX 0x0f - -#define ABS_X 0x00 -#define ABS_Y 0x01 -#define ABS_Z 0x02 -#define ABS_RX 0x03 -#define ABS_RY 0x04 -#define ABS_RZ 0x05 -#define ABS_THROTTLE 0x06 -#define ABS_RUDDER 0x07 -#define ABS_WHEEL 0x08 -#define ABS_GAS 0x09 -#define ABS_BRAKE 0x0a -#define ABS_HAT0X 0x10 -#define ABS_HAT0Y 0x11 -#define ABS_HAT1X 0x12 -#define ABS_HAT1Y 0x13 -#define ABS_HAT2X 0x14 -#define ABS_HAT2Y 0x15 -#define ABS_HAT3X 0x16 -#define ABS_HAT3Y 0x17 -#define ABS_PRESSURE 0x18 -#define ABS_DISTANCE 0x19 -#define ABS_TILT_X 0x1a -#define ABS_TILT_Y 0x1b -#define ABS_TOOL_WIDTH 0x1c -#define ABS_VOLUME 0x20 -#define ABS_MISC 0x28 -#define ABS_MAX 0x3f - -#define SW_LID 0x00 -#define SW_TABLET_MODE 0x01 -#define SW_HEADPHONE_INSERT 0x02 -#define SW_MAX 0x0f - -#define MSC_SERIAL 0x00 -#define MSC_PULSELED 0x01 -#define MSC_GESTURE 0x02 -#define MSC_RAW 0x03 -#define MSC_SCAN 0x04 -#define MSC_MAX 0x07 - -#define LED_NUML 0x00 -#define LED_CAPSL 0x01 -#define LED_SCROLLL 0x02 -#define LED_COMPOSE 0x03 -#define LED_KANA 0x04 -#define LED_SLEEP 0x05 -#define LED_SUSPEND 0x06 -#define LED_MUTE 0x07 -#define LED_MISC 0x08 -#define LED_MAIL 0x09 -#define LED_CHARGING 0x0a -#define LED_MAX 0x0f - -#define REP_DELAY 0x00 -#define REP_PERIOD 0x01 -#define REP_MAX 0x01 - -#define SND_CLICK 0x00 -#define SND_BELL 0x01 -#define SND_TONE 0x02 -#define SND_MAX 0x07 - -#define ID_BUS 0 -#define ID_VENDOR 1 -#define ID_PRODUCT 2 -#define ID_VERSION 3 - -#define BUS_PCI 0x01 -#define BUS_ISAPNP 0x02 -#define BUS_USB 0x03 -#define BUS_HIL 0x04 -#define BUS_BLUETOOTH 0x05 - -#define BUS_ISA 0x10 -#define BUS_I8042 0x11 -#define BUS_XTKBD 0x12 -#define BUS_RS232 0x13 -#define BUS_GAMEPORT 0x14 -#define BUS_PARPORT 0x15 -#define BUS_AMIGA 0x16 -#define BUS_ADB 0x17 -#define BUS_I2C 0x18 -#define BUS_HOST 0x19 -#define BUS_GSC 0x1A - -#define FF_STATUS_STOPPED 0x00 -#define FF_STATUS_PLAYING 0x01 -#define FF_STATUS_MAX 0x01 - -struct ff_replay { - __u16 length; - __u16 delay; -}; - -struct ff_trigger { - __u16 button; - __u16 interval; -}; - -struct ff_envelope { - __u16 attack_length; - __u16 attack_level; - __u16 fade_length; - __u16 fade_level; -}; - -struct ff_constant_effect { - __s16 level; - struct ff_envelope envelope; -}; - -struct ff_ramp_effect { - __s16 start_level; - __s16 end_level; - struct ff_envelope envelope; -}; - -struct ff_condition_effect { - __u16 right_saturation; - __u16 left_saturation; - - __s16 right_coeff; - __s16 left_coeff; - - __u16 deadband; - __s16 center; - -}; - -struct ff_periodic_effect { - __u16 waveform; - __u16 period; - __s16 magnitude; - __s16 offset; - __u16 phase; - - struct ff_envelope envelope; - - __u32 custom_len; - __s16 *custom_data; - -}; - -struct ff_rumble_effect { - __u16 strong_magnitude; - __u16 weak_magnitude; -}; - -struct ff_effect { - __u16 type; - - __s16 id; - - __u16 direction; - - struct ff_trigger trigger; - struct ff_replay replay; - - union { - struct ff_constant_effect constant; - struct ff_ramp_effect ramp; - struct ff_periodic_effect periodic; - struct ff_condition_effect condition[2]; - struct ff_rumble_effect rumble; - } u; -}; - -#define FF_RUMBLE 0x50 -#define FF_PERIODIC 0x51 -#define FF_CONSTANT 0x52 -#define FF_SPRING 0x53 -#define FF_FRICTION 0x54 -#define FF_DAMPER 0x55 -#define FF_INERTIA 0x56 -#define FF_RAMP 0x57 - -#define FF_SQUARE 0x58 -#define FF_TRIANGLE 0x59 -#define FF_SINE 0x5a -#define FF_SAW_UP 0x5b -#define FF_SAW_DOWN 0x5c -#define FF_CUSTOM 0x5d - -#define FF_GAIN 0x60 -#define FF_AUTOCENTER 0x61 - -#define FF_MAX 0x7f - -#endif diff --git a/libc/kernel/common/linux/interrupt.h b/libc/kernel/common/linux/interrupt.h deleted file mode 100644 index f48592fcb..000000000 --- a/libc/kernel/common/linux/interrupt.h +++ /dev/null @@ -1,121 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_INTERRUPT_H -#define _LINUX_INTERRUPT_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define IRQF_TRIGGER_NONE 0x00000000 -#define IRQF_TRIGGER_RISING 0x00000001 -#define IRQF_TRIGGER_FALLING 0x00000002 -#define IRQF_TRIGGER_HIGH 0x00000004 -#define IRQF_TRIGGER_LOW 0x00000008 -#define IRQF_TRIGGER_MASK (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING) -#define IRQF_TRIGGER_PROBE 0x00000010 - -#define IRQF_DISABLED 0x00000020 -#define IRQF_SAMPLE_RANDOM 0x00000040 -#define IRQF_SHARED 0x00000080 -#define IRQF_PROBE_SHARED 0x00000100 -#define IRQF_TIMER 0x00000200 -#define IRQF_PERCPU 0x00000400 - -#define SA_INTERRUPT IRQF_DISABLED -#define SA_SAMPLE_RANDOM IRQF_SAMPLE_RANDOM -#define SA_SHIRQ IRQF_SHARED -#define SA_PROBEIRQ IRQF_PROBE_SHARED -#define SA_PERCPU IRQF_PERCPU - -#define SA_TRIGGER_LOW IRQF_TRIGGER_LOW -#define SA_TRIGGER_HIGH IRQF_TRIGGER_HIGH -#define SA_TRIGGER_FALLING IRQF_TRIGGER_FALLING -#define SA_TRIGGER_RISING IRQF_TRIGGER_RISING -#define SA_TRIGGER_MASK IRQF_TRIGGER_MASK - -struct irqaction { - irqreturn_t (*handler)(int, void *, struct pt_regs *); - unsigned long flags; - cpumask_t mask; - const char *name; - void *dev_id; - struct irqaction *next; - int irq; - struct proc_dir_entry *dir; -}; - -#define local_irq_enable_in_hardirq() local_irq_enable() - -#define disable_irq_nosync_lockdep(irq) disable_irq_nosync(irq) -#define disable_irq_lockdep(irq) disable_irq(irq) -#define enable_irq_lockdep(irq) enable_irq(irq) - -#ifndef __ARCH_SET_SOFTIRQ_PENDING -#define set_softirq_pending(x) (local_softirq_pending() = (x)) -#define or_softirq_pending(x) (local_softirq_pending() |= (x)) -#endif - -#define save_flags(x) save_flags(&x) -#define save_and_cli(x) save_and_cli(&x) - -enum -{ - HI_SOFTIRQ=0, - TIMER_SOFTIRQ, - NET_TX_SOFTIRQ, - NET_RX_SOFTIRQ, - BLOCK_SOFTIRQ, - TASKLET_SOFTIRQ -}; - -struct softirq_action -{ - void (*action)(struct softirq_action *); - void *data; -}; - -#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) - -struct tasklet_struct -{ - struct tasklet_struct *next; - unsigned long state; - atomic_t count; - void (*func)(unsigned long); - unsigned long data; -}; - -#define DECLARE_TASKLET(name, func, data) struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data } - -#define DECLARE_TASKLET_DISABLED(name, func, data) struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data } - -enum -{ - TASKLET_STATE_SCHED, - TASKLET_STATE_RUN -}; - -#define tasklet_trylock(t) 1 -#define tasklet_unlock_wait(t) do { } while (0) -#define tasklet_unlock(t) do { } while (0) - -#endif diff --git a/libc/kernel/common/linux/ioctl.h b/libc/kernel/common/linux/ioctl.h deleted file mode 100644 index 9efbeab6c..000000000 --- a/libc/kernel/common/linux/ioctl.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IOCTL_H -#define _LINUX_IOCTL_H - -#include - -#endif - diff --git a/libc/kernel/common/linux/ioport.h b/libc/kernel/common/linux/ioport.h deleted file mode 100644 index b2081fc90..000000000 --- a/libc/kernel/common/linux/ioport.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IOPORT_H -#define _LINUX_IOPORT_H - -#include -#include - -struct resource { - resource_size_t start; - resource_size_t end; - const char *name; - unsigned long flags; - struct resource *parent, *sibling, *child; -}; - -struct resource_list { - struct resource_list *next; - struct resource *res; - struct pci_dev *dev; -}; - -#define IORESOURCE_BITS 0x000000ff - -#define IORESOURCE_IO 0x00000100 -#define IORESOURCE_MEM 0x00000200 -#define IORESOURCE_IRQ 0x00000400 -#define IORESOURCE_DMA 0x00000800 - -#define IORESOURCE_PREFETCH 0x00001000 -#define IORESOURCE_READONLY 0x00002000 -#define IORESOURCE_CACHEABLE 0x00004000 -#define IORESOURCE_RANGELENGTH 0x00008000 -#define IORESOURCE_SHADOWABLE 0x00010000 -#define IORESOURCE_BUS_HAS_VGA 0x00080000 - -#define IORESOURCE_DISABLED 0x10000000 -#define IORESOURCE_UNSET 0x20000000 -#define IORESOURCE_AUTO 0x40000000 -#define IORESOURCE_BUSY 0x80000000 - -#define IORESOURCE_IRQ_HIGHEDGE (1<<0) -#define IORESOURCE_IRQ_LOWEDGE (1<<1) -#define IORESOURCE_IRQ_HIGHLEVEL (1<<2) -#define IORESOURCE_IRQ_LOWLEVEL (1<<3) -#define IORESOURCE_IRQ_SHAREABLE (1<<4) - -#define IORESOURCE_DMA_TYPE_MASK (3<<0) -#define IORESOURCE_DMA_8BIT (0<<0) -#define IORESOURCE_DMA_8AND16BIT (1<<0) -#define IORESOURCE_DMA_16BIT (2<<0) - -#define IORESOURCE_DMA_MASTER (1<<2) -#define IORESOURCE_DMA_BYTE (1<<3) -#define IORESOURCE_DMA_WORD (1<<4) - -#define IORESOURCE_DMA_SPEED_MASK (3<<6) -#define IORESOURCE_DMA_COMPATIBLE (0<<6) -#define IORESOURCE_DMA_TYPEA (1<<6) -#define IORESOURCE_DMA_TYPEB (2<<6) -#define IORESOURCE_DMA_TYPEF (3<<6) - -#define IORESOURCE_MEM_WRITEABLE (1<<0) -#define IORESOURCE_MEM_CACHEABLE (1<<1) -#define IORESOURCE_MEM_RANGELENGTH (1<<2) -#define IORESOURCE_MEM_TYPE_MASK (3<<3) -#define IORESOURCE_MEM_8BIT (0<<3) -#define IORESOURCE_MEM_16BIT (1<<3) -#define IORESOURCE_MEM_8AND16BIT (2<<3) -#define IORESOURCE_MEM_32BIT (3<<3) -#define IORESOURCE_MEM_SHADOWABLE (1<<5) -#define IORESOURCE_MEM_EXPANSIONROM (1<<6) - -#define IORESOURCE_ROM_ENABLE (1<<0) -#define IORESOURCE_ROM_SHADOW (1<<1) -#define IORESOURCE_ROM_COPY (1<<2) - -#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) -#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name)) -#define rename_region(region, newname) do { (region)->name = (newname); } while (0) - -#define release_region(start,n) __release_region(&ioport_resource, (start), (n)) -#define check_mem_region(start,n) __check_region(&iomem_resource, (start), (n)) -#define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n)) - -#endif diff --git a/libc/kernel/common/linux/ioprio.h b/libc/kernel/common/linux/ioprio.h deleted file mode 100644 index a0a5d4862..000000000 --- a/libc/kernel/common/linux/ioprio.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef IOPRIO_H -#define IOPRIO_H - -#include - -#define IOPRIO_BITS (16) -#define IOPRIO_CLASS_SHIFT (13) -#define IOPRIO_PRIO_MASK ((1UL << IOPRIO_CLASS_SHIFT) - 1) - -#define IOPRIO_PRIO_CLASS(mask) ((mask) >> IOPRIO_CLASS_SHIFT) -#define IOPRIO_PRIO_DATA(mask) ((mask) & IOPRIO_PRIO_MASK) -#define IOPRIO_PRIO_VALUE(class, data) (((class) << IOPRIO_CLASS_SHIFT) | data) - -#define ioprio_valid(mask) (IOPRIO_PRIO_CLASS((mask)) != IOPRIO_CLASS_NONE) - -enum { - IOPRIO_CLASS_NONE, - IOPRIO_CLASS_RT, - IOPRIO_CLASS_BE, - IOPRIO_CLASS_IDLE, -}; - -#define IOPRIO_BE_NR (8) - -enum { - IOPRIO_WHO_PROCESS = 1, - IOPRIO_WHO_PGRP, - IOPRIO_WHO_USER, -}; - -#define IOPRIO_NORM (4) - -#endif diff --git a/libc/kernel/common/linux/ip.h b/libc/kernel/common/linux/ip.h deleted file mode 100644 index 040789d3f..000000000 --- a/libc/kernel/common/linux/ip.h +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IP_H -#define _LINUX_IP_H -#include -#include - -#define IPTOS_TOS_MASK 0x1E -#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK) -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 - -#define IPTOS_PREC_MASK 0xE0 -#define IPTOS_PREC(tos) ((tos)&IPTOS_PREC_MASK) -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - -#define IPOPT_COPY 0x80 -#define IPOPT_CLASS_MASK 0x60 -#define IPOPT_NUMBER_MASK 0x1f - -#define IPOPT_COPIED(o) ((o)&IPOPT_COPY) -#define IPOPT_CLASS(o) ((o)&IPOPT_CLASS_MASK) -#define IPOPT_NUMBER(o) ((o)&IPOPT_NUMBER_MASK) - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_MEASUREMENT 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_END (0 |IPOPT_CONTROL) -#define IPOPT_NOOP (1 |IPOPT_CONTROL) -#define IPOPT_SEC (2 |IPOPT_CONTROL|IPOPT_COPY) -#define IPOPT_LSRR (3 |IPOPT_CONTROL|IPOPT_COPY) -#define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT) -#define IPOPT_RR (7 |IPOPT_CONTROL) -#define IPOPT_SID (8 |IPOPT_CONTROL|IPOPT_COPY) -#define IPOPT_SSRR (9 |IPOPT_CONTROL|IPOPT_COPY) -#define IPOPT_RA (20|IPOPT_CONTROL|IPOPT_COPY) - -#define IPVERSION 4 -#define MAXTTL 255 -#define IPDEFTTL 64 - -#define IPOPT_OPTVAL 0 -#define IPOPT_OLEN 1 -#define IPOPT_OFFSET 2 -#define IPOPT_MINOFF 4 -#define MAX_IPOPTLEN 40 -#define IPOPT_NOP IPOPT_NOOP -#define IPOPT_EOL IPOPT_END -#define IPOPT_TS IPOPT_TIMESTAMP - -#define IPOPT_TS_TSONLY 0 -#define IPOPT_TS_TSANDADDR 1 -#define IPOPT_TS_PRESPEC 3 - -struct iphdr { -#ifdef __LITTLE_ENDIAN_BITFIELD - __u8 ihl:4, - version:4; -#elif defined (__BIG_ENDIAN_BITFIELD) - __u8 version:4, - ihl:4; -#else -#error "Please fix " -#endif - __u8 tos; - __be16 tot_len; - __be16 id; - __be16 frag_off; - __u8 ttl; - __u8 protocol; - __u16 check; - __be32 saddr; - __be32 daddr; - -}; - -struct ip_auth_hdr { - __u8 nexthdr; - __u8 hdrlen; - __u16 reserved; - __u32 spi; - __u32 seq_no; - __u8 auth_data[0]; -}; - -struct ip_esp_hdr { - __u32 spi; - __u32 seq_no; - __u8 enc_data[0]; -}; - -struct ip_comp_hdr { - __u8 nexthdr; - __u8 flags; - __u16 cpi; -}; - -#endif diff --git a/libc/kernel/common/linux/ipc.h b/libc/kernel/common/linux/ipc.h deleted file mode 100644 index 54766d56d..000000000 --- a/libc/kernel/common/linux/ipc.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IPC_H -#define _LINUX_IPC_H - -#include - -#define IPC_PRIVATE ((__kernel_key_t) 0) - -struct ipc_perm -{ - __kernel_key_t key; - __kernel_uid_t uid; - __kernel_gid_t gid; - __kernel_uid_t cuid; - __kernel_gid_t cgid; - __kernel_mode_t mode; - unsigned short seq; -}; - -#include - -#define IPC_CREAT 00001000 -#define IPC_EXCL 00002000 -#define IPC_NOWAIT 00004000 - -#define IPC_DIPC 00010000 -#define IPC_OWN 00020000 - -#define IPC_RMID 0 -#define IPC_SET 1 -#define IPC_STAT 2 -#define IPC_INFO 3 - -#define IPC_OLD 0 -#define IPC_64 0x0100 - -#endif - diff --git a/libc/kernel/common/linux/ipmi_msgdefs.h b/libc/kernel/common/linux/ipmi_msgdefs.h deleted file mode 100644 index 247d5633d..000000000 --- a/libc/kernel/common/linux/ipmi_msgdefs.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_IPMI_MSGDEFS_H -#define __LINUX_IPMI_MSGDEFS_H - -#define IPMI_NETFN_SENSOR_EVENT_REQUEST 0x04 -#define IPMI_NETFN_SENSOR_EVENT_RESPONSE 0x05 -#define IPMI_GET_EVENT_RECEIVER_CMD 0x01 - -#define IPMI_NETFN_APP_REQUEST 0x06 -#define IPMI_NETFN_APP_RESPONSE 0x07 -#define IPMI_GET_DEVICE_ID_CMD 0x01 -#define IPMI_CLEAR_MSG_FLAGS_CMD 0x30 -#define IPMI_GET_DEVICE_GUID_CMD 0x08 -#define IPMI_GET_MSG_FLAGS_CMD 0x31 -#define IPMI_SEND_MSG_CMD 0x34 -#define IPMI_GET_MSG_CMD 0x33 -#define IPMI_SET_BMC_GLOBAL_ENABLES_CMD 0x2e -#define IPMI_GET_BMC_GLOBAL_ENABLES_CMD 0x2f -#define IPMI_READ_EVENT_MSG_BUFFER_CMD 0x35 -#define IPMI_GET_CHANNEL_INFO_CMD 0x42 - -#define IPMI_NETFN_STORAGE_REQUEST 0x0a -#define IPMI_NETFN_STORAGE_RESPONSE 0x0b -#define IPMI_ADD_SEL_ENTRY_CMD 0x44 - -#define IPMI_BMC_SLAVE_ADDR 0x20 - -#define IPMI_MAX_MSG_LENGTH 272 - -#define IPMI_CC_NO_ERROR 0x00 -#define IPMI_NODE_BUSY_ERR 0xc0 -#define IPMI_INVALID_COMMAND_ERR 0xc1 -#define IPMI_ERR_MSG_TRUNCATED 0xc6 -#define IPMI_LOST_ARBITRATION_ERR 0x81 -#define IPMI_ERR_UNSPECIFIED 0xff - -#define IPMI_CHANNEL_PROTOCOL_IPMB 1 -#define IPMI_CHANNEL_PROTOCOL_ICMB 2 -#define IPMI_CHANNEL_PROTOCOL_SMBUS 4 -#define IPMI_CHANNEL_PROTOCOL_KCS 5 -#define IPMI_CHANNEL_PROTOCOL_SMIC 6 -#define IPMI_CHANNEL_PROTOCOL_BT10 7 -#define IPMI_CHANNEL_PROTOCOL_BT15 8 -#define IPMI_CHANNEL_PROTOCOL_TMODE 9 - -#define IPMI_CHANNEL_MEDIUM_IPMB 1 -#define IPMI_CHANNEL_MEDIUM_ICMB10 2 -#define IPMI_CHANNEL_MEDIUM_ICMB09 3 -#define IPMI_CHANNEL_MEDIUM_8023LAN 4 -#define IPMI_CHANNEL_MEDIUM_ASYNC 5 -#define IPMI_CHANNEL_MEDIUM_OTHER_LAN 6 -#define IPMI_CHANNEL_MEDIUM_PCI_SMBUS 7 -#define IPMI_CHANNEL_MEDIUM_SMBUS1 8 -#define IPMI_CHANNEL_MEDIUM_SMBUS2 9 -#define IPMI_CHANNEL_MEDIUM_USB1 10 -#define IPMI_CHANNEL_MEDIUM_USB2 11 -#define IPMI_CHANNEL_MEDIUM_SYSINTF 12 - -#endif diff --git a/libc/kernel/common/linux/ipmi_smi.h b/libc/kernel/common/linux/ipmi_smi.h deleted file mode 100644 index 56cc21091..000000000 --- a/libc/kernel/common/linux/ipmi_smi.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_IPMI_SMI_H -#define __LINUX_IPMI_SMI_H - -#include -#include -#include -#include -#include -#include - -typedef struct ipmi_smi *ipmi_smi_t; - -struct ipmi_smi_msg -{ - struct list_head link; - - long msgid; - void *user_data; - - int data_size; - unsigned char data[IPMI_MAX_MSG_LENGTH]; - - int rsp_size; - unsigned char rsp[IPMI_MAX_MSG_LENGTH]; - - void (*done)(struct ipmi_smi_msg *msg); -}; - -struct ipmi_smi_handlers -{ - struct module *owner; - - int (*start_processing)(void *send_info, - ipmi_smi_t new_intf); - - void (*sender)(void *send_info, - struct ipmi_smi_msg *msg, - int priority); - - void (*request_events)(void *send_info); - - void (*set_run_to_completion)(void *send_info, int run_to_completion); - - void (*poll)(void *send_info); - - int (*inc_usecount)(void *send_info); - void (*dec_usecount)(void *send_info); -}; - -struct ipmi_device_id { - unsigned char device_id; - unsigned char device_revision; - unsigned char firmware_revision_1; - unsigned char firmware_revision_2; - unsigned char ipmi_version; - unsigned char additional_device_support; - unsigned int manufacturer_id; - unsigned int product_id; - unsigned char aux_firmware_revision[4]; - unsigned int aux_firmware_revision_set : 1; -}; - -#define ipmi_version_major(v) ((v)->ipmi_version & 0xf) -#define ipmi_version_minor(v) ((v)->ipmi_version >> 4) - -struct ipmi_smi_msg *ipmi_alloc_smi_msg(void); - -#endif diff --git a/libc/kernel/common/linux/ipx.h b/libc/kernel/common/linux/ipx.h deleted file mode 100644 index ff675e98d..000000000 --- a/libc/kernel/common/linux/ipx.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPX_H_ -#define _IPX_H_ -#include -#include -#define IPX_NODE_LEN 6 -#define IPX_MTU 576 - -struct sockaddr_ipx { - sa_family_t sipx_family; - __u16 sipx_port; - __u32 sipx_network; - unsigned char sipx_node[IPX_NODE_LEN]; - __u8 sipx_type; - unsigned char sipx_zero; -}; - -#define sipx_special sipx_port -#define sipx_action sipx_zero -#define IPX_DLTITF 0 -#define IPX_CRTITF 1 - -struct ipx_route_definition { - __u32 ipx_network; - __u32 ipx_router_network; - unsigned char ipx_router_node[IPX_NODE_LEN]; -}; - -struct ipx_interface_definition { - __u32 ipx_network; - unsigned char ipx_device[16]; - unsigned char ipx_dlink_type; -#define IPX_FRAME_NONE 0 -#define IPX_FRAME_SNAP 1 -#define IPX_FRAME_8022 2 -#define IPX_FRAME_ETHERII 3 -#define IPX_FRAME_8023 4 -#define IPX_FRAME_TR_8022 5 - unsigned char ipx_special; -#define IPX_SPECIAL_NONE 0 -#define IPX_PRIMARY 1 -#define IPX_INTERNAL 2 - unsigned char ipx_node[IPX_NODE_LEN]; -}; - -struct ipx_config_data { - unsigned char ipxcfg_auto_select_primary; - unsigned char ipxcfg_auto_create_interfaces; -}; - -struct ipx_route_def { - __u32 ipx_network; - __u32 ipx_router_network; -#define IPX_ROUTE_NO_ROUTER 0 - unsigned char ipx_router_node[IPX_NODE_LEN]; - unsigned char ipx_device[16]; - unsigned short ipx_flags; -#define IPX_RT_SNAP 8 -#define IPX_RT_8022 4 -#define IPX_RT_BLUEBOOK 2 -#define IPX_RT_ROUTED 1 -}; - -#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE) -#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1) -#define SIOCIPXCFGDATA (SIOCPROTOPRIVATE + 2) -#define SIOCIPXNCPCONN (SIOCPROTOPRIVATE + 3) -#endif diff --git a/libc/kernel/common/linux/irq.h b/libc/kernel/common/linux/irq.h deleted file mode 100644 index 38f5db76d..000000000 --- a/libc/kernel/common/linux/irq.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IRQ_H -#define _LINUX_IRQ_H - -#include - -#include -#include -#include -#include -#include - -#include -#include - -#define IRQ_TYPE_NONE 0x00000000 -#define IRQ_TYPE_EDGE_RISING 0x00000001 -#define IRQ_TYPE_EDGE_FALLING 0x00000002 -#define IRQ_TYPE_EDGE_BOTH (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING) -#define IRQ_TYPE_LEVEL_HIGH 0x00000004 -#define IRQ_TYPE_LEVEL_LOW 0x00000008 -#define IRQ_TYPE_SENSE_MASK 0x0000000f -#define IRQ_TYPE_PROBE 0x00000010 - -#define IRQ_INPROGRESS 0x00010000 -#define IRQ_DISABLED 0x00020000 -#define IRQ_PENDING 0x00040000 -#define IRQ_REPLAY 0x00080000 -#define IRQ_AUTODETECT 0x00100000 -#define IRQ_WAITING 0x00200000 -#define IRQ_LEVEL 0x00400000 -#define IRQ_MASKED 0x00800000 -#define IRQ_PER_CPU 0x01000000 -#define CHECK_IRQ_PER_CPU(var) 0 - -#define IRQ_NOPROBE 0x02000000 -#define IRQ_NOREQUEST 0x04000000 -#define IRQ_NOAUTOEN 0x08000000 -#define IRQ_DELAYED_DISABLE 0x10000000 -#define IRQ_WAKEUP 0x20000000 - -struct proc_dir_entry; - -struct irq_chip { - const char *name; - unsigned int (*startup)(unsigned int irq); - void (*shutdown)(unsigned int irq); - void (*enable)(unsigned int irq); - void (*disable)(unsigned int irq); - - void (*ack)(unsigned int irq); - void (*mask)(unsigned int irq); - void (*mask_ack)(unsigned int irq); - void (*unmask)(unsigned int irq); - void (*eoi)(unsigned int irq); - - void (*end)(unsigned int irq); - void (*set_affinity)(unsigned int irq, cpumask_t dest); - int (*retrigger)(unsigned int irq); - int (*set_type)(unsigned int irq, unsigned int flow_type); - int (*set_wake)(unsigned int irq, unsigned int on); - - const char *typename; -}; - -struct irq_desc { - void fastcall (*handle_irq)(unsigned int irq, - struct irq_desc *desc, - struct pt_regs *regs); - struct irq_chip *chip; - void *handler_data; - void *chip_data; - struct irqaction *action; - unsigned int status; - - unsigned int depth; - unsigned int wake_depth; - unsigned int irq_count; - unsigned int irqs_unhandled; - spinlock_t lock; -} ____cacheline_aligned; - -#define hw_interrupt_type irq_chip -typedef struct irq_chip hw_irq_controller; -#define no_irq_type no_irq_chip -typedef struct irq_desc irq_desc_t; - -#include - -#endif diff --git a/libc/kernel/common/linux/irq_cpustat.h b/libc/kernel/common/linux/irq_cpustat.h deleted file mode 100644 index 3540a4a79..000000000 --- a/libc/kernel/common/linux/irq_cpustat.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __irq_cpustat_h -#define __irq_cpustat_h - -#ifndef __ARCH_IRQ_STAT - -#define __IRQ_STAT(cpu, member) (irq_stat[cpu].member) -#endif - -#define local_softirq_pending() __IRQ_STAT(smp_processor_id(), __softirq_pending) - -#define nmi_count(cpu) __IRQ_STAT((cpu), __nmi_count) - -#endif diff --git a/libc/kernel/common/linux/irqflags.h b/libc/kernel/common/linux/irqflags.h deleted file mode 100644 index 1bf3f90b9..000000000 --- a/libc/kernel/common/linux/irqflags.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TRACE_IRQFLAGS_H -#define _LINUX_TRACE_IRQFLAGS_H - -#define trace_hardirqs_on() do { } while (0) -#define trace_hardirqs_off() do { } while (0) -#define trace_softirqs_on(ip) do { } while (0) -#define trace_softirqs_off(ip) do { } while (0) -#define trace_hardirq_context(p) 0 -#define trace_softirq_context(p) 0 -#define trace_hardirqs_enabled(p) 0 -#define trace_softirqs_enabled(p) 0 -#define trace_hardirq_enter() do { } while (0) -#define trace_hardirq_exit() do { } while (0) -#define trace_softirq_enter() do { } while (0) -#define trace_softirq_exit() do { } while (0) -#define INIT_TRACE_IRQFLAGS - -#define raw_local_irq_disable() local_irq_disable() -#define raw_local_irq_enable() local_irq_enable() -#define raw_local_irq_save(flags) local_irq_save(flags) -#define raw_local_irq_restore(flags) local_irq_restore(flags) - -#endif diff --git a/libc/kernel/common/linux/irqreturn.h b/libc/kernel/common/linux/irqreturn.h deleted file mode 100644 index e37f43027..000000000 --- a/libc/kernel/common/linux/irqreturn.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_IRQRETURN_H -#define _LINUX_IRQRETURN_H - -typedef int irqreturn_t; - -#define IRQ_NONE (0) -#define IRQ_HANDLED (1) -#define IRQ_RETVAL(x) ((x) != 0) - -#endif diff --git a/libc/kernel/common/linux/jbd.h b/libc/kernel/common/linux/jbd.h deleted file mode 100644 index 7ba766c90..000000000 --- a/libc/kernel/common/linux/jbd.h +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_JBD_H -#define _LINUX_JBD_H - -#include "jfs_compat.h" -#define JFS_DEBUG -#define jfs_debug jbd_debug - -#define journal_oom_retry 1 - -#undef JBD_PARANOID_IOFAIL - -#define JBD_DEFAULT_MAX_COMMIT_AGE 5 - -#define jbd_debug(f, a...) - -#define jbd_kmalloc(size, flags) __jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry) -#define jbd_rep_kmalloc(size, flags) __jbd_kmalloc(__FUNCTION__, (size), (flags), 1) - -#define JFS_MIN_JOURNAL_BLOCKS 1024 - -#define JFS_MAGIC_NUMBER 0xc03b3998U - -#define JFS_DESCRIPTOR_BLOCK 1 -#define JFS_COMMIT_BLOCK 2 -#define JFS_SUPERBLOCK_V1 3 -#define JFS_SUPERBLOCK_V2 4 -#define JFS_REVOKE_BLOCK 5 - -typedef struct journal_header_s -{ - __be32 h_magic; - __be32 h_blocktype; - __be32 h_sequence; -} journal_header_t; - -typedef struct journal_block_tag_s -{ - __be32 t_blocknr; - __be32 t_flags; -} journal_block_tag_t; - -typedef struct journal_revoke_header_s -{ - journal_header_t r_header; - __be32 r_count; -} journal_revoke_header_t; - -#define JFS_FLAG_ESCAPE 1 -#define JFS_FLAG_SAME_UUID 2 -#define JFS_FLAG_DELETED 4 -#define JFS_FLAG_LAST_TAG 8 - -typedef struct journal_superblock_s -{ - - journal_header_t s_header; - - __be32 s_blocksize; - __be32 s_maxlen; - __be32 s_first; - - __be32 s_sequence; - __be32 s_start; - - __be32 s_errno; - - __be32 s_feature_compat; - __be32 s_feature_incompat; - __be32 s_feature_ro_compat; - - __u8 s_uuid[16]; - - __be32 s_nr_users; - - __be32 s_dynsuper; - - __be32 s_max_transaction; - __be32 s_max_trans_data; - - __u32 s_padding[44]; - - __u8 s_users[16*48]; - -} journal_superblock_t; - -#define JFS_HAS_COMPAT_FEATURE(j,mask) ((j)->j_format_version >= 2 && ((j)->j_superblock->s_feature_compat & cpu_to_be32((mask)))) -#define JFS_HAS_RO_COMPAT_FEATURE(j,mask) ((j)->j_format_version >= 2 && ((j)->j_superblock->s_feature_ro_compat & cpu_to_be32((mask)))) -#define JFS_HAS_INCOMPAT_FEATURE(j,mask) ((j)->j_format_version >= 2 && ((j)->j_superblock->s_feature_incompat & cpu_to_be32((mask)))) - -#define JFS_FEATURE_INCOMPAT_REVOKE 0x00000001 - -#define JFS_KNOWN_COMPAT_FEATURES 0 -#define JFS_KNOWN_ROCOMPAT_FEATURES 0 -#define JFS_KNOWN_INCOMPAT_FEATURES JFS_FEATURE_INCOMPAT_REVOKE - -#define BJ_None 0 -#define BJ_SyncData 1 -#define BJ_Metadata 2 -#define BJ_Forget 3 -#define BJ_IO 4 -#define BJ_Shadow 5 -#define BJ_LogCtl 6 -#define BJ_Reserved 7 -#define BJ_Locked 8 -#define BJ_Types 9 - -#endif diff --git a/libc/kernel/common/linux/jiffies.h b/libc/kernel/common/linux/jiffies.h deleted file mode 100644 index 86b705b65..000000000 --- a/libc/kernel/common/linux/jiffies.h +++ /dev/null @@ -1,115 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_JIFFIES_H -#define _LINUX_JIFFIES_H - -#include -#include -#include -#include -#include -#include - -#if HZ >= (12 && HZ < 24) -#define SHIFT_HZ 4 -#elif HZ >= 24 && HZ < 48 -#define SHIFT_HZ 5 -#elif HZ >= 48 && HZ < 96 -#define SHIFT_HZ 6 -#elif HZ >= 96 && HZ < 192 -#define SHIFT_HZ 7 -#elif HZ >= 192 && HZ < 384 -#define SHIFT_HZ 8 -#elif HZ >= 384 && HZ < 768 -#define SHIFT_HZ 9 -#elif HZ >= 768 && HZ < 1536 -#define SHIFT_HZ 10 -#else -#error You lose. -#endif - -#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) - -#define LATCH_HPET ((HPET_TICK_RATE + HZ/2) / HZ) - -#define SH_DIV(NOM,DEN,LSH) ( (((NOM) / (DEN)) << (LSH)) + ((((NOM) % (DEN)) << (LSH)) + (DEN) / 2) / (DEN)) - -#define ACTHZ (SH_DIV (CLOCK_TICK_RATE, LATCH, 8)) - -#define ACTHZ_HPET (SH_DIV (HPET_TICK_RATE, LATCH_HPET, 8)) - -#define TICK_NSEC (SH_DIV (1000000UL * 1000, ACTHZ, 8)) - -#define TICK_NSEC_HPET (SH_DIV(1000000UL * 1000, ACTHZ_HPET, 8)) - -#define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ) - -#define TICK_USEC_TO_NSEC(TUSEC) (SH_DIV (TUSEC * USER_HZ * 1000, ACTHZ, 8)) - -#define __jiffy_data __attribute__((section(".data"))) - -#if BITS_PER_LONG < 64 - -#else -#endif -#define time_after(a,b) (typecheck(unsigned long, a) && typecheck(unsigned long, b) && ((long)(b) - (long)(a) < 0)) -#define time_before(a,b) time_after(b,a) -#define time_after_eq(a,b) (typecheck(unsigned long, a) && typecheck(unsigned long, b) && ((long)(a) - (long)(b) >= 0)) -#define time_before_eq(a,b) time_after_eq(b,a) -#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ)) -#define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) -#define SEC_JIFFIE_SC (31 - SHIFT_HZ) -#if !((NSEC_PER_SEC << 2) / TICK_NSEC << SEC_JIFFIE_SC - 2 & 0x80000000) -#undef SEC_JIFFIE_SC -#define SEC_JIFFIE_SC (32 - SHIFT_HZ) -#endif -#define NSEC_JIFFIE_SC (SEC_JIFFIE_SC + 29) -#define USEC_JIFFIE_SC (SEC_JIFFIE_SC + 19) -#define SEC_CONVERSION ((unsigned long)((((u64)NSEC_PER_SEC << SEC_JIFFIE_SC) + TICK_NSEC -1) / (u64)TICK_NSEC)) -#define NSEC_CONVERSION ((unsigned long)((((u64)1 << NSEC_JIFFIE_SC) + TICK_NSEC -1) / (u64)TICK_NSEC)) -#define USEC_CONVERSION ((unsigned long)((((u64)NSEC_PER_USEC << USEC_JIFFIE_SC) + TICK_NSEC -1) / (u64)TICK_NSEC)) -#define USEC_ROUND (u64)(((u64)1 << USEC_JIFFIE_SC) - 1) -#if BITS_PER_LONG < 64 -#define MAX_SEC_IN_JIFFIES (long)((u64)((u64)MAX_JIFFY_OFFSET * TICK_NSEC) / NSEC_PER_SEC) -#else -#define MAX_SEC_IN_JIFFIES (SH_DIV((MAX_JIFFY_OFFSET >> SEC_JIFFIE_SC) * TICK_NSEC, NSEC_PER_SEC, 1) - 1) -#endif -#if HZ <= (MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)) -#elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC) -#else -#endif -#if HZ <= (USEC_PER_SEC && !(USEC_PER_SEC % HZ)) -#elif HZ > USEC_PER_SEC && !(HZ % USEC_PER_SEC) -#else -#endif -#if HZ <= (MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)) -#elif HZ > MSEC_PER_SEC && !(HZ % MSEC_PER_SEC) -#else -#endif -#if HZ <= (USEC_PER_SEC && !(USEC_PER_SEC % HZ)) -#elif HZ > USEC_PER_SEC && !(HZ % USEC_PER_SEC) -#else -#endif -#if TICK_NSEC % NSEC_PER_SEC / USER_HZ == 0 -#else -#endif -#if HZ % USER_HZ == 0 -#else -#endif -#if TICK_NSEC % NSEC_PER_SEC / USER_HZ == 0 -#else -#endif -#if NSEC_PER_SEC % USER_HZ == 0 -#elif (USER_HZ % 512) == 0 -#else -#endif -#endif diff --git a/libc/kernel/common/linux/kd.h b/libc/kernel/common/linux/kd.h deleted file mode 100644 index 1541ddf58..000000000 --- a/libc/kernel/common/linux/kd.h +++ /dev/null @@ -1,176 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KD_H -#define _LINUX_KD_H -#include -#include - -#define GIO_FONT 0x4B60 -#define PIO_FONT 0x4B61 - -#define GIO_FONTX 0x4B6B -#define PIO_FONTX 0x4B6C -struct consolefontdesc { - unsigned short charcount; - unsigned short charheight; - char __user *chardata; -}; - -#define PIO_FONTRESET 0x4B6D - -#define GIO_CMAP 0x4B70 -#define PIO_CMAP 0x4B71 - -#define KIOCSOUND 0x4B2F -#define KDMKTONE 0x4B30 - -#define KDGETLED 0x4B31 -#define KDSETLED 0x4B32 -#define LED_SCR 0x01 -#define LED_NUM 0x02 -#define LED_CAP 0x04 - -#define KDGKBTYPE 0x4B33 -#define KB_84 0x01 -#define KB_101 0x02 -#define KB_OTHER 0x03 - -#define KDADDIO 0x4B34 -#define KDDELIO 0x4B35 -#define KDENABIO 0x4B36 -#define KDDISABIO 0x4B37 - -#define KDSETMODE 0x4B3A -#define KD_TEXT 0x00 -#define KD_GRAPHICS 0x01 -#define KD_TEXT0 0x02 -#define KD_TEXT1 0x03 -#define KDGETMODE 0x4B3B - -#define KDMAPDISP 0x4B3C -#define KDUNMAPDISP 0x4B3D - -typedef char scrnmap_t; -#define E_TABSZ 256 -#define GIO_SCRNMAP 0x4B40 -#define PIO_SCRNMAP 0x4B41 -#define GIO_UNISCRNMAP 0x4B69 -#define PIO_UNISCRNMAP 0x4B6A - -#define GIO_UNIMAP 0x4B66 -struct unipair { - unsigned short unicode; - unsigned short fontpos; -}; -struct unimapdesc { - unsigned short entry_ct; - struct unipair __user *entries; -}; -#define PIO_UNIMAP 0x4B67 -#define PIO_UNIMAPCLR 0x4B68 -struct unimapinit { - unsigned short advised_hashsize; - unsigned short advised_hashstep; - unsigned short advised_hashlevel; -}; - -#define UNI_DIRECT_BASE 0xF000 -#define UNI_DIRECT_MASK 0x01FF - -#define K_RAW 0x00 -#define K_XLATE 0x01 -#define K_MEDIUMRAW 0x02 -#define K_UNICODE 0x03 -#define KDGKBMODE 0x4B44 -#define KDSKBMODE 0x4B45 - -#define K_METABIT 0x03 -#define K_ESCPREFIX 0x04 -#define KDGKBMETA 0x4B62 -#define KDSKBMETA 0x4B63 - -#define K_SCROLLLOCK 0x01 -#define K_NUMLOCK 0x02 -#define K_CAPSLOCK 0x04 -#define KDGKBLED 0x4B64 -#define KDSKBLED 0x4B65 - -struct kbentry { - unsigned char kb_table; - unsigned char kb_index; - unsigned short kb_value; -}; -#define K_NORMTAB 0x00 -#define K_SHIFTTAB 0x01 -#define K_ALTTAB 0x02 -#define K_ALTSHIFTTAB 0x03 - -#define KDGKBENT 0x4B46 -#define KDSKBENT 0x4B47 - -struct kbsentry { - unsigned char kb_func; - unsigned char kb_string[512]; -}; -#define KDGKBSENT 0x4B48 -#define KDSKBSENT 0x4B49 - -struct kbdiacr { - unsigned char diacr, base, result; -}; -struct kbdiacrs { - unsigned int kb_cnt; - struct kbdiacr kbdiacr[256]; -}; -#define KDGKBDIACR 0x4B4A -#define KDSKBDIACR 0x4B4B - -struct kbkeycode { - unsigned int scancode, keycode; -}; -#define KDGETKEYCODE 0x4B4C -#define KDSETKEYCODE 0x4B4D - -#define KDSIGACCEPT 0x4B4E - -struct kbd_repeat { - int delay; - int period; - -}; - -#define KDKBDREP 0x4B52 - -#define KDFONTOP 0x4B72 - -struct console_font_op { - unsigned int op; - unsigned int flags; - unsigned int width, height; - unsigned int charcount; - unsigned char __user *data; -}; - -struct console_font { - unsigned int width, height; - unsigned int charcount; - unsigned char *data; -}; - -#define KD_FONT_OP_SET 0 -#define KD_FONT_OP_GET 1 -#define KD_FONT_OP_SET_DEFAULT 2 -#define KD_FONT_OP_COPY 3 - -#define KD_FONT_FLAG_DONT_RECALC 1 - -#endif diff --git a/libc/kernel/common/linux/kdev_t.h b/libc/kernel/common/linux/kdev_t.h deleted file mode 100644 index 517f9c3b4..000000000 --- a/libc/kernel/common/linux/kdev_t.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KDEV_T_H -#define _LINUX_KDEV_T_H - -#define MAJOR(dev) ((dev)>>8) -#define MINOR(dev) ((dev) & 0xff) -#define MKDEV(ma,mi) ((ma)<<8 | (mi)) -#endif diff --git a/libc/kernel/common/linux/kernel.h b/libc/kernel/common/linux/kernel.h deleted file mode 100644 index 9682e473e..000000000 --- a/libc/kernel/common/linux/kernel.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KERNEL_H -#define _LINUX_KERNEL_H - -#define SI_LOAD_SHIFT 16 -struct sysinfo { - long uptime; - unsigned long loads[3]; - unsigned long totalram; - unsigned long freeram; - unsigned long sharedram; - unsigned long bufferram; - unsigned long totalswap; - unsigned long freeswap; - unsigned short procs; - unsigned short pad; - unsigned long totalhigh; - unsigned long freehigh; - unsigned int mem_unit; - char _f[20-2*sizeof(long)-sizeof(int)]; -}; - -#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) - -#define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1) - -#define __FUNCTION__ (__func__) - -#endif diff --git a/libc/kernel/common/linux/kernel_stat.h b/libc/kernel/common/linux/kernel_stat.h deleted file mode 100644 index f333736a6..000000000 --- a/libc/kernel/common/linux/kernel_stat.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KERNEL_STAT_H -#define _LINUX_KERNEL_STAT_H - -#include -#include -#include -#include -#include -#include - -struct cpu_usage_stat { - cputime64_t user; - cputime64_t nice; - cputime64_t system; - cputime64_t softirq; - cputime64_t irq; - cputime64_t idle; - cputime64_t iowait; - cputime64_t steal; -}; - -struct kernel_stat { - struct cpu_usage_stat cpustat; - unsigned int irqs[NR_IRQS]; -}; - -#define kstat_cpu(cpu) per_cpu(kstat, cpu) - -#define kstat_this_cpu __get_cpu_var(kstat) - -#endif diff --git a/libc/kernel/common/linux/kernelcapi.h b/libc/kernel/common/linux/kernelcapi.h deleted file mode 100644 index 4638b0a70..000000000 --- a/libc/kernel/common/linux/kernelcapi.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __KERNELCAPI_H__ -#define __KERNELCAPI_H__ - -#define CAPI_MAXAPPL 240 -#define CAPI_MAXCONTR 32 -#define CAPI_MAXDATAWINDOW 8 - -typedef struct kcapi_flagdef { - int contr; - int flag; -} kcapi_flagdef; - -typedef struct kcapi_carddef { - char driver[32]; - unsigned int port; - unsigned irq; - unsigned int membase; - int cardnr; -} kcapi_carddef; - -#define KCAPI_CMD_TRACE 10 -#define KCAPI_CMD_ADDCARD 11 - -#define KCAPI_TRACE_OFF 0 -#define KCAPI_TRACE_SHORT_NO_DATA 1 -#define KCAPI_TRACE_FULL_NO_DATA 2 -#define KCAPI_TRACE_SHORT 3 -#define KCAPI_TRACE_FULL 4 - -#endif diff --git a/libc/kernel/common/linux/kexec.h b/libc/kernel/common/linux/kexec.h deleted file mode 100644 index 400464651..000000000 --- a/libc/kernel/common/linux/kexec.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_KEXEC_H -#define LINUX_KEXEC_H - -struct pt_regs; -struct task_struct; -#endif diff --git a/libc/kernel/common/linux/key.h b/libc/kernel/common/linux/key.h deleted file mode 100644 index 5c485d75d..000000000 --- a/libc/kernel/common/linux/key.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KEY_H -#define _LINUX_KEY_H - -#include -#include -#include -#include -#include - -#endif diff --git a/libc/kernel/common/linux/keyboard.h b/libc/kernel/common/linux/keyboard.h deleted file mode 100644 index 25e0945eb..000000000 --- a/libc/kernel/common/linux/keyboard.h +++ /dev/null @@ -1,446 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_KEYBOARD_H -#define __LINUX_KEYBOARD_H - -#include - -#define KG_SHIFT 0 -#define KG_CTRL 2 -#define KG_ALT 3 -#define KG_ALTGR 1 -#define KG_SHIFTL 4 -#define KG_KANASHIFT 4 -#define KG_SHIFTR 5 -#define KG_CTRLL 6 -#define KG_CTRLR 7 -#define KG_CAPSSHIFT 8 - -#define NR_SHIFT 9 - -#define NR_KEYS 256 -#define MAX_NR_KEYMAPS 256 - -#define MAX_NR_OF_USER_KEYMAPS 256 - -#define MAX_NR_FUNC 256 - -#define KT_LATIN 0 -#define KT_LETTER 11 -#define KT_FN 1 -#define KT_SPEC 2 -#define KT_PAD 3 -#define KT_DEAD 4 -#define KT_CONS 5 -#define KT_CUR 6 -#define KT_SHIFT 7 -#define KT_META 8 -#define KT_ASCII 9 -#define KT_LOCK 10 -#define KT_SLOCK 12 -#define KT_BRL 14 - -#define K(t,v) (((t)<<8)|(v)) -#define KTYP(x) ((x) >> 8) -#define KVAL(x) ((x) & 0xff) - -#define K_F1 K(KT_FN,0) -#define K_F2 K(KT_FN,1) -#define K_F3 K(KT_FN,2) -#define K_F4 K(KT_FN,3) -#define K_F5 K(KT_FN,4) -#define K_F6 K(KT_FN,5) -#define K_F7 K(KT_FN,6) -#define K_F8 K(KT_FN,7) -#define K_F9 K(KT_FN,8) -#define K_F10 K(KT_FN,9) -#define K_F11 K(KT_FN,10) -#define K_F12 K(KT_FN,11) -#define K_F13 K(KT_FN,12) -#define K_F14 K(KT_FN,13) -#define K_F15 K(KT_FN,14) -#define K_F16 K(KT_FN,15) -#define K_F17 K(KT_FN,16) -#define K_F18 K(KT_FN,17) -#define K_F19 K(KT_FN,18) -#define K_F20 K(KT_FN,19) -#define K_FIND K(KT_FN,20) -#define K_INSERT K(KT_FN,21) -#define K_REMOVE K(KT_FN,22) -#define K_SELECT K(KT_FN,23) -#define K_PGUP K(KT_FN,24) -#define K_PGDN K(KT_FN,25) -#define K_MACRO K(KT_FN,26) -#define K_HELP K(KT_FN,27) -#define K_DO K(KT_FN,28) -#define K_PAUSE K(KT_FN,29) -#define K_F21 K(KT_FN,30) -#define K_F22 K(KT_FN,31) -#define K_F23 K(KT_FN,32) -#define K_F24 K(KT_FN,33) -#define K_F25 K(KT_FN,34) -#define K_F26 K(KT_FN,35) -#define K_F27 K(KT_FN,36) -#define K_F28 K(KT_FN,37) -#define K_F29 K(KT_FN,38) -#define K_F30 K(KT_FN,39) -#define K_F31 K(KT_FN,40) -#define K_F32 K(KT_FN,41) -#define K_F33 K(KT_FN,42) -#define K_F34 K(KT_FN,43) -#define K_F35 K(KT_FN,44) -#define K_F36 K(KT_FN,45) -#define K_F37 K(KT_FN,46) -#define K_F38 K(KT_FN,47) -#define K_F39 K(KT_FN,48) -#define K_F40 K(KT_FN,49) -#define K_F41 K(KT_FN,50) -#define K_F42 K(KT_FN,51) -#define K_F43 K(KT_FN,52) -#define K_F44 K(KT_FN,53) -#define K_F45 K(KT_FN,54) -#define K_F46 K(KT_FN,55) -#define K_F47 K(KT_FN,56) -#define K_F48 K(KT_FN,57) -#define K_F49 K(KT_FN,58) -#define K_F50 K(KT_FN,59) -#define K_F51 K(KT_FN,60) -#define K_F52 K(KT_FN,61) -#define K_F53 K(KT_FN,62) -#define K_F54 K(KT_FN,63) -#define K_F55 K(KT_FN,64) -#define K_F56 K(KT_FN,65) -#define K_F57 K(KT_FN,66) -#define K_F58 K(KT_FN,67) -#define K_F59 K(KT_FN,68) -#define K_F60 K(KT_FN,69) -#define K_F61 K(KT_FN,70) -#define K_F62 K(KT_FN,71) -#define K_F63 K(KT_FN,72) -#define K_F64 K(KT_FN,73) -#define K_F65 K(KT_FN,74) -#define K_F66 K(KT_FN,75) -#define K_F67 K(KT_FN,76) -#define K_F68 K(KT_FN,77) -#define K_F69 K(KT_FN,78) -#define K_F70 K(KT_FN,79) -#define K_F71 K(KT_FN,80) -#define K_F72 K(KT_FN,81) -#define K_F73 K(KT_FN,82) -#define K_F74 K(KT_FN,83) -#define K_F75 K(KT_FN,84) -#define K_F76 K(KT_FN,85) -#define K_F77 K(KT_FN,86) -#define K_F78 K(KT_FN,87) -#define K_F79 K(KT_FN,88) -#define K_F80 K(KT_FN,89) -#define K_F81 K(KT_FN,90) -#define K_F82 K(KT_FN,91) -#define K_F83 K(KT_FN,92) -#define K_F84 K(KT_FN,93) -#define K_F85 K(KT_FN,94) -#define K_F86 K(KT_FN,95) -#define K_F87 K(KT_FN,96) -#define K_F88 K(KT_FN,97) -#define K_F89 K(KT_FN,98) -#define K_F90 K(KT_FN,99) -#define K_F91 K(KT_FN,100) -#define K_F92 K(KT_FN,101) -#define K_F93 K(KT_FN,102) -#define K_F94 K(KT_FN,103) -#define K_F95 K(KT_FN,104) -#define K_F96 K(KT_FN,105) -#define K_F97 K(KT_FN,106) -#define K_F98 K(KT_FN,107) -#define K_F99 K(KT_FN,108) -#define K_F100 K(KT_FN,109) -#define K_F101 K(KT_FN,110) -#define K_F102 K(KT_FN,111) -#define K_F103 K(KT_FN,112) -#define K_F104 K(KT_FN,113) -#define K_F105 K(KT_FN,114) -#define K_F106 K(KT_FN,115) -#define K_F107 K(KT_FN,116) -#define K_F108 K(KT_FN,117) -#define K_F109 K(KT_FN,118) -#define K_F110 K(KT_FN,119) -#define K_F111 K(KT_FN,120) -#define K_F112 K(KT_FN,121) -#define K_F113 K(KT_FN,122) -#define K_F114 K(KT_FN,123) -#define K_F115 K(KT_FN,124) -#define K_F116 K(KT_FN,125) -#define K_F117 K(KT_FN,126) -#define K_F118 K(KT_FN,127) -#define K_F119 K(KT_FN,128) -#define K_F120 K(KT_FN,129) -#define K_F121 K(KT_FN,130) -#define K_F122 K(KT_FN,131) -#define K_F123 K(KT_FN,132) -#define K_F124 K(KT_FN,133) -#define K_F125 K(KT_FN,134) -#define K_F126 K(KT_FN,135) -#define K_F127 K(KT_FN,136) -#define K_F128 K(KT_FN,137) -#define K_F129 K(KT_FN,138) -#define K_F130 K(KT_FN,139) -#define K_F131 K(KT_FN,140) -#define K_F132 K(KT_FN,141) -#define K_F133 K(KT_FN,142) -#define K_F134 K(KT_FN,143) -#define K_F135 K(KT_FN,144) -#define K_F136 K(KT_FN,145) -#define K_F137 K(KT_FN,146) -#define K_F138 K(KT_FN,147) -#define K_F139 K(KT_FN,148) -#define K_F140 K(KT_FN,149) -#define K_F141 K(KT_FN,150) -#define K_F142 K(KT_FN,151) -#define K_F143 K(KT_FN,152) -#define K_F144 K(KT_FN,153) -#define K_F145 K(KT_FN,154) -#define K_F146 K(KT_FN,155) -#define K_F147 K(KT_FN,156) -#define K_F148 K(KT_FN,157) -#define K_F149 K(KT_FN,158) -#define K_F150 K(KT_FN,159) -#define K_F151 K(KT_FN,160) -#define K_F152 K(KT_FN,161) -#define K_F153 K(KT_FN,162) -#define K_F154 K(KT_FN,163) -#define K_F155 K(KT_FN,164) -#define K_F156 K(KT_FN,165) -#define K_F157 K(KT_FN,166) -#define K_F158 K(KT_FN,167) -#define K_F159 K(KT_FN,168) -#define K_F160 K(KT_FN,169) -#define K_F161 K(KT_FN,170) -#define K_F162 K(KT_FN,171) -#define K_F163 K(KT_FN,172) -#define K_F164 K(KT_FN,173) -#define K_F165 K(KT_FN,174) -#define K_F166 K(KT_FN,175) -#define K_F167 K(KT_FN,176) -#define K_F168 K(KT_FN,177) -#define K_F169 K(KT_FN,178) -#define K_F170 K(KT_FN,179) -#define K_F171 K(KT_FN,180) -#define K_F172 K(KT_FN,181) -#define K_F173 K(KT_FN,182) -#define K_F174 K(KT_FN,183) -#define K_F175 K(KT_FN,184) -#define K_F176 K(KT_FN,185) -#define K_F177 K(KT_FN,186) -#define K_F178 K(KT_FN,187) -#define K_F179 K(KT_FN,188) -#define K_F180 K(KT_FN,189) -#define K_F181 K(KT_FN,190) -#define K_F182 K(KT_FN,191) -#define K_F183 K(KT_FN,192) -#define K_F184 K(KT_FN,193) -#define K_F185 K(KT_FN,194) -#define K_F186 K(KT_FN,195) -#define K_F187 K(KT_FN,196) -#define K_F188 K(KT_FN,197) -#define K_F189 K(KT_FN,198) -#define K_F190 K(KT_FN,199) -#define K_F191 K(KT_FN,200) -#define K_F192 K(KT_FN,201) -#define K_F193 K(KT_FN,202) -#define K_F194 K(KT_FN,203) -#define K_F195 K(KT_FN,204) -#define K_F196 K(KT_FN,205) -#define K_F197 K(KT_FN,206) -#define K_F198 K(KT_FN,207) -#define K_F199 K(KT_FN,208) -#define K_F200 K(KT_FN,209) -#define K_F201 K(KT_FN,210) -#define K_F202 K(KT_FN,211) -#define K_F203 K(KT_FN,212) -#define K_F204 K(KT_FN,213) -#define K_F205 K(KT_FN,214) -#define K_F206 K(KT_FN,215) -#define K_F207 K(KT_FN,216) -#define K_F208 K(KT_FN,217) -#define K_F209 K(KT_FN,218) -#define K_F210 K(KT_FN,219) -#define K_F211 K(KT_FN,220) -#define K_F212 K(KT_FN,221) -#define K_F213 K(KT_FN,222) -#define K_F214 K(KT_FN,223) -#define K_F215 K(KT_FN,224) -#define K_F216 K(KT_FN,225) -#define K_F217 K(KT_FN,226) -#define K_F218 K(KT_FN,227) -#define K_F219 K(KT_FN,228) -#define K_F220 K(KT_FN,229) -#define K_F221 K(KT_FN,230) -#define K_F222 K(KT_FN,231) -#define K_F223 K(KT_FN,232) -#define K_F224 K(KT_FN,233) -#define K_F225 K(KT_FN,234) -#define K_F226 K(KT_FN,235) -#define K_F227 K(KT_FN,236) -#define K_F228 K(KT_FN,237) -#define K_F229 K(KT_FN,238) -#define K_F230 K(KT_FN,239) -#define K_F231 K(KT_FN,240) -#define K_F232 K(KT_FN,241) -#define K_F233 K(KT_FN,242) -#define K_F234 K(KT_FN,243) -#define K_F235 K(KT_FN,244) -#define K_F236 K(KT_FN,245) -#define K_F237 K(KT_FN,246) -#define K_F238 K(KT_FN,247) -#define K_F239 K(KT_FN,248) -#define K_F240 K(KT_FN,249) -#define K_F241 K(KT_FN,250) -#define K_F242 K(KT_FN,251) -#define K_F243 K(KT_FN,252) -#define K_F244 K(KT_FN,253) -#define K_F245 K(KT_FN,254) -#define K_UNDO K(KT_FN,255) - -#define K_HOLE K(KT_SPEC,0) -#define K_ENTER K(KT_SPEC,1) -#define K_SH_REGS K(KT_SPEC,2) -#define K_SH_MEM K(KT_SPEC,3) -#define K_SH_STAT K(KT_SPEC,4) -#define K_BREAK K(KT_SPEC,5) -#define K_CONS K(KT_SPEC,6) -#define K_CAPS K(KT_SPEC,7) -#define K_NUM K(KT_SPEC,8) -#define K_HOLD K(KT_SPEC,9) -#define K_SCROLLFORW K(KT_SPEC,10) -#define K_SCROLLBACK K(KT_SPEC,11) -#define K_BOOT K(KT_SPEC,12) -#define K_CAPSON K(KT_SPEC,13) -#define K_COMPOSE K(KT_SPEC,14) -#define K_SAK K(KT_SPEC,15) -#define K_DECRCONSOLE K(KT_SPEC,16) -#define K_INCRCONSOLE K(KT_SPEC,17) -#define K_SPAWNCONSOLE K(KT_SPEC,18) -#define K_BARENUMLOCK K(KT_SPEC,19) - -#define K_ALLOCATED K(KT_SPEC,126) -#define K_NOSUCHMAP K(KT_SPEC,127) - -#define K_P0 K(KT_PAD,0) -#define K_P1 K(KT_PAD,1) -#define K_P2 K(KT_PAD,2) -#define K_P3 K(KT_PAD,3) -#define K_P4 K(KT_PAD,4) -#define K_P5 K(KT_PAD,5) -#define K_P6 K(KT_PAD,6) -#define K_P7 K(KT_PAD,7) -#define K_P8 K(KT_PAD,8) -#define K_P9 K(KT_PAD,9) -#define K_PPLUS K(KT_PAD,10) -#define K_PMINUS K(KT_PAD,11) -#define K_PSTAR K(KT_PAD,12) -#define K_PSLASH K(KT_PAD,13) -#define K_PENTER K(KT_PAD,14) -#define K_PCOMMA K(KT_PAD,15) -#define K_PDOT K(KT_PAD,16) -#define K_PPLUSMINUS K(KT_PAD,17) -#define K_PPARENL K(KT_PAD,18) -#define K_PPARENR K(KT_PAD,19) - -#define NR_PAD 20 - -#define K_DGRAVE K(KT_DEAD,0) -#define K_DACUTE K(KT_DEAD,1) -#define K_DCIRCM K(KT_DEAD,2) -#define K_DTILDE K(KT_DEAD,3) -#define K_DDIERE K(KT_DEAD,4) -#define K_DCEDIL K(KT_DEAD,5) - -#define NR_DEAD 6 - -#define K_DOWN K(KT_CUR,0) -#define K_LEFT K(KT_CUR,1) -#define K_RIGHT K(KT_CUR,2) -#define K_UP K(KT_CUR,3) - -#define K_SHIFT K(KT_SHIFT,KG_SHIFT) -#define K_CTRL K(KT_SHIFT,KG_CTRL) -#define K_ALT K(KT_SHIFT,KG_ALT) -#define K_ALTGR K(KT_SHIFT,KG_ALTGR) -#define K_SHIFTL K(KT_SHIFT,KG_SHIFTL) -#define K_SHIFTR K(KT_SHIFT,KG_SHIFTR) -#define K_CTRLL K(KT_SHIFT,KG_CTRLL) -#define K_CTRLR K(KT_SHIFT,KG_CTRLR) -#define K_CAPSSHIFT K(KT_SHIFT,KG_CAPSSHIFT) - -#define K_ASC0 K(KT_ASCII,0) -#define K_ASC1 K(KT_ASCII,1) -#define K_ASC2 K(KT_ASCII,2) -#define K_ASC3 K(KT_ASCII,3) -#define K_ASC4 K(KT_ASCII,4) -#define K_ASC5 K(KT_ASCII,5) -#define K_ASC6 K(KT_ASCII,6) -#define K_ASC7 K(KT_ASCII,7) -#define K_ASC8 K(KT_ASCII,8) -#define K_ASC9 K(KT_ASCII,9) -#define K_HEX0 K(KT_ASCII,10) -#define K_HEX1 K(KT_ASCII,11) -#define K_HEX2 K(KT_ASCII,12) -#define K_HEX3 K(KT_ASCII,13) -#define K_HEX4 K(KT_ASCII,14) -#define K_HEX5 K(KT_ASCII,15) -#define K_HEX6 K(KT_ASCII,16) -#define K_HEX7 K(KT_ASCII,17) -#define K_HEX8 K(KT_ASCII,18) -#define K_HEX9 K(KT_ASCII,19) -#define K_HEXa K(KT_ASCII,20) -#define K_HEXb K(KT_ASCII,21) -#define K_HEXc K(KT_ASCII,22) -#define K_HEXd K(KT_ASCII,23) -#define K_HEXe K(KT_ASCII,24) -#define K_HEXf K(KT_ASCII,25) - -#define NR_ASCII 26 - -#define K_SHIFTLOCK K(KT_LOCK,KG_SHIFT) -#define K_CTRLLOCK K(KT_LOCK,KG_CTRL) -#define K_ALTLOCK K(KT_LOCK,KG_ALT) -#define K_ALTGRLOCK K(KT_LOCK,KG_ALTGR) -#define K_SHIFTLLOCK K(KT_LOCK,KG_SHIFTL) -#define K_SHIFTRLOCK K(KT_LOCK,KG_SHIFTR) -#define K_CTRLLLOCK K(KT_LOCK,KG_CTRLL) -#define K_CTRLRLOCK K(KT_LOCK,KG_CTRLR) - -#define K_SHIFT_SLOCK K(KT_SLOCK,KG_SHIFT) -#define K_CTRL_SLOCK K(KT_SLOCK,KG_CTRL) -#define K_ALT_SLOCK K(KT_SLOCK,KG_ALT) -#define K_ALTGR_SLOCK K(KT_SLOCK,KG_ALTGR) -#define K_SHIFTL_SLOCK K(KT_SLOCK,KG_SHIFTL) -#define K_SHIFTR_SLOCK K(KT_SLOCK,KG_SHIFTR) -#define K_CTRLL_SLOCK K(KT_SLOCK,KG_CTRLL) -#define K_CTRLR_SLOCK K(KT_SLOCK,KG_CTRLR) - -#define NR_LOCK 8 - -#define K_BRL_BLANK K(KT_BRL, 0) -#define K_BRL_DOT1 K(KT_BRL, 1) -#define K_BRL_DOT2 K(KT_BRL, 2) -#define K_BRL_DOT3 K(KT_BRL, 3) -#define K_BRL_DOT4 K(KT_BRL, 4) -#define K_BRL_DOT5 K(KT_BRL, 5) -#define K_BRL_DOT6 K(KT_BRL, 6) -#define K_BRL_DOT7 K(KT_BRL, 7) -#define K_BRL_DOT8 K(KT_BRL, 8) - -#define NR_BRL 9 - -#define MAX_DIACR 256 -#endif diff --git a/libc/kernel/common/linux/keychord.h b/libc/kernel/common/linux/keychord.h deleted file mode 100644 index 914843121..000000000 --- a/libc/kernel/common/linux/keychord.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_KEYCHORD_H_ -#define __LINUX_KEYCHORD_H_ - -#include - -#define KEYCHORD_VERSION 1 - -struct input_keychord { - - __u16 version; - - __u16 id; - - __u16 count; - - __u16 keycodes[]; -}; - -#endif diff --git a/libc/kernel/common/linux/klist.h b/libc/kernel/common/linux/klist.h deleted file mode 100644 index 0df014f1f..000000000 --- a/libc/kernel/common/linux/klist.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KLIST_H -#define _LINUX_KLIST_H - -#include -#include -#include -#include - -struct klist_node; -struct klist { - spinlock_t k_lock; - struct list_head k_list; - void (*get)(struct klist_node *); - void (*put)(struct klist_node *); -}; - -struct klist_node { - struct klist * n_klist; - struct list_head n_node; - struct kref n_ref; - struct completion n_removed; -}; - -struct klist_iter { - struct klist * i_klist; - struct list_head * i_head; - struct klist_node * i_cur; -}; - -#endif diff --git a/libc/kernel/common/linux/kmod.h b/libc/kernel/common/linux/kmod.h deleted file mode 100644 index d24456d29..000000000 --- a/libc/kernel/common/linux/kmod.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_KMOD_H__ -#define __LINUX_KMOD_H__ - -#include -#include -#include - -#define KMOD_PATH_LEN 256 - -#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x))) - -#endif diff --git a/libc/kernel/common/linux/kobject.h b/libc/kernel/common/linux/kobject.h deleted file mode 100644 index c61a95071..000000000 --- a/libc/kernel/common/linux/kobject.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _KOBJECT_H_ -#define _KOBJECT_H_ - -#endif diff --git a/libc/kernel/common/linux/kref.h b/libc/kernel/common/linux/kref.h deleted file mode 100644 index ee02b7f1d..000000000 --- a/libc/kernel/common/linux/kref.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _KREF_H_ -#define _KREF_H_ - -#endif diff --git a/libc/kernel/common/linux/ktime.h b/libc/kernel/common/linux/ktime.h deleted file mode 100644 index 34f8f0f02..000000000 --- a/libc/kernel/common/linux/ktime.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_KTIME_H -#define _LINUX_KTIME_H - -#include -#include - -typedef union { - s64 tv64; -#if BITS_PER_LONG != (64 && !defined(CONFIG_KTIME_SCALAR)) - struct { -#ifdef __BIG_ENDIAN - s32 sec, nsec; -#else - s32 nsec, sec; -#endif - } tv; -#endif -} ktime_t; - -#define KTIME_MAX ((s64)~((u64)1 << 63)) -#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) - -#if BITS_PER_LONG == 64 - -#if BITS_PER_LONG == 64 -#endif -#define ktime_sub(lhs, rhs) ({ (ktime_t){ .tv64 = (lhs).tv64 - (rhs).tv64 }; }) -#define ktime_add(lhs, rhs) ({ (ktime_t){ .tv64 = (lhs).tv64 + (rhs).tv64 }; }) -#define ktime_add_ns(kt, nsval) ({ (ktime_t){ .tv64 = (kt).tv64 + (nsval) }; }) -#define ktime_to_timespec(kt) ns_to_timespec((kt).tv64) -#define ktime_to_timeval(kt) ns_to_timeval((kt).tv64) -#define ktime_to_ns(kt) ((kt).tv64) -#else - -#endif -#define KTIME_REALTIME_RES (ktime_t){ .tv64 = TICK_NSEC } -#define KTIME_MONOTONIC_RES (ktime_t){ .tv64 = TICK_NSEC } - -#define ktime_get_real_ts(ts) getnstimeofday(ts) - -#endif diff --git a/libc/kernel/common/linux/limits.h b/libc/kernel/common/linux/limits.h deleted file mode 100644 index 5565e30e9..000000000 --- a/libc/kernel/common/linux/limits.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_LIMITS_H -#define _LINUX_LIMITS_H - -#define NR_OPEN 1024 - -#define NGROUPS_MAX 65536 -#define ARG_MAX 131072 -#define CHILD_MAX 999 -#define OPEN_MAX 256 -#define LINK_MAX 127 -#define MAX_CANON 255 -#define MAX_INPUT 255 -#define NAME_MAX 255 -#define PATH_MAX 4096 -#define PIPE_BUF 4096 -#define XATTR_NAME_MAX 255 -#define XATTR_SIZE_MAX 65536 -#define XATTR_LIST_MAX 65536 - -#define RTSIG_MAX 32 - -#endif diff --git a/libc/kernel/common/linux/linkage.h b/libc/kernel/common/linux/linkage.h deleted file mode 100644 index e0194bc8d..000000000 --- a/libc/kernel/common/linux/linkage.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_LINKAGE_H -#define _LINUX_LINKAGE_H - -#include - -#ifdef __cplusplus -#define CPP_ASMLINKAGE extern "C" -#else -#define CPP_ASMLINKAGE -#endif - -#ifndef asmlinkage -#define asmlinkage CPP_ASMLINKAGE -#endif - -#ifndef prevent_tail_call -#define prevent_tail_call(ret) do { } while (0) -#endif - -#ifndef __ALIGN -#define __ALIGN .align 4,0x90 -#define __ALIGN_STR ".align 4,0x90" -#endif - -#ifdef __ASSEMBLY__ - -#define ALIGN __ALIGN -#define ALIGN_STR __ALIGN_STR - -#ifndef ENTRY -#define ENTRY(name) .globl name; ALIGN; name: -#endif - -#define KPROBE_ENTRY(name) .section .kprobes.text, "ax"; ENTRY(name) - -#ifndef END -#define END(name) .size name, .-name -#endif - -#ifndef ENDPROC -#define ENDPROC(name) .type name, @function; END(name) -#endif - -#endif - -#define NORET_TYPE -#define ATTRIB_NORET __attribute__((noreturn)) -#define NORET_AND noreturn, - -#ifndef FASTCALL -#define FASTCALL(x) x -#define fastcall -#endif - -#endif diff --git a/libc/kernel/common/linux/list.h b/libc/kernel/common/linux/list.h deleted file mode 100644 index d17871db6..000000000 --- a/libc/kernel/common/linux/list.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_LIST_H -#define _LINUX_LIST_H - -#warning "don't include kernel headers in userspace" -#endif diff --git a/libc/kernel/common/linux/lockd/nlm.h b/libc/kernel/common/linux/lockd/nlm.h deleted file mode 100644 index d5d44fe95..000000000 --- a/libc/kernel/common/linux/lockd/nlm.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_LOCKD_NLM_H -#define LINUX_LOCKD_NLM_H - -#define NLM_OFFSET_MAX ((s32) 0x7fffffff) -#define NLM4_OFFSET_MAX ((s64) ((~(u64)0) >> 1)) - -enum { - NLM_LCK_GRANTED = 0, - NLM_LCK_DENIED = 1, - NLM_LCK_DENIED_NOLOCKS = 2, - NLM_LCK_BLOCKED = 3, - NLM_LCK_DENIED_GRACE_PERIOD = 4, -}; - -#define NLM_PROGRAM 100021 - -#define NLMPROC_NULL 0 -#define NLMPROC_TEST 1 -#define NLMPROC_LOCK 2 -#define NLMPROC_CANCEL 3 -#define NLMPROC_UNLOCK 4 -#define NLMPROC_GRANTED 5 -#define NLMPROC_TEST_MSG 6 -#define NLMPROC_LOCK_MSG 7 -#define NLMPROC_CANCEL_MSG 8 -#define NLMPROC_UNLOCK_MSG 9 -#define NLMPROC_GRANTED_MSG 10 -#define NLMPROC_TEST_RES 11 -#define NLMPROC_LOCK_RES 12 -#define NLMPROC_CANCEL_RES 13 -#define NLMPROC_UNLOCK_RES 14 -#define NLMPROC_GRANTED_RES 15 -#define NLMPROC_NSM_NOTIFY 16 -#define NLMPROC_SHARE 20 -#define NLMPROC_UNSHARE 21 -#define NLMPROC_NM_LOCK 22 -#define NLMPROC_FREE_ALL 23 - -#endif diff --git a/libc/kernel/common/linux/lockd/xdr.h b/libc/kernel/common/linux/lockd/xdr.h deleted file mode 100644 index 75d0308e0..000000000 --- a/libc/kernel/common/linux/lockd/xdr.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LOCKD_XDR_H -#define LOCKD_XDR_H - -#include -#include -#include - -#define NLM_MAXCOOKIELEN 32 -#define NLM_MAXSTRLEN 1024 - -#define nlm_granted __constant_htonl(NLM_LCK_GRANTED) -#define nlm_lck_denied __constant_htonl(NLM_LCK_DENIED) -#define nlm_lck_denied_nolocks __constant_htonl(NLM_LCK_DENIED_NOLOCKS) -#define nlm_lck_blocked __constant_htonl(NLM_LCK_BLOCKED) -#define nlm_lck_denied_grace_period __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD) - -struct nlm_lock { - char * caller; - int len; - struct nfs_fh fh; - struct xdr_netobj oh; - u32 svid; - struct file_lock fl; -}; - -struct nlm_cookie -{ - unsigned char data[NLM_MAXCOOKIELEN]; - unsigned int len; -}; - -struct nlm_args { - struct nlm_cookie cookie; - struct nlm_lock lock; - u32 block; - u32 reclaim; - u32 state; - u32 monitor; - u32 fsm_access; - u32 fsm_mode; -}; - -typedef struct nlm_args nlm_args; - -struct nlm_res { - struct nlm_cookie cookie; - u32 status; - struct nlm_lock lock; -}; - -struct nlm_reboot { - char * mon; - int len; - u32 state; - u32 addr; - u32 vers; - u32 proto; -}; - -#define NLMSVC_XDRSIZE sizeof(struct nlm_args) - -#endif diff --git a/libc/kernel/common/linux/lockdep.h b/libc/kernel/common/linux/lockdep.h deleted file mode 100644 index f5e86349c..000000000 --- a/libc/kernel/common/linux/lockdep.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_LOCKDEP_H -#define __LINUX_LOCKDEP_H - -#include -#include -#include -#include - -#define lock_acquire(l, s, t, r, c, i) do { } while (0) -#define lock_release(l, n, i) do { } while (0) -#define lockdep_init() do { } while (0) -#define lockdep_info() do { } while (0) -#define lockdep_init_map(lock, name, key) do { (void)(key); } while (0) -#define lockdep_set_class(lock, key) do { (void)(key); } while (0) -#define lockdep_set_class_and_name(lock, key, name) do { (void)(key); } while (0) -#define INIT_LOCKDEP -#define lockdep_reset() do { debug_locks = 1; } while (0) -#define lockdep_free_key_range(start, size) do { } while (0) - -#define early_init_irq_lock_class() do { } while (0) - -#define early_boot_irqs_off() do { } while (0) -#define early_boot_irqs_on() do { } while (0) - -#define SINGLE_DEPTH_NESTING 1 - -#define spin_acquire(l, s, t, i) do { } while (0) -#define spin_release(l, n, i) do { } while (0) - -#define rwlock_acquire(l, s, t, i) do { } while (0) -#define rwlock_acquire_read(l, s, t, i) do { } while (0) -#define rwlock_release(l, n, i) do { } while (0) - -#define mutex_acquire(l, s, t, i) do { } while (0) -#define mutex_release(l, n, i) do { } while (0) - -#define rwsem_acquire(l, s, t, i) do { } while (0) -#define rwsem_acquire_read(l, s, t, i) do { } while (0) -#define rwsem_release(l, n, i) do { } while (0) - -#endif diff --git a/libc/kernel/common/linux/loop.h b/libc/kernel/common/linux/loop.h deleted file mode 100644 index 9cdfd382a..000000000 --- a/libc/kernel/common/linux/loop.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_LOOP_H -#define _LINUX_LOOP_H - -#define LO_NAME_SIZE 64 -#define LO_KEY_SIZE 32 - -enum { - LO_FLAGS_READ_ONLY = 1, - LO_FLAGS_USE_AOPS = 2, -}; - -#include -#include - -struct loop_info { - int lo_number; - __kernel_old_dev_t lo_device; - unsigned long lo_inode; - __kernel_old_dev_t lo_rdevice; - int lo_offset; - int lo_encrypt_type; - int lo_encrypt_key_size; - int lo_flags; - char lo_name[LO_NAME_SIZE]; - unsigned char lo_encrypt_key[LO_KEY_SIZE]; - unsigned long lo_init[2]; - char reserved[4]; -}; - -struct loop_info64 { - __u64 lo_device; - __u64 lo_inode; - __u64 lo_rdevice; - __u64 lo_offset; - __u64 lo_sizelimit; - __u32 lo_number; - __u32 lo_encrypt_type; - __u32 lo_encrypt_key_size; - __u32 lo_flags; - __u8 lo_file_name[LO_NAME_SIZE]; - __u8 lo_crypt_name[LO_NAME_SIZE]; - __u8 lo_encrypt_key[LO_KEY_SIZE]; - __u64 lo_init[2]; -}; - -#define LO_CRYPT_NONE 0 -#define LO_CRYPT_XOR 1 -#define LO_CRYPT_DES 2 -#define LO_CRYPT_FISH2 3 -#define LO_CRYPT_BLOW 4 -#define LO_CRYPT_CAST128 5 -#define LO_CRYPT_IDEA 6 -#define LO_CRYPT_DUMMY 9 -#define LO_CRYPT_SKIPJACK 10 -#define LO_CRYPT_CRYPTOAPI 18 -#define MAX_LO_CRYPT 20 - -#define LOOP_SET_FD 0x4C00 -#define LOOP_CLR_FD 0x4C01 -#define LOOP_SET_STATUS 0x4C02 -#define LOOP_GET_STATUS 0x4C03 -#define LOOP_SET_STATUS64 0x4C04 -#define LOOP_GET_STATUS64 0x4C05 -#define LOOP_CHANGE_FD 0x4C06 - -#endif diff --git a/libc/kernel/common/linux/magic.h b/libc/kernel/common/linux/magic.h deleted file mode 100644 index c94f9ce0c..000000000 --- a/libc/kernel/common/linux/magic.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MAGIC_H__ -#define __LINUX_MAGIC_H__ - -#define ADFS_SUPER_MAGIC 0xadf5 -#define AFFS_SUPER_MAGIC 0xadff -#define AFS_SUPER_MAGIC 0x5346414F -#define AUTOFS_SUPER_MAGIC 0x0187 -#define CODA_SUPER_MAGIC 0x73757245 -#define EFS_SUPER_MAGIC 0x414A53 -#define EXT2_SUPER_MAGIC 0xEF53 -#define EXT3_SUPER_MAGIC 0xEF53 -#define EXT4_SUPER_MAGIC 0xEF53 -#define HPFS_SUPER_MAGIC 0xf995e849 -#define ISOFS_SUPER_MAGIC 0x9660 -#define JFFS2_SUPER_MAGIC 0x72b6 -#define ANON_INODE_FS_MAGIC 0x09041934 - -#define MINIX_SUPER_MAGIC 0x137F -#define MINIX_SUPER_MAGIC2 0x138F -#define MINIX2_SUPER_MAGIC 0x2468 -#define MINIX2_SUPER_MAGIC2 0x2478 -#define MINIX3_SUPER_MAGIC 0x4d5a - -#define MSDOS_SUPER_MAGIC 0x4d44 -#define NCP_SUPER_MAGIC 0x564c -#define NFS_SUPER_MAGIC 0x6969 -#define OPENPROM_SUPER_MAGIC 0x9fa1 -#define PROC_SUPER_MAGIC 0x9fa0 -#define QNX4_SUPER_MAGIC 0x002f - -#define REISERFS_SUPER_MAGIC 0x52654973 - -#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" -#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" -#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" - -#define SMB_SUPER_MAGIC 0x517B -#define USBDEVICE_SUPER_MAGIC 0x9fa2 -#define CGROUP_SUPER_MAGIC 0x27e0eb - -#define FUTEXFS_SUPER_MAGIC 0xBAD1DEA -#define INOTIFYFS_SUPER_MAGIC 0x2BAD1DEA - -#endif diff --git a/libc/kernel/common/linux/major.h b/libc/kernel/common/linux/major.h deleted file mode 100644 index e42d698a2..000000000 --- a/libc/kernel/common/linux/major.h +++ /dev/null @@ -1,175 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MAJOR_H -#define _LINUX_MAJOR_H - -#define UNNAMED_MAJOR 0 -#define MEM_MAJOR 1 -#define RAMDISK_MAJOR 1 -#define FLOPPY_MAJOR 2 -#define PTY_MASTER_MAJOR 2 -#define IDE0_MAJOR 3 -#define HD_MAJOR IDE0_MAJOR -#define PTY_SLAVE_MAJOR 3 -#define TTY_MAJOR 4 -#define TTYAUX_MAJOR 5 -#define LP_MAJOR 6 -#define VCS_MAJOR 7 -#define LOOP_MAJOR 7 -#define SCSI_DISK0_MAJOR 8 -#define SCSI_TAPE_MAJOR 9 -#define MD_MAJOR 9 -#define MISC_MAJOR 10 -#define SCSI_CDROM_MAJOR 11 -#define MUX_MAJOR 11 -#define XT_DISK_MAJOR 13 -#define INPUT_MAJOR 13 -#define SOUND_MAJOR 14 -#define CDU31A_CDROM_MAJOR 15 -#define JOYSTICK_MAJOR 15 -#define GOLDSTAR_CDROM_MAJOR 16 -#define OPTICS_CDROM_MAJOR 17 -#define SANYO_CDROM_MAJOR 18 -#define CYCLADES_MAJOR 19 -#define CYCLADESAUX_MAJOR 20 -#define MITSUMI_X_CDROM_MAJOR 20 -#define MFM_ACORN_MAJOR 21 -#define SCSI_GENERIC_MAJOR 21 -#define IDE1_MAJOR 22 -#define DIGICU_MAJOR 22 -#define DIGI_MAJOR 23 -#define MITSUMI_CDROM_MAJOR 23 -#define CDU535_CDROM_MAJOR 24 -#define STL_SERIALMAJOR 24 -#define MATSUSHITA_CDROM_MAJOR 25 -#define STL_CALLOUTMAJOR 25 -#define MATSUSHITA_CDROM2_MAJOR 26 -#define QIC117_TAPE_MAJOR 27 -#define MATSUSHITA_CDROM3_MAJOR 27 -#define MATSUSHITA_CDROM4_MAJOR 28 -#define STL_SIOMEMMAJOR 28 -#define ACSI_MAJOR 28 -#define AZTECH_CDROM_MAJOR 29 -#define GRAPHDEV_MAJOR 29 -#define CM206_CDROM_MAJOR 32 -#define IDE2_MAJOR 33 -#define IDE3_MAJOR 34 -#define Z8530_MAJOR 34 -#define XPRAM_MAJOR 35 -#define NETLINK_MAJOR 36 -#define PS2ESDI_MAJOR 36 -#define IDETAPE_MAJOR 37 -#define Z2RAM_MAJOR 37 -#define APBLOCK_MAJOR 38 -#define DDV_MAJOR 39 -#define NBD_MAJOR 43 -#define RISCOM8_NORMAL_MAJOR 48 -#define DAC960_MAJOR 48 -#define RISCOM8_CALLOUT_MAJOR 49 -#define MKISS_MAJOR 55 -#define DSP56K_MAJOR 55 - -#define IDE4_MAJOR 56 -#define IDE5_MAJOR 57 - -#define SCSI_DISK1_MAJOR 65 -#define SCSI_DISK2_MAJOR 66 -#define SCSI_DISK3_MAJOR 67 -#define SCSI_DISK4_MAJOR 68 -#define SCSI_DISK5_MAJOR 69 -#define SCSI_DISK6_MAJOR 70 -#define SCSI_DISK7_MAJOR 71 - -#define COMPAQ_SMART2_MAJOR 72 -#define COMPAQ_SMART2_MAJOR1 73 -#define COMPAQ_SMART2_MAJOR2 74 -#define COMPAQ_SMART2_MAJOR3 75 -#define COMPAQ_SMART2_MAJOR4 76 -#define COMPAQ_SMART2_MAJOR5 77 -#define COMPAQ_SMART2_MAJOR6 78 -#define COMPAQ_SMART2_MAJOR7 79 - -#define SPECIALIX_NORMAL_MAJOR 75 -#define SPECIALIX_CALLOUT_MAJOR 76 - -#define AURORA_MAJOR 79 - -#define I2O_MAJOR 80 - -#define SHMIQ_MAJOR 85 -#define SCSI_CHANGER_MAJOR 86 - -#define IDE6_MAJOR 88 -#define IDE7_MAJOR 89 -#define IDE8_MAJOR 90 -#define IDE9_MAJOR 91 - -#define DASD_MAJOR 94 - -#define MDISK_MAJOR 95 - -#define UBD_MAJOR 98 - -#define PP_MAJOR 99 -#define JSFD_MAJOR 99 - -#define PHONE_MAJOR 100 - -#define COMPAQ_CISS_MAJOR 104 -#define COMPAQ_CISS_MAJOR1 105 -#define COMPAQ_CISS_MAJOR2 106 -#define COMPAQ_CISS_MAJOR3 107 -#define COMPAQ_CISS_MAJOR4 108 -#define COMPAQ_CISS_MAJOR5 109 -#define COMPAQ_CISS_MAJOR6 110 -#define COMPAQ_CISS_MAJOR7 111 - -#define VIODASD_MAJOR 112 -#define VIOCD_MAJOR 113 - -#define ATARAID_MAJOR 114 - -#define SCSI_DISK8_MAJOR 128 -#define SCSI_DISK9_MAJOR 129 -#define SCSI_DISK10_MAJOR 130 -#define SCSI_DISK11_MAJOR 131 -#define SCSI_DISK12_MAJOR 132 -#define SCSI_DISK13_MAJOR 133 -#define SCSI_DISK14_MAJOR 134 -#define SCSI_DISK15_MAJOR 135 - -#define UNIX98_PTY_MASTER_MAJOR 128 -#define UNIX98_PTY_MAJOR_COUNT 8 -#define UNIX98_PTY_SLAVE_MAJOR (UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT) - -#define RTF_MAJOR 150 -#define RAW_MAJOR 162 - -#define USB_ACM_MAJOR 166 -#define USB_ACM_AUX_MAJOR 167 -#define USB_CHAR_MAJOR 180 - -#define VXVM_MAJOR 199 -#define VXSPEC_MAJOR 200 -#define VXDMP_MAJOR 201 - -#define MSR_MAJOR 202 -#define CPUID_MAJOR 203 - -#define OSST_MAJOR 206 - -#define IBM_TTY3270_MAJOR 227 -#define IBM_FS3270_MAJOR 228 - -#define VIOTAPE_MAJOR 230 - -#endif diff --git a/libc/kernel/common/linux/mc146818rtc.h b/libc/kernel/common/linux/mc146818rtc.h deleted file mode 100644 index 74436ea6e..000000000 --- a/libc/kernel/common/linux/mc146818rtc.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _MC146818RTC_H -#define _MC146818RTC_H - -#include -#include -#include - -#define RTC_SECONDS 0 -#define RTC_SECONDS_ALARM 1 -#define RTC_MINUTES 2 -#define RTC_MINUTES_ALARM 3 -#define RTC_HOURS 4 -#define RTC_HOURS_ALARM 5 - -#define RTC_ALARM_DONT_CARE 0xC0 - -#define RTC_DAY_OF_WEEK 6 -#define RTC_DAY_OF_MONTH 7 -#define RTC_MONTH 8 -#define RTC_YEAR 9 - -#define RTC_REG_A 10 -#define RTC_REG_B 11 -#define RTC_REG_C 12 -#define RTC_REG_D 13 - -#define RTC_FREQ_SELECT RTC_REG_A - -#define RTC_UIP 0x80 -#define RTC_DIV_CTL 0x70 - -#define RTC_REF_CLCK_4MHZ 0x00 -#define RTC_REF_CLCK_1MHZ 0x10 -#define RTC_REF_CLCK_32KHZ 0x20 - -#define RTC_DIV_RESET1 0x60 -#define RTC_DIV_RESET2 0x70 - -#define RTC_RATE_SELECT 0x0F - -#define RTC_CONTROL RTC_REG_B -#define RTC_SET 0x80 -#define RTC_PIE 0x40 -#define RTC_AIE 0x20 -#define RTC_UIE 0x10 -#define RTC_SQWE 0x08 -#define RTC_DM_BINARY 0x04 -#define RTC_24H 0x02 -#define RTC_DST_EN 0x01 - -#define RTC_INTR_FLAGS RTC_REG_C - -#define RTC_IRQF 0x80 -#define RTC_PF 0x40 -#define RTC_AF 0x20 -#define RTC_UF 0x10 - -#define RTC_VALID RTC_REG_D -#define RTC_VRT 0x80 - -#ifndef ARCH_RTC_LOCATION - -#define RTC_IO_EXTENT 0x8 -#define RTC_IOMAPPED 1 - -#endif - -#endif diff --git a/libc/kernel/common/linux/mca.h b/libc/kernel/common/linux/mca.h deleted file mode 100644 index dfbfc2ab9..000000000 --- a/libc/kernel/common/linux/mca.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MCA_H -#define _LINUX_MCA_H - -#include - -#define MCA_bus 0 - -typedef int (*MCA_ProcFn)(char* buf, int slot, void* dev); - -enum MCA_AdapterStatus { - MCA_ADAPTER_NORMAL = 0, - MCA_ADAPTER_NONE = 1, - MCA_ADAPTER_DISABLED = 2, - MCA_ADAPTER_ERROR = 3 -}; - -struct mca_device { - u64 dma_mask; - int pos_id; - int slot; - - int index; - - int driver_loaded; - - unsigned char pos[8]; - - short pos_register; - - enum MCA_AdapterStatus status; - struct device dev; - char name[32]; -}; -#define to_mca_device(mdev) container_of(mdev, struct mca_device, dev) - -struct mca_bus_accessor_functions { - unsigned char (*mca_read_pos)(struct mca_device *, int reg); - void (*mca_write_pos)(struct mca_device *, int reg, - unsigned char byte); - int (*mca_transform_irq)(struct mca_device *, int irq); - int (*mca_transform_ioport)(struct mca_device *, - int region); - void * (*mca_transform_memory)(struct mca_device *, - void *memory); -}; - -struct mca_bus { - u64 default_dma_mask; - int number; - struct mca_bus_accessor_functions f; - struct device dev; - char name[32]; -}; -#define to_mca_bus(mdev) container_of(mdev, struct mca_bus, dev) - -struct mca_driver { - const short *id_table; - void *driver_data; - struct device_driver driver; -}; -#define to_mca_driver(mdriver) container_of(mdriver, struct mca_driver, driver) - -#endif diff --git a/libc/kernel/common/linux/mempolicy.h b/libc/kernel/common/linux/mempolicy.h deleted file mode 100644 index 6b7b2d424..000000000 --- a/libc/kernel/common/linux/mempolicy.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MEMPOLICY_H -#define _LINUX_MEMPOLICY_H 1 - -#include - -#define MPOL_DEFAULT 0 -#define MPOL_PREFERRED 1 -#define MPOL_BIND 2 -#define MPOL_INTERLEAVE 3 - -#define MPOL_MAX MPOL_INTERLEAVE - -#define MPOL_F_NODE (1<<0) -#define MPOL_F_ADDR (1<<1) - -#define MPOL_MF_STRICT (1<<0) -#define MPOL_MF_MOVE (1<<1) -#define MPOL_MF_MOVE_ALL (1<<2) -#define MPOL_MF_INTERNAL (1<<3) - -#endif diff --git a/libc/kernel/common/linux/mempool.h b/libc/kernel/common/linux/mempool.h deleted file mode 100644 index fa2432b38..000000000 --- a/libc/kernel/common/linux/mempool.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MEMPOOL_H -#define _LINUX_MEMPOOL_H - -#include - -struct kmem_cache; - -typedef void * (mempool_alloc_t)(gfp_t gfp_mask, void *pool_data); -typedef void (mempool_free_t)(void *element, void *pool_data); - -typedef struct mempool_s { - spinlock_t lock; - int min_nr; - int curr_nr; - void **elements; - - void *pool_data; - mempool_alloc_t *alloc; - mempool_free_t *free; - wait_queue_head_t wait; -} mempool_t; - -#endif diff --git a/libc/kernel/common/linux/miscdevice.h b/libc/kernel/common/linux/miscdevice.h deleted file mode 100644 index 457960ac1..000000000 --- a/libc/kernel/common/linux/miscdevice.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MISCDEVICE_H -#define _LINUX_MISCDEVICE_H -#include -#include - -#define PSMOUSE_MINOR 1 -#define MS_BUSMOUSE_MINOR 2 -#define ATIXL_BUSMOUSE_MINOR 3 - -#define ATARIMOUSE_MINOR 5 -#define SUN_MOUSE_MINOR 6 -#define APOLLO_MOUSE_MINOR 7 -#define PC110PAD_MINOR 9 - -#define WATCHDOG_MINOR 130 -#define TEMP_MINOR 131 -#define RTC_MINOR 135 -#define EFI_RTC_MINOR 136 -#define SUN_OPENPROM_MINOR 139 -#define DMAPI_MINOR 140 -#define NVRAM_MINOR 144 -#define SGI_MMTIMER 153 -#define STORE_QUEUE_MINOR 155 -#define I2O_MINOR 166 -#define MICROCODE_MINOR 184 -#define MWAVE_MINOR 219 -#define MPT_MINOR 220 -#define MISC_DYNAMIC_MINOR 255 - -#define TUN_MINOR 200 -#define HPET_MINOR 228 - -struct device; -struct class_device; - -struct miscdevice { - int minor; - const char *name; - const struct file_operations *fops; - struct list_head list; - struct device *dev; - struct class_device *class; -}; - -#define MODULE_ALIAS_MISCDEV(minor) MODULE_ALIAS("char-major-" __stringify(MISC_MAJOR) "-" __stringify(minor)) -#endif diff --git a/libc/kernel/common/linux/mm.h b/libc/kernel/common/linux/mm.h deleted file mode 100644 index fea293b56..000000000 --- a/libc/kernel/common/linux/mm.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MM_H -#define _LINUX_MM_H - -#include -#include -#include - -#endif diff --git a/libc/kernel/common/linux/mmc/card.h b/libc/kernel/common/linux/mmc/card.h deleted file mode 100644 index 94afe21a4..000000000 --- a/libc/kernel/common/linux/mmc/card.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_MMC_CARD_H -#define LINUX_MMC_CARD_H - -#include - -struct mmc_cid { - unsigned int manfid; - char prod_name[8]; - unsigned int serial; - unsigned short oemid; - unsigned short year; - unsigned char hwrev; - unsigned char fwrev; - unsigned char month; -}; - -struct mmc_csd { - unsigned char mmca_vsn; - unsigned short cmdclass; - unsigned short tacc_clks; - unsigned int tacc_ns; - unsigned int r2w_factor; - unsigned int max_dtr; - unsigned int read_blkbits; - unsigned int write_blkbits; - unsigned int capacity; - unsigned int read_partial:1, - read_misalign:1, - write_partial:1, - write_misalign:1; -}; - -struct sd_scr { - unsigned char sda_vsn; - unsigned char bus_widths; -#define SD_SCR_BUS_WIDTH_1 (1<<0) -#define SD_SCR_BUS_WIDTH_4 (1<<2) -}; - -struct mmc_host; - -struct mmc_card { - struct list_head node; - struct mmc_host *host; - struct device dev; - unsigned int rca; - unsigned int state; -#define MMC_STATE_PRESENT (1<<0) -#define MMC_STATE_DEAD (1<<1) -#define MMC_STATE_BAD (1<<2) -#define MMC_STATE_SDCARD (1<<3) -#define MMC_STATE_READONLY (1<<4) - u32 raw_cid[4]; - u32 raw_csd[4]; - u32 raw_scr[2]; - struct mmc_cid cid; - struct mmc_csd csd; - struct sd_scr scr; -}; - -#define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT) -#define mmc_card_dead(c) ((c)->state & MMC_STATE_DEAD) -#define mmc_card_bad(c) ((c)->state & MMC_STATE_BAD) -#define mmc_card_sd(c) ((c)->state & MMC_STATE_SDCARD) -#define mmc_card_readonly(c) ((c)->state & MMC_STATE_READONLY) - -#define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT) -#define mmc_card_set_dead(c) ((c)->state |= MMC_STATE_DEAD) -#define mmc_card_set_bad(c) ((c)->state |= MMC_STATE_BAD) -#define mmc_card_set_sd(c) ((c)->state |= MMC_STATE_SDCARD) -#define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY) - -#define mmc_card_name(c) ((c)->cid.prod_name) -#define mmc_card_id(c) ((c)->dev.bus_id) - -#define mmc_list_to_card(l) container_of(l, struct mmc_card, node) -#define mmc_get_drvdata(c) dev_get_drvdata(&(c)->dev) -#define mmc_set_drvdata(c,d) dev_set_drvdata(&(c)->dev, d) - -struct mmc_driver { - struct device_driver drv; - int (*probe)(struct mmc_card *); - void (*remove)(struct mmc_card *); - int (*suspend)(struct mmc_card *, pm_message_t); - int (*resume)(struct mmc_card *); -}; - -#define mmc_card_release_host(c) mmc_release_host((c)->host) -#endif diff --git a/libc/kernel/common/linux/mmc/host.h b/libc/kernel/common/linux/mmc/host.h deleted file mode 100644 index 94336264e..000000000 --- a/libc/kernel/common/linux/mmc/host.h +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_MMC_HOST_H -#define LINUX_MMC_HOST_H - -#include - -struct mmc_ios { - unsigned int clock; - unsigned short vdd; - -#define MMC_VDD_150 0 -#define MMC_VDD_155 1 -#define MMC_VDD_160 2 -#define MMC_VDD_165 3 -#define MMC_VDD_170 4 -#define MMC_VDD_180 5 -#define MMC_VDD_190 6 -#define MMC_VDD_200 7 -#define MMC_VDD_210 8 -#define MMC_VDD_220 9 -#define MMC_VDD_230 10 -#define MMC_VDD_240 11 -#define MMC_VDD_250 12 -#define MMC_VDD_260 13 -#define MMC_VDD_270 14 -#define MMC_VDD_280 15 -#define MMC_VDD_290 16 -#define MMC_VDD_300 17 -#define MMC_VDD_310 18 -#define MMC_VDD_320 19 -#define MMC_VDD_330 20 -#define MMC_VDD_340 21 -#define MMC_VDD_350 22 -#define MMC_VDD_360 23 - - unsigned char bus_mode; - -#define MMC_BUSMODE_OPENDRAIN 1 -#define MMC_BUSMODE_PUSHPULL 2 - - unsigned char chip_select; - -#define MMC_CS_DONTCARE 0 -#define MMC_CS_HIGH 1 -#define MMC_CS_LOW 2 - - unsigned char power_mode; - -#define MMC_POWER_OFF 0 -#define MMC_POWER_UP 1 -#define MMC_POWER_ON 2 - - unsigned char bus_width; - -#define MMC_BUS_WIDTH_1 0 -#define MMC_BUS_WIDTH_4 2 -}; - -struct mmc_host_ops { - void (*request)(struct mmc_host *host, struct mmc_request *req); - void (*set_ios)(struct mmc_host *host, struct mmc_ios *ios); - int (*get_ro)(struct mmc_host *host); -}; - -struct mmc_card; -struct device; - -struct mmc_host { - struct device *dev; - struct class_device class_dev; - int index; - const struct mmc_host_ops *ops; - unsigned int f_min; - unsigned int f_max; - u32 ocr_avail; - - unsigned long caps; - -#define MMC_CAP_4_BIT_DATA (1 << 0) - - unsigned int max_seg_size; - unsigned short max_hw_segs; - unsigned short max_phys_segs; - unsigned short max_sectors; - unsigned short unused; - - struct mmc_ios ios; - u32 ocr; - - unsigned int mode; -#define MMC_MODE_MMC 0 -#define MMC_MODE_SD 1 - - struct list_head cards; - - wait_queue_head_t wq; - spinlock_t lock; - struct mmc_card *card_busy; - struct mmc_card *card_selected; - - struct work_struct detect; - - unsigned long private[0] ____cacheline_aligned; -}; - -#define mmc_dev(x) ((x)->dev) -#define mmc_hostname(x) ((x)->class_dev.class_id) - -#endif - diff --git a/libc/kernel/common/linux/mmc/mmc.h b/libc/kernel/common/linux/mmc/mmc.h deleted file mode 100644 index 089714cbf..000000000 --- a/libc/kernel/common/linux/mmc/mmc.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef MMC_H -#define MMC_H - -#include -#include -#include - -struct request; -struct mmc_data; -struct mmc_request; - -struct mmc_command { - u32 opcode; - u32 arg; - u32 resp[4]; - unsigned int flags; -#define MMC_RSP_PRESENT (1 << 0) -#define MMC_RSP_136 (1 << 1) -#define MMC_RSP_CRC (1 << 2) -#define MMC_RSP_BUSY (1 << 3) -#define MMC_RSP_OPCODE (1 << 4) -#define MMC_CMD_MASK (3 << 5) -#define MMC_CMD_AC (0 << 5) -#define MMC_CMD_ADTC (1 << 5) -#define MMC_CMD_BC (2 << 5) -#define MMC_CMD_BCR (3 << 5) - -#define MMC_RSP_NONE (0) -#define MMC_RSP_R1 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) -#define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) -#define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) -#define MMC_RSP_R3 (MMC_RSP_PRESENT) -#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC) - -#define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) - -#define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK) - - unsigned int retries; - unsigned int error; - -#define MMC_ERR_NONE 0 -#define MMC_ERR_TIMEOUT 1 -#define MMC_ERR_BADCRC 2 -#define MMC_ERR_FIFO 3 -#define MMC_ERR_FAILED 4 -#define MMC_ERR_INVALID 5 - - struct mmc_data *data; - struct mmc_request *mrq; -}; - -struct mmc_data { - unsigned int timeout_ns; - unsigned int timeout_clks; - unsigned int blksz_bits; - unsigned int blksz; - unsigned int blocks; - unsigned int error; - unsigned int flags; - -#define MMC_DATA_WRITE (1 << 8) -#define MMC_DATA_READ (1 << 9) -#define MMC_DATA_STREAM (1 << 10) -#define MMC_DATA_MULTI (1 << 11) - - unsigned int bytes_xfered; - - struct mmc_command *stop; - struct mmc_request *mrq; - - unsigned int sg_len; - struct scatterlist *sg; -}; - -struct mmc_request { - struct mmc_command *cmd; - struct mmc_data *data; - struct mmc_command *stop; - - void *done_data; - void (*done)(struct mmc_request *); -}; - -struct mmc_host; -struct mmc_card; - -#endif diff --git a/libc/kernel/common/linux/mmzone.h b/libc/kernel/common/linux/mmzone.h deleted file mode 100644 index a81382ee7..000000000 --- a/libc/kernel/common/linux/mmzone.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MMZONE_H -#define _LINUX_MMZONE_H - -#endif diff --git a/libc/kernel/common/linux/mod_devicetable.h b/libc/kernel/common/linux/mod_devicetable.h deleted file mode 100644 index a3c1de818..000000000 --- a/libc/kernel/common/linux/mod_devicetable.h +++ /dev/null @@ -1,209 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_MOD_DEVICETABLE_H -#define LINUX_MOD_DEVICETABLE_H - -#define PCI_ANY_ID (~0) - -struct pci_device_id { - __u32 vendor, device; - __u32 subvendor, subdevice; - __u32 class, class_mask; - kernel_ulong_t driver_data; -}; - -#define IEEE1394_MATCH_VENDOR_ID 0x0001 -#define IEEE1394_MATCH_MODEL_ID 0x0002 -#define IEEE1394_MATCH_SPECIFIER_ID 0x0004 -#define IEEE1394_MATCH_VERSION 0x0008 - -struct ieee1394_device_id { - __u32 match_flags; - __u32 vendor_id; - __u32 model_id; - __u32 specifier_id; - __u32 version; - kernel_ulong_t driver_data - __attribute__((aligned(sizeof(kernel_ulong_t)))); -}; - -struct usb_device_id { - - __u16 match_flags; - - __u16 idVendor; - __u16 idProduct; - __u16 bcdDevice_lo; - __u16 bcdDevice_hi; - - __u8 bDeviceClass; - __u8 bDeviceSubClass; - __u8 bDeviceProtocol; - - __u8 bInterfaceClass; - __u8 bInterfaceSubClass; - __u8 bInterfaceProtocol; - - kernel_ulong_t driver_info; -}; - -#define USB_DEVICE_ID_MATCH_VENDOR 0x0001 -#define USB_DEVICE_ID_MATCH_PRODUCT 0x0002 -#define USB_DEVICE_ID_MATCH_DEV_LO 0x0004 -#define USB_DEVICE_ID_MATCH_DEV_HI 0x0008 -#define USB_DEVICE_ID_MATCH_DEV_CLASS 0x0010 -#define USB_DEVICE_ID_MATCH_DEV_SUBCLASS 0x0020 -#define USB_DEVICE_ID_MATCH_DEV_PROTOCOL 0x0040 -#define USB_DEVICE_ID_MATCH_INT_CLASS 0x0080 -#define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100 -#define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 - -struct ccw_device_id { - __u16 match_flags; - - __u16 cu_type; - __u16 dev_type; - __u8 cu_model; - __u8 dev_model; - - kernel_ulong_t driver_info; -}; - -#define CCW_DEVICE_ID_MATCH_CU_TYPE 0x01 -#define CCW_DEVICE_ID_MATCH_CU_MODEL 0x02 -#define CCW_DEVICE_ID_MATCH_DEVICE_TYPE 0x04 -#define CCW_DEVICE_ID_MATCH_DEVICE_MODEL 0x08 - -#define PNP_ID_LEN 8 -#define PNP_MAX_DEVICES 8 - -struct pnp_device_id { - __u8 id[PNP_ID_LEN]; - kernel_ulong_t driver_data; -}; - -struct pnp_card_device_id { - __u8 id[PNP_ID_LEN]; - kernel_ulong_t driver_data; - struct { - __u8 id[PNP_ID_LEN]; - } devs[PNP_MAX_DEVICES]; -}; - -#define SERIO_ANY 0xff - -struct serio_device_id { - __u8 type; - __u8 extra; - __u8 id; - __u8 proto; -}; - -struct of_device_id -{ - char name[32]; - char type[32]; - char compatible[128]; - kernel_ulong_t data; -}; - -struct vio_device_id { - char type[32]; - char compat[32]; -}; - -struct pcmcia_device_id { - __u16 match_flags; - - __u16 manf_id; - __u16 card_id; - - __u8 func_id; - - __u8 function; - - __u8 device_no; - - __u32 prod_id_hash[4] - __attribute__((aligned(sizeof(__u32)))); - - kernel_ulong_t prod_id[4] - __attribute__((aligned(sizeof(kernel_ulong_t)))); - - kernel_ulong_t driver_info; - kernel_ulong_t cisfile; -}; - -#define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001 -#define PCMCIA_DEV_ID_MATCH_CARD_ID 0x0002 -#define PCMCIA_DEV_ID_MATCH_FUNC_ID 0x0004 -#define PCMCIA_DEV_ID_MATCH_FUNCTION 0x0008 -#define PCMCIA_DEV_ID_MATCH_PROD_ID1 0x0010 -#define PCMCIA_DEV_ID_MATCH_PROD_ID2 0x0020 -#define PCMCIA_DEV_ID_MATCH_PROD_ID3 0x0040 -#define PCMCIA_DEV_ID_MATCH_PROD_ID4 0x0080 -#define PCMCIA_DEV_ID_MATCH_DEVICE_NO 0x0100 -#define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 -#define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 - -struct i2c_device_id { - __u16 id; -}; - -#define INPUT_DEVICE_ID_EV_MAX 0x1f -#define INPUT_DEVICE_ID_KEY_MAX 0x1ff -#define INPUT_DEVICE_ID_REL_MAX 0x0f -#define INPUT_DEVICE_ID_ABS_MAX 0x3f -#define INPUT_DEVICE_ID_MSC_MAX 0x07 -#define INPUT_DEVICE_ID_LED_MAX 0x0f -#define INPUT_DEVICE_ID_SND_MAX 0x07 -#define INPUT_DEVICE_ID_FF_MAX 0x7f -#define INPUT_DEVICE_ID_SW_MAX 0x0f - -#define INPUT_DEVICE_ID_MATCH_BUS 1 -#define INPUT_DEVICE_ID_MATCH_VENDOR 2 -#define INPUT_DEVICE_ID_MATCH_PRODUCT 4 -#define INPUT_DEVICE_ID_MATCH_VERSION 8 - -#define INPUT_DEVICE_ID_MATCH_EVBIT 0x0010 -#define INPUT_DEVICE_ID_MATCH_KEYBIT 0x0020 -#define INPUT_DEVICE_ID_MATCH_RELBIT 0x0040 -#define INPUT_DEVICE_ID_MATCH_ABSBIT 0x0080 -#define INPUT_DEVICE_ID_MATCH_MSCIT 0x0100 -#define INPUT_DEVICE_ID_MATCH_LEDBIT 0x0200 -#define INPUT_DEVICE_ID_MATCH_SNDBIT 0x0400 -#define INPUT_DEVICE_ID_MATCH_FFBIT 0x0800 -#define INPUT_DEVICE_ID_MATCH_SWBIT 0x1000 - -struct input_device_id { - - kernel_ulong_t flags; - - __u16 bustype; - __u16 vendor; - __u16 product; - __u16 version; - - kernel_ulong_t evbit[INPUT_DEVICE_ID_EV_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t keybit[INPUT_DEVICE_ID_KEY_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t relbit[INPUT_DEVICE_ID_REL_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t absbit[INPUT_DEVICE_ID_ABS_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t mscbit[INPUT_DEVICE_ID_MSC_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t ledbit[INPUT_DEVICE_ID_LED_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t sndbit[INPUT_DEVICE_ID_SND_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t ffbit[INPUT_DEVICE_ID_FF_MAX / BITS_PER_LONG + 1]; - kernel_ulong_t swbit[INPUT_DEVICE_ID_SW_MAX / BITS_PER_LONG + 1]; - - kernel_ulong_t driver_info; -}; - -#endif diff --git a/libc/kernel/common/linux/module.h b/libc/kernel/common/linux/module.h deleted file mode 100644 index 3c449c64d..000000000 --- a/libc/kernel/common/linux/module.h +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MODULE_H -#define _LINUX_MODULE_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#define MODULE_SUPPORTED_DEVICE(name) - -#ifndef MODULE_SYMBOL_PREFIX -#define MODULE_SYMBOL_PREFIX "" -#endif - -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) - -struct kernel_symbol -{ - unsigned long value; - const char *name; -}; - -struct modversion_info -{ - unsigned long crc; - char name[MODULE_NAME_LEN]; -}; - -struct module; - -struct module_attribute { - struct attribute attr; - ssize_t (*show)(struct module_attribute *, struct module *, char *); - ssize_t (*store)(struct module_attribute *, struct module *, - const char *, size_t count); - void (*setup)(struct module *, const char *); - int (*test)(struct module *); - void (*free)(struct module *); -}; - -struct module_kobject -{ - struct kobject kobj; - struct module *mod; -}; - -struct exception_table_entry; - -#ifdef MODULE -#define MODULE_GENERIC_TABLE(gtype,name) extern const struct gtype##_id __mod_##gtype##_table __attribute__ ((unused, alias(__stringify(name)))) - -#define THIS_MODULE (&__this_module) -#else -#define MODULE_GENERIC_TABLE(gtype,name) -#define THIS_MODULE ((struct module *)0) -#endif - -#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info) - -#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias) - -#define MODULE_LICENSE(_license) MODULE_INFO(license, _license) - -#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author) - -#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) - -#define MODULE_PARM_DESC(_parm, desc) __MODULE_INFO(parm, _parm, #_parm ":" desc) - -#define MODULE_DEVICE_TABLE(type,name) MODULE_GENERIC_TABLE(type##_device,name) - -#define MODULE_VERSION(_version) MODULE_INFO(version, _version) - -struct notifier_block; - -#define EXPORT_SYMBOL(sym) -#define EXPORT_SYMBOL_GPL(sym) -#define EXPORT_SYMBOL_GPL_FUTURE(sym) -#define EXPORT_UNUSED_SYMBOL(sym) -#define EXPORT_UNUSED_SYMBOL_GPL(sym) - -#define symbol_get(x) ({ extern typeof(x) x __attribute__((weak)); &(x); }) -#define symbol_put(x) do { } while(0) -#define symbol_put_addr(x) do { } while(0) -#define module_name(mod) "kernel" -#define __unsafe(mod) -#define module_put_and_exit(code) do_exit(code) - -struct module; - -#define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x) -#define __MODULE_STRING(x) __stringify(x) -#endif diff --git a/libc/kernel/common/linux/moduleparam.h b/libc/kernel/common/linux/moduleparam.h deleted file mode 100644 index b46ddd60c..000000000 --- a/libc/kernel/common/linux/moduleparam.h +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MODULE_PARAMS_H -#define _LINUX_MODULE_PARAMS_H - -#include -#include -#include - -#ifdef MODULE -#define MODULE_PARAM_PREFIX -#else -#define MODULE_PARAM_PREFIX KBUILD_MODNAME "." -#endif - -#ifdef MODULE -#define ___module_cat(a,b) __mod_ ## a ## b -#define __module_cat(a,b) ___module_cat(a,b) -#define __MODULE_INFO(tag, name, info) static const char __module_cat(name,__LINE__)[] __attribute_used__ __attribute__((section(".modinfo"),unused)) = __stringify(tag) "=" info -#else -#define __MODULE_INFO(tag, name, info) -#endif -#define __MODULE_PARM_TYPE(name, _type) __MODULE_INFO(parmtype, name##type, #name ":" _type) - -struct kernel_param; - -typedef int (*param_set_fn)(const char *val, struct kernel_param *kp); - -typedef int (*param_get_fn)(char *buffer, struct kernel_param *kp); - -struct kernel_param { - const char *name; - unsigned int perm; - param_set_fn set; - param_get_fn get; - void *arg; -}; - -struct kparam_string { - unsigned int maxlen; - char *string; -}; - -struct kparam_array -{ - unsigned int max; - unsigned int *num; - param_set_fn set; - param_get_fn get; - unsigned int elemsize; - void *elem; -}; - -#define __module_param_call(prefix, name, set, get, arg, perm) static char __param_str_##name[] = prefix #name; static struct kernel_param const __param_##name __attribute_used__ __attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) = { __param_str_##name, perm, set, get, arg } - -#define module_param_call(name, set, get, arg, perm) __module_param_call(MODULE_PARAM_PREFIX, name, set, get, arg, perm) - -#define module_param_named(name, value, type, perm) param_check_##type(name, &(value)); module_param_call(name, param_set_##type, param_get_##type, &value, perm); __MODULE_PARM_TYPE(name, #type) - -#define module_param(name, type, perm) module_param_named(name, name, type, perm) - -#define module_param_string(name, string, len, perm) static struct kparam_string __param_string_##name = { len, string }; module_param_call(name, param_set_copystring, param_get_string, &__param_string_##name, perm); __MODULE_PARM_TYPE(name, "string") - -#define __param_check(name, p, type) static inline type *__check_##name(void) { return(p); } - -#define param_check_byte(name, p) __param_check(name, p, unsigned char) - -#define param_check_short(name, p) __param_check(name, p, short) - -#define param_check_ushort(name, p) __param_check(name, p, unsigned short) - -#define param_check_int(name, p) __param_check(name, p, int) - -#define param_check_uint(name, p) __param_check(name, p, unsigned int) - -#define param_check_long(name, p) __param_check(name, p, long) - -#define param_check_ulong(name, p) __param_check(name, p, unsigned long) - -#define param_check_charp(name, p) __param_check(name, p, char *) - -#define param_check_bool(name, p) __param_check(name, p, int) - -#define param_check_invbool(name, p) __param_check(name, p, int) - -#define module_param_array_named(name, array, type, nump, perm) static struct kparam_array __param_arr_##name = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type, sizeof(array[0]), array }; module_param_call(name, param_array_set, param_array_get, &__param_arr_##name, perm); __MODULE_PARM_TYPE(name, "array of " #type) - -#define module_param_array(name, type, nump, perm) module_param_array_named(name, name, type, nump, perm) - -struct module; - -#endif diff --git a/libc/kernel/common/linux/mount.h b/libc/kernel/common/linux/mount.h deleted file mode 100644 index ee476e0ab..000000000 --- a/libc/kernel/common/linux/mount.h +++ /dev/null @@ -1,14 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MOUNT_H -#define _LINUX_MOUNT_H -#endif diff --git a/libc/kernel/common/linux/msdos_fs.h b/libc/kernel/common/linux/msdos_fs.h deleted file mode 100644 index 5a4eb0ac7..000000000 --- a/libc/kernel/common/linux/msdos_fs.h +++ /dev/null @@ -1,180 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MSDOS_FS_H -#define _LINUX_MSDOS_FS_H - -#include - -#include - -#define SECTOR_SIZE 512 -#define SECTOR_BITS 9 -#define MSDOS_DPB (MSDOS_DPS) -#define MSDOS_DPB_BITS 4 -#define MSDOS_DPS (SECTOR_SIZE / sizeof(struct msdos_dir_entry)) -#define MSDOS_DPS_BITS 4 -#define CF_LE_W(v) le16_to_cpu(v) -#define CF_LE_L(v) le32_to_cpu(v) -#define CT_LE_W(v) cpu_to_le16(v) -#define CT_LE_L(v) cpu_to_le32(v) - -#define MSDOS_ROOT_INO 1 -#define MSDOS_DIR_BITS 5 - -#define FAT_MAX_DIR_ENTRIES (65536) -#define FAT_MAX_DIR_SIZE (FAT_MAX_DIR_ENTRIES << MSDOS_DIR_BITS) - -#define ATTR_NONE 0 -#define ATTR_RO 1 -#define ATTR_HIDDEN 2 -#define ATTR_SYS 4 -#define ATTR_VOLUME 8 -#define ATTR_DIR 16 -#define ATTR_ARCH 32 - -#define ATTR_UNUSED (ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN) - -#define ATTR_EXT (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME) - -#define CASE_LOWER_BASE 8 -#define CASE_LOWER_EXT 16 - -#define DELETED_FLAG 0xe5 -#define IS_FREE(n) (!*(n) || *(n) == DELETED_FLAG) - -#define MSDOS_VALID_MODE (S_IFREG | S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO) - -#define MSDOS_MKMODE(a, m) (m & (a & ATTR_RO ? S_IRUGO|S_IXUGO : S_IRWXUGO)) - -#define MSDOS_NAME 11 -#define MSDOS_LONGNAME 256 -#define MSDOS_SLOTS 21 -#define MSDOS_DOT ". " -#define MSDOS_DOTDOT ".. " - -#define FAT_VALID_MEDIA(x) ((0xF8 <= (x) && (x) <= 0xFF) || (x) == 0xF0) -#define FAT_FIRST_ENT(s, x) ((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x)) - -#define FAT_START_ENT 2 - -#define MAX_FAT12 0xFF4 -#define MAX_FAT16 0xFFF4 -#define MAX_FAT32 0x0FFFFFF6 -#define MAX_FAT(s) (MSDOS_SB(s)->fat_bits == 32 ? MAX_FAT32 : MSDOS_SB(s)->fat_bits == 16 ? MAX_FAT16 : MAX_FAT12) - -#define BAD_FAT12 0xFF7 -#define BAD_FAT16 0xFFF7 -#define BAD_FAT32 0x0FFFFFF7 - -#define EOF_FAT12 0xFFF -#define EOF_FAT16 0xFFFF -#define EOF_FAT32 0x0FFFFFFF - -#define FAT_ENT_FREE (0) -#define FAT_ENT_BAD (BAD_FAT32) -#define FAT_ENT_EOF (EOF_FAT32) - -#define FAT_FSINFO_SIG1 0x41615252 -#define FAT_FSINFO_SIG2 0x61417272 -#define IS_FSINFO(x) (le32_to_cpu((x)->signature1) == FAT_FSINFO_SIG1 && le32_to_cpu((x)->signature2) == FAT_FSINFO_SIG2) - -#define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, struct dirent [2]) -#define VFAT_IOCTL_READDIR_SHORT _IOR('r', 2, struct dirent [2]) - -#define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) -#define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) -#define VFAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x12, __u32) - -#define VFAT_SFN_DISPLAY_LOWER 0x0001 -#define VFAT_SFN_DISPLAY_WIN95 0x0002 -#define VFAT_SFN_DISPLAY_WINNT 0x0004 -#define VFAT_SFN_CREATE_WIN95 0x0100 -#define VFAT_SFN_CREATE_WINNT 0x0200 - -struct fat_boot_sector { - __u8 ignored[3]; - __u8 system_id[8]; - __u8 sector_size[2]; - __u8 sec_per_clus; - __le16 reserved; - __u8 fats; - __u8 dir_entries[2]; - __u8 sectors[2]; - __u8 media; - __le16 fat_length; - __le16 secs_track; - __le16 heads; - __le32 hidden; - __le32 total_sect; - - __le32 fat32_length; - __le16 flags; - __u8 version[2]; - __le32 root_cluster; - __le16 info_sector; - __le16 backup_boot; - __le16 reserved2[6]; -}; - -struct fat_boot_fsinfo { - __le32 signature1; - __le32 reserved1[120]; - __le32 signature2; - __le32 free_clusters; - __le32 next_cluster; - __le32 reserved2[4]; -}; - -struct fat_boot_bsx { - __u8 drive; - __u8 reserved1; - __u8 signature; - __u8 vol_id[4]; - __u8 vol_label[11]; - __u8 type[8]; -}; -#define FAT16_BSX_OFFSET 36 -#define FAT32_BSX_OFFSET 64 - -struct msdos_dir_entry { - __u8 name[MSDOS_NAME]; - __u8 attr; - __u8 lcase; - __u8 ctime_cs; - __le16 ctime; - __le16 cdate; - __le16 adate; - __le16 starthi; - __le16 time,date,start; - __le32 size; -}; - -struct msdos_dir_slot { - __u8 id; - __u8 name0_4[10]; - __u8 attr; - __u8 reserved; - __u8 alias_checksum; - __u8 name5_10[12]; - __le16 start; - __u8 name11_12[4]; -}; - -struct fat_slot_info { - loff_t i_pos; - loff_t slot_off; - int nr_slots; - struct msdos_dir_entry *de; - struct buffer_head *bh; -}; - -#endif diff --git a/libc/kernel/common/linux/msg.h b/libc/kernel/common/linux/msg.h deleted file mode 100644 index 254f1e9e6..000000000 --- a/libc/kernel/common/linux/msg.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MSG_H -#define _LINUX_MSG_H - -#include - -#define MSG_STAT 11 -#define MSG_INFO 12 - -#define MSG_NOERROR 010000 -#define MSG_EXCEPT 020000 - -struct msqid_ds { - struct ipc_perm msg_perm; - struct msg *msg_first; - struct msg *msg_last; - __kernel_time_t msg_stime; - __kernel_time_t msg_rtime; - __kernel_time_t msg_ctime; - unsigned long msg_lcbytes; - unsigned long msg_lqbytes; - unsigned short msg_cbytes; - unsigned short msg_qnum; - unsigned short msg_qbytes; - __kernel_ipc_pid_t msg_lspid; - __kernel_ipc_pid_t msg_lrpid; -}; - -#include - -struct msgbuf { - long mtype; - char mtext[1]; -}; - -struct msginfo { - int msgpool; - int msgmap; - int msgmax; - int msgmnb; - int msgmni; - int msgssz; - int msgtql; - unsigned short msgseg; -}; - -#define MSGMNI 16 -#define MSGMAX 8192 -#define MSGMNB 16384 - -#define MSGPOOL (MSGMNI*MSGMNB/1024) -#define MSGTQL MSGMNB -#define MSGMAP MSGMNB -#define MSGSSZ 16 -#define __MSGSEG ((MSGPOOL*1024)/ MSGSSZ) -#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) - -#endif diff --git a/libc/kernel/common/linux/msm_adsp.h b/libc/kernel/common/linux/msm_adsp.h deleted file mode 100644 index 6f1270764..000000000 --- a/libc/kernel/common/linux/msm_adsp.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MSM_ADSP_H -#define __LINUX_MSM_ADSP_H - -#include -#include -#include - -#define ADSP_IOCTL_MAGIC 'q' - -struct adsp_command_t { - uint16_t queue; - uint32_t len; - uint8_t *data; -}; - -struct adsp_event_t { - uint16_t type; - uint32_t timeout_ms; - uint16_t msg_id; - uint16_t flags; - uint32_t len; - uint8_t *data; -}; - -struct adsp_pmem_info_t { - int fd; - void *vaddr; -}; - -#define ADSP_IOCTL_ENABLE _IOR(ADSP_IOCTL_MAGIC, 1, unsigned) - -#define ADSP_IOCTL_DISABLE _IOR(ADSP_IOCTL_MAGIC, 2, unsigned) - -#define ADSP_IOCTL_DISABLE_ACK _IOR(ADSP_IOCTL_MAGIC, 3, unsigned) - -#define ADSP_IOCTL_WRITE_COMMAND _IOR(ADSP_IOCTL_MAGIC, 4, struct adsp_command_t *) - -#define ADSP_IOCTL_GET_EVENT _IOWR(ADSP_IOCTL_MAGIC, 5, struct adsp_event_data_t *) - -#define ADSP_IOCTL_DISABLE_EVENT_RSP _IOR(ADSP_IOCTL_MAGIC, 10, unsigned) - -#define ADSP_IOCTL_REGISTER_PMEM _IOW(ADSP_IOCTL_MAGIC, 13, struct adsp_pmem_info *) - -#define ADSP_IOCTL_ABORT_EVENT_READ _IOW(ADSP_IOCTL_MAGIC, 15, unsigned) - -#endif diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h deleted file mode 100644 index 9ac58aaea..000000000 --- a/libc/kernel/common/linux/msm_audio.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MSM_AUDIO_H -#define __LINUX_MSM_AUDIO_H - -#include -#include -#include - -#define AUDIO_IOCTL_MAGIC 'a' - -#define AUDIO_START _IOW(AUDIO_IOCTL_MAGIC, 0, unsigned) -#define AUDIO_STOP _IOW(AUDIO_IOCTL_MAGIC, 1, unsigned) -#define AUDIO_FLUSH _IOW(AUDIO_IOCTL_MAGIC, 2, unsigned) -#define AUDIO_GET_CONFIG _IOR(AUDIO_IOCTL_MAGIC, 3, unsigned) -#define AUDIO_SET_CONFIG _IOW(AUDIO_IOCTL_MAGIC, 4, unsigned) -#define AUDIO_GET_STATS _IOR(AUDIO_IOCTL_MAGIC, 5, unsigned) -#define AUDIO_ENABLE_AUDPP _IOW(AUDIO_IOCTL_MAGIC, 6, unsigned) -#define AUDIO_SET_ADRC _IOW(AUDIO_IOCTL_MAGIC, 7, unsigned) -#define AUDIO_SET_EQ _IOW(AUDIO_IOCTL_MAGIC, 8, unsigned) -#define AUDIO_SET_RX_IIR _IOW(AUDIO_IOCTL_MAGIC, 9, unsigned) -#define AUDIO_SET_VOLUME _IOW(AUDIO_IOCTL_MAGIC, 10, unsigned) -#define AUDIO_ENABLE_AUDPRE _IOW(AUDIO_IOCTL_MAGIC, 11, unsigned) -#define AUDIO_SET_AGC _IOW(AUDIO_IOCTL_MAGIC, 12, unsigned) -#define AUDIO_SET_NS _IOW(AUDIO_IOCTL_MAGIC, 13, unsigned) -#define AUDIO_SET_TX_IIR _IOW(AUDIO_IOCTL_MAGIC, 14, unsigned) - -struct msm_audio_config { - uint32_t buffer_size; - uint32_t buffer_count; - uint32_t channel_count; - uint32_t sample_rate; - uint32_t type; - uint32_t unused[3]; -}; - -struct msm_audio_stats { - uint32_t byte_count; - uint32_t sample_count; - uint32_t unused[2]; -}; - -#define SND_IOCTL_MAGIC 's' - -#define SND_MUTE_UNMUTED 0 -#define SND_MUTE_MUTED 1 - -struct msm_snd_device_config { - uint32_t device; - uint32_t ear_mute; - uint32_t mic_mute; -}; - -#define SND_SET_DEVICE _IOW(SND_IOCTL_MAGIC, 2, struct msm_device_config *) - -#define SND_METHOD_VOICE 0 - -struct msm_snd_volume_config { - uint32_t device; - uint32_t method; - uint32_t volume; -}; - -#define SND_SET_VOLUME _IOW(SND_IOCTL_MAGIC, 3, struct msm_snd_volume_config *) - -#define SND_GET_NUM_ENDPOINTS _IOR(SND_IOCTL_MAGIC, 4, unsigned *) - -struct msm_snd_endpoint { - int id; - char name[64]; -}; - -#define SND_GET_ENDPOINT _IOWR(SND_IOCTL_MAGIC, 5, struct msm_snd_endpoint *) - -#endif - diff --git a/libc/kernel/common/linux/msm_mdp.h b/libc/kernel/common/linux/msm_mdp.h deleted file mode 100644 index d10ed4383..000000000 --- a/libc/kernel/common/linux/msm_mdp.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _MSM_MDP_H_ -#define _MSM_MDP_H_ - -#include - -#define MSMFB_IOCTL_MAGIC 'm' -#define MSMFB_GRP_DISP _IOW(MSMFB_IOCTL_MAGIC, 1, unsigned int) -#define MSMFB_BLIT _IOW(MSMFB_IOCTL_MAGIC, 2, unsigned int) - -enum { - MDP_RGB_565, - MDP_XRGB_8888, - MDP_Y_CBCR_H2V2, - MDP_ARGB_8888, - MDP_RGB_888, - MDP_Y_CRCB_H2V2, - MDP_YCRYCB_H2V1, - MDP_Y_CRCB_H2V1, - MDP_Y_CBCR_H2V1, - MDP_RGBA_8888, - MDP_BGRA_8888, - MDP_IMGTYPE_LIMIT -}; - -enum { - PMEM_IMG, - FB_IMG, -}; - -#define MDP_ROT_NOP 0 -#define MDP_FLIP_LR 0x1 -#define MDP_FLIP_UD 0x2 -#define MDP_ROT_90 0x4 -#define MDP_ROT_180 (MDP_FLIP_UD|MDP_FLIP_LR) -#define MDP_ROT_270 (MDP_ROT_90|MDP_FLIP_UD|MDP_FLIP_LR) -#define MDP_DITHER 0x8 - -#define MDP_TRANSP_NOP 0xffffffff -#define MDP_ALPHA_NOP 0xff - -struct mdp_rect { - uint32_t x; - uint32_t y; - uint32_t w; - uint32_t h; -}; - -struct mdp_img { - uint32_t width; - uint32_t height; - uint32_t format; - uint32_t offset; - int memory_id; -}; - -struct mdp_blit_req { - struct mdp_img src; - struct mdp_img dst; - struct mdp_rect src_rect; - struct mdp_rect dst_rect; - uint32_t alpha; - uint32_t transp_mask; - uint32_t flags; -}; - -struct mdp_blit_req_list { - uint32_t count; - struct mdp_blit_req req[]; -}; - -#endif diff --git a/libc/kernel/common/linux/mt9t013.h b/libc/kernel/common/linux/mt9t013.h deleted file mode 100644 index 11dc4b34d..000000000 --- a/libc/kernel/common/linux/mt9t013.h +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef CAMERA_MT9T013_H -#define CAMERA_MT9T013_H -#include -#include -#include -#include - -#define MT9T013_I2C_IOCTL_MAGIC 'm' - -#define MT9T013_I2C_IOCTL_W _IOW(MT9T013_I2C_IOCTL_MAGIC, 0, unsigned) - -#define MT9T013_I2C_IOCTL_R _IOR(MT9T013_I2C_IOCTL_MAGIC, 1, unsigned) - -#define MT9T013_I2C_IOCTL_AF_W _IOW(MT9T013_I2C_IOCTL_MAGIC, 2, unsigned) - -#define MT9T013_I2C_IOCTL_CAMIF_PAD_REG_RESET _IO(MT9T013_I2C_IOCTL_MAGIC, 3) - -#define MT9T013_I2C_IOCTL_CAMIF_PAD_REG_RESET_2 _IO(MT9T013_I2C_IOCTL_MAGIC, 4) - -#define CAMERA_CONFIGURE_GPIOS _IO(MT9T013_I2C_IOCTL_MAGIC, 7) - -#define CAMERA_UNCONFIGURE_GPIOS _IO(MT9T013_I2C_IOCTL_MAGIC, 8) - -#define CAMERA_LENS_POWER_ON _IO(MT9T013_I2C_IOCTL_MAGIC, 9) - -#define CAMERA_LENS_POWER_OFF _IO(MT9T013_I2C_IOCTL_MAGIC, 10) - -#define MT9T013_I2C_IOCTL_CAMIF_APPS_RESET _IO(MT9T013_I2C_IOCTL_MAGIC, 11) - -#define CAMIO_VFE_MDC_CLK 1 -#define CAMIO_MDC_CLK 2 -#define CAMIO_VFE_CLK 3 - -#define MT9T013_I2C_IOCTL_CLK_ENABLE _IOW(MT9T013_I2C_IOCTL_MAGIC, 12, unsigned) - -#define MT9T013_I2C_IOCTL_CLK_DISABLE _IOW(MT9T013_I2C_IOCTL_MAGIC, 13, unsigned) - -#define MT9T013_I2C_IOCTL_CLK_SELECT _IOW(MT9T013_I2C_IOCTL_MAGIC, 14, unsigned) - -#define MT9T013_I2C_IOCTL_CLK_FREQ_PROG _IOW(MT9T013_I2C_IOCTL_MAGIC, 15, unsigned) - -#define CAMSENSOR_REG_INIT 0<<0 -#define CAMSENSOR_REG_UPDATE_PERIODIC 1<<0 -#define CAMSENSOR_TYPE_PREVIEW 0<<1 -#define CAMSENSOR_TYPE_SNAPSHOT 1<<1 - -#define MT9T013_I2C_IOCTL_SENSOR_SETTING _IOW(MT9T013_I2C_IOCTL_MAGIC, 16, uint32_t) - -struct mt9t013_reg_struct -{ - uint16_t vt_pix_clk_div; - uint16_t vt_sys_clk_div; - uint16_t pre_pll_clk_div; - uint16_t pll_multiplier; - uint16_t op_pix_clk_div; - uint16_t op_sys_clk_div; - uint16_t scale_m; - uint16_t row_speed; - uint16_t x_addr_start; - uint16_t x_addr_end; - uint16_t y_addr_start; - uint16_t y_addr_end; - uint16_t read_mode; - uint16_t x_output_size ; - uint16_t y_output_size; - uint16_t line_length_pck; - uint16_t frame_length_lines; - uint16_t coarse_integration_time; - uint16_t fine_integration_time; -}; - -struct mt9t013_reg_pat { - struct mt9t013_reg_struct reg[2]; -}; - -#define MT9T013_I2C_IOCTL_GET_REGISTERS _IOR(MT9T013_I2C_IOCTL_MAGIC, 17, struct mt9t013_reg_pat *) - -struct mt9t013_exposure_gain { - uint16_t gain; - uint16_t line; -}; - -#define MT9T013_I2C_IOCTL_EXPOSURE_GAIN _IOW(MT9T013_I2C_IOCTL_MAGIC, 18, struct exposure_gain *) - -#define MT9T013_I2C_IOCTL_MOVE_FOCUS _IOW(MT9T013_I2C_IOCTL_MAGIC, 19, uint32_t) - -#define MT9T013_I2C_IOCTL_SET_DEFAULT_FOCUS _IOW(MT9T013_I2C_IOCTL_MAGIC, 20, uint32_t) - -#define MT9T013_I2C_IOCTL_POWER_DOWN _IO(MT9T013_I2C_IOCTL_MAGIC, 21) - -struct mt9t013_init { - int preview; - uint16_t chipid; -}; - -#define MT9T013_I2C_IOCTL_INIT _IOWR(MT9T013_I2C_IOCTL_MAGIC, 22, struct mt9t013_init *) - -#endif - diff --git a/libc/kernel/common/linux/mtd/bbm.h b/libc/kernel/common/linux/mtd/bbm.h deleted file mode 100644 index e311b233c..000000000 --- a/libc/kernel/common/linux/mtd/bbm.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MTD_BBM_H -#define __LINUX_MTD_BBM_H - -#define NAND_MAX_CHIPS 8 - -struct nand_bbt_descr { - int options; - int pages[NAND_MAX_CHIPS]; - int offs; - int veroffs; - uint8_t version[NAND_MAX_CHIPS]; - int len; - int maxblocks; - int reserved_block_code; - uint8_t *pattern; -}; - -#define NAND_BBT_NRBITS_MSK 0x0000000F -#define NAND_BBT_1BIT 0x00000001 -#define NAND_BBT_2BIT 0x00000002 -#define NAND_BBT_4BIT 0x00000004 -#define NAND_BBT_8BIT 0x00000008 - -#define NAND_BBT_LASTBLOCK 0x00000010 - -#define NAND_BBT_ABSPAGE 0x00000020 - -#define NAND_BBT_SEARCH 0x00000040 - -#define NAND_BBT_PERCHIP 0x00000080 - -#define NAND_BBT_VERSION 0x00000100 - -#define NAND_BBT_CREATE 0x00000200 - -#define NAND_BBT_SCANALLPAGES 0x00000400 - -#define NAND_BBT_SCANEMPTY 0x00000800 - -#define NAND_BBT_WRITE 0x00001000 - -#define NAND_BBT_SAVECONTENT 0x00002000 - -#define NAND_BBT_SCAN2NDPAGE 0x00004000 - -#define NAND_BBT_SCAN_MAXBLOCKS 4 - -#define ONENAND_BADBLOCK_POS 0 - -struct bbm_info { - int bbt_erase_shift; - int badblockpos; - int options; - - uint8_t *bbt; - - int (*isbad_bbt)(struct mtd_info *mtd, loff_t ofs, int allowbbt); - - struct nand_bbt_descr *badblock_pattern; - - void *priv; -}; - -#endif diff --git a/libc/kernel/common/linux/mtd/blktrans.h b/libc/kernel/common/linux/mtd/blktrans.h deleted file mode 100644 index 7c4072499..000000000 --- a/libc/kernel/common/linux/mtd/blktrans.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_TRANS_H__ -#define __MTD_TRANS_H__ - -#include - -struct hd_geometry; -struct mtd_info; -struct mtd_blktrans_ops; -struct file; -struct inode; - -struct mtd_blktrans_dev { - struct mtd_blktrans_ops *tr; - struct list_head list; - struct mtd_info *mtd; - struct mutex lock; - int devnum; - int blksize; - unsigned long size; - int readonly; - void *blkcore_priv; -}; - -struct blkcore_priv; - -struct mtd_blktrans_ops { - char *name; - int major; - int part_bits; - - int (*readsect)(struct mtd_blktrans_dev *dev, - unsigned long block, char *buffer); - int (*writesect)(struct mtd_blktrans_dev *dev, - unsigned long block, char *buffer); - - int (*getgeo)(struct mtd_blktrans_dev *dev, struct hd_geometry *geo); - int (*flush)(struct mtd_blktrans_dev *dev); - - int (*open)(struct mtd_blktrans_dev *dev); - int (*release)(struct mtd_blktrans_dev *dev); - - void (*add_mtd)(struct mtd_blktrans_ops *tr, struct mtd_info *mtd); - void (*remove_dev)(struct mtd_blktrans_dev *dev); - - struct list_head devs; - struct list_head list; - struct module *owner; - - struct mtd_blkcore_priv *blkcore_priv; -}; - -#endif diff --git a/libc/kernel/common/linux/mtd/cfi.h b/libc/kernel/common/linux/mtd/cfi.h deleted file mode 100644 index d7f1ba128..000000000 --- a/libc/kernel/common/linux/mtd/cfi.h +++ /dev/null @@ -1,187 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_CFI_H__ -#define __MTD_CFI_H__ - -#include -#include -#include -#include -#include -#include - -#define cfi_interleave_is_1(cfi) (0) - -#define cfi_interleave_is_2(cfi) (0) - -#define cfi_interleave_is_4(cfi) (0) - -#define cfi_interleave_is_8(cfi) (0) - -#define CFI_DEVICETYPE_X8 (8 / 8) -#define CFI_DEVICETYPE_X16 (16 / 8) -#define CFI_DEVICETYPE_X32 (32 / 8) -#define CFI_DEVICETYPE_X64 (64 / 8) - -struct cfi_extquery { - uint8_t pri[3]; - uint8_t MajorVersion; - uint8_t MinorVersion; -} __attribute__((packed)); - -struct cfi_pri_intelext { - uint8_t pri[3]; - uint8_t MajorVersion; - uint8_t MinorVersion; - uint32_t FeatureSupport; - uint8_t SuspendCmdSupport; - uint16_t BlkStatusRegMask; - uint8_t VccOptimal; - uint8_t VppOptimal; - uint8_t NumProtectionFields; - uint16_t ProtRegAddr; - uint8_t FactProtRegSize; - uint8_t UserProtRegSize; - uint8_t extra[0]; -} __attribute__((packed)); - -struct cfi_intelext_otpinfo { - uint32_t ProtRegAddr; - uint16_t FactGroups; - uint8_t FactProtRegSize; - uint16_t UserGroups; - uint8_t UserProtRegSize; -} __attribute__((packed)); - -struct cfi_intelext_blockinfo { - uint16_t NumIdentBlocks; - uint16_t BlockSize; - uint16_t MinBlockEraseCycles; - uint8_t BitsPerCell; - uint8_t BlockCap; -} __attribute__((packed)); - -struct cfi_intelext_regioninfo { - uint16_t NumIdentPartitions; - uint8_t NumOpAllowed; - uint8_t NumOpAllowedSimProgMode; - uint8_t NumOpAllowedSimEraMode; - uint8_t NumBlockTypes; - struct cfi_intelext_blockinfo BlockTypes[1]; -} __attribute__((packed)); - -struct cfi_intelext_programming_regioninfo { - uint8_t ProgRegShift; - uint8_t Reserved1; - uint8_t ControlValid; - uint8_t Reserved2; - uint8_t ControlInvalid; - uint8_t Reserved3; -} __attribute__((packed)); - -struct cfi_pri_amdstd { - uint8_t pri[3]; - uint8_t MajorVersion; - uint8_t MinorVersion; - uint8_t SiliconRevision; - uint8_t EraseSuspend; - uint8_t BlkProt; - uint8_t TmpBlkUnprotect; - uint8_t BlkProtUnprot; - uint8_t SimultaneousOps; - uint8_t BurstMode; - uint8_t PageMode; - uint8_t VppMin; - uint8_t VppMax; - uint8_t TopBottom; -} __attribute__((packed)); - -struct cfi_pri_atmel { - uint8_t pri[3]; - uint8_t MajorVersion; - uint8_t MinorVersion; - uint8_t Features; - uint8_t BottomBoot; - uint8_t BurstMode; - uint8_t PageMode; -} __attribute__((packed)); - -struct cfi_pri_query { - uint8_t NumFields; - uint32_t ProtField[1]; -} __attribute__((packed)); - -struct cfi_bri_query { - uint8_t PageModeReadCap; - uint8_t NumFields; - uint32_t ConfField[1]; -} __attribute__((packed)); - -#define P_ID_NONE 0x0000 -#define P_ID_INTEL_EXT 0x0001 -#define P_ID_AMD_STD 0x0002 -#define P_ID_INTEL_STD 0x0003 -#define P_ID_AMD_EXT 0x0004 -#define P_ID_WINBOND 0x0006 -#define P_ID_ST_ADV 0x0020 -#define P_ID_MITSUBISHI_STD 0x0100 -#define P_ID_MITSUBISHI_EXT 0x0101 -#define P_ID_SST_PAGE 0x0102 -#define P_ID_INTEL_PERFORMANCE 0x0200 -#define P_ID_INTEL_DATA 0x0210 -#define P_ID_RESERVED 0xffff - -#define CFI_MODE_CFI 1 -#define CFI_MODE_JEDEC 0 - -struct cfi_private { - uint16_t cmdset; - void *cmdset_priv; - int interleave; - int device_type; - int cfi_mode; - int addr_unlock1; - int addr_unlock2; - struct mtd_info *(*cmdset_setup)(struct map_info *); - struct cfi_ident *cfiq; - int mfr, id; - int numchips; - unsigned long chipshift; - const char *im_name; - struct flchip chips[0]; -}; - -#if BITS_PER_LONG >= 64 -#endif -#define CMD(x) cfi_build_cmd((x), map, cfi) -#if BITS_PER_LONG >= 64 -#endif -#define MERGESTATUS(x) cfi_merge_status((x), map, cfi) - -struct cfi_fixup { - uint16_t mfr; - uint16_t id; - void (*fixup)(struct mtd_info *mtd, void* param); - void* param; -}; - -#define CFI_MFR_ANY 0xffff -#define CFI_ID_ANY 0xffff - -#define CFI_MFR_AMD 0x0001 -#define CFI_MFR_ATMEL 0x001F -#define CFI_MFR_ST 0x0020 - -typedef int (*varsize_frob_t)(struct map_info *map, struct flchip *chip, - unsigned long adr, int len, void *thunk); - -#endif diff --git a/libc/kernel/common/linux/mtd/cfi_endian.h b/libc/kernel/common/linux/mtd/cfi_endian.h deleted file mode 100644 index 452091e4b..000000000 --- a/libc/kernel/common/linux/mtd/cfi_endian.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include - -#define CFI_HOST_ENDIAN - -#ifdef CFI_LITTLE_ENDIAN -#define cpu_to_cfi8(x) (x) -#define cfi8_to_cpu(x) (x) -#define cpu_to_cfi16(x) cpu_to_le16(x) -#define cpu_to_cfi32(x) cpu_to_le32(x) -#define cpu_to_cfi64(x) cpu_to_le64(x) -#define cfi16_to_cpu(x) le16_to_cpu(x) -#define cfi32_to_cpu(x) le32_to_cpu(x) -#define cfi64_to_cpu(x) le64_to_cpu(x) -#elif defined (CFI_BIG_ENDIAN) -#define cpu_to_cfi8(x) (x) -#define cfi8_to_cpu(x) (x) -#define cpu_to_cfi16(x) cpu_to_be16(x) -#define cpu_to_cfi32(x) cpu_to_be32(x) -#define cpu_to_cfi64(x) cpu_to_be64(x) -#define cfi16_to_cpu(x) be16_to_cpu(x) -#define cfi32_to_cpu(x) be32_to_cpu(x) -#define cfi64_to_cpu(x) be64_to_cpu(x) -#elif defined (CFI_HOST_ENDIAN) -#define cpu_to_cfi8(x) (x) -#define cfi8_to_cpu(x) (x) -#define cpu_to_cfi16(x) (x) -#define cpu_to_cfi32(x) (x) -#define cpu_to_cfi64(x) (x) -#define cfi16_to_cpu(x) (x) -#define cfi32_to_cpu(x) (x) -#define cfi64_to_cpu(x) (x) -#else -#error No CFI endianness defined -#endif diff --git a/libc/kernel/common/linux/mtd/compatmac.h b/libc/kernel/common/linux/mtd/compatmac.h deleted file mode 100644 index 143f46a23..000000000 --- a/libc/kernel/common/linux/mtd/compatmac.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MTD_COMPATMAC_H__ -#define __LINUX_MTD_COMPATMAC_H__ - -#endif diff --git a/libc/kernel/common/linux/mtd/flashchip.h b/libc/kernel/common/linux/mtd/flashchip.h deleted file mode 100644 index e44104896..000000000 --- a/libc/kernel/common/linux/mtd/flashchip.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_FLASHCHIP_H__ -#define __MTD_FLASHCHIP_H__ - -#include - -typedef enum { - FL_READY, - FL_STATUS, - FL_CFI_QUERY, - FL_JEDEC_QUERY, - FL_ERASING, - FL_ERASE_SUSPENDING, - FL_ERASE_SUSPENDED, - FL_WRITING, - FL_WRITING_TO_BUFFER, - FL_OTP_WRITE, - FL_WRITE_SUSPENDING, - FL_WRITE_SUSPENDED, - FL_PM_SUSPENDED, - FL_SYNCING, - FL_UNLOADING, - FL_LOCKING, - FL_UNLOCKING, - FL_POINT, - FL_XIP_WHILE_ERASING, - FL_XIP_WHILE_WRITING, - FL_UNKNOWN -} flstate_t; - -struct flchip { - unsigned long start; - - int ref_point_counter; - flstate_t state; - flstate_t oldstate; - - unsigned int write_suspended:1; - unsigned int erase_suspended:1; - unsigned long in_progress_block_addr; - - spinlock_t *mutex; - spinlock_t _spinlock; - wait_queue_head_t wq; - int word_write_time; - int buffer_write_time; - int erase_time; - - void *priv; -}; - -struct flchip_shared { - spinlock_t lock; - struct flchip *writing; - struct flchip *erasing; -}; - -#endif diff --git a/libc/kernel/common/linux/mtd/map.h b/libc/kernel/common/linux/mtd/map.h deleted file mode 100644 index 87124bc22..000000000 --- a/libc/kernel/common/linux/mtd/map.h +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MTD_MAP_H__ -#define __LINUX_MTD_MAP_H__ - -#include -#include -#include - -#include - -#include -#include -#include - -#define map_bankwidth_is_1(map) (0) - -#define map_bankwidth_is_2(map) (0) - -#define map_bankwidth_is_4(map) (0) - -#define map_calc_words(map) ((map_bankwidth(map) + (sizeof(unsigned long)-1))/ sizeof(unsigned long)) - -#define map_bankwidth_is_8(map) (0) - -#define map_bankwidth_is_16(map) (0) - -#define map_bankwidth_is_32(map) (0) - -#ifndef map_bankwidth -#error "No bus width supported. What's the point?" -#endif - -#define MAX_MAP_LONGS ( ((MAX_MAP_BANKWIDTH*8) + BITS_PER_LONG - 1) / BITS_PER_LONG ) - -struct map_info { - char *name; - unsigned long size; - unsigned long phys; -#define NO_XIP (-1UL) - - void __iomem *virt; - void *cached; - - int bankwidth; - - void (*inval_cache)(struct map_info *, unsigned long, ssize_t); - - void (*set_vpp)(struct map_info *, int); - - unsigned long map_priv_1; - unsigned long map_priv_2; - void *fldrv_priv; - struct mtd_chip_driver *fldrv; -}; - -struct mtd_chip_driver { - struct mtd_info *(*probe)(struct map_info *map); - void (*destroy)(struct mtd_info *); - struct module *module; - char *name; - struct list_head list; -}; - -struct mtd_info *do_map_probe(const char *name, struct map_info *map); - -#define ENABLE_VPP(map) do { if(map->set_vpp) map->set_vpp(map, 1); } while(0) -#define DISABLE_VPP(map) do { if(map->set_vpp) map->set_vpp(map, 0); } while(0) - -#define INVALIDATE_CACHED_RANGE(map, from, size) do { if(map->inval_cache) map->inval_cache(map, from, size); } while(0) - -#define map_word_andequal(m, a, b, z) map_word_equal(m, z, map_word_and(m, a, b)) -#if BITS_PER_LONG >= 64 -#endif -#ifdef __LITTLE_ENDIAN -#else -#endif -#if BITS_PER_LONG < 64 -#define MAP_FF_LIMIT 4 -#else -#define MAP_FF_LIMIT 8 -#endif -#if BITS_PER_LONG >= 64 -#endif -#if BITS_PER_LONG >= 64 -#endif -#define map_read(map, ofs) inline_map_read(map, ofs) -#define map_copy_from(map, to, from, len) inline_map_copy_from(map, to, from, len) -#define map_write(map, datum, ofs) inline_map_write(map, datum, ofs) -#define map_copy_to(map, to, from, len) inline_map_copy_to(map, to, from, len) -#define simple_map_init(map) BUG_ON(!map_bankwidth_supported((map)->bankwidth)) -#define map_is_linear(map) ({ (void)(map); 1; }) -#endif diff --git a/libc/kernel/common/linux/mtd/mtd.h b/libc/kernel/common/linux/mtd/mtd.h deleted file mode 100644 index 300813c93..000000000 --- a/libc/kernel/common/linux/mtd/mtd.h +++ /dev/null @@ -1,153 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_MTD_H__ -#define __MTD_MTD_H__ - -#error This is a kernel header. Perhaps include mtd-user.h instead? - -#include -#include -#include -#include - -#include -#include - -#define MTD_CHAR_MAJOR 90 -#define MTD_BLOCK_MAJOR 31 -#define MAX_MTD_DEVICES 16 - -#define MTD_ERASE_PENDING 0x01 -#define MTD_ERASING 0x02 -#define MTD_ERASE_SUSPEND 0x04 -#define MTD_ERASE_DONE 0x08 -#define MTD_ERASE_FAILED 0x10 - -struct erase_info { - struct mtd_info *mtd; - u_int32_t addr; - u_int32_t len; - u_int32_t fail_addr; - u_long time; - u_long retries; - u_int dev; - u_int cell; - void (*callback) (struct erase_info *self); - u_long priv; - u_char state; - struct erase_info *next; -}; - -struct mtd_erase_region_info { - u_int32_t offset; - u_int32_t erasesize; - u_int32_t numblocks; -}; - -typedef enum { - MTD_OOB_PLACE, - MTD_OOB_AUTO, - MTD_OOB_RAW, -} mtd_oob_mode_t; - -struct mtd_oob_ops { - mtd_oob_mode_t mode; - size_t len; - size_t retlen; - size_t ooblen; - uint32_t ooboffs; - uint8_t *datbuf; - uint8_t *oobbuf; -}; - -struct mtd_info { - u_char type; - u_int32_t flags; - u_int32_t size; - - u_int32_t erasesize; - - u_int32_t writesize; - - u_int32_t oobsize; - u_int32_t ecctype; - u_int32_t eccsize; - -#define MTD_PROGREGION_CTRLMODE_VALID(mtd) (mtd)->oobsize -#define MTD_PROGREGION_CTRLMODE_INVALID(mtd) (mtd)->ecctype - - char *name; - int index; - - struct nand_ecclayout *ecclayout; - - int numeraseregions; - struct mtd_erase_region_info *eraseregions; - - u_int32_t bank_size; - - int (*erase) (struct mtd_info *mtd, struct erase_info *instr); - - int (*point) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char **mtdbuf); - - void (*unpoint) (struct mtd_info *mtd, u_char * addr, loff_t from, size_t len); - - int (*read) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); - int (*write) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf); - - int (*read_oob) (struct mtd_info *mtd, loff_t from, - struct mtd_oob_ops *ops); - int (*write_oob) (struct mtd_info *mtd, loff_t to, - struct mtd_oob_ops *ops); - - int (*get_fact_prot_info) (struct mtd_info *mtd, struct otp_info *buf, size_t len); - int (*read_fact_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); - int (*get_user_prot_info) (struct mtd_info *mtd, struct otp_info *buf, size_t len); - int (*read_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); - int (*write_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); - int (*lock_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len); - - int (*writev) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, size_t *retlen); - - void (*sync) (struct mtd_info *mtd); - - int (*lock) (struct mtd_info *mtd, loff_t ofs, size_t len); - int (*unlock) (struct mtd_info *mtd, loff_t ofs, size_t len); - - int (*suspend) (struct mtd_info *mtd); - void (*resume) (struct mtd_info *mtd); - - int (*block_isbad) (struct mtd_info *mtd, loff_t ofs); - int (*block_markbad) (struct mtd_info *mtd, loff_t ofs); - - struct notifier_block reboot_notifier; - - struct mtd_ecc_stats ecc_stats; - - void *priv; - - struct module *owner; - int usecount; -}; - -struct mtd_notifier { - void (*add)(struct mtd_info *mtd); - void (*remove)(struct mtd_info *mtd); - struct list_head list; -}; - -#define MTD_DEBUG_LEVEL0 (0) -#define MTD_DEBUG_LEVEL1 (1) -#define MTD_DEBUG_LEVEL2 (2) -#define MTD_DEBUG_LEVEL3 (3) -#define DEBUG(n, args...) do { } while(0) -#endif diff --git a/libc/kernel/common/linux/mtd/nand.h b/libc/kernel/common/linux/mtd/nand.h deleted file mode 100644 index 36e9fb4ce..000000000 --- a/libc/kernel/common/linux/mtd/nand.h +++ /dev/null @@ -1,319 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MTD_NAND_H -#define __LINUX_MTD_NAND_H - -#include -#include -#include - -struct mtd_info; - -#define NAND_MAX_CHIPS 8 - -#define NAND_MAX_OOBSIZE 64 -#define NAND_MAX_PAGESIZE 2048 - -#define NAND_NCE 0x01 - -#define NAND_CLE 0x02 - -#define NAND_ALE 0x04 - -#define NAND_CTRL_CLE (NAND_NCE | NAND_CLE) -#define NAND_CTRL_ALE (NAND_NCE | NAND_ALE) -#define NAND_CTRL_CHANGE 0x80 - -#define NAND_CMD_READ0 0 -#define NAND_CMD_READ1 1 -#define NAND_CMD_RNDOUT 5 -#define NAND_CMD_PAGEPROG 0x10 -#define NAND_CMD_READOOB 0x50 -#define NAND_CMD_ERASE1 0x60 -#define NAND_CMD_STATUS 0x70 -#define NAND_CMD_STATUS_MULTI 0x71 -#define NAND_CMD_SEQIN 0x80 -#define NAND_CMD_RNDIN 0x85 -#define NAND_CMD_READID 0x90 -#define NAND_CMD_ERASE2 0xd0 -#define NAND_CMD_RESET 0xff - -#define NAND_CMD_READSTART 0x30 -#define NAND_CMD_RNDOUTSTART 0xE0 -#define NAND_CMD_CACHEDPROG 0x15 - -#define NAND_CMD_DEPLETE1 0x100 -#define NAND_CMD_DEPLETE2 0x38 -#define NAND_CMD_STATUS_MULTI 0x71 -#define NAND_CMD_STATUS_ERROR 0x72 - -#define NAND_CMD_STATUS_ERROR0 0x73 -#define NAND_CMD_STATUS_ERROR1 0x74 -#define NAND_CMD_STATUS_ERROR2 0x75 -#define NAND_CMD_STATUS_ERROR3 0x76 -#define NAND_CMD_STATUS_RESET 0x7f -#define NAND_CMD_STATUS_CLEAR 0xff - -#define NAND_CMD_NONE -1 - -#define NAND_STATUS_FAIL 0x01 -#define NAND_STATUS_FAIL_N1 0x02 -#define NAND_STATUS_TRUE_READY 0x20 -#define NAND_STATUS_READY 0x40 -#define NAND_STATUS_WP 0x80 - -typedef enum { - NAND_ECC_NONE, - NAND_ECC_SOFT, - NAND_ECC_HW, - NAND_ECC_HW_SYNDROME, -} nand_ecc_modes_t; - -#define NAND_ECC_READ 0 - -#define NAND_ECC_WRITE 1 - -#define NAND_ECC_READSYN 2 - -#define NAND_GET_DEVICE 0x80 - -#define NAND_NO_AUTOINCR 0x00000001 - -#define NAND_BUSWIDTH_16 0x00000002 - -#define NAND_NO_PADDING 0x00000004 - -#define NAND_CACHEPRG 0x00000008 - -#define NAND_COPYBACK 0x00000010 - -#define NAND_IS_AND 0x00000020 - -#define NAND_4PAGE_ARRAY 0x00000040 - -#define BBT_AUTO_REFRESH 0x00000080 - -#define NAND_NO_READRDY 0x00000100 - -#define NAND_SAMSUNG_LP_OPTIONS (NAND_NO_PADDING | NAND_CACHEPRG | NAND_COPYBACK) - -#define NAND_CANAUTOINCR(chip) (!(chip->options & NAND_NO_AUTOINCR)) -#define NAND_MUST_PAD(chip) (!(chip->options & NAND_NO_PADDING)) -#define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG)) -#define NAND_HAS_COPYBACK(chip) ((chip->options & NAND_COPYBACK)) - -#define NAND_CHIPOPTIONS_MSK (0x0000ffff & ~NAND_NO_AUTOINCR) - -#define NAND_USE_FLASH_BBT 0x00010000 - -#define NAND_SKIP_BBTSCAN 0x00020000 - -#define NAND_CONTROLLER_ALLOC 0x80000000 - -typedef enum { - FL_READY, - FL_READING, - FL_WRITING, - FL_ERASING, - FL_SYNCING, - FL_CACHEDPRG, - FL_PM_SUSPENDED, -} nand_state_t; - -struct nand_chip; - -struct nand_hw_control { - spinlock_t lock; - struct nand_chip *active; - wait_queue_head_t wq; -}; - -struct nand_ecc_ctrl { - nand_ecc_modes_t mode; - int steps; - int size; - int bytes; - int total; - int prepad; - int postpad; - struct nand_ecclayout *layout; - void (*hwctl)(struct mtd_info *mtd, int mode); - int (*calculate)(struct mtd_info *mtd, - const uint8_t *dat, - uint8_t *ecc_code); - int (*correct)(struct mtd_info *mtd, uint8_t *dat, - uint8_t *read_ecc, - uint8_t *calc_ecc); - int (*read_page)(struct mtd_info *mtd, - struct nand_chip *chip, - uint8_t *buf); - void (*write_page)(struct mtd_info *mtd, - struct nand_chip *chip, - const uint8_t *buf); - int (*read_oob)(struct mtd_info *mtd, - struct nand_chip *chip, - int page, - int sndcmd); - int (*write_oob)(struct mtd_info *mtd, - struct nand_chip *chip, - int page); -}; - -struct nand_buffers { - uint8_t ecccalc[NAND_MAX_OOBSIZE]; - uint8_t ecccode[NAND_MAX_OOBSIZE]; - uint8_t oobwbuf[NAND_MAX_OOBSIZE]; - uint8_t databuf[NAND_MAX_PAGESIZE]; - uint8_t oobrbuf[NAND_MAX_OOBSIZE]; -}; - -struct nand_chip { - void __iomem *IO_ADDR_R; - void __iomem *IO_ADDR_W; - - uint8_t (*read_byte)(struct mtd_info *mtd); - u16 (*read_word)(struct mtd_info *mtd); - void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); - void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len); - int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); - void (*select_chip)(struct mtd_info *mtd, int chip); - int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip); - int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); - void (*cmd_ctrl)(struct mtd_info *mtd, int dat, - unsigned int ctrl); - int (*dev_ready)(struct mtd_info *mtd); - void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr); - int (*waitfunc)(struct mtd_info *mtd, struct nand_chip *this); - void (*erase_cmd)(struct mtd_info *mtd, int page); - int (*scan_bbt)(struct mtd_info *mtd); - int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state, int status, int page); - - int chip_delay; - unsigned int options; - - int page_shift; - int phys_erase_shift; - int bbt_erase_shift; - int chip_shift; - int numchips; - unsigned long chipsize; - int pagemask; - int pagebuf; - int badblockpos; - - nand_state_t state; - - uint8_t *oob_poi; - struct nand_hw_control *controller; - struct nand_ecclayout *ecclayout; - - struct nand_ecc_ctrl ecc; - struct nand_buffers buffers; - struct nand_hw_control hwcontrol; - - struct mtd_oob_ops ops; - - uint8_t *bbt; - struct nand_bbt_descr *bbt_td; - struct nand_bbt_descr *bbt_md; - - struct nand_bbt_descr *badblock_pattern; - - void *priv; -}; - -#define NAND_MFR_TOSHIBA 0x98 -#define NAND_MFR_SAMSUNG 0xec -#define NAND_MFR_FUJITSU 0x04 -#define NAND_MFR_NATIONAL 0x8f -#define NAND_MFR_RENESAS 0x07 -#define NAND_MFR_STMICRO 0x20 -#define NAND_MFR_HYNIX 0xad - -struct nand_flash_dev { - char *name; - int id; - unsigned long pagesize; - unsigned long chipsize; - unsigned long erasesize; - unsigned long options; -}; - -struct nand_manufacturers { - int id; - char * name; -}; - -struct nand_bbt_descr { - int options; - int pages[NAND_MAX_CHIPS]; - int offs; - int veroffs; - uint8_t version[NAND_MAX_CHIPS]; - int len; - int maxblocks; - int reserved_block_code; - uint8_t *pattern; -}; - -#define NAND_BBT_NRBITS_MSK 0x0000000F -#define NAND_BBT_1BIT 0x00000001 -#define NAND_BBT_2BIT 0x00000002 -#define NAND_BBT_4BIT 0x00000004 -#define NAND_BBT_8BIT 0x00000008 - -#define NAND_BBT_LASTBLOCK 0x00000010 - -#define NAND_BBT_ABSPAGE 0x00000020 - -#define NAND_BBT_SEARCH 0x00000040 - -#define NAND_BBT_PERCHIP 0x00000080 - -#define NAND_BBT_VERSION 0x00000100 - -#define NAND_BBT_CREATE 0x00000200 - -#define NAND_BBT_SCANALLPAGES 0x00000400 - -#define NAND_BBT_SCANEMPTY 0x00000800 - -#define NAND_BBT_WRITE 0x00001000 - -#define NAND_BBT_SAVECONTENT 0x00002000 - -#define NAND_BBT_SCAN2NDPAGE 0x00004000 - -#define NAND_BBT_SCAN_MAXBLOCKS 4 - -#define NAND_SMALL_BADBLOCK_POS 5 -#define NAND_LARGE_BADBLOCK_POS 0 - -struct platform_nand_chip { - int nr_chips; - int chip_offset; - int nr_partitions; - struct mtd_partition *partitions; - struct nand_ecclayout *ecclayout; - int chip_delay; - unsigned int options; - void *priv; -}; - -struct platform_nand_ctrl { - void (*hwcontrol)(struct mtd_info *mtd, int cmd); - int (*dev_ready)(struct mtd_info *mtd); - void (*select_chip)(struct mtd_info *mtd, int chip); - void *priv; -}; - -#endif diff --git a/libc/kernel/common/linux/mtd/nand_ecc.h b/libc/kernel/common/linux/mtd/nand_ecc.h deleted file mode 100644 index 3e817f4fb..000000000 --- a/libc/kernel/common/linux/mtd/nand_ecc.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_NAND_ECC_H__ -#define __MTD_NAND_ECC_H__ - -struct mtd_info; - -#endif diff --git a/libc/kernel/common/linux/mtd/nftl.h b/libc/kernel/common/linux/mtd/nftl.h deleted file mode 100644 index da7320e28..000000000 --- a/libc/kernel/common/linux/mtd/nftl.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_NFTL_H__ -#define __MTD_NFTL_H__ - -#include -#include - -#include - -#define BLOCK_NIL 0xffff -#define BLOCK_FREE 0xfffe -#define BLOCK_NOTEXPLORED 0xfffd -#define BLOCK_RESERVED 0xfffc - -struct NFTLrecord { - struct mtd_blktrans_dev mbd; - __u16 MediaUnit, SpareMediaUnit; - __u32 EraseSize; - struct NFTLMediaHeader MediaHdr; - int usecount; - unsigned char heads; - unsigned char sectors; - unsigned short cylinders; - __u16 numvunits; - __u16 lastEUN; - __u16 numfreeEUNs; - __u16 LastFreeEUN; - int head,sect,cyl; - __u16 *EUNtable; - __u16 *ReplUnitTable; - unsigned int nb_blocks; - unsigned int nb_boot_blocks; - struct erase_info instr; - struct nand_ecclayout oobinfo; -}; - -#ifndef NFTL_MAJOR -#define NFTL_MAJOR 93 -#endif - -#define MAX_NFTLS 16 -#define MAX_SECTORS_PER_UNIT 64 -#define NFTL_PARTN_BITS 4 - -#endif diff --git a/libc/kernel/common/linux/mtd/onenand_regs.h b/libc/kernel/common/linux/mtd/onenand_regs.h deleted file mode 100644 index a39c78f3d..000000000 --- a/libc/kernel/common/linux/mtd/onenand_regs.h +++ /dev/null @@ -1,143 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __ONENAND_REG_H -#define __ONENAND_REG_H - -#define ONENAND_MEMORY_MAP(x) ((x) << 1) - -#define ONENAND_BOOTRAM ONENAND_MEMORY_MAP(0x0000) -#define ONENAND_DATARAM ONENAND_MEMORY_MAP(0x0200) -#define ONENAND_SPARERAM ONENAND_MEMORY_MAP(0x8010) - -#define ONENAND_REG_MANUFACTURER_ID ONENAND_MEMORY_MAP(0xF000) -#define ONENAND_REG_DEVICE_ID ONENAND_MEMORY_MAP(0xF001) -#define ONENAND_REG_VERSION_ID ONENAND_MEMORY_MAP(0xF002) -#define ONENAND_REG_DATA_BUFFER_SIZE ONENAND_MEMORY_MAP(0xF003) -#define ONENAND_REG_BOOT_BUFFER_SIZE ONENAND_MEMORY_MAP(0xF004) -#define ONENAND_REG_NUM_BUFFERS ONENAND_MEMORY_MAP(0xF005) -#define ONENAND_REG_TECHNOLOGY ONENAND_MEMORY_MAP(0xF006) - -#define ONENAND_REG_START_ADDRESS1 ONENAND_MEMORY_MAP(0xF100) -#define ONENAND_REG_START_ADDRESS2 ONENAND_MEMORY_MAP(0xF101) -#define ONENAND_REG_START_ADDRESS3 ONENAND_MEMORY_MAP(0xF102) -#define ONENAND_REG_START_ADDRESS4 ONENAND_MEMORY_MAP(0xF103) -#define ONENAND_REG_START_ADDRESS5 ONENAND_MEMORY_MAP(0xF104) -#define ONENAND_REG_START_ADDRESS6 ONENAND_MEMORY_MAP(0xF105) -#define ONENAND_REG_START_ADDRESS7 ONENAND_MEMORY_MAP(0xF106) -#define ONENAND_REG_START_ADDRESS8 ONENAND_MEMORY_MAP(0xF107) - -#define ONENAND_REG_START_BUFFER ONENAND_MEMORY_MAP(0xF200) -#define ONENAND_REG_COMMAND ONENAND_MEMORY_MAP(0xF220) -#define ONENAND_REG_SYS_CFG1 ONENAND_MEMORY_MAP(0xF221) -#define ONENAND_REG_SYS_CFG2 ONENAND_MEMORY_MAP(0xF222) -#define ONENAND_REG_CTRL_STATUS ONENAND_MEMORY_MAP(0xF240) -#define ONENAND_REG_INTERRUPT ONENAND_MEMORY_MAP(0xF241) -#define ONENAND_REG_START_BLOCK_ADDRESS ONENAND_MEMORY_MAP(0xF24C) -#define ONENAND_REG_END_BLOCK_ADDRESS ONENAND_MEMORY_MAP(0xF24D) -#define ONENAND_REG_WP_STATUS ONENAND_MEMORY_MAP(0xF24E) - -#define ONENAND_REG_ECC_STATUS ONENAND_MEMORY_MAP(0xFF00) -#define ONENAND_REG_ECC_M0 ONENAND_MEMORY_MAP(0xFF01) -#define ONENAND_REG_ECC_S0 ONENAND_MEMORY_MAP(0xFF02) -#define ONENAND_REG_ECC_M1 ONENAND_MEMORY_MAP(0xFF03) -#define ONENAND_REG_ECC_S1 ONENAND_MEMORY_MAP(0xFF04) -#define ONENAND_REG_ECC_M2 ONENAND_MEMORY_MAP(0xFF05) -#define ONENAND_REG_ECC_S2 ONENAND_MEMORY_MAP(0xFF06) -#define ONENAND_REG_ECC_M3 ONENAND_MEMORY_MAP(0xFF07) -#define ONENAND_REG_ECC_S3 ONENAND_MEMORY_MAP(0xFF08) - -#define ONENAND_DEVICE_DENSITY_SHIFT (4) -#define ONENAND_DEVICE_IS_DDP (1 << 3) -#define ONENAND_DEVICE_IS_DEMUX (1 << 2) -#define ONENAND_DEVICE_VCC_MASK (0x3) - -#define ONENAND_DEVICE_DENSITY_512Mb (0x002) - -#define ONENAND_VERSION_PROCESS_SHIFT (8) - -#define ONENAND_DDP_SHIFT (15) - -#define ONENAND_FPA_MASK (0x3f) -#define ONENAND_FPA_SHIFT (2) -#define ONENAND_FSA_MASK (0x03) - -#define ONENAND_BSA_MASK (0x03) -#define ONENAND_BSA_SHIFT (8) -#define ONENAND_BSA_BOOTRAM (0 << 2) -#define ONENAND_BSA_DATARAM0 (2 << 2) -#define ONENAND_BSA_DATARAM1 (3 << 2) -#define ONENAND_BSC_MASK (0x03) - -#define ONENAND_CMD_READ (0x00) -#define ONENAND_CMD_READOOB (0x13) -#define ONENAND_CMD_PROG (0x80) -#define ONENAND_CMD_PROGOOB (0x1A) -#define ONENAND_CMD_UNLOCK (0x23) -#define ONENAND_CMD_LOCK (0x2A) -#define ONENAND_CMD_LOCK_TIGHT (0x2C) -#define ONENAND_CMD_ERASE (0x94) -#define ONENAND_CMD_RESET (0xF0) -#define ONENAND_CMD_OTP_ACCESS (0x65) -#define ONENAND_CMD_READID (0x90) - -#define ONENAND_CMD_BUFFERRAM (0x1978) - -#define ONENAND_SYS_CFG1_SYNC_READ (1 << 15) -#define ONENAND_SYS_CFG1_BRL_7 (7 << 12) -#define ONENAND_SYS_CFG1_BRL_6 (6 << 12) -#define ONENAND_SYS_CFG1_BRL_5 (5 << 12) -#define ONENAND_SYS_CFG1_BRL_4 (4 << 12) -#define ONENAND_SYS_CFG1_BRL_3 (3 << 12) -#define ONENAND_SYS_CFG1_BRL_10 (2 << 12) -#define ONENAND_SYS_CFG1_BRL_9 (1 << 12) -#define ONENAND_SYS_CFG1_BRL_8 (0 << 12) -#define ONENAND_SYS_CFG1_BRL_SHIFT (12) -#define ONENAND_SYS_CFG1_BL_32 (4 << 9) -#define ONENAND_SYS_CFG1_BL_16 (3 << 9) -#define ONENAND_SYS_CFG1_BL_8 (2 << 9) -#define ONENAND_SYS_CFG1_BL_4 (1 << 9) -#define ONENAND_SYS_CFG1_BL_CONT (0 << 9) -#define ONENAND_SYS_CFG1_BL_SHIFT (9) -#define ONENAND_SYS_CFG1_NO_ECC (1 << 8) -#define ONENAND_SYS_CFG1_RDY (1 << 7) -#define ONENAND_SYS_CFG1_INT (1 << 6) -#define ONENAND_SYS_CFG1_IOBE (1 << 5) -#define ONENAND_SYS_CFG1_RDY_CONF (1 << 4) - -#define ONENAND_CTRL_ONGO (1 << 15) -#define ONENAND_CTRL_LOCK (1 << 14) -#define ONENAND_CTRL_LOAD (1 << 13) -#define ONENAND_CTRL_PROGRAM (1 << 12) -#define ONENAND_CTRL_ERASE (1 << 11) -#define ONENAND_CTRL_ERROR (1 << 10) -#define ONENAND_CTRL_RSTB (1 << 7) -#define ONENAND_CTRL_OTP_L (1 << 6) -#define ONENAND_CTRL_OTP_BL (1 << 5) - -#define ONENAND_INT_MASTER (1 << 15) -#define ONENAND_INT_READ (1 << 7) -#define ONENAND_INT_WRITE (1 << 6) -#define ONENAND_INT_ERASE (1 << 5) -#define ONENAND_INT_RESET (1 << 4) -#define ONENAND_INT_CLEAR (0 << 0) - -#define ONENAND_WP_US (1 << 2) -#define ONENAND_WP_LS (1 << 1) -#define ONENAND_WP_LTS (1 << 0) - -#define ONENAND_ECC_1BIT (1 << 0) -#define ONENAND_ECC_2BIT (1 << 1) -#define ONENAND_ECC_2BIT_ALL (0xAAAA) - -#define ONENAND_OTP_LOCK_OFFSET (14) - -#endif diff --git a/libc/kernel/common/linux/mtd/partitions.h b/libc/kernel/common/linux/mtd/partitions.h deleted file mode 100644 index aeb15e18d..000000000 --- a/libc/kernel/common/linux/mtd/partitions.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef MTD_PARTITIONS_H -#define MTD_PARTITIONS_H - -#include - -struct mtd_partition { - char *name; - u_int32_t size; - u_int32_t offset; - u_int32_t mask_flags; - struct nand_ecclayout *ecclayout; - struct mtd_info **mtdp; -}; - -#define MTDPART_OFS_NXTBLK (-2) -#define MTDPART_OFS_APPEND (-1) -#define MTDPART_SIZ_FULL (0) - -struct mtd_part_parser { - struct list_head list; - struct module *owner; - const char *name; - int (*parse_fn)(struct mtd_info *, struct mtd_partition **, unsigned long); -}; - -#define put_partition_parser(p) do { module_put((p)->owner); } while(0) - -#endif - diff --git a/libc/kernel/common/linux/mtio.h b/libc/kernel/common/linux/mtio.h deleted file mode 100644 index 47a6e2bf8..000000000 --- a/libc/kernel/common/linux/mtio.h +++ /dev/null @@ -1,259 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_MTIO_H -#define _LINUX_MTIO_H - -#include -#include -#include - -struct mtop { - short mt_op; - int mt_count; -}; - -#define MTRESET 0 -#define MTFSF 1 -#define MTBSF 2 -#define MTFSR 3 -#define MTBSR 4 -#define MTWEOF 5 -#define MTREW 6 -#define MTOFFL 7 -#define MTNOP 8 -#define MTRETEN 9 -#define MTBSFM 10 -#define MTFSFM 11 -#define MTEOM 12 -#define MTERASE 13 - -#define MTRAS1 14 -#define MTRAS2 15 -#define MTRAS3 16 - -#define MTSETBLK 20 -#define MTSETDENSITY 21 -#define MTSEEK 22 -#define MTTELL 23 -#define MTSETDRVBUFFER 24 - -#define MTFSS 25 -#define MTBSS 26 -#define MTWSM 27 - -#define MTLOCK 28 -#define MTUNLOCK 29 -#define MTLOAD 30 -#define MTUNLOAD 31 -#define MTCOMPRESSION 32 -#define MTSETPART 33 -#define MTMKPART 34 - -struct mtget { - long mt_type; - long mt_resid; - - long mt_dsreg; - long mt_gstat; - long mt_erreg; - - __kernel_daddr_t mt_fileno; - __kernel_daddr_t mt_blkno; -}; - -#define MT_ISUNKNOWN 0x01 -#define MT_ISQIC02 0x02 -#define MT_ISWT5150 0x03 -#define MT_ISARCHIVE_5945L2 0x04 -#define MT_ISCMSJ500 0x05 -#define MT_ISTDC3610 0x06 -#define MT_ISARCHIVE_VP60I 0x07 -#define MT_ISARCHIVE_2150L 0x08 -#define MT_ISARCHIVE_2060L 0x09 -#define MT_ISARCHIVESC499 0x0A -#define MT_ISQIC02_ALL_FEATURES 0x0F -#define MT_ISWT5099EEN24 0x11 -#define MT_ISTEAC_MT2ST 0x12 -#define MT_ISEVEREX_FT40A 0x32 -#define MT_ISDDS1 0x51 -#define MT_ISDDS2 0x52 -#define MT_ISONSTREAM_SC 0x61 -#define MT_ISSCSI1 0x71 -#define MT_ISSCSI2 0x72 - -#define MT_ISFTAPE_UNKNOWN 0x800000 -#define MT_ISFTAPE_FLAG 0x800000 - -struct mt_tape_info { - long t_type; - char *t_name; -}; - -#define MT_TAPE_INFO { {MT_ISUNKNOWN, "Unknown type of tape device"}, {MT_ISQIC02, "Generic QIC-02 tape streamer"}, {MT_ISWT5150, "Wangtek 5150, QIC-150"}, {MT_ISARCHIVE_5945L2, "Archive 5945L-2"}, {MT_ISCMSJ500, "CMS Jumbo 500"}, {MT_ISTDC3610, "Tandberg TDC 3610, QIC-24"}, {MT_ISARCHIVE_VP60I, "Archive VP60i, QIC-02"}, {MT_ISARCHIVE_2150L, "Archive Viper 2150L"}, {MT_ISARCHIVE_2060L, "Archive Viper 2060L"}, {MT_ISARCHIVESC499, "Archive SC-499 QIC-36 controller"}, {MT_ISQIC02_ALL_FEATURES, "Generic QIC-02 tape, all features"}, {MT_ISWT5099EEN24, "Wangtek 5099-een24, 60MB"}, {MT_ISTEAC_MT2ST, "Teac MT-2ST 155mb data cassette drive"}, {MT_ISEVEREX_FT40A, "Everex FT40A, QIC-40"}, {MT_ISONSTREAM_SC, "OnStream SC-, DI-, DP-, or USB tape drive"}, {MT_ISSCSI1, "Generic SCSI-1 tape"}, {MT_ISSCSI2, "Generic SCSI-2 tape"}, {0, NULL} } - -struct mtpos { - long mt_blkno; -}; - -struct mtvolinfo { - unsigned int mt_volno; - unsigned int mt_blksz; - unsigned int mt_rawsize; - unsigned int mt_size; - unsigned int mt_cmpr:1; -}; - -#define MT_FT_RD_SINGLE 0 -#define MT_FT_RD_AHEAD 1 -#define MT_FT_WR_ASYNC 0 -#define MT_FT_WR_MULTI 1 -#define MT_FT_WR_SINGLE 2 -#define MT_FT_WR_DELETE 3 - -struct mtftseg -{ - unsigned mt_segno; - unsigned mt_mode; - int mt_result; - void __user *mt_data; -}; - -struct mttapesize { - unsigned long mt_capacity; - unsigned long mt_used; -}; - -#define FTFMT_SET_PARMS 1 -#define FTFMT_GET_PARMS 2 -#define FTFMT_FORMAT_TRACK 3 -#define FTFMT_STATUS 4 -#define FTFMT_VERIFY 5 - -struct ftfmtparms { - unsigned char ft_qicstd; - unsigned char ft_fmtcode; - unsigned char ft_fhm; - unsigned char ft_ftm; - unsigned short ft_spt; - unsigned short ft_tpc; -}; - -struct ftfmttrack { - unsigned int ft_track; - unsigned char ft_gap3; -}; - -struct ftfmtstatus { - unsigned int ft_segment; -}; - -struct ftfmtverify { - unsigned int ft_segment; - unsigned long ft_bsm; -}; - -struct mtftformat { - unsigned int fmt_op; - union fmt_arg { - struct ftfmtparms fmt_parms; - struct ftfmttrack fmt_track; - struct ftfmtstatus fmt_status; - struct ftfmtverify fmt_verify; - } fmt_arg; -}; - -struct mtftcmd { - unsigned int ft_wait_before; - qic117_cmd_t ft_cmd; - unsigned char ft_parm_cnt; - unsigned char ft_parms[3]; - unsigned int ft_result_bits; - unsigned int ft_result; - unsigned int ft_wait_after; - int ft_status; - int ft_error; -}; - -#define MTIOCTOP _IOW('m', 1, struct mtop) -#define MTIOCGET _IOR('m', 2, struct mtget) -#define MTIOCPOS _IOR('m', 3, struct mtpos) - -#define MTIOCGETCONFIG _IOR('m', 4, struct mtconfiginfo) -#define MTIOCSETCONFIG _IOW('m', 5, struct mtconfiginfo) - -#define MTIOCRDFTSEG _IOWR('m', 6, struct mtftseg) -#define MTIOCWRFTSEG _IOWR('m', 7, struct mtftseg) -#define MTIOCVOLINFO _IOR('m', 8, struct mtvolinfo) -#define MTIOCGETSIZE _IOR('m', 9, struct mttapesize) -#define MTIOCFTFORMAT _IOWR('m', 10, struct mtftformat) -#define MTIOCFTCMD _IOWR('m', 11, struct mtftcmd) - -#define GMT_EOF(x) ((x) & 0x80000000) -#define GMT_BOT(x) ((x) & 0x40000000) -#define GMT_EOT(x) ((x) & 0x20000000) -#define GMT_SM(x) ((x) & 0x10000000) -#define GMT_EOD(x) ((x) & 0x08000000) -#define GMT_WR_PROT(x) ((x) & 0x04000000) - -#define GMT_ONLINE(x) ((x) & 0x01000000) -#define GMT_D_6250(x) ((x) & 0x00800000) -#define GMT_D_1600(x) ((x) & 0x00400000) -#define GMT_D_800(x) ((x) & 0x00200000) - -#define GMT_DR_OPEN(x) ((x) & 0x00040000) - -#define GMT_IM_REP_EN(x) ((x) & 0x00010000) -#define GMT_CLN(x) ((x) & 0x00008000) - -#define MT_ST_BLKSIZE_SHIFT 0 -#define MT_ST_BLKSIZE_MASK 0xffffff -#define MT_ST_DENSITY_SHIFT 24 -#define MT_ST_DENSITY_MASK 0xff000000 - -#define MT_ST_SOFTERR_SHIFT 0 -#define MT_ST_SOFTERR_MASK 0xffff - -#define MT_ST_OPTIONS 0xf0000000 -#define MT_ST_BOOLEANS 0x10000000 -#define MT_ST_SETBOOLEANS 0x30000000 -#define MT_ST_CLEARBOOLEANS 0x40000000 -#define MT_ST_WRITE_THRESHOLD 0x20000000 -#define MT_ST_DEF_BLKSIZE 0x50000000 -#define MT_ST_DEF_OPTIONS 0x60000000 -#define MT_ST_TIMEOUTS 0x70000000 -#define MT_ST_SET_TIMEOUT (MT_ST_TIMEOUTS | 0x000000) -#define MT_ST_SET_LONG_TIMEOUT (MT_ST_TIMEOUTS | 0x100000) -#define MT_ST_SET_CLN 0x80000000 - -#define MT_ST_BUFFER_WRITES 0x1 -#define MT_ST_ASYNC_WRITES 0x2 -#define MT_ST_READ_AHEAD 0x4 -#define MT_ST_DEBUGGING 0x8 -#define MT_ST_TWO_FM 0x10 -#define MT_ST_FAST_MTEOM 0x20 -#define MT_ST_AUTO_LOCK 0x40 -#define MT_ST_DEF_WRITES 0x80 -#define MT_ST_CAN_BSR 0x100 -#define MT_ST_NO_BLKLIMS 0x200 -#define MT_ST_CAN_PARTITIONS 0x400 -#define MT_ST_SCSI2LOGICAL 0x800 -#define MT_ST_SYSV 0x1000 -#define MT_ST_NOWAIT 0x2000 - -#define MT_ST_CLEAR_DEFAULT 0xfffff -#define MT_ST_DEF_DENSITY (MT_ST_DEF_OPTIONS | 0x100000) -#define MT_ST_DEF_COMPRESSION (MT_ST_DEF_OPTIONS | 0x200000) -#define MT_ST_DEF_DRVBUFFER (MT_ST_DEF_OPTIONS | 0x300000) - -#define MT_ST_HPLOADER_OFFSET 10000 - -#endif diff --git a/libc/kernel/common/linux/mutex-debug.h b/libc/kernel/common/linux/mutex-debug.h deleted file mode 100644 index 7065610c4..000000000 --- a/libc/kernel/common/linux/mutex-debug.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MUTEX_DEBUG_H -#define __LINUX_MUTEX_DEBUG_H - -#include -#include - -#define __DEBUG_MUTEX_INITIALIZER(lockname) , .magic = &lockname - -#define mutex_init(mutex) do { static struct lock_class_key __key; __mutex_init((mutex), #mutex, &__key); } while (0) - -#endif diff --git a/libc/kernel/common/linux/mutex.h b/libc/kernel/common/linux/mutex.h deleted file mode 100644 index 4b33a8ad5..000000000 --- a/libc/kernel/common/linux/mutex.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_MUTEX_H -#define __LINUX_MUTEX_H - -#include -#include -#include -#include - -#include - -struct mutex { - - atomic_t count; - spinlock_t wait_lock; - struct list_head wait_list; -}; - -struct mutex_waiter { - struct list_head list; - struct task_struct *task; -}; - -#define __DEBUG_MUTEX_INITIALIZER(lockname) -#define mutex_init(mutex) do { static struct lock_class_key __key; __mutex_init((mutex), #mutex, &__key); } while (0) -#define mutex_destroy(mutex) do { } while (0) - -#define __DEP_MAP_MUTEX_INITIALIZER(lockname) - -#define __MUTEX_INITIALIZER(lockname) { .count = ATOMIC_INIT(1) , .wait_lock = SPIN_LOCK_UNLOCKED , .wait_list = LIST_HEAD_INIT(lockname.wait_list) __DEBUG_MUTEX_INITIALIZER(lockname) __DEP_MAP_MUTEX_INITIALIZER(lockname) } - -#define DEFINE_MUTEX(mutexname) struct mutex mutexname = __MUTEX_INITIALIZER(mutexname) - -#define mutex_lock_nested(lock, subclass) mutex_lock(lock) - -#endif diff --git a/libc/kernel/common/linux/ncp.h b/libc/kernel/common/linux/ncp.h deleted file mode 100644 index 091220add..000000000 --- a/libc/kernel/common/linux/ncp.h +++ /dev/null @@ -1,193 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NCP_H -#define _LINUX_NCP_H - -#include - -#define NCP_PTYPE (0x11) -#define NCP_PORT (0x0451) - -#define NCP_ALLOC_SLOT_REQUEST (0x1111) -#define NCP_REQUEST (0x2222) -#define NCP_DEALLOC_SLOT_REQUEST (0x5555) - -struct ncp_request_header { - __u16 type; - __u8 sequence; - __u8 conn_low; - __u8 task; - __u8 conn_high; - __u8 function; - __u8 data[0]; -} __attribute__((packed)); - -#define NCP_REPLY (0x3333) -#define NCP_WATCHDOG (0x3E3E) -#define NCP_POSITIVE_ACK (0x9999) - -struct ncp_reply_header { - __u16 type; - __u8 sequence; - __u8 conn_low; - __u8 task; - __u8 conn_high; - __u8 completion_code; - __u8 connection_state; - __u8 data[0]; -} __attribute__((packed)); - -#define NCP_VOLNAME_LEN (16) -#define NCP_NUMBER_OF_VOLUMES (256) -struct ncp_volume_info { - __u32 total_blocks; - __u32 free_blocks; - __u32 purgeable_blocks; - __u32 not_yet_purgeable_blocks; - __u32 total_dir_entries; - __u32 available_dir_entries; - __u8 sectors_per_block; - char volume_name[NCP_VOLNAME_LEN + 1]; -}; - -#define AR_READ (cpu_to_le16(1)) -#define AR_WRITE (cpu_to_le16(2)) -#define AR_EXCLUSIVE (cpu_to_le16(0x20)) - -#define NCP_FILE_ID_LEN 6 - -#define NW_NS_DOS 0 -#define NW_NS_MAC 1 -#define NW_NS_NFS 2 -#define NW_NS_FTAM 3 -#define NW_NS_OS2 4 - -#define RIM_NAME (cpu_to_le32(1)) -#define RIM_SPACE_ALLOCATED (cpu_to_le32(2)) -#define RIM_ATTRIBUTES (cpu_to_le32(4)) -#define RIM_DATA_SIZE (cpu_to_le32(8)) -#define RIM_TOTAL_SIZE (cpu_to_le32(0x10)) -#define RIM_EXT_ATTR_INFO (cpu_to_le32(0x20)) -#define RIM_ARCHIVE (cpu_to_le32(0x40)) -#define RIM_MODIFY (cpu_to_le32(0x80)) -#define RIM_CREATION (cpu_to_le32(0x100)) -#define RIM_OWNING_NAMESPACE (cpu_to_le32(0x200)) -#define RIM_DIRECTORY (cpu_to_le32(0x400)) -#define RIM_RIGHTS (cpu_to_le32(0x800)) -#define RIM_ALL (cpu_to_le32(0xFFF)) -#define RIM_COMPRESSED_INFO (cpu_to_le32(0x80000000)) - -#define NSIBM_NFS_NAME 0x0001 -#define NSIBM_NFS_MODE 0x0002 -#define NSIBM_NFS_GID 0x0004 -#define NSIBM_NFS_NLINKS 0x0008 -#define NSIBM_NFS_RDEV 0x0010 -#define NSIBM_NFS_LINK 0x0020 -#define NSIBM_NFS_CREATED 0x0040 -#define NSIBM_NFS_UID 0x0080 -#define NSIBM_NFS_ACSFLAG 0x0100 -#define NSIBM_NFS_MYFLAG 0x0200 - -#define OC_MODE_OPEN 0x01 -#define OC_MODE_TRUNCATE 0x02 -#define OC_MODE_REPLACE 0x02 -#define OC_MODE_CREATE 0x08 - -#define OC_ACTION_NONE 0x00 -#define OC_ACTION_OPEN 0x01 -#define OC_ACTION_CREATE 0x02 -#define OC_ACTION_TRUNCATE 0x04 -#define OC_ACTION_REPLACE 0x04 - -#ifndef AR_READ_ONLY -#define AR_READ_ONLY 0x0001 -#define AR_WRITE_ONLY 0x0002 -#define AR_DENY_READ 0x0004 -#define AR_DENY_WRITE 0x0008 -#define AR_COMPATIBILITY 0x0010 -#define AR_WRITE_THROUGH 0x0040 -#define AR_OPEN_COMPRESSED 0x0100 -#endif - -struct nw_nfs_info { - __u32 mode; - __u32 rdev; -}; - -struct nw_info_struct { - __u32 spaceAlloc; - __le32 attributes; - __u16 flags; - __le32 dataStreamSize; - __le32 totalStreamSize; - __u16 numberOfStreams; - __le16 creationTime; - __le16 creationDate; - __u32 creatorID; - __le16 modifyTime; - __le16 modifyDate; - __u32 modifierID; - __le16 lastAccessDate; - __u16 archiveTime; - __u16 archiveDate; - __u32 archiverID; - __u16 inheritedRightsMask; - __le32 dirEntNum; - __le32 DosDirNum; - __u32 volNumber; - __u32 EADataSize; - __u32 EAKeyCount; - __u32 EAKeySize; - __u32 NSCreator; - __u8 nameLen; - __u8 entryName[256]; - -} __attribute__((packed)); - -#define DM_ATTRIBUTES (cpu_to_le32(0x02)) -#define DM_CREATE_DATE (cpu_to_le32(0x04)) -#define DM_CREATE_TIME (cpu_to_le32(0x08)) -#define DM_CREATOR_ID (cpu_to_le32(0x10)) -#define DM_ARCHIVE_DATE (cpu_to_le32(0x20)) -#define DM_ARCHIVE_TIME (cpu_to_le32(0x40)) -#define DM_ARCHIVER_ID (cpu_to_le32(0x80)) -#define DM_MODIFY_DATE (cpu_to_le32(0x0100)) -#define DM_MODIFY_TIME (cpu_to_le32(0x0200)) -#define DM_MODIFIER_ID (cpu_to_le32(0x0400)) -#define DM_LAST_ACCESS_DATE (cpu_to_le32(0x0800)) -#define DM_INHERITED_RIGHTS_MASK (cpu_to_le32(0x1000)) -#define DM_MAXIMUM_SPACE (cpu_to_le32(0x2000)) - -struct nw_modify_dos_info { - __le32 attributes; - __le16 creationDate; - __le16 creationTime; - __u32 creatorID; - __le16 modifyDate; - __le16 modifyTime; - __u32 modifierID; - __u16 archiveDate; - __u16 archiveTime; - __u32 archiverID; - __le16 lastAccessDate; - __u16 inheritanceGrantMask; - __u16 inheritanceRevokeMask; - __u32 maximumSpace; -} __attribute__((packed)); - -struct nw_search_sequence { - __u8 volNumber; - __u32 dirBase; - __u32 sequence; -} __attribute__((packed)); - -#endif diff --git a/libc/kernel/common/linux/ncp_mount.h b/libc/kernel/common/linux/ncp_mount.h deleted file mode 100644 index 204869fcf..000000000 --- a/libc/kernel/common/linux/ncp_mount.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NCP_MOUNT_H -#define _LINUX_NCP_MOUNT_H - -#include -#include - -#define NCP_MOUNT_VERSION 3 - -#define NCP_MOUNT_SOFT 0x0001 -#define NCP_MOUNT_INTR 0x0002 -#define NCP_MOUNT_STRONG 0x0004 -#define NCP_MOUNT_NO_OS2 0x0008 -#define NCP_MOUNT_NO_NFS 0x0010 -#define NCP_MOUNT_EXTRAS 0x0020 -#define NCP_MOUNT_SYMLINKS 0x0040 -#define NCP_MOUNT_NFS_EXTRAS 0x0080 - -struct ncp_mount_data { - int version; - unsigned int ncp_fd; - __kernel_uid_t mounted_uid; - __kernel_pid_t wdog_pid; - - unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; - unsigned int time_out; - unsigned int retry_count; - unsigned int flags; - - __kernel_uid_t uid; - __kernel_gid_t gid; - __kernel_mode_t file_mode; - __kernel_mode_t dir_mode; -}; - -#define NCP_MOUNT_VERSION_V4 (4) - -struct ncp_mount_data_v4 { - int version; - unsigned long flags; - - unsigned long mounted_uid; - - long wdog_pid; - - unsigned int ncp_fd; - unsigned int time_out; - unsigned int retry_count; - - unsigned long uid; - unsigned long gid; - - unsigned long file_mode; - unsigned long dir_mode; -}; - -#define NCP_MOUNT_VERSION_V5 (5) - -#endif diff --git a/libc/kernel/common/linux/ncp_no.h b/libc/kernel/common/linux/ncp_no.h deleted file mode 100644 index 9afed68ab..000000000 --- a/libc/kernel/common/linux/ncp_no.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NCP_NO -#define _NCP_NO - -#define aRONLY (__constant_cpu_to_le32(1)) -#define aHIDDEN (__constant_cpu_to_le32(2)) -#define aSYSTEM (__constant_cpu_to_le32(4)) -#define aEXECUTE (__constant_cpu_to_le32(8)) -#define aDIR (__constant_cpu_to_le32(0x10)) -#define aARCH (__constant_cpu_to_le32(0x20)) -#define aSHARED (__constant_cpu_to_le32(0x80)) -#define aDONTSUBALLOCATE (__constant_cpu_to_le32(1L<<11)) -#define aTRANSACTIONAL (__constant_cpu_to_le32(1L<<12)) -#define aPURGE (__constant_cpu_to_le32(1L<<16)) -#define aRENAMEINHIBIT (__constant_cpu_to_le32(1L<<17)) -#define aDELETEINHIBIT (__constant_cpu_to_le32(1L<<18)) -#define aDONTCOMPRESS (__constant_cpu_to_le32(1L<<27)) - -#endif diff --git a/libc/kernel/common/linux/net.h b/libc/kernel/common/linux/net.h deleted file mode 100644 index 29fca2c51..000000000 --- a/libc/kernel/common/linux/net.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NET_H -#define _LINUX_NET_H - -#include -#include - -struct poll_table_struct; -struct inode; - -#define NPROTO 32 - -#define SYS_SOCKET 1 -#define SYS_BIND 2 -#define SYS_CONNECT 3 -#define SYS_LISTEN 4 -#define SYS_ACCEPT 5 -#define SYS_GETSOCKNAME 6 -#define SYS_GETPEERNAME 7 -#define SYS_SOCKETPAIR 8 -#define SYS_SEND 9 -#define SYS_RECV 10 -#define SYS_SENDTO 11 -#define SYS_RECVFROM 12 -#define SYS_SHUTDOWN 13 -#define SYS_SETSOCKOPT 14 -#define SYS_GETSOCKOPT 15 -#define SYS_SENDMSG 16 -#define SYS_RECVMSG 17 - -typedef enum { - SS_FREE = 0, - SS_UNCONNECTED, - SS_CONNECTING, - SS_CONNECTED, - SS_DISCONNECTING -} socket_state; - -#define __SO_ACCEPTCON (1 << 16) - -#endif diff --git a/libc/kernel/common/linux/netdevice.h b/libc/kernel/common/linux/netdevice.h deleted file mode 100644 index 54b58f167..000000000 --- a/libc/kernel/common/linux/netdevice.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NETDEVICE_H -#define _LINUX_NETDEVICE_H - -#include -#include -#include - -#define MAX_ADDR_LEN 32 - -#define NETDEV_TX_OK 0 -#define NETDEV_TX_BUSY 1 -#define NETDEV_TX_LOCKED -1 - -#define LL_MAX_HEADER 32 - -#define MAX_HEADER LL_MAX_HEADER - -struct net_device_stats -{ - unsigned long rx_packets; - unsigned long tx_packets; - unsigned long rx_bytes; - unsigned long tx_bytes; - unsigned long rx_errors; - unsigned long tx_errors; - unsigned long rx_dropped; - unsigned long tx_dropped; - unsigned long multicast; - unsigned long collisions; - - unsigned long rx_length_errors; - unsigned long rx_over_errors; - unsigned long rx_crc_errors; - unsigned long rx_frame_errors; - unsigned long rx_fifo_errors; - unsigned long rx_missed_errors; - - unsigned long tx_aborted_errors; - unsigned long tx_carrier_errors; - unsigned long tx_fifo_errors; - unsigned long tx_heartbeat_errors; - unsigned long tx_window_errors; - - unsigned long rx_compressed; - unsigned long tx_compressed; -}; - -enum { - IF_PORT_UNKNOWN = 0, - IF_PORT_10BASE2, - IF_PORT_10BASET, - IF_PORT_AUI, - IF_PORT_100BASET, - IF_PORT_100BASETX, - IF_PORT_100BASEFX -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter.h b/libc/kernel/common/linux/netfilter.h deleted file mode 100644 index 04883449f..000000000 --- a/libc/kernel/common/linux/netfilter.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_NETFILTER_H -#define __LINUX_NETFILTER_H - -#include - -#define NF_DROP 0 -#define NF_ACCEPT 1 -#define NF_STOLEN 2 -#define NF_QUEUE 3 -#define NF_REPEAT 4 -#define NF_STOP 5 -#define NF_MAX_VERDICT NF_STOP - -#define NF_VERDICT_MASK 0x0000ffff -#define NF_VERDICT_BITS 16 - -#define NF_VERDICT_QMASK 0xffff0000 -#define NF_VERDICT_QBITS 16 - -#define NF_QUEUE_NR(x) (((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK) | NF_QUEUE) - -#define NFC_UNKNOWN 0x4000 -#define NFC_ALTERED 0x8000 - -#endif diff --git a/libc/kernel/common/linux/netfilter/nf_conntrack_common.h b/libc/kernel/common/linux/netfilter/nf_conntrack_common.h deleted file mode 100644 index 69177fce0..000000000 --- a/libc/kernel/common/linux/netfilter/nf_conntrack_common.h +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NF_CONNTRACK_COMMON_H -#define _NF_CONNTRACK_COMMON_H - -enum ip_conntrack_info -{ - - IP_CT_ESTABLISHED, - - IP_CT_RELATED, - - IP_CT_NEW, - - IP_CT_IS_REPLY, - - IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 -}; - -enum ip_conntrack_status { - - IPS_EXPECTED_BIT = 0, - IPS_EXPECTED = (1 << IPS_EXPECTED_BIT), - - IPS_SEEN_REPLY_BIT = 1, - IPS_SEEN_REPLY = (1 << IPS_SEEN_REPLY_BIT), - - IPS_ASSURED_BIT = 2, - IPS_ASSURED = (1 << IPS_ASSURED_BIT), - - IPS_CONFIRMED_BIT = 3, - IPS_CONFIRMED = (1 << IPS_CONFIRMED_BIT), - - IPS_SRC_NAT_BIT = 4, - IPS_SRC_NAT = (1 << IPS_SRC_NAT_BIT), - - IPS_DST_NAT_BIT = 5, - IPS_DST_NAT = (1 << IPS_DST_NAT_BIT), - - IPS_NAT_MASK = (IPS_DST_NAT | IPS_SRC_NAT), - - IPS_SEQ_ADJUST_BIT = 6, - IPS_SEQ_ADJUST = (1 << IPS_SEQ_ADJUST_BIT), - - IPS_SRC_NAT_DONE_BIT = 7, - IPS_SRC_NAT_DONE = (1 << IPS_SRC_NAT_DONE_BIT), - - IPS_DST_NAT_DONE_BIT = 8, - IPS_DST_NAT_DONE = (1 << IPS_DST_NAT_DONE_BIT), - - IPS_NAT_DONE_MASK = (IPS_DST_NAT_DONE | IPS_SRC_NAT_DONE), - - IPS_DYING_BIT = 9, - IPS_DYING = (1 << IPS_DYING_BIT), - - IPS_FIXED_TIMEOUT_BIT = 10, - IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT), -}; - -enum ip_conntrack_events -{ - - IPCT_NEW_BIT = 0, - IPCT_NEW = (1 << IPCT_NEW_BIT), - - IPCT_RELATED_BIT = 1, - IPCT_RELATED = (1 << IPCT_RELATED_BIT), - - IPCT_DESTROY_BIT = 2, - IPCT_DESTROY = (1 << IPCT_DESTROY_BIT), - - IPCT_REFRESH_BIT = 3, - IPCT_REFRESH = (1 << IPCT_REFRESH_BIT), - - IPCT_STATUS_BIT = 4, - IPCT_STATUS = (1 << IPCT_STATUS_BIT), - - IPCT_PROTOINFO_BIT = 5, - IPCT_PROTOINFO = (1 << IPCT_PROTOINFO_BIT), - - IPCT_PROTOINFO_VOLATILE_BIT = 6, - IPCT_PROTOINFO_VOLATILE = (1 << IPCT_PROTOINFO_VOLATILE_BIT), - - IPCT_HELPER_BIT = 7, - IPCT_HELPER = (1 << IPCT_HELPER_BIT), - - IPCT_HELPINFO_BIT = 8, - IPCT_HELPINFO = (1 << IPCT_HELPINFO_BIT), - - IPCT_HELPINFO_VOLATILE_BIT = 9, - IPCT_HELPINFO_VOLATILE = (1 << IPCT_HELPINFO_VOLATILE_BIT), - - IPCT_NATINFO_BIT = 10, - IPCT_NATINFO = (1 << IPCT_NATINFO_BIT), - - IPCT_COUNTER_FILLING_BIT = 11, - IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT), -}; - -enum ip_conntrack_expect_events { - IPEXP_NEW_BIT = 0, - IPEXP_NEW = (1 << IPEXP_NEW_BIT), -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/nf_conntrack_ftp.h b/libc/kernel/common/linux/netfilter/nf_conntrack_ftp.h deleted file mode 100644 index ff815a754..000000000 --- a/libc/kernel/common/linux/netfilter/nf_conntrack_ftp.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NF_CONNTRACK_FTP_H -#define _NF_CONNTRACK_FTP_H - -enum ip_ct_ftp_type -{ - - IP_CT_FTP_PORT, - - IP_CT_FTP_PASV, - - IP_CT_FTP_EPRT, - - IP_CT_FTP_EPSV, -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/nf_conntrack_sctp.h b/libc/kernel/common/linux/netfilter/nf_conntrack_sctp.h deleted file mode 100644 index 15768b218..000000000 --- a/libc/kernel/common/linux/netfilter/nf_conntrack_sctp.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NF_CONNTRACK_SCTP_H -#define _NF_CONNTRACK_SCTP_H - -#include - -enum sctp_conntrack { - SCTP_CONNTRACK_NONE, - SCTP_CONNTRACK_CLOSED, - SCTP_CONNTRACK_COOKIE_WAIT, - SCTP_CONNTRACK_COOKIE_ECHOED, - SCTP_CONNTRACK_ESTABLISHED, - SCTP_CONNTRACK_SHUTDOWN_SENT, - SCTP_CONNTRACK_SHUTDOWN_RECD, - SCTP_CONNTRACK_SHUTDOWN_ACK_SENT, - SCTP_CONNTRACK_MAX -}; - -struct ip_ct_sctp -{ - enum sctp_conntrack state; - - u_int32_t vtag[IP_CT_DIR_MAX]; - u_int32_t ttag[IP_CT_DIR_MAX]; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/nf_conntrack_tcp.h b/libc/kernel/common/linux/netfilter/nf_conntrack_tcp.h deleted file mode 100644 index 227f90231..000000000 --- a/libc/kernel/common/linux/netfilter/nf_conntrack_tcp.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NF_CONNTRACK_TCP_H -#define _NF_CONNTRACK_TCP_H - -enum tcp_conntrack { - TCP_CONNTRACK_NONE, - TCP_CONNTRACK_SYN_SENT, - TCP_CONNTRACK_SYN_RECV, - TCP_CONNTRACK_ESTABLISHED, - TCP_CONNTRACK_FIN_WAIT, - TCP_CONNTRACK_CLOSE_WAIT, - TCP_CONNTRACK_LAST_ACK, - TCP_CONNTRACK_TIME_WAIT, - TCP_CONNTRACK_CLOSE, - TCP_CONNTRACK_LISTEN, - TCP_CONNTRACK_MAX, - TCP_CONNTRACK_IGNORE -}; - -#define IP_CT_TCP_FLAG_WINDOW_SCALE 0x01 - -#define IP_CT_TCP_FLAG_SACK_PERM 0x02 - -#define IP_CT_TCP_FLAG_CLOSE_INIT 0x03 - -#endif diff --git a/libc/kernel/common/linux/netfilter/nf_conntrack_tuple_common.h b/libc/kernel/common/linux/netfilter/nf_conntrack_tuple_common.h deleted file mode 100644 index f28254367..000000000 --- a/libc/kernel/common/linux/netfilter/nf_conntrack_tuple_common.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NF_CONNTRACK_TUPLE_COMMON_H -#define _NF_CONNTRACK_TUPLE_COMMON_H - -enum ip_conntrack_dir -{ - IP_CT_DIR_ORIGINAL, - IP_CT_DIR_REPLY, - IP_CT_DIR_MAX -}; - -#define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL) - -#endif diff --git a/libc/kernel/common/linux/netfilter/nfnetlink.h b/libc/kernel/common/linux/netfilter/nfnetlink.h deleted file mode 100644 index 4544cab54..000000000 --- a/libc/kernel/common/linux/netfilter/nfnetlink.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _NFNETLINK_H -#define _NFNETLINK_H -#include - -#define NF_NETLINK_CONNTRACK_NEW 0x00000001 -#define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 -#define NF_NETLINK_CONNTRACK_DESTROY 0x00000004 -#define NF_NETLINK_CONNTRACK_EXP_NEW 0x00000008 -#define NF_NETLINK_CONNTRACK_EXP_UPDATE 0x00000010 -#define NF_NETLINK_CONNTRACK_EXP_DESTROY 0x00000020 - -enum nfnetlink_groups { - NFNLGRP_NONE, -#define NFNLGRP_NONE NFNLGRP_NONE - NFNLGRP_CONNTRACK_NEW, -#define NFNLGRP_CONNTRACK_NEW NFNLGRP_CONNTRACK_NEW - NFNLGRP_CONNTRACK_UPDATE, -#define NFNLGRP_CONNTRACK_UPDATE NFNLGRP_CONNTRACK_UPDATE - NFNLGRP_CONNTRACK_DESTROY, -#define NFNLGRP_CONNTRACK_DESTROY NFNLGRP_CONNTRACK_DESTROY - NFNLGRP_CONNTRACK_EXP_NEW, -#define NFNLGRP_CONNTRACK_EXP_NEW NFNLGRP_CONNTRACK_EXP_NEW - NFNLGRP_CONNTRACK_EXP_UPDATE, -#define NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_UPDATE - NFNLGRP_CONNTRACK_EXP_DESTROY, -#define NFNLGRP_CONNTRACK_EXP_DESTROY NFNLGRP_CONNTRACK_EXP_DESTROY - __NFNLGRP_MAX, -}; -#define NFNLGRP_MAX (__NFNLGRP_MAX - 1) - -struct nfattr -{ - u_int16_t nfa_len; - u_int16_t nfa_type; -} __attribute__ ((packed)); - -#define NFNL_NFA_NEST 0x8000 -#define NFA_TYPE(attr) ((attr)->nfa_type & 0x7fff) - -#define NFA_ALIGNTO 4 -#define NFA_ALIGN(len) (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1)) -#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) && (nfa)->nfa_len <= (len)) -#define NFA_NEXT(nfa,attrlen) ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len))) -#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len)) -#define NFA_SPACE(len) NFA_ALIGN(NFA_LENGTH(len)) -#define NFA_DATA(nfa) ((void *)(((char *)(nfa)) + NFA_LENGTH(0))) -#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0)) -#define NFA_NEST(skb, type) ({ struct nfattr *__start = (struct nfattr *) (skb)->tail; NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); __start; }) -#define NFA_NEST_END(skb, start) ({ (start)->nfa_len = ((skb)->tail - (unsigned char *) (start)); (skb)->len; }) -#define NFA_NEST_CANCEL(skb, start) ({ if (start) skb_trim(skb, (unsigned char *) (start) - (skb)->data); -1; }) - -struct nfgenmsg { - u_int8_t nfgen_family; - u_int8_t version; - u_int16_t res_id; -} __attribute__ ((packed)); - -#define NFNETLINK_V0 0 - -#define NFM_NFA(n) ((struct nfattr *)(((char *)(n)) + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) -#define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) - -#define NFNL_SUBSYS_ID(x) ((x & 0xff00) >> 8) -#define NFNL_MSG_TYPE(x) (x & 0x00ff) - -#define NFNL_SUBSYS_NONE 0 -#define NFNL_SUBSYS_CTNETLINK 1 -#define NFNL_SUBSYS_CTNETLINK_EXP 2 -#define NFNL_SUBSYS_QUEUE 3 -#define NFNL_SUBSYS_ULOG 4 -#define NFNL_SUBSYS_COUNT 5 - -#endif diff --git a/libc/kernel/common/linux/netfilter/nfnetlink_conntrack.h b/libc/kernel/common/linux/netfilter/nfnetlink_conntrack.h deleted file mode 100644 index 105dd098d..000000000 --- a/libc/kernel/common/linux/netfilter/nfnetlink_conntrack.h +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPCONNTRACK_NETLINK_H -#define _IPCONNTRACK_NETLINK_H -#include - -enum cntl_msg_types { - IPCTNL_MSG_CT_NEW, - IPCTNL_MSG_CT_GET, - IPCTNL_MSG_CT_DELETE, - IPCTNL_MSG_CT_GET_CTRZERO, - - IPCTNL_MSG_MAX -}; - -enum ctnl_exp_msg_types { - IPCTNL_MSG_EXP_NEW, - IPCTNL_MSG_EXP_GET, - IPCTNL_MSG_EXP_DELETE, - - IPCTNL_MSG_EXP_MAX -}; - -enum ctattr_type { - CTA_UNSPEC, - CTA_TUPLE_ORIG, - CTA_TUPLE_REPLY, - CTA_STATUS, - CTA_PROTOINFO, - CTA_HELP, - CTA_NAT_SRC, -#define CTA_NAT CTA_NAT_SRC - CTA_TIMEOUT, - CTA_MARK, - CTA_COUNTERS_ORIG, - CTA_COUNTERS_REPLY, - CTA_USE, - CTA_ID, - CTA_NAT_DST, - __CTA_MAX -}; -#define CTA_MAX (__CTA_MAX - 1) - -enum ctattr_tuple { - CTA_TUPLE_UNSPEC, - CTA_TUPLE_IP, - CTA_TUPLE_PROTO, - __CTA_TUPLE_MAX -}; -#define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1) - -enum ctattr_ip { - CTA_IP_UNSPEC, - CTA_IP_V4_SRC, - CTA_IP_V4_DST, - CTA_IP_V6_SRC, - CTA_IP_V6_DST, - __CTA_IP_MAX -}; -#define CTA_IP_MAX (__CTA_IP_MAX - 1) - -enum ctattr_l4proto { - CTA_PROTO_UNSPEC, - CTA_PROTO_NUM, - CTA_PROTO_SRC_PORT, - CTA_PROTO_DST_PORT, - CTA_PROTO_ICMP_ID, - CTA_PROTO_ICMP_TYPE, - CTA_PROTO_ICMP_CODE, - CTA_PROTO_ICMPV6_ID, - CTA_PROTO_ICMPV6_TYPE, - CTA_PROTO_ICMPV6_CODE, - __CTA_PROTO_MAX -}; -#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1) - -enum ctattr_protoinfo { - CTA_PROTOINFO_UNSPEC, - CTA_PROTOINFO_TCP, - __CTA_PROTOINFO_MAX -}; -#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1) - -enum ctattr_protoinfo_tcp { - CTA_PROTOINFO_TCP_UNSPEC, - CTA_PROTOINFO_TCP_STATE, - __CTA_PROTOINFO_TCP_MAX -}; -#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1) - -enum ctattr_counters { - CTA_COUNTERS_UNSPEC, - CTA_COUNTERS_PACKETS, - CTA_COUNTERS_BYTES, - CTA_COUNTERS32_PACKETS, - CTA_COUNTERS32_BYTES, - __CTA_COUNTERS_MAX -}; -#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1) - -enum ctattr_nat { - CTA_NAT_UNSPEC, - CTA_NAT_MINIP, - CTA_NAT_MAXIP, - CTA_NAT_PROTO, - __CTA_NAT_MAX -}; -#define CTA_NAT_MAX (__CTA_NAT_MAX - 1) - -enum ctattr_protonat { - CTA_PROTONAT_UNSPEC, - CTA_PROTONAT_PORT_MIN, - CTA_PROTONAT_PORT_MAX, - __CTA_PROTONAT_MAX -}; -#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) - -enum ctattr_expect { - CTA_EXPECT_UNSPEC, - CTA_EXPECT_MASTER, - CTA_EXPECT_TUPLE, - CTA_EXPECT_MASK, - CTA_EXPECT_TIMEOUT, - CTA_EXPECT_ID, - CTA_EXPECT_HELP_NAME, - __CTA_EXPECT_MAX -}; -#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) - -enum ctattr_help { - CTA_HELP_UNSPEC, - CTA_HELP_NAME, - __CTA_HELP_MAX -}; -#define CTA_HELP_MAX (__CTA_HELP_MAX - 1) - -#endif diff --git a/libc/kernel/common/linux/netfilter/x_tables.h b/libc/kernel/common/linux/netfilter/x_tables.h deleted file mode 100644 index 234181fbf..000000000 --- a/libc/kernel/common/linux/netfilter/x_tables.h +++ /dev/null @@ -1,125 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _X_TABLES_H -#define _X_TABLES_H - -#define XT_FUNCTION_MAXNAMELEN 30 -#define XT_TABLE_MAXNAMELEN 32 - -struct xt_entry_match -{ - union { - struct { - u_int16_t match_size; - - char name[XT_FUNCTION_MAXNAMELEN-1]; - - u_int8_t revision; - } user; - struct { - u_int16_t match_size; - - struct xt_match *match; - } kernel; - - u_int16_t match_size; - } u; - - unsigned char data[0]; -}; - -struct xt_entry_target -{ - union { - struct { - u_int16_t target_size; - - char name[XT_FUNCTION_MAXNAMELEN-1]; - - u_int8_t revision; - } user; - struct { - u_int16_t target_size; - - struct xt_target *target; - } kernel; - - u_int16_t target_size; - } u; - - unsigned char data[0]; -}; - -struct xt_standard_target -{ - struct xt_entry_target target; - int verdict; -}; - -struct xt_get_revision -{ - char name[XT_FUNCTION_MAXNAMELEN-1]; - - u_int8_t revision; -}; - -#define XT_CONTINUE 0xFFFFFFFF - -#define XT_RETURN (-NF_REPEAT - 1) - -struct _xt_align -{ - u_int8_t u8; - u_int16_t u16; - u_int32_t u32; - u_int64_t u64; -}; - -#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) & ~(__alignof__(struct _xt_align)-1)) - -#define XT_STANDARD_TARGET "" - -#define XT_ERROR_TARGET "ERROR" - -#define XT_BASE_CTL 64 - -#define XT_SO_SET_REPLACE (XT_BASE_CTL) -#define XT_SO_SET_ADD_COUNTERS (XT_BASE_CTL + 1) -#define XT_SO_SET_MAX XT_SO_SET_ADD_COUNTERS - -#define XT_SO_GET_INFO (XT_BASE_CTL) -#define XT_SO_GET_ENTRIES (XT_BASE_CTL + 1) -#define XT_SO_GET_REVISION_MATCH (XT_BASE_CTL + 2) -#define XT_SO_GET_REVISION_TARGET (XT_BASE_CTL + 3) -#define XT_SO_GET_MAX XT_SO_GET_REVISION_TARGET - -#define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0) -#define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0) - -struct xt_counters -{ - u_int64_t pcnt, bcnt; -}; - -struct xt_counters_info -{ - - char name[XT_TABLE_MAXNAMELEN]; - - unsigned int num_counters; - - struct xt_counters counters[0]; -}; - -#define XT_INV_PROTO 0x40 - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_CLASSIFY.h b/libc/kernel/common/linux/netfilter/xt_CLASSIFY.h deleted file mode 100644 index 1e9f61e6f..000000000 --- a/libc/kernel/common/linux/netfilter/xt_CLASSIFY.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_CLASSIFY_H -#define _XT_CLASSIFY_H - -struct xt_classify_target_info { - u_int32_t priority; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_CONNMARK.h b/libc/kernel/common/linux/netfilter/xt_CONNMARK.h deleted file mode 100644 index 1b30eebba..000000000 --- a/libc/kernel/common/linux/netfilter/xt_CONNMARK.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_CONNMARK_H_target -#define _XT_CONNMARK_H_target - -enum { - XT_CONNMARK_SET = 0, - XT_CONNMARK_SAVE, - XT_CONNMARK_RESTORE -}; - -struct xt_connmark_target_info { - unsigned long mark; - unsigned long mask; - u_int8_t mode; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_CONNSECMARK.h b/libc/kernel/common/linux/netfilter/xt_CONNSECMARK.h deleted file mode 100644 index 5e16b2e76..000000000 --- a/libc/kernel/common/linux/netfilter/xt_CONNSECMARK.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_CONNSECMARK_H_target -#define _XT_CONNSECMARK_H_target - -enum { - CONNSECMARK_SAVE = 1, - CONNSECMARK_RESTORE, -}; - -struct xt_connsecmark_target_info { - u_int8_t mode; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_MARK.h b/libc/kernel/common/linux/netfilter/xt_MARK.h deleted file mode 100644 index f58c97c11..000000000 --- a/libc/kernel/common/linux/netfilter/xt_MARK.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_MARK_H_target -#define _XT_MARK_H_target - -struct xt_mark_target_info { - unsigned long mark; -}; - -enum { - XT_MARK_SET=0, - XT_MARK_AND, - XT_MARK_OR, -}; - -struct xt_mark_target_info_v1 { - unsigned long mark; - u_int8_t mode; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_NFQUEUE.h b/libc/kernel/common/linux/netfilter/xt_NFQUEUE.h deleted file mode 100644 index 1f0cacb30..000000000 --- a/libc/kernel/common/linux/netfilter/xt_NFQUEUE.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_NFQ_TARGET_H -#define _XT_NFQ_TARGET_H - -struct xt_NFQ_info { - u_int16_t queuenum; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_SECMARK.h b/libc/kernel/common/linux/netfilter/xt_SECMARK.h deleted file mode 100644 index a91d32cbf..000000000 --- a/libc/kernel/common/linux/netfilter/xt_SECMARK.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_SECMARK_H_target -#define _XT_SECMARK_H_target - -#define SECMARK_MODE_SEL 0x01 -#define SECMARK_SELCTX_MAX 256 - -struct xt_secmark_target_selinux_info { - u_int32_t selsid; - char selctx[SECMARK_SELCTX_MAX]; -}; - -struct xt_secmark_target_info { - u_int8_t mode; - union { - struct xt_secmark_target_selinux_info sel; - } u; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_comment.h b/libc/kernel/common/linux/netfilter/xt_comment.h deleted file mode 100644 index 6ea26fc78..000000000 --- a/libc/kernel/common/linux/netfilter/xt_comment.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_COMMENT_H -#define _XT_COMMENT_H - -#define XT_MAX_COMMENT_LEN 256 - -struct xt_comment_info { - unsigned char comment[XT_MAX_COMMENT_LEN]; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_connbytes.h b/libc/kernel/common/linux/netfilter/xt_connbytes.h deleted file mode 100644 index 8cc80e164..000000000 --- a/libc/kernel/common/linux/netfilter/xt_connbytes.h +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_CONNBYTES_H -#define _XT_CONNBYTES_H - -enum xt_connbytes_what { - XT_CONNBYTES_PKTS, - XT_CONNBYTES_BYTES, - XT_CONNBYTES_AVGPKT, -}; - -enum xt_connbytes_direction { - XT_CONNBYTES_DIR_ORIGINAL, - XT_CONNBYTES_DIR_REPLY, - XT_CONNBYTES_DIR_BOTH, -}; - -struct xt_connbytes_info -{ - struct { - aligned_u64 from; - aligned_u64 to; - } count; - u_int8_t what; - u_int8_t direction; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_connmark.h b/libc/kernel/common/linux/netfilter/xt_connmark.h deleted file mode 100644 index 021e03ab1..000000000 --- a/libc/kernel/common/linux/netfilter/xt_connmark.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_CONNMARK_H -#define _XT_CONNMARK_H - -struct xt_connmark_info { - unsigned long mark, mask; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_conntrack.h b/libc/kernel/common/linux/netfilter/xt_conntrack.h deleted file mode 100644 index aa9bde2cf..000000000 --- a/libc/kernel/common/linux/netfilter/xt_conntrack.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_CONNTRACK_H -#define _XT_CONNTRACK_H - -#include -#include - -#define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) -#define XT_CONNTRACK_STATE_INVALID (1 << 0) - -#define XT_CONNTRACK_STATE_SNAT (1 << (IP_CT_NUMBER + 1)) -#define XT_CONNTRACK_STATE_DNAT (1 << (IP_CT_NUMBER + 2)) -#define XT_CONNTRACK_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 3)) - -#define XT_CONNTRACK_STATE 0x01 -#define XT_CONNTRACK_PROTO 0x02 -#define XT_CONNTRACK_ORIGSRC 0x04 -#define XT_CONNTRACK_ORIGDST 0x08 -#define XT_CONNTRACK_REPLSRC 0x10 -#define XT_CONNTRACK_REPLDST 0x20 -#define XT_CONNTRACK_STATUS 0x40 -#define XT_CONNTRACK_EXPIRES 0x80 - -struct ip_conntrack_old_tuple -{ - struct { - __u32 ip; - union { - __u16 all; - } u; - } src; - - struct { - __u32 ip; - union { - __u16 all; - } u; - - __u16 protonum; - } dst; -}; - -struct xt_conntrack_info -{ - unsigned int statemask, statusmask; - - struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX]; - struct in_addr sipmsk[IP_CT_DIR_MAX], dipmsk[IP_CT_DIR_MAX]; - - unsigned long expires_min, expires_max; - - u_int8_t flags; - - u_int8_t invflags; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_dccp.h b/libc/kernel/common/linux/netfilter/xt_dccp.h deleted file mode 100644 index 8a10e6724..000000000 --- a/libc/kernel/common/linux/netfilter/xt_dccp.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_DCCP_H_ -#define _XT_DCCP_H_ - -#define XT_DCCP_SRC_PORTS 0x01 -#define XT_DCCP_DEST_PORTS 0x02 -#define XT_DCCP_TYPE 0x04 -#define XT_DCCP_OPTION 0x08 - -#define XT_DCCP_VALID_FLAGS 0x0f - -struct xt_dccp_info { - u_int16_t dpts[2]; - u_int16_t spts[2]; - - u_int16_t flags; - u_int16_t invflags; - - u_int16_t typemask; - u_int8_t option; -}; - -#endif - diff --git a/libc/kernel/common/linux/netfilter/xt_esp.h b/libc/kernel/common/linux/netfilter/xt_esp.h deleted file mode 100644 index 175c47eb6..000000000 --- a/libc/kernel/common/linux/netfilter/xt_esp.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_ESP_H -#define _XT_ESP_H - -struct xt_esp -{ - u_int32_t spis[2]; - u_int8_t invflags; -}; - -#define XT_ESP_INV_SPI 0x01 -#define XT_ESP_INV_MASK 0x01 - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_helper.h b/libc/kernel/common/linux/netfilter/xt_helper.h deleted file mode 100644 index 6ffa451ee..000000000 --- a/libc/kernel/common/linux/netfilter/xt_helper.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_HELPER_H -#define _XT_HELPER_H - -struct xt_helper_info { - int invert; - char name[30]; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_length.h b/libc/kernel/common/linux/netfilter/xt_length.h deleted file mode 100644 index 12db6c7d3..000000000 --- a/libc/kernel/common/linux/netfilter/xt_length.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_LENGTH_H -#define _XT_LENGTH_H - -struct xt_length_info { - u_int16_t min, max; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_limit.h b/libc/kernel/common/linux/netfilter/xt_limit.h deleted file mode 100644 index f9fb37ff6..000000000 --- a/libc/kernel/common/linux/netfilter/xt_limit.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_RATE_H -#define _XT_RATE_H - -#define XT_LIMIT_SCALE 10000 - -struct xt_rateinfo { - u_int32_t avg; - u_int32_t burst; - - unsigned long prev; - u_int32_t credit; - u_int32_t credit_cap, cost; - - struct xt_rateinfo *master; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_mac.h b/libc/kernel/common/linux/netfilter/xt_mac.h deleted file mode 100644 index 2473aab66..000000000 --- a/libc/kernel/common/linux/netfilter/xt_mac.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_MAC_H -#define _XT_MAC_H - -struct xt_mac_info { - unsigned char srcaddr[ETH_ALEN]; - int invert; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_mark.h b/libc/kernel/common/linux/netfilter/xt_mark.h deleted file mode 100644 index 69699dfb8..000000000 --- a/libc/kernel/common/linux/netfilter/xt_mark.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_MARK_H -#define _XT_MARK_H - -struct xt_mark_info { - unsigned long mark, mask; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_multiport.h b/libc/kernel/common/linux/netfilter/xt_multiport.h deleted file mode 100644 index f17979af1..000000000 --- a/libc/kernel/common/linux/netfilter/xt_multiport.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_MULTIPORT_H -#define _XT_MULTIPORT_H - -enum xt_multiport_flags -{ - XT_MULTIPORT_SOURCE, - XT_MULTIPORT_DESTINATION, - XT_MULTIPORT_EITHER -}; - -#define XT_MULTI_PORTS 15 - -struct xt_multiport -{ - u_int8_t flags; - u_int8_t count; - u_int16_t ports[XT_MULTI_PORTS]; -}; - -struct xt_multiport_v1 -{ - u_int8_t flags; - u_int8_t count; - u_int16_t ports[XT_MULTI_PORTS]; - u_int8_t pflags[XT_MULTI_PORTS]; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_physdev.h b/libc/kernel/common/linux/netfilter/xt_physdev.h deleted file mode 100644 index d0ca032a9..000000000 --- a/libc/kernel/common/linux/netfilter/xt_physdev.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_PHYSDEV_H -#define _XT_PHYSDEV_H - -#define XT_PHYSDEV_OP_IN 0x01 -#define XT_PHYSDEV_OP_OUT 0x02 -#define XT_PHYSDEV_OP_BRIDGED 0x04 -#define XT_PHYSDEV_OP_ISIN 0x08 -#define XT_PHYSDEV_OP_ISOUT 0x10 -#define XT_PHYSDEV_OP_MASK (0x20 - 1) - -struct xt_physdev_info { - char physindev[IFNAMSIZ]; - char in_mask[IFNAMSIZ]; - char physoutdev[IFNAMSIZ]; - char out_mask[IFNAMSIZ]; - u_int8_t invert; - u_int8_t bitmask; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_pkttype.h b/libc/kernel/common/linux/netfilter/xt_pkttype.h deleted file mode 100644 index 32527b88a..000000000 --- a/libc/kernel/common/linux/netfilter/xt_pkttype.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_PKTTYPE_H -#define _XT_PKTTYPE_H - -struct xt_pkttype_info { - int pkttype; - int invert; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_quota.h b/libc/kernel/common/linux/netfilter/xt_quota.h deleted file mode 100644 index d34752d1f..000000000 --- a/libc/kernel/common/linux/netfilter/xt_quota.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_QUOTA_H -#define _XT_QUOTA_H - -enum xt_quota_flags { - XT_QUOTA_INVERT = 0x1, -}; -#define XT_QUOTA_MASK 0x1 - -struct xt_quota_info { - u_int32_t flags; - u_int32_t pad; - aligned_u64 quota; - struct xt_quota_info *master; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_realm.h b/libc/kernel/common/linux/netfilter/xt_realm.h deleted file mode 100644 index 1a2a3cfcb..000000000 --- a/libc/kernel/common/linux/netfilter/xt_realm.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_REALM_H -#define _XT_REALM_H - -struct xt_realm_info { - u_int32_t id; - u_int32_t mask; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_sctp.h b/libc/kernel/common/linux/netfilter/xt_sctp.h deleted file mode 100644 index f79c3b648..000000000 --- a/libc/kernel/common/linux/netfilter/xt_sctp.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_SCTP_H_ -#define _XT_SCTP_H_ - -#define XT_SCTP_SRC_PORTS 0x01 -#define XT_SCTP_DEST_PORTS 0x02 -#define XT_SCTP_CHUNK_TYPES 0x04 - -#define XT_SCTP_VALID_FLAGS 0x07 - -#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0])) - -struct xt_sctp_flag_info { - u_int8_t chunktype; - u_int8_t flag; - u_int8_t flag_mask; -}; - -#define XT_NUM_SCTP_FLAGS 4 - -struct xt_sctp_info { - u_int16_t dpts[2]; - u_int16_t spts[2]; - - u_int32_t chunkmap[256 / sizeof (u_int32_t)]; - -#define SCTP_CHUNK_MATCH_ANY 0x01 -#define SCTP_CHUNK_MATCH_ALL 0x02 -#define SCTP_CHUNK_MATCH_ONLY 0x04 - - u_int32_t chunk_match_type; - struct xt_sctp_flag_info flag_info[XT_NUM_SCTP_FLAGS]; - int flag_count; - - u_int32_t flags; - u_int32_t invflags; -}; - -#define bytes(type) (sizeof(type) * 8) - -#define SCTP_CHUNKMAP_SET(chunkmap, type) do { chunkmap[type / bytes(u_int32_t)] |= 1 << (type % bytes(u_int32_t)); } while (0) - -#define SCTP_CHUNKMAP_CLEAR(chunkmap, type) do { chunkmap[type / bytes(u_int32_t)] &= ~(1 << (type % bytes(u_int32_t))); } while (0) - -#define SCTP_CHUNKMAP_IS_SET(chunkmap, type) ({ (chunkmap[type / bytes (u_int32_t)] & (1 << (type % bytes (u_int32_t)))) ? 1: 0; }) - -#define SCTP_CHUNKMAP_RESET(chunkmap) do { int i; for (i = 0; i < ELEMCOUNT(chunkmap); i++) chunkmap[i] = 0; } while (0) - -#define SCTP_CHUNKMAP_SET_ALL(chunkmap) do { int i; for (i = 0; i < ELEMCOUNT(chunkmap); i++) chunkmap[i] = ~0; } while (0) - -#define SCTP_CHUNKMAP_COPY(destmap, srcmap) do { int i; for (i = 0; i < ELEMCOUNT(chunkmap); i++) destmap[i] = srcmap[i]; } while (0) - -#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) ({ int i; int flag = 1; for (i = 0; i < ELEMCOUNT(chunkmap); i++) { if (chunkmap[i]) { flag = 0; break; } } flag; }) - -#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) ({ int i; int flag = 1; for (i = 0; i < ELEMCOUNT(chunkmap); i++) { if (chunkmap[i] != ~0) { flag = 0; break; } } flag; }) - -#endif - diff --git a/libc/kernel/common/linux/netfilter/xt_state.h b/libc/kernel/common/linux/netfilter/xt_state.h deleted file mode 100644 index 675477694..000000000 --- a/libc/kernel/common/linux/netfilter/xt_state.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_STATE_H -#define _XT_STATE_H - -#define XT_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) -#define XT_STATE_INVALID (1 << 0) - -#define XT_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 1)) - -struct xt_state_info -{ - unsigned int statemask; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_statistic.h b/libc/kernel/common/linux/netfilter/xt_statistic.h deleted file mode 100644 index 999b0a1de..000000000 --- a/libc/kernel/common/linux/netfilter/xt_statistic.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_STATISTIC_H -#define _XT_STATISTIC_H - -enum xt_statistic_mode { - XT_STATISTIC_MODE_RANDOM, - XT_STATISTIC_MODE_NTH, - __XT_STATISTIC_MODE_MAX -}; -#define XT_STATISTIC_MODE_MAX (__XT_STATISTIC_MODE_MAX - 1) - -enum xt_statistic_flags { - XT_STATISTIC_INVERT = 0x1, -}; -#define XT_STATISTIC_MASK 0x1 - -struct xt_statistic_info { - u_int16_t mode; - u_int16_t flags; - union { - struct { - u_int32_t probability; - } random; - struct { - u_int32_t every; - u_int32_t packet; - u_int32_t count; - } nth; - } u; - struct xt_statistic_info *master __attribute__((aligned(8))); -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_string.h b/libc/kernel/common/linux/netfilter/xt_string.h deleted file mode 100644 index a01018ff3..000000000 --- a/libc/kernel/common/linux/netfilter/xt_string.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_STRING_H -#define _XT_STRING_H - -#define XT_STRING_MAX_PATTERN_SIZE 128 -#define XT_STRING_MAX_ALGO_NAME_SIZE 16 - -struct xt_string_info -{ - u_int16_t from_offset; - u_int16_t to_offset; - char algo[XT_STRING_MAX_ALGO_NAME_SIZE]; - char pattern[XT_STRING_MAX_PATTERN_SIZE]; - u_int8_t patlen; - u_int8_t invert; - struct ts_config __attribute__((aligned(8))) *config; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_tcpmss.h b/libc/kernel/common/linux/netfilter/xt_tcpmss.h deleted file mode 100644 index 33de0ee56..000000000 --- a/libc/kernel/common/linux/netfilter/xt_tcpmss.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_TCPMSS_MATCH_H -#define _XT_TCPMSS_MATCH_H - -struct xt_tcpmss_match_info { - u_int16_t mss_min, mss_max; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter/xt_tcpudp.h b/libc/kernel/common/linux/netfilter/xt_tcpudp.h deleted file mode 100644 index 476fffba2..000000000 --- a/libc/kernel/common/linux/netfilter/xt_tcpudp.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XT_TCPUDP_H -#define _XT_TCPUDP_H - -struct xt_tcp -{ - u_int16_t spts[2]; - u_int16_t dpts[2]; - u_int8_t option; - u_int8_t flg_mask; - u_int8_t flg_cmp; - u_int8_t invflags; -}; - -#define XT_TCP_INV_SRCPT 0x01 -#define XT_TCP_INV_DSTPT 0x02 -#define XT_TCP_INV_FLAGS 0x04 -#define XT_TCP_INV_OPTION 0x08 -#define XT_TCP_INV_MASK 0x0F - -struct xt_udp -{ - u_int16_t spts[2]; - u_int16_t dpts[2]; - u_int8_t invflags; -}; - -#define XT_UDP_INV_SRCPT 0x01 -#define XT_UDP_INV_DSTPT 0x02 -#define XT_UDP_INV_MASK 0x03 - -#endif diff --git a/libc/kernel/common/linux/netfilter_arp.h b/libc/kernel/common/linux/netfilter_arp.h deleted file mode 100644 index 08569db8a..000000000 --- a/libc/kernel/common/linux/netfilter_arp.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_ARP_NETFILTER_H -#define __LINUX_ARP_NETFILTER_H - -#include - -#define NF_ARP 0 - -#define NF_ARP_IN 0 -#define NF_ARP_OUT 1 -#define NF_ARP_FORWARD 2 -#define NF_ARP_NUMHOOKS 3 - -#endif diff --git a/libc/kernel/common/linux/netfilter_arp/arp_tables.h b/libc/kernel/common/linux/netfilter_arp/arp_tables.h deleted file mode 100644 index 665a34763..000000000 --- a/libc/kernel/common/linux/netfilter_arp/arp_tables.h +++ /dev/null @@ -1,159 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ARPTABLES_H -#define _ARPTABLES_H - -#include -#include - -#include - -#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN -#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN -#define arpt_target xt_target -#define arpt_table xt_table - -#define ARPT_DEV_ADDR_LEN_MAX 16 - -struct arpt_devaddr_info { - char addr[ARPT_DEV_ADDR_LEN_MAX]; - char mask[ARPT_DEV_ADDR_LEN_MAX]; -}; - -struct arpt_arp { - - struct in_addr src, tgt; - - struct in_addr smsk, tmsk; - - u_int8_t arhln, arhln_mask; - struct arpt_devaddr_info src_devaddr; - struct arpt_devaddr_info tgt_devaddr; - - u_int16_t arpop, arpop_mask; - - u_int16_t arhrd, arhrd_mask; - u_int16_t arpro, arpro_mask; - - char iniface[IFNAMSIZ], outiface[IFNAMSIZ]; - unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ]; - - u_int8_t flags; - - u_int16_t invflags; -}; - -#define arpt_entry_target xt_entry_target -#define arpt_standard_target xt_standard_target - -#define ARPT_F_MASK 0x00 - -#define ARPT_INV_VIA_IN 0x0001 -#define ARPT_INV_VIA_OUT 0x0002 -#define ARPT_INV_SRCIP 0x0004 -#define ARPT_INV_TGTIP 0x0008 -#define ARPT_INV_SRCDEVADDR 0x0010 -#define ARPT_INV_TGTDEVADDR 0x0020 -#define ARPT_INV_ARPOP 0x0040 -#define ARPT_INV_ARPHRD 0x0080 -#define ARPT_INV_ARPPRO 0x0100 -#define ARPT_INV_ARPHLN 0x0200 -#define ARPT_INV_MASK 0x03FF - -struct arpt_entry -{ - struct arpt_arp arp; - - u_int16_t target_offset; - - u_int16_t next_offset; - - unsigned int comefrom; - - struct xt_counters counters; - - unsigned char elems[0]; -}; - -#define ARPT_CTL_OFFSET 32 -#define ARPT_BASE_CTL (XT_BASE_CTL+ARPT_CTL_OFFSET) - -#define ARPT_SO_SET_REPLACE (XT_SO_SET_REPLACE+ARPT_CTL_OFFSET) -#define ARPT_SO_SET_ADD_COUNTERS (XT_SO_SET_ADD_COUNTERS+ARPT_CTL_OFFSET) -#define ARPT_SO_SET_MAX (XT_SO_SET_MAX+ARPT_CTL_OFFSET) - -#define ARPT_SO_GET_INFO (XT_SO_GET_INFO+ARPT_CTL_OFFSET) -#define ARPT_SO_GET_ENTRIES (XT_SO_GET_ENTRIES+ARPT_CTL_OFFSET) - -#define ARPT_SO_GET_REVISION_TARGET (XT_SO_GET_REVISION_TARGET+ARPT_CTL_OFFSET) -#define ARPT_SO_GET_MAX (XT_SO_GET_REVISION_TARGET+ARPT_CTL_OFFSET) - -#define ARPT_CONTINUE XT_CONTINUE - -#define ARPT_RETURN XT_RETURN - -struct arpt_getinfo -{ - - char name[ARPT_TABLE_MAXNAMELEN]; - - unsigned int valid_hooks; - - unsigned int hook_entry[NF_ARP_NUMHOOKS]; - - unsigned int underflow[NF_ARP_NUMHOOKS]; - - unsigned int num_entries; - - unsigned int size; -}; - -struct arpt_replace -{ - - char name[ARPT_TABLE_MAXNAMELEN]; - - unsigned int valid_hooks; - - unsigned int num_entries; - - unsigned int size; - - unsigned int hook_entry[NF_ARP_NUMHOOKS]; - - unsigned int underflow[NF_ARP_NUMHOOKS]; - - unsigned int num_counters; - - struct xt_counters __user *counters; - - struct arpt_entry entries[0]; -}; - -#define arpt_counters_info xt_counters_info - -struct arpt_get_entries -{ - - char name[ARPT_TABLE_MAXNAMELEN]; - - unsigned int size; - - struct arpt_entry entrytable[0]; -}; - -#define ARPT_STANDARD_TARGET XT_STANDARD_TARGET - -#define ARPT_ERROR_TARGET XT_ERROR_TARGET - -#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) ({ unsigned int __i; int __ret = 0; struct arpt_entry *__entry; for (__i = 0; __i < (size); __i += __entry->next_offset) { __entry = (void *)(entries) + __i; __ret = fn(__entry , ## args); if (__ret != 0) break; } __ret; }) -#endif diff --git a/libc/kernel/common/linux/netfilter_bridge.h b/libc/kernel/common/linux/netfilter_bridge.h deleted file mode 100644 index 22cca5564..000000000 --- a/libc/kernel/common/linux/netfilter_bridge.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_BRIDGE_NETFILTER_H -#define __LINUX_BRIDGE_NETFILTER_H - -#include - -#define NF_BR_PRE_ROUTING 0 - -#define NF_BR_LOCAL_IN 1 - -#define NF_BR_FORWARD 2 - -#define NF_BR_LOCAL_OUT 3 - -#define NF_BR_POST_ROUTING 4 - -#define NF_BR_BROUTING 5 -#define NF_BR_NUMHOOKS 6 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4.h b/libc/kernel/common/linux/netfilter_ipv4.h deleted file mode 100644 index 17fd4516e..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_IP_NETFILTER_H -#define __LINUX_IP_NETFILTER_H - -#include - -#define NFC_IP_SRC 0x0001 - -#define NFC_IP_DST 0x0002 - -#define NFC_IP_IF_IN 0x0004 - -#define NFC_IP_IF_OUT 0x0008 - -#define NFC_IP_TOS 0x0010 - -#define NFC_IP_PROTO 0x0020 - -#define NFC_IP_OPTIONS 0x0040 - -#define NFC_IP_FRAG 0x0080 - -#define NFC_IP_TCPFLAGS 0x0100 - -#define NFC_IP_SRC_PT 0x0200 - -#define NFC_IP_DST_PT 0x0400 - -#define NFC_IP_PROTO_UNKNOWN 0x2000 - -#define NF_IP_PRE_ROUTING 0 - -#define NF_IP_LOCAL_IN 1 - -#define NF_IP_FORWARD 2 - -#define NF_IP_LOCAL_OUT 3 - -#define NF_IP_POST_ROUTING 4 -#define NF_IP_NUMHOOKS 5 - -enum nf_ip_hook_priorities { - NF_IP_PRI_FIRST = INT_MIN, - NF_IP_PRI_CONNTRACK_DEFRAG = -400, - NF_IP_PRI_RAW = -300, - NF_IP_PRI_SELINUX_FIRST = -225, - NF_IP_PRI_CONNTRACK = -200, - NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD = -175, - NF_IP_PRI_MANGLE = -150, - NF_IP_PRI_NAT_DST = -100, - NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50, - NF_IP_PRI_FILTER = 0, - NF_IP_PRI_NAT_SRC = 100, - NF_IP_PRI_SELINUX_LAST = 225, - NF_IP_PRI_CONNTRACK_HELPER = INT_MAX - 2, - NF_IP_PRI_NAT_SEQ_ADJUST = INT_MAX - 1, - NF_IP_PRI_CONNTRACK_CONFIRM = INT_MAX, - NF_IP_PRI_LAST = INT_MAX, -}; - -#define SO_ORIGINAL_DST 80 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ip_conntrack.h b/libc/kernel/common/linux/netfilter_ipv4/ip_conntrack.h deleted file mode 100644 index ef55a61f2..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ip_conntrack.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP_CONNTRACK_H -#define _IP_CONNTRACK_H - -#include - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ip_conntrack_tuple.h b/libc/kernel/common/linux/netfilter_ipv4/ip_conntrack_tuple.h deleted file mode 100644 index 0c96bafb0..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ip_conntrack_tuple.h +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP_CONNTRACK_TUPLE_H -#define _IP_CONNTRACK_TUPLE_H - -#include -#include - -union ip_conntrack_manip_proto -{ - - u_int16_t all; - - struct { - __be16 port; - } tcp; - struct { - u_int16_t port; - } udp; - struct { - u_int16_t id; - } icmp; - struct { - u_int16_t port; - } sctp; - struct { - __be16 key; - } gre; -}; - -struct ip_conntrack_manip -{ - u_int32_t ip; - union ip_conntrack_manip_proto u; -}; - -struct ip_conntrack_tuple -{ - struct ip_conntrack_manip src; - - struct { - u_int32_t ip; - union { - - u_int16_t all; - - struct { - u_int16_t port; - } tcp; - struct { - u_int16_t port; - } udp; - struct { - u_int8_t type, code; - } icmp; - struct { - u_int16_t port; - } sctp; - struct { - __be16 key; - } gre; - } u; - - u_int8_t protonum; - - u_int8_t dir; - } dst; -}; - -#define IP_CT_TUPLE_U_BLANK(tuple) do { (tuple)->src.u.all = 0; (tuple)->dst.u.all = 0; } while (0) - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ip_nat.h b/libc/kernel/common/linux/netfilter_ipv4/ip_nat.h deleted file mode 100644 index 7db9da3b0..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ip_nat.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP_NAT_H -#define _IP_NAT_H -#include -#include - -#define IP_NAT_MAPPING_TYPE_MAX_NAMELEN 16 - -enum ip_nat_manip_type -{ - IP_NAT_MANIP_SRC, - IP_NAT_MANIP_DST -}; - -#define HOOK2MANIP(hooknum) ((hooknum) != NF_IP_POST_ROUTING && (hooknum) != NF_IP_LOCAL_IN) - -#define IP_NAT_RANGE_MAP_IPS 1 -#define IP_NAT_RANGE_PROTO_SPECIFIED 2 - -struct ip_nat_seq { - - u_int32_t correction_pos; - - int16_t offset_before, offset_after; -}; - -struct ip_nat_range -{ - - unsigned int flags; - - u_int32_t min_ip, max_ip; - - union ip_conntrack_manip_proto min, max; -}; - -struct ip_nat_multi_range_compat -{ - unsigned int rangesize; - - struct ip_nat_range range[1]; -}; - -#define ip_nat_multi_range ip_nat_multi_range_compat -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ip_nat_rule.h b/libc/kernel/common/linux/netfilter_ipv4/ip_nat_rule.h deleted file mode 100644 index b9db0b0f6..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ip_nat_rule.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP_NAT_RULE_H -#define _IP_NAT_RULE_H -#include -#include -#include - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ip_queue.h b/libc/kernel/common/linux/netfilter_ipv4/ip_queue.h deleted file mode 100644 index 5d17a545e..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ip_queue.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP_QUEUE_H -#define _IP_QUEUE_H - -#include - -typedef struct ipq_packet_msg { - unsigned long packet_id; - unsigned long mark; - long timestamp_sec; - long timestamp_usec; - unsigned int hook; - char indev_name[IFNAMSIZ]; - char outdev_name[IFNAMSIZ]; - unsigned short hw_protocol; - unsigned short hw_type; - unsigned char hw_addrlen; - unsigned char hw_addr[8]; - size_t data_len; - unsigned char payload[0]; -} ipq_packet_msg_t; - -typedef struct ipq_mode_msg { - unsigned char value; - size_t range; -} ipq_mode_msg_t; - -typedef struct ipq_verdict_msg { - unsigned int value; - unsigned long id; - size_t data_len; - unsigned char payload[0]; -} ipq_verdict_msg_t; - -typedef struct ipq_peer_msg { - union { - ipq_verdict_msg_t verdict; - ipq_mode_msg_t mode; - } msg; -} ipq_peer_msg_t; - -enum { - IPQ_COPY_NONE, - IPQ_COPY_META, - IPQ_COPY_PACKET -}; -#define IPQ_COPY_MAX IPQ_COPY_PACKET - -#define IPQM_BASE 0x10 -#define IPQM_MODE (IPQM_BASE + 1) -#define IPQM_VERDICT (IPQM_BASE + 2) -#define IPQM_PACKET (IPQM_BASE + 3) -#define IPQM_MAX (IPQM_BASE + 4) - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ip_tables.h b/libc/kernel/common/linux/netfilter_ipv4/ip_tables.h deleted file mode 100644 index aa48305b1..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ip_tables.h +++ /dev/null @@ -1,180 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPTABLES_H -#define _IPTABLES_H - -#include -#include - -#include - -#define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN -#define IPT_TABLE_MAXNAMELEN XT_FUNCTION_MAXNAMELEN -#define ipt_match xt_match -#define ipt_target xt_target -#define ipt_table xt_table -#define ipt_get_revision xt_get_revision - -struct ipt_ip { - - struct in_addr src, dst; - - struct in_addr smsk, dmsk; - char iniface[IFNAMSIZ], outiface[IFNAMSIZ]; - unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ]; - - u_int16_t proto; - - u_int8_t flags; - - u_int8_t invflags; -}; - -#define ipt_entry_match xt_entry_match -#define ipt_entry_target xt_entry_target -#define ipt_standard_target xt_standard_target - -#define ipt_counters xt_counters - -#define IPT_F_FRAG 0x01 -#define IPT_F_GOTO 0x02 -#define IPT_F_MASK 0x03 - -#define IPT_INV_VIA_IN 0x01 -#define IPT_INV_VIA_OUT 0x02 -#define IPT_INV_TOS 0x04 -#define IPT_INV_SRCIP 0x08 -#define IPT_INV_DSTIP 0x10 -#define IPT_INV_FRAG 0x20 -#define IPT_INV_PROTO XT_INV_PROTO -#define IPT_INV_MASK 0x7F - -struct ipt_entry -{ - struct ipt_ip ip; - - unsigned int nfcache; - - u_int16_t target_offset; - - u_int16_t next_offset; - - unsigned int comefrom; - - struct xt_counters counters; - - unsigned char elems[0]; -}; - -#define IPT_BASE_CTL XT_BASE_CTL - -#define IPT_SO_SET_REPLACE XT_SO_SET_REPLACE -#define IPT_SO_SET_ADD_COUNTERS XT_SO_SET_ADD_COUNTERS -#define IPT_SO_SET_MAX XT_SO_SET_MAX - -#define IPT_SO_GET_INFO XT_SO_GET_INFO -#define IPT_SO_GET_ENTRIES XT_SO_GET_ENTRIES -#define IPT_SO_GET_REVISION_MATCH XT_SO_GET_REVISION_MATCH -#define IPT_SO_GET_REVISION_TARGET XT_SO_GET_REVISION_TARGET -#define IPT_SO_GET_MAX XT_SO_GET_REVISION_TARGET - -#define IPT_CONTINUE XT_CONTINUE -#define IPT_RETURN XT_RETURN - -#include -#define ipt_udp xt_udp -#define ipt_tcp xt_tcp - -#define IPT_TCP_INV_SRCPT XT_TCP_INV_SRCPT -#define IPT_TCP_INV_DSTPT XT_TCP_INV_DSTPT -#define IPT_TCP_INV_FLAGS XT_TCP_INV_FLAGS -#define IPT_TCP_INV_OPTION XT_TCP_INV_OPTION -#define IPT_TCP_INV_MASK XT_TCP_INV_MASK - -#define IPT_UDP_INV_SRCPT XT_UDP_INV_SRCPT -#define IPT_UDP_INV_DSTPT XT_UDP_INV_DSTPT -#define IPT_UDP_INV_MASK XT_UDP_INV_MASK - -struct ipt_icmp -{ - u_int8_t type; - u_int8_t code[2]; - u_int8_t invflags; -}; - -#define IPT_ICMP_INV 0x01 - -struct ipt_getinfo -{ - - char name[IPT_TABLE_MAXNAMELEN]; - - unsigned int valid_hooks; - - unsigned int hook_entry[NF_IP_NUMHOOKS]; - - unsigned int underflow[NF_IP_NUMHOOKS]; - - unsigned int num_entries; - - unsigned int size; -}; - -struct ipt_replace -{ - - char name[IPT_TABLE_MAXNAMELEN]; - - unsigned int valid_hooks; - - unsigned int num_entries; - - unsigned int size; - - unsigned int hook_entry[NF_IP_NUMHOOKS]; - - unsigned int underflow[NF_IP_NUMHOOKS]; - - unsigned int num_counters; - - struct xt_counters __user *counters; - - struct ipt_entry entries[0]; -}; - -#define ipt_counters_info xt_counters_info - -struct ipt_get_entries -{ - - char name[IPT_TABLE_MAXNAMELEN]; - - unsigned int size; - - struct ipt_entry entrytable[0]; -}; - -#define IPT_STANDARD_TARGET XT_STANDARD_TARGET - -#define IPT_ERROR_TARGET XT_ERROR_TARGET - -static __inline__ struct ipt_entry_target * -ipt_get_target(struct ipt_entry *e) -{ - return (void *)e + e->target_offset; -} - -#define IPT_MATCH_ITERATE(e, fn, args...) ({ unsigned int __i; int __ret = 0; struct ipt_entry_match *__match; for (__i = sizeof(struct ipt_entry); __i < (e)->target_offset; __i += __match->u.match_size) { __match = (void *)(e) + __i; __ret = fn(__match , ## args); if (__ret != 0) break; } __ret; }) - -#define IPT_ENTRY_ITERATE(entries, size, fn, args...) ({ unsigned int __i; int __ret = 0; struct ipt_entry *__entry; for (__i = 0; __i < (size); __i += __entry->next_offset) { __entry = (void *)(entries) + __i; __ret = fn(__entry , ## args); if (__ret != 0) break; } __ret; }) - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_CLASSIFY.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_CLASSIFY.h deleted file mode 100644 index a738edd9a..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_CLASSIFY.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_CLASSIFY_H -#define _IPT_CLASSIFY_H - -#include -#define ipt_classify_target_info xt_classify_target_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_DSCP.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_DSCP.h deleted file mode 100644 index 0271fb26f..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_DSCP.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_DSCP_TARGET_H -#define _IPT_DSCP_TARGET_H -#include - -struct ipt_DSCP_info { - u_int8_t dscp; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_ECN.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_ECN.h deleted file mode 100644 index 67c16fee9..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_ECN.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_ECN_TARGET_H -#define _IPT_ECN_TARGET_H -#include - -#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK) - -#define IPT_ECN_OP_SET_IP 0x01 -#define IPT_ECN_OP_SET_ECE 0x10 -#define IPT_ECN_OP_SET_CWR 0x20 - -#define IPT_ECN_OP_MASK 0xce - -struct ipt_ECN_info { - u_int8_t operation; - u_int8_t ip_ect; - union { - struct { - u_int8_t ece:1, cwr:1; - } tcp; - } proto; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_LOG.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_LOG.h deleted file mode 100644 index dd6fd1b2a..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_LOG.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_LOG_H -#define _IPT_LOG_H - -#define IPT_LOG_TCPSEQ 0x01 -#define IPT_LOG_TCPOPT 0x02 -#define IPT_LOG_IPOPT 0x04 -#define IPT_LOG_UID 0x08 -#define IPT_LOG_NFLOG 0x10 -#define IPT_LOG_MASK 0x1f - -struct ipt_log_info { - unsigned char level; - unsigned char logflags; - char prefix[30]; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_NFQUEUE.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_NFQUEUE.h deleted file mode 100644 index 27ac4a52c..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_NFQUEUE.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_NFQ_TARGET_H -#define _IPT_NFQ_TARGET_H - -#include - -#define ipt_NFQ_info xt_NFQ_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_REJECT.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_REJECT.h deleted file mode 100644 index d3c396570..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_REJECT.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_REJECT_H -#define _IPT_REJECT_H - -enum ipt_reject_with { - IPT_ICMP_NET_UNREACHABLE, - IPT_ICMP_HOST_UNREACHABLE, - IPT_ICMP_PROT_UNREACHABLE, - IPT_ICMP_PORT_UNREACHABLE, - IPT_ICMP_ECHOREPLY, - IPT_ICMP_NET_PROHIBITED, - IPT_ICMP_HOST_PROHIBITED, - IPT_TCP_RESET, - IPT_ICMP_ADMIN_PROHIBITED -}; - -struct ipt_reject_info { - enum ipt_reject_with with; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_TCPMSS.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_TCPMSS.h deleted file mode 100644 index e924f371b..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_TCPMSS.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_TCPMSS_H -#define _IPT_TCPMSS_H - -struct ipt_tcpmss_info { - u_int16_t mss; -}; - -#define IPT_TCPMSS_CLAMP_PMTU 0xffff - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_TOS.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_TOS.h deleted file mode 100644 index 1cc211660..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_TOS.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_TOS_H_target -#define _IPT_TOS_H_target - -#ifndef IPTOS_NORMALSVC -#define IPTOS_NORMALSVC 0 -#endif - -struct ipt_tos_target_info { - u_int8_t tos; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_TTL.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_TTL.h deleted file mode 100644 index f9e98af62..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_TTL.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_TTL_H -#define _IPT_TTL_H - -enum { - IPT_TTL_SET = 0, - IPT_TTL_INC, - IPT_TTL_DEC -}; - -#define IPT_TTL_MAXMODE IPT_TTL_DEC - -struct ipt_TTL_info { - u_int8_t mode; - u_int8_t ttl; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_ULOG.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_ULOG.h deleted file mode 100644 index 9511cb84f..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_ULOG.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_ULOG_H -#define _IPT_ULOG_H - -#ifndef NETLINK_NFLOG -#define NETLINK_NFLOG 5 -#endif - -#define ULOG_DEFAULT_NLGROUP 1 -#define ULOG_DEFAULT_QTHRESHOLD 1 - -#define ULOG_MAC_LEN 80 -#define ULOG_PREFIX_LEN 32 - -#define ULOG_MAX_QLEN 50 - -struct ipt_ulog_info { - unsigned int nl_group; - size_t copy_range; - size_t qthreshold; - char prefix[ULOG_PREFIX_LEN]; -}; - -typedef struct ulog_packet_msg { - unsigned long mark; - long timestamp_sec; - long timestamp_usec; - unsigned int hook; - char indev_name[IFNAMSIZ]; - char outdev_name[IFNAMSIZ]; - size_t data_len; - char prefix[ULOG_PREFIX_LEN]; - unsigned char mac_len; - unsigned char mac[ULOG_MAC_LEN]; - unsigned char payload[0]; -} ulog_packet_msg_t; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_addrtype.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_addrtype.h deleted file mode 100644 index 5203b32b7..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_addrtype.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_ADDRTYPE_H -#define _IPT_ADDRTYPE_H - -struct ipt_addrtype_info { - u_int16_t source; - u_int16_t dest; - u_int32_t invert_source; - u_int32_t invert_dest; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_ah.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_ah.h deleted file mode 100644 index 11983e2cb..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_ah.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_AH_H -#define _IPT_AH_H - -struct ipt_ah -{ - u_int32_t spis[2]; - u_int8_t invflags; -}; - -#define IPT_AH_INV_SPI 0x01 -#define IPT_AH_INV_MASK 0x01 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_comment.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_comment.h deleted file mode 100644 index dbd750780..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_comment.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_COMMENT_H -#define _IPT_COMMENT_H - -#include - -#define IPT_MAX_COMMENT_LEN XT_MAX_COMMENT_LEN - -#define ipt_comment_info xt_comment_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_connbytes.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_connbytes.h deleted file mode 100644 index 8ae19c5c2..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_connbytes.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_CONNBYTES_H -#define _IPT_CONNBYTES_H - -#include -#define ipt_connbytes_what xt_connbytes_what - -#define IPT_CONNBYTES_PKTS XT_CONNBYTES_PKTS -#define IPT_CONNBYTES_BYTES XT_CONNBYTES_BYTES -#define IPT_CONNBYTES_AVGPKT XT_CONNBYTES_AVGPKT - -#define ipt_connbytes_direction xt_connbytes_direction -#define IPT_CONNBYTES_DIR_ORIGINAL XT_CONNBYTES_DIR_ORIGINAL -#define IPT_CONNBYTES_DIR_REPLY XT_CONNBYTES_DIR_REPLY -#define IPT_CONNBYTES_DIR_BOTH XT_CONNBYTES_DIR_BOTH - -#define ipt_connbytes_info xt_connbytes_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_dccp.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_dccp.h deleted file mode 100644 index c1212c903..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_dccp.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_DCCP_H_ -#define _IPT_DCCP_H_ - -#include -#define IPT_DCCP_SRC_PORTS XT_DCCP_SRC_PORTS -#define IPT_DCCP_DEST_PORTS XT_DCCP_DEST_PORTS -#define IPT_DCCP_TYPE XT_DCCP_TYPE -#define IPT_DCCP_OPTION XT_DCCP_OPTION - -#define IPT_DCCP_VALID_FLAGS XT_DCCP_VALID_FLAGS - -#define ipt_dccp_info xt_dccp_info - -#endif - diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_dscp_.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_dscp_.h deleted file mode 100644 index aba8861e4..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_dscp_.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_DSCP_H -#define _IPT_DSCP_H - -#define IPT_DSCP_MASK 0xfc -#define IPT_DSCP_SHIFT 2 -#define IPT_DSCP_MAX 0x3f - -struct ipt_dscp_info { - u_int8_t dscp; - u_int8_t invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_esp.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_esp.h deleted file mode 100644 index 4947e7ebc..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_esp.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_ESP_H -#define _IPT_ESP_H - -#include - -#define ipt_esp xt_esp -#define IPT_ESP_INV_SPI XT_ESP_INV_SPI -#define IPT_ESP_INV_MASK XT_ESP_INV_MASK - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_hashlimit.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_hashlimit.h deleted file mode 100644 index adc1f416a..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_hashlimit.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_HASHLIMIT_H -#define _IPT_HASHLIMIT_H - -#define IPT_HASHLIMIT_SCALE 10000 - -struct ipt_hashlimit_htable; - -#define IPT_HASHLIMIT_HASH_DIP 0x0001 -#define IPT_HASHLIMIT_HASH_DPT 0x0002 -#define IPT_HASHLIMIT_HASH_SIP 0x0004 -#define IPT_HASHLIMIT_HASH_SPT 0x0008 - -struct hashlimit_cfg { - u_int32_t mode; - u_int32_t avg; - u_int32_t burst; - - u_int32_t size; - u_int32_t max; - u_int32_t gc_interval; - u_int32_t expire; -}; - -struct ipt_hashlimit_info { - char name [IFNAMSIZ]; - struct hashlimit_cfg cfg; - struct ipt_hashlimit_htable *hinfo; - - union { - void *ptr; - struct ipt_hashlimit_info *master; - } u; -}; -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_helper.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_helper.h deleted file mode 100644 index 576add910..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_helper.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_HELPER_H -#define _IPT_HELPER_H - -#include -#define ipt_helper_info xt_helper_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_iprange.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_iprange.h deleted file mode 100644 index b4dd603b8..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_iprange.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_IPRANGE_H -#define _IPT_IPRANGE_H - -#define IPRANGE_SRC 0x01 -#define IPRANGE_DST 0x02 -#define IPRANGE_SRC_INV 0x10 -#define IPRANGE_DST_INV 0x20 - -struct ipt_iprange { - - u_int32_t min_ip, max_ip; -}; - -struct ipt_iprange_info -{ - struct ipt_iprange src; - struct ipt_iprange dst; - - u_int8_t flags; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_length.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_length.h deleted file mode 100644 index 961085928..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_length.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_LENGTH_H -#define _IPT_LENGTH_H - -#include -#define ipt_length_info xt_length_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_mac.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_mac.h deleted file mode 100644 index 89378a37c..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_mac.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_MAC_H -#define _IPT_MAC_H - -#include -#define ipt_mac_info xt_mac_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_owner.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_owner.h deleted file mode 100644 index 8b742b1d4..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_owner.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_OWNER_H -#define _IPT_OWNER_H - -#define IPT_OWNER_UID 0x01 -#define IPT_OWNER_GID 0x02 -#define IPT_OWNER_PID 0x04 -#define IPT_OWNER_SID 0x08 -#define IPT_OWNER_COMM 0x10 - -struct ipt_owner_info { - uid_t uid; - gid_t gid; - pid_t pid; - pid_t sid; - char comm[16]; - u_int8_t match, invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_physdev.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_physdev.h deleted file mode 100644 index 791cf024c..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_physdev.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_PHYSDEV_H -#define _IPT_PHYSDEV_H - -#include - -#define IPT_PHYSDEV_OP_IN XT_PHYSDEV_OP_IN -#define IPT_PHYSDEV_OP_OUT XT_PHYSDEV_OP_OUT -#define IPT_PHYSDEV_OP_BRIDGED XT_PHYSDEV_OP_BRIDGED -#define IPT_PHYSDEV_OP_ISIN XT_PHYSDEV_OP_ISIN -#define IPT_PHYSDEV_OP_ISOUT XT_PHYSDEV_OP_ISOUT -#define IPT_PHYSDEV_OP_MASK XT_PHYSDEV_OP_MASK - -#define ipt_physdev_info xt_physdev_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_pkttype.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_pkttype.h deleted file mode 100644 index fbb20b125..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_pkttype.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_PKTTYPE_H -#define _IPT_PKTTYPE_H - -#include -#define ipt_pkttype_info xt_pkttype_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_realm.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_realm.h deleted file mode 100644 index 9b80faa1c..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_realm.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_REALM_H -#define _IPT_REALM_H - -#include -#define ipt_realm_info xt_realm_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_recent.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_recent.h deleted file mode 100644 index 45172bd10..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_recent.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_RECENT_H -#define _IPT_RECENT_H - -#define RECENT_NAME "ipt_recent" -#define RECENT_VER "v0.3.1" - -#define IPT_RECENT_CHECK 1 -#define IPT_RECENT_SET 2 -#define IPT_RECENT_UPDATE 4 -#define IPT_RECENT_REMOVE 8 -#define IPT_RECENT_TTL 16 - -#define IPT_RECENT_SOURCE 0 -#define IPT_RECENT_DEST 1 - -#define IPT_RECENT_NAME_LEN 200 - -struct ipt_recent_info { - u_int32_t seconds; - u_int32_t hit_count; - u_int8_t check_set; - u_int8_t invert; - char name[IPT_RECENT_NAME_LEN]; - u_int8_t side; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_sctp.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_sctp.h deleted file mode 100644 index 20f301f29..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_sctp.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_SCTP_H_ -#define _IPT_SCTP_H_ - -#define IPT_SCTP_SRC_PORTS 0x01 -#define IPT_SCTP_DEST_PORTS 0x02 -#define IPT_SCTP_CHUNK_TYPES 0x04 - -#define IPT_SCTP_VALID_FLAGS 0x07 - -struct ipt_sctp_flag_info { - u_int8_t chunktype; - u_int8_t flag; - u_int8_t flag_mask; -}; - -#define IPT_NUM_SCTP_FLAGS 4 - -struct ipt_sctp_info { - u_int16_t dpts[2]; - u_int16_t spts[2]; - - u_int32_t chunkmap[256 / sizeof (u_int32_t)]; - -#define SCTP_CHUNK_MATCH_ANY 0x01 -#define SCTP_CHUNK_MATCH_ALL 0x02 -#define SCTP_CHUNK_MATCH_ONLY 0x04 - - u_int32_t chunk_match_type; - struct ipt_sctp_flag_info flag_info[IPT_NUM_SCTP_FLAGS]; - int flag_count; - - u_int32_t flags; - u_int32_t invflags; -}; - -#define bytes(type) (sizeof(type) * 8) - -#define SCTP_CHUNKMAP_SET(chunkmap, type) do { chunkmap[type / bytes(u_int32_t)] |= 1 << (type % bytes(u_int32_t)); } while (0) - -#define SCTP_CHUNKMAP_CLEAR(chunkmap, type) do { chunkmap[type / bytes(u_int32_t)] &= ~(1 << (type % bytes(u_int32_t))); } while (0) - -#define SCTP_CHUNKMAP_IS_SET(chunkmap, type) ({ (chunkmap[type / bytes (u_int32_t)] & (1 << (type % bytes (u_int32_t)))) ? 1: 0; }) - -#define SCTP_CHUNKMAP_RESET(chunkmap) do { int i; for (i = 0; i < ARRAY_SIZE(chunkmap); i++) chunkmap[i] = 0; } while (0) - -#define SCTP_CHUNKMAP_SET_ALL(chunkmap) do { int i; for (i = 0; i < ARRAY_SIZE(chunkmap); i++) chunkmap[i] = ~0; } while (0) - -#define SCTP_CHUNKMAP_COPY(destmap, srcmap) do { int i; for (i = 0; i < ARRAY_SIZE(chunkmap); i++) destmap[i] = srcmap[i]; } while (0) - -#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) ({ int i; int flag = 1; for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { if (chunkmap[i]) { flag = 0; break; } } flag; }) - -#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) ({ int i; int flag = 1; for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { if (chunkmap[i] != ~0) { flag = 0; break; } } flag; }) - -#endif - diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_state.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_state.h deleted file mode 100644 index bd519900d..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_state.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_STATE_H -#define _IPT_STATE_H - -#include - -#define IPT_STATE_BIT XT_STATE_BIT -#define IPT_STATE_INVALID XT_STATE_INVALID - -#define IPT_STATE_UNTRACKED XT_STATE_UNTRACKED - -#define ipt_state_info xt_state_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_string.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_string.h deleted file mode 100644 index 60923dd89..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_string.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_STRING_H -#define _IPT_STRING_H - -#include - -#define IPT_STRING_MAX_PATTERN_SIZE XT_STRING_MAX_PATTERN_SIZE -#define IPT_STRING_MAX_ALGO_NAME_SIZE XT_STRING_MAX_ALGO_NAME_SIZE -#define ipt_string_info xt_string_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv4/ipt_tos_.h b/libc/kernel/common/linux/netfilter_ipv4/ipt_tos_.h deleted file mode 100644 index 789ce229a..000000000 --- a/libc/kernel/common/linux/netfilter_ipv4/ipt_tos_.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IPT_TOS_H -#define _IPT_TOS_H - -struct ipt_tos_info { - u_int8_t tos; - u_int8_t invert; -}; - -#ifndef IPTOS_NORMALSVC -#define IPTOS_NORMALSVC 0 -#endif - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6.h b/libc/kernel/common/linux/netfilter_ipv6.h deleted file mode 100644 index 0d68cd9c3..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_IP6_NETFILTER_H -#define __LINUX_IP6_NETFILTER_H - -#include - -#define NFC_IP6_SRC 0x0001 - -#define NFC_IP6_DST 0x0002 - -#define NFC_IP6_IF_IN 0x0004 - -#define NFC_IP6_IF_OUT 0x0008 - -#define NFC_IP6_TOS 0x0010 - -#define NFC_IP6_PROTO 0x0020 - -#define NFC_IP6_OPTIONS 0x0040 - -#define NFC_IP6_FRAG 0x0080 - -#define NFC_IP6_TCPFLAGS 0x0100 - -#define NFC_IP6_SRC_PT 0x0200 - -#define NFC_IP6_DST_PT 0x0400 - -#define NFC_IP6_PROTO_UNKNOWN 0x2000 - -#define NF_IP6_PRE_ROUTING 0 - -#define NF_IP6_LOCAL_IN 1 - -#define NF_IP6_FORWARD 2 - -#define NF_IP6_LOCAL_OUT 3 - -#define NF_IP6_POST_ROUTING 4 -#define NF_IP6_NUMHOOKS 5 - -enum nf_ip6_hook_priorities { - NF_IP6_PRI_FIRST = INT_MIN, - NF_IP6_PRI_CONNTRACK_DEFRAG = -400, - NF_IP6_PRI_SELINUX_FIRST = -225, - NF_IP6_PRI_CONNTRACK = -200, - NF_IP6_PRI_BRIDGE_SABOTAGE_FORWARD = -175, - NF_IP6_PRI_MANGLE = -150, - NF_IP6_PRI_NAT_DST = -100, - NF_IP6_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50, - NF_IP6_PRI_FILTER = 0, - NF_IP6_PRI_NAT_SRC = 100, - NF_IP6_PRI_SELINUX_LAST = 225, - NF_IP6_PRI_LAST = INT_MAX, -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h b/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h deleted file mode 100644 index 1687e4fea..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6_tables.h +++ /dev/null @@ -1,178 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6_TABLES_H -#define _IP6_TABLES_H - -#include -#include - -#include - -#define IP6T_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN -#define IP6T_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN - -#define ip6t_match xt_match -#define ip6t_target xt_target -#define ip6t_table xt_table -#define ip6t_get_revision xt_get_revision - -struct ip6t_ip6 { - - struct in6_addr src, dst; - - struct in6_addr smsk, dmsk; - char iniface[IFNAMSIZ], outiface[IFNAMSIZ]; - unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ]; - - u_int16_t proto; - - u_int8_t tos; - - u_int8_t flags; - - u_int8_t invflags; -}; - -#define ip6t_entry_match xt_entry_match -#define ip6t_entry_target xt_entry_target -#define ip6t_standard_target xt_standard_target - -#define ip6t_counters xt_counters - -#define IP6T_F_PROTO 0x01 -#define IP6T_F_TOS 0x02 -#define IP6T_F_GOTO 0x04 -#define IP6T_F_MASK 0x07 - -#define IP6T_INV_VIA_IN 0x01 -#define IP6T_INV_VIA_OUT 0x02 -#define IP6T_INV_TOS 0x04 -#define IP6T_INV_SRCIP 0x08 -#define IP6T_INV_DSTIP 0x10 -#define IP6T_INV_FRAG 0x20 -#define IP6T_INV_PROTO XT_INV_PROTO -#define IP6T_INV_MASK 0x7F - -struct ip6t_entry -{ - struct ip6t_ip6 ipv6; - - unsigned int nfcache; - - u_int16_t target_offset; - - u_int16_t next_offset; - - unsigned int comefrom; - - struct xt_counters counters; - - unsigned char elems[0]; -}; - -#define IP6T_BASE_CTL XT_BASE_CTL - -#define IP6T_SO_SET_REPLACE XT_SO_SET_REPLACE -#define IP6T_SO_SET_ADD_COUNTERS XT_SO_SET_ADD_COUNTERS -#define IP6T_SO_SET_MAX XT_SO_SET_MAX - -#define IP6T_SO_GET_INFO XT_SO_GET_INFO -#define IP6T_SO_GET_ENTRIES XT_SO_GET_ENTRIES -#define IP6T_SO_GET_REVISION_MATCH XT_SO_GET_REVISION_MATCH -#define IP6T_SO_GET_REVISION_TARGET XT_SO_GET_REVISION_TARGET -#define IP6T_SO_GET_MAX XT_SO_GET_REVISION_TARGET - -#define IP6T_CONTINUE XT_CONTINUE - -#define IP6T_RETURN XT_RETURN - -#include - -#define ip6t_tcp xt_tcp -#define ip6t_udp xt_udp - -#define IP6T_TCP_INV_SRCPT XT_TCP_INV_SRCPT -#define IP6T_TCP_INV_DSTPT XT_TCP_INV_DSTPT -#define IP6T_TCP_INV_FLAGS XT_TCP_INV_FLAGS -#define IP6T_TCP_INV_OPTION XT_TCP_INV_OPTION -#define IP6T_TCP_INV_MASK XT_TCP_INV_MASK - -#define IP6T_UDP_INV_SRCPT XT_UDP_INV_SRCPT -#define IP6T_UDP_INV_DSTPT XT_UDP_INV_DSTPT -#define IP6T_UDP_INV_MASK XT_UDP_INV_MASK - -struct ip6t_icmp -{ - u_int8_t type; - u_int8_t code[2]; - u_int8_t invflags; -}; - -#define IP6T_ICMP_INV 0x01 - -struct ip6t_getinfo -{ - - char name[IP6T_TABLE_MAXNAMELEN]; - - unsigned int valid_hooks; - - unsigned int hook_entry[NF_IP6_NUMHOOKS]; - - unsigned int underflow[NF_IP6_NUMHOOKS]; - - unsigned int num_entries; - - unsigned int size; -}; - -struct ip6t_replace -{ - - char name[IP6T_TABLE_MAXNAMELEN]; - - unsigned int valid_hooks; - - unsigned int num_entries; - - unsigned int size; - - unsigned int hook_entry[NF_IP6_NUMHOOKS]; - - unsigned int underflow[NF_IP6_NUMHOOKS]; - - unsigned int num_counters; - - struct xt_counters __user *counters; - - struct ip6t_entry entries[0]; -}; - -#define ip6t_counters_info xt_counters_info - -struct ip6t_get_entries -{ - - char name[IP6T_TABLE_MAXNAMELEN]; - - unsigned int size; - - struct ip6t_entry entrytable[0]; -}; - -#define IP6T_STANDARD_TARGET XT_STANDARD_TARGET - -#define IP6T_ERROR_TARGET XT_ERROR_TARGET - -#define IP6T_MATCH_ITERATE(e, fn, args...) ({ unsigned int __i; int __ret = 0; struct ip6t_entry_match *__m; for (__i = sizeof(struct ip6t_entry); __i < (e)->target_offset; __i += __m->u.match_size) { __m = (void *)(e) + __i; __ret = fn(__m , ## args); if (__ret != 0) break; } __ret; }) -#define IP6T_ENTRY_ITERATE(entries, size, fn, args...) ({ unsigned int __i; int __ret = 0; struct ip6t_entry *__e; for (__i = 0; __i < (size); __i += __e->next_offset) { __e = (void *)(entries) + __i; __ret = fn(__e , ## args); if (__ret != 0) break; } __ret; }) -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_HL.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_HL.h deleted file mode 100644 index 1071ff984..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_HL.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_HL_H -#define _IP6T_HL_H - -enum { - IP6T_HL_SET = 0, - IP6T_HL_INC, - IP6T_HL_DEC -}; - -#define IP6T_HL_MAXMODE IP6T_HL_DEC - -struct ip6t_HL_info { - u_int8_t mode; - u_int8_t hop_limit; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_LOG.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_LOG.h deleted file mode 100644 index 344c13392..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_LOG.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_LOG_H -#define _IP6T_LOG_H - -#define IP6T_LOG_TCPSEQ 0x01 -#define IP6T_LOG_TCPOPT 0x02 -#define IP6T_LOG_IPOPT 0x04 -#define IP6T_LOG_UID 0x08 -#define IP6T_LOG_NFLOG 0x10 -#define IP6T_LOG_MASK 0x1f - -struct ip6t_log_info { - unsigned char level; - unsigned char logflags; - char prefix[30]; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_REJECT.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_REJECT.h deleted file mode 100644 index b101c85a0..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_REJECT.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_REJECT_H -#define _IP6T_REJECT_H - -enum ip6t_reject_with { - IP6T_ICMP6_NO_ROUTE, - IP6T_ICMP6_ADM_PROHIBITED, - IP6T_ICMP6_NOT_NEIGHBOUR, - IP6T_ICMP6_ADDR_UNREACH, - IP6T_ICMP6_PORT_UNREACH, - IP6T_ICMP6_ECHOREPLY, - IP6T_TCP_RESET -}; - -struct ip6t_reject_info { - u_int32_t with; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_ah.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_ah.h deleted file mode 100644 index 7110df5e7..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_ah.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_AH_H -#define _IP6T_AH_H - -struct ip6t_ah -{ - u_int32_t spis[2]; - u_int32_t hdrlen; - u_int8_t hdrres; - u_int8_t invflags; -}; - -#define IP6T_AH_SPI 0x01 -#define IP6T_AH_LEN 0x02 -#define IP6T_AH_RES 0x04 - -#define IP6T_AH_INV_SPI 0x01 -#define IP6T_AH_INV_LEN 0x02 -#define IP6T_AH_INV_MASK 0x03 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_esp.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_esp.h deleted file mode 100644 index 0aa755667..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_esp.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_ESP_H -#define _IP6T_ESP_H - -#include - -#define ip6t_esp xt_esp -#define IP6T_ESP_INV_SPI XT_ESP_INV_SPI -#define IP6T_ESP_INV_MASK XT_ESP_INV_MASK - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_frag.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_frag.h deleted file mode 100644 index 134d6bb58..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_frag.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_FRAG_H -#define _IP6T_FRAG_H - -struct ip6t_frag -{ - u_int32_t ids[2]; - u_int32_t hdrlen; - u_int8_t flags; - u_int8_t invflags; -}; - -#define IP6T_FRAG_IDS 0x01 -#define IP6T_FRAG_LEN 0x02 -#define IP6T_FRAG_RES 0x04 -#define IP6T_FRAG_FST 0x08 -#define IP6T_FRAG_MF 0x10 -#define IP6T_FRAG_NMF 0x20 - -#define IP6T_FRAG_INV_IDS 0x01 -#define IP6T_FRAG_INV_LEN 0x02 -#define IP6T_FRAG_INV_MASK 0x03 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_hl.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_hl.h deleted file mode 100644 index e0144d2b7..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_hl.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_HL_H -#define _IP6T_HL_H - -enum { - IP6T_HL_EQ = 0, - IP6T_HL_NE, - IP6T_HL_LT, - IP6T_HL_GT, -}; - -struct ip6t_hl_info { - u_int8_t mode; - u_int8_t hop_limit; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_ipv6header.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_ipv6header.h deleted file mode 100644 index 7e83ebc5b..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_ipv6header.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __IPV6HEADER_H -#define __IPV6HEADER_H - -struct ip6t_ipv6header_info -{ - u_int8_t matchflags; - u_int8_t invflags; - u_int8_t modeflag; -}; - -#define MASK_HOPOPTS 128 -#define MASK_DSTOPTS 64 -#define MASK_ROUTING 32 -#define MASK_FRAGMENT 16 -#define MASK_AH 8 -#define MASK_ESP 4 -#define MASK_NONE 2 -#define MASK_PROTO 1 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_length.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_length.h deleted file mode 100644 index fdc4c5fc7..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_length.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_LENGTH_H -#define _IP6T_LENGTH_H - -#include -#define ip6t_length_info xt_length_info - -#endif - diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_mac.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_mac.h deleted file mode 100644 index 58e60233f..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_mac.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_MAC_H -#define _IP6T_MAC_H - -#include -#define ip6t_mac_info xt_mac_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_opts.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_opts.h deleted file mode 100644 index 1d9db9c55..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_opts.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_OPTS_H -#define _IP6T_OPTS_H - -#define IP6T_OPTS_OPTSNR 16 - -struct ip6t_opts -{ - u_int32_t hdrlen; - u_int8_t flags; - u_int8_t invflags; - u_int16_t opts[IP6T_OPTS_OPTSNR]; - u_int8_t optsnr; -}; - -#define IP6T_OPTS_LEN 0x01 -#define IP6T_OPTS_OPTS 0x02 -#define IP6T_OPTS_NSTRICT 0x04 - -#define IP6T_OPTS_INV_LEN 0x01 -#define IP6T_OPTS_INV_MASK 0x01 - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_owner.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_owner.h deleted file mode 100644 index a6126b473..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_owner.h +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_OWNER_H -#define _IP6T_OWNER_H - -#define IP6T_OWNER_UID 0x01 -#define IP6T_OWNER_GID 0x02 -#define IP6T_OWNER_PID 0x04 -#define IP6T_OWNER_SID 0x08 - -struct ip6t_owner_info { - uid_t uid; - gid_t gid; - pid_t pid; - pid_t sid; - u_int8_t match, invert; -}; - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_physdev.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_physdev.h deleted file mode 100644 index 657e2fb27..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_physdev.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_PHYSDEV_H -#define _IP6T_PHYSDEV_H - -#include - -#define IP6T_PHYSDEV_OP_IN XT_PHYSDEV_OP_IN -#define IP6T_PHYSDEV_OP_OUT XT_PHYSDEV_OP_OUT -#define IP6T_PHYSDEV_OP_BRIDGED XT_PHYSDEV_OP_BRIDGED -#define IP6T_PHYSDEV_OP_ISIN XT_PHYSDEV_OP_ISIN -#define IP6T_PHYSDEV_OP_ISOUT XT_PHYSDEV_OP_ISOUT -#define IP6T_PHYSDEV_OP_MASK XT_PHYSDEV_OP_MASK - -#define ip6t_physdev_info xt_physdev_info - -#endif diff --git a/libc/kernel/common/linux/netfilter_ipv6/ip6t_rt.h b/libc/kernel/common/linux/netfilter_ipv6/ip6t_rt.h deleted file mode 100644 index 274a7ee06..000000000 --- a/libc/kernel/common/linux/netfilter_ipv6/ip6t_rt.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _IP6T_RT_H -#define _IP6T_RT_H - -#define IP6T_RT_HOPS 16 - -struct ip6t_rt -{ - u_int32_t rt_type; - u_int32_t segsleft[2]; - u_int32_t hdrlen; - u_int8_t flags; - u_int8_t invflags; - struct in6_addr addrs[IP6T_RT_HOPS]; - u_int8_t addrnr; -}; - -#define IP6T_RT_TYP 0x01 -#define IP6T_RT_SGS 0x02 -#define IP6T_RT_LEN 0x04 -#define IP6T_RT_RES 0x08 -#define IP6T_RT_FST_MASK 0x30 -#define IP6T_RT_FST 0x10 -#define IP6T_RT_FST_NSTRICT 0x20 - -#define IP6T_RT_INV_TYP 0x01 -#define IP6T_RT_INV_SGS 0x02 -#define IP6T_RT_INV_LEN 0x04 -#define IP6T_RT_INV_MASK 0x07 - -#endif diff --git a/libc/kernel/common/linux/netlink.h b/libc/kernel/common/linux/netlink.h deleted file mode 100644 index b6f1c06b3..000000000 --- a/libc/kernel/common/linux/netlink.h +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_NETLINK_H -#define __LINUX_NETLINK_H - -#include -#include - -#define NETLINK_ROUTE 0 -#define NETLINK_UNUSED 1 -#define NETLINK_USERSOCK 2 -#define NETLINK_FIREWALL 3 -#define NETLINK_INET_DIAG 4 -#define NETLINK_NFLOG 5 -#define NETLINK_XFRM 6 -#define NETLINK_SELINUX 7 -#define NETLINK_ISCSI 8 -#define NETLINK_AUDIT 9 -#define NETLINK_FIB_LOOKUP 10 -#define NETLINK_CONNECTOR 11 -#define NETLINK_NETFILTER 12 -#define NETLINK_IP6_FW 13 -#define NETLINK_DNRTMSG 14 -#define NETLINK_KOBJECT_UEVENT 15 -#define NETLINK_GENERIC 16 - -#define MAX_LINKS 32 - -struct sockaddr_nl -{ - sa_family_t nl_family; - unsigned short nl_pad; - __u32 nl_pid; - __u32 nl_groups; -}; - -struct nlmsghdr -{ - __u32 nlmsg_len; - __u16 nlmsg_type; - __u16 nlmsg_flags; - __u32 nlmsg_seq; - __u32 nlmsg_pid; -}; - -#define NLM_F_REQUEST 1 -#define NLM_F_MULTI 2 -#define NLM_F_ACK 4 -#define NLM_F_ECHO 8 - -#define NLM_F_ROOT 0x100 -#define NLM_F_MATCH 0x200 -#define NLM_F_ATOMIC 0x400 -#define NLM_F_DUMP (NLM_F_ROOT|NLM_F_MATCH) - -#define NLM_F_REPLACE 0x100 -#define NLM_F_EXCL 0x200 -#define NLM_F_CREATE 0x400 -#define NLM_F_APPEND 0x800 - -#define NLMSG_ALIGNTO 4 -#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) ) -#define NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr))) -#define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(NLMSG_HDRLEN)) -#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len)) -#define NLMSG_DATA(nlh) ((void*)(((char*)nlh) + NLMSG_LENGTH(0))) -#define NLMSG_NEXT(nlh,len) ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))) -#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && (nlh)->nlmsg_len <= (len)) -#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len))) - -#define NLMSG_NOOP 0x1 -#define NLMSG_ERROR 0x2 -#define NLMSG_DONE 0x3 -#define NLMSG_OVERRUN 0x4 - -#define NLMSG_MIN_TYPE 0x10 - -struct nlmsgerr -{ - int error; - struct nlmsghdr msg; -}; - -#define NETLINK_ADD_MEMBERSHIP 1 -#define NETLINK_DROP_MEMBERSHIP 2 -#define NETLINK_PKTINFO 3 - -struct nl_pktinfo -{ - __u32 group; -}; - -#define NET_MAJOR 36 - -enum { - NETLINK_UNCONNECTED = 0, - NETLINK_CONNECTED, -}; - -struct nlattr -{ - __u16 nla_len; - __u16 nla_type; -}; - -#define NLA_ALIGNTO 4 -#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1)) -#define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr))) - -#endif diff --git a/libc/kernel/common/linux/nfs.h b/libc/kernel/common/linux/nfs.h deleted file mode 100644 index d94dc9fcf..000000000 --- a/libc/kernel/common/linux/nfs.h +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFS_H -#define _LINUX_NFS_H - -#define NFS_PROGRAM 100003 -#define NFS_PORT 2049 -#define NFS_MAXDATA 8192 -#define NFS_MAXPATHLEN 1024 -#define NFS_MAXNAMLEN 255 -#define NFS_MAXGROUPS 16 -#define NFS_FHSIZE 32 -#define NFS_COOKIESIZE 4 -#define NFS_FIFO_DEV (-1) -#define NFSMODE_FMT 0170000 -#define NFSMODE_DIR 0040000 -#define NFSMODE_CHR 0020000 -#define NFSMODE_BLK 0060000 -#define NFSMODE_REG 0100000 -#define NFSMODE_LNK 0120000 -#define NFSMODE_SOCK 0140000 -#define NFSMODE_FIFO 0010000 - -#define NFS_MNT_PROGRAM 100005 -#define NFS_MNT_PORT 627 - - enum nfs_stat { - NFS_OK = 0, - NFSERR_PERM = 1, - NFSERR_NOENT = 2, - NFSERR_IO = 5, - NFSERR_NXIO = 6, - NFSERR_EAGAIN = 11, - NFSERR_ACCES = 13, - NFSERR_EXIST = 17, - NFSERR_XDEV = 18, - NFSERR_NODEV = 19, - NFSERR_NOTDIR = 20, - NFSERR_ISDIR = 21, - NFSERR_INVAL = 22, - NFSERR_FBIG = 27, - NFSERR_NOSPC = 28, - NFSERR_ROFS = 30, - NFSERR_MLINK = 31, - NFSERR_OPNOTSUPP = 45, - NFSERR_NAMETOOLONG = 63, - NFSERR_NOTEMPTY = 66, - NFSERR_DQUOT = 69, - NFSERR_STALE = 70, - NFSERR_REMOTE = 71, - NFSERR_WFLUSH = 99, - NFSERR_BADHANDLE = 10001, - NFSERR_NOT_SYNC = 10002, - NFSERR_BAD_COOKIE = 10003, - NFSERR_NOTSUPP = 10004, - NFSERR_TOOSMALL = 10005, - NFSERR_SERVERFAULT = 10006, - NFSERR_BADTYPE = 10007, - NFSERR_JUKEBOX = 10008, - NFSERR_SAME = 10009, - NFSERR_DENIED = 10010, - NFSERR_EXPIRED = 10011, - NFSERR_LOCKED = 10012, - NFSERR_GRACE = 10013, - NFSERR_FHEXPIRED = 10014, - NFSERR_SHARE_DENIED = 10015, - NFSERR_WRONGSEC = 10016, - NFSERR_CLID_INUSE = 10017, - NFSERR_RESOURCE = 10018, - NFSERR_MOVED = 10019, - NFSERR_NOFILEHANDLE = 10020, - NFSERR_MINOR_VERS_MISMATCH = 10021, - NFSERR_STALE_CLIENTID = 10022, - NFSERR_STALE_STATEID = 10023, - NFSERR_OLD_STATEID = 10024, - NFSERR_BAD_STATEID = 10025, - NFSERR_BAD_SEQID = 10026, - NFSERR_NOT_SAME = 10027, - NFSERR_LOCK_RANGE = 10028, - NFSERR_SYMLINK = 10029, - NFSERR_RESTOREFH = 10030, - NFSERR_LEASE_MOVED = 10031, - NFSERR_ATTRNOTSUPP = 10032, - NFSERR_NO_GRACE = 10033, - NFSERR_RECLAIM_BAD = 10034, - NFSERR_RECLAIM_CONFLICT = 10035, - NFSERR_BAD_XDR = 10036, - NFSERR_LOCKS_HELD = 10037, - NFSERR_OPENMODE = 10038, - NFSERR_BADOWNER = 10039, - NFSERR_BADCHAR = 10040, - NFSERR_BADNAME = 10041, - NFSERR_BAD_RANGE = 10042, - NFSERR_LOCK_NOTSUPP = 10043, - NFSERR_OP_ILLEGAL = 10044, - NFSERR_DEADLOCK = 10045, - NFSERR_FILE_OPEN = 10046, - NFSERR_ADMIN_REVOKED = 10047, - NFSERR_CB_PATH_DOWN = 10048, - NFSERR_REPLAY_ME = 10049 -}; - -enum nfs_ftype { - NFNON = 0, - NFREG = 1, - NFDIR = 2, - NFBLK = 3, - NFCHR = 4, - NFLNK = 5, - NFSOCK = 6, - NFBAD = 7, - NFFIFO = 8 -}; - -#endif diff --git a/libc/kernel/common/linux/nfs2.h b/libc/kernel/common/linux/nfs2.h deleted file mode 100644 index 1bb5df221..000000000 --- a/libc/kernel/common/linux/nfs2.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFS2_H -#define _LINUX_NFS2_H - -#define NFS2_PORT 2049 -#define NFS2_MAXDATA 8192 -#define NFS2_MAXPATHLEN 1024 -#define NFS2_MAXNAMLEN 255 -#define NFS2_MAXGROUPS 16 -#define NFS2_FHSIZE 32 -#define NFS2_COOKIESIZE 4 -#define NFS2_FIFO_DEV (-1) -#define NFS2MODE_FMT 0170000 -#define NFS2MODE_DIR 0040000 -#define NFS2MODE_CHR 0020000 -#define NFS2MODE_BLK 0060000 -#define NFS2MODE_REG 0100000 -#define NFS2MODE_LNK 0120000 -#define NFS2MODE_SOCK 0140000 -#define NFS2MODE_FIFO 0010000 - -enum nfs2_ftype { - NF2NON = 0, - NF2REG = 1, - NF2DIR = 2, - NF2BLK = 3, - NF2CHR = 4, - NF2LNK = 5, - NF2SOCK = 6, - NF2BAD = 7, - NF2FIFO = 8 -}; - -struct nfs2_fh { - char data[NFS2_FHSIZE]; -}; - -#define NFS2_VERSION 2 -#define NFSPROC_NULL 0 -#define NFSPROC_GETATTR 1 -#define NFSPROC_SETATTR 2 -#define NFSPROC_ROOT 3 -#define NFSPROC_LOOKUP 4 -#define NFSPROC_READLINK 5 -#define NFSPROC_READ 6 -#define NFSPROC_WRITECACHE 7 -#define NFSPROC_WRITE 8 -#define NFSPROC_CREATE 9 -#define NFSPROC_REMOVE 10 -#define NFSPROC_RENAME 11 -#define NFSPROC_LINK 12 -#define NFSPROC_SYMLINK 13 -#define NFSPROC_MKDIR 14 -#define NFSPROC_RMDIR 15 -#define NFSPROC_READDIR 16 -#define NFSPROC_STATFS 17 - -#define NFS_MNT_PROGRAM 100005 -#define NFS_MNT_VERSION 1 -#define MNTPROC_NULL 0 -#define MNTPROC_MNT 1 -#define MNTPROC_UMNT 3 -#define MNTPROC_UMNTALL 4 - -#endif diff --git a/libc/kernel/common/linux/nfs3.h b/libc/kernel/common/linux/nfs3.h deleted file mode 100644 index 8303459ef..000000000 --- a/libc/kernel/common/linux/nfs3.h +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFS3_H -#define _LINUX_NFS3_H - -#define NFS3_PORT 2049 -#define NFS3_MAXDATA 32768 -#define NFS3_MAXPATHLEN PATH_MAX -#define NFS3_MAXNAMLEN NAME_MAX -#define NFS3_MAXGROUPS 16 -#define NFS3_FHSIZE 64 -#define NFS3_COOKIESIZE 4 -#define NFS3_FIFO_DEV (-1) -#define NFS3MODE_FMT 0170000 -#define NFS3MODE_DIR 0040000 -#define NFS3MODE_CHR 0020000 -#define NFS3MODE_BLK 0060000 -#define NFS3MODE_REG 0100000 -#define NFS3MODE_LNK 0120000 -#define NFS3MODE_SOCK 0140000 -#define NFS3MODE_FIFO 0010000 - -#define NFS3_ACCESS_READ 0x0001 -#define NFS3_ACCESS_LOOKUP 0x0002 -#define NFS3_ACCESS_MODIFY 0x0004 -#define NFS3_ACCESS_EXTEND 0x0008 -#define NFS3_ACCESS_DELETE 0x0010 -#define NFS3_ACCESS_EXECUTE 0x0020 -#define NFS3_ACCESS_FULL 0x003f - -enum nfs3_createmode { - NFS3_CREATE_UNCHECKED = 0, - NFS3_CREATE_GUARDED = 1, - NFS3_CREATE_EXCLUSIVE = 2 -}; - -#define NFS3_FSF_LINK 0x0001 -#define NFS3_FSF_SYMLINK 0x0002 -#define NFS3_FSF_HOMOGENEOUS 0x0008 -#define NFS3_FSF_CANSETTIME 0x0010 - -#define NFS3_FSF_DEFAULT 0x001B -#define NFS3_FSF_BILLYBOY 0x0018 -#define NFS3_FSF_READONLY 0x0008 - -enum nfs3_ftype { - NF3NON = 0, - NF3REG = 1, - NF3DIR = 2, - NF3BLK = 3, - NF3CHR = 4, - NF3LNK = 5, - NF3SOCK = 6, - NF3FIFO = 7, - NF3BAD = 8 -}; - -struct nfs3_fh { - unsigned short size; - unsigned char data[NFS3_FHSIZE]; -}; - -#define NFS3_VERSION 3 -#define NFS3PROC_NULL 0 -#define NFS3PROC_GETATTR 1 -#define NFS3PROC_SETATTR 2 -#define NFS3PROC_LOOKUP 3 -#define NFS3PROC_ACCESS 4 -#define NFS3PROC_READLINK 5 -#define NFS3PROC_READ 6 -#define NFS3PROC_WRITE 7 -#define NFS3PROC_CREATE 8 -#define NFS3PROC_MKDIR 9 -#define NFS3PROC_SYMLINK 10 -#define NFS3PROC_MKNOD 11 -#define NFS3PROC_REMOVE 12 -#define NFS3PROC_RMDIR 13 -#define NFS3PROC_RENAME 14 -#define NFS3PROC_LINK 15 -#define NFS3PROC_READDIR 16 -#define NFS3PROC_READDIRPLUS 17 -#define NFS3PROC_FSSTAT 18 -#define NFS3PROC_FSINFO 19 -#define NFS3PROC_PATHCONF 20 -#define NFS3PROC_COMMIT 21 - -#define NFS_MNT3_PROGRAM 100005 -#define NFS_MNT3_VERSION 3 -#define MOUNTPROC3_NULL 0 -#define MOUNTPROC3_MNT 1 -#define MOUNTPROC3_UMNT 3 -#define MOUNTPROC3_UMNTALL 4 - -#ifdef NFS_NEED_KERNEL_TYPES - -#define NFS3_POST_OP_ATTR_WORDS 22 - -#endif -#endif diff --git a/libc/kernel/common/linux/nfs4.h b/libc/kernel/common/linux/nfs4.h deleted file mode 100644 index 2e95e4579..000000000 --- a/libc/kernel/common/linux/nfs4.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFS4_H -#define _LINUX_NFS4_H - -#include - -#define NFS4_VERIFIER_SIZE 8 -#define NFS4_FHSIZE 128 -#define NFS4_MAXPATHLEN PATH_MAX -#define NFS4_MAXNAMLEN NAME_MAX - -#define NFS4_ACCESS_READ 0x0001 -#define NFS4_ACCESS_LOOKUP 0x0002 -#define NFS4_ACCESS_MODIFY 0x0004 -#define NFS4_ACCESS_EXTEND 0x0008 -#define NFS4_ACCESS_DELETE 0x0010 -#define NFS4_ACCESS_EXECUTE 0x0020 - -#define NFS4_FH_PERSISTENT 0x0000 -#define NFS4_FH_NOEXPIRE_WITH_OPEN 0x0001 -#define NFS4_FH_VOLATILE_ANY 0x0002 -#define NFS4_FH_VOL_MIGRATION 0x0004 -#define NFS4_FH_VOL_RENAME 0x0008 - -#define NFS4_OPEN_RESULT_CONFIRM 0x0002 -#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004 - -#define NFS4_SHARE_ACCESS_READ 0x0001 -#define NFS4_SHARE_ACCESS_WRITE 0x0002 -#define NFS4_SHARE_ACCESS_BOTH 0x0003 -#define NFS4_SHARE_DENY_READ 0x0001 -#define NFS4_SHARE_DENY_WRITE 0x0002 -#define NFS4_SHARE_DENY_BOTH 0x0003 - -#define NFS4_SET_TO_SERVER_TIME 0 -#define NFS4_SET_TO_CLIENT_TIME 1 - -#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0 -#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE 1 -#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE 2 -#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE 3 - -#define ACL4_SUPPORT_ALLOW_ACL 0x01 -#define ACL4_SUPPORT_DENY_ACL 0x02 -#define ACL4_SUPPORT_AUDIT_ACL 0x04 -#define ACL4_SUPPORT_ALARM_ACL 0x08 - -#define NFS4_ACE_FILE_INHERIT_ACE 0x00000001 -#define NFS4_ACE_DIRECTORY_INHERIT_ACE 0x00000002 -#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE 0x00000004 -#define NFS4_ACE_INHERIT_ONLY_ACE 0x00000008 -#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG 0x00000010 -#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG 0x00000020 -#define NFS4_ACE_IDENTIFIER_GROUP 0x00000040 -#define NFS4_ACE_OWNER 0x00000080 -#define NFS4_ACE_GROUP 0x00000100 -#define NFS4_ACE_EVERYONE 0x00000200 - -#define NFS4_ACE_READ_DATA 0x00000001 -#define NFS4_ACE_LIST_DIRECTORY 0x00000001 -#define NFS4_ACE_WRITE_DATA 0x00000002 -#define NFS4_ACE_ADD_FILE 0x00000002 -#define NFS4_ACE_APPEND_DATA 0x00000004 -#define NFS4_ACE_ADD_SUBDIRECTORY 0x00000004 -#define NFS4_ACE_READ_NAMED_ATTRS 0x00000008 -#define NFS4_ACE_WRITE_NAMED_ATTRS 0x00000010 -#define NFS4_ACE_EXECUTE 0x00000020 -#define NFS4_ACE_DELETE_CHILD 0x00000040 -#define NFS4_ACE_READ_ATTRIBUTES 0x00000080 -#define NFS4_ACE_WRITE_ATTRIBUTES 0x00000100 -#define NFS4_ACE_DELETE 0x00010000 -#define NFS4_ACE_READ_ACL 0x00020000 -#define NFS4_ACE_WRITE_ACL 0x00040000 -#define NFS4_ACE_WRITE_OWNER 0x00080000 -#define NFS4_ACE_SYNCHRONIZE 0x00100000 -#define NFS4_ACE_GENERIC_READ 0x00120081 -#define NFS4_ACE_GENERIC_WRITE 0x00160106 -#define NFS4_ACE_GENERIC_EXECUTE 0x001200A0 -#define NFS4_ACE_MASK_ALL 0x001F01FF - -enum nfs4_acl_whotype { - NFS4_ACL_WHO_NAMED = 0, - NFS4_ACL_WHO_OWNER, - NFS4_ACL_WHO_GROUP, - NFS4_ACL_WHO_EVERYONE, -}; - -#endif - diff --git a/libc/kernel/common/linux/nfs_xdr.h b/libc/kernel/common/linux/nfs_xdr.h deleted file mode 100644 index 48fe26241..000000000 --- a/libc/kernel/common/linux/nfs_xdr.h +++ /dev/null @@ -1,556 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFS_XDR_H -#define _LINUX_NFS_XDR_H - -#include -#include - -#define NFS_MAX_FILE_IO_SIZE (1048576U) -#define NFS_DEF_FILE_IO_SIZE (4096U) -#define NFS_MIN_FILE_IO_SIZE (1024U) - -struct nfs_fsid { - uint64_t major; - uint64_t minor; -}; - -#define NFS_ATTR_WCC 0x0001 -#define NFS_ATTR_FATTR 0x0002 -#define NFS_ATTR_FATTR_V3 0x0004 -#define NFS_ATTR_FATTR_V4 0x0008 -#define NFS_ATTR_FATTR_V4_REFERRAL 0x0010 - -struct nfs_fsinfo { - struct nfs_fattr *fattr; - __u32 rtmax; - __u32 rtpref; - __u32 rtmult; - __u32 wtmax; - __u32 wtpref; - __u32 wtmult; - __u32 dtpref; - __u64 maxfilesize; - __u32 lease_time; -}; - -struct nfs_fsstat { - struct nfs_fattr *fattr; - __u64 tbytes; - __u64 fbytes; - __u64 abytes; - __u64 tfiles; - __u64 ffiles; - __u64 afiles; -}; - -struct nfs2_fsstat { - __u32 tsize; - __u32 bsize; - __u32 blocks; - __u32 bfree; - __u32 bavail; -}; - -struct nfs_pathconf { - struct nfs_fattr *fattr; - __u32 max_link; - __u32 max_namelen; -}; - -struct nfs4_change_info { - u32 atomic; - u64 before; - u64 after; -}; - -struct nfs_seqid; - -struct nfs_openargs { - const struct nfs_fh * fh; - struct nfs_seqid * seqid; - int open_flags; - __u64 clientid; - __u32 id; - union { - struct iattr * attrs; - nfs4_verifier verifier; - nfs4_stateid delegation; - int delegation_type; - } u; - const struct qstr * name; - const struct nfs_server *server; - const u32 * bitmask; - __u32 claim; -}; - -struct nfs_openres { - nfs4_stateid stateid; - struct nfs_fh fh; - struct nfs4_change_info cinfo; - __u32 rflags; - struct nfs_fattr * f_attr; - struct nfs_fattr * dir_attr; - const struct nfs_server *server; - int delegation_type; - nfs4_stateid delegation; - __u32 do_recall; - __u64 maxsize; -}; - -struct nfs_open_confirmargs { - const struct nfs_fh * fh; - nfs4_stateid * stateid; - struct nfs_seqid * seqid; -}; - -struct nfs_open_confirmres { - nfs4_stateid stateid; -}; - -struct nfs_closeargs { - struct nfs_fh * fh; - nfs4_stateid * stateid; - struct nfs_seqid * seqid; - int open_flags; - const u32 * bitmask; -}; - -struct nfs_closeres { - nfs4_stateid stateid; - struct nfs_fattr * fattr; - const struct nfs_server *server; -}; - -struct nfs_lowner { - __u64 clientid; - u32 id; -}; - -struct nfs_lock_args { - struct nfs_fh * fh; - struct file_lock * fl; - struct nfs_seqid * lock_seqid; - nfs4_stateid * lock_stateid; - struct nfs_seqid * open_seqid; - nfs4_stateid * open_stateid; - struct nfs_lowner lock_owner; - unsigned char block : 1; - unsigned char reclaim : 1; - unsigned char new_lock_owner : 1; -}; - -struct nfs_lock_res { - nfs4_stateid stateid; -}; - -struct nfs_locku_args { - struct nfs_fh * fh; - struct file_lock * fl; - struct nfs_seqid * seqid; - nfs4_stateid * stateid; -}; - -struct nfs_locku_res { - nfs4_stateid stateid; -}; - -struct nfs_lockt_args { - struct nfs_fh * fh; - struct file_lock * fl; - struct nfs_lowner lock_owner; -}; - -struct nfs_lockt_res { - struct file_lock * denied; -}; - -struct nfs4_delegreturnargs { - const struct nfs_fh *fhandle; - const nfs4_stateid *stateid; - const u32 * bitmask; -}; - -struct nfs4_delegreturnres { - struct nfs_fattr * fattr; - const struct nfs_server *server; -}; - -struct nfs_readargs { - struct nfs_fh * fh; - struct nfs_open_context *context; - __u64 offset; - __u32 count; - unsigned int pgbase; - struct page ** pages; -}; - -struct nfs_readres { - struct nfs_fattr * fattr; - __u32 count; - int eof; -}; - -struct nfs_writeargs { - struct nfs_fh * fh; - struct nfs_open_context *context; - __u64 offset; - __u32 count; - enum nfs3_stable_how stable; - unsigned int pgbase; - struct page ** pages; - const u32 * bitmask; -}; - -struct nfs_writeverf { - enum nfs3_stable_how committed; - __u32 verifier[2]; -}; - -struct nfs_writeres { - struct nfs_fattr * fattr; - struct nfs_writeverf * verf; - __u32 count; - const struct nfs_server *server; -}; - -struct nfs_entry { - __u64 ino; - __u64 cookie, - prev_cookie; - const char * name; - unsigned int len; - int eof; - struct nfs_fh * fh; - struct nfs_fattr * fattr; -}; - -struct nfs_sattrargs { - struct nfs_fh * fh; - struct iattr * sattr; -}; - -struct nfs_diropargs { - struct nfs_fh * fh; - const char * name; - unsigned int len; -}; - -struct nfs_createargs { - struct nfs_fh * fh; - const char * name; - unsigned int len; - struct iattr * sattr; -}; - -struct nfs_renameargs { - struct nfs_fh * fromfh; - const char * fromname; - unsigned int fromlen; - struct nfs_fh * tofh; - const char * toname; - unsigned int tolen; -}; - -struct nfs_setattrargs { - struct nfs_fh * fh; - nfs4_stateid stateid; - struct iattr * iap; - const struct nfs_server * server; - const u32 * bitmask; -}; - -struct nfs_setaclargs { - struct nfs_fh * fh; - size_t acl_len; - unsigned int acl_pgbase; - struct page ** acl_pages; -}; - -struct nfs_getaclargs { - struct nfs_fh * fh; - size_t acl_len; - unsigned int acl_pgbase; - struct page ** acl_pages; -}; - -struct nfs_setattrres { - struct nfs_fattr * fattr; - const struct nfs_server * server; -}; - -struct nfs_linkargs { - struct nfs_fh * fromfh; - struct nfs_fh * tofh; - const char * toname; - unsigned int tolen; -}; - -struct nfs_symlinkargs { - struct nfs_fh * fromfh; - const char * fromname; - unsigned int fromlen; - const char * topath; - unsigned int tolen; - struct iattr * sattr; -}; - -struct nfs_readdirargs { - struct nfs_fh * fh; - __u32 cookie; - unsigned int count; - struct page ** pages; -}; - -struct nfs3_getaclargs { - struct nfs_fh * fh; - int mask; - struct page ** pages; -}; - -struct nfs3_setaclargs { - struct inode * inode; - int mask; - struct posix_acl * acl_access; - struct posix_acl * acl_default; - struct page ** pages; -}; - -struct nfs_diropok { - struct nfs_fh * fh; - struct nfs_fattr * fattr; -}; - -struct nfs_readlinkargs { - struct nfs_fh * fh; - unsigned int pgbase; - unsigned int pglen; - struct page ** pages; -}; - -struct nfs3_sattrargs { - struct nfs_fh * fh; - struct iattr * sattr; - unsigned int guard; - struct timespec guardtime; -}; - -struct nfs3_diropargs { - struct nfs_fh * fh; - const char * name; - unsigned int len; -}; - -struct nfs3_accessargs { - struct nfs_fh * fh; - __u32 access; -}; - -struct nfs3_createargs { - struct nfs_fh * fh; - const char * name; - unsigned int len; - struct iattr * sattr; - enum nfs3_createmode createmode; - __u32 verifier[2]; -}; - -struct nfs3_mkdirargs { - struct nfs_fh * fh; - const char * name; - unsigned int len; - struct iattr * sattr; -}; - -struct nfs3_symlinkargs { - struct nfs_fh * fromfh; - const char * fromname; - unsigned int fromlen; - const char * topath; - unsigned int tolen; - struct iattr * sattr; -}; - -struct nfs3_mknodargs { - struct nfs_fh * fh; - const char * name; - unsigned int len; - enum nfs3_ftype type; - struct iattr * sattr; - dev_t rdev; -}; - -struct nfs3_renameargs { - struct nfs_fh * fromfh; - const char * fromname; - unsigned int fromlen; - struct nfs_fh * tofh; - const char * toname; - unsigned int tolen; -}; - -struct nfs3_linkargs { - struct nfs_fh * fromfh; - struct nfs_fh * tofh; - const char * toname; - unsigned int tolen; -}; - -struct nfs3_readdirargs { - struct nfs_fh * fh; - __u64 cookie; - __u32 verf[2]; - int plus; - unsigned int count; - struct page ** pages; -}; - -struct nfs3_diropres { - struct nfs_fattr * dir_attr; - struct nfs_fh * fh; - struct nfs_fattr * fattr; -}; - -struct nfs3_accessres { - struct nfs_fattr * fattr; - __u32 access; -}; - -struct nfs3_readlinkargs { - struct nfs_fh * fh; - unsigned int pgbase; - unsigned int pglen; - struct page ** pages; -}; - -struct nfs3_renameres { - struct nfs_fattr * fromattr; - struct nfs_fattr * toattr; -}; - -struct nfs3_linkres { - struct nfs_fattr * dir_attr; - struct nfs_fattr * fattr; -}; - -struct nfs3_readdirres { - struct nfs_fattr * dir_attr; - __u32 * verf; - int plus; -}; - -struct nfs3_getaclres { - struct nfs_fattr * fattr; - int mask; - unsigned int acl_access_count; - unsigned int acl_default_count; - struct posix_acl * acl_access; - struct posix_acl * acl_default; -}; - -struct nfs_page; - -#define NFS_PAGEVEC_SIZE (8U) - -struct nfs_read_data { - int flags; - struct rpc_task task; - struct inode *inode; - struct rpc_cred *cred; - struct nfs_fattr fattr; - struct list_head pages; - struct nfs_page *req; - struct page **pagevec; - unsigned int npages; - struct nfs_readargs args; - struct nfs_readres res; - struct page *page_array[NFS_PAGEVEC_SIZE]; -}; - -struct nfs_write_data { - int flags; - struct rpc_task task; - struct inode *inode; - struct rpc_cred *cred; - struct nfs_fattr fattr; - struct nfs_writeverf verf; - struct list_head pages; - struct nfs_page *req; - struct page **pagevec; - unsigned int npages; - struct nfs_writeargs args; - struct nfs_writeres res; - struct page *page_array[NFS_PAGEVEC_SIZE]; -}; - -struct nfs_access_entry; - -struct nfs_rpc_ops { - int version; - struct dentry_operations *dentry_ops; - struct inode_operations *dir_inode_ops; - struct inode_operations *file_inode_ops; - - int (*getroot) (struct nfs_server *, struct nfs_fh *, - struct nfs_fsinfo *); - int (*getattr) (struct nfs_server *, struct nfs_fh *, - struct nfs_fattr *); - int (*setattr) (struct dentry *, struct nfs_fattr *, - struct iattr *); - int (*lookup) (struct inode *, struct qstr *, - struct nfs_fh *, struct nfs_fattr *); - int (*access) (struct inode *, struct nfs_access_entry *); - int (*readlink)(struct inode *, struct page *, unsigned int, - unsigned int); - int (*read) (struct nfs_read_data *); - int (*write) (struct nfs_write_data *); - int (*commit) (struct nfs_write_data *); - int (*create) (struct inode *, struct dentry *, - struct iattr *, int, struct nameidata *); - int (*remove) (struct inode *, struct qstr *); - int (*unlink_setup) (struct rpc_message *, - struct dentry *, struct qstr *); - int (*unlink_done) (struct dentry *, struct rpc_task *); - int (*rename) (struct inode *, struct qstr *, - struct inode *, struct qstr *); - int (*link) (struct inode *, struct inode *, struct qstr *); - int (*symlink) (struct inode *, struct qstr *, struct qstr *, - struct iattr *, struct nfs_fh *, - struct nfs_fattr *); - int (*mkdir) (struct inode *, struct dentry *, struct iattr *); - int (*rmdir) (struct inode *, struct qstr *); - int (*readdir) (struct dentry *, struct rpc_cred *, - u64, struct page *, unsigned int, int); - int (*mknod) (struct inode *, struct dentry *, struct iattr *, - dev_t); - int (*statfs) (struct nfs_server *, struct nfs_fh *, - struct nfs_fsstat *); - int (*fsinfo) (struct nfs_server *, struct nfs_fh *, - struct nfs_fsinfo *); - int (*pathconf) (struct nfs_server *, struct nfs_fh *, - struct nfs_pathconf *); - u32 * (*decode_dirent)(u32 *, struct nfs_entry *, int plus); - void (*read_setup) (struct nfs_read_data *); - int (*read_done) (struct rpc_task *, struct nfs_read_data *); - void (*write_setup) (struct nfs_write_data *, int how); - int (*write_done) (struct rpc_task *, struct nfs_write_data *); - void (*commit_setup) (struct nfs_write_data *, int how); - int (*commit_done) (struct rpc_task *, struct nfs_write_data *); - int (*file_open) (struct inode *, struct file *); - int (*file_release) (struct inode *, struct file *); - int (*lock)(struct file *, int, struct file_lock *); - void (*clear_acl_cache)(struct inode *); -}; - -#define NFS_CALL(op, inode, args) NFS_PROTO(inode)->op args - -#endif diff --git a/libc/kernel/common/linux/nfsacl.h b/libc/kernel/common/linux/nfsacl.h deleted file mode 100644 index 7dd95ab84..000000000 --- a/libc/kernel/common/linux/nfsacl.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_NFSACL_H -#define __LINUX_NFSACL_H - -#define NFS_ACL_PROGRAM 100227 - -#define ACLPROC2_GETACL 1 -#define ACLPROC2_SETACL 2 -#define ACLPROC2_GETATTR 3 -#define ACLPROC2_ACCESS 4 - -#define ACLPROC3_GETACL 1 -#define ACLPROC3_SETACL 2 - -#define NFS_ACL 0x0001 -#define NFS_ACLCNT 0x0002 -#define NFS_DFACL 0x0004 -#define NFS_DFACLCNT 0x0008 - -#define NFS_ACL_DEFAULT 0x1000 - -#endif diff --git a/libc/kernel/common/linux/nfsd/auth.h b/libc/kernel/common/linux/nfsd/auth.h deleted file mode 100644 index f840f0e8f..000000000 --- a/libc/kernel/common/linux/nfsd/auth.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_NFSD_AUTH_H -#define LINUX_NFSD_AUTH_H - -#endif diff --git a/libc/kernel/common/linux/nfsd/const.h b/libc/kernel/common/linux/nfsd/const.h deleted file mode 100644 index c345508d9..000000000 --- a/libc/kernel/common/linux/nfsd/const.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFSD_CONST_H -#define _LINUX_NFSD_CONST_H - -#include -#include -#include -#include - -#define NFSSVC_MAXVERS 3 - -#define NFSSVC_MAXBLKSIZE (32*1024) - -#endif diff --git a/libc/kernel/common/linux/nfsd/debug.h b/libc/kernel/common/linux/nfsd/debug.h deleted file mode 100644 index 9b90f05fd..000000000 --- a/libc/kernel/common/linux/nfsd/debug.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_NFSD_DEBUG_H -#define LINUX_NFSD_DEBUG_H - -#include - -#ifdef RPC_DEBUG -#define NFSD_DEBUG 1 -#endif - -#define NFSDDBG_SOCK 0x0001 -#define NFSDDBG_FH 0x0002 -#define NFSDDBG_EXPORT 0x0004 -#define NFSDDBG_SVC 0x0008 -#define NFSDDBG_PROC 0x0010 -#define NFSDDBG_FILEOP 0x0020 -#define NFSDDBG_AUTH 0x0040 -#define NFSDDBG_REPCACHE 0x0080 -#define NFSDDBG_XDR 0x0100 -#define NFSDDBG_LOCKD 0x0200 -#define NFSDDBG_ALL 0x7FFF -#define NFSDDBG_NOCHANGE 0xFFFF - -#endif diff --git a/libc/kernel/common/linux/nfsd/export.h b/libc/kernel/common/linux/nfsd/export.h deleted file mode 100644 index 932274fe6..000000000 --- a/libc/kernel/common/linux/nfsd/export.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef NFSD_EXPORT_H -#define NFSD_EXPORT_H - -#include - -#define NFSCLNT_IDMAX 1024 -#define NFSCLNT_ADDRMAX 16 -#define NFSCLNT_KEYMAX 32 - -#define NFSEXP_READONLY 0x0001 -#define NFSEXP_INSECURE_PORT 0x0002 -#define NFSEXP_ROOTSQUASH 0x0004 -#define NFSEXP_ALLSQUASH 0x0008 -#define NFSEXP_ASYNC 0x0010 -#define NFSEXP_GATHERED_WRITES 0x0020 - -#define NFSEXP_NOHIDE 0x0200 -#define NFSEXP_NOSUBTREECHECK 0x0400 -#define NFSEXP_NOAUTHNLM 0x0800 -#define NFSEXP_MSNFS 0x1000 -#define NFSEXP_FSID 0x2000 -#define NFSEXP_CROSSMOUNT 0x4000 -#define NFSEXP_NOACL 0x8000 -#define NFSEXP_ALLFLAGS 0xFE3F - -#endif - diff --git a/libc/kernel/common/linux/nfsd/interface.h b/libc/kernel/common/linux/nfsd/interface.h deleted file mode 100644 index 3c3946a34..000000000 --- a/libc/kernel/common/linux/nfsd/interface.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_NFSD_INTERFACE_H -#define LINUX_NFSD_INTERFACE_H - -#endif diff --git a/libc/kernel/common/linux/nfsd/nfsfh.h b/libc/kernel/common/linux/nfsd/nfsfh.h deleted file mode 100644 index 13450d23a..000000000 --- a/libc/kernel/common/linux/nfsd/nfsfh.h +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NFSD_FH_H -#define _LINUX_NFSD_FH_H - -#include -#include -#include - -struct nfs_fhbase_old { - __u32 fb_dcookie; - __u32 fb_ino; - __u32 fb_dirino; - __u32 fb_dev; - __u32 fb_xdev; - __u32 fb_xino; - __u32 fb_generation; -}; - -struct nfs_fhbase_new { - __u8 fb_version; - __u8 fb_auth_type; - __u8 fb_fsid_type; - __u8 fb_fileid_type; - __u32 fb_auth[1]; - -}; - -struct knfsd_fh { - unsigned int fh_size; - union { - struct nfs_fhbase_old fh_old; - __u32 fh_pad[NFS4_FHSIZE/4]; - struct nfs_fhbase_new fh_new; - } fh_base; -}; - -#define ofh_dcookie fh_base.fh_old.fb_dcookie -#define ofh_ino fh_base.fh_old.fb_ino -#define ofh_dirino fh_base.fh_old.fb_dirino -#define ofh_dev fh_base.fh_old.fb_dev -#define ofh_xdev fh_base.fh_old.fb_xdev -#define ofh_xino fh_base.fh_old.fb_xino -#define ofh_generation fh_base.fh_old.fb_generation - -#define fh_version fh_base.fh_new.fb_version -#define fh_fsid_type fh_base.fh_new.fb_fsid_type -#define fh_auth_type fh_base.fh_new.fb_auth_type -#define fh_fileid_type fh_base.fh_new.fb_fileid_type -#define fh_auth fh_base.fh_new.fb_auth -#define fh_fsid fh_base.fh_new.fb_auth - -#endif diff --git a/libc/kernel/common/linux/nfsd/stats.h b/libc/kernel/common/linux/nfsd/stats.h deleted file mode 100644 index 647e65ccd..000000000 --- a/libc/kernel/common/linux/nfsd/stats.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_NFSD_STATS_H -#define LINUX_NFSD_STATS_H - -#include - -struct nfsd_stats { - unsigned int rchits; - unsigned int rcmisses; - unsigned int rcnocache; - unsigned int fh_stale; - unsigned int fh_lookup; - unsigned int fh_anon; - unsigned int fh_nocache_dir; - unsigned int fh_nocache_nondir; - unsigned int io_read; - unsigned int io_write; - unsigned int th_cnt; - unsigned int th_usage[10]; - unsigned int th_fullcnt; - unsigned int ra_size; - unsigned int ra_depth[11]; - -}; - -#define NFSD_USAGE_WRAP (HZ*1000000) - -#endif diff --git a/libc/kernel/common/linux/nfsd/xdr.h b/libc/kernel/common/linux/nfsd/xdr.h deleted file mode 100644 index f94961dd7..000000000 --- a/libc/kernel/common/linux/nfsd/xdr.h +++ /dev/null @@ -1,141 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_NFSD_H -#define LINUX_NFSD_H - -#include -#include -#include - -struct nfsd_fhandle { - struct svc_fh fh; -}; - -struct nfsd_sattrargs { - struct svc_fh fh; - struct iattr attrs; -}; - -struct nfsd_diropargs { - struct svc_fh fh; - char * name; - int len; -}; - -struct nfsd_readargs { - struct svc_fh fh; - __u32 offset; - __u32 count; - struct kvec vec[RPCSVC_MAXPAGES]; - int vlen; -}; - -struct nfsd_writeargs { - svc_fh fh; - __u32 offset; - int len; - struct kvec vec[RPCSVC_MAXPAGES]; - int vlen; -}; - -struct nfsd_createargs { - struct svc_fh fh; - char * name; - int len; - struct iattr attrs; -}; - -struct nfsd_renameargs { - struct svc_fh ffh; - char * fname; - int flen; - struct svc_fh tfh; - char * tname; - int tlen; -}; - -struct nfsd_readlinkargs { - struct svc_fh fh; - char * buffer; -}; - -struct nfsd_linkargs { - struct svc_fh ffh; - struct svc_fh tfh; - char * tname; - int tlen; -}; - -struct nfsd_symlinkargs { - struct svc_fh ffh; - char * fname; - int flen; - char * tname; - int tlen; - struct iattr attrs; -}; - -struct nfsd_readdirargs { - struct svc_fh fh; - __u32 cookie; - __u32 count; - u32 * buffer; -}; - -struct nfsd_attrstat { - struct svc_fh fh; - struct kstat stat; -}; - -struct nfsd_diropres { - struct svc_fh fh; - struct kstat stat; -}; - -struct nfsd_readlinkres { - int len; -}; - -struct nfsd_readres { - struct svc_fh fh; - unsigned long count; - struct kstat stat; -}; - -struct nfsd_readdirres { - int count; - - struct readdir_cd common; - u32 * buffer; - int buflen; - u32 * offset; -}; - -struct nfsd_statfsres { - struct kstatfs stats; -}; - -union nfsd_xdrstore { - struct nfsd_sattrargs sattr; - struct nfsd_diropargs dirop; - struct nfsd_readargs read; - struct nfsd_writeargs write; - struct nfsd_createargs create; - struct nfsd_renameargs rename; - struct nfsd_linkargs link; - struct nfsd_symlinkargs symlink; - struct nfsd_readdirargs readdir; -}; - -#define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) - -#endif diff --git a/libc/kernel/common/linux/node.h b/libc/kernel/common/linux/node.h deleted file mode 100644 index b33bffca6..000000000 --- a/libc/kernel/common/linux/node.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NODE_H_ -#define _LINUX_NODE_H_ - -#include -#include - -struct node { - struct sys_device sysdev; -}; - -#define to_node(sys_device) container_of(sys_device, struct node, sysdev) -#endif diff --git a/libc/kernel/common/linux/nodemask.h b/libc/kernel/common/linux/nodemask.h deleted file mode 100644 index 4ec8632be..000000000 --- a/libc/kernel/common/linux/nodemask.h +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_NODEMASK_H -#define __LINUX_NODEMASK_H - -#include -#include -#include -#include - -typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t; - -#define node_set(node, dst) __node_set((node), &(dst)) -#define node_clear(node, dst) __node_clear((node), &(dst)) -#define nodes_setall(dst) __nodes_setall(&(dst), MAX_NUMNODES) -#define nodes_clear(dst) __nodes_clear(&(dst), MAX_NUMNODES) -#define node_isset(node, nodemask) test_bit((node), (nodemask).bits) -#define node_test_and_set(node, nodemask) __node_test_and_set((node), &(nodemask)) -#define nodes_and(dst, src1, src2) __nodes_and(&(dst), &(src1), &(src2), MAX_NUMNODES) -#define nodes_or(dst, src1, src2) __nodes_or(&(dst), &(src1), &(src2), MAX_NUMNODES) -#define nodes_xor(dst, src1, src2) __nodes_xor(&(dst), &(src1), &(src2), MAX_NUMNODES) -#define nodes_andnot(dst, src1, src2) __nodes_andnot(&(dst), &(src1), &(src2), MAX_NUMNODES) -#define nodes_complement(dst, src) __nodes_complement(&(dst), &(src), MAX_NUMNODES) -#define nodes_equal(src1, src2) __nodes_equal(&(src1), &(src2), MAX_NUMNODES) -#define nodes_intersects(src1, src2) __nodes_intersects(&(src1), &(src2), MAX_NUMNODES) -#define nodes_subset(src1, src2) __nodes_subset(&(src1), &(src2), MAX_NUMNODES) -#define nodes_empty(src) __nodes_empty(&(src), MAX_NUMNODES) -#define nodes_full(nodemask) __nodes_full(&(nodemask), MAX_NUMNODES) -#define nodes_weight(nodemask) __nodes_weight(&(nodemask), MAX_NUMNODES) -#define nodes_shift_right(dst, src, n) __nodes_shift_right(&(dst), &(src), (n), MAX_NUMNODES) -#define nodes_shift_left(dst, src, n) __nodes_shift_left(&(dst), &(src), (n), MAX_NUMNODES) -#define first_node(src) __first_node(&(src)) -#define next_node(n, src) __next_node((n), &(src)) -#define nodemask_of_node(node) ({ typeof(_unused_nodemask_arg_) m; if (sizeof(m) == sizeof(unsigned long)) { m.bits[0] = 1UL<<(node); } else { nodes_clear(m); node_set((node), m); } m; }) -#define first_unset_node(mask) __first_unset_node(&(mask)) -#define NODE_MASK_LAST_WORD BITMAP_LAST_WORD_MASK(MAX_NUMNODES) -#if MAX_NUMNODES <= BITS_PER_LONG -#define NODE_MASK_ALL ((nodemask_t) { { [BITS_TO_LONGS(MAX_NUMNODES)-1] = NODE_MASK_LAST_WORD } }) -#else -#define NODE_MASK_ALL ((nodemask_t) { { [0 ... BITS_TO_LONGS(MAX_NUMNODES)-2] = ~0UL, [BITS_TO_LONGS(MAX_NUMNODES)-1] = NODE_MASK_LAST_WORD } }) -#endif -#define NODE_MASK_NONE ((nodemask_t) { { [0 ... BITS_TO_LONGS(MAX_NUMNODES)-1] = 0UL } }) -#define nodes_addr(src) ((src).bits) -#define nodemask_scnprintf(buf, len, src) __nodemask_scnprintf((buf), (len), &(src), MAX_NUMNODES) -#define nodemask_parse(ubuf, ulen, dst) __nodemask_parse((ubuf), (ulen), &(dst), MAX_NUMNODES) -#define nodelist_scnprintf(buf, len, src) __nodelist_scnprintf((buf), (len), &(src), MAX_NUMNODES) -#define nodelist_parse(buf, dst) __nodelist_parse((buf), &(dst), MAX_NUMNODES) -#define node_remap(oldbit, old, new) __node_remap((oldbit), &(old), &(new), MAX_NUMNODES) -#define nodes_remap(dst, src, old, new) __nodes_remap(&(dst), &(src), &(old), &(new), MAX_NUMNODES) -#if MAX_NUMNODES > 1 -#define for_each_node_mask(node, mask) for ((node) = first_node(mask); (node) < MAX_NUMNODES; (node) = next_node((node), (mask))) -#else -#define for_each_node_mask(node, mask) if (!nodes_empty(mask)) for ((node) = 0; (node) < 1; (node)++) -#endif - -#if MAX_NUMNODES > 1 -#define num_online_nodes() nodes_weight(node_online_map) -#define num_possible_nodes() nodes_weight(node_possible_map) -#define node_online(node) node_isset((node), node_online_map) -#define node_possible(node) node_isset((node), node_possible_map) -#define first_online_node first_node(node_online_map) -#define next_online_node(nid) next_node((nid), node_online_map) -#else -#define num_online_nodes() 1 -#define num_possible_nodes() 1 -#define node_online(node) ((node) == 0) -#define node_possible(node) ((node) == 0) -#define first_online_node 0 -#define next_online_node(nid) (MAX_NUMNODES) -#endif - -#define any_online_node(mask) ({ int node; for_each_node_mask(node, (mask)) if (node_online(node)) break; node; }) - -#define node_set_online(node) set_bit((node), node_online_map.bits) -#define node_set_offline(node) clear_bit((node), node_online_map.bits) - -#define for_each_node(node) for_each_node_mask((node), node_possible_map) -#define for_each_online_node(node) for_each_node_mask((node), node_online_map) - -#endif diff --git a/libc/kernel/common/linux/notifier.h b/libc/kernel/common/linux/notifier.h deleted file mode 100644 index f1fc461b0..000000000 --- a/libc/kernel/common/linux/notifier.h +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NOTIFIER_H -#define _LINUX_NOTIFIER_H -#include -#include -#include - -struct notifier_block { - int (*notifier_call)(struct notifier_block *, unsigned long, void *); - struct notifier_block *next; - int priority; -}; - -struct atomic_notifier_head { - spinlock_t lock; - struct notifier_block *head; -}; - -struct blocking_notifier_head { - struct rw_semaphore rwsem; - struct notifier_block *head; -}; - -struct raw_notifier_head { - struct notifier_block *head; -}; - -#define ATOMIC_INIT_NOTIFIER_HEAD(name) do { spin_lock_init(&(name)->lock); (name)->head = NULL; } while (0) -#define BLOCKING_INIT_NOTIFIER_HEAD(name) do { init_rwsem(&(name)->rwsem); (name)->head = NULL; } while (0) -#define RAW_INIT_NOTIFIER_HEAD(name) do { (name)->head = NULL; } while (0) - -#define ATOMIC_NOTIFIER_INIT(name) { .lock = __SPIN_LOCK_UNLOCKED(name.lock), .head = NULL } -#define BLOCKING_NOTIFIER_INIT(name) { .rwsem = __RWSEM_INITIALIZER((name).rwsem), .head = NULL } -#define RAW_NOTIFIER_INIT(name) { .head = NULL } - -#define ATOMIC_NOTIFIER_HEAD(name) struct atomic_notifier_head name = ATOMIC_NOTIFIER_INIT(name) -#define BLOCKING_NOTIFIER_HEAD(name) struct blocking_notifier_head name = BLOCKING_NOTIFIER_INIT(name) -#define RAW_NOTIFIER_HEAD(name) struct raw_notifier_head name = RAW_NOTIFIER_INIT(name) - -#endif diff --git a/libc/kernel/common/linux/numa.h b/libc/kernel/common/linux/numa.h deleted file mode 100644 index f5d66f5ba..000000000 --- a/libc/kernel/common/linux/numa.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NUMA_H -#define _LINUX_NUMA_H - -#define NODES_SHIFT 0 - -#define MAX_NUMNODES (1 << NODES_SHIFT) - -#endif diff --git a/libc/kernel/common/linux/nvram.h b/libc/kernel/common/linux/nvram.h deleted file mode 100644 index b358bdbe2..000000000 --- a/libc/kernel/common/linux/nvram.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_NVRAM_H -#define _LINUX_NVRAM_H - -#include - -#define NVRAM_INIT _IO('p', 0x40) -#define NVRAM_SETCKS _IO('p', 0x41) - -#define NVRAM_FIRST_BYTE 14 - -#define NVRAM_OFFSET(x) ((x)-NVRAM_FIRST_BYTE) - -#endif diff --git a/libc/kernel/common/linux/omap_csmi.h b/libc/kernel/common/linux/omap_csmi.h deleted file mode 100644 index 6a28d3de3..000000000 --- a/libc/kernel/common/linux/omap_csmi.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _OMAP_CSMI_H_ -#define _OMAP_CSMI_H_ - -#include - -#define OMAP_CSMI_TTY_ENABLE_ACK _IO('c', 0) -#define OMAP_CSMI_TTY_DISABLE_ACK _IO('c', 1) -#define OMAP_CSMI_TTY_READ_UNACKED _IOR('c', 2, int) -#define OMAP_CSMI_TTY_ACK _IOW('c', 3, int) -#define OMAP_CSMI_TTY_WAKEUP_AND_ACK _IOW('c', 4, int) - -#endif diff --git a/libc/kernel/common/linux/pagemap.h b/libc/kernel/common/linux/pagemap.h deleted file mode 100644 index 8dd397d3c..000000000 --- a/libc/kernel/common/linux/pagemap.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PAGEMAP_H -#define _LINUX_PAGEMAP_H - -#include -#include -#include -#include -#include -#include -#include - -#define AS_EIO (__GFP_BITS_SHIFT + 0) -#define AS_ENOSPC (__GFP_BITS_SHIFT + 1) - -#define PAGE_CACHE_SHIFT PAGE_SHIFT -#define PAGE_CACHE_SIZE PAGE_SIZE -#define PAGE_CACHE_MASK PAGE_MASK -#define PAGE_CACHE_ALIGN(addr) (((addr)+PAGE_CACHE_SIZE-1)&PAGE_CACHE_MASK) -#define page_cache_get(page) get_page(page) -#define page_cache_release(page) put_page(page) - -#endif diff --git a/libc/kernel/common/linux/param.h b/libc/kernel/common/linux/param.h deleted file mode 100644 index 456695df3..000000000 --- a/libc/kernel/common/linux/param.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PARAM_H -#define _LINUX_PARAM_H - -#include - -#endif diff --git a/libc/kernel/common/linux/patchkey.h b/libc/kernel/common/linux/patchkey.h deleted file mode 100644 index fdf86ced0..000000000 --- a/libc/kernel/common/linux/patchkey.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PATCHKEY_H_INDIRECT -#error "patchkey.h included directly" -#endif - -#ifndef _LINUX_PATCHKEY_H -#define _LINUX_PATCHKEY_H - -#include - -#ifdef __BYTE_ORDER -#if __BYTE_ORDER == __BIG_ENDIAN -#define _PATCHKEY(id) (0xfd00|id) -#elif __BYTE_ORDER == __LITTLE_ENDIAN -#define _PATCHKEY(id) ((id<<8)|0x00fd) -#else -#error "could not determine byte order" -#endif -#endif - -#endif diff --git a/libc/kernel/common/linux/pci.h b/libc/kernel/common/linux/pci.h deleted file mode 100644 index 165deb43e..000000000 --- a/libc/kernel/common/linux/pci.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_PCI_H -#define LINUX_PCI_H - -#include - -#include - -#define PCI_DEVFN(slot,func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) -#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) -#define PCI_FUNC(devfn) ((devfn) & 0x07) - -#define PCIIOC_BASE ('P' << 24 | 'C' << 16 | 'I' << 8) -#define PCIIOC_CONTROLLER (PCIIOC_BASE | 0x00) -#define PCIIOC_MMAP_IS_IO (PCIIOC_BASE | 0x01) -#define PCIIOC_MMAP_IS_MEM (PCIIOC_BASE | 0x02) -#define PCIIOC_WRITE_COMBINE (PCIIOC_BASE | 0x03) - -#endif diff --git a/libc/kernel/common/linux/pci_ids.h b/libc/kernel/common/linux/pci_ids.h deleted file mode 100644 index ec5adfbe5..000000000 --- a/libc/kernel/common/linux/pci_ids.h +++ /dev/null @@ -1,2270 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#define PCI_CLASS_NOT_DEFINED 0x0000 -#define PCI_CLASS_NOT_DEFINED_VGA 0x0001 - -#define PCI_BASE_CLASS_STORAGE 0x01 -#define PCI_CLASS_STORAGE_SCSI 0x0100 -#define PCI_CLASS_STORAGE_IDE 0x0101 -#define PCI_CLASS_STORAGE_FLOPPY 0x0102 -#define PCI_CLASS_STORAGE_IPI 0x0103 -#define PCI_CLASS_STORAGE_RAID 0x0104 -#define PCI_CLASS_STORAGE_SAS 0x0107 -#define PCI_CLASS_STORAGE_OTHER 0x0180 - -#define PCI_BASE_CLASS_NETWORK 0x02 -#define PCI_CLASS_NETWORK_ETHERNET 0x0200 -#define PCI_CLASS_NETWORK_TOKEN_RING 0x0201 -#define PCI_CLASS_NETWORK_FDDI 0x0202 -#define PCI_CLASS_NETWORK_ATM 0x0203 -#define PCI_CLASS_NETWORK_OTHER 0x0280 - -#define PCI_BASE_CLASS_DISPLAY 0x03 -#define PCI_CLASS_DISPLAY_VGA 0x0300 -#define PCI_CLASS_DISPLAY_XGA 0x0301 -#define PCI_CLASS_DISPLAY_3D 0x0302 -#define PCI_CLASS_DISPLAY_OTHER 0x0380 - -#define PCI_BASE_CLASS_MULTIMEDIA 0x04 -#define PCI_CLASS_MULTIMEDIA_VIDEO 0x0400 -#define PCI_CLASS_MULTIMEDIA_AUDIO 0x0401 -#define PCI_CLASS_MULTIMEDIA_PHONE 0x0402 -#define PCI_CLASS_MULTIMEDIA_OTHER 0x0480 - -#define PCI_BASE_CLASS_MEMORY 0x05 -#define PCI_CLASS_MEMORY_RAM 0x0500 -#define PCI_CLASS_MEMORY_FLASH 0x0501 -#define PCI_CLASS_MEMORY_OTHER 0x0580 - -#define PCI_BASE_CLASS_BRIDGE 0x06 -#define PCI_CLASS_BRIDGE_HOST 0x0600 -#define PCI_CLASS_BRIDGE_ISA 0x0601 -#define PCI_CLASS_BRIDGE_EISA 0x0602 -#define PCI_CLASS_BRIDGE_MC 0x0603 -#define PCI_CLASS_BRIDGE_PCI 0x0604 -#define PCI_CLASS_BRIDGE_PCMCIA 0x0605 -#define PCI_CLASS_BRIDGE_NUBUS 0x0606 -#define PCI_CLASS_BRIDGE_CARDBUS 0x0607 -#define PCI_CLASS_BRIDGE_RACEWAY 0x0608 -#define PCI_CLASS_BRIDGE_OTHER 0x0680 - -#define PCI_BASE_CLASS_COMMUNICATION 0x07 -#define PCI_CLASS_COMMUNICATION_SERIAL 0x0700 -#define PCI_CLASS_COMMUNICATION_PARALLEL 0x0701 -#define PCI_CLASS_COMMUNICATION_MULTISERIAL 0x0702 -#define PCI_CLASS_COMMUNICATION_MODEM 0x0703 -#define PCI_CLASS_COMMUNICATION_OTHER 0x0780 - -#define PCI_BASE_CLASS_SYSTEM 0x08 -#define PCI_CLASS_SYSTEM_PIC 0x0800 -#define PCI_CLASS_SYSTEM_PIC_IOAPIC 0x080010 -#define PCI_CLASS_SYSTEM_PIC_IOXAPIC 0x080020 -#define PCI_CLASS_SYSTEM_DMA 0x0801 -#define PCI_CLASS_SYSTEM_TIMER 0x0802 -#define PCI_CLASS_SYSTEM_RTC 0x0803 -#define PCI_CLASS_SYSTEM_PCI_HOTPLUG 0x0804 -#define PCI_CLASS_SYSTEM_SDHCI 0x0805 -#define PCI_CLASS_SYSTEM_OTHER 0x0880 - -#define PCI_BASE_CLASS_INPUT 0x09 -#define PCI_CLASS_INPUT_KEYBOARD 0x0900 -#define PCI_CLASS_INPUT_PEN 0x0901 -#define PCI_CLASS_INPUT_MOUSE 0x0902 -#define PCI_CLASS_INPUT_SCANNER 0x0903 -#define PCI_CLASS_INPUT_GAMEPORT 0x0904 -#define PCI_CLASS_INPUT_OTHER 0x0980 - -#define PCI_BASE_CLASS_DOCKING 0x0a -#define PCI_CLASS_DOCKING_GENERIC 0x0a00 -#define PCI_CLASS_DOCKING_OTHER 0x0a80 - -#define PCI_BASE_CLASS_PROCESSOR 0x0b -#define PCI_CLASS_PROCESSOR_386 0x0b00 -#define PCI_CLASS_PROCESSOR_486 0x0b01 -#define PCI_CLASS_PROCESSOR_PENTIUM 0x0b02 -#define PCI_CLASS_PROCESSOR_ALPHA 0x0b10 -#define PCI_CLASS_PROCESSOR_POWERPC 0x0b20 -#define PCI_CLASS_PROCESSOR_MIPS 0x0b30 -#define PCI_CLASS_PROCESSOR_CO 0x0b40 - -#define PCI_BASE_CLASS_SERIAL 0x0c -#define PCI_CLASS_SERIAL_FIREWIRE 0x0c00 -#define PCI_CLASS_SERIAL_ACCESS 0x0c01 -#define PCI_CLASS_SERIAL_SSA 0x0c02 -#define PCI_CLASS_SERIAL_USB 0x0c03 -#define PCI_CLASS_SERIAL_USB_UHCI 0x0c0300 -#define PCI_CLASS_SERIAL_USB_OHCI 0x0c0310 -#define PCI_CLASS_SERIAL_USB_EHCI 0x0c0320 -#define PCI_CLASS_SERIAL_FIBER 0x0c04 -#define PCI_CLASS_SERIAL_SMBUS 0x0c05 - -#define PCI_BASE_CLASS_INTELLIGENT 0x0e -#define PCI_CLASS_INTELLIGENT_I2O 0x0e00 - -#define PCI_BASE_CLASS_SATELLITE 0x0f -#define PCI_CLASS_SATELLITE_TV 0x0f00 -#define PCI_CLASS_SATELLITE_AUDIO 0x0f01 -#define PCI_CLASS_SATELLITE_VOICE 0x0f03 -#define PCI_CLASS_SATELLITE_DATA 0x0f04 - -#define PCI_BASE_CLASS_CRYPT 0x10 -#define PCI_CLASS_CRYPT_NETWORK 0x1000 -#define PCI_CLASS_CRYPT_ENTERTAINMENT 0x1001 -#define PCI_CLASS_CRYPT_OTHER 0x1080 - -#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11 -#define PCI_CLASS_SP_DPIO 0x1100 -#define PCI_CLASS_SP_OTHER 0x1180 - -#define PCI_CLASS_OTHERS 0xff - -#define PCI_VENDOR_ID_DYNALINK 0x0675 -#define PCI_DEVICE_ID_DYNALINK_IS64PH 0x1702 - -#define PCI_VENDOR_ID_BERKOM 0x0871 -#define PCI_DEVICE_ID_BERKOM_A1T 0xffa1 -#define PCI_DEVICE_ID_BERKOM_T_CONCEPT 0xffa2 -#define PCI_DEVICE_ID_BERKOM_A4T 0xffa4 -#define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO 0xffa8 - -#define PCI_VENDOR_ID_COMPAQ 0x0e11 -#define PCI_DEVICE_ID_COMPAQ_TOKENRING 0x0508 -#define PCI_DEVICE_ID_COMPAQ_TACHYON 0xa0fc -#define PCI_DEVICE_ID_COMPAQ_SMART2P 0xae10 -#define PCI_DEVICE_ID_COMPAQ_NETEL100 0xae32 -#define PCI_DEVICE_ID_COMPAQ_NETEL10 0xae34 -#define PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE 0xae33 -#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I 0xae35 -#define PCI_DEVICE_ID_COMPAQ_NETEL100D 0xae40 -#define PCI_DEVICE_ID_COMPAQ_NETEL100PI 0xae43 -#define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011 -#define PCI_DEVICE_ID_COMPAQ_CISS 0xb060 -#define PCI_DEVICE_ID_COMPAQ_CISSB 0xb178 -#define PCI_DEVICE_ID_COMPAQ_CISSC 0x46 -#define PCI_DEVICE_ID_COMPAQ_THUNDER 0xf130 -#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150 - -#define PCI_VENDOR_ID_NCR 0x1000 -#define PCI_VENDOR_ID_LSI_LOGIC 0x1000 -#define PCI_DEVICE_ID_NCR_53C810 0x0001 -#define PCI_DEVICE_ID_NCR_53C820 0x0002 -#define PCI_DEVICE_ID_NCR_53C825 0x0003 -#define PCI_DEVICE_ID_NCR_53C815 0x0004 -#define PCI_DEVICE_ID_LSI_53C810AP 0x0005 -#define PCI_DEVICE_ID_NCR_53C860 0x0006 -#define PCI_DEVICE_ID_LSI_53C1510 0x000a -#define PCI_DEVICE_ID_NCR_53C896 0x000b -#define PCI_DEVICE_ID_NCR_53C895 0x000c -#define PCI_DEVICE_ID_NCR_53C885 0x000d -#define PCI_DEVICE_ID_NCR_53C875 0x000f -#define PCI_DEVICE_ID_NCR_53C1510 0x0010 -#define PCI_DEVICE_ID_LSI_53C895A 0x0012 -#define PCI_DEVICE_ID_LSI_53C875A 0x0013 -#define PCI_DEVICE_ID_LSI_53C1010_33 0x0020 -#define PCI_DEVICE_ID_LSI_53C1010_66 0x0021 -#define PCI_DEVICE_ID_LSI_53C1030 0x0030 -#define PCI_DEVICE_ID_LSI_1030_53C1035 0x0032 -#define PCI_DEVICE_ID_LSI_53C1035 0x0040 -#define PCI_DEVICE_ID_NCR_53C875J 0x008f -#define PCI_DEVICE_ID_LSI_FC909 0x0621 -#define PCI_DEVICE_ID_LSI_FC929 0x0622 -#define PCI_DEVICE_ID_LSI_FC929_LAN 0x0623 -#define PCI_DEVICE_ID_LSI_FC919 0x0624 -#define PCI_DEVICE_ID_LSI_FC919_LAN 0x0625 -#define PCI_DEVICE_ID_LSI_FC929X 0x0626 -#define PCI_DEVICE_ID_LSI_FC939X 0x0642 -#define PCI_DEVICE_ID_LSI_FC949X 0x0640 -#define PCI_DEVICE_ID_LSI_FC949ES 0x0646 -#define PCI_DEVICE_ID_LSI_FC919X 0x0628 -#define PCI_DEVICE_ID_NCR_YELLOWFIN 0x0701 -#define PCI_DEVICE_ID_LSI_61C102 0x0901 -#define PCI_DEVICE_ID_LSI_63C815 0x1000 -#define PCI_DEVICE_ID_LSI_SAS1064 0x0050 -#define PCI_DEVICE_ID_LSI_SAS1064R 0x0411 -#define PCI_DEVICE_ID_LSI_SAS1066 0x005E -#define PCI_DEVICE_ID_LSI_SAS1068 0x0054 -#define PCI_DEVICE_ID_LSI_SAS1064A 0x005C -#define PCI_DEVICE_ID_LSI_SAS1064E 0x0056 -#define PCI_DEVICE_ID_LSI_SAS1066E 0x005A -#define PCI_DEVICE_ID_LSI_SAS1068E 0x0058 -#define PCI_DEVICE_ID_LSI_SAS1078 0x0060 - -#define PCI_VENDOR_ID_ATI 0x1002 - -#define PCI_DEVICE_ID_ATI_68800 0x4158 -#define PCI_DEVICE_ID_ATI_215CT222 0x4354 -#define PCI_DEVICE_ID_ATI_210888CX 0x4358 -#define PCI_DEVICE_ID_ATI_215ET222 0x4554 - -#define PCI_DEVICE_ID_ATI_215GB 0x4742 -#define PCI_DEVICE_ID_ATI_215GD 0x4744 -#define PCI_DEVICE_ID_ATI_215GI 0x4749 -#define PCI_DEVICE_ID_ATI_215GP 0x4750 -#define PCI_DEVICE_ID_ATI_215GQ 0x4751 -#define PCI_DEVICE_ID_ATI_215XL 0x4752 -#define PCI_DEVICE_ID_ATI_215GT 0x4754 -#define PCI_DEVICE_ID_ATI_215GTB 0x4755 -#define PCI_DEVICE_ID_ATI_215_IV 0x4756 -#define PCI_DEVICE_ID_ATI_215_IW 0x4757 -#define PCI_DEVICE_ID_ATI_215_IZ 0x475A -#define PCI_DEVICE_ID_ATI_210888GX 0x4758 -#define PCI_DEVICE_ID_ATI_215_LB 0x4c42 -#define PCI_DEVICE_ID_ATI_215_LD 0x4c44 -#define PCI_DEVICE_ID_ATI_215_LG 0x4c47 -#define PCI_DEVICE_ID_ATI_215_LI 0x4c49 -#define PCI_DEVICE_ID_ATI_215_LM 0x4c4D -#define PCI_DEVICE_ID_ATI_215_LN 0x4c4E -#define PCI_DEVICE_ID_ATI_215_LR 0x4c52 -#define PCI_DEVICE_ID_ATI_215_LS 0x4c53 -#define PCI_DEVICE_ID_ATI_264_LT 0x4c54 - -#define PCI_DEVICE_ID_ATI_264VT 0x5654 -#define PCI_DEVICE_ID_ATI_264VU 0x5655 -#define PCI_DEVICE_ID_ATI_264VV 0x5656 - -#define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245 -#define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246 -#define PCI_DEVICE_ID_ATI_RAGE128_RG 0x5247 - -#define PCI_DEVICE_ID_ATI_RAGE128_RK 0x524b -#define PCI_DEVICE_ID_ATI_RAGE128_RL 0x524c -#define PCI_DEVICE_ID_ATI_RAGE128_SE 0x5345 -#define PCI_DEVICE_ID_ATI_RAGE128_SF 0x5346 -#define PCI_DEVICE_ID_ATI_RAGE128_SG 0x5347 -#define PCI_DEVICE_ID_ATI_RAGE128_SH 0x5348 -#define PCI_DEVICE_ID_ATI_RAGE128_SK 0x534b -#define PCI_DEVICE_ID_ATI_RAGE128_SL 0x534c -#define PCI_DEVICE_ID_ATI_RAGE128_SM 0x534d -#define PCI_DEVICE_ID_ATI_RAGE128_SN 0x534e - -#define PCI_DEVICE_ID_ATI_RAGE128_TF 0x5446 -#define PCI_DEVICE_ID_ATI_RAGE128_TL 0x544c -#define PCI_DEVICE_ID_ATI_RAGE128_TR 0x5452 -#define PCI_DEVICE_ID_ATI_RAGE128_TS 0x5453 -#define PCI_DEVICE_ID_ATI_RAGE128_TT 0x5454 -#define PCI_DEVICE_ID_ATI_RAGE128_TU 0x5455 - -#define PCI_DEVICE_ID_ATI_RAGE128_LE 0x4c45 -#define PCI_DEVICE_ID_ATI_RAGE128_LF 0x4c46 - -#define PCI_DEVICE_ID_ATI_RAGE128_MF 0x4d46 -#define PCI_DEVICE_ID_ATI_RAGE128_ML 0x4d4c - -#define PCI_DEVICE_ID_ATI_RAGE128_PA 0x5041 -#define PCI_DEVICE_ID_ATI_RAGE128_PB 0x5042 -#define PCI_DEVICE_ID_ATI_RAGE128_PC 0x5043 -#define PCI_DEVICE_ID_ATI_RAGE128_PD 0x5044 -#define PCI_DEVICE_ID_ATI_RAGE128_PE 0x5045 -#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 - -#define PCI_DEVICE_ID_ATI_RAGE128_PG 0x5047 -#define PCI_DEVICE_ID_ATI_RAGE128_PH 0x5048 -#define PCI_DEVICE_ID_ATI_RAGE128_PI 0x5049 -#define PCI_DEVICE_ID_ATI_RAGE128_PJ 0x504A -#define PCI_DEVICE_ID_ATI_RAGE128_PK 0x504B -#define PCI_DEVICE_ID_ATI_RAGE128_PL 0x504C -#define PCI_DEVICE_ID_ATI_RAGE128_PM 0x504D -#define PCI_DEVICE_ID_ATI_RAGE128_PN 0x504E -#define PCI_DEVICE_ID_ATI_RAGE128_PO 0x504F -#define PCI_DEVICE_ID_ATI_RAGE128_PP 0x5050 -#define PCI_DEVICE_ID_ATI_RAGE128_PQ 0x5051 -#define PCI_DEVICE_ID_ATI_RAGE128_PR 0x5052 -#define PCI_DEVICE_ID_ATI_RAGE128_PS 0x5053 -#define PCI_DEVICE_ID_ATI_RAGE128_PT 0x5054 -#define PCI_DEVICE_ID_ATI_RAGE128_PU 0x5055 -#define PCI_DEVICE_ID_ATI_RAGE128_PV 0x5056 -#define PCI_DEVICE_ID_ATI_RAGE128_PW 0x5057 -#define PCI_DEVICE_ID_ATI_RAGE128_PX 0x5058 - -#define PCI_DEVICE_ID_ATI_RADEON_QD 0x5144 -#define PCI_DEVICE_ID_ATI_RADEON_QE 0x5145 -#define PCI_DEVICE_ID_ATI_RADEON_QF 0x5146 -#define PCI_DEVICE_ID_ATI_RADEON_QG 0x5147 - -#define PCI_DEVICE_ID_ATI_RADEON_QY 0x5159 -#define PCI_DEVICE_ID_ATI_RADEON_QZ 0x515a - -#define PCI_DEVICE_ID_ATI_RADEON_QL 0x514c -#define PCI_DEVICE_ID_ATI_RADEON_QN 0x514e -#define PCI_DEVICE_ID_ATI_RADEON_QO 0x514f -#define PCI_DEVICE_ID_ATI_RADEON_Ql 0x516c -#define PCI_DEVICE_ID_ATI_RADEON_BB 0x4242 - -#define PCI_DEVICE_ID_ATI_RADEON_QM 0x514d - -#define PCI_DEVICE_ID_ATI_RADEON_QW 0x5157 -#define PCI_DEVICE_ID_ATI_RADEON_QX 0x5158 - -#define PCI_DEVICE_ID_ATI_RADEON_Id 0x4964 -#define PCI_DEVICE_ID_ATI_RADEON_Ie 0x4965 -#define PCI_DEVICE_ID_ATI_RADEON_If 0x4966 -#define PCI_DEVICE_ID_ATI_RADEON_Ig 0x4967 - -#define PCI_DEVICE_ID_ATI_RADEON_Ya 0x5961 -#define PCI_DEVICE_ID_ATI_RADEON_Yd 0x5964 - -#define PCI_DEVICE_ID_ATI_RADEON_ND 0x4e44 -#define PCI_DEVICE_ID_ATI_RADEON_NE 0x4e45 -#define PCI_DEVICE_ID_ATI_RADEON_NF 0x4e46 -#define PCI_DEVICE_ID_ATI_RADEON_NG 0x4e47 - -#define PCI_DEVICE_ID_ATI_RADEON_LY 0x4c59 -#define PCI_DEVICE_ID_ATI_RADEON_LZ 0x4c5a - -#define PCI_DEVICE_ID_ATI_RADEON_LW 0x4c57 -#define PCI_DEVICE_ID_ATI_RADEON_LX 0x4c58 - -#define PCI_DEVICE_ID_ATI_RADEON_Ld 0x4c64 -#define PCI_DEVICE_ID_ATI_RADEON_Le 0x4c65 -#define PCI_DEVICE_ID_ATI_RADEON_Lf 0x4c66 -#define PCI_DEVICE_ID_ATI_RADEON_Lg 0x4c67 - -#define PCI_DEVICE_ID_ATI_RS100 0xcab0 -#define PCI_DEVICE_ID_ATI_RS200 0xcab2 -#define PCI_DEVICE_ID_ATI_RS200_B 0xcbb2 -#define PCI_DEVICE_ID_ATI_RS250 0xcab3 -#define PCI_DEVICE_ID_ATI_RS300_100 0x5830 -#define PCI_DEVICE_ID_ATI_RS300_133 0x5831 -#define PCI_DEVICE_ID_ATI_RS300_166 0x5832 -#define PCI_DEVICE_ID_ATI_RS300_200 0x5833 -#define PCI_DEVICE_ID_ATI_RS350_100 0x7830 -#define PCI_DEVICE_ID_ATI_RS350_133 0x7831 -#define PCI_DEVICE_ID_ATI_RS350_166 0x7832 -#define PCI_DEVICE_ID_ATI_RS350_200 0x7833 -#define PCI_DEVICE_ID_ATI_RS400_100 0x5a30 -#define PCI_DEVICE_ID_ATI_RS400_133 0x5a31 -#define PCI_DEVICE_ID_ATI_RS400_166 0x5a32 -#define PCI_DEVICE_ID_ATI_RS400_200 0x5a33 -#define PCI_DEVICE_ID_ATI_RS480 0x5950 - -#define PCI_DEVICE_ID_ATI_IXP200_IDE 0x4349 -#define PCI_DEVICE_ID_ATI_IXP200_SMBUS 0x4353 -#define PCI_DEVICE_ID_ATI_IXP300_SMBUS 0x4363 -#define PCI_DEVICE_ID_ATI_IXP300_IDE 0x4369 -#define PCI_DEVICE_ID_ATI_IXP300_SATA 0x436e -#define PCI_DEVICE_ID_ATI_IXP400_SMBUS 0x4372 -#define PCI_DEVICE_ID_ATI_IXP400_IDE 0x4376 -#define PCI_DEVICE_ID_ATI_IXP400_SATA 0x4379 -#define PCI_DEVICE_ID_ATI_IXP400_SATA2 0x437a -#define PCI_DEVICE_ID_ATI_IXP600_SATA 0x4380 -#define PCI_DEVICE_ID_ATI_IXP600_SRAID 0x4381 -#define PCI_DEVICE_ID_ATI_IXP600_IDE 0x438c - -#define PCI_VENDOR_ID_VLSI 0x1004 -#define PCI_DEVICE_ID_VLSI_82C592 0x0005 -#define PCI_DEVICE_ID_VLSI_82C593 0x0006 -#define PCI_DEVICE_ID_VLSI_82C594 0x0007 -#define PCI_DEVICE_ID_VLSI_82C597 0x0009 -#define PCI_DEVICE_ID_VLSI_82C541 0x000c -#define PCI_DEVICE_ID_VLSI_82C543 0x000d -#define PCI_DEVICE_ID_VLSI_82C532 0x0101 -#define PCI_DEVICE_ID_VLSI_82C534 0x0102 -#define PCI_DEVICE_ID_VLSI_82C535 0x0104 -#define PCI_DEVICE_ID_VLSI_82C147 0x0105 -#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702 - -#define PCI_VENDOR_ID_ADL 0x1005 -#define PCI_DEVICE_ID_ADL_2301 0x2301 - -#define PCI_VENDOR_ID_NS 0x100b -#define PCI_DEVICE_ID_NS_87415 0x0002 -#define PCI_DEVICE_ID_NS_87560_LIO 0x000e -#define PCI_DEVICE_ID_NS_87560_USB 0x0012 -#define PCI_DEVICE_ID_NS_83815 0x0020 -#define PCI_DEVICE_ID_NS_83820 0x0022 -#define PCI_DEVICE_ID_NS_CS5535_ISA 0x002b -#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d -#define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e -#define PCI_DEVICE_ID_NS_CS5535_USB 0x002f -#define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030 -#define PCI_DEVICE_ID_NS_SATURN 0x0035 -#define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 -#define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 -#define PCI_DEVICE_ID_NS_SCx200_IDE 0x0502 -#define PCI_DEVICE_ID_NS_SCx200_AUDIO 0x0503 -#define PCI_DEVICE_ID_NS_SCx200_VIDEO 0x0504 -#define PCI_DEVICE_ID_NS_SCx200_XBUS 0x0505 -#define PCI_DEVICE_ID_NS_SC1100_BRIDGE 0x0510 -#define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 -#define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 -#define PCI_DEVICE_ID_NS_87410 0xd001 - -#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE 0x0028 -#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE 0x002b - -#define PCI_VENDOR_ID_TSENG 0x100c -#define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 -#define PCI_DEVICE_ID_TSENG_W32P_b 0x3205 -#define PCI_DEVICE_ID_TSENG_W32P_c 0x3206 -#define PCI_DEVICE_ID_TSENG_W32P_d 0x3207 -#define PCI_DEVICE_ID_TSENG_ET6000 0x3208 - -#define PCI_VENDOR_ID_WEITEK 0x100e -#define PCI_DEVICE_ID_WEITEK_P9000 0x9001 -#define PCI_DEVICE_ID_WEITEK_P9100 0x9100 - -#define PCI_VENDOR_ID_DEC 0x1011 -#define PCI_DEVICE_ID_DEC_BRD 0x0001 -#define PCI_DEVICE_ID_DEC_TULIP 0x0002 -#define PCI_DEVICE_ID_DEC_TGA 0x0004 -#define PCI_DEVICE_ID_DEC_TULIP_FAST 0x0009 -#define PCI_DEVICE_ID_DEC_TGA2 0x000D -#define PCI_DEVICE_ID_DEC_FDDI 0x000F -#define PCI_DEVICE_ID_DEC_TULIP_PLUS 0x0014 -#define PCI_DEVICE_ID_DEC_21142 0x0019 -#define PCI_DEVICE_ID_DEC_21052 0x0021 -#define PCI_DEVICE_ID_DEC_21150 0x0022 -#define PCI_DEVICE_ID_DEC_21152 0x0024 -#define PCI_DEVICE_ID_DEC_21153 0x0025 -#define PCI_DEVICE_ID_DEC_21154 0x0026 -#define PCI_DEVICE_ID_DEC_21285 0x1065 -#define PCI_DEVICE_ID_COMPAQ_42XX 0x0046 - -#define PCI_VENDOR_ID_CIRRUS 0x1013 -#define PCI_DEVICE_ID_CIRRUS_7548 0x0038 -#define PCI_DEVICE_ID_CIRRUS_5430 0x00a0 -#define PCI_DEVICE_ID_CIRRUS_5434_4 0x00a4 -#define PCI_DEVICE_ID_CIRRUS_5434_8 0x00a8 -#define PCI_DEVICE_ID_CIRRUS_5436 0x00ac -#define PCI_DEVICE_ID_CIRRUS_5446 0x00b8 -#define PCI_DEVICE_ID_CIRRUS_5480 0x00bc -#define PCI_DEVICE_ID_CIRRUS_5462 0x00d0 -#define PCI_DEVICE_ID_CIRRUS_5464 0x00d4 -#define PCI_DEVICE_ID_CIRRUS_5465 0x00d6 -#define PCI_DEVICE_ID_CIRRUS_6729 0x1100 -#define PCI_DEVICE_ID_CIRRUS_6832 0x1110 -#define PCI_DEVICE_ID_CIRRUS_7543 0x1202 -#define PCI_DEVICE_ID_CIRRUS_4610 0x6001 -#define PCI_DEVICE_ID_CIRRUS_4612 0x6003 -#define PCI_DEVICE_ID_CIRRUS_4615 0x6004 - -#define PCI_VENDOR_ID_IBM 0x1014 -#define PCI_DEVICE_ID_IBM_TR 0x0018 -#define PCI_DEVICE_ID_IBM_TR_WAKE 0x003e -#define PCI_DEVICE_ID_IBM_CPC710_PCI64 0x00fc -#define PCI_DEVICE_ID_IBM_SNIPE 0x0180 -#define PCI_DEVICE_ID_IBM_CITRINE 0x028C -#define PCI_DEVICE_ID_IBM_GEMSTONE 0xB166 -#define PCI_DEVICE_ID_IBM_OBSIDIAN 0x02BD -#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031 -#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219 -#define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A -#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM 0x0251 -#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252 - -#define PCI_VENDOR_ID_COMPEX2 0x101a -#define PCI_DEVICE_ID_COMPEX2_100VG 0x0005 - -#define PCI_VENDOR_ID_WD 0x101c -#define PCI_DEVICE_ID_WD_90C 0xc24a - -#define PCI_VENDOR_ID_AMI 0x101e -#define PCI_DEVICE_ID_AMI_MEGARAID3 0x1960 -#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010 -#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060 - -#define PCI_VENDOR_ID_AMD 0x1022 -#define PCI_DEVICE_ID_AMD_K8_NB 0x1100 -#define PCI_DEVICE_ID_AMD_LANCE 0x2000 -#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 -#define PCI_DEVICE_ID_AMD_SCSI 0x2020 -#define PCI_DEVICE_ID_AMD_SERENADE 0x36c0 -#define PCI_DEVICE_ID_AMD_FE_GATE_7006 0x7006 -#define PCI_DEVICE_ID_AMD_FE_GATE_7007 0x7007 -#define PCI_DEVICE_ID_AMD_FE_GATE_700C 0x700C -#define PCI_DEVICE_ID_AMD_FE_GATE_700E 0x700E -#define PCI_DEVICE_ID_AMD_COBRA_7401 0x7401 -#define PCI_DEVICE_ID_AMD_VIPER_7409 0x7409 -#define PCI_DEVICE_ID_AMD_VIPER_740B 0x740B -#define PCI_DEVICE_ID_AMD_VIPER_7410 0x7410 -#define PCI_DEVICE_ID_AMD_VIPER_7411 0x7411 -#define PCI_DEVICE_ID_AMD_VIPER_7413 0x7413 -#define PCI_DEVICE_ID_AMD_VIPER_7440 0x7440 -#define PCI_DEVICE_ID_AMD_OPUS_7441 0x7441 -#define PCI_DEVICE_ID_AMD_OPUS_7443 0x7443 -#define PCI_DEVICE_ID_AMD_VIPER_7443 0x7443 -#define PCI_DEVICE_ID_AMD_OPUS_7445 0x7445 -#define PCI_DEVICE_ID_AMD_8111_LPC 0x7468 -#define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 -#define PCI_DEVICE_ID_AMD_8111_SMBUS2 0x746a -#define PCI_DEVICE_ID_AMD_8111_SMBUS 0x746b -#define PCI_DEVICE_ID_AMD_8111_AUDIO 0x746d -#define PCI_DEVICE_ID_AMD_8151_0 0x7454 -#define PCI_DEVICE_ID_AMD_8131_BRIDGE 0x7450 -#define PCI_DEVICE_ID_AMD_8131_APIC 0x7451 -#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090 -#define PCI_DEVICE_ID_AMD_CS5536_FLASH 0x2091 -#define PCI_DEVICE_ID_AMD_CS5536_AUDIO 0x2093 -#define PCI_DEVICE_ID_AMD_CS5536_OHC 0x2094 -#define PCI_DEVICE_ID_AMD_CS5536_EHC 0x2095 -#define PCI_DEVICE_ID_AMD_CS5536_UDC 0x2096 -#define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097 -#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A - -#define PCI_DEVICE_ID_AMD_LX_VIDEO 0x2081 -#define PCI_DEVICE_ID_AMD_LX_AES 0x2082 - -#define PCI_VENDOR_ID_TRIDENT 0x1023 -#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 -#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 -#define PCI_DEVICE_ID_TRIDENT_9320 0x9320 -#define PCI_DEVICE_ID_TRIDENT_9388 0x9388 -#define PCI_DEVICE_ID_TRIDENT_9397 0x9397 -#define PCI_DEVICE_ID_TRIDENT_939A 0x939A -#define PCI_DEVICE_ID_TRIDENT_9520 0x9520 -#define PCI_DEVICE_ID_TRIDENT_9525 0x9525 -#define PCI_DEVICE_ID_TRIDENT_9420 0x9420 -#define PCI_DEVICE_ID_TRIDENT_9440 0x9440 -#define PCI_DEVICE_ID_TRIDENT_9660 0x9660 -#define PCI_DEVICE_ID_TRIDENT_9750 0x9750 -#define PCI_DEVICE_ID_TRIDENT_9850 0x9850 -#define PCI_DEVICE_ID_TRIDENT_9880 0x9880 -#define PCI_DEVICE_ID_TRIDENT_8400 0x8400 -#define PCI_DEVICE_ID_TRIDENT_8420 0x8420 -#define PCI_DEVICE_ID_TRIDENT_8500 0x8500 - -#define PCI_VENDOR_ID_AI 0x1025 -#define PCI_DEVICE_ID_AI_M1435 0x1435 - -#define PCI_VENDOR_ID_DELL 0x1028 -#define PCI_DEVICE_ID_DELL_RACIII 0x0008 -#define PCI_DEVICE_ID_DELL_RAC4 0x0012 -#define PCI_DEVICE_ID_DELL_PERC5 0x0015 - -#define PCI_VENDOR_ID_MATROX 0x102B -#define PCI_DEVICE_ID_MATROX_MGA_2 0x0518 -#define PCI_DEVICE_ID_MATROX_MIL 0x0519 -#define PCI_DEVICE_ID_MATROX_MYS 0x051A -#define PCI_DEVICE_ID_MATROX_MIL_2 0x051b -#define PCI_DEVICE_ID_MATROX_MYS_AGP 0x051e -#define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f -#define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 -#define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 -#define PCI_DEVICE_ID_MATROX_G100_AGP 0x1001 -#define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520 -#define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521 -#define PCI_DEVICE_ID_MATROX_G400 0x0525 -#define PCI_DEVICE_ID_MATROX_G550 0x2527 -#define PCI_DEVICE_ID_MATROX_VIA 0x4536 - -#define PCI_VENDOR_ID_CT 0x102c -#define PCI_DEVICE_ID_CT_69000 0x00c0 -#define PCI_DEVICE_ID_CT_65545 0x00d8 -#define PCI_DEVICE_ID_CT_65548 0x00dc -#define PCI_DEVICE_ID_CT_65550 0x00e0 -#define PCI_DEVICE_ID_CT_65554 0x00e4 -#define PCI_DEVICE_ID_CT_65555 0x00e5 - -#define PCI_VENDOR_ID_MIRO 0x1031 -#define PCI_DEVICE_ID_MIRO_36050 0x5601 -#define PCI_DEVICE_ID_MIRO_DC10PLUS 0x7efe -#define PCI_DEVICE_ID_MIRO_DC30PLUS 0xd801 - -#define PCI_VENDOR_ID_NEC 0x1033 -#define PCI_DEVICE_ID_NEC_CBUS_1 0x0001 -#define PCI_DEVICE_ID_NEC_LOCAL 0x0002 -#define PCI_DEVICE_ID_NEC_ATM 0x0003 -#define PCI_DEVICE_ID_NEC_R4000 0x0004 -#define PCI_DEVICE_ID_NEC_486 0x0005 -#define PCI_DEVICE_ID_NEC_ACCEL_1 0x0006 -#define PCI_DEVICE_ID_NEC_UXBUS 0x0007 -#define PCI_DEVICE_ID_NEC_ACCEL_2 0x0008 -#define PCI_DEVICE_ID_NEC_GRAPH 0x0009 -#define PCI_DEVICE_ID_NEC_VL 0x0016 -#define PCI_DEVICE_ID_NEC_STARALPHA2 0x002c -#define PCI_DEVICE_ID_NEC_CBUS_2 0x002d -#define PCI_DEVICE_ID_NEC_USB 0x0035 -#define PCI_DEVICE_ID_NEC_CBUS_3 0x003b -#define PCI_DEVICE_ID_NEC_NAPCCARD 0x003e -#define PCI_DEVICE_ID_NEC_PCX2 0x0046 -#define PCI_DEVICE_ID_NEC_NILE4 0x005a -#define PCI_DEVICE_ID_NEC_VRC5476 0x009b -#define PCI_DEVICE_ID_NEC_VRC4173 0x00a5 -#define PCI_DEVICE_ID_NEC_VRC5477_AC97 0x00a6 -#define PCI_DEVICE_ID_NEC_PC9821CS01 0x800c -#define PCI_DEVICE_ID_NEC_PC9821NRB06 0x800d - -#define PCI_VENDOR_ID_FD 0x1036 -#define PCI_DEVICE_ID_FD_36C70 0x0000 - -#define PCI_VENDOR_ID_SI 0x1039 -#define PCI_DEVICE_ID_SI_5591_AGP 0x0001 -#define PCI_DEVICE_ID_SI_6202 0x0002 -#define PCI_DEVICE_ID_SI_503 0x0008 -#define PCI_DEVICE_ID_SI_ACPI 0x0009 -#define PCI_DEVICE_ID_SI_SMBUS 0x0016 -#define PCI_DEVICE_ID_SI_LPC 0x0018 -#define PCI_DEVICE_ID_SI_5597_VGA 0x0200 -#define PCI_DEVICE_ID_SI_6205 0x0205 -#define PCI_DEVICE_ID_SI_501 0x0406 -#define PCI_DEVICE_ID_SI_496 0x0496 -#define PCI_DEVICE_ID_SI_300 0x0300 -#define PCI_DEVICE_ID_SI_315H 0x0310 -#define PCI_DEVICE_ID_SI_315 0x0315 -#define PCI_DEVICE_ID_SI_315PRO 0x0325 -#define PCI_DEVICE_ID_SI_530 0x0530 -#define PCI_DEVICE_ID_SI_540 0x0540 -#define PCI_DEVICE_ID_SI_550 0x0550 -#define PCI_DEVICE_ID_SI_540_VGA 0x5300 -#define PCI_DEVICE_ID_SI_550_VGA 0x5315 -#define PCI_DEVICE_ID_SI_620 0x0620 -#define PCI_DEVICE_ID_SI_630 0x0630 -#define PCI_DEVICE_ID_SI_633 0x0633 -#define PCI_DEVICE_ID_SI_635 0x0635 -#define PCI_DEVICE_ID_SI_640 0x0640 -#define PCI_DEVICE_ID_SI_645 0x0645 -#define PCI_DEVICE_ID_SI_646 0x0646 -#define PCI_DEVICE_ID_SI_648 0x0648 -#define PCI_DEVICE_ID_SI_650 0x0650 -#define PCI_DEVICE_ID_SI_651 0x0651 -#define PCI_DEVICE_ID_SI_655 0x0655 -#define PCI_DEVICE_ID_SI_661 0x0661 -#define PCI_DEVICE_ID_SI_730 0x0730 -#define PCI_DEVICE_ID_SI_733 0x0733 -#define PCI_DEVICE_ID_SI_630_VGA 0x6300 -#define PCI_DEVICE_ID_SI_735 0x0735 -#define PCI_DEVICE_ID_SI_740 0x0740 -#define PCI_DEVICE_ID_SI_741 0x0741 -#define PCI_DEVICE_ID_SI_745 0x0745 -#define PCI_DEVICE_ID_SI_746 0x0746 -#define PCI_DEVICE_ID_SI_755 0x0755 -#define PCI_DEVICE_ID_SI_760 0x0760 -#define PCI_DEVICE_ID_SI_900 0x0900 -#define PCI_DEVICE_ID_SI_961 0x0961 -#define PCI_DEVICE_ID_SI_962 0x0962 -#define PCI_DEVICE_ID_SI_963 0x0963 -#define PCI_DEVICE_ID_SI_965 0x0965 -#define PCI_DEVICE_ID_SI_966 0x0966 -#define PCI_DEVICE_ID_SI_968 0x0968 -#define PCI_DEVICE_ID_SI_5511 0x5511 -#define PCI_DEVICE_ID_SI_5513 0x5513 -#define PCI_DEVICE_ID_SI_5517 0x5517 -#define PCI_DEVICE_ID_SI_5518 0x5518 -#define PCI_DEVICE_ID_SI_5571 0x5571 -#define PCI_DEVICE_ID_SI_5581 0x5581 -#define PCI_DEVICE_ID_SI_5582 0x5582 -#define PCI_DEVICE_ID_SI_5591 0x5591 -#define PCI_DEVICE_ID_SI_5596 0x5596 -#define PCI_DEVICE_ID_SI_5597 0x5597 -#define PCI_DEVICE_ID_SI_5598 0x5598 -#define PCI_DEVICE_ID_SI_5600 0x5600 -#define PCI_DEVICE_ID_SI_7012 0x7012 -#define PCI_DEVICE_ID_SI_7013 0x7013 -#define PCI_DEVICE_ID_SI_7016 0x7016 -#define PCI_DEVICE_ID_SI_7018 0x7018 - -#define PCI_VENDOR_ID_HP 0x103c -#define PCI_DEVICE_ID_HP_VISUALIZE_EG 0x1005 -#define PCI_DEVICE_ID_HP_VISUALIZE_FX6 0x1006 -#define PCI_DEVICE_ID_HP_VISUALIZE_FX4 0x1008 -#define PCI_DEVICE_ID_HP_VISUALIZE_FX2 0x100a -#define PCI_DEVICE_ID_HP_TACHYON 0x1028 -#define PCI_DEVICE_ID_HP_TACHLITE 0x1029 -#define PCI_DEVICE_ID_HP_J2585A 0x1030 -#define PCI_DEVICE_ID_HP_J2585B 0x1031 -#define PCI_DEVICE_ID_HP_J2973A 0x1040 -#define PCI_DEVICE_ID_HP_J2970A 0x1042 -#define PCI_DEVICE_ID_HP_DIVA 0x1048 -#define PCI_DEVICE_ID_HP_DIVA_TOSCA1 0x1049 -#define PCI_DEVICE_ID_HP_DIVA_TOSCA2 0x104A -#define PCI_DEVICE_ID_HP_DIVA_MAESTRO 0x104B -#define PCI_DEVICE_ID_HP_REO_IOC 0x10f1 -#define PCI_DEVICE_ID_HP_VISUALIZE_FXE 0x108b -#define PCI_DEVICE_ID_HP_DIVA_HALFDOME 0x1223 -#define PCI_DEVICE_ID_HP_DIVA_KEYSTONE 0x1226 -#define PCI_DEVICE_ID_HP_DIVA_POWERBAR 0x1227 -#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a -#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e -#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c -#define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282 -#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290 -#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301 -#define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a -#define PCI_DEVICE_ID_HP_CISSA 0x3220 -#define PCI_DEVICE_ID_HP_CISSC 0x3230 -#define PCI_DEVICE_ID_HP_CISSD 0x3238 -#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 - -#define PCI_VENDOR_ID_PCTECH 0x1042 -#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000 -#define PCI_DEVICE_ID_PCTECH_RZ1001 0x1001 -#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020 - -#define PCI_VENDOR_ID_ASUSTEK 0x1043 -#define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 - -#define PCI_VENDOR_ID_DPT 0x1044 -#define PCI_DEVICE_ID_DPT 0xa400 - -#define PCI_VENDOR_ID_OPTI 0x1045 -#define PCI_DEVICE_ID_OPTI_82C558 0xc558 -#define PCI_DEVICE_ID_OPTI_82C621 0xc621 -#define PCI_DEVICE_ID_OPTI_82C700 0xc700 -#define PCI_DEVICE_ID_OPTI_82C825 0xd568 - -#define PCI_VENDOR_ID_ELSA 0x1048 -#define PCI_DEVICE_ID_ELSA_MICROLINK 0x1000 -#define PCI_DEVICE_ID_ELSA_QS3000 0x3000 - -#define PCI_VENDOR_ID_BUSLOGIC 0x104B -#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140 -#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER 0x1040 -#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT 0x8130 - -#define PCI_VENDOR_ID_TI 0x104c -#define PCI_DEVICE_ID_TI_TVP4020 0x3d07 -#define PCI_DEVICE_ID_TI_4450 0x8011 -#define PCI_DEVICE_ID_TI_XX21_XX11 0x8031 -#define PCI_DEVICE_ID_TI_XX21_XX11_SD 0x8034 -#define PCI_DEVICE_ID_TI_X515 0x8036 -#define PCI_DEVICE_ID_TI_XX12 0x8039 -#define PCI_DEVICE_ID_TI_1130 0xac12 -#define PCI_DEVICE_ID_TI_1031 0xac13 -#define PCI_DEVICE_ID_TI_1131 0xac15 -#define PCI_DEVICE_ID_TI_1250 0xac16 -#define PCI_DEVICE_ID_TI_1220 0xac17 -#define PCI_DEVICE_ID_TI_1221 0xac19 -#define PCI_DEVICE_ID_TI_1210 0xac1a -#define PCI_DEVICE_ID_TI_1450 0xac1b -#define PCI_DEVICE_ID_TI_1225 0xac1c -#define PCI_DEVICE_ID_TI_1251A 0xac1d -#define PCI_DEVICE_ID_TI_1211 0xac1e -#define PCI_DEVICE_ID_TI_1251B 0xac1f -#define PCI_DEVICE_ID_TI_4410 0xac41 -#define PCI_DEVICE_ID_TI_4451 0xac42 -#define PCI_DEVICE_ID_TI_4510 0xac44 -#define PCI_DEVICE_ID_TI_4520 0xac46 -#define PCI_DEVICE_ID_TI_7510 0xac47 -#define PCI_DEVICE_ID_TI_7610 0xac48 -#define PCI_DEVICE_ID_TI_7410 0xac49 -#define PCI_DEVICE_ID_TI_1410 0xac50 -#define PCI_DEVICE_ID_TI_1420 0xac51 -#define PCI_DEVICE_ID_TI_1451A 0xac52 -#define PCI_DEVICE_ID_TI_1620 0xac54 -#define PCI_DEVICE_ID_TI_1520 0xac55 -#define PCI_DEVICE_ID_TI_1510 0xac56 -#define PCI_DEVICE_ID_TI_X620 0xac8d -#define PCI_DEVICE_ID_TI_X420 0xac8e - -#define PCI_VENDOR_ID_SONY 0x104d - -#define PCI_VENDOR_ID_WINBOND2 0x1050 -#define PCI_DEVICE_ID_WINBOND2_89C940F 0x5a5a -#define PCI_DEVICE_ID_WINBOND2_6692 0x6692 - -#define PCI_VENDOR_ID_ANIGMA 0x1051 -#define PCI_DEVICE_ID_ANIGMA_MC145575 0x0100 - -#define PCI_VENDOR_ID_EFAR 0x1055 -#define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130 -#define PCI_DEVICE_ID_EFAR_SLC90E66_3 0x9463 - -#define PCI_VENDOR_ID_MOTOROLA 0x1057 -#define PCI_DEVICE_ID_MOTOROLA_MPC105 0x0001 -#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 -#define PCI_DEVICE_ID_MOTOROLA_MPC107 0x0004 -#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 -#define PCI_DEVICE_ID_MOTOROLA_FALCON 0x4802 -#define PCI_DEVICE_ID_MOTOROLA_HAWK 0x4803 -#define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b -#define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803 -#define PCI_DEVICE_ID_MOTOROLA_MPC5200B 0x5809 - -#define PCI_VENDOR_ID_PROMISE 0x105a -#define PCI_DEVICE_ID_PROMISE_20265 0x0d30 -#define PCI_DEVICE_ID_PROMISE_20267 0x4d30 -#define PCI_DEVICE_ID_PROMISE_20246 0x4d33 -#define PCI_DEVICE_ID_PROMISE_20262 0x4d38 -#define PCI_DEVICE_ID_PROMISE_20263 0x0D38 -#define PCI_DEVICE_ID_PROMISE_20268 0x4d68 -#define PCI_DEVICE_ID_PROMISE_20269 0x4d69 -#define PCI_DEVICE_ID_PROMISE_20270 0x6268 -#define PCI_DEVICE_ID_PROMISE_20271 0x6269 -#define PCI_DEVICE_ID_PROMISE_20275 0x1275 -#define PCI_DEVICE_ID_PROMISE_20276 0x5275 -#define PCI_DEVICE_ID_PROMISE_20277 0x7275 - -#define PCI_VENDOR_ID_UMC 0x1060 -#define PCI_DEVICE_ID_UMC_UM8673F 0x0101 -#define PCI_DEVICE_ID_UMC_UM8886BF 0x673a -#define PCI_DEVICE_ID_UMC_UM8886A 0x886a - -#define PCI_VENDOR_ID_MYLEX 0x1069 -#define PCI_DEVICE_ID_MYLEX_DAC960_P 0x0001 -#define PCI_DEVICE_ID_MYLEX_DAC960_PD 0x0002 -#define PCI_DEVICE_ID_MYLEX_DAC960_PG 0x0010 -#define PCI_DEVICE_ID_MYLEX_DAC960_LA 0x0020 -#define PCI_DEVICE_ID_MYLEX_DAC960_LP 0x0050 -#define PCI_DEVICE_ID_MYLEX_DAC960_BA 0xBA56 -#define PCI_DEVICE_ID_MYLEX_DAC960_GEM 0xB166 - -#define PCI_VENDOR_ID_APPLE 0x106b -#define PCI_DEVICE_ID_APPLE_BANDIT 0x0001 -#define PCI_DEVICE_ID_APPLE_HYDRA 0x000e -#define PCI_DEVICE_ID_APPLE_UNI_N_FW 0x0018 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 -#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC 0x0021 -#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP 0x0024 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P 0x0027 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15 0x002d -#define PCI_DEVICE_ID_APPLE_UNI_N_PCI15 0x002e -#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2 0x0032 -#define PCI_DEVICE_ID_APPLE_UNI_N_ATA 0x0033 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP2 0x0034 -#define PCI_DEVICE_ID_APPLE_IPID_ATA100 0x003b -#define PCI_DEVICE_ID_APPLE_K2_ATA100 0x0043 -#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b -#define PCI_DEVICE_ID_APPLE_K2_GMAC 0x004c -#define PCI_DEVICE_ID_APPLE_SH_ATA 0x0050 -#define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051 -#define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 -#define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059 -#define PCI_DEVICE_ID_APPLE_IPID2_AGP 0x0066 -#define PCI_DEVICE_ID_APPLE_IPID2_ATA 0x0069 -#define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a -#define PCI_DEVICE_ID_APPLE_IPID2_GMAC 0x006b -#define PCI_DEVICE_ID_APPLE_TIGON3 0x1645 - -#define PCI_VENDOR_ID_YAMAHA 0x1073 -#define PCI_DEVICE_ID_YAMAHA_724 0x0004 -#define PCI_DEVICE_ID_YAMAHA_724F 0x000d -#define PCI_DEVICE_ID_YAMAHA_740 0x000a -#define PCI_DEVICE_ID_YAMAHA_740C 0x000c -#define PCI_DEVICE_ID_YAMAHA_744 0x0010 -#define PCI_DEVICE_ID_YAMAHA_754 0x0012 - -#define PCI_VENDOR_ID_QLOGIC 0x1077 -#define PCI_DEVICE_ID_QLOGIC_ISP10160 0x1016 -#define PCI_DEVICE_ID_QLOGIC_ISP1020 0x1020 -#define PCI_DEVICE_ID_QLOGIC_ISP1080 0x1080 -#define PCI_DEVICE_ID_QLOGIC_ISP12160 0x1216 -#define PCI_DEVICE_ID_QLOGIC_ISP1240 0x1240 -#define PCI_DEVICE_ID_QLOGIC_ISP1280 0x1280 -#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 -#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 -#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300 -#define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312 -#define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322 -#define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312 -#define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322 -#define PCI_DEVICE_ID_QLOGIC_ISP2422 0x2422 -#define PCI_DEVICE_ID_QLOGIC_ISP2432 0x2432 -#define PCI_DEVICE_ID_QLOGIC_ISP2512 0x2512 -#define PCI_DEVICE_ID_QLOGIC_ISP2522 0x2522 -#define PCI_DEVICE_ID_QLOGIC_ISP5422 0x5422 -#define PCI_DEVICE_ID_QLOGIC_ISP5432 0x5432 - -#define PCI_VENDOR_ID_CYRIX 0x1078 -#define PCI_DEVICE_ID_CYRIX_5510 0x0000 -#define PCI_DEVICE_ID_CYRIX_PCI_MASTER 0x0001 -#define PCI_DEVICE_ID_CYRIX_5520 0x0002 -#define PCI_DEVICE_ID_CYRIX_5530_LEGACY 0x0100 -#define PCI_DEVICE_ID_CYRIX_5530_IDE 0x0102 -#define PCI_DEVICE_ID_CYRIX_5530_AUDIO 0x0103 -#define PCI_DEVICE_ID_CYRIX_5530_VIDEO 0x0104 - -#define PCI_VENDOR_ID_CONTAQ 0x1080 -#define PCI_DEVICE_ID_CONTAQ_82C693 0xc693 - -#define PCI_VENDOR_ID_OLICOM 0x108d -#define PCI_DEVICE_ID_OLICOM_OC2325 0x0012 -#define PCI_DEVICE_ID_OLICOM_OC2183 0x0013 -#define PCI_DEVICE_ID_OLICOM_OC2326 0x0014 - -#define PCI_VENDOR_ID_SUN 0x108e -#define PCI_DEVICE_ID_SUN_EBUS 0x1000 -#define PCI_DEVICE_ID_SUN_HAPPYMEAL 0x1001 -#define PCI_DEVICE_ID_SUN_RIO_EBUS 0x1100 -#define PCI_DEVICE_ID_SUN_RIO_GEM 0x1101 -#define PCI_DEVICE_ID_SUN_RIO_1394 0x1102 -#define PCI_DEVICE_ID_SUN_RIO_USB 0x1103 -#define PCI_DEVICE_ID_SUN_GEM 0x2bad -#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 -#define PCI_DEVICE_ID_SUN_PBM 0x8000 -#define PCI_DEVICE_ID_SUN_SCHIZO 0x8001 -#define PCI_DEVICE_ID_SUN_SABRE 0xa000 -#define PCI_DEVICE_ID_SUN_HUMMINGBIRD 0xa001 -#define PCI_DEVICE_ID_SUN_TOMATILLO 0xa801 -#define PCI_DEVICE_ID_SUN_CASSINI 0xabba - -#define PCI_VENDOR_ID_CMD 0x1095 -#define PCI_DEVICE_ID_CMD_643 0x0643 -#define PCI_DEVICE_ID_CMD_646 0x0646 -#define PCI_DEVICE_ID_CMD_648 0x0648 -#define PCI_DEVICE_ID_CMD_649 0x0649 - -#define PCI_DEVICE_ID_SII_680 0x0680 -#define PCI_DEVICE_ID_SII_3112 0x3112 -#define PCI_DEVICE_ID_SII_1210SA 0x0240 - -#define PCI_VENDOR_ID_BROOKTREE 0x109e -#define PCI_DEVICE_ID_BROOKTREE_878 0x0878 -#define PCI_DEVICE_ID_BROOKTREE_879 0x0879 - -#define PCI_VENDOR_ID_SGI 0x10a9 -#define PCI_DEVICE_ID_SGI_IOC3 0x0003 -#define PCI_DEVICE_ID_SGI_IOC4 0x100a -#define PCI_VENDOR_ID_SGI_LITHIUM 0x1002 - -#define PCI_VENDOR_ID_WINBOND 0x10ad -#define PCI_DEVICE_ID_WINBOND_82C105 0x0105 -#define PCI_DEVICE_ID_WINBOND_83C553 0x0565 - -#define PCI_VENDOR_ID_PLX 0x10b5 -#define PCI_DEVICE_ID_PLX_R685 0x1030 -#define PCI_DEVICE_ID_PLX_ROMULUS 0x106a -#define PCI_DEVICE_ID_PLX_SPCOM800 0x1076 -#define PCI_DEVICE_ID_PLX_1077 0x1077 -#define PCI_DEVICE_ID_PLX_SPCOM200 0x1103 -#define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 -#define PCI_DEVICE_ID_PLX_R753 0x1152 -#define PCI_DEVICE_ID_PLX_OLITEC 0x1187 -#define PCI_DEVICE_ID_PLX_PCI200SYN 0x3196 -#define PCI_DEVICE_ID_PLX_9050 0x9050 -#define PCI_DEVICE_ID_PLX_9080 0x9080 -#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001 - -#define PCI_VENDOR_ID_MADGE 0x10b6 -#define PCI_DEVICE_ID_MADGE_MK2 0x0002 - -#define PCI_VENDOR_ID_3COM 0x10b7 -#define PCI_DEVICE_ID_3COM_3C985 0x0001 -#define PCI_DEVICE_ID_3COM_3C940 0x1700 -#define PCI_DEVICE_ID_3COM_3C339 0x3390 -#define PCI_DEVICE_ID_3COM_3C359 0x3590 -#define PCI_DEVICE_ID_3COM_3C940B 0x80eb -#define PCI_DEVICE_ID_3COM_3CR990 0x9900 -#define PCI_DEVICE_ID_3COM_3CR990_TX_95 0x9902 -#define PCI_DEVICE_ID_3COM_3CR990_TX_97 0x9903 -#define PCI_DEVICE_ID_3COM_3CR990B 0x9904 -#define PCI_DEVICE_ID_3COM_3CR990_FX 0x9905 -#define PCI_DEVICE_ID_3COM_3CR990SVR95 0x9908 -#define PCI_DEVICE_ID_3COM_3CR990SVR97 0x9909 -#define PCI_DEVICE_ID_3COM_3CR990SVR 0x990a - -#define PCI_VENDOR_ID_AL 0x10b9 -#define PCI_DEVICE_ID_AL_M1533 0x1533 -#define PCI_DEVICE_ID_AL_M1535 0x1535 -#define PCI_DEVICE_ID_AL_M1541 0x1541 -#define PCI_DEVICE_ID_AL_M1563 0x1563 -#define PCI_DEVICE_ID_AL_M1621 0x1621 -#define PCI_DEVICE_ID_AL_M1631 0x1631 -#define PCI_DEVICE_ID_AL_M1632 0x1632 -#define PCI_DEVICE_ID_AL_M1641 0x1641 -#define PCI_DEVICE_ID_AL_M1644 0x1644 -#define PCI_DEVICE_ID_AL_M1647 0x1647 -#define PCI_DEVICE_ID_AL_M1651 0x1651 -#define PCI_DEVICE_ID_AL_M1671 0x1671 -#define PCI_DEVICE_ID_AL_M1681 0x1681 -#define PCI_DEVICE_ID_AL_M1683 0x1683 -#define PCI_DEVICE_ID_AL_M1689 0x1689 -#define PCI_DEVICE_ID_AL_M5219 0x5219 -#define PCI_DEVICE_ID_AL_M5228 0x5228 -#define PCI_DEVICE_ID_AL_M5229 0x5229 -#define PCI_DEVICE_ID_AL_M5451 0x5451 -#define PCI_DEVICE_ID_AL_M7101 0x7101 - -#define PCI_VENDOR_ID_NEOMAGIC 0x10c8 -#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005 -#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006 -#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016 - -#define PCI_VENDOR_ID_TCONRAD 0x10da -#define PCI_DEVICE_ID_TCONRAD_TOKENRING 0x0508 - -#define PCI_VENDOR_ID_NVIDIA 0x10de -#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020 -#define PCI_DEVICE_ID_NVIDIA_TNT2 0x0028 -#define PCI_DEVICE_ID_NVIDIA_UTNT2 0x0029 -#define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN 0x002a -#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C -#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS 0x0034 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036 -#define PCI_DEVICE_ID_NVIDIA_NVENET_10 0x0037 -#define PCI_DEVICE_ID_NVIDIA_NVENET_11 0x0038 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2 0x003e -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_ULTRA 0x0040 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800 0x0041 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_LE 0x0042 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_GT 0x0045 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_4000 0x004E -#define PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS 0x0052 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE 0x0053 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA 0x0054 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2 0x0055 -#define PCI_DEVICE_ID_NVIDIA_NVENET_8 0x0056 -#define PCI_DEVICE_ID_NVIDIA_NVENET_9 0x0057 -#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059 -#define PCI_DEVICE_ID_NVIDIA_CK804_PCIE 0x005d -#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS 0x0064 -#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE 0x0065 -#define PCI_DEVICE_ID_NVIDIA_NVENET_2 0x0066 -#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM 0x0069 -#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a -#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS 0x0084 -#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085 -#define PCI_DEVICE_ID_NVIDIA_NVENET_4 0x0086 -#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM 0x0089 -#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO 0x008a -#define PCI_DEVICE_ID_NVIDIA_NVENET_5 0x008c -#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA 0x008e -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_7800_GT 0x0090 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_7800_GTX 0x0091 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_7800 0x0098 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_7800_GTX 0x0099 -#define PCI_DEVICE_ID_NVIDIA_ITNT2 0x00A0 -#define PCI_DEVICE_ID_GEFORCE_6800A 0x00c1 -#define PCI_DEVICE_ID_GEFORCE_6800A_LE 0x00c2 -#define PCI_DEVICE_ID_GEFORCE_GO_6800 0x00c8 -#define PCI_DEVICE_ID_GEFORCE_GO_6800_ULTRA 0x00c9 -#define PCI_DEVICE_ID_QUADRO_FX_GO1400 0x00cc -#define PCI_DEVICE_ID_QUADRO_FX_1400 0x00ce -#define PCI_DEVICE_ID_NVIDIA_NFORCE3 0x00d1 -#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS 0x00d4 -#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE 0x00d5 -#define PCI_DEVICE_ID_NVIDIA_NVENET_3 0x00d6 -#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM 0x00d9 -#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da -#define PCI_DEVICE_ID_NVIDIA_NVENET_7 0x00df -#define PCI_DEVICE_ID_NVIDIA_NFORCE3S 0x00e1 -#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA 0x00e3 -#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS 0x00e4 -#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE 0x00e5 -#define PCI_DEVICE_ID_NVIDIA_NVENET_6 0x00e6 -#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO 0x00ea -#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2 0x00ee -#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_ALT1 0x00f0 -#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT1 0x00f1 -#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT2 0x00f2 -#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6200_ALT1 0x00f3 -#define PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT 0x00f9 -#define PCIE_DEVICE_ID_NVIDIA_QUADRO_NVS280 0x00fd -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR 0x0100 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR 0x0101 -#define PCI_DEVICE_ID_NVIDIA_QUADRO 0x0103 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX 0x0110 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2 0x0111 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO 0x0112 -#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR 0x0113 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600_GT 0x0140 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600 0x0141 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6610_XL 0x0145 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_540 0x014E -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200 0x014F -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS 0x0150 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2 0x0151 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA 0x0152 -#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO 0x0153 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200_TURBOCACHE 0x0161 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200 0x0164 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250 0x0166 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200_1 0x0167 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250_1 0x0168 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460 0x0170 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440 0x0171 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420 0x0172 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_SE 0x0173 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO 0x0174 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO 0x0175 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32 0x0176 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_460_GO 0x0177 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL 0x0178 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64 0x0179 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_200 0x017A -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL 0x017B -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL 0x017C -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_410_GO_M16 0x017D -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X 0x0181 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X 0x0182 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X 0x0183 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000 0x0185 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO 0x0186 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO 0x0187 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL 0x0188 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_MAC 0x0189 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_280_NVS 0x018A -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_380_XGL 0x018B -#define PCI_DEVICE_ID_NVIDIA_IGEFORCE2 0x01a0 -#define PCI_DEVICE_ID_NVIDIA_NFORCE 0x01a4 -#define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO 0x01b1 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS 0x01b4 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE 0x01bc -#define PCI_DEVICE_ID_NVIDIA_MCP1_MODEM 0x01c1 -#define PCI_DEVICE_ID_NVIDIA_NVENET_1 0x01c3 -#define PCI_DEVICE_ID_NVIDIA_NFORCE2 0x01e0 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE3 0x0200 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1 0x0201 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2 0x0202 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC 0x0203 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B 0x0211 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_LE 0x0212 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_GT 0x0215 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600 0x0250 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400 0x0251 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200 0x0253 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL 0x0258 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL 0x0259 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL 0x025B -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS 0x0264 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE 0x0265 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA 0x0266 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2 0x0267 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS 0x0368 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE 0x036E -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA 0x037E -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2 0x037F -#define PCI_DEVICE_ID_NVIDIA_NVENET_12 0x0268 -#define PCI_DEVICE_ID_NVIDIA_NVENET_13 0x0269 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800 0x0280 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X 0x0281 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE 0x0282 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO 0x0286 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_980_XGL 0x0288 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_780_XGL 0x0289 -#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700_GOGL 0x028C -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_ULTRA 0x0301 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800 0x0302 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_2000 0x0308 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1000 0x0309 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_ULTRA 0x0311 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600 0x0312 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600SE 0x0314 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5600 0x031A -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5650 0x031B -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO700 0x031C -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200 0x0320 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_ULTRA 0x0321 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_1 0x0322 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200SE 0x0323 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5200 0x0324 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250 0x0325 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5500 0x0326 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5100 0x0327 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250_32 0x0328 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200 0x0329 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_NVS_280_PCI 0x032A -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_500 0x032B -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5300 0x032C -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5100 0x032D -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900_ULTRA 0x0330 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900 0x0331 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900XT 0x0332 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5950_ULTRA 0x0333 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900ZT 0x0334 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_3000 0x0338 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_700 0x033F -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700_ULTRA 0x0341 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700 0x0342 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700LE 0x0343 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700VE 0x0344 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_1 0x0347 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2 0x0348 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000 0x034C -#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100 0x034E -#define PCI_DEVICE_ID_NVIDIA_NVENET_14 0x0372 -#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373 -#define PCI_DEVICE_ID_NVIDIA_NVENET_16 0x03E5 -#define PCI_DEVICE_ID_NVIDIA_NVENET_17 0x03E6 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA 0x03E7 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE 0x03EC -#define PCI_DEVICE_ID_NVIDIA_NVENET_18 0x03EE -#define PCI_DEVICE_ID_NVIDIA_NVENET_19 0x03EF -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2 0x03F6 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3 0x03F7 -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE 0x0448 -#define PCI_DEVICE_ID_NVIDIA_NVENET_20 0x0450 -#define PCI_DEVICE_ID_NVIDIA_NVENET_21 0x0451 -#define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 -#define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 - -#define PCI_VENDOR_ID_IMS 0x10e0 -#define PCI_DEVICE_ID_IMS_TT128 0x9128 -#define PCI_DEVICE_ID_IMS_TT3D 0x9135 - -#define PCI_VENDOR_ID_INTERG 0x10ea -#define PCI_DEVICE_ID_INTERG_1682 0x1682 -#define PCI_DEVICE_ID_INTERG_2000 0x2000 -#define PCI_DEVICE_ID_INTERG_2010 0x2010 -#define PCI_DEVICE_ID_INTERG_5000 0x5000 -#define PCI_DEVICE_ID_INTERG_5050 0x5050 - -#define PCI_VENDOR_ID_REALTEK 0x10ec -#define PCI_DEVICE_ID_REALTEK_8139 0x8139 - -#define PCI_VENDOR_ID_XILINX 0x10ee -#define PCI_DEVICE_ID_RME_DIGI96 0x3fc0 -#define PCI_DEVICE_ID_RME_DIGI96_8 0x3fc1 -#define PCI_DEVICE_ID_RME_DIGI96_8_PRO 0x3fc2 -#define PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST 0x3fc3 -#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5 -#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI 0x3fc6 - -#define PCI_VENDOR_ID_INIT 0x1101 - -#define PCI_VENDOR_ID_CREATIVE 0x1102 -#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002 - -#define PCI_VENDOR_ID_ECTIVA 0x1102 -#define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938 - -#define PCI_VENDOR_ID_TTI 0x1103 -#define PCI_DEVICE_ID_TTI_HPT343 0x0003 -#define PCI_DEVICE_ID_TTI_HPT366 0x0004 -#define PCI_DEVICE_ID_TTI_HPT372 0x0005 -#define PCI_DEVICE_ID_TTI_HPT302 0x0006 -#define PCI_DEVICE_ID_TTI_HPT371 0x0007 -#define PCI_DEVICE_ID_TTI_HPT374 0x0008 -#define PCI_DEVICE_ID_TTI_HPT372N 0x0009 - -#define PCI_VENDOR_ID_VIA 0x1106 -#define PCI_DEVICE_ID_VIA_8763_0 0x0198 -#define PCI_DEVICE_ID_VIA_8380_0 0x0204 -#define PCI_DEVICE_ID_VIA_3238_0 0x0238 -#define PCI_DEVICE_ID_VIA_PT880 0x0258 -#define PCI_DEVICE_ID_VIA_PT880ULTRA 0x0308 -#define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 -#define PCI_DEVICE_ID_VIA_3269_0 0x0269 -#define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 -#define PCI_DEVICE_ID_VIA_3296_0 0x0296 -#define PCI_DEVICE_ID_VIA_8363_0 0x0305 -#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314 -#define PCI_DEVICE_ID_VIA_8371_0 0x0391 -#define PCI_DEVICE_ID_VIA_8501_0 0x0501 -#define PCI_DEVICE_ID_VIA_82C561 0x0561 -#define PCI_DEVICE_ID_VIA_82C586_1 0x0571 -#define PCI_DEVICE_ID_VIA_82C576 0x0576 -#define PCI_DEVICE_ID_VIA_SATA_EIDE 0x0581 -#define PCI_DEVICE_ID_VIA_82C586_0 0x0586 -#define PCI_DEVICE_ID_VIA_82C596 0x0596 -#define PCI_DEVICE_ID_VIA_82C597_0 0x0597 -#define PCI_DEVICE_ID_VIA_82C598_0 0x0598 -#define PCI_DEVICE_ID_VIA_8601_0 0x0601 -#define PCI_DEVICE_ID_VIA_8605_0 0x0605 -#define PCI_DEVICE_ID_VIA_82C686 0x0686 -#define PCI_DEVICE_ID_VIA_82C691_0 0x0691 -#define PCI_DEVICE_ID_VIA_82C576_1 0x1571 -#define PCI_DEVICE_ID_VIA_82C586_2 0x3038 -#define PCI_DEVICE_ID_VIA_82C586_3 0x3040 -#define PCI_DEVICE_ID_VIA_82C596_3 0x3050 -#define PCI_DEVICE_ID_VIA_82C596B_3 0x3051 -#define PCI_DEVICE_ID_VIA_82C686_4 0x3057 -#define PCI_DEVICE_ID_VIA_82C686_5 0x3058 -#define PCI_DEVICE_ID_VIA_8233_5 0x3059 -#define PCI_DEVICE_ID_VIA_8233_0 0x3074 -#define PCI_DEVICE_ID_VIA_8633_0 0x3091 -#define PCI_DEVICE_ID_VIA_8367_0 0x3099 -#define PCI_DEVICE_ID_VIA_8653_0 0x3101 -#define PCI_DEVICE_ID_VIA_8622 0x3102 -#define PCI_DEVICE_ID_VIA_8235_USB_2 0x3104 -#define PCI_DEVICE_ID_VIA_8233C_0 0x3109 -#define PCI_DEVICE_ID_VIA_8361 0x3112 -#define PCI_DEVICE_ID_VIA_XM266 0x3116 -#define PCI_DEVICE_ID_VIA_612X 0x3119 -#define PCI_DEVICE_ID_VIA_862X_0 0x3123 -#define PCI_DEVICE_ID_VIA_8753_0 0x3128 -#define PCI_DEVICE_ID_VIA_8233A 0x3147 -#define PCI_DEVICE_ID_VIA_8703_51_0 0x3148 -#define PCI_DEVICE_ID_VIA_8237_SATA 0x3149 -#define PCI_DEVICE_ID_VIA_XN266 0x3156 -#define PCI_DEVICE_ID_VIA_6410 0x3164 -#define PCI_DEVICE_ID_VIA_8754C_0 0x3168 -#define PCI_DEVICE_ID_VIA_8235 0x3177 -#define PCI_DEVICE_ID_VIA_8385_0 0x3188 -#define PCI_DEVICE_ID_VIA_8377_0 0x3189 -#define PCI_DEVICE_ID_VIA_8378_0 0x3205 -#define PCI_DEVICE_ID_VIA_8783_0 0x3208 -#define PCI_DEVICE_ID_VIA_8237 0x3227 -#define PCI_DEVICE_ID_VIA_8251 0x3287 -#define PCI_DEVICE_ID_VIA_8237A 0x3337 -#define PCI_DEVICE_ID_VIA_8231 0x8231 -#define PCI_DEVICE_ID_VIA_8231_4 0x8235 -#define PCI_DEVICE_ID_VIA_8365_1 0x8305 -#define PCI_DEVICE_ID_VIA_CX700 0x8324 -#define PCI_DEVICE_ID_VIA_8371_1 0x8391 -#define PCI_DEVICE_ID_VIA_82C598_1 0x8598 -#define PCI_DEVICE_ID_VIA_838X_1 0xB188 -#define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198 - -#define PCI_VENDOR_ID_SIEMENS 0x110A -#define PCI_DEVICE_ID_SIEMENS_DSCC4 0x2102 - -#define PCI_VENDOR_ID_VORTEX 0x1119 -#define PCI_DEVICE_ID_VORTEX_GDT60x0 0x0000 -#define PCI_DEVICE_ID_VORTEX_GDT6000B 0x0001 -#define PCI_DEVICE_ID_VORTEX_GDT6x10 0x0002 -#define PCI_DEVICE_ID_VORTEX_GDT6x20 0x0003 -#define PCI_DEVICE_ID_VORTEX_GDT6530 0x0004 -#define PCI_DEVICE_ID_VORTEX_GDT6550 0x0005 -#define PCI_DEVICE_ID_VORTEX_GDT6x17 0x0006 -#define PCI_DEVICE_ID_VORTEX_GDT6x27 0x0007 -#define PCI_DEVICE_ID_VORTEX_GDT6537 0x0008 -#define PCI_DEVICE_ID_VORTEX_GDT6557 0x0009 -#define PCI_DEVICE_ID_VORTEX_GDT6x15 0x000a -#define PCI_DEVICE_ID_VORTEX_GDT6x25 0x000b -#define PCI_DEVICE_ID_VORTEX_GDT6535 0x000c -#define PCI_DEVICE_ID_VORTEX_GDT6555 0x000d -#define PCI_DEVICE_ID_VORTEX_GDT6x17RP 0x0100 -#define PCI_DEVICE_ID_VORTEX_GDT6x27RP 0x0101 -#define PCI_DEVICE_ID_VORTEX_GDT6537RP 0x0102 -#define PCI_DEVICE_ID_VORTEX_GDT6557RP 0x0103 -#define PCI_DEVICE_ID_VORTEX_GDT6x11RP 0x0104 -#define PCI_DEVICE_ID_VORTEX_GDT6x21RP 0x0105 - -#define PCI_VENDOR_ID_EF 0x111a -#define PCI_DEVICE_ID_EF_ATM_FPGA 0x0000 -#define PCI_DEVICE_ID_EF_ATM_ASIC 0x0002 -#define PCI_VENDOR_ID_EF_ATM_LANAI2 0x0003 -#define PCI_VENDOR_ID_EF_ATM_LANAIHB 0x0005 - -#define PCI_VENDOR_ID_IDT 0x111d -#define PCI_DEVICE_ID_IDT_IDT77201 0x0001 - -#define PCI_VENDOR_ID_FORE 0x1127 -#define PCI_DEVICE_ID_FORE_PCA200E 0x0300 - -#define PCI_VENDOR_ID_PHILIPS 0x1131 -#define PCI_DEVICE_ID_PHILIPS_SAA7146 0x7146 -#define PCI_DEVICE_ID_PHILIPS_SAA9730 0x9730 - -#define PCI_VENDOR_ID_EICON 0x1133 -#define PCI_DEVICE_ID_EICON_DIVA20 0xe002 -#define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004 -#define PCI_DEVICE_ID_EICON_DIVA201 0xe005 -#define PCI_DEVICE_ID_EICON_DIVA202 0xe00b -#define PCI_DEVICE_ID_EICON_MAESTRA 0xe010 -#define PCI_DEVICE_ID_EICON_MAESTRAQ 0xe012 -#define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013 -#define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014 - -#define PCI_VENDOR_ID_ZIATECH 0x1138 -#define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 - -#define PCI_VENDOR_ID_SYSKONNECT 0x1148 -#define PCI_DEVICE_ID_SYSKONNECT_TR 0x4200 -#define PCI_DEVICE_ID_SYSKONNECT_GE 0x4300 -#define PCI_DEVICE_ID_SYSKONNECT_YU 0x4320 -#define PCI_DEVICE_ID_SYSKONNECT_9DXX 0x4400 -#define PCI_DEVICE_ID_SYSKONNECT_9MXX 0x4500 - -#define PCI_VENDOR_ID_DIGI 0x114f -#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070 -#define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 -#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 -#define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 -#define PCI_DEVICE_ID_NEO_2DB9 0x00C8 -#define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 -#define PCI_DEVICE_ID_NEO_2RJ45 0x00CA -#define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB - -#define PCI_VENDOR_ID_XIRCOM 0x115d -#define PCI_DEVICE_ID_XIRCOM_RBM56G 0x0101 -#define PCI_DEVICE_ID_XIRCOM_X3201_MDM 0x0103 - -#define PCI_VENDOR_ID_SERVERWORKS 0x1166 -#define PCI_DEVICE_ID_SERVERWORKS_HE 0x0008 -#define PCI_DEVICE_ID_SERVERWORKS_LE 0x0009 -#define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 -#define PCI_DEVICE_ID_SERVERWORKS_EPB 0x0103 -#define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 -#define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 -#define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 -#define PCI_DEVICE_ID_SERVERWORKS_HT1000SB 0x0205 -#define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211 -#define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212 -#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213 -#define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214 -#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217 -#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227 - -#define PCI_VENDOR_ID_SBE 0x1176 -#define PCI_DEVICE_ID_SBE_WANXL100 0x0301 -#define PCI_DEVICE_ID_SBE_WANXL200 0x0302 -#define PCI_DEVICE_ID_SBE_WANXL400 0x0104 - -#define PCI_VENDOR_ID_TOSHIBA 0x1179 -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102 -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103 -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105 -#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a -#define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f -#define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617 - -#define PCI_VENDOR_ID_TOSHIBA_2 0x102f -#define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 -#define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 -#define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3 - -#define PCI_VENDOR_ID_RICOH 0x1180 -#define PCI_DEVICE_ID_RICOH_RL5C465 0x0465 -#define PCI_DEVICE_ID_RICOH_RL5C466 0x0466 -#define PCI_DEVICE_ID_RICOH_RL5C475 0x0475 -#define PCI_DEVICE_ID_RICOH_RL5C476 0x0476 -#define PCI_DEVICE_ID_RICOH_RL5C478 0x0478 -#define PCI_DEVICE_ID_RICOH_R5C822 0x0822 - -#define PCI_VENDOR_ID_DLINK 0x1186 -#define PCI_DEVICE_ID_DLINK_DGE510T 0x4c00 - -#define PCI_VENDOR_ID_ARTOP 0x1191 -#define PCI_DEVICE_ID_ARTOP_ATP850UF 0x0005 -#define PCI_DEVICE_ID_ARTOP_ATP860 0x0006 -#define PCI_DEVICE_ID_ARTOP_ATP860R 0x0007 -#define PCI_DEVICE_ID_ARTOP_ATP865 0x0008 -#define PCI_DEVICE_ID_ARTOP_ATP865R 0x0009 -#define PCI_DEVICE_ID_ARTOP_AEC7610 0x8002 -#define PCI_DEVICE_ID_ARTOP_AEC7612UW 0x8010 -#define PCI_DEVICE_ID_ARTOP_AEC7612U 0x8020 -#define PCI_DEVICE_ID_ARTOP_AEC7612S 0x8030 -#define PCI_DEVICE_ID_ARTOP_AEC7612D 0x8040 -#define PCI_DEVICE_ID_ARTOP_AEC7612SUW 0x8050 -#define PCI_DEVICE_ID_ARTOP_8060 0x8060 - -#define PCI_VENDOR_ID_ZEITNET 0x1193 -#define PCI_DEVICE_ID_ZEITNET_1221 0x0001 -#define PCI_DEVICE_ID_ZEITNET_1225 0x0002 - -#define PCI_VENDOR_ID_FUJITSU_ME 0x119e -#define PCI_DEVICE_ID_FUJITSU_FS155 0x0001 -#define PCI_DEVICE_ID_FUJITSU_FS50 0x0003 - -#define PCI_SUBVENDOR_ID_KEYSPAN 0x11a9 -#define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334 - -#define PCI_VENDOR_ID_MARVELL 0x11ab -#define PCI_DEVICE_ID_MARVELL_GT64111 0x4146 -#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 -#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 -#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 -#define PCI_DEVICE_ID_MARVELL_GT96100 0x9652 -#define PCI_DEVICE_ID_MARVELL_GT96100A 0x9653 - -#define PCI_VENDOR_ID_V3 0x11b0 -#define PCI_DEVICE_ID_V3_V960 0x0001 -#define PCI_DEVICE_ID_V3_V351 0x0002 - -#define PCI_VENDOR_ID_ATT 0x11c1 -#define PCI_DEVICE_ID_ATT_VENUS_MODEM 0x480 - -#define PCI_VENDOR_ID_SPECIALIX 0x11cb -#define PCI_DEVICE_ID_SPECIALIX_IO8 0x2000 -#define PCI_DEVICE_ID_SPECIALIX_RIO 0x8000 -#define PCI_SUBDEVICE_ID_SPECIALIX_SPEED4 0xa004 - -#define PCI_VENDOR_ID_ANALOG_DEVICES 0x11d4 -#define PCI_DEVICE_ID_AD1889JS 0x1889 - -#define PCI_DEVICE_ID_SEGA_BBA 0x1234 - -#define PCI_VENDOR_ID_ZORAN 0x11de -#define PCI_DEVICE_ID_ZORAN_36057 0x6057 -#define PCI_DEVICE_ID_ZORAN_36120 0x6120 - -#define PCI_VENDOR_ID_COMPEX 0x11f6 -#define PCI_DEVICE_ID_COMPEX_ENET100VG4 0x0112 - -#define PCI_VENDOR_ID_RP 0x11fe -#define PCI_DEVICE_ID_RP32INTF 0x0001 -#define PCI_DEVICE_ID_RP8INTF 0x0002 -#define PCI_DEVICE_ID_RP16INTF 0x0003 -#define PCI_DEVICE_ID_RP4QUAD 0x0004 -#define PCI_DEVICE_ID_RP8OCTA 0x0005 -#define PCI_DEVICE_ID_RP8J 0x0006 -#define PCI_DEVICE_ID_RP4J 0x0007 -#define PCI_DEVICE_ID_RP8SNI 0x0008 -#define PCI_DEVICE_ID_RP16SNI 0x0009 -#define PCI_DEVICE_ID_RPP4 0x000A -#define PCI_DEVICE_ID_RPP8 0x000B -#define PCI_DEVICE_ID_RP4M 0x000D -#define PCI_DEVICE_ID_RP2_232 0x000E -#define PCI_DEVICE_ID_RP2_422 0x000F -#define PCI_DEVICE_ID_URP32INTF 0x0801 -#define PCI_DEVICE_ID_URP8INTF 0x0802 -#define PCI_DEVICE_ID_URP16INTF 0x0803 -#define PCI_DEVICE_ID_URP8OCTA 0x0805 -#define PCI_DEVICE_ID_UPCI_RM3_8PORT 0x080C -#define PCI_DEVICE_ID_UPCI_RM3_4PORT 0x080D -#define PCI_DEVICE_ID_CRP16INTF 0x0903 - -#define PCI_VENDOR_ID_CYCLADES 0x120e -#define PCI_DEVICE_ID_CYCLOM_Y_Lo 0x0100 -#define PCI_DEVICE_ID_CYCLOM_Y_Hi 0x0101 -#define PCI_DEVICE_ID_CYCLOM_4Y_Lo 0x0102 -#define PCI_DEVICE_ID_CYCLOM_4Y_Hi 0x0103 -#define PCI_DEVICE_ID_CYCLOM_8Y_Lo 0x0104 -#define PCI_DEVICE_ID_CYCLOM_8Y_Hi 0x0105 -#define PCI_DEVICE_ID_CYCLOM_Z_Lo 0x0200 -#define PCI_DEVICE_ID_CYCLOM_Z_Hi 0x0201 -#define PCI_DEVICE_ID_PC300_RX_2 0x0300 -#define PCI_DEVICE_ID_PC300_RX_1 0x0301 -#define PCI_DEVICE_ID_PC300_TE_2 0x0310 -#define PCI_DEVICE_ID_PC300_TE_1 0x0311 -#define PCI_DEVICE_ID_PC300_TE_M_2 0x0320 -#define PCI_DEVICE_ID_PC300_TE_M_1 0x0321 - -#define PCI_VENDOR_ID_ESSENTIAL 0x120f -#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER 0x0001 - -#define PCI_VENDOR_ID_O2 0x1217 -#define PCI_DEVICE_ID_O2_6729 0x6729 -#define PCI_DEVICE_ID_O2_6730 0x673a -#define PCI_DEVICE_ID_O2_6832 0x6832 -#define PCI_DEVICE_ID_O2_6836 0x6836 - -#define PCI_VENDOR_ID_3DFX 0x121a -#define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 -#define PCI_DEVICE_ID_3DFX_VOODOO2 0x0002 -#define PCI_DEVICE_ID_3DFX_BANSHEE 0x0003 -#define PCI_DEVICE_ID_3DFX_VOODOO3 0x0005 -#define PCI_DEVICE_ID_3DFX_VOODOO5 0x0009 - -#define PCI_VENDOR_ID_AVM 0x1244 -#define PCI_DEVICE_ID_AVM_B1 0x0700 -#define PCI_DEVICE_ID_AVM_C4 0x0800 -#define PCI_DEVICE_ID_AVM_A1 0x0a00 -#define PCI_DEVICE_ID_AVM_A1_V2 0x0e00 -#define PCI_DEVICE_ID_AVM_C2 0x1100 -#define PCI_DEVICE_ID_AVM_T1 0x1200 - -#define PCI_VENDOR_ID_STALLION 0x124d - -#define PCI_VENDOR_ID_AT 0x1259 -#define PCI_SUBDEVICE_ID_AT_2700FX 0x2701 -#define PCI_SUBDEVICE_ID_AT_2701FX 0x2703 - -#define PCI_VENDOR_ID_ESS 0x125d -#define PCI_DEVICE_ID_ESS_ESS1968 0x1968 -#define PCI_DEVICE_ID_ESS_ESS1978 0x1978 -#define PCI_DEVICE_ID_ESS_ALLEGRO_1 0x1988 -#define PCI_DEVICE_ID_ESS_ALLEGRO 0x1989 -#define PCI_DEVICE_ID_ESS_CANYON3D_2LE 0x1990 -#define PCI_DEVICE_ID_ESS_CANYON3D_2 0x1992 -#define PCI_DEVICE_ID_ESS_MAESTRO3 0x1998 -#define PCI_DEVICE_ID_ESS_MAESTRO3_1 0x1999 -#define PCI_DEVICE_ID_ESS_MAESTRO3_HW 0x199a -#define PCI_DEVICE_ID_ESS_MAESTRO3_2 0x199b - -#define PCI_VENDOR_ID_SATSAGEM 0x1267 -#define PCI_DEVICE_ID_SATSAGEM_NICCY 0x1016 - -#define PCI_VENDOR_ID_ENSONIQ 0x1274 -#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880 -#define PCI_DEVICE_ID_ENSONIQ_ES1370 0x5000 -#define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371 - -#define PCI_VENDOR_ID_TRANSMETA 0x1279 -#define PCI_DEVICE_ID_EFFICEON 0x0060 - -#define PCI_VENDOR_ID_ROCKWELL 0x127A - -#define PCI_VENDOR_ID_ITE 0x1283 -#define PCI_DEVICE_ID_ITE_IT8172G 0x8172 -#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801 -#define PCI_DEVICE_ID_ITE_8211 0x8211 -#define PCI_DEVICE_ID_ITE_8212 0x8212 -#define PCI_DEVICE_ID_ITE_8872 0x8872 -#define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886 - -#define PCI_DEVICE_ID_ESS_ESS0100 0x0100 - -#define PCI_VENDOR_ID_ALTEON 0x12ae - -#define PCI_SUBVENDOR_ID_CONNECT_TECH 0x12c4 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232 0x0001 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_232 0x0002 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_232 0x0003 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485 0x0004 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_4_4 0x0005 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485 0x0006 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485_2_2 0x0007 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_485 0x0008 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6 0x0009 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1 0x000A -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1 0x000B -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_20MHZ 0x000C -#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_PTM 0x000D -#define PCI_SUBDEVICE_ID_CONNECT_TECH_NT960PCI 0x0100 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_2 0x0201 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4 0x0202 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232 0x0300 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_232 0x0301 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_232 0x0302 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_1_1 0x0310 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_2 0x0311 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_4 0x0312 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2 0x0320 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4 0x0321 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8 0x0322 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_485 0x0330 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_485 0x0331 -#define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485 0x0332 - -#define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2 -#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018 - -#define PCI_SUBVENDOR_ID_CHASE_PCIFAST 0x12E0 -#define PCI_SUBDEVICE_ID_CHASE_PCIFAST4 0x0031 -#define PCI_SUBDEVICE_ID_CHASE_PCIFAST8 0x0021 -#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16 0x0011 -#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC 0x0041 -#define PCI_SUBVENDOR_ID_CHASE_PCIRAS 0x124D -#define PCI_SUBDEVICE_ID_CHASE_PCIRAS4 0xF001 -#define PCI_SUBDEVICE_ID_CHASE_PCIRAS8 0xF010 - -#define PCI_VENDOR_ID_AUREAL 0x12eb -#define PCI_DEVICE_ID_AUREAL_VORTEX_1 0x0001 -#define PCI_DEVICE_ID_AUREAL_VORTEX_2 0x0002 -#define PCI_DEVICE_ID_AUREAL_ADVANTAGE 0x0003 - -#define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8 -#define PCI_DEVICE_ID_LML_33R10 0x8a02 - -#define PCI_VENDOR_ID_SIIG 0x131f -#define PCI_SUBVENDOR_ID_SIIG 0x131f -#define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000 -#define PCI_DEVICE_ID_SIIG_1S_10x_650 0x1001 -#define PCI_DEVICE_ID_SIIG_1S_10x_850 0x1002 -#define PCI_DEVICE_ID_SIIG_1S1P_10x_550 0x1010 -#define PCI_DEVICE_ID_SIIG_1S1P_10x_650 0x1011 -#define PCI_DEVICE_ID_SIIG_1S1P_10x_850 0x1012 -#define PCI_DEVICE_ID_SIIG_1P_10x 0x1020 -#define PCI_DEVICE_ID_SIIG_2P_10x 0x1021 -#define PCI_DEVICE_ID_SIIG_2S_10x_550 0x1030 -#define PCI_DEVICE_ID_SIIG_2S_10x_650 0x1031 -#define PCI_DEVICE_ID_SIIG_2S_10x_850 0x1032 -#define PCI_DEVICE_ID_SIIG_2S1P_10x_550 0x1034 -#define PCI_DEVICE_ID_SIIG_2S1P_10x_650 0x1035 -#define PCI_DEVICE_ID_SIIG_2S1P_10x_850 0x1036 -#define PCI_DEVICE_ID_SIIG_4S_10x_550 0x1050 -#define PCI_DEVICE_ID_SIIG_4S_10x_650 0x1051 -#define PCI_DEVICE_ID_SIIG_4S_10x_850 0x1052 -#define PCI_DEVICE_ID_SIIG_1S_20x_550 0x2000 -#define PCI_DEVICE_ID_SIIG_1S_20x_650 0x2001 -#define PCI_DEVICE_ID_SIIG_1S_20x_850 0x2002 -#define PCI_DEVICE_ID_SIIG_1P_20x 0x2020 -#define PCI_DEVICE_ID_SIIG_2P_20x 0x2021 -#define PCI_DEVICE_ID_SIIG_2S_20x_550 0x2030 -#define PCI_DEVICE_ID_SIIG_2S_20x_650 0x2031 -#define PCI_DEVICE_ID_SIIG_2S_20x_850 0x2032 -#define PCI_DEVICE_ID_SIIG_2P1S_20x_550 0x2040 -#define PCI_DEVICE_ID_SIIG_2P1S_20x_650 0x2041 -#define PCI_DEVICE_ID_SIIG_2P1S_20x_850 0x2042 -#define PCI_DEVICE_ID_SIIG_1S1P_20x_550 0x2010 -#define PCI_DEVICE_ID_SIIG_1S1P_20x_650 0x2011 -#define PCI_DEVICE_ID_SIIG_1S1P_20x_850 0x2012 -#define PCI_DEVICE_ID_SIIG_4S_20x_550 0x2050 -#define PCI_DEVICE_ID_SIIG_4S_20x_650 0x2051 -#define PCI_DEVICE_ID_SIIG_4S_20x_850 0x2052 -#define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060 -#define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061 -#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062 -#define PCI_DEVICE_ID_SIIG_8S_20x_550 0x2080 -#define PCI_DEVICE_ID_SIIG_8S_20x_650 0x2081 -#define PCI_DEVICE_ID_SIIG_8S_20x_850 0x2082 -#define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050 - -#define PCI_VENDOR_ID_RADISYS 0x1331 - -#define PCI_VENDOR_ID_DOMEX 0x134a -#define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 - -#define PCI_VENDOR_ID_INTASHIELD 0x135a -#define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 - -#define PCI_VENDOR_ID_QUATECH 0x135C -#define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 -#define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 -#define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050 -#define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060 - -#define PCI_VENDOR_ID_SEALEVEL 0x135e -#define PCI_DEVICE_ID_SEALEVEL_U530 0x7101 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM2 0x7201 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM422 0x7402 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM232 0x7202 -#define PCI_DEVICE_ID_SEALEVEL_COMM4 0x7401 -#define PCI_DEVICE_ID_SEALEVEL_COMM8 0x7801 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM8 0x7804 - -#define PCI_VENDOR_ID_HYPERCOPE 0x1365 -#define PCI_DEVICE_ID_HYPERCOPE_PLX 0x9050 -#define PCI_SUBDEVICE_ID_HYPERCOPE_OLD_ERGO 0x0104 -#define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO 0x0106 -#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO 0x0107 -#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108 - -#define PCI_VENDOR_ID_KAWASAKI 0x136b -#define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01 - -#define PCI_VENDOR_ID_CNET 0x1371 -#define PCI_DEVICE_ID_CNET_GIGACARD 0x434e - -#define PCI_VENDOR_ID_LMC 0x1376 -#define PCI_DEVICE_ID_LMC_HSSI 0x0003 -#define PCI_DEVICE_ID_LMC_DS3 0x0004 -#define PCI_DEVICE_ID_LMC_SSI 0x0005 -#define PCI_DEVICE_ID_LMC_T1 0x0006 - -#define PCI_VENDOR_ID_NETGEAR 0x1385 -#define PCI_DEVICE_ID_NETGEAR_GA620 0x620a - -#define PCI_VENDOR_ID_APPLICOM 0x1389 -#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001 -#define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002 -#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003 - -#define PCI_VENDOR_ID_MOXA 0x1393 -#define PCI_DEVICE_ID_MOXA_RC7000 0x0001 -#define PCI_DEVICE_ID_MOXA_CP102 0x1020 -#define PCI_DEVICE_ID_MOXA_CP102UL 0x1021 -#define PCI_DEVICE_ID_MOXA_CP102U 0x1022 -#define PCI_DEVICE_ID_MOXA_C104 0x1040 -#define PCI_DEVICE_ID_MOXA_CP104U 0x1041 -#define PCI_DEVICE_ID_MOXA_CP104JU 0x1042 -#define PCI_DEVICE_ID_MOXA_CT114 0x1140 -#define PCI_DEVICE_ID_MOXA_CP114 0x1141 -#define PCI_DEVICE_ID_MOXA_CP118U 0x1180 -#define PCI_DEVICE_ID_MOXA_CP132 0x1320 -#define PCI_DEVICE_ID_MOXA_CP132U 0x1321 -#define PCI_DEVICE_ID_MOXA_CP134U 0x1340 -#define PCI_DEVICE_ID_MOXA_C168 0x1680 -#define PCI_DEVICE_ID_MOXA_CP168U 0x1681 - -#define PCI_VENDOR_ID_CCD 0x1397 -#define PCI_DEVICE_ID_CCD_2BD0 0x2bd0 -#define PCI_DEVICE_ID_CCD_B000 0xb000 -#define PCI_DEVICE_ID_CCD_B006 0xb006 -#define PCI_DEVICE_ID_CCD_B007 0xb007 -#define PCI_DEVICE_ID_CCD_B008 0xb008 -#define PCI_DEVICE_ID_CCD_B009 0xb009 -#define PCI_DEVICE_ID_CCD_B00A 0xb00a -#define PCI_DEVICE_ID_CCD_B00B 0xb00b -#define PCI_DEVICE_ID_CCD_B00C 0xb00c -#define PCI_DEVICE_ID_CCD_B100 0xb100 -#define PCI_DEVICE_ID_CCD_B700 0xb700 -#define PCI_DEVICE_ID_CCD_B701 0xb701 - -#define PCI_VENDOR_ID_EXAR 0x13a8 -#define PCI_DEVICE_ID_EXAR_XR17C152 0x0152 -#define PCI_DEVICE_ID_EXAR_XR17C154 0x0154 -#define PCI_DEVICE_ID_EXAR_XR17C158 0x0158 - -#define PCI_VENDOR_ID_MICROGATE 0x13c0 -#define PCI_DEVICE_ID_MICROGATE_USC 0x0010 -#define PCI_DEVICE_ID_MICROGATE_SCA 0x0030 - -#define PCI_VENDOR_ID_3WARE 0x13C1 -#define PCI_DEVICE_ID_3WARE_1000 0x1000 -#define PCI_DEVICE_ID_3WARE_7000 0x1001 -#define PCI_DEVICE_ID_3WARE_9000 0x1002 - -#define PCI_VENDOR_ID_IOMEGA 0x13ca -#define PCI_DEVICE_ID_IOMEGA_BUZ 0x4231 - -#define PCI_VENDOR_ID_ABOCOM 0x13D1 -#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1 - -#define PCI_VENDOR_ID_CMEDIA 0x13f6 -#define PCI_DEVICE_ID_CMEDIA_CM8338A 0x0100 -#define PCI_DEVICE_ID_CMEDIA_CM8338B 0x0101 -#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111 -#define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112 - -#define PCI_VENDOR_ID_LAVA 0x1407 -#define PCI_DEVICE_ID_LAVA_DSERIAL 0x0100 -#define PCI_DEVICE_ID_LAVA_QUATRO_A 0x0101 -#define PCI_DEVICE_ID_LAVA_QUATRO_B 0x0102 -#define PCI_DEVICE_ID_LAVA_OCTO_A 0x0180 -#define PCI_DEVICE_ID_LAVA_OCTO_B 0x0181 -#define PCI_DEVICE_ID_LAVA_PORT_PLUS 0x0200 -#define PCI_DEVICE_ID_LAVA_QUAD_A 0x0201 -#define PCI_DEVICE_ID_LAVA_QUAD_B 0x0202 -#define PCI_DEVICE_ID_LAVA_SSERIAL 0x0500 -#define PCI_DEVICE_ID_LAVA_PORT_650 0x0600 -#define PCI_DEVICE_ID_LAVA_PARALLEL 0x8000 -#define PCI_DEVICE_ID_LAVA_DUAL_PAR_A 0x8002 -#define PCI_DEVICE_ID_LAVA_DUAL_PAR_B 0x8003 -#define PCI_DEVICE_ID_LAVA_BOCA_IOPPAR 0x8800 - -#define PCI_VENDOR_ID_TIMEDIA 0x1409 -#define PCI_DEVICE_ID_TIMEDIA_1889 0x7168 - -#define PCI_VENDOR_ID_ICE 0x1412 -#define PCI_DEVICE_ID_ICE_1712 0x1712 -#define PCI_DEVICE_ID_VT1724 0x1724 - -#define PCI_VENDOR_ID_OXSEMI 0x1415 -#define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403 -#define PCI_DEVICE_ID_OXSEMI_16PCI954 0x9501 -#define PCI_DEVICE_ID_OXSEMI_16PCI95N 0x9511 -#define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513 -#define PCI_DEVICE_ID_OXSEMI_16PCI952 0x9521 - -#define PCI_VENDOR_ID_SAMSUNG 0x144d - -#define PCI_VENDOR_ID_MYRICOM 0x14c1 - -#define PCI_VENDOR_ID_TITAN 0x14D2 -#define PCI_DEVICE_ID_TITAN_010L 0x8001 -#define PCI_DEVICE_ID_TITAN_100L 0x8010 -#define PCI_DEVICE_ID_TITAN_110L 0x8011 -#define PCI_DEVICE_ID_TITAN_200L 0x8020 -#define PCI_DEVICE_ID_TITAN_210L 0x8021 -#define PCI_DEVICE_ID_TITAN_400L 0x8040 -#define PCI_DEVICE_ID_TITAN_800L 0x8080 -#define PCI_DEVICE_ID_TITAN_100 0xA001 -#define PCI_DEVICE_ID_TITAN_200 0xA005 -#define PCI_DEVICE_ID_TITAN_400 0xA003 -#define PCI_DEVICE_ID_TITAN_800B 0xA004 - -#define PCI_VENDOR_ID_PANACOM 0x14d4 -#define PCI_DEVICE_ID_PANACOM_QUADMODEM 0x0400 -#define PCI_DEVICE_ID_PANACOM_DUALMODEM 0x0402 - -#define PCI_VENDOR_ID_AFAVLAB 0x14db -#define PCI_DEVICE_ID_AFAVLAB_P028 0x2180 -#define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 -#define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 - -#define PCI_VENDOR_ID_BROADCOM 0x14e4 -#define PCI_DEVICE_ID_TIGON3_5752 0x1600 -#define PCI_DEVICE_ID_TIGON3_5752M 0x1601 -#define PCI_DEVICE_ID_TIGON3_5700 0x1644 -#define PCI_DEVICE_ID_TIGON3_5701 0x1645 -#define PCI_DEVICE_ID_TIGON3_5702 0x1646 -#define PCI_DEVICE_ID_TIGON3_5703 0x1647 -#define PCI_DEVICE_ID_TIGON3_5704 0x1648 -#define PCI_DEVICE_ID_TIGON3_5704S_2 0x1649 -#define PCI_DEVICE_ID_NX2_5706 0x164a -#define PCI_DEVICE_ID_NX2_5708 0x164c -#define PCI_DEVICE_ID_TIGON3_5702FE 0x164d -#define PCI_DEVICE_ID_TIGON3_5705 0x1653 -#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 -#define PCI_DEVICE_ID_TIGON3_5720 0x1658 -#define PCI_DEVICE_ID_TIGON3_5721 0x1659 -#define PCI_DEVICE_ID_TIGON3_5705M 0x165d -#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e -#define PCI_DEVICE_ID_TIGON3_5714 0x1668 -#define PCI_DEVICE_ID_TIGON3_5714S 0x1669 -#define PCI_DEVICE_ID_TIGON3_5780 0x166a -#define PCI_DEVICE_ID_TIGON3_5780S 0x166b -#define PCI_DEVICE_ID_TIGON3_5705F 0x166e -#define PCI_DEVICE_ID_TIGON3_5754M 0x1672 -#define PCI_DEVICE_ID_TIGON3_5755M 0x1673 -#define PCI_DEVICE_ID_TIGON3_5750 0x1676 -#define PCI_DEVICE_ID_TIGON3_5751 0x1677 -#define PCI_DEVICE_ID_TIGON3_5715 0x1678 -#define PCI_DEVICE_ID_TIGON3_5715S 0x1679 -#define PCI_DEVICE_ID_TIGON3_5754 0x167a -#define PCI_DEVICE_ID_TIGON3_5755 0x167b -#define PCI_DEVICE_ID_TIGON3_5750M 0x167c -#define PCI_DEVICE_ID_TIGON3_5751M 0x167d -#define PCI_DEVICE_ID_TIGON3_5751F 0x167e -#define PCI_DEVICE_ID_TIGON3_5787M 0x1693 -#define PCI_DEVICE_ID_TIGON3_5782 0x1696 -#define PCI_DEVICE_ID_TIGON3_5786 0x169a -#define PCI_DEVICE_ID_TIGON3_5787 0x169b -#define PCI_DEVICE_ID_TIGON3_5788 0x169c -#define PCI_DEVICE_ID_TIGON3_5789 0x169d -#define PCI_DEVICE_ID_TIGON3_5702X 0x16a6 -#define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 -#define PCI_DEVICE_ID_TIGON3_5704S 0x16a8 -#define PCI_DEVICE_ID_NX2_5706S 0x16aa -#define PCI_DEVICE_ID_NX2_5708S 0x16ac -#define PCI_DEVICE_ID_TIGON3_5702A3 0x16c6 -#define PCI_DEVICE_ID_TIGON3_5703A3 0x16c7 -#define PCI_DEVICE_ID_TIGON3_5781 0x16dd -#define PCI_DEVICE_ID_TIGON3_5753 0x16f7 -#define PCI_DEVICE_ID_TIGON3_5753M 0x16fd -#define PCI_DEVICE_ID_TIGON3_5753F 0x16fe -#define PCI_DEVICE_ID_TIGON3_5901 0x170d -#define PCI_DEVICE_ID_BCM4401B1 0x170c -#define PCI_DEVICE_ID_TIGON3_5901_2 0x170e -#define PCI_DEVICE_ID_BCM4401 0x4401 -#define PCI_DEVICE_ID_BCM4401B0 0x4402 - -#define PCI_VENDOR_ID_TOPIC 0x151f -#define PCI_DEVICE_ID_TOPIC_TP560 0x0000 - -#define PCI_VENDOR_ID_ENE 0x1524 -#define PCI_DEVICE_ID_ENE_1211 0x1211 -#define PCI_DEVICE_ID_ENE_1225 0x1225 -#define PCI_DEVICE_ID_ENE_1410 0x1410 -#define PCI_DEVICE_ID_ENE_710 0x1411 -#define PCI_DEVICE_ID_ENE_712 0x1412 -#define PCI_DEVICE_ID_ENE_1420 0x1420 -#define PCI_DEVICE_ID_ENE_720 0x1421 -#define PCI_DEVICE_ID_ENE_722 0x1422 - -#define PCI_VENDOR_ID_CHELSIO 0x1425 - -#define PCI_VENDOR_ID_SYBA 0x1592 -#define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 -#define PCI_DEVICE_ID_SYBA_1P_ECP 0x0783 - -#define PCI_VENDOR_ID_MORETON 0x15aa -#define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 - -#define PCI_VENDOR_ID_ZOLTRIX 0x15b0 -#define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 - -#define PCI_VENDOR_ID_MELLANOX 0x15b3 -#define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44 -#define PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE 0x5a46 -#define PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT 0x6278 -#define PCI_DEVICE_ID_MELLANOX_ARBEL 0x6282 -#define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c -#define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274 - -#define PCI_VENDOR_ID_PDC 0x15e9 - -#define PCI_VENDOR_ID_FARSITE 0x1619 -#define PCI_DEVICE_ID_FARSITE_T2P 0x0400 -#define PCI_DEVICE_ID_FARSITE_T4P 0x0440 -#define PCI_DEVICE_ID_FARSITE_T1U 0x0610 -#define PCI_DEVICE_ID_FARSITE_T2U 0x0620 -#define PCI_DEVICE_ID_FARSITE_T4U 0x0640 -#define PCI_DEVICE_ID_FARSITE_TE1 0x1610 -#define PCI_DEVICE_ID_FARSITE_TE1C 0x1612 - -#define PCI_VENDOR_ID_SIBYTE 0x166d -#define PCI_DEVICE_ID_BCM1250_HT 0x0002 - -#define PCI_VENDOR_ID_NETCELL 0x169c -#define PCI_DEVICE_ID_REVOLUTION 0x0044 - -#define PCI_VENDOR_ID_VITESSE 0x1725 -#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174 - -#define PCI_VENDOR_ID_LINKSYS 0x1737 -#define PCI_DEVICE_ID_LINKSYS_EG1064 0x1064 - -#define PCI_VENDOR_ID_ALTIMA 0x173b -#define PCI_DEVICE_ID_ALTIMA_AC1000 0x03e8 -#define PCI_DEVICE_ID_ALTIMA_AC1001 0x03e9 -#define PCI_DEVICE_ID_ALTIMA_AC9100 0x03ea -#define PCI_DEVICE_ID_ALTIMA_AC1003 0x03eb - -#define PCI_VENDOR_ID_S2IO 0x17d5 -#define PCI_DEVICE_ID_S2IO_WIN 0x5731 -#define PCI_DEVICE_ID_S2IO_UNI 0x5831 -#define PCI_DEVICE_ID_HERC_WIN 0x5732 -#define PCI_DEVICE_ID_HERC_UNI 0x5832 - -#define PCI_VENDOR_ID_SITECOM 0x182d -#define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069 - -#define PCI_VENDOR_ID_TOPSPIN 0x1867 - -#define PCI_VENDOR_ID_TDI 0x192E -#define PCI_DEVICE_ID_TDI_EHCI 0x0101 - -#define PCI_VENDOR_ID_JMICRON 0x197B -#define PCI_DEVICE_ID_JMICRON_JMB360 0x2360 -#define PCI_DEVICE_ID_JMICRON_JMB361 0x2361 -#define PCI_DEVICE_ID_JMICRON_JMB363 0x2363 -#define PCI_DEVICE_ID_JMICRON_JMB365 0x2365 -#define PCI_DEVICE_ID_JMICRON_JMB366 0x2366 -#define PCI_DEVICE_ID_JMICRON_JMB368 0x2368 - -#define PCI_VENDOR_ID_TEKRAM 0x1de1 -#define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 - -#define PCI_VENDOR_ID_HINT 0x3388 -#define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013 - -#define PCI_VENDOR_ID_3DLABS 0x3d3d -#define PCI_DEVICE_ID_3DLABS_PERMEDIA2 0x0007 -#define PCI_DEVICE_ID_3DLABS_PERMEDIA2V 0x0009 - -#define PCI_VENDOR_ID_AKS 0x416c -#define PCI_DEVICE_ID_AKS_ALADDINCARD 0x0100 - -#define PCI_VENDOR_ID_S3 0x5333 -#define PCI_DEVICE_ID_S3_TRIO 0x8811 -#define PCI_DEVICE_ID_S3_868 0x8880 -#define PCI_DEVICE_ID_S3_968 0x88f0 -#define PCI_DEVICE_ID_S3_SAVAGE4 0x8a25 -#define PCI_DEVICE_ID_S3_PROSAVAGE8 0x8d04 -#define PCI_DEVICE_ID_S3_SONICVIBES 0xca00 - -#define PCI_VENDOR_ID_DUNORD 0x5544 -#define PCI_DEVICE_ID_DUNORD_I3000 0x0001 - -#define PCI_VENDOR_ID_DCI 0x6666 -#define PCI_DEVICE_ID_DCI_PCCOM4 0x0001 -#define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 -#define PCI_DEVICE_ID_DCI_PCCOM2 0x0004 - -#define PCI_VENDOR_ID_INTEL 0x8086 -#define PCI_DEVICE_ID_INTEL_EESSC 0x0008 -#define PCI_DEVICE_ID_INTEL_PXHD_0 0x0320 -#define PCI_DEVICE_ID_INTEL_PXHD_1 0x0321 -#define PCI_DEVICE_ID_INTEL_PXH_0 0x0329 -#define PCI_DEVICE_ID_INTEL_PXH_1 0x032A -#define PCI_DEVICE_ID_INTEL_PXHV 0x032C -#define PCI_DEVICE_ID_INTEL_82375 0x0482 -#define PCI_DEVICE_ID_INTEL_82424 0x0483 -#define PCI_DEVICE_ID_INTEL_82378 0x0484 -#define PCI_DEVICE_ID_INTEL_I960 0x0960 -#define PCI_DEVICE_ID_INTEL_I960RM 0x0962 -#define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 -#define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 -#define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 -#define PCI_DEVICE_ID_INTEL_7505_0 0x2550 -#define PCI_DEVICE_ID_INTEL_7205_0 0x255d -#define PCI_DEVICE_ID_INTEL_82437 0x122d -#define PCI_DEVICE_ID_INTEL_82371FB_0 0x122e -#define PCI_DEVICE_ID_INTEL_82371FB_1 0x1230 -#define PCI_DEVICE_ID_INTEL_82371MX 0x1234 -#define PCI_DEVICE_ID_INTEL_82441 0x1237 -#define PCI_DEVICE_ID_INTEL_82380FB 0x124b -#define PCI_DEVICE_ID_INTEL_82439 0x1250 -#define PCI_DEVICE_ID_INTEL_80960_RP 0x1960 -#define PCI_DEVICE_ID_INTEL_82840_HB 0x1a21 -#define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30 -#define PCI_DEVICE_ID_INTEL_IOAT 0x1a38 -#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 -#define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 -#define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413 -#define PCI_DEVICE_ID_INTEL_82801AA_5 0x2415 -#define PCI_DEVICE_ID_INTEL_82801AA_6 0x2416 -#define PCI_DEVICE_ID_INTEL_82801AA_8 0x2418 -#define PCI_DEVICE_ID_INTEL_82801AB_0 0x2420 -#define PCI_DEVICE_ID_INTEL_82801AB_1 0x2421 -#define PCI_DEVICE_ID_INTEL_82801AB_3 0x2423 -#define PCI_DEVICE_ID_INTEL_82801AB_5 0x2425 -#define PCI_DEVICE_ID_INTEL_82801AB_6 0x2426 -#define PCI_DEVICE_ID_INTEL_82801AB_8 0x2428 -#define PCI_DEVICE_ID_INTEL_82801BA_0 0x2440 -#define PCI_DEVICE_ID_INTEL_82801BA_2 0x2443 -#define PCI_DEVICE_ID_INTEL_82801BA_4 0x2445 -#define PCI_DEVICE_ID_INTEL_82801BA_6 0x2448 -#define PCI_DEVICE_ID_INTEL_82801BA_8 0x244a -#define PCI_DEVICE_ID_INTEL_82801BA_9 0x244b -#define PCI_DEVICE_ID_INTEL_82801BA_10 0x244c -#define PCI_DEVICE_ID_INTEL_82801BA_11 0x244e -#define PCI_DEVICE_ID_INTEL_82801E_0 0x2450 -#define PCI_DEVICE_ID_INTEL_82801E_11 0x245b -#define PCI_DEVICE_ID_INTEL_82801CA_0 0x2480 -#define PCI_DEVICE_ID_INTEL_82801CA_3 0x2483 -#define PCI_DEVICE_ID_INTEL_82801CA_5 0x2485 -#define PCI_DEVICE_ID_INTEL_82801CA_6 0x2486 -#define PCI_DEVICE_ID_INTEL_82801CA_10 0x248a -#define PCI_DEVICE_ID_INTEL_82801CA_11 0x248b -#define PCI_DEVICE_ID_INTEL_82801CA_12 0x248c -#define PCI_DEVICE_ID_INTEL_82801DB_0 0x24c0 -#define PCI_DEVICE_ID_INTEL_82801DB_1 0x24c1 -#define PCI_DEVICE_ID_INTEL_82801DB_3 0x24c3 -#define PCI_DEVICE_ID_INTEL_82801DB_5 0x24c5 -#define PCI_DEVICE_ID_INTEL_82801DB_6 0x24c6 -#define PCI_DEVICE_ID_INTEL_82801DB_9 0x24c9 -#define PCI_DEVICE_ID_INTEL_82801DB_10 0x24ca -#define PCI_DEVICE_ID_INTEL_82801DB_11 0x24cb -#define PCI_DEVICE_ID_INTEL_82801DB_12 0x24cc -#define PCI_DEVICE_ID_INTEL_82801EB_0 0x24d0 -#define PCI_DEVICE_ID_INTEL_82801EB_1 0x24d1 -#define PCI_DEVICE_ID_INTEL_82801EB_3 0x24d3 -#define PCI_DEVICE_ID_INTEL_82801EB_5 0x24d5 -#define PCI_DEVICE_ID_INTEL_82801EB_6 0x24d6 -#define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db -#define PCI_DEVICE_ID_INTEL_82801EB_13 0x24dd -#define PCI_DEVICE_ID_INTEL_ESB_1 0x25a1 -#define PCI_DEVICE_ID_INTEL_ESB_2 0x25a2 -#define PCI_DEVICE_ID_INTEL_ESB_4 0x25a4 -#define PCI_DEVICE_ID_INTEL_ESB_5 0x25a6 -#define PCI_DEVICE_ID_INTEL_ESB_9 0x25ab -#define PCI_DEVICE_ID_INTEL_82820_HB 0x2500 -#define PCI_DEVICE_ID_INTEL_82820_UP_HB 0x2501 -#define PCI_DEVICE_ID_INTEL_82850_HB 0x2530 -#define PCI_DEVICE_ID_INTEL_82860_HB 0x2531 -#define PCI_DEVICE_ID_INTEL_E7501_MCH 0x254c -#define PCI_DEVICE_ID_INTEL_82845G_HB 0x2560 -#define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562 -#define PCI_DEVICE_ID_INTEL_82865_HB 0x2570 -#define PCI_DEVICE_ID_INTEL_82865_IG 0x2572 -#define PCI_DEVICE_ID_INTEL_82875_HB 0x2578 -#define PCI_DEVICE_ID_INTEL_82915G_HB 0x2580 -#define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 -#define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 -#define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 -#define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 -#define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772 -#define PCI_DEVICE_ID_INTEL_82945GM_HB 0x27A0 -#define PCI_DEVICE_ID_INTEL_82945GM_IG 0x27A2 -#define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 -#define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 -#define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 -#define PCI_DEVICE_ID_INTEL_ICH6_16 0x266a -#define PCI_DEVICE_ID_INTEL_ICH6_17 0x266d -#define PCI_DEVICE_ID_INTEL_ICH6_18 0x266e -#define PCI_DEVICE_ID_INTEL_ICH6_19 0x266f -#define PCI_DEVICE_ID_INTEL_ESB2_0 0x2670 -#define PCI_DEVICE_ID_INTEL_ESB2_14 0x2698 -#define PCI_DEVICE_ID_INTEL_ESB2_17 0x269b -#define PCI_DEVICE_ID_INTEL_ESB2_18 0x269e -#define PCI_DEVICE_ID_INTEL_ICH7_0 0x27b8 -#define PCI_DEVICE_ID_INTEL_ICH7_1 0x27b9 -#define PCI_DEVICE_ID_INTEL_ICH7_30 0x27b0 -#define PCI_DEVICE_ID_INTEL_ICH7_31 0x27bd -#define PCI_DEVICE_ID_INTEL_ICH7_17 0x27da -#define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd -#define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de -#define PCI_DEVICE_ID_INTEL_ICH7_21 0x27df -#define PCI_DEVICE_ID_INTEL_ICH8_0 0x2810 -#define PCI_DEVICE_ID_INTEL_ICH8_1 0x2811 -#define PCI_DEVICE_ID_INTEL_ICH8_2 0x2812 -#define PCI_DEVICE_ID_INTEL_ICH8_3 0x2814 -#define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815 -#define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e -#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850 -#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340 -#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 -#define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 -#define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580 -#define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582 -#define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 -#define PCI_DEVICE_ID_INTEL_E7320_MCH 0x3592 -#define PCI_DEVICE_ID_INTEL_MCH_PA 0x3595 -#define PCI_DEVICE_ID_INTEL_MCH_PA1 0x3596 -#define PCI_DEVICE_ID_INTEL_MCH_PB 0x3597 -#define PCI_DEVICE_ID_INTEL_MCH_PB1 0x3598 -#define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599 -#define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a -#define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e -#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000 -#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010 -#define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020 -#define PCI_DEVICE_ID_INTEL_82437VX 0x7030 -#define PCI_DEVICE_ID_INTEL_82439TX 0x7100 -#define PCI_DEVICE_ID_INTEL_82371AB_0 0x7110 -#define PCI_DEVICE_ID_INTEL_82371AB 0x7111 -#define PCI_DEVICE_ID_INTEL_82371AB_2 0x7112 -#define PCI_DEVICE_ID_INTEL_82371AB_3 0x7113 -#define PCI_DEVICE_ID_INTEL_82810_MC1 0x7120 -#define PCI_DEVICE_ID_INTEL_82810_IG1 0x7121 -#define PCI_DEVICE_ID_INTEL_82810_MC3 0x7122 -#define PCI_DEVICE_ID_INTEL_82810_IG3 0x7123 -#define PCI_DEVICE_ID_INTEL_82810E_MC 0x7124 -#define PCI_DEVICE_ID_INTEL_82810E_IG 0x7125 -#define PCI_DEVICE_ID_INTEL_82443LX_0 0x7180 -#define PCI_DEVICE_ID_INTEL_82443LX_1 0x7181 -#define PCI_DEVICE_ID_INTEL_82443BX_0 0x7190 -#define PCI_DEVICE_ID_INTEL_82443BX_1 0x7191 -#define PCI_DEVICE_ID_INTEL_82443BX_2 0x7192 -#define PCI_DEVICE_ID_INTEL_440MX 0x7195 -#define PCI_DEVICE_ID_INTEL_440MX_6 0x7196 -#define PCI_DEVICE_ID_INTEL_82443MX_0 0x7198 -#define PCI_DEVICE_ID_INTEL_82443MX_1 0x7199 -#define PCI_DEVICE_ID_INTEL_82443MX_3 0x719b -#define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0 -#define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2 -#define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 -#define PCI_DEVICE_ID_INTEL_82454GX 0x84c4 -#define PCI_DEVICE_ID_INTEL_82450GX 0x84c5 -#define PCI_DEVICE_ID_INTEL_82451NX 0x84ca -#define PCI_DEVICE_ID_INTEL_82454NX 0x84cb -#define PCI_DEVICE_ID_INTEL_84460GX 0x84ea -#define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500 -#define PCI_DEVICE_ID_INTEL_IXP2800 0x9004 -#define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 - -#define PCI_VENDOR_ID_SCALEMP 0x8686 -#define PCI_DEVICE_ID_SCALEMP_VSMP_CTL 0x1010 - -#define PCI_VENDOR_ID_COMPUTONE 0x8e0e -#define PCI_DEVICE_ID_COMPUTONE_IP2EX 0x0291 -#define PCI_DEVICE_ID_COMPUTONE_PG 0x0302 -#define PCI_SUBVENDOR_ID_COMPUTONE 0x8e0e -#define PCI_SUBDEVICE_ID_COMPUTONE_PG4 0x0001 -#define PCI_SUBDEVICE_ID_COMPUTONE_PG8 0x0002 -#define PCI_SUBDEVICE_ID_COMPUTONE_PG6 0x0003 - -#define PCI_VENDOR_ID_KTI 0x8e2e - -#define PCI_VENDOR_ID_ADAPTEC 0x9004 -#define PCI_DEVICE_ID_ADAPTEC_7810 0x1078 -#define PCI_DEVICE_ID_ADAPTEC_7821 0x2178 -#define PCI_DEVICE_ID_ADAPTEC_38602 0x3860 -#define PCI_DEVICE_ID_ADAPTEC_7850 0x5078 -#define PCI_DEVICE_ID_ADAPTEC_7855 0x5578 -#define PCI_DEVICE_ID_ADAPTEC_3860 0x6038 -#define PCI_DEVICE_ID_ADAPTEC_1480A 0x6075 -#define PCI_DEVICE_ID_ADAPTEC_7860 0x6078 -#define PCI_DEVICE_ID_ADAPTEC_7861 0x6178 -#define PCI_DEVICE_ID_ADAPTEC_7870 0x7078 -#define PCI_DEVICE_ID_ADAPTEC_7871 0x7178 -#define PCI_DEVICE_ID_ADAPTEC_7872 0x7278 -#define PCI_DEVICE_ID_ADAPTEC_7873 0x7378 -#define PCI_DEVICE_ID_ADAPTEC_7874 0x7478 -#define PCI_DEVICE_ID_ADAPTEC_7895 0x7895 -#define PCI_DEVICE_ID_ADAPTEC_7880 0x8078 -#define PCI_DEVICE_ID_ADAPTEC_7881 0x8178 -#define PCI_DEVICE_ID_ADAPTEC_7882 0x8278 -#define PCI_DEVICE_ID_ADAPTEC_7883 0x8378 -#define PCI_DEVICE_ID_ADAPTEC_7884 0x8478 -#define PCI_DEVICE_ID_ADAPTEC_7885 0x8578 -#define PCI_DEVICE_ID_ADAPTEC_7886 0x8678 -#define PCI_DEVICE_ID_ADAPTEC_7887 0x8778 -#define PCI_DEVICE_ID_ADAPTEC_7888 0x8878 - -#define PCI_VENDOR_ID_ADAPTEC2 0x9005 -#define PCI_DEVICE_ID_ADAPTEC2_2940U2 0x0010 -#define PCI_DEVICE_ID_ADAPTEC2_2930U2 0x0011 -#define PCI_DEVICE_ID_ADAPTEC2_7890B 0x0013 -#define PCI_DEVICE_ID_ADAPTEC2_7890 0x001f -#define PCI_DEVICE_ID_ADAPTEC2_3940U2 0x0050 -#define PCI_DEVICE_ID_ADAPTEC2_3950U2D 0x0051 -#define PCI_DEVICE_ID_ADAPTEC2_7896 0x005f -#define PCI_DEVICE_ID_ADAPTEC2_7892A 0x0080 -#define PCI_DEVICE_ID_ADAPTEC2_7892B 0x0081 -#define PCI_DEVICE_ID_ADAPTEC2_7892D 0x0083 -#define PCI_DEVICE_ID_ADAPTEC2_7892P 0x008f -#define PCI_DEVICE_ID_ADAPTEC2_7899A 0x00c0 -#define PCI_DEVICE_ID_ADAPTEC2_7899B 0x00c1 -#define PCI_DEVICE_ID_ADAPTEC2_7899D 0x00c3 -#define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf -#define PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN 0x0500 -#define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503 - -#define PCI_VENDOR_ID_HOLTEK 0x9412 -#define PCI_DEVICE_ID_HOLTEK_6565 0x6565 - -#define PCI_VENDOR_ID_NETMOS 0x9710 -#define PCI_DEVICE_ID_NETMOS_9705 0x9705 -#define PCI_DEVICE_ID_NETMOS_9715 0x9715 -#define PCI_DEVICE_ID_NETMOS_9735 0x9735 -#define PCI_DEVICE_ID_NETMOS_9745 0x9745 -#define PCI_DEVICE_ID_NETMOS_9755 0x9755 -#define PCI_DEVICE_ID_NETMOS_9805 0x9805 -#define PCI_DEVICE_ID_NETMOS_9815 0x9815 -#define PCI_DEVICE_ID_NETMOS_9835 0x9835 -#define PCI_DEVICE_ID_NETMOS_9845 0x9845 -#define PCI_DEVICE_ID_NETMOS_9855 0x9855 - -#define PCI_SUBVENDOR_ID_EXSYS 0xd84d -#define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 -#define PCI_SUBDEVICE_ID_EXSYS_4055 0x4055 - -#define PCI_VENDOR_ID_TIGERJET 0xe159 -#define PCI_DEVICE_ID_TIGERJET_300 0x0001 -#define PCI_DEVICE_ID_TIGERJET_100 0x0002 - -#define PCI_VENDOR_ID_TTTECH 0x0357 -#define PCI_DEVICE_ID_TTTECH_MC322 0x000A - -#define PCI_VENDOR_ID_XILINX_RME 0xea60 -#define PCI_DEVICE_ID_RME_DIGI32 0x9896 -#define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 -#define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 - diff --git a/libc/kernel/common/linux/pci_regs.h b/libc/kernel/common/linux/pci_regs.h deleted file mode 100644 index 93a21beae..000000000 --- a/libc/kernel/common/linux/pci_regs.h +++ /dev/null @@ -1,422 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_PCI_REGS_H -#define LINUX_PCI_REGS_H - -#define PCI_VENDOR_ID 0x00 -#define PCI_DEVICE_ID 0x02 -#define PCI_COMMAND 0x04 -#define PCI_COMMAND_IO 0x1 -#define PCI_COMMAND_MEMORY 0x2 -#define PCI_COMMAND_MASTER 0x4 -#define PCI_COMMAND_SPECIAL 0x8 -#define PCI_COMMAND_INVALIDATE 0x10 -#define PCI_COMMAND_VGA_PALETTE 0x20 -#define PCI_COMMAND_PARITY 0x40 -#define PCI_COMMAND_WAIT 0x80 -#define PCI_COMMAND_SERR 0x100 -#define PCI_COMMAND_FAST_BACK 0x200 -#define PCI_COMMAND_INTX_DISABLE 0x400 - -#define PCI_STATUS 0x06 -#define PCI_STATUS_CAP_LIST 0x10 -#define PCI_STATUS_66MHZ 0x20 -#define PCI_STATUS_UDF 0x40 -#define PCI_STATUS_FAST_BACK 0x80 -#define PCI_STATUS_PARITY 0x100 -#define PCI_STATUS_DEVSEL_MASK 0x600 -#define PCI_STATUS_DEVSEL_FAST 0x000 -#define PCI_STATUS_DEVSEL_MEDIUM 0x200 -#define PCI_STATUS_DEVSEL_SLOW 0x400 -#define PCI_STATUS_SIG_TARGET_ABORT 0x800 -#define PCI_STATUS_REC_TARGET_ABORT 0x1000 -#define PCI_STATUS_REC_MASTER_ABORT 0x2000 -#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 -#define PCI_STATUS_DETECTED_PARITY 0x8000 - -#define PCI_CLASS_REVISION 0x08 -#define PCI_REVISION_ID 0x08 -#define PCI_CLASS_PROG 0x09 -#define PCI_CLASS_DEVICE 0x0a - -#define PCI_CACHE_LINE_SIZE 0x0c -#define PCI_LATENCY_TIMER 0x0d -#define PCI_HEADER_TYPE 0x0e -#define PCI_HEADER_TYPE_NORMAL 0 -#define PCI_HEADER_TYPE_BRIDGE 1 -#define PCI_HEADER_TYPE_CARDBUS 2 - -#define PCI_BIST 0x0f -#define PCI_BIST_CODE_MASK 0x0f -#define PCI_BIST_START 0x40 -#define PCI_BIST_CAPABLE 0x80 - -#define PCI_BASE_ADDRESS_0 0x10 -#define PCI_BASE_ADDRESS_1 0x14 -#define PCI_BASE_ADDRESS_2 0x18 -#define PCI_BASE_ADDRESS_3 0x1c -#define PCI_BASE_ADDRESS_4 0x20 -#define PCI_BASE_ADDRESS_5 0x24 -#define PCI_BASE_ADDRESS_SPACE 0x01 -#define PCI_BASE_ADDRESS_SPACE_IO 0x01 -#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 -#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 -#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 -#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 -#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 -#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 -#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) -#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) - -#define PCI_CARDBUS_CIS 0x28 -#define PCI_SUBSYSTEM_VENDOR_ID 0x2c -#define PCI_SUBSYSTEM_ID 0x2e -#define PCI_ROM_ADDRESS 0x30 -#define PCI_ROM_ADDRESS_ENABLE 0x01 -#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) - -#define PCI_CAPABILITY_LIST 0x34 - -#define PCI_INTERRUPT_LINE 0x3c -#define PCI_INTERRUPT_PIN 0x3d -#define PCI_MIN_GNT 0x3e -#define PCI_MAX_LAT 0x3f - -#define PCI_PRIMARY_BUS 0x18 -#define PCI_SECONDARY_BUS 0x19 -#define PCI_SUBORDINATE_BUS 0x1a -#define PCI_SEC_LATENCY_TIMER 0x1b -#define PCI_IO_BASE 0x1c -#define PCI_IO_LIMIT 0x1d -#define PCI_IO_RANGE_TYPE_MASK 0x0fUL -#define PCI_IO_RANGE_TYPE_16 0x00 -#define PCI_IO_RANGE_TYPE_32 0x01 -#define PCI_IO_RANGE_MASK (~0x0fUL) -#define PCI_SEC_STATUS 0x1e -#define PCI_MEMORY_BASE 0x20 -#define PCI_MEMORY_LIMIT 0x22 -#define PCI_MEMORY_RANGE_TYPE_MASK 0x0fUL -#define PCI_MEMORY_RANGE_MASK (~0x0fUL) -#define PCI_PREF_MEMORY_BASE 0x24 -#define PCI_PREF_MEMORY_LIMIT 0x26 -#define PCI_PREF_RANGE_TYPE_MASK 0x0fUL -#define PCI_PREF_RANGE_TYPE_32 0x00 -#define PCI_PREF_RANGE_TYPE_64 0x01 -#define PCI_PREF_RANGE_MASK (~0x0fUL) -#define PCI_PREF_BASE_UPPER32 0x28 -#define PCI_PREF_LIMIT_UPPER32 0x2c -#define PCI_IO_BASE_UPPER16 0x30 -#define PCI_IO_LIMIT_UPPER16 0x32 - -#define PCI_ROM_ADDRESS1 0x38 - -#define PCI_BRIDGE_CONTROL 0x3e -#define PCI_BRIDGE_CTL_PARITY 0x01 -#define PCI_BRIDGE_CTL_SERR 0x02 -#define PCI_BRIDGE_CTL_NO_ISA 0x04 -#define PCI_BRIDGE_CTL_VGA 0x08 -#define PCI_BRIDGE_CTL_MASTER_ABORT 0x20 -#define PCI_BRIDGE_CTL_BUS_RESET 0x40 -#define PCI_BRIDGE_CTL_FAST_BACK 0x80 - -#define PCI_CB_CAPABILITY_LIST 0x14 - -#define PCI_CB_SEC_STATUS 0x16 -#define PCI_CB_PRIMARY_BUS 0x18 -#define PCI_CB_CARD_BUS 0x19 -#define PCI_CB_SUBORDINATE_BUS 0x1a -#define PCI_CB_LATENCY_TIMER 0x1b -#define PCI_CB_MEMORY_BASE_0 0x1c -#define PCI_CB_MEMORY_LIMIT_0 0x20 -#define PCI_CB_MEMORY_BASE_1 0x24 -#define PCI_CB_MEMORY_LIMIT_1 0x28 -#define PCI_CB_IO_BASE_0 0x2c -#define PCI_CB_IO_BASE_0_HI 0x2e -#define PCI_CB_IO_LIMIT_0 0x30 -#define PCI_CB_IO_LIMIT_0_HI 0x32 -#define PCI_CB_IO_BASE_1 0x34 -#define PCI_CB_IO_BASE_1_HI 0x36 -#define PCI_CB_IO_LIMIT_1 0x38 -#define PCI_CB_IO_LIMIT_1_HI 0x3a -#define PCI_CB_IO_RANGE_MASK (~0x03UL) - -#define PCI_CB_BRIDGE_CONTROL 0x3e -#define PCI_CB_BRIDGE_CTL_PARITY 0x01 -#define PCI_CB_BRIDGE_CTL_SERR 0x02 -#define PCI_CB_BRIDGE_CTL_ISA 0x04 -#define PCI_CB_BRIDGE_CTL_VGA 0x08 -#define PCI_CB_BRIDGE_CTL_MASTER_ABORT 0x20 -#define PCI_CB_BRIDGE_CTL_CB_RESET 0x40 -#define PCI_CB_BRIDGE_CTL_16BIT_INT 0x80 -#define PCI_CB_BRIDGE_CTL_PREFETCH_MEM0 0x100 -#define PCI_CB_BRIDGE_CTL_PREFETCH_MEM1 0x200 -#define PCI_CB_BRIDGE_CTL_POST_WRITES 0x400 -#define PCI_CB_SUBSYSTEM_VENDOR_ID 0x40 -#define PCI_CB_SUBSYSTEM_ID 0x42 -#define PCI_CB_LEGACY_MODE_BASE 0x44 - -#define PCI_CAP_LIST_ID 0 -#define PCI_CAP_ID_PM 0x01 -#define PCI_CAP_ID_AGP 0x02 -#define PCI_CAP_ID_VPD 0x03 -#define PCI_CAP_ID_SLOTID 0x04 -#define PCI_CAP_ID_MSI 0x05 -#define PCI_CAP_ID_CHSWP 0x06 -#define PCI_CAP_ID_PCIX 0x07 -#define PCI_CAP_ID_HT_IRQCONF 0x08 -#define PCI_CAP_ID_VNDR 0x09 -#define PCI_CAP_ID_SHPC 0x0C -#define PCI_CAP_ID_EXP 0x10 -#define PCI_CAP_ID_MSIX 0x11 -#define PCI_CAP_LIST_NEXT 1 -#define PCI_CAP_FLAGS 2 -#define PCI_CAP_SIZEOF 4 - -#define PCI_PM_PMC 2 -#define PCI_PM_CAP_VER_MASK 0x0007 -#define PCI_PM_CAP_PME_CLOCK 0x0008 -#define PCI_PM_CAP_RESERVED 0x0010 -#define PCI_PM_CAP_DSI 0x0020 -#define PCI_PM_CAP_AUX_POWER 0x01C0 -#define PCI_PM_CAP_D1 0x0200 -#define PCI_PM_CAP_D2 0x0400 -#define PCI_PM_CAP_PME 0x0800 -#define PCI_PM_CAP_PME_MASK 0xF800 -#define PCI_PM_CAP_PME_D0 0x0800 -#define PCI_PM_CAP_PME_D1 0x1000 -#define PCI_PM_CAP_PME_D2 0x2000 -#define PCI_PM_CAP_PME_D3 0x4000 -#define PCI_PM_CAP_PME_D3cold 0x8000 -#define PCI_PM_CTRL 4 -#define PCI_PM_CTRL_STATE_MASK 0x0003 -#define PCI_PM_CTRL_NO_SOFT_RESET 0x0004 -#define PCI_PM_CTRL_PME_ENABLE 0x0100 -#define PCI_PM_CTRL_DATA_SEL_MASK 0x1e00 -#define PCI_PM_CTRL_DATA_SCALE_MASK 0x6000 -#define PCI_PM_CTRL_PME_STATUS 0x8000 -#define PCI_PM_PPB_EXTENSIONS 6 -#define PCI_PM_PPB_B2_B3 0x40 -#define PCI_PM_BPCC_ENABLE 0x80 -#define PCI_PM_DATA_REGISTER 7 -#define PCI_PM_SIZEOF 8 - -#define PCI_AGP_VERSION 2 -#define PCI_AGP_RFU 3 -#define PCI_AGP_STATUS 4 -#define PCI_AGP_STATUS_RQ_MASK 0xff000000 -#define PCI_AGP_STATUS_SBA 0x0200 -#define PCI_AGP_STATUS_64BIT 0x0020 -#define PCI_AGP_STATUS_FW 0x0010 -#define PCI_AGP_STATUS_RATE4 0x0004 -#define PCI_AGP_STATUS_RATE2 0x0002 -#define PCI_AGP_STATUS_RATE1 0x0001 -#define PCI_AGP_COMMAND 8 -#define PCI_AGP_COMMAND_RQ_MASK 0xff000000 -#define PCI_AGP_COMMAND_SBA 0x0200 -#define PCI_AGP_COMMAND_AGP 0x0100 -#define PCI_AGP_COMMAND_64BIT 0x0020 -#define PCI_AGP_COMMAND_FW 0x0010 -#define PCI_AGP_COMMAND_RATE4 0x0004 -#define PCI_AGP_COMMAND_RATE2 0x0002 -#define PCI_AGP_COMMAND_RATE1 0x0001 -#define PCI_AGP_SIZEOF 12 - -#define PCI_VPD_ADDR 2 -#define PCI_VPD_ADDR_MASK 0x7fff -#define PCI_VPD_ADDR_F 0x8000 -#define PCI_VPD_DATA 4 - -#define PCI_SID_ESR 2 -#define PCI_SID_ESR_NSLOTS 0x1f -#define PCI_SID_ESR_FIC 0x20 -#define PCI_SID_CHASSIS_NR 3 - -#define PCI_MSI_FLAGS 2 -#define PCI_MSI_FLAGS_64BIT 0x80 -#define PCI_MSI_FLAGS_QSIZE 0x70 -#define PCI_MSI_FLAGS_QMASK 0x0e -#define PCI_MSI_FLAGS_ENABLE 0x01 -#define PCI_MSI_FLAGS_MASKBIT 0x100 -#define PCI_MSI_RFU 3 -#define PCI_MSI_ADDRESS_LO 4 -#define PCI_MSI_ADDRESS_HI 8 -#define PCI_MSI_DATA_32 8 -#define PCI_MSI_DATA_64 12 -#define PCI_MSI_MASK_BIT 16 - -#define PCI_CHSWP_CSR 2 -#define PCI_CHSWP_DHA 0x01 -#define PCI_CHSWP_EIM 0x02 -#define PCI_CHSWP_PIE 0x04 -#define PCI_CHSWP_LOO 0x08 -#define PCI_CHSWP_PI 0x30 -#define PCI_CHSWP_EXT 0x40 -#define PCI_CHSWP_INS 0x80 - -#define PCI_X_CMD 2 -#define PCI_X_CMD_DPERR_E 0x0001 -#define PCI_X_CMD_ERO 0x0002 -#define PCI_X_CMD_MAX_READ 0x000c -#define PCI_X_CMD_MAX_SPLIT 0x0070 -#define PCI_X_CMD_VERSION(x) (((x) >> 12) & 3) -#define PCI_X_STATUS 4 -#define PCI_X_STATUS_DEVFN 0x000000ff -#define PCI_X_STATUS_BUS 0x0000ff00 -#define PCI_X_STATUS_64BIT 0x00010000 -#define PCI_X_STATUS_133MHZ 0x00020000 -#define PCI_X_STATUS_SPL_DISC 0x00040000 -#define PCI_X_STATUS_UNX_SPL 0x00080000 -#define PCI_X_STATUS_COMPLEX 0x00100000 -#define PCI_X_STATUS_MAX_READ 0x00600000 -#define PCI_X_STATUS_MAX_SPLIT 0x03800000 -#define PCI_X_STATUS_MAX_CUM 0x1c000000 -#define PCI_X_STATUS_SPL_ERR 0x20000000 -#define PCI_X_STATUS_266MHZ 0x40000000 -#define PCI_X_STATUS_533MHZ 0x80000000 - -#define PCI_EXP_FLAGS 2 -#define PCI_EXP_FLAGS_VERS 0x000f -#define PCI_EXP_FLAGS_TYPE 0x00f0 -#define PCI_EXP_TYPE_ENDPOINT 0x0 -#define PCI_EXP_TYPE_LEG_END 0x1 -#define PCI_EXP_TYPE_ROOT_PORT 0x4 -#define PCI_EXP_TYPE_UPSTREAM 0x5 -#define PCI_EXP_TYPE_DOWNSTREAM 0x6 -#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 -#define PCI_EXP_FLAGS_SLOT 0x0100 -#define PCI_EXP_FLAGS_IRQ 0x3e00 -#define PCI_EXP_DEVCAP 4 -#define PCI_EXP_DEVCAP_PAYLOAD 0x07 -#define PCI_EXP_DEVCAP_PHANTOM 0x18 -#define PCI_EXP_DEVCAP_EXT_TAG 0x20 -#define PCI_EXP_DEVCAP_L0S 0x1c0 -#define PCI_EXP_DEVCAP_L1 0xe00 -#define PCI_EXP_DEVCAP_ATN_BUT 0x1000 -#define PCI_EXP_DEVCAP_ATN_IND 0x2000 -#define PCI_EXP_DEVCAP_PWR_IND 0x4000 -#define PCI_EXP_DEVCAP_PWR_VAL 0x3fc0000 -#define PCI_EXP_DEVCAP_PWR_SCL 0xc000000 -#define PCI_EXP_DEVCTL 8 -#define PCI_EXP_DEVCTL_CERE 0x0001 -#define PCI_EXP_DEVCTL_NFERE 0x0002 -#define PCI_EXP_DEVCTL_FERE 0x0004 -#define PCI_EXP_DEVCTL_URRE 0x0008 -#define PCI_EXP_DEVCTL_RELAX_EN 0x0010 -#define PCI_EXP_DEVCTL_PAYLOAD 0x00e0 -#define PCI_EXP_DEVCTL_EXT_TAG 0x0100 -#define PCI_EXP_DEVCTL_PHANTOM 0x0200 -#define PCI_EXP_DEVCTL_AUX_PME 0x0400 -#define PCI_EXP_DEVCTL_NOSNOOP_EN 0x0800 -#define PCI_EXP_DEVCTL_READRQ 0x7000 -#define PCI_EXP_DEVSTA 10 -#define PCI_EXP_DEVSTA_CED 0x01 -#define PCI_EXP_DEVSTA_NFED 0x02 -#define PCI_EXP_DEVSTA_FED 0x04 -#define PCI_EXP_DEVSTA_URD 0x08 -#define PCI_EXP_DEVSTA_AUXPD 0x10 -#define PCI_EXP_DEVSTA_TRPND 0x20 -#define PCI_EXP_LNKCAP 12 -#define PCI_EXP_LNKCTL 16 -#define PCI_EXP_LNKSTA 18 -#define PCI_EXP_SLTCAP 20 -#define PCI_EXP_SLTCTL 24 -#define PCI_EXP_SLTSTA 26 -#define PCI_EXP_RTCTL 28 -#define PCI_EXP_RTCTL_SECEE 0x01 -#define PCI_EXP_RTCTL_SENFEE 0x02 -#define PCI_EXP_RTCTL_SEFEE 0x04 -#define PCI_EXP_RTCTL_PMEIE 0x08 -#define PCI_EXP_RTCTL_CRSSVE 0x10 -#define PCI_EXP_RTCAP 30 -#define PCI_EXP_RTSTA 32 - -#define PCI_EXT_CAP_ID(header) (header & 0x0000ffff) -#define PCI_EXT_CAP_VER(header) ((header >> 16) & 0xf) -#define PCI_EXT_CAP_NEXT(header) ((header >> 20) & 0xffc) - -#define PCI_EXT_CAP_ID_ERR 1 -#define PCI_EXT_CAP_ID_VC 2 -#define PCI_EXT_CAP_ID_DSN 3 -#define PCI_EXT_CAP_ID_PWR 4 - -#define PCI_ERR_UNCOR_STATUS 4 -#define PCI_ERR_UNC_TRAIN 0x00000001 -#define PCI_ERR_UNC_DLP 0x00000010 -#define PCI_ERR_UNC_POISON_TLP 0x00001000 -#define PCI_ERR_UNC_FCP 0x00002000 -#define PCI_ERR_UNC_COMP_TIME 0x00004000 -#define PCI_ERR_UNC_COMP_ABORT 0x00008000 -#define PCI_ERR_UNC_UNX_COMP 0x00010000 -#define PCI_ERR_UNC_RX_OVER 0x00020000 -#define PCI_ERR_UNC_MALF_TLP 0x00040000 -#define PCI_ERR_UNC_ECRC 0x00080000 -#define PCI_ERR_UNC_UNSUP 0x00100000 -#define PCI_ERR_UNCOR_MASK 8 - -#define PCI_ERR_UNCOR_SEVER 12 - -#define PCI_ERR_COR_STATUS 16 -#define PCI_ERR_COR_RCVR 0x00000001 -#define PCI_ERR_COR_BAD_TLP 0x00000040 -#define PCI_ERR_COR_BAD_DLLP 0x00000080 -#define PCI_ERR_COR_REP_ROLL 0x00000100 -#define PCI_ERR_COR_REP_TIMER 0x00001000 -#define PCI_ERR_COR_MASK 20 - -#define PCI_ERR_CAP 24 -#define PCI_ERR_CAP_FEP(x) ((x) & 31) -#define PCI_ERR_CAP_ECRC_GENC 0x00000020 -#define PCI_ERR_CAP_ECRC_GENE 0x00000040 -#define PCI_ERR_CAP_ECRC_CHKC 0x00000080 -#define PCI_ERR_CAP_ECRC_CHKE 0x00000100 -#define PCI_ERR_HEADER_LOG 28 -#define PCI_ERR_ROOT_COMMAND 44 - -#define PCI_ERR_ROOT_CMD_COR_EN 0x00000001 - -#define PCI_ERR_ROOT_CMD_NONFATAL_EN 0x00000002 - -#define PCI_ERR_ROOT_CMD_FATAL_EN 0x00000004 -#define PCI_ERR_ROOT_STATUS 48 -#define PCI_ERR_ROOT_COR_RCV 0x00000001 - -#define PCI_ERR_ROOT_MULTI_COR_RCV 0x00000002 - -#define PCI_ERR_ROOT_UNCOR_RCV 0x00000004 - -#define PCI_ERR_ROOT_MULTI_UNCOR_RCV 0x00000008 -#define PCI_ERR_ROOT_FIRST_FATAL 0x00000010 -#define PCI_ERR_ROOT_NONFATAL_RCV 0x00000020 -#define PCI_ERR_ROOT_FATAL_RCV 0x00000040 -#define PCI_ERR_ROOT_COR_SRC 52 -#define PCI_ERR_ROOT_SRC 54 - -#define PCI_VC_PORT_REG1 4 -#define PCI_VC_PORT_REG2 8 -#define PCI_VC_PORT_CTRL 12 -#define PCI_VC_PORT_STATUS 14 -#define PCI_VC_RES_CAP 16 -#define PCI_VC_RES_CTRL 20 -#define PCI_VC_RES_STATUS 26 - -#define PCI_PWR_DSR 4 -#define PCI_PWR_DATA 8 -#define PCI_PWR_DATA_BASE(x) ((x) & 0xff) -#define PCI_PWR_DATA_SCALE(x) (((x) >> 8) & 3) -#define PCI_PWR_DATA_PM_SUB(x) (((x) >> 10) & 7) -#define PCI_PWR_DATA_PM_STATE(x) (((x) >> 13) & 3) -#define PCI_PWR_DATA_TYPE(x) (((x) >> 15) & 7) -#define PCI_PWR_DATA_RAIL(x) (((x) >> 18) & 7) -#define PCI_PWR_CAP 12 -#define PCI_PWR_CAP_BUDGET(x) ((x) & 1) - -#endif diff --git a/libc/kernel/common/linux/percpu.h b/libc/kernel/common/linux/percpu.h deleted file mode 100644 index c19561662..000000000 --- a/libc/kernel/common/linux/percpu.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_PERCPU_H -#define __LINUX_PERCPU_H -#include -#include -#include -#include -#include - -#ifndef PERCPU_ENOUGH_ROOM -#define PERCPU_ENOUGH_ROOM 32768 -#endif - -#define get_cpu_var(var) (*({ preempt_disable(); &__get_cpu_var(var); })) -#define put_cpu_var(var) preempt_enable() - -#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); }) - -#define alloc_percpu(type) ((type *)(__alloc_percpu(sizeof(type)))) -#endif diff --git a/libc/kernel/common/linux/percpu_counter.h b/libc/kernel/common/linux/percpu_counter.h deleted file mode 100644 index 112375c31..000000000 --- a/libc/kernel/common/linux/percpu_counter.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PERCPU_COUNTER_H -#define _LINUX_PERCPU_COUNTER_H - -#include -#include -#include -#include -#include - -struct percpu_counter { - s64 count; -}; - -#endif diff --git a/libc/kernel/common/linux/personality.h b/libc/kernel/common/linux/personality.h deleted file mode 100644 index 1f84b4e92..000000000 --- a/libc/kernel/common/linux/personality.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PERSONALITY_H -#define _LINUX_PERSONALITY_H - -struct exec_domain; -struct pt_regs; - -enum { - ADDR_NO_RANDOMIZE = 0x0040000, - FDPIC_FUNCPTRS = 0x0080000, - MMAP_PAGE_ZERO = 0x0100000, - ADDR_COMPAT_LAYOUT = 0x0200000, - READ_IMPLIES_EXEC = 0x0400000, - ADDR_LIMIT_32BIT = 0x0800000, - SHORT_INODE = 0x1000000, - WHOLE_SECONDS = 0x2000000, - STICKY_TIMEOUTS = 0x4000000, - ADDR_LIMIT_3GB = 0x8000000, -}; - -#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE) - -enum { - PER_LINUX = 0x0000, - PER_LINUX_32BIT = 0x0000 | ADDR_LIMIT_32BIT, - PER_LINUX_FDPIC = 0x0000 | FDPIC_FUNCPTRS, - PER_SVR4 = 0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO, - PER_SVR3 = 0x0002 | STICKY_TIMEOUTS | SHORT_INODE, - PER_SCOSVR3 = 0x0003 | STICKY_TIMEOUTS | - WHOLE_SECONDS | SHORT_INODE, - PER_OSR5 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS, - PER_WYSEV386 = 0x0004 | STICKY_TIMEOUTS | SHORT_INODE, - PER_ISCR4 = 0x0005 | STICKY_TIMEOUTS, - PER_BSD = 0x0006, - PER_SUNOS = 0x0006 | STICKY_TIMEOUTS, - PER_XENIX = 0x0007 | STICKY_TIMEOUTS | SHORT_INODE, - PER_LINUX32 = 0x0008, - PER_LINUX32_3GB = 0x0008 | ADDR_LIMIT_3GB, - PER_IRIX32 = 0x0009 | STICKY_TIMEOUTS, - PER_IRIXN32 = 0x000a | STICKY_TIMEOUTS, - PER_IRIX64 = 0x000b | STICKY_TIMEOUTS, - PER_RISCOS = 0x000c, - PER_SOLARIS = 0x000d | STICKY_TIMEOUTS, - PER_UW7 = 0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO, - PER_OSF4 = 0x000f, - PER_HPUX = 0x0010, - PER_MASK = 0x00ff, -}; - -typedef void (*handler_t)(int, struct pt_regs *); - -struct exec_domain { - const char *name; - handler_t handler; - unsigned char pers_low; - unsigned char pers_high; - unsigned long *signal_map; - unsigned long *signal_invmap; - struct map_segment *err_map; - struct map_segment *socktype_map; - struct map_segment *sockopt_map; - struct map_segment *af_map; - struct module *module; - struct exec_domain *next; -}; - -#define personality(pers) (pers & PER_MASK) - -#define get_personality (current->personality) - -#define set_personality(pers) ((current->personality == pers) ? 0 : __set_personality(pers)) - -#endif diff --git a/libc/kernel/common/linux/pfkeyv2.h b/libc/kernel/common/linux/pfkeyv2.h deleted file mode 100644 index 3ac9488da..000000000 --- a/libc/kernel/common/linux/pfkeyv2.h +++ /dev/null @@ -1,306 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PFKEY2_H -#define _LINUX_PFKEY2_H - -#include - -#define PF_KEY_V2 2 -#define PFKEYV2_REVISION 199806L - -struct sadb_msg { - uint8_t sadb_msg_version; - uint8_t sadb_msg_type; - uint8_t sadb_msg_errno; - uint8_t sadb_msg_satype; - uint16_t sadb_msg_len; - uint16_t sadb_msg_reserved; - uint32_t sadb_msg_seq; - uint32_t sadb_msg_pid; -} __attribute__((packed)); - -struct sadb_ext { - uint16_t sadb_ext_len; - uint16_t sadb_ext_type; -} __attribute__((packed)); - -struct sadb_sa { - uint16_t sadb_sa_len; - uint16_t sadb_sa_exttype; - uint32_t sadb_sa_spi; - uint8_t sadb_sa_replay; - uint8_t sadb_sa_state; - uint8_t sadb_sa_auth; - uint8_t sadb_sa_encrypt; - uint32_t sadb_sa_flags; -} __attribute__((packed)); - -struct sadb_lifetime { - uint16_t sadb_lifetime_len; - uint16_t sadb_lifetime_exttype; - uint32_t sadb_lifetime_allocations; - uint64_t sadb_lifetime_bytes; - uint64_t sadb_lifetime_addtime; - uint64_t sadb_lifetime_usetime; -} __attribute__((packed)); - -struct sadb_address { - uint16_t sadb_address_len; - uint16_t sadb_address_exttype; - uint8_t sadb_address_proto; - uint8_t sadb_address_prefixlen; - uint16_t sadb_address_reserved; -} __attribute__((packed)); - -struct sadb_key { - uint16_t sadb_key_len; - uint16_t sadb_key_exttype; - uint16_t sadb_key_bits; - uint16_t sadb_key_reserved; -} __attribute__((packed)); - -struct sadb_ident { - uint16_t sadb_ident_len; - uint16_t sadb_ident_exttype; - uint16_t sadb_ident_type; - uint16_t sadb_ident_reserved; - uint64_t sadb_ident_id; -} __attribute__((packed)); - -struct sadb_sens { - uint16_t sadb_sens_len; - uint16_t sadb_sens_exttype; - uint32_t sadb_sens_dpd; - uint8_t sadb_sens_sens_level; - uint8_t sadb_sens_sens_len; - uint8_t sadb_sens_integ_level; - uint8_t sadb_sens_integ_len; - uint32_t sadb_sens_reserved; -} __attribute__((packed)); - -struct sadb_prop { - uint16_t sadb_prop_len; - uint16_t sadb_prop_exttype; - uint8_t sadb_prop_replay; - uint8_t sadb_prop_reserved[3]; -} __attribute__((packed)); - -struct sadb_comb { - uint8_t sadb_comb_auth; - uint8_t sadb_comb_encrypt; - uint16_t sadb_comb_flags; - uint16_t sadb_comb_auth_minbits; - uint16_t sadb_comb_auth_maxbits; - uint16_t sadb_comb_encrypt_minbits; - uint16_t sadb_comb_encrypt_maxbits; - uint32_t sadb_comb_reserved; - uint32_t sadb_comb_soft_allocations; - uint32_t sadb_comb_hard_allocations; - uint64_t sadb_comb_soft_bytes; - uint64_t sadb_comb_hard_bytes; - uint64_t sadb_comb_soft_addtime; - uint64_t sadb_comb_hard_addtime; - uint64_t sadb_comb_soft_usetime; - uint64_t sadb_comb_hard_usetime; -} __attribute__((packed)); - -struct sadb_supported { - uint16_t sadb_supported_len; - uint16_t sadb_supported_exttype; - uint32_t sadb_supported_reserved; -} __attribute__((packed)); - -struct sadb_alg { - uint8_t sadb_alg_id; - uint8_t sadb_alg_ivlen; - uint16_t sadb_alg_minbits; - uint16_t sadb_alg_maxbits; - uint16_t sadb_alg_reserved; -} __attribute__((packed)); - -struct sadb_spirange { - uint16_t sadb_spirange_len; - uint16_t sadb_spirange_exttype; - uint32_t sadb_spirange_min; - uint32_t sadb_spirange_max; - uint32_t sadb_spirange_reserved; -} __attribute__((packed)); - -struct sadb_x_kmprivate { - uint16_t sadb_x_kmprivate_len; - uint16_t sadb_x_kmprivate_exttype; - uint32_t sadb_x_kmprivate_reserved; -} __attribute__((packed)); - -struct sadb_x_sa2 { - uint16_t sadb_x_sa2_len; - uint16_t sadb_x_sa2_exttype; - uint8_t sadb_x_sa2_mode; - uint8_t sadb_x_sa2_reserved1; - uint16_t sadb_x_sa2_reserved2; - uint32_t sadb_x_sa2_sequence; - uint32_t sadb_x_sa2_reqid; -} __attribute__((packed)); - -struct sadb_x_policy { - uint16_t sadb_x_policy_len; - uint16_t sadb_x_policy_exttype; - uint16_t sadb_x_policy_type; - uint8_t sadb_x_policy_dir; - uint8_t sadb_x_policy_reserved; - uint32_t sadb_x_policy_id; - uint32_t sadb_x_policy_priority; -} __attribute__((packed)); - -struct sadb_x_ipsecrequest { - uint16_t sadb_x_ipsecrequest_len; - uint16_t sadb_x_ipsecrequest_proto; - uint8_t sadb_x_ipsecrequest_mode; - uint8_t sadb_x_ipsecrequest_level; - uint16_t sadb_x_ipsecrequest_reserved1; - uint32_t sadb_x_ipsecrequest_reqid; - uint32_t sadb_x_ipsecrequest_reserved2; -} __attribute__((packed)); - -struct sadb_x_nat_t_type { - uint16_t sadb_x_nat_t_type_len; - uint16_t sadb_x_nat_t_type_exttype; - uint8_t sadb_x_nat_t_type_type; - uint8_t sadb_x_nat_t_type_reserved[3]; -} __attribute__((packed)); - -struct sadb_x_nat_t_port { - uint16_t sadb_x_nat_t_port_len; - uint16_t sadb_x_nat_t_port_exttype; - uint16_t sadb_x_nat_t_port_port; - uint16_t sadb_x_nat_t_port_reserved; -} __attribute__((packed)); - -struct sadb_x_sec_ctx { - uint16_t sadb_x_sec_len; - uint16_t sadb_x_sec_exttype; - uint8_t sadb_x_ctx_alg; - uint8_t sadb_x_ctx_doi; - uint16_t sadb_x_ctx_len; -} __attribute__((packed)); - -#define SADB_RESERVED 0 -#define SADB_GETSPI 1 -#define SADB_UPDATE 2 -#define SADB_ADD 3 -#define SADB_DELETE 4 -#define SADB_GET 5 -#define SADB_ACQUIRE 6 -#define SADB_REGISTER 7 -#define SADB_EXPIRE 8 -#define SADB_FLUSH 9 -#define SADB_DUMP 10 -#define SADB_X_PROMISC 11 -#define SADB_X_PCHANGE 12 -#define SADB_X_SPDUPDATE 13 -#define SADB_X_SPDADD 14 -#define SADB_X_SPDDELETE 15 -#define SADB_X_SPDGET 16 -#define SADB_X_SPDACQUIRE 17 -#define SADB_X_SPDDUMP 18 -#define SADB_X_SPDFLUSH 19 -#define SADB_X_SPDSETIDX 20 -#define SADB_X_SPDEXPIRE 21 -#define SADB_X_SPDDELETE2 22 -#define SADB_X_NAT_T_NEW_MAPPING 23 -#define SADB_MAX 23 - -#define SADB_SAFLAGS_PFS 1 -#define SADB_SAFLAGS_NOPMTUDISC 0x20000000 -#define SADB_SAFLAGS_DECAP_DSCP 0x40000000 -#define SADB_SAFLAGS_NOECN 0x80000000 - -#define SADB_SASTATE_LARVAL 0 -#define SADB_SASTATE_MATURE 1 -#define SADB_SASTATE_DYING 2 -#define SADB_SASTATE_DEAD 3 -#define SADB_SASTATE_MAX 3 - -#define SADB_SATYPE_UNSPEC 0 -#define SADB_SATYPE_AH 2 -#define SADB_SATYPE_ESP 3 -#define SADB_SATYPE_RSVP 5 -#define SADB_SATYPE_OSPFV2 6 -#define SADB_SATYPE_RIPV2 7 -#define SADB_SATYPE_MIP 8 -#define SADB_X_SATYPE_IPCOMP 9 -#define SADB_SATYPE_MAX 9 - -#define SADB_AALG_NONE 0 -#define SADB_AALG_MD5HMAC 2 -#define SADB_AALG_SHA1HMAC 3 -#define SADB_X_AALG_SHA2_256HMAC 5 -#define SADB_X_AALG_SHA2_384HMAC 6 -#define SADB_X_AALG_SHA2_512HMAC 7 -#define SADB_X_AALG_RIPEMD160HMAC 8 -#define SADB_X_AALG_NULL 251 -#define SADB_AALG_MAX 251 - -#define SADB_EALG_NONE 0 -#define SADB_EALG_DESCBC 2 -#define SADB_EALG_3DESCBC 3 -#define SADB_X_EALG_CASTCBC 6 -#define SADB_X_EALG_BLOWFISHCBC 7 -#define SADB_EALG_NULL 11 -#define SADB_X_EALG_AESCBC 12 -#define SADB_EALG_MAX 253 - -#define SADB_X_EALG_SERPENTCBC 252 -#define SADB_X_EALG_TWOFISHCBC 253 - -#define SADB_X_CALG_NONE 0 -#define SADB_X_CALG_OUI 1 -#define SADB_X_CALG_DEFLATE 2 -#define SADB_X_CALG_LZS 3 -#define SADB_X_CALG_LZJH 4 -#define SADB_X_CALG_MAX 4 - -#define SADB_EXT_RESERVED 0 -#define SADB_EXT_SA 1 -#define SADB_EXT_LIFETIME_CURRENT 2 -#define SADB_EXT_LIFETIME_HARD 3 -#define SADB_EXT_LIFETIME_SOFT 4 -#define SADB_EXT_ADDRESS_SRC 5 -#define SADB_EXT_ADDRESS_DST 6 -#define SADB_EXT_ADDRESS_PROXY 7 -#define SADB_EXT_KEY_AUTH 8 -#define SADB_EXT_KEY_ENCRYPT 9 -#define SADB_EXT_IDENTITY_SRC 10 -#define SADB_EXT_IDENTITY_DST 11 -#define SADB_EXT_SENSITIVITY 12 -#define SADB_EXT_PROPOSAL 13 -#define SADB_EXT_SUPPORTED_AUTH 14 -#define SADB_EXT_SUPPORTED_ENCRYPT 15 -#define SADB_EXT_SPIRANGE 16 -#define SADB_X_EXT_KMPRIVATE 17 -#define SADB_X_EXT_POLICY 18 -#define SADB_X_EXT_SA2 19 - -#define SADB_X_EXT_NAT_T_TYPE 20 -#define SADB_X_EXT_NAT_T_SPORT 21 -#define SADB_X_EXT_NAT_T_DPORT 22 -#define SADB_X_EXT_NAT_T_OA 23 -#define SADB_X_EXT_SEC_CTX 24 -#define SADB_EXT_MAX 24 - -#define SADB_IDENTTYPE_RESERVED 0 -#define SADB_IDENTTYPE_PREFIX 1 -#define SADB_IDENTTYPE_FQDN 2 -#define SADB_IDENTTYPE_USERFQDN 3 -#define SADB_IDENTTYPE_MAX 3 - -#endif diff --git a/libc/kernel/common/linux/pkt_cls.h b/libc/kernel/common/linux/pkt_cls.h deleted file mode 100644 index 601a683da..000000000 --- a/libc/kernel/common/linux/pkt_cls.h +++ /dev/null @@ -1,372 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_PKT_CLS_H -#define __LINUX_PKT_CLS_H - -#include - -#define _TC_MAKE32(x) ((x)) - -#define _TC_MAKEMASK1(n) (_TC_MAKE32(1) << _TC_MAKE32(n)) -#define _TC_MAKEMASK(v,n) (_TC_MAKE32((_TC_MAKE32(1)<<(v))-1) << _TC_MAKE32(n)) -#define _TC_MAKEVALUE(v,n) (_TC_MAKE32(v) << _TC_MAKE32(n)) -#define _TC_GETVALUE(v,n,m) ((_TC_MAKE32(v) & _TC_MAKE32(m)) >> _TC_MAKE32(n)) - -#define TC_MUNGED _TC_MAKEMASK1(0) -#define SET_TC_MUNGED(v) ( TC_MUNGED | (v & ~TC_MUNGED)) -#define CLR_TC_MUNGED(v) ( v & ~TC_MUNGED) - -#define TC_OK2MUNGE _TC_MAKEMASK1(1) -#define SET_TC_OK2MUNGE(v) ( TC_OK2MUNGE | (v & ~TC_OK2MUNGE)) -#define CLR_TC_OK2MUNGE(v) ( v & ~TC_OK2MUNGE) - -#define S_TC_VERD _TC_MAKE32(2) -#define M_TC_VERD _TC_MAKEMASK(4,S_TC_VERD) -#define G_TC_VERD(x) _TC_GETVALUE(x,S_TC_VERD,M_TC_VERD) -#define V_TC_VERD(x) _TC_MAKEVALUE(x,S_TC_VERD) -#define SET_TC_VERD(v,n) ((V_TC_VERD(n)) | (v & ~M_TC_VERD)) - -#define S_TC_FROM _TC_MAKE32(6) -#define M_TC_FROM _TC_MAKEMASK(2,S_TC_FROM) -#define G_TC_FROM(x) _TC_GETVALUE(x,S_TC_FROM,M_TC_FROM) -#define V_TC_FROM(x) _TC_MAKEVALUE(x,S_TC_FROM) -#define SET_TC_FROM(v,n) ((V_TC_FROM(n)) | (v & ~M_TC_FROM)) -#define AT_STACK 0x0 -#define AT_INGRESS 0x1 -#define AT_EGRESS 0x2 - -#define TC_NCLS _TC_MAKEMASK1(8) -#define SET_TC_NCLS(v) ( TC_NCLS | (v & ~TC_NCLS)) -#define CLR_TC_NCLS(v) ( v & ~TC_NCLS) - -#define S_TC_RTTL _TC_MAKE32(9) -#define M_TC_RTTL _TC_MAKEMASK(3,S_TC_RTTL) -#define G_TC_RTTL(x) _TC_GETVALUE(x,S_TC_RTTL,M_TC_RTTL) -#define V_TC_RTTL(x) _TC_MAKEVALUE(x,S_TC_RTTL) -#define SET_TC_RTTL(v,n) ((V_TC_RTTL(n)) | (v & ~M_TC_RTTL)) - -#define S_TC_AT _TC_MAKE32(12) -#define M_TC_AT _TC_MAKEMASK(2,S_TC_AT) -#define G_TC_AT(x) _TC_GETVALUE(x,S_TC_AT,M_TC_AT) -#define V_TC_AT(x) _TC_MAKEVALUE(x,S_TC_AT) -#define SET_TC_AT(v,n) ((V_TC_AT(n)) | (v & ~M_TC_AT)) - -enum -{ - TCA_ACT_UNSPEC, - TCA_ACT_KIND, - TCA_ACT_OPTIONS, - TCA_ACT_INDEX, - TCA_ACT_STATS, - __TCA_ACT_MAX -}; - -#define TCA_ACT_MAX __TCA_ACT_MAX -#define TCA_OLD_COMPAT (TCA_ACT_MAX+1) -#define TCA_ACT_MAX_PRIO 32 -#define TCA_ACT_BIND 1 -#define TCA_ACT_NOBIND 0 -#define TCA_ACT_UNBIND 1 -#define TCA_ACT_NOUNBIND 0 -#define TCA_ACT_REPLACE 1 -#define TCA_ACT_NOREPLACE 0 -#define MAX_REC_LOOP 4 -#define MAX_RED_LOOP 4 - -#define TC_ACT_UNSPEC (-1) -#define TC_ACT_OK 0 -#define TC_ACT_RECLASSIFY 1 -#define TC_ACT_SHOT 2 -#define TC_ACT_PIPE 3 -#define TC_ACT_STOLEN 4 -#define TC_ACT_QUEUED 5 -#define TC_ACT_REPEAT 6 -#define TC_ACT_JUMP 0x10000000 - -enum -{ - TCA_ID_UNSPEC=0, - TCA_ID_POLICE=1, - - __TCA_ID_MAX=255 -}; - -#define TCA_ID_MAX __TCA_ID_MAX - -struct tc_police -{ - __u32 index; - int action; -#define TC_POLICE_UNSPEC TC_ACT_UNSPEC -#define TC_POLICE_OK TC_ACT_OK -#define TC_POLICE_RECLASSIFY TC_ACT_RECLASSIFY -#define TC_POLICE_SHOT TC_ACT_SHOT -#define TC_POLICE_PIPE TC_ACT_PIPE - - __u32 limit; - __u32 burst; - __u32 mtu; - struct tc_ratespec rate; - struct tc_ratespec peakrate; - int refcnt; - int bindcnt; - __u32 capab; -}; - -struct tcf_t -{ - __u64 install; - __u64 lastuse; - __u64 expires; -}; - -struct tc_cnt -{ - int refcnt; - int bindcnt; -}; - -#define tc_gen __u32 index; __u32 capab; int action; int refcnt; int bindcnt - -enum -{ - TCA_POLICE_UNSPEC, - TCA_POLICE_TBF, - TCA_POLICE_RATE, - TCA_POLICE_PEAKRATE, - TCA_POLICE_AVRATE, - TCA_POLICE_RESULT, - __TCA_POLICE_MAX -#define TCA_POLICE_RESULT TCA_POLICE_RESULT -}; - -#define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1) - -#define TC_U32_HTID(h) ((h)&0xFFF00000) -#define TC_U32_USERHTID(h) (TC_U32_HTID(h)>>20) -#define TC_U32_HASH(h) (((h)>>12)&0xFF) -#define TC_U32_NODE(h) ((h)&0xFFF) -#define TC_U32_KEY(h) ((h)&0xFFFFF) -#define TC_U32_UNSPEC 0 -#define TC_U32_ROOT (0xFFF00000) - -enum -{ - TCA_U32_UNSPEC, - TCA_U32_CLASSID, - TCA_U32_HASH, - TCA_U32_LINK, - TCA_U32_DIVISOR, - TCA_U32_SEL, - TCA_U32_POLICE, - TCA_U32_ACT, - TCA_U32_INDEV, - TCA_U32_PCNT, - TCA_U32_MARK, - __TCA_U32_MAX -}; - -#define TCA_U32_MAX (__TCA_U32_MAX - 1) - -struct tc_u32_key -{ - __u32 mask; - __u32 val; - int off; - int offmask; -}; - -struct tc_u32_sel -{ - unsigned char flags; - unsigned char offshift; - unsigned char nkeys; - - __u16 offmask; - __u16 off; - short offoff; - - short hoff; - __u32 hmask; - struct tc_u32_key keys[0]; -}; - -struct tc_u32_mark -{ - __u32 val; - __u32 mask; - __u32 success; -}; - -struct tc_u32_pcnt -{ - __u64 rcnt; - __u64 rhit; - __u64 kcnts[0]; -}; - -#define TC_U32_TERMINAL 1 -#define TC_U32_OFFSET 2 -#define TC_U32_VAROFFSET 4 -#define TC_U32_EAT 8 - -#define TC_U32_MAXDEPTH 8 - -enum -{ - TCA_RSVP_UNSPEC, - TCA_RSVP_CLASSID, - TCA_RSVP_DST, - TCA_RSVP_SRC, - TCA_RSVP_PINFO, - TCA_RSVP_POLICE, - TCA_RSVP_ACT, - __TCA_RSVP_MAX -}; - -#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 ) - -struct tc_rsvp_gpi -{ - __u32 key; - __u32 mask; - int offset; -}; - -struct tc_rsvp_pinfo -{ - struct tc_rsvp_gpi dpi; - struct tc_rsvp_gpi spi; - __u8 protocol; - __u8 tunnelid; - __u8 tunnelhdr; - __u8 pad; -}; - -enum -{ - TCA_ROUTE4_UNSPEC, - TCA_ROUTE4_CLASSID, - TCA_ROUTE4_TO, - TCA_ROUTE4_FROM, - TCA_ROUTE4_IIF, - TCA_ROUTE4_POLICE, - TCA_ROUTE4_ACT, - __TCA_ROUTE4_MAX -}; - -#define TCA_ROUTE4_MAX (__TCA_ROUTE4_MAX - 1) - -enum -{ - TCA_FW_UNSPEC, - TCA_FW_CLASSID, - TCA_FW_POLICE, - TCA_FW_INDEV, - TCA_FW_ACT, - __TCA_FW_MAX -}; - -#define TCA_FW_MAX (__TCA_FW_MAX - 1) - -enum -{ - TCA_TCINDEX_UNSPEC, - TCA_TCINDEX_HASH, - TCA_TCINDEX_MASK, - TCA_TCINDEX_SHIFT, - TCA_TCINDEX_FALL_THROUGH, - TCA_TCINDEX_CLASSID, - TCA_TCINDEX_POLICE, - TCA_TCINDEX_ACT, - __TCA_TCINDEX_MAX -}; - -#define TCA_TCINDEX_MAX (__TCA_TCINDEX_MAX - 1) - -enum -{ - TCA_BASIC_UNSPEC, - TCA_BASIC_CLASSID, - TCA_BASIC_EMATCHES, - TCA_BASIC_ACT, - TCA_BASIC_POLICE, - __TCA_BASIC_MAX -}; - -#define TCA_BASIC_MAX (__TCA_BASIC_MAX - 1) - -struct tcf_ematch_tree_hdr -{ - __u16 nmatches; - __u16 progid; -}; - -enum -{ - TCA_EMATCH_TREE_UNSPEC, - TCA_EMATCH_TREE_HDR, - TCA_EMATCH_TREE_LIST, - __TCA_EMATCH_TREE_MAX -}; -#define TCA_EMATCH_TREE_MAX (__TCA_EMATCH_TREE_MAX - 1) - -struct tcf_ematch_hdr -{ - __u16 matchid; - __u16 kind; - __u16 flags; - __u16 pad; -}; - -#define TCF_EM_REL_END 0 -#define TCF_EM_REL_AND (1<<0) -#define TCF_EM_REL_OR (1<<1) -#define TCF_EM_INVERT (1<<2) -#define TCF_EM_SIMPLE (1<<3) - -#define TCF_EM_REL_MASK 3 -#define TCF_EM_REL_VALID(v) (((v) & TCF_EM_REL_MASK) != TCF_EM_REL_MASK) - -enum -{ - TCF_LAYER_LINK, - TCF_LAYER_NETWORK, - TCF_LAYER_TRANSPORT, - __TCF_LAYER_MAX -}; -#define TCF_LAYER_MAX (__TCF_LAYER_MAX - 1) - -enum -{ - TCF_EM_CONTAINER, - TCF_EM_CMP, - TCF_EM_NBYTE, - TCF_EM_U32, - TCF_EM_META, - TCF_EM_TEXT, - __TCF_EM_MAX -}; - -enum -{ - TCF_EM_PROG_TC -}; - -enum -{ - TCF_EM_OPND_EQ, - TCF_EM_OPND_GT, - TCF_EM_OPND_LT -}; - -#endif diff --git a/libc/kernel/common/linux/pkt_sched.h b/libc/kernel/common/linux/pkt_sched.h deleted file mode 100644 index 1e15d830f..000000000 --- a/libc/kernel/common/linux/pkt_sched.h +++ /dev/null @@ -1,405 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_PKT_SCHED_H -#define __LINUX_PKT_SCHED_H - -#define TC_PRIO_BESTEFFORT 0 -#define TC_PRIO_FILLER 1 -#define TC_PRIO_BULK 2 -#define TC_PRIO_INTERACTIVE_BULK 4 -#define TC_PRIO_INTERACTIVE 6 -#define TC_PRIO_CONTROL 7 - -#define TC_PRIO_MAX 15 - -struct tc_stats -{ - __u64 bytes; - __u32 packets; - __u32 drops; - __u32 overlimits; - __u32 bps; - __u32 pps; - __u32 qlen; - __u32 backlog; -}; - -struct tc_estimator -{ - signed char interval; - unsigned char ewma_log; -}; - -#define TC_H_MAJ_MASK (0xFFFF0000U) -#define TC_H_MIN_MASK (0x0000FFFFU) -#define TC_H_MAJ(h) ((h)&TC_H_MAJ_MASK) -#define TC_H_MIN(h) ((h)&TC_H_MIN_MASK) -#define TC_H_MAKE(maj,min) (((maj)&TC_H_MAJ_MASK)|((min)&TC_H_MIN_MASK)) - -#define TC_H_UNSPEC (0U) -#define TC_H_ROOT (0xFFFFFFFFU) -#define TC_H_INGRESS (0xFFFFFFF1U) - -struct tc_ratespec -{ - unsigned char cell_log; - unsigned char __reserved; - unsigned short feature; - short addend; - unsigned short mpu; - __u32 rate; -}; - -struct tc_fifo_qopt -{ - __u32 limit; -}; - -#define TCQ_PRIO_BANDS 16 -#define TCQ_MIN_PRIO_BANDS 2 - -struct tc_prio_qopt -{ - int bands; - __u8 priomap[TC_PRIO_MAX+1]; -}; - -struct tc_tbf_qopt -{ - struct tc_ratespec rate; - struct tc_ratespec peakrate; - __u32 limit; - __u32 buffer; - __u32 mtu; -}; - -enum -{ - TCA_TBF_UNSPEC, - TCA_TBF_PARMS, - TCA_TBF_RTAB, - TCA_TBF_PTAB, - __TCA_TBF_MAX, -}; - -#define TCA_TBF_MAX (__TCA_TBF_MAX - 1) - -struct tc_sfq_qopt -{ - unsigned quantum; - int perturb_period; - __u32 limit; - unsigned divisor; - unsigned flows; -}; - -enum -{ - TCA_RED_UNSPEC, - TCA_RED_PARMS, - TCA_RED_STAB, - __TCA_RED_MAX, -}; - -#define TCA_RED_MAX (__TCA_RED_MAX - 1) - -struct tc_red_qopt -{ - __u32 limit; - __u32 qth_min; - __u32 qth_max; - unsigned char Wlog; - unsigned char Plog; - unsigned char Scell_log; - unsigned char flags; -#define TC_RED_ECN 1 -#define TC_RED_HARDDROP 2 -}; - -struct tc_red_xstats -{ - __u32 early; - __u32 pdrop; - __u32 other; - __u32 marked; -}; - -#define MAX_DPs 16 - -enum -{ - TCA_GRED_UNSPEC, - TCA_GRED_PARMS, - TCA_GRED_STAB, - TCA_GRED_DPS, - __TCA_GRED_MAX, -}; - -#define TCA_GRED_MAX (__TCA_GRED_MAX - 1) - -struct tc_gred_qopt -{ - __u32 limit; - __u32 qth_min; - __u32 qth_max; - __u32 DP; - __u32 backlog; - __u32 qave; - __u32 forced; - __u32 early; - __u32 other; - __u32 pdrop; - __u8 Wlog; - __u8 Plog; - __u8 Scell_log; - __u8 prio; - __u32 packets; - __u32 bytesin; -}; - -struct tc_gred_sopt -{ - __u32 DPs; - __u32 def_DP; - __u8 grio; - __u8 flags; - __u16 pad1; -}; - -#define TC_HTB_NUMPRIO 8 -#define TC_HTB_MAXDEPTH 8 -#define TC_HTB_PROTOVER 3 - -struct tc_htb_opt -{ - struct tc_ratespec rate; - struct tc_ratespec ceil; - __u32 buffer; - __u32 cbuffer; - __u32 quantum; - __u32 level; - __u32 prio; -}; -struct tc_htb_glob -{ - __u32 version; - __u32 rate2quantum; - __u32 defcls; - __u32 debug; - - __u32 direct_pkts; -}; -enum -{ - TCA_HTB_UNSPEC, - TCA_HTB_PARMS, - TCA_HTB_INIT, - TCA_HTB_CTAB, - TCA_HTB_RTAB, - __TCA_HTB_MAX, -}; - -#define TCA_HTB_MAX (__TCA_HTB_MAX - 1) - -struct tc_htb_xstats -{ - __u32 lends; - __u32 borrows; - __u32 giants; - __u32 tokens; - __u32 ctokens; -}; - -struct tc_hfsc_qopt -{ - __u16 defcls; -}; - -struct tc_service_curve -{ - __u32 m1; - __u32 d; - __u32 m2; -}; - -struct tc_hfsc_stats -{ - __u64 work; - __u64 rtwork; - __u32 period; - __u32 level; -}; - -enum -{ - TCA_HFSC_UNSPEC, - TCA_HFSC_RSC, - TCA_HFSC_FSC, - TCA_HFSC_USC, - __TCA_HFSC_MAX, -}; - -#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1) - -#define TC_CBQ_MAXPRIO 8 -#define TC_CBQ_MAXLEVEL 8 -#define TC_CBQ_DEF_EWMA 5 - -struct tc_cbq_lssopt -{ - unsigned char change; - unsigned char flags; -#define TCF_CBQ_LSS_BOUNDED 1 -#define TCF_CBQ_LSS_ISOLATED 2 - unsigned char ewma_log; - unsigned char level; -#define TCF_CBQ_LSS_FLAGS 1 -#define TCF_CBQ_LSS_EWMA 2 -#define TCF_CBQ_LSS_MAXIDLE 4 -#define TCF_CBQ_LSS_MINIDLE 8 -#define TCF_CBQ_LSS_OFFTIME 0x10 -#define TCF_CBQ_LSS_AVPKT 0x20 - __u32 maxidle; - __u32 minidle; - __u32 offtime; - __u32 avpkt; -}; - -struct tc_cbq_wrropt -{ - unsigned char flags; - unsigned char priority; - unsigned char cpriority; - unsigned char __reserved; - __u32 allot; - __u32 weight; -}; - -struct tc_cbq_ovl -{ - unsigned char strategy; -#define TC_CBQ_OVL_CLASSIC 0 -#define TC_CBQ_OVL_DELAY 1 -#define TC_CBQ_OVL_LOWPRIO 2 -#define TC_CBQ_OVL_DROP 3 -#define TC_CBQ_OVL_RCLASSIC 4 - unsigned char priority2; - __u16 pad; - __u32 penalty; -}; - -struct tc_cbq_police -{ - unsigned char police; - unsigned char __res1; - unsigned short __res2; -}; - -struct tc_cbq_fopt -{ - __u32 split; - __u32 defmap; - __u32 defchange; -}; - -struct tc_cbq_xstats -{ - __u32 borrows; - __u32 overactions; - __s32 avgidle; - __s32 undertime; -}; - -enum -{ - TCA_CBQ_UNSPEC, - TCA_CBQ_LSSOPT, - TCA_CBQ_WRROPT, - TCA_CBQ_FOPT, - TCA_CBQ_OVL_STRATEGY, - TCA_CBQ_RATE, - TCA_CBQ_RTAB, - TCA_CBQ_POLICE, - __TCA_CBQ_MAX, -}; - -#define TCA_CBQ_MAX (__TCA_CBQ_MAX - 1) - -enum { - TCA_DSMARK_UNSPEC, - TCA_DSMARK_INDICES, - TCA_DSMARK_DEFAULT_INDEX, - TCA_DSMARK_SET_TC_INDEX, - TCA_DSMARK_MASK, - TCA_DSMARK_VALUE, - __TCA_DSMARK_MAX, -}; - -#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1) - -enum { - TCA_ATM_UNSPEC, - TCA_ATM_FD, - TCA_ATM_PTR, - TCA_ATM_HDR, - TCA_ATM_EXCESS, - TCA_ATM_ADDR, - TCA_ATM_STATE, - __TCA_ATM_MAX, -}; - -#define TCA_ATM_MAX (__TCA_ATM_MAX - 1) - -enum -{ - TCA_NETEM_UNSPEC, - TCA_NETEM_CORR, - TCA_NETEM_DELAY_DIST, - TCA_NETEM_REORDER, - TCA_NETEM_CORRUPT, - __TCA_NETEM_MAX, -}; - -#define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1) - -struct tc_netem_qopt -{ - __u32 latency; - __u32 limit; - __u32 loss; - __u32 gap; - __u32 duplicate; - __u32 jitter; -}; - -struct tc_netem_corr -{ - __u32 delay_corr; - __u32 loss_corr; - __u32 dup_corr; -}; - -struct tc_netem_reorder -{ - __u32 probability; - __u32 correlation; -}; - -struct tc_netem_corrupt -{ - __u32 probability; - __u32 correlation; -}; - -#define NETEM_DIST_SCALE 8192 - -#endif diff --git a/libc/kernel/common/linux/platform_device.h b/libc/kernel/common/linux/platform_device.h deleted file mode 100644 index a761b5b2f..000000000 --- a/libc/kernel/common/linux/platform_device.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _PLATFORM_DEVICE_H_ -#define _PLATFORM_DEVICE_H_ - -#include - -struct platform_device { - const char * name; - u32 id; - struct device dev; - u32 num_resources; - struct resource * resource; -}; - -#define to_platform_device(x) container_of((x), struct platform_device, dev) - -struct platform_driver { - int (*probe)(struct platform_device *); - int (*remove)(struct platform_device *); - void (*shutdown)(struct platform_device *); - int (*suspend)(struct platform_device *, pm_message_t state); - int (*resume)(struct platform_device *); - struct device_driver driver; -}; - -#define platform_get_drvdata(_dev) dev_get_drvdata(&(_dev)->dev) -#define platform_set_drvdata(_dev,data) dev_set_drvdata(&(_dev)->dev, (data)) - -#endif diff --git a/libc/kernel/common/linux/plist.h b/libc/kernel/common/linux/plist.h deleted file mode 100644 index 5d65783ba..000000000 --- a/libc/kernel/common/linux/plist.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PLIST_H_ -#define _LINUX_PLIST_H_ - -#include -#include -#include - -struct plist_head { - struct list_head prio_list; - struct list_head node_list; -}; - -struct plist_node { - int prio; - struct plist_head plist; -}; - -#define PLIST_HEAD_LOCK_INIT(_lock) - -#define PLIST_HEAD_INIT(head, _lock) { .prio_list = LIST_HEAD_INIT((head).prio_list), .node_list = LIST_HEAD_INIT((head).node_list), PLIST_HEAD_LOCK_INIT(&(_lock)) } - -#define PLIST_NODE_INIT(node, __prio) { .prio = (__prio), .plist = PLIST_HEAD_INIT((node).plist, NULL), } - -#define plist_for_each(pos, head) list_for_each_entry(pos, &(head)->node_list, plist.node_list) - -#define plist_for_each_safe(pos, n, head) list_for_each_entry_safe(pos, n, &(head)->node_list, plist.node_list) - -#define plist_for_each_entry(pos, head, mem) list_for_each_entry(pos, &(head)->node_list, mem.plist.node_list) - -#define plist_for_each_entry_safe(pos, n, head, m) list_for_each_entry_safe(pos, n, &(head)->node_list, m.plist.node_list) - -#define plist_first_entry(head, type, member) container_of(plist_first(head), type, member) -#endif diff --git a/libc/kernel/common/linux/pm.h b/libc/kernel/common/linux/pm.h deleted file mode 100644 index 054879113..000000000 --- a/libc/kernel/common/linux/pm.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PM_H -#define _LINUX_PM_H - -#endif diff --git a/libc/kernel/common/linux/pnp.h b/libc/kernel/common/linux/pnp.h deleted file mode 100644 index 30b0af7b4..000000000 --- a/libc/kernel/common/linux/pnp.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PNP_H -#define _LINUX_PNP_H - -#endif diff --git a/libc/kernel/common/linux/poll.h b/libc/kernel/common/linux/poll.h deleted file mode 100644 index 6822509e6..000000000 --- a/libc/kernel/common/linux/poll.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_POLL_H -#define _LINUX_POLL_H - -#include - -#endif diff --git a/libc/kernel/common/linux/posix_acl.h b/libc/kernel/common/linux/posix_acl.h deleted file mode 100644 index bdaee5be7..000000000 --- a/libc/kernel/common/linux/posix_acl.h +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_POSIX_ACL_H -#define __LINUX_POSIX_ACL_H - -#include - -#define ACL_UNDEFINED_ID (-1) - -#define ACL_TYPE_ACCESS (0x8000) -#define ACL_TYPE_DEFAULT (0x4000) - -#define ACL_USER_OBJ (0x01) -#define ACL_USER (0x02) -#define ACL_GROUP_OBJ (0x04) -#define ACL_GROUP (0x08) -#define ACL_MASK (0x10) -#define ACL_OTHER (0x20) - -#define ACL_READ (0x04) -#define ACL_WRITE (0x02) -#define ACL_EXECUTE (0x01) - -struct posix_acl_entry { - short e_tag; - unsigned short e_perm; - unsigned int e_id; -}; - -struct posix_acl { - atomic_t a_refcount; - unsigned int a_count; - struct posix_acl_entry a_entries[0]; -}; - -#define FOREACH_ACL_ENTRY(pa, acl, pe) for(pa=(acl)->a_entries, pe=pa+(acl)->a_count; pa - -#undef __NFDBITS -#define __NFDBITS (8 * sizeof(unsigned long)) - -#undef __FD_SETSIZE -#define __FD_SETSIZE 1024 - -#undef __FDSET_LONGS -#define __FDSET_LONGS (__FD_SETSIZE/__NFDBITS) - -#undef __FDELT -#define __FDELT(d) ((d) / __NFDBITS) - -#undef __FDMASK -#define __FDMASK(d) (1UL << ((d) % __NFDBITS)) - -typedef struct { - unsigned long fds_bits [__FDSET_LONGS]; -} __kernel_fd_set; - -typedef void (*__kernel_sighandler_t)(int); - -typedef int __kernel_key_t; -typedef int __kernel_mqd_t; - -#include - -#endif diff --git a/libc/kernel/common/linux/ppdev.h b/libc/kernel/common/linux/ppdev.h deleted file mode 100644 index c43f8b92e..000000000 --- a/libc/kernel/common/linux/ppdev.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#define PP_IOCTL 'p' - -#define PPSETMODE _IOW(PP_IOCTL, 0x80, int) - -#define PPRSTATUS _IOR(PP_IOCTL, 0x81, unsigned char) -#define PPWSTATUS OBSOLETE__IOW(PP_IOCTL, 0x82, unsigned char) - -#define PPRCONTROL _IOR(PP_IOCTL, 0x83, unsigned char) -#define PPWCONTROL _IOW(PP_IOCTL, 0x84, unsigned char) - -struct ppdev_frob_struct { - unsigned char mask; - unsigned char val; -}; -#define PPFCONTROL _IOW(PP_IOCTL, 0x8e, struct ppdev_frob_struct) - -#define PPRDATA _IOR(PP_IOCTL, 0x85, unsigned char) -#define PPWDATA _IOW(PP_IOCTL, 0x86, unsigned char) - -#define PPRECONTROL OBSOLETE__IOR(PP_IOCTL, 0x87, unsigned char) -#define PPWECONTROL OBSOLETE__IOW(PP_IOCTL, 0x88, unsigned char) - -#define PPRFIFO OBSOLETE__IOR(PP_IOCTL, 0x89, unsigned char) -#define PPWFIFO OBSOLETE__IOW(PP_IOCTL, 0x8a, unsigned char) - -#define PPCLAIM _IO(PP_IOCTL, 0x8b) - -#define PPRELEASE _IO(PP_IOCTL, 0x8c) - -#define PPYIELD _IO(PP_IOCTL, 0x8d) - -#define PPEXCL _IO(PP_IOCTL, 0x8f) - -#define PPDATADIR _IOW(PP_IOCTL, 0x90, int) - -#define PPNEGOT _IOW(PP_IOCTL, 0x91, int) - -#define PPWCTLONIRQ _IOW(PP_IOCTL, 0x92, unsigned char) - -#define PPCLRIRQ _IOR(PP_IOCTL, 0x93, int) - -#define PPSETPHASE _IOW(PP_IOCTL, 0x94, int) - -#define PPGETTIME _IOR(PP_IOCTL, 0x95, struct timeval) -#define PPSETTIME _IOW(PP_IOCTL, 0x96, struct timeval) - -#define PPGETMODES _IOR(PP_IOCTL, 0x97, unsigned int) - -#define PPGETMODE _IOR(PP_IOCTL, 0x98, int) -#define PPGETPHASE _IOR(PP_IOCTL, 0x99, int) - -#define PPGETFLAGS _IOR(PP_IOCTL, 0x9a, int) -#define PPSETFLAGS _IOW(PP_IOCTL, 0x9b, int) - -#define PP_FASTWRITE (1<<2) -#define PP_FASTREAD (1<<3) -#define PP_W91284PIC (1<<4) - -#define PP_FLAGMASK (PP_FASTWRITE | PP_FASTREAD | PP_W91284PIC) - diff --git a/libc/kernel/common/linux/ppp_defs.h b/libc/kernel/common/linux/ppp_defs.h deleted file mode 100644 index da54ac7dc..000000000 --- a/libc/kernel/common/linux/ppp_defs.h +++ /dev/null @@ -1,121 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _PPP_DEFS_H_ -#define _PPP_DEFS_H_ - -#define PPP_HDRLEN 4 -#define PPP_FCSLEN 2 -#define PPP_MRU 1500 - -#define PPP_ADDRESS(p) (((__u8 *)(p))[0]) -#define PPP_CONTROL(p) (((__u8 *)(p))[1]) -#define PPP_PROTOCOL(p) ((((__u8 *)(p))[2] << 8) + ((__u8 *)(p))[3]) - -#define PPP_ALLSTATIONS 0xff -#define PPP_UI 0x03 -#define PPP_FLAG 0x7e -#define PPP_ESCAPE 0x7d -#define PPP_TRANS 0x20 - -#define PPP_IP 0x21 -#define PPP_AT 0x29 -#define PPP_IPX 0x2b -#define PPP_VJC_COMP 0x2d -#define PPP_VJC_UNCOMP 0x2f -#define PPP_MP 0x3d -#define PPP_IPV6 0x57 -#define PPP_COMPFRAG 0xfb -#define PPP_COMP 0xfd -#define PPP_MPLS_UC 0x0281 -#define PPP_MPLS_MC 0x0283 -#define PPP_IPCP 0x8021 -#define PPP_ATCP 0x8029 -#define PPP_IPXCP 0x802b -#define PPP_IPV6CP 0x8057 -#define PPP_CCPFRAG 0x80fb -#define PPP_CCP 0x80fd -#define PPP_MPLSCP 0x80fd -#define PPP_LCP 0xc021 -#define PPP_PAP 0xc023 -#define PPP_LQR 0xc025 -#define PPP_CHAP 0xc223 -#define PPP_CBCP 0xc029 - -#define PPP_INITFCS 0xffff -#define PPP_GOODFCS 0xf0b8 - -typedef __u32 ext_accm[8]; - -enum NPmode { - NPMODE_PASS, - NPMODE_DROP, - NPMODE_ERROR, - NPMODE_QUEUE -}; - -struct pppstat { - __u32 ppp_discards; - - __u32 ppp_ibytes; - __u32 ppp_ioctects; - __u32 ppp_ipackets; - __u32 ppp_ierrors; - __u32 ppp_ilqrs; - - __u32 ppp_obytes; - __u32 ppp_ooctects; - __u32 ppp_opackets; - __u32 ppp_oerrors; - __u32 ppp_olqrs; -}; - -struct vjstat { - __u32 vjs_packets; - __u32 vjs_compressed; - __u32 vjs_searches; - __u32 vjs_misses; - __u32 vjs_uncompressedin; - __u32 vjs_compressedin; - __u32 vjs_errorin; - __u32 vjs_tossed; -}; - -struct compstat { - __u32 unc_bytes; - __u32 unc_packets; - __u32 comp_bytes; - __u32 comp_packets; - __u32 inc_bytes; - __u32 inc_packets; - - __u32 in_count; - __u32 bytes_out; - - double ratio; -}; - -struct ppp_stats { - struct pppstat p; - struct vjstat vj; -}; - -struct ppp_comp_stats { - struct compstat c; - struct compstat d; -}; - -struct ppp_idle { - time_t xmit_idle; - time_t recv_idle; -}; - -#endif diff --git a/libc/kernel/common/linux/prctl.h b/libc/kernel/common/linux/prctl.h deleted file mode 100644 index a7631a201..000000000 --- a/libc/kernel/common/linux/prctl.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PRCTL_H -#define _LINUX_PRCTL_H - -#define PR_SET_PDEATHSIG 1 -#define PR_GET_PDEATHSIG 2 - -#define PR_GET_DUMPABLE 3 -#define PR_SET_DUMPABLE 4 - -#define PR_GET_UNALIGN 5 -#define PR_SET_UNALIGN 6 -#define PR_UNALIGN_NOPRINT 1 -#define PR_UNALIGN_SIGBUS 2 - -#define PR_GET_KEEPCAPS 7 -#define PR_SET_KEEPCAPS 8 - -#define PR_GET_FPEMU 9 -#define PR_SET_FPEMU 10 -#define PR_FPEMU_NOPRINT 1 -#define PR_FPEMU_SIGFPE 2 - -#define PR_GET_FPEXC 11 -#define PR_SET_FPEXC 12 -#define PR_FP_EXC_SW_ENABLE 0x80 -#define PR_FP_EXC_DIV 0x010000 -#define PR_FP_EXC_OVF 0x020000 -#define PR_FP_EXC_UND 0x040000 -#define PR_FP_EXC_RES 0x080000 -#define PR_FP_EXC_INV 0x100000 -#define PR_FP_EXC_DISABLED 0 -#define PR_FP_EXC_NONRECOV 1 -#define PR_FP_EXC_ASYNC 2 -#define PR_FP_EXC_PRECISE 3 - -#define PR_GET_TIMING 13 -#define PR_SET_TIMING 14 -#define PR_TIMING_STATISTICAL 0 -#define PR_TIMING_TIMESTAMP 1 - -#define PR_SET_NAME 15 -#define PR_GET_NAME 16 - -#define PR_GET_ENDIAN 19 -#define PR_SET_ENDIAN 20 -#define PR_ENDIAN_BIG 0 -#define PR_ENDIAN_LITTLE 1 -#define PR_ENDIAN_PPC_LITTLE 2 - -#endif diff --git a/libc/kernel/common/linux/preempt.h b/libc/kernel/common/linux/preempt.h deleted file mode 100644 index b703dd3c0..000000000 --- a/libc/kernel/common/linux/preempt.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_PREEMPT_H -#define __LINUX_PREEMPT_H - -#include -#include - -#define add_preempt_count(val) do { preempt_count() += (val); } while (0) -#define sub_preempt_count(val) do { preempt_count() -= (val); } while (0) - -#define inc_preempt_count() add_preempt_count(1) -#define dec_preempt_count() sub_preempt_count(1) - -#define preempt_count() (current_thread_info()->preempt_count) - -#define preempt_disable() do { } while (0) -#define preempt_enable_no_resched() do { } while (0) -#define preempt_enable() do { } while (0) -#define preempt_check_resched() do { } while (0) - -#endif diff --git a/libc/kernel/common/linux/proc_fs.h b/libc/kernel/common/linux/proc_fs.h deleted file mode 100644 index ccb22ac4c..000000000 --- a/libc/kernel/common/linux/proc_fs.h +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PROC_FS_H -#define _LINUX_PROC_FS_H - -#include -#include -#include -#include - -#define FIRST_PROCESS_ENTRY 256 - -enum { - PROC_ROOT_INO = 1, -}; - -#define PROC_SUPER_MAGIC 0x9fa0 - -typedef int (read_proc_t)(char *page, char **start, off_t off, - int count, int *eof, void *data); -typedef int (write_proc_t)(struct file *file, const char __user *buffer, - unsigned long count, void *data); -typedef int (get_info_t)(char *, char **, off_t, int); - -struct proc_dir_entry { - unsigned int low_ino; - unsigned short namelen; - const char *name; - mode_t mode; - nlink_t nlink; - uid_t uid; - gid_t gid; - loff_t size; - struct inode_operations * proc_iops; - const struct file_operations * proc_fops; - get_info_t *get_info; - struct module *owner; - struct proc_dir_entry *next, *parent, *subdir; - void *data; - read_proc_t *read_proc; - write_proc_t *write_proc; - atomic_t count; - int deleted; - void *set; -}; - -struct kcore_list { - struct kcore_list *next; - unsigned long addr; - size_t size; -}; - -struct vmcore { - struct list_head list; - unsigned long long paddr; - unsigned long long size; - loff_t offset; -}; - -#define proc_root_driver NULL -#define proc_net NULL -#define proc_bus NULL - -#define proc_net_fops_create(name, mode, fops) ({ (void)(mode), NULL; }) -#define proc_net_create(name, mode, info) ({ (void)(mode), NULL; }) -#define remove_proc_entry(name, parent) do {} while (0) - -#endif diff --git a/libc/kernel/common/linux/ptrace.h b/libc/kernel/common/linux/ptrace.h deleted file mode 100644 index 079c0c89a..000000000 --- a/libc/kernel/common/linux/ptrace.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_PTRACE_H -#define _LINUX_PTRACE_H - -#define PTRACE_TRACEME 0 -#define PTRACE_PEEKTEXT 1 -#define PTRACE_PEEKDATA 2 -#define PTRACE_PEEKUSR 3 -#define PTRACE_POKETEXT 4 -#define PTRACE_POKEDATA 5 -#define PTRACE_POKEUSR 6 -#define PTRACE_CONT 7 -#define PTRACE_KILL 8 -#define PTRACE_SINGLESTEP 9 - -#define PTRACE_ATTACH 0x10 -#define PTRACE_DETACH 0x11 - -#define PTRACE_SYSCALL 24 - -#define PTRACE_SETOPTIONS 0x4200 -#define PTRACE_GETEVENTMSG 0x4201 -#define PTRACE_GETSIGINFO 0x4202 -#define PTRACE_SETSIGINFO 0x4203 - -#define PTRACE_O_TRACESYSGOOD 0x00000001 -#define PTRACE_O_TRACEFORK 0x00000002 -#define PTRACE_O_TRACEVFORK 0x00000004 -#define PTRACE_O_TRACECLONE 0x00000008 -#define PTRACE_O_TRACEEXEC 0x00000010 -#define PTRACE_O_TRACEVFORKDONE 0x00000020 -#define PTRACE_O_TRACEEXIT 0x00000040 - -#define PTRACE_O_MASK 0x0000007f - -#define PTRACE_EVENT_FORK 1 -#define PTRACE_EVENT_VFORK 2 -#define PTRACE_EVENT_CLONE 3 -#define PTRACE_EVENT_EXEC 4 -#define PTRACE_EVENT_VFORK_DONE 5 -#define PTRACE_EVENT_EXIT 6 - -#include - -#endif diff --git a/libc/kernel/common/linux/qic117.h b/libc/kernel/common/linux/qic117.h deleted file mode 100644 index e077090f9..000000000 --- a/libc/kernel/common/linux/qic117.h +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _QIC117_H -#define _QIC117_H - -typedef enum { - QIC_NO_COMMAND = 0, - QIC_RESET = 1, - QIC_REPORT_NEXT_BIT = 2, - QIC_PAUSE = 3, - QIC_MICRO_STEP_PAUSE = 4, - QIC_ALTERNATE_TIMEOUT = 5, - QIC_REPORT_DRIVE_STATUS = 6, - QIC_REPORT_ERROR_CODE = 7, - QIC_REPORT_DRIVE_CONFIGURATION = 8, - QIC_REPORT_ROM_VERSION = 9, - QIC_LOGICAL_FORWARD = 10, - QIC_PHYSICAL_REVERSE = 11, - QIC_PHYSICAL_FORWARD = 12, - QIC_SEEK_HEAD_TO_TRACK = 13, - QIC_SEEK_LOAD_POINT = 14, - QIC_ENTER_FORMAT_MODE = 15, - QIC_WRITE_REFERENCE_BURST = 16, - QIC_ENTER_VERIFY_MODE = 17, - QIC_STOP_TAPE = 18, - - QIC_MICRO_STEP_HEAD_UP = 21, - QIC_MICRO_STEP_HEAD_DOWN = 22, - QIC_SOFT_SELECT = 23, - QIC_SOFT_DESELECT = 24, - QIC_SKIP_REVERSE = 25, - QIC_SKIP_FORWARD = 26, - QIC_SELECT_RATE = 27, - - QIC_ENTER_DIAGNOSTIC_1 = 28, - QIC_ENTER_DIAGNOSTIC_2 = 29, - QIC_ENTER_PRIMARY_MODE = 30, - - QIC_REPORT_VENDOR_ID = 32, - QIC_REPORT_TAPE_STATUS = 33, - QIC_SKIP_EXTENDED_REVERSE = 34, - QIC_SKIP_EXTENDED_FORWARD = 35, - QIC_CALIBRATE_TAPE_LENGTH = 36, - QIC_REPORT_FORMAT_SEGMENTS = 37, - QIC_SET_FORMAT_SEGMENTS = 38, - - QIC_PHANTOM_SELECT = 46, - QIC_PHANTOM_DESELECT = 47 -} qic117_cmd_t; - -typedef enum { - discretional = 0, required, ccs1, ccs2 -} qic_compatibility; - -typedef enum { - unused, mode, motion, report -} command_types; - -struct qic117_command_table { - char *name; - __u8 mask; - __u8 state; - __u8 cmd_type; - __u8 non_intr; - __u8 level; -}; - -#define QIC117_COMMANDS { {NULL, 0x00, 0x00, mode, 0, discretional}, {"soft reset", 0x00, 0x00, motion, 1, required}, {"report next bit", 0x00, 0x00, report, 0, required}, {"pause", 0x36, 0x24, motion, 1, required}, {"micro step pause", 0x36, 0x24, motion, 1, required}, {"alternate command timeout", 0x00, 0x00, mode, 0, required}, {"report drive status", 0x00, 0x00, report, 0, required}, {"report error code", 0x01, 0x01, report, 0, required}, {"report drive configuration",0x00, 0x00, report, 0, required}, {"report rom version", 0x00, 0x00, report, 0, required}, {"logical forward", 0x37, 0x25, motion, 0, required}, {"physical reverse", 0x17, 0x05, motion, 0, required}, {"physical forward", 0x17, 0x05, motion, 0, required}, {"seek head to track", 0x37, 0x25, motion, 0, required}, {"seek load point", 0x17, 0x05, motion, 1, required}, {"enter format mode", 0x1f, 0x05, mode, 0, required}, {"write reference burst", 0x1f, 0x05, motion, 1, required}, {"enter verify mode", 0x37, 0x25, mode, 0, required}, {"stop tape", 0x00, 0x00, motion, 1, required}, {"reserved (19)", 0x00, 0x00, unused, 0, discretional}, {"reserved (20)", 0x00, 0x00, unused, 0, discretional}, {"micro step head up", 0x02, 0x00, motion, 0, required}, {"micro step head down", 0x02, 0x00, motion, 0, required}, {"soft select", 0x00, 0x00, mode, 0, discretional}, {"soft deselect", 0x00, 0x00, mode, 0, discretional}, {"skip segments reverse", 0x36, 0x24, motion, 1, required}, {"skip segments forward", 0x36, 0x24, motion, 1, required}, {"select rate or format", 0x03, 0x01, mode, 0, required }, {"enter diag mode 1", 0x00, 0x00, mode, 0, discretional}, {"enter diag mode 2", 0x00, 0x00, mode, 0, discretional}, {"enter primary mode", 0x00, 0x00, mode, 0, required}, {"vendor unique (31)", 0x00, 0x00, unused, 0, discretional}, {"report vendor id", 0x00, 0x00, report, 0, required}, {"report tape status", 0x04, 0x04, report, 0, ccs1}, {"skip extended reverse", 0x36, 0x24, motion, 1, ccs1}, {"skip extended forward", 0x36, 0x24, motion, 1, ccs1}, {"calibrate tape length", 0x17, 0x05, motion, 1, ccs2}, {"report format segments", 0x17, 0x05, report, 0, ccs2}, {"set format segments", 0x17, 0x05, mode, 0, ccs2}, {"reserved (39)", 0x00, 0x00, unused, 0, discretional}, {"vendor unique (40)", 0x00, 0x00, unused, 0, discretional}, {"vendor unique (41)", 0x00, 0x00, unused, 0, discretional}, {"vendor unique (42)", 0x00, 0x00, unused, 0, discretional}, {"vendor unique (43)", 0x00, 0x00, unused, 0, discretional}, {"vendor unique (44)", 0x00, 0x00, unused, 0, discretional}, {"vendor unique (45)", 0x00, 0x00, unused, 0, discretional}, {"phantom select", 0x00, 0x00, mode, 0, discretional}, {"phantom deselect", 0x00, 0x00, mode, 0, discretional}, } - -#define QIC_STATUS_READY 0x01 -#define QIC_STATUS_ERROR 0x02 -#define QIC_STATUS_CARTRIDGE_PRESENT 0x04 -#define QIC_STATUS_WRITE_PROTECT 0x08 -#define QIC_STATUS_NEW_CARTRIDGE 0x10 -#define QIC_STATUS_REFERENCED 0x20 -#define QIC_STATUS_AT_BOT 0x40 -#define QIC_STATUS_AT_EOT 0x80 - -#define QIC_CONFIG_RATE_MASK 0x18 -#define QIC_CONFIG_RATE_SHIFT 3 -#define QIC_CONFIG_RATE_250 0 -#define QIC_CONFIG_RATE_500 2 -#define QIC_CONFIG_RATE_1000 3 -#define QIC_CONFIG_RATE_2000 1 -#define QIC_CONFIG_RATE_4000 0 - -#define QIC_CONFIG_LONG 0x40 -#define QIC_CONFIG_80 0x80 - -#define QIC_TAPE_STD_MASK 0x0f -#define QIC_TAPE_QIC40 0x01 -#define QIC_TAPE_QIC80 0x02 -#define QIC_TAPE_QIC3020 0x03 -#define QIC_TAPE_QIC3010 0x04 - -#define QIC_TAPE_LEN_MASK 0x70 -#define QIC_TAPE_205FT 0x10 -#define QIC_TAPE_307FT 0x20 -#define QIC_TAPE_VARIABLE 0x30 -#define QIC_TAPE_1100FT 0x40 -#define QIC_TAPE_FLEX 0x60 - -#define QIC_TAPE_WIDE 0x80 - -#define QIC_TOP_TAPE_LEN 1500 - -typedef struct { - char *message; - unsigned int fatal:1; -} ftape_error; - -#define QIC117_ERRORS { { "No error", 0, }, { "Command Received while Drive Not Ready", 0, }, { "Cartridge Not Present or Removed", 1, }, { "Motor Speed Error (not within 1%)", 1, }, { "Motor Speed Fault (jammed, or gross speed error", 1, }, { "Cartridge Write Protected", 1, }, { "Undefined or Reserved Command Code", 1, }, { "Illegal Track Address Specified for Seek", 1, }, { "Illegal Command in Report Subcontext", 0, }, { "Illegal Entry into a Diagnostic Mode", 1, }, { "Broken Tape Detected (based on hole sensor)", 1, }, { "Warning--Read Gain Setting Error", 1, }, { "Command Received While Error Status Pending (obs)", 1, }, { "Command Received While New Cartridge Pending", 1, }, { "Command Illegal or Undefined in Primary Mode", 1, }, { "Command Illegal or Undefined in Format Mode", 1, }, { "Command Illegal or Undefined in Verify Mode", 1, }, { "Logical Forward Not at Logical BOT or no Format Segments in Format Mode", 1, }, { "Logical EOT Before All Segments generated", 1, }, { "Command Illegal When Cartridge Not Referenced", 1, }, { "Self-Diagnostic Failed (cannot be cleared)", 1, }, { "Warning EEPROM Not Initialized, Defaults Set", 1, }, { "EEPROM Corrupted or Hardware Failure", 1, }, { "Motion Time-out Error", 1, }, { "Data Segment Too Long -- Logical Forward or Pause", 1, }, { "Transmit Overrun (obs)", 1, }, { "Power On Reset Occurred", 0, }, { "Software Reset Occurred", 0, }, { "Diagnostic Mode 1 Error", 1, }, { "Diagnostic Mode 2 Error", 1, }, { "Command Received During Non-Interruptible Process", 1, }, { "Rate or Format Selection Error", 1, }, { "Illegal Command While in High Speed Mode", 1, }, { "Illegal Seek Segment Value", 1, }, { "Invalid Media", 1, }, { "Head Positioning Failure", 1, }, { "Write Reference Burst Failure", 1, }, { "Prom Code Missing", 1, }, { "Invalid Format", 1, }, { "EOT/BOT System Failure", 1, }, { "Prom A Checksum Error", 1, }, { "Drive Wakeup Reset Occurred", 1, }, { "Prom B Checksum Error", 1, }, { "Illegal Entry into Format Mode", 1, }, } - -#endif diff --git a/libc/kernel/common/linux/qnxtypes.h b/libc/kernel/common/linux/qnxtypes.h deleted file mode 100644 index 53cd20c26..000000000 --- a/libc/kernel/common/linux/qnxtypes.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _QNX4TYPES_H -#define _QNX4TYPES_H - -typedef __le16 qnx4_nxtnt_t; -typedef __u8 qnx4_ftype_t; - -typedef struct { - __le32 xtnt_blk; - __le32 xtnt_size; -} qnx4_xtnt_t; - -typedef __le16 qnx4_mode_t; -typedef __le16 qnx4_muid_t; -typedef __le16 qnx4_mgid_t; -typedef __le32 qnx4_off_t; -typedef __le16 qnx4_nlink_t; - -#endif diff --git a/libc/kernel/common/linux/quota.h b/libc/kernel/common/linux/quota.h deleted file mode 100644 index 054af5afb..000000000 --- a/libc/kernel/common/linux/quota.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_QUOTA_ -#define _LINUX_QUOTA_ - -#include -#include - -#define __DQUOT_VERSION__ "dquot_6.5.1" -#define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 - -typedef __kernel_uid32_t qid_t; -typedef __u64 qsize_t; - -#define QUOTABLOCK_BITS 10 -#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS) - -#define qb2kb(x) ((x) << (QUOTABLOCK_BITS-10)) -#define kb2qb(x) ((x) >> (QUOTABLOCK_BITS-10)) -#define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS) - -#define MAXQUOTAS 2 -#define USRQUOTA 0 -#define GRPQUOTA 1 - -#define INITQFNAMES { "user", "group", "undefined", }; - -#define SUBCMDMASK 0x00ff -#define SUBCMDSHIFT 8 -#define QCMD(cmd, type) (((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK)) - -#define Q_SYNC 0x800001 -#define Q_QUOTAON 0x800002 -#define Q_QUOTAOFF 0x800003 -#define Q_GETFMT 0x800004 -#define Q_GETINFO 0x800005 -#define Q_SETINFO 0x800006 -#define Q_GETQUOTA 0x800007 -#define Q_SETQUOTA 0x800008 - -#define QIF_BLIMITS 1 -#define QIF_SPACE 2 -#define QIF_ILIMITS 4 -#define QIF_INODES 8 -#define QIF_BTIME 16 -#define QIF_ITIME 32 -#define QIF_LIMITS (QIF_BLIMITS | QIF_ILIMITS) -#define QIF_USAGE (QIF_SPACE | QIF_INODES) -#define QIF_TIMES (QIF_BTIME | QIF_ITIME) -#define QIF_ALL (QIF_LIMITS | QIF_USAGE | QIF_TIMES) - -struct if_dqblk { - __u64 dqb_bhardlimit; - __u64 dqb_bsoftlimit; - __u64 dqb_curspace; - __u64 dqb_ihardlimit; - __u64 dqb_isoftlimit; - __u64 dqb_curinodes; - __u64 dqb_btime; - __u64 dqb_itime; - __u32 dqb_valid; -}; - -#define IIF_BGRACE 1 -#define IIF_IGRACE 2 -#define IIF_FLAGS 4 -#define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS) - -struct if_dqinfo { - __u64 dqi_bgrace; - __u64 dqi_igrace; - __u32 dqi_flags; - __u32 dqi_valid; -}; - -#include - -#endif diff --git a/libc/kernel/common/linux/raid/md.h b/libc/kernel/common/linux/raid/md.h deleted file mode 100644 index d609c06f8..000000000 --- a/libc/kernel/common/linux/raid/md.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _MD_H -#define _MD_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define MD_MAJOR_VERSION 0 -#define MD_MINOR_VERSION 90 - -#define MD_PATCHLEVEL_VERSION 3 - -#endif - diff --git a/libc/kernel/common/linux/raid/md_k.h b/libc/kernel/common/linux/raid/md_k.h deleted file mode 100644 index c8b858c5e..000000000 --- a/libc/kernel/common/linux/raid/md_k.h +++ /dev/null @@ -1,184 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _MD_K_H -#define _MD_K_H - -#include "../../../drivers/md/dm-bio-list.h" - -#define LEVEL_MULTIPATH (-4) -#define LEVEL_LINEAR (-1) -#define LEVEL_FAULTY (-5) - -#define LEVEL_NONE (-1000000) - -#define MaxSector (~(sector_t)0) -#define MD_THREAD_NAME_MAX 14 - -typedef struct mddev_s mddev_t; -typedef struct mdk_rdev_s mdk_rdev_t; - -#define MAX_MD_DEVS 256 - -#define MAX_CHUNK_SIZE (1<<30) - -struct mdk_rdev_s -{ - struct list_head same_set; - - sector_t size; - mddev_t *mddev; - unsigned long last_events; - - struct block_device *bdev; - - struct page *sb_page; - int sb_loaded; - __u64 sb_events; - sector_t data_offset; - sector_t sb_offset; - int sb_size; - int preferred_minor; - - struct kobject kobj; - - unsigned long flags; -#define Faulty 1 -#define In_sync 2 -#define WriteMostly 4 -#define BarriersNotsupp 5 - - int desc_nr; - int raid_disk; - int saved_raid_disk; - sector_t recovery_offset; - - atomic_t nr_pending; - atomic_t read_errors; - atomic_t corrected_errors; -}; - -struct mddev_s -{ - void *private; - struct mdk_personality *pers; - dev_t unit; - int md_minor; - struct list_head disks; - int sb_dirty; - int ro; - - struct gendisk *gendisk; - - struct kobject kobj; - - int major_version, - minor_version, - patch_version; - int persistent; - int chunk_size; - time_t ctime, utime; - int level, layout; - char clevel[16]; - int raid_disks; - int max_disks; - sector_t size; - sector_t array_size; - __u64 events; - - char uuid[16]; - - sector_t reshape_position; - int delta_disks, new_level, new_layout, new_chunk; - - struct mdk_thread_s *thread; - struct mdk_thread_s *sync_thread; - sector_t curr_resync; - unsigned long resync_mark; - sector_t resync_mark_cnt; - sector_t curr_mark_cnt; - - sector_t resync_max_sectors; - - sector_t resync_mismatches; - - sector_t suspend_lo; - sector_t suspend_hi; - - int sync_speed_min; - int sync_speed_max; - - int ok_start_degraded; - -#define MD_RECOVERY_RUNNING 0 -#define MD_RECOVERY_SYNC 1 -#define MD_RECOVERY_ERR 2 -#define MD_RECOVERY_INTR 3 -#define MD_RECOVERY_DONE 4 -#define MD_RECOVERY_NEEDED 5 -#define MD_RECOVERY_REQUESTED 6 -#define MD_RECOVERY_CHECK 7 -#define MD_RECOVERY_RESHAPE 8 -#define MD_RECOVERY_FROZEN 9 - - unsigned long recovery; - - int in_sync; - struct mutex reconfig_mutex; - atomic_t active; - - int changed; - int degraded; - int barriers_work; - struct bio *biolist; - - atomic_t recovery_active; - wait_queue_head_t recovery_wait; - sector_t recovery_cp; - - spinlock_t write_lock; - wait_queue_head_t sb_wait; - atomic_t pending_writes; - - unsigned int safemode; - unsigned int safemode_delay; - struct timer_list safemode_timer; - atomic_t writes_pending; - request_queue_t *queue; - - atomic_t write_behind; - unsigned int max_write_behind; - - struct bitmap *bitmap; - struct file *bitmap_file; - long bitmap_offset; - long default_bitmap_offset; - - struct list_head all_mddevs; -}; - -struct md_sysfs_entry { - struct attribute attr; - ssize_t (*show)(mddev_t *, char *); - ssize_t (*store)(mddev_t *, const char *, size_t); -}; - -#define ITERATE_RDEV_GENERIC(head,rdev,tmp) for ((tmp) = (head).next; (rdev) = (list_entry((tmp), mdk_rdev_t, same_set)), (tmp) = (tmp)->next, (tmp)->prev != &(head) ; ) -#define ITERATE_RDEV(mddev,rdev,tmp) ITERATE_RDEV_GENERIC((mddev)->disks,rdev,tmp) -#define ITERATE_RDEV_PENDING(rdev,tmp) ITERATE_RDEV_GENERIC(pending_raid_disks,rdev,tmp) - -#define THREAD_WAKEUP 0 - -#define __wait_event_lock_irq(wq, condition, lock, cmd) do { wait_queue_t __wait; init_waitqueue_entry(&__wait, current); add_wait_queue(&wq, &__wait); for (;;) { set_current_state(TASK_UNINTERRUPTIBLE); if (condition) break; spin_unlock_irq(&lock); cmd; schedule(); spin_lock_irq(&lock); } current->state = TASK_RUNNING; remove_wait_queue(&wq, &__wait); } while (0) - -#define wait_event_lock_irq(wq, condition, lock, cmd) do { if (condition) break; __wait_event_lock_irq(wq, condition, lock, cmd); } while (0) - -#endif diff --git a/libc/kernel/common/linux/raid/md_p.h b/libc/kernel/common/linux/raid/md_p.h deleted file mode 100644 index ab856a738..000000000 --- a/libc/kernel/common/linux/raid/md_p.h +++ /dev/null @@ -1,135 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _MD_P_H -#define _MD_P_H - -#define MD_RESERVED_BYTES (64 * 1024) -#define MD_RESERVED_SECTORS (MD_RESERVED_BYTES / 512) -#define MD_RESERVED_BLOCKS (MD_RESERVED_BYTES / BLOCK_SIZE) - -#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS) -#define MD_NEW_SIZE_BLOCKS(x) ((x & ~(MD_RESERVED_BLOCKS - 1)) - MD_RESERVED_BLOCKS) - -#define MD_SB_BYTES 4096 -#define MD_SB_WORDS (MD_SB_BYTES / 4) -#define MD_SB_BLOCKS (MD_SB_BYTES / BLOCK_SIZE) -#define MD_SB_SECTORS (MD_SB_BYTES / 512) - -#define MD_SB_GENERIC_OFFSET 0 -#define MD_SB_PERSONALITY_OFFSET 64 -#define MD_SB_DISKS_OFFSET 128 -#define MD_SB_DESCRIPTOR_OFFSET 992 - -#define MD_SB_GENERIC_CONSTANT_WORDS 32 -#define MD_SB_GENERIC_STATE_WORDS 32 -#define MD_SB_GENERIC_WORDS (MD_SB_GENERIC_CONSTANT_WORDS + MD_SB_GENERIC_STATE_WORDS) -#define MD_SB_PERSONALITY_WORDS 64 -#define MD_SB_DESCRIPTOR_WORDS 32 -#define MD_SB_DISKS 27 -#define MD_SB_DISKS_WORDS (MD_SB_DISKS*MD_SB_DESCRIPTOR_WORDS) -#define MD_SB_RESERVED_WORDS (1024 - MD_SB_GENERIC_WORDS - MD_SB_PERSONALITY_WORDS - MD_SB_DISKS_WORDS - MD_SB_DESCRIPTOR_WORDS) -#define MD_SB_EQUAL_WORDS (MD_SB_GENERIC_WORDS + MD_SB_PERSONALITY_WORDS + MD_SB_DISKS_WORDS) - -#define MD_DISK_FAULTY 0 -#define MD_DISK_ACTIVE 1 -#define MD_DISK_SYNC 2 -#define MD_DISK_REMOVED 3 - -#define MD_DISK_WRITEMOSTLY 9 - -typedef struct mdp_device_descriptor_s { - __u32 number; - __u32 major; - __u32 minor; - __u32 raid_disk; - __u32 state; - __u32 reserved[MD_SB_DESCRIPTOR_WORDS - 5]; -} mdp_disk_t; - -#define MD_SB_MAGIC 0xa92b4efc - -#define MD_SB_CLEAN 0 -#define MD_SB_ERRORS 1 - -#define MD_SB_BITMAP_PRESENT 8 - -typedef struct mdp_superblock_s { - - __u32 md_magic; - __u32 major_version; - __u32 minor_version; - __u32 patch_version; - __u32 gvalid_words; - __u32 set_uuid0; - __u32 ctime; - __u32 level; - __u32 size; - __u32 nr_disks; - __u32 raid_disks; - __u32 md_minor; - __u32 not_persistent; - __u32 set_uuid1; - __u32 set_uuid2; - __u32 set_uuid3; - __u32 gstate_creserved[MD_SB_GENERIC_CONSTANT_WORDS - 16]; - - __u32 utime; - __u32 state; - __u32 active_disks; - __u32 working_disks; - __u32 failed_disks; - __u32 spare_disks; - __u32 sb_csum; -#ifdef __BIG_ENDIAN - __u32 events_hi; - __u32 events_lo; - __u32 cp_events_hi; - __u32 cp_events_lo; -#else - __u32 events_lo; - __u32 events_hi; - __u32 cp_events_lo; - __u32 cp_events_hi; -#endif - __u32 recovery_cp; - - __u64 reshape_position; - __u32 new_level; - __u32 delta_disks; - __u32 new_layout; - __u32 new_chunk; - __u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 18]; - - __u32 layout; - __u32 chunk_size; - __u32 root_pv; - __u32 root_block; - __u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 4]; - - mdp_disk_t disks[MD_SB_DISKS]; - - __u32 reserved[MD_SB_RESERVED_WORDS]; - - mdp_disk_t this_disk; - -} mdp_super_t; - -#define WriteMostly1 1 - -#define MD_FEATURE_BITMAP_OFFSET 1 -#define MD_FEATURE_RECOVERY_OFFSET 2 -#define MD_FEATURE_RESHAPE_ACTIVE 4 - -#define MD_FEATURE_ALL (1|2|4) - -#endif - diff --git a/libc/kernel/common/linux/raid/md_u.h b/libc/kernel/common/linux/raid/md_u.h deleted file mode 100644 index 3671187ac..000000000 --- a/libc/kernel/common/linux/raid/md_u.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _MD_U_H -#define _MD_U_H - -#define RAID_VERSION _IOR (MD_MAJOR, 0x10, mdu_version_t) -#define GET_ARRAY_INFO _IOR (MD_MAJOR, 0x11, mdu_array_info_t) -#define GET_DISK_INFO _IOR (MD_MAJOR, 0x12, mdu_disk_info_t) -#define PRINT_RAID_DEBUG _IO (MD_MAJOR, 0x13) -#define RAID_AUTORUN _IO (MD_MAJOR, 0x14) -#define GET_BITMAP_FILE _IOR (MD_MAJOR, 0x15, mdu_bitmap_file_t) - -#define CLEAR_ARRAY _IO (MD_MAJOR, 0x20) -#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, mdu_disk_info_t) -#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22) -#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, mdu_array_info_t) -#define SET_DISK_INFO _IO (MD_MAJOR, 0x24) -#define WRITE_RAID_INFO _IO (MD_MAJOR, 0x25) -#define UNPROTECT_ARRAY _IO (MD_MAJOR, 0x26) -#define PROTECT_ARRAY _IO (MD_MAJOR, 0x27) -#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28) -#define SET_DISK_FAULTY _IO (MD_MAJOR, 0x29) -#define HOT_GENERATE_ERROR _IO (MD_MAJOR, 0x2a) -#define SET_BITMAP_FILE _IOW (MD_MAJOR, 0x2b, int) - -#define RUN_ARRAY _IOW (MD_MAJOR, 0x30, mdu_param_t) -#define START_ARRAY _IO (MD_MAJOR, 0x31) -#define STOP_ARRAY _IO (MD_MAJOR, 0x32) -#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33) -#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34) - -typedef struct mdu_version_s { - int major; - int minor; - int patchlevel; -} mdu_version_t; - -typedef struct mdu_array_info_s { - - int major_version; - int minor_version; - int patch_version; - int ctime; - int level; - int size; - int nr_disks; - int raid_disks; - int md_minor; - int not_persistent; - - int utime; - int state; - int active_disks; - int working_disks; - int failed_disks; - int spare_disks; - - int layout; - int chunk_size; - -} mdu_array_info_t; - -typedef struct mdu_disk_info_s { - - int number; - int major; - int minor; - int raid_disk; - int state; - -} mdu_disk_info_t; - -typedef struct mdu_start_info_s { - - int major; - int minor; - int raid_disk; - int state; - -} mdu_start_info_t; - -typedef struct mdu_bitmap_file_s -{ - char pathname[4096]; -} mdu_bitmap_file_t; - -typedef struct mdu_param_s -{ - int personality; - int chunk_size; - int max_fault; -} mdu_param_t; - -#endif - diff --git a/libc/kernel/common/linux/raid/xor.h b/libc/kernel/common/linux/raid/xor.h deleted file mode 100644 index 01e9f45d5..000000000 --- a/libc/kernel/common/linux/raid/xor.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _XOR_H -#define _XOR_H - -#include - -#define MAX_XOR_BLOCKS 5 - -struct xor_block_template { - struct xor_block_template *next; - const char *name; - int speed; - void (*do_2)(unsigned long, unsigned long *, unsigned long *); - void (*do_3)(unsigned long, unsigned long *, unsigned long *, - unsigned long *); - void (*do_4)(unsigned long, unsigned long *, unsigned long *, - unsigned long *, unsigned long *); - void (*do_5)(unsigned long, unsigned long *, unsigned long *, - unsigned long *, unsigned long *, unsigned long *); -}; - -#endif diff --git a/libc/kernel/common/linux/random.h b/libc/kernel/common/linux/random.h deleted file mode 100644 index d2bef975d..000000000 --- a/libc/kernel/common/linux/random.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_RANDOM_H -#define _LINUX_RANDOM_H - -#include - -#define RNDGETENTCNT _IOR( 'R', 0x00, int ) - -#define RNDADDTOENTCNT _IOW( 'R', 0x01, int ) - -#define RNDGETPOOL _IOR( 'R', 0x02, int [2] ) - -#define RNDADDENTROPY _IOW( 'R', 0x03, int [2] ) - -#define RNDZAPENTCNT _IO( 'R', 0x04 ) - -#define RNDCLEARPOOL _IO( 'R', 0x06 ) - -struct rand_pool_info { - int entropy_count; - int buf_size; - __u32 buf[0]; -}; - -#endif diff --git a/libc/kernel/common/linux/rbtree.h b/libc/kernel/common/linux/rbtree.h deleted file mode 100644 index 714ffe984..000000000 --- a/libc/kernel/common/linux/rbtree.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_RBTREE_H -#define _LINUX_RBTREE_H - -#include -#include - -struct rb_node -{ - unsigned long rb_parent_color; -#define RB_RED 0 -#define RB_BLACK 1 - struct rb_node *rb_right; - struct rb_node *rb_left; -} __attribute__((aligned(sizeof(long)))); - -struct rb_root -{ - struct rb_node *rb_node; -}; - -#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_color & ~3)) -#define rb_color(r) ((r)->rb_parent_color & 1) -#define rb_is_red(r) (!rb_color(r)) -#define rb_is_black(r) rb_color(r) -#define rb_set_red(r) do { (r)->rb_parent_color &= ~1; } while (0) -#define rb_set_black(r) do { (r)->rb_parent_color |= 1; } while (0) - -#define RB_ROOT (struct rb_root) { NULL, } -#define rb_entry(ptr, type, member) container_of(ptr, type, member) -#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL) -#define RB_EMPTY_NODE(node) (rb_parent(node) != node) -#define RB_CLEAR_NODE(node) (rb_set_parent(node, node)) - -#endif diff --git a/libc/kernel/common/linux/rcupdate.h b/libc/kernel/common/linux/rcupdate.h deleted file mode 100644 index 5547a4de7..000000000 --- a/libc/kernel/common/linux/rcupdate.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_RCUPDATE_H -#define __LINUX_RCUPDATE_H - -#endif diff --git a/libc/kernel/common/linux/reboot.h b/libc/kernel/common/linux/reboot.h deleted file mode 100644 index e10ff1494..000000000 --- a/libc/kernel/common/linux/reboot.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_REBOOT_H -#define _LINUX_REBOOT_H - -#define LINUX_REBOOT_MAGIC1 0xfee1dead -#define LINUX_REBOOT_MAGIC2 672274793 -#define LINUX_REBOOT_MAGIC2A 85072278 -#define LINUX_REBOOT_MAGIC2B 369367448 -#define LINUX_REBOOT_MAGIC2C 537993216 - -#define LINUX_REBOOT_CMD_RESTART 0x01234567 -#define LINUX_REBOOT_CMD_HALT 0xCDEF0123 -#define LINUX_REBOOT_CMD_CAD_ON 0x89ABCDEF -#define LINUX_REBOOT_CMD_CAD_OFF 0x00000000 -#define LINUX_REBOOT_CMD_POWER_OFF 0x4321FEDC -#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 -#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 -#define LINUX_REBOOT_CMD_KEXEC 0x45584543 - -#endif diff --git a/libc/kernel/common/linux/relay.h b/libc/kernel/common/linux/relay.h deleted file mode 100644 index 09f72198a..000000000 --- a/libc/kernel/common/linux/relay.h +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_RELAY_H -#define _LINUX_RELAY_H - -#include -#include -#include -#include -#include -#include -#include - -#define FIX_SIZE(x) ((((x) - 1) & PAGE_MASK) + PAGE_SIZE) - -#define RELAYFS_CHANNEL_VERSION 6 - -struct rchan_buf -{ - void *start; - void *data; - size_t offset; - size_t subbufs_produced; - size_t subbufs_consumed; - struct rchan *chan; - wait_queue_head_t read_wait; - struct work_struct wake_readers; - struct dentry *dentry; - struct kref kref; - struct page **page_array; - unsigned int page_count; - unsigned int finalized; - size_t *padding; - size_t prev_padding; - size_t bytes_consumed; - unsigned int cpu; -} ____cacheline_aligned; - -struct rchan -{ - u32 version; - size_t subbuf_size; - size_t n_subbufs; - size_t alloc_size; - struct rchan_callbacks *cb; - struct kref kref; - void *private_data; - size_t last_toobig; - struct rchan_buf *buf[NR_CPUS]; -}; - -struct rchan_callbacks -{ - - int (*subbuf_start) (struct rchan_buf *buf, - void *subbuf, - void *prev_subbuf, - size_t prev_padding); - - void (*buf_mapped)(struct rchan_buf *buf, - struct file *filp); - - void (*buf_unmapped)(struct rchan_buf *buf, - struct file *filp); - - struct dentry *(*create_buf_file)(const char *filename, - struct dentry *parent, - int mode, - struct rchan_buf *buf, - int *is_global); - - int (*remove_buf_file)(struct dentry *dentry); -}; - -struct rchan *relay_open(const char *base_filename, - struct dentry *parent, - size_t subbuf_size, - size_t n_subbufs, - struct rchan_callbacks *cb); - -#endif - diff --git a/libc/kernel/common/linux/resource.h b/libc/kernel/common/linux/resource.h deleted file mode 100644 index 347b52491..000000000 --- a/libc/kernel/common/linux/resource.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_RESOURCE_H -#define _LINUX_RESOURCE_H - -#include - -struct task_struct; - -#define RUSAGE_SELF 0 -#define RUSAGE_CHILDREN (-1) -#define RUSAGE_BOTH (-2) - -struct rusage { - struct timeval ru_utime; - struct timeval ru_stime; - long ru_maxrss; - long ru_ixrss; - long ru_idrss; - long ru_isrss; - long ru_minflt; - long ru_majflt; - long ru_nswap; - long ru_inblock; - long ru_oublock; - long ru_msgsnd; - long ru_msgrcv; - long ru_nsignals; - long ru_nvcsw; - long ru_nivcsw; -}; - -struct rlimit { - unsigned long rlim_cur; - unsigned long rlim_max; -}; - -#define PRIO_MIN (-20) -#define PRIO_MAX 20 - -#define PRIO_PROCESS 0 -#define PRIO_PGRP 1 -#define PRIO_USER 2 - -#define _STK_LIM (8*1024*1024) - -#define MLOCK_LIMIT (8 * PAGE_SIZE) - -#include - -#endif diff --git a/libc/kernel/common/linux/route.h b/libc/kernel/common/linux/route.h deleted file mode 100644 index cdb874434..000000000 --- a/libc/kernel/common/linux/route.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_ROUTE_H -#define _LINUX_ROUTE_H - -#include -#include - -struct rtentry -{ - unsigned long rt_pad1; - struct sockaddr rt_dst; - struct sockaddr rt_gateway; - struct sockaddr rt_genmask; - unsigned short rt_flags; - short rt_pad2; - unsigned long rt_pad3; - void *rt_pad4; - short rt_metric; - char __user *rt_dev; - unsigned long rt_mtu; -#define rt_mss rt_mtu - unsigned long rt_window; - unsigned short rt_irtt; -}; - -#define RTF_UP 0x0001 -#define RTF_GATEWAY 0x0002 -#define RTF_HOST 0x0004 -#define RTF_REINSTATE 0x0008 -#define RTF_DYNAMIC 0x0010 -#define RTF_MODIFIED 0x0020 -#define RTF_MTU 0x0040 -#define RTF_MSS RTF_MTU -#define RTF_WINDOW 0x0080 -#define RTF_IRTT 0x0100 -#define RTF_REJECT 0x0200 - -#endif - diff --git a/libc/kernel/common/linux/rtc.h b/libc/kernel/common/linux/rtc.h deleted file mode 100644 index b51bc7194..000000000 --- a/libc/kernel/common/linux/rtc.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_RTC_H_ -#define _LINUX_RTC_H_ - -struct rtc_time { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; - -struct rtc_wkalrm { - unsigned char enabled; - unsigned char pending; - struct rtc_time time; -}; - -struct rtc_pll_info { - int pll_ctrl; - int pll_value; - int pll_max; - int pll_min; - int pll_posmult; - int pll_negmult; - long pll_clock; -}; - -#define RTC_AIE_ON _IO('p', 0x01) -#define RTC_AIE_OFF _IO('p', 0x02) -#define RTC_UIE_ON _IO('p', 0x03) -#define RTC_UIE_OFF _IO('p', 0x04) -#define RTC_PIE_ON _IO('p', 0x05) -#define RTC_PIE_OFF _IO('p', 0x06) -#define RTC_WIE_ON _IO('p', 0x0f) -#define RTC_WIE_OFF _IO('p', 0x10) - -#define RTC_ALM_SET _IOW('p', 0x07, struct rtc_time) -#define RTC_ALM_READ _IOR('p', 0x08, struct rtc_time) -#define RTC_RD_TIME _IOR('p', 0x09, struct rtc_time) -#define RTC_SET_TIME _IOW('p', 0x0a, struct rtc_time) -#define RTC_IRQP_READ _IOR('p', 0x0b, unsigned long) -#define RTC_IRQP_SET _IOW('p', 0x0c, unsigned long) -#define RTC_EPOCH_READ _IOR('p', 0x0d, unsigned long) -#define RTC_EPOCH_SET _IOW('p', 0x0e, unsigned long) - -#define RTC_WKALM_SET _IOW('p', 0x0f, struct rtc_wkalrm) -#define RTC_WKALM_RD _IOR('p', 0x10, struct rtc_wkalrm) - -#define RTC_PLL_GET _IOR('p', 0x11, struct rtc_pll_info) -#define RTC_PLL_SET _IOW('p', 0x12, struct rtc_pll_info) - -#define RTC_IRQF 0x80 -#define RTC_PF 0x40 -#define RTC_AF 0x20 -#define RTC_UF 0x10 - -#endif diff --git a/libc/kernel/common/linux/rtnetlink.h b/libc/kernel/common/linux/rtnetlink.h deleted file mode 100644 index ddcffaa8d..000000000 --- a/libc/kernel/common/linux/rtnetlink.h +++ /dev/null @@ -1,723 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_RTNETLINK_H -#define __LINUX_RTNETLINK_H - -#include - -enum { - RTM_BASE = 16, -#define RTM_BASE RTM_BASE - - RTM_NEWLINK = 16, -#define RTM_NEWLINK RTM_NEWLINK - RTM_DELLINK, -#define RTM_DELLINK RTM_DELLINK - RTM_GETLINK, -#define RTM_GETLINK RTM_GETLINK - RTM_SETLINK, -#define RTM_SETLINK RTM_SETLINK - - RTM_NEWADDR = 20, -#define RTM_NEWADDR RTM_NEWADDR - RTM_DELADDR, -#define RTM_DELADDR RTM_DELADDR - RTM_GETADDR, -#define RTM_GETADDR RTM_GETADDR - - RTM_NEWROUTE = 24, -#define RTM_NEWROUTE RTM_NEWROUTE - RTM_DELROUTE, -#define RTM_DELROUTE RTM_DELROUTE - RTM_GETROUTE, -#define RTM_GETROUTE RTM_GETROUTE - - RTM_NEWNEIGH = 28, -#define RTM_NEWNEIGH RTM_NEWNEIGH - RTM_DELNEIGH, -#define RTM_DELNEIGH RTM_DELNEIGH - RTM_GETNEIGH, -#define RTM_GETNEIGH RTM_GETNEIGH - - RTM_NEWRULE = 32, -#define RTM_NEWRULE RTM_NEWRULE - RTM_DELRULE, -#define RTM_DELRULE RTM_DELRULE - RTM_GETRULE, -#define RTM_GETRULE RTM_GETRULE - - RTM_NEWQDISC = 36, -#define RTM_NEWQDISC RTM_NEWQDISC - RTM_DELQDISC, -#define RTM_DELQDISC RTM_DELQDISC - RTM_GETQDISC, -#define RTM_GETQDISC RTM_GETQDISC - - RTM_NEWTCLASS = 40, -#define RTM_NEWTCLASS RTM_NEWTCLASS - RTM_DELTCLASS, -#define RTM_DELTCLASS RTM_DELTCLASS - RTM_GETTCLASS, -#define RTM_GETTCLASS RTM_GETTCLASS - - RTM_NEWTFILTER = 44, -#define RTM_NEWTFILTER RTM_NEWTFILTER - RTM_DELTFILTER, -#define RTM_DELTFILTER RTM_DELTFILTER - RTM_GETTFILTER, -#define RTM_GETTFILTER RTM_GETTFILTER - - RTM_NEWACTION = 48, -#define RTM_NEWACTION RTM_NEWACTION - RTM_DELACTION, -#define RTM_DELACTION RTM_DELACTION - RTM_GETACTION, -#define RTM_GETACTION RTM_GETACTION - - RTM_NEWPREFIX = 52, -#define RTM_NEWPREFIX RTM_NEWPREFIX - RTM_GETPREFIX = 54, -#define RTM_GETPREFIX RTM_GETPREFIX - - RTM_GETMULTICAST = 58, -#define RTM_GETMULTICAST RTM_GETMULTICAST - - RTM_GETANYCAST = 62, -#define RTM_GETANYCAST RTM_GETANYCAST - - RTM_NEWNEIGHTBL = 64, -#define RTM_NEWNEIGHTBL RTM_NEWNEIGHTBL - RTM_GETNEIGHTBL = 66, -#define RTM_GETNEIGHTBL RTM_GETNEIGHTBL - RTM_SETNEIGHTBL, -#define RTM_SETNEIGHTBL RTM_SETNEIGHTBL - - __RTM_MAX, -#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) -}; - -#define RTM_NR_MSGTYPES (RTM_MAX + 1 - RTM_BASE) -#define RTM_NR_FAMILIES (RTM_NR_MSGTYPES >> 2) -#define RTM_FAM(cmd) (((cmd) - RTM_BASE) >> 2) - -struct rtattr -{ - unsigned short rta_len; - unsigned short rta_type; -}; - -#define RTA_ALIGNTO 4 -#define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) ) -#define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && (rta)->rta_len >= sizeof(struct rtattr) && (rta)->rta_len <= (len)) -#define RTA_NEXT(rta,attrlen) ((attrlen) -= RTA_ALIGN((rta)->rta_len), (struct rtattr*)(((char*)(rta)) + RTA_ALIGN((rta)->rta_len))) -#define RTA_LENGTH(len) (RTA_ALIGN(sizeof(struct rtattr)) + (len)) -#define RTA_SPACE(len) RTA_ALIGN(RTA_LENGTH(len)) -#define RTA_DATA(rta) ((void*)(((char*)(rta)) + RTA_LENGTH(0))) -#define RTA_PAYLOAD(rta) ((int)((rta)->rta_len) - RTA_LENGTH(0)) - -struct rtmsg -{ - unsigned char rtm_family; - unsigned char rtm_dst_len; - unsigned char rtm_src_len; - unsigned char rtm_tos; - - unsigned char rtm_table; - unsigned char rtm_protocol; - unsigned char rtm_scope; - unsigned char rtm_type; - - unsigned rtm_flags; -}; - -enum -{ - RTN_UNSPEC, - RTN_UNICAST, - RTN_LOCAL, - RTN_BROADCAST, - RTN_ANYCAST, - RTN_MULTICAST, - RTN_BLACKHOLE, - RTN_UNREACHABLE, - RTN_PROHIBIT, - RTN_THROW, - RTN_NAT, - RTN_XRESOLVE, - __RTN_MAX -}; - -#define RTN_MAX (__RTN_MAX - 1) - -#define RTPROT_UNSPEC 0 -#define RTPROT_REDIRECT 1 -#define RTPROT_KERNEL 2 -#define RTPROT_BOOT 3 -#define RTPROT_STATIC 4 - -#define RTPROT_GATED 8 -#define RTPROT_RA 9 -#define RTPROT_MRT 10 -#define RTPROT_ZEBRA 11 -#define RTPROT_BIRD 12 -#define RTPROT_DNROUTED 13 -#define RTPROT_XORP 14 -#define RTPROT_NTK 15 - -enum rt_scope_t -{ - RT_SCOPE_UNIVERSE=0, - - RT_SCOPE_SITE=200, - RT_SCOPE_LINK=253, - RT_SCOPE_HOST=254, - RT_SCOPE_NOWHERE=255 -}; - -#define RTM_F_NOTIFY 0x100 -#define RTM_F_CLONED 0x200 -#define RTM_F_EQUALIZE 0x400 -#define RTM_F_PREFIX 0x800 - -enum rt_class_t -{ - RT_TABLE_UNSPEC=0, - - RT_TABLE_DEFAULT=253, - RT_TABLE_MAIN=254, - RT_TABLE_LOCAL=255, - __RT_TABLE_MAX -}; -#define RT_TABLE_MAX (__RT_TABLE_MAX - 1) - -enum rtattr_type_t -{ - RTA_UNSPEC, - RTA_DST, - RTA_SRC, - RTA_IIF, - RTA_OIF, - RTA_GATEWAY, - RTA_PRIORITY, - RTA_PREFSRC, - RTA_METRICS, - RTA_MULTIPATH, - RTA_PROTOINFO, - RTA_FLOW, - RTA_CACHEINFO, - RTA_SESSION, - RTA_MP_ALGO, - __RTA_MAX -}; - -#define RTA_MAX (__RTA_MAX - 1) - -#define RTM_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg)))) -#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg)) - -struct rtnexthop -{ - unsigned short rtnh_len; - unsigned char rtnh_flags; - unsigned char rtnh_hops; - int rtnh_ifindex; -}; - -#define RTNH_F_DEAD 1 -#define RTNH_F_PERVASIVE 2 -#define RTNH_F_ONLINK 4 - -#define RTNH_ALIGNTO 4 -#define RTNH_ALIGN(len) ( ((len)+RTNH_ALIGNTO-1) & ~(RTNH_ALIGNTO-1) ) -#define RTNH_OK(rtnh,len) ((rtnh)->rtnh_len >= sizeof(struct rtnexthop) && ((int)(rtnh)->rtnh_len) <= (len)) -#define RTNH_NEXT(rtnh) ((struct rtnexthop*)(((char*)(rtnh)) + RTNH_ALIGN((rtnh)->rtnh_len))) -#define RTNH_LENGTH(len) (RTNH_ALIGN(sizeof(struct rtnexthop)) + (len)) -#define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len)) -#define RTNH_DATA(rtnh) ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0))) - -struct rta_cacheinfo -{ - __u32 rta_clntref; - __u32 rta_lastuse; - __s32 rta_expires; - __u32 rta_error; - __u32 rta_used; - -#define RTNETLINK_HAVE_PEERINFO 1 - __u32 rta_id; - __u32 rta_ts; - __u32 rta_tsage; -}; - -enum -{ - RTAX_UNSPEC, -#define RTAX_UNSPEC RTAX_UNSPEC - RTAX_LOCK, -#define RTAX_LOCK RTAX_LOCK - RTAX_MTU, -#define RTAX_MTU RTAX_MTU - RTAX_WINDOW, -#define RTAX_WINDOW RTAX_WINDOW - RTAX_RTT, -#define RTAX_RTT RTAX_RTT - RTAX_RTTVAR, -#define RTAX_RTTVAR RTAX_RTTVAR - RTAX_SSTHRESH, -#define RTAX_SSTHRESH RTAX_SSTHRESH - RTAX_CWND, -#define RTAX_CWND RTAX_CWND - RTAX_ADVMSS, -#define RTAX_ADVMSS RTAX_ADVMSS - RTAX_REORDERING, -#define RTAX_REORDERING RTAX_REORDERING - RTAX_HOPLIMIT, -#define RTAX_HOPLIMIT RTAX_HOPLIMIT - RTAX_INITCWND, -#define RTAX_INITCWND RTAX_INITCWND - RTAX_FEATURES, -#define RTAX_FEATURES RTAX_FEATURES - __RTAX_MAX -}; - -#define RTAX_MAX (__RTAX_MAX - 1) - -#define RTAX_FEATURE_ECN 0x00000001 -#define RTAX_FEATURE_SACK 0x00000002 -#define RTAX_FEATURE_TIMESTAMP 0x00000004 -#define RTAX_FEATURE_ALLFRAG 0x00000008 - -struct rta_session -{ - __u8 proto; - __u8 pad1; - __u16 pad2; - - union { - struct { - __u16 sport; - __u16 dport; - } ports; - - struct { - __u8 type; - __u8 code; - __u16 ident; - } icmpt; - - __u32 spi; - } u; -}; - -struct ifaddrmsg -{ - unsigned char ifa_family; - unsigned char ifa_prefixlen; - unsigned char ifa_flags; - unsigned char ifa_scope; - int ifa_index; -}; - -enum -{ - IFA_UNSPEC, - IFA_ADDRESS, - IFA_LOCAL, - IFA_LABEL, - IFA_BROADCAST, - IFA_ANYCAST, - IFA_CACHEINFO, - IFA_MULTICAST, - __IFA_MAX -}; - -#define IFA_MAX (__IFA_MAX - 1) - -#define IFA_F_SECONDARY 0x01 -#define IFA_F_TEMPORARY IFA_F_SECONDARY - -#define IFA_F_DEPRECATED 0x20 -#define IFA_F_TENTATIVE 0x40 -#define IFA_F_PERMANENT 0x80 - -struct ifa_cacheinfo -{ - __u32 ifa_prefered; - __u32 ifa_valid; - __u32 cstamp; - __u32 tstamp; -}; - -#define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) -#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) - -struct ndmsg -{ - unsigned char ndm_family; - unsigned char ndm_pad1; - unsigned short ndm_pad2; - int ndm_ifindex; - __u16 ndm_state; - __u8 ndm_flags; - __u8 ndm_type; -}; - -enum -{ - NDA_UNSPEC, - NDA_DST, - NDA_LLADDR, - NDA_CACHEINFO, - NDA_PROBES, - __NDA_MAX -}; - -#define NDA_MAX (__NDA_MAX - 1) - -#define NDA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg)))) -#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg)) - -#define NTF_PROXY 0x08 -#define NTF_ROUTER 0x80 - -#define NUD_INCOMPLETE 0x01 -#define NUD_REACHABLE 0x02 -#define NUD_STALE 0x04 -#define NUD_DELAY 0x08 -#define NUD_PROBE 0x10 -#define NUD_FAILED 0x20 - -#define NUD_NOARP 0x40 -#define NUD_PERMANENT 0x80 -#define NUD_NONE 0x00 - -struct nda_cacheinfo -{ - __u32 ndm_confirmed; - __u32 ndm_used; - __u32 ndm_updated; - __u32 ndm_refcnt; -}; - -struct ndt_stats -{ - __u64 ndts_allocs; - __u64 ndts_destroys; - __u64 ndts_hash_grows; - __u64 ndts_res_failed; - __u64 ndts_lookups; - __u64 ndts_hits; - __u64 ndts_rcv_probes_mcast; - __u64 ndts_rcv_probes_ucast; - __u64 ndts_periodic_gc_runs; - __u64 ndts_forced_gc_runs; -}; - -enum { - NDTPA_UNSPEC, - NDTPA_IFINDEX, - NDTPA_REFCNT, - NDTPA_REACHABLE_TIME, - NDTPA_BASE_REACHABLE_TIME, - NDTPA_RETRANS_TIME, - NDTPA_GC_STALETIME, - NDTPA_DELAY_PROBE_TIME, - NDTPA_QUEUE_LEN, - NDTPA_APP_PROBES, - NDTPA_UCAST_PROBES, - NDTPA_MCAST_PROBES, - NDTPA_ANYCAST_DELAY, - NDTPA_PROXY_DELAY, - NDTPA_PROXY_QLEN, - NDTPA_LOCKTIME, - __NDTPA_MAX -}; -#define NDTPA_MAX (__NDTPA_MAX - 1) - -struct ndtmsg -{ - __u8 ndtm_family; - __u8 ndtm_pad1; - __u16 ndtm_pad2; -}; - -struct ndt_config -{ - __u16 ndtc_key_len; - __u16 ndtc_entry_size; - __u32 ndtc_entries; - __u32 ndtc_last_flush; - __u32 ndtc_last_rand; - __u32 ndtc_hash_rnd; - __u32 ndtc_hash_mask; - __u32 ndtc_hash_chain_gc; - __u32 ndtc_proxy_qlen; -}; - -enum { - NDTA_UNSPEC, - NDTA_NAME, - NDTA_THRESH1, - NDTA_THRESH2, - NDTA_THRESH3, - NDTA_CONFIG, - NDTA_PARMS, - NDTA_STATS, - NDTA_GC_INTERVAL, - __NDTA_MAX -}; -#define NDTA_MAX (__NDTA_MAX - 1) - -#define NDTA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg)))) -#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg)) - -struct rtgenmsg -{ - unsigned char rtgen_family; -}; - -struct ifinfomsg -{ - unsigned char ifi_family; - unsigned char __ifi_pad; - unsigned short ifi_type; - int ifi_index; - unsigned ifi_flags; - unsigned ifi_change; -}; - -struct prefixmsg -{ - unsigned char prefix_family; - unsigned char prefix_pad1; - unsigned short prefix_pad2; - int prefix_ifindex; - unsigned char prefix_type; - unsigned char prefix_len; - unsigned char prefix_flags; - unsigned char prefix_pad3; -}; - -enum -{ - PREFIX_UNSPEC, - PREFIX_ADDRESS, - PREFIX_CACHEINFO, - __PREFIX_MAX -}; - -#define PREFIX_MAX (__PREFIX_MAX - 1) - -struct prefix_cacheinfo -{ - __u32 preferred_time; - __u32 valid_time; -}; - -struct rtnl_link_stats -{ - __u32 rx_packets; - __u32 tx_packets; - __u32 rx_bytes; - __u32 tx_bytes; - __u32 rx_errors; - __u32 tx_errors; - __u32 rx_dropped; - __u32 tx_dropped; - __u32 multicast; - __u32 collisions; - - __u32 rx_length_errors; - __u32 rx_over_errors; - __u32 rx_crc_errors; - __u32 rx_frame_errors; - __u32 rx_fifo_errors; - __u32 rx_missed_errors; - - __u32 tx_aborted_errors; - __u32 tx_carrier_errors; - __u32 tx_fifo_errors; - __u32 tx_heartbeat_errors; - __u32 tx_window_errors; - - __u32 rx_compressed; - __u32 tx_compressed; -}; - -struct rtnl_link_ifmap -{ - __u64 mem_start; - __u64 mem_end; - __u64 base_addr; - __u16 irq; - __u8 dma; - __u8 port; -}; - -enum -{ - IFLA_UNSPEC, - IFLA_ADDRESS, - IFLA_BROADCAST, - IFLA_IFNAME, - IFLA_MTU, - IFLA_LINK, - IFLA_QDISC, - IFLA_STATS, - IFLA_COST, -#define IFLA_COST IFLA_COST - IFLA_PRIORITY, -#define IFLA_PRIORITY IFLA_PRIORITY - IFLA_MASTER, -#define IFLA_MASTER IFLA_MASTER - IFLA_WIRELESS, -#define IFLA_WIRELESS IFLA_WIRELESS - IFLA_PROTINFO, -#define IFLA_PROTINFO IFLA_PROTINFO - IFLA_TXQLEN, -#define IFLA_TXQLEN IFLA_TXQLEN - IFLA_MAP, -#define IFLA_MAP IFLA_MAP - IFLA_WEIGHT, -#define IFLA_WEIGHT IFLA_WEIGHT - IFLA_OPERSTATE, - IFLA_LINKMODE, - __IFLA_MAX -}; - -#define IFLA_MAX (__IFLA_MAX - 1) - -#define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) -#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) - -enum -{ - IFLA_INET6_UNSPEC, - IFLA_INET6_FLAGS, - IFLA_INET6_CONF, - IFLA_INET6_STATS, - IFLA_INET6_MCAST, - IFLA_INET6_CACHEINFO, - __IFLA_INET6_MAX -}; - -#define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1) - -struct ifla_cacheinfo -{ - __u32 max_reasm_len; - __u32 tstamp; - __u32 reachable_time; - __u32 retrans_time; -}; - -struct tcmsg -{ - unsigned char tcm_family; - unsigned char tcm__pad1; - unsigned short tcm__pad2; - int tcm_ifindex; - __u32 tcm_handle; - __u32 tcm_parent; - __u32 tcm_info; -}; - -enum -{ - TCA_UNSPEC, - TCA_KIND, - TCA_OPTIONS, - TCA_STATS, - TCA_XSTATS, - TCA_RATE, - TCA_FCNT, - TCA_STATS2, - __TCA_MAX -}; - -#define TCA_MAX (__TCA_MAX - 1) - -#define TCA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg)))) -#define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg)) - -#define RTMGRP_LINK 1 -#define RTMGRP_NOTIFY 2 -#define RTMGRP_NEIGH 4 -#define RTMGRP_TC 8 - -#define RTMGRP_IPV4_IFADDR 0x10 -#define RTMGRP_IPV4_MROUTE 0x20 -#define RTMGRP_IPV4_ROUTE 0x40 -#define RTMGRP_IPV4_RULE 0x80 - -#define RTMGRP_IPV6_IFADDR 0x100 -#define RTMGRP_IPV6_MROUTE 0x200 -#define RTMGRP_IPV6_ROUTE 0x400 -#define RTMGRP_IPV6_IFINFO 0x800 - -#define RTMGRP_DECnet_IFADDR 0x1000 -#define RTMGRP_DECnet_ROUTE 0x4000 - -#define RTMGRP_IPV6_PREFIX 0x20000 - -enum rtnetlink_groups { - RTNLGRP_NONE, -#define RTNLGRP_NONE RTNLGRP_NONE - RTNLGRP_LINK, -#define RTNLGRP_LINK RTNLGRP_LINK - RTNLGRP_NOTIFY, -#define RTNLGRP_NOTIFY RTNLGRP_NOTIFY - RTNLGRP_NEIGH, -#define RTNLGRP_NEIGH RTNLGRP_NEIGH - RTNLGRP_TC, -#define RTNLGRP_TC RTNLGRP_TC - RTNLGRP_IPV4_IFADDR, -#define RTNLGRP_IPV4_IFADDR RTNLGRP_IPV4_IFADDR - RTNLGRP_IPV4_MROUTE, -#define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE - RTNLGRP_IPV4_ROUTE, -#define RTNLGRP_IPV4_ROUTE RTNLGRP_IPV4_ROUTE - RTNLGRP_IPV4_RULE, -#define RTNLGRP_IPV4_RULE RTNLGRP_IPV4_RULE - RTNLGRP_IPV6_IFADDR, -#define RTNLGRP_IPV6_IFADDR RTNLGRP_IPV6_IFADDR - RTNLGRP_IPV6_MROUTE, -#define RTNLGRP_IPV6_MROUTE RTNLGRP_IPV6_MROUTE - RTNLGRP_IPV6_ROUTE, -#define RTNLGRP_IPV6_ROUTE RTNLGRP_IPV6_ROUTE - RTNLGRP_IPV6_IFINFO, -#define RTNLGRP_IPV6_IFINFO RTNLGRP_IPV6_IFINFO - RTNLGRP_DECnet_IFADDR, -#define RTNLGRP_DECnet_IFADDR RTNLGRP_DECnet_IFADDR - RTNLGRP_NOP2, - RTNLGRP_DECnet_ROUTE, -#define RTNLGRP_DECnet_ROUTE RTNLGRP_DECnet_ROUTE - RTNLGRP_NOP3, - RTNLGRP_NOP4, - RTNLGRP_IPV6_PREFIX, -#define RTNLGRP_IPV6_PREFIX RTNLGRP_IPV6_PREFIX - __RTNLGRP_MAX -}; -#define RTNLGRP_MAX (__RTNLGRP_MAX - 1) - -struct tcamsg -{ - unsigned char tca_family; - unsigned char tca__pad1; - unsigned short tca__pad2; -}; -#define TA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg)))) -#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg)) -#define TCA_ACT_TAB 1 -#define TCAA_MAX 1 - -#endif diff --git a/libc/kernel/common/linux/rwsem.h b/libc/kernel/common/linux/rwsem.h deleted file mode 100644 index e64c4c872..000000000 --- a/libc/kernel/common/linux/rwsem.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_RWSEM_H -#define _LINUX_RWSEM_H - -#include - -#endif diff --git a/libc/kernel/common/linux/sched.h b/libc/kernel/common/linux/sched.h deleted file mode 100644 index 6b781ebb9..000000000 --- a/libc/kernel/common/linux/sched.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SCHED_H -#define _LINUX_SCHED_H - -#include - -#define CSIGNAL 0x000000ff -#define CLONE_VM 0x00000100 -#define CLONE_FS 0x00000200 -#define CLONE_FILES 0x00000400 -#define CLONE_SIGHAND 0x00000800 -#define CLONE_PTRACE 0x00002000 -#define CLONE_VFORK 0x00004000 -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x00010000 -#define CLONE_NEWNS 0x00020000 -#define CLONE_SYSVSEM 0x00040000 -#define CLONE_SETTLS 0x00080000 -#define CLONE_PARENT_SETTID 0x00100000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_DETACHED 0x00400000 -#define CLONE_UNTRACED 0x00800000 -#define CLONE_CHILD_SETTID 0x01000000 -#define CLONE_STOPPED 0x02000000 - -#define SCHED_NORMAL 0 -#define SCHED_FIFO 1 -#define SCHED_RR 2 -#define SCHED_BATCH 3 - -#endif diff --git a/libc/kernel/common/linux/sem.h b/libc/kernel/common/linux/sem.h deleted file mode 100644 index dfa531bcf..000000000 --- a/libc/kernel/common/linux/sem.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SEM_H -#define _LINUX_SEM_H - -#include - -#define SEM_UNDO 0x1000 - -#define GETPID 11 -#define GETVAL 12 -#define GETALL 13 -#define GETNCNT 14 -#define GETZCNT 15 -#define SETVAL 16 -#define SETALL 17 - -#define SEM_STAT 18 -#define SEM_INFO 19 - -struct semid_ds { - struct ipc_perm sem_perm; - __kernel_time_t sem_otime; - __kernel_time_t sem_ctime; - struct sem *sem_base; - struct sem_queue *sem_pending; - struct sem_queue **sem_pending_last; - struct sem_undo *undo; - unsigned short sem_nsems; -}; - -#include - -struct sembuf { - unsigned short sem_num; - short sem_op; - short sem_flg; -}; - -union semun { - int val; - struct semid_ds __user *buf; - unsigned short __user *array; - struct seminfo __user *__buf; - void __user *__pad; -}; - -struct seminfo { - int semmap; - int semmni; - int semmns; - int semmnu; - int semmsl; - int semopm; - int semume; - int semusz; - int semvmx; - int semaem; -}; - -#define SEMMNI 128 -#define SEMMSL 250 -#define SEMMNS (SEMMNI*SEMMSL) -#define SEMOPM 32 -#define SEMVMX 32767 -#define SEMAEM SEMVMX - -#define SEMUME SEMOPM -#define SEMMNU SEMMNS -#define SEMMAP SEMMNS -#define SEMUSZ 20 - -#endif diff --git a/libc/kernel/common/linux/seq_file.h b/libc/kernel/common/linux/seq_file.h deleted file mode 100644 index 81e314d8a..000000000 --- a/libc/kernel/common/linux/seq_file.h +++ /dev/null @@ -1,14 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SEQ_FILE_H -#define _LINUX_SEQ_FILE_H -#endif diff --git a/libc/kernel/common/linux/seqlock.h b/libc/kernel/common/linux/seqlock.h deleted file mode 100644 index a1e05d47b..000000000 --- a/libc/kernel/common/linux/seqlock.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SEQLOCK_H -#define __LINUX_SEQLOCK_H - -#include -#include - -typedef struct { - unsigned sequence; - spinlock_t lock; -} seqlock_t; - -#define __SEQLOCK_UNLOCKED(lockname) { 0, __SPIN_LOCK_UNLOCKED(lockname) } - -#define SEQLOCK_UNLOCKED __SEQLOCK_UNLOCKED(old_style_seqlock_init) - -#define seqlock_init(x) do { *(x) = (seqlock_t) __SEQLOCK_UNLOCKED(x); } while (0) - -#define DEFINE_SEQLOCK(x) seqlock_t x = __SEQLOCK_UNLOCKED(x) - -#define SEQCNT_ZERO { 0 } -#define seqcount_init(x) do { *(x) = (seqcount_t) SEQCNT_ZERO; } while (0) - -#define write_seqlock_irqsave(lock, flags) do { local_irq_save(flags); write_seqlock(lock); } while (0) -#define write_seqlock_irq(lock) do { local_irq_disable(); write_seqlock(lock); } while (0) -#define write_seqlock_bh(lock) do { local_bh_disable(); write_seqlock(lock); } while (0) -#define write_sequnlock_irqrestore(lock, flags) do { write_sequnlock(lock); local_irq_restore(flags); } while(0) -#define write_sequnlock_irq(lock) do { write_sequnlock(lock); local_irq_enable(); } while(0) -#define write_sequnlock_bh(lock) do { write_sequnlock(lock); local_bh_enable(); } while(0) -#define read_seqbegin_irqsave(lock, flags) ({ local_irq_save(flags); read_seqbegin(lock); }) -#define read_seqretry_irqrestore(lock, iv, flags) ({ int ret = read_seqretry(lock, iv); local_irq_restore(flags); ret; }) -#endif diff --git a/libc/kernel/common/linux/serial_core.h b/libc/kernel/common/linux/serial_core.h deleted file mode 100644 index 79f037523..000000000 --- a/libc/kernel/common/linux/serial_core.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef LINUX_SERIAL_CORE_H -#define LINUX_SERIAL_CORE_H - -#define PORT_UNKNOWN 0 -#define PORT_8250 1 -#define PORT_16450 2 -#define PORT_16550 3 -#define PORT_16550A 4 -#define PORT_CIRRUS 5 -#define PORT_16650 6 -#define PORT_16650V2 7 -#define PORT_16750 8 -#define PORT_STARTECH 9 -#define PORT_16C950 10 -#define PORT_16654 11 -#define PORT_16850 12 -#define PORT_RSA 13 -#define PORT_NS16550A 14 -#define PORT_XSCALE 15 -#define PORT_MAX_8250 15 - -#define PORT_PXA 31 -#define PORT_AMBA 32 -#define PORT_CLPS711X 33 -#define PORT_SA1100 34 -#define PORT_UART00 35 -#define PORT_21285 37 - -#define PORT_SUNZILOG 38 -#define PORT_SUNSAB 39 - -#define PORT_V850E_UART 40 - -#define PORT_DZ 47 - -#define PORT_MUX 48 - -#define PORT_AT91 49 - -#define PORT_MAC_ZILOG 50 -#define PORT_PMAC_ZILOG 51 - -#define PORT_SCI 52 -#define PORT_SCIF 53 -#define PORT_IRDA 54 - -#define PORT_S3C2410 55 - -#define PORT_IP22ZILOG 56 - -#define PORT_LH7A40X 57 - -#define PORT_CPM 58 - -#define PORT_MPC52xx 59 - -#define PORT_ICOM 60 - -#define PORT_S3C2440 61 - -#define PORT_IMX 62 - -#define PORT_MPSC 63 - -#define PORT_TXX9 64 - -#define PORT_VR41XX_SIU 65 -#define PORT_VR41XX_DSIU 66 - -#define PORT_S3C2400 67 - -#define PORT_M32R_SIO 68 - -#define PORT_JSM 69 - -#define PORT_IP3106 70 - -#define PORT_NETX 71 - -#define PORT_SUNHV 72 - -#define PORT_S3C2412 73 - -#endif diff --git a/libc/kernel/common/linux/serial_reg.h b/libc/kernel/common/linux/serial_reg.h deleted file mode 100644 index 97b149ad3..000000000 --- a/libc/kernel/common/linux/serial_reg.h +++ /dev/null @@ -1,249 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SERIAL_REG_H -#define _LINUX_SERIAL_REG_H - -#define UART_RX 0 -#define UART_TX 0 - -#define UART_IER 1 -#define UART_IER_MSI 0x08 -#define UART_IER_RLSI 0x04 -#define UART_IER_THRI 0x02 -#define UART_IER_RDI 0x01 - -#define UART_IERX_SLEEP 0x10 - -#define UART_IIR 2 -#define UART_IIR_NO_INT 0x01 -#define UART_IIR_ID 0x06 -#define UART_IIR_MSI 0x00 -#define UART_IIR_THRI 0x02 -#define UART_IIR_RDI 0x04 -#define UART_IIR_RLSI 0x06 - -#define UART_FCR 2 -#define UART_FCR_ENABLE_FIFO 0x01 -#define UART_FCR_CLEAR_RCVR 0x02 -#define UART_FCR_CLEAR_XMIT 0x04 -#define UART_FCR_DMA_SELECT 0x08 - -#define UART_FCR_R_TRIG_00 0x00 -#define UART_FCR_R_TRIG_01 0x40 -#define UART_FCR_R_TRIG_10 0x80 -#define UART_FCR_R_TRIG_11 0xc0 -#define UART_FCR_T_TRIG_00 0x00 -#define UART_FCR_T_TRIG_01 0x10 -#define UART_FCR_T_TRIG_10 0x20 -#define UART_FCR_T_TRIG_11 0x30 - -#define UART_FCR_TRIGGER_MASK 0xC0 -#define UART_FCR_TRIGGER_1 0x00 -#define UART_FCR_TRIGGER_4 0x40 -#define UART_FCR_TRIGGER_8 0x80 -#define UART_FCR_TRIGGER_14 0xC0 - -#define UART_FCR6_R_TRIGGER_8 0x00 -#define UART_FCR6_R_TRIGGER_16 0x40 -#define UART_FCR6_R_TRIGGER_24 0x80 -#define UART_FCR6_R_TRIGGER_28 0xC0 -#define UART_FCR6_T_TRIGGER_16 0x00 -#define UART_FCR6_T_TRIGGER_8 0x10 -#define UART_FCR6_T_TRIGGER_24 0x20 -#define UART_FCR6_T_TRIGGER_30 0x30 -#define UART_FCR7_64BYTE 0x20 - -#define UART_LCR 3 - -#define UART_LCR_DLAB 0x80 -#define UART_LCR_SBC 0x40 -#define UART_LCR_SPAR 0x20 -#define UART_LCR_EPAR 0x10 -#define UART_LCR_PARITY 0x08 -#define UART_LCR_STOP 0x04 -#define UART_LCR_WLEN5 0x00 -#define UART_LCR_WLEN6 0x01 -#define UART_LCR_WLEN7 0x02 -#define UART_LCR_WLEN8 0x03 - -#define UART_MCR 4 -#define UART_MCR_CLKSEL 0x80 -#define UART_MCR_TCRTLR 0x40 -#define UART_MCR_XONANY 0x20 -#define UART_MCR_AFE 0x20 -#define UART_MCR_LOOP 0x10 -#define UART_MCR_OUT2 0x08 -#define UART_MCR_OUT1 0x04 -#define UART_MCR_RTS 0x02 -#define UART_MCR_DTR 0x01 - -#define UART_LSR 5 -#define UART_LSR_TEMT 0x40 -#define UART_LSR_THRE 0x20 -#define UART_LSR_BI 0x10 -#define UART_LSR_FE 0x08 -#define UART_LSR_PE 0x04 -#define UART_LSR_OE 0x02 -#define UART_LSR_DR 0x01 - -#define UART_MSR 6 -#define UART_MSR_DCD 0x80 -#define UART_MSR_RI 0x40 -#define UART_MSR_DSR 0x20 -#define UART_MSR_CTS 0x10 -#define UART_MSR_DDCD 0x08 -#define UART_MSR_TERI 0x04 -#define UART_MSR_DDSR 0x02 -#define UART_MSR_DCTS 0x01 -#define UART_MSR_ANY_DELTA 0x0F - -#define UART_SCR 7 - -#define UART_DLL 0 -#define UART_DLM 1 - -#define UART_EFR 2 -#define UART_EFR_CTS 0x80 -#define UART_EFR_RTS 0x40 -#define UART_EFR_SCD 0x20 -#define UART_EFR_ECB 0x10 - -#define UART_XON1 4 -#define UART_XON2 5 -#define UART_XOFF1 6 -#define UART_XOFF2 7 - -#define UART_TI752_TCR 6 -#define UART_TI752_TLR 7 - -#define UART_TRG 0 - -#define UART_TRG_1 0x01 -#define UART_TRG_4 0x04 -#define UART_TRG_8 0x08 -#define UART_TRG_16 0x10 -#define UART_TRG_32 0x20 -#define UART_TRG_64 0x40 -#define UART_TRG_96 0x60 -#define UART_TRG_120 0x78 -#define UART_TRG_128 0x80 - -#define UART_FCTR 1 -#define UART_FCTR_RTS_NODELAY 0x00 -#define UART_FCTR_RTS_4DELAY 0x01 -#define UART_FCTR_RTS_6DELAY 0x02 -#define UART_FCTR_RTS_8DELAY 0x03 -#define UART_FCTR_IRDA 0x04 -#define UART_FCTR_TX_INT 0x08 -#define UART_FCTR_TRGA 0x00 -#define UART_FCTR_TRGB 0x10 -#define UART_FCTR_TRGC 0x20 -#define UART_FCTR_TRGD 0x30 -#define UART_FCTR_SCR_SWAP 0x40 -#define UART_FCTR_RX 0x00 -#define UART_FCTR_TX 0x80 - -#define UART_EMSR 7 -#define UART_EMSR_FIFO_COUNT 0x01 -#define UART_EMSR_ALT_COUNT 0x02 - -#define UART_IER_DMAE 0x80 -#define UART_IER_UUE 0x40 -#define UART_IER_NRZE 0x20 -#define UART_IER_RTOIE 0x10 - -#define UART_IIR_TOD 0x08 - -#define UART_FCR_PXAR1 0x00 -#define UART_FCR_PXAR8 0x40 -#define UART_FCR_PXAR16 0x80 -#define UART_FCR_PXAR32 0xc0 - -#define UART_ASR 0x01 -#define UART_RFL 0x03 -#define UART_TFL 0x04 -#define UART_ICR 0x05 - -#define UART_ACR 0x00 -#define UART_CPR 0x01 -#define UART_TCR 0x02 -#define UART_CKS 0x03 -#define UART_TTL 0x04 -#define UART_RTL 0x05 -#define UART_FCL 0x06 -#define UART_FCH 0x07 -#define UART_ID1 0x08 -#define UART_ID2 0x09 -#define UART_ID3 0x0A -#define UART_REV 0x0B -#define UART_CSR 0x0C -#define UART_NMR 0x0D -#define UART_CTR 0xFF - -#define UART_ACR_RXDIS 0x01 -#define UART_ACR_TXDIS 0x02 -#define UART_ACR_DSRFC 0x04 -#define UART_ACR_TLENB 0x20 -#define UART_ACR_ICRRD 0x40 -#define UART_ACR_ASREN 0x80 - -#define UART_RSA_BASE (-8) - -#define UART_RSA_MSR ((UART_RSA_BASE) + 0) - -#define UART_RSA_MSR_SWAP (1 << 0) -#define UART_RSA_MSR_FIFO (1 << 2) -#define UART_RSA_MSR_FLOW (1 << 3) -#define UART_RSA_MSR_ITYP (1 << 4) - -#define UART_RSA_IER ((UART_RSA_BASE) + 1) - -#define UART_RSA_IER_Rx_FIFO_H (1 << 0) -#define UART_RSA_IER_Tx_FIFO_H (1 << 1) -#define UART_RSA_IER_Tx_FIFO_E (1 << 2) -#define UART_RSA_IER_Rx_TOUT (1 << 3) -#define UART_RSA_IER_TIMER (1 << 4) - -#define UART_RSA_SRR ((UART_RSA_BASE) + 2) - -#define UART_RSA_SRR_Tx_FIFO_NEMP (1 << 0) -#define UART_RSA_SRR_Tx_FIFO_NHFL (1 << 1) -#define UART_RSA_SRR_Tx_FIFO_NFUL (1 << 2) -#define UART_RSA_SRR_Rx_FIFO_NEMP (1 << 3) -#define UART_RSA_SRR_Rx_FIFO_NHFL (1 << 4) -#define UART_RSA_SRR_Rx_FIFO_NFUL (1 << 5) -#define UART_RSA_SRR_Rx_TOUT (1 << 6) -#define UART_RSA_SRR_TIMER (1 << 7) - -#define UART_RSA_FRR ((UART_RSA_BASE) + 2) - -#define UART_RSA_TIVSR ((UART_RSA_BASE) + 3) - -#define UART_RSA_TCR ((UART_RSA_BASE) + 4) - -#define UART_RSA_TCR_SWITCH (1 << 0) - -#define SERIAL_RSA_BAUD_BASE (921600) -#define SERIAL_RSA_BAUD_BASE_LO (SERIAL_RSA_BAUD_BASE / 8) - -#define UART_OMAP_MDR1 0x08 -#define UART_OMAP_MDR2 0x09 -#define UART_OMAP_SCR 0x10 -#define UART_OMAP_SSR 0x11 -#define UART_OMAP_EBLR 0x12 -#define UART_OMAP_OSC_12M_SEL 0x13 -#define UART_OMAP_MVER 0x14 -#define UART_OMAP_SYSC 0x15 -#define UART_OMAP_SYSS 0x16 - -#endif - diff --git a/libc/kernel/common/linux/serio.h b/libc/kernel/common/linux/serio.h deleted file mode 100644 index 7f049873c..000000000 --- a/libc/kernel/common/linux/serio.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _SERIO_H -#define _SERIO_H - -#include - -#define SPIOCSTYPE _IOW('q', 0x01, unsigned long) - -#define SERIO_TIMEOUT 1 -#define SERIO_PARITY 2 -#define SERIO_FRAME 4 - -#define SERIO_XT 0x00 -#define SERIO_8042 0x01 -#define SERIO_RS232 0x02 -#define SERIO_HIL_MLC 0x03 -#define SERIO_PS_PSTHRU 0x05 -#define SERIO_8042_XL 0x06 - -#define SERIO_UNKNOWN 0x00 -#define SERIO_MSC 0x01 -#define SERIO_SUN 0x02 -#define SERIO_MS 0x03 -#define SERIO_MP 0x04 -#define SERIO_MZ 0x05 -#define SERIO_MZP 0x06 -#define SERIO_MZPP 0x07 -#define SERIO_VSXXXAA 0x08 -#define SERIO_SUNKBD 0x10 -#define SERIO_WARRIOR 0x18 -#define SERIO_SPACEORB 0x19 -#define SERIO_MAGELLAN 0x1a -#define SERIO_SPACEBALL 0x1b -#define SERIO_GUNZE 0x1c -#define SERIO_IFORCE 0x1d -#define SERIO_STINGER 0x1e -#define SERIO_NEWTON 0x1f -#define SERIO_STOWAWAY 0x20 -#define SERIO_H3600 0x21 -#define SERIO_PS2SER 0x22 -#define SERIO_TWIDKBD 0x23 -#define SERIO_TWIDJOY 0x24 -#define SERIO_HIL 0x25 -#define SERIO_SNES232 0x26 -#define SERIO_SEMTECH 0x27 -#define SERIO_LKKBD 0x28 -#define SERIO_ELO 0x29 -#define SERIO_MICROTOUCH 0x30 - -#endif diff --git a/libc/kernel/common/linux/shm.h b/libc/kernel/common/linux/shm.h deleted file mode 100644 index a7056db93..000000000 --- a/libc/kernel/common/linux/shm.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SHM_H_ -#define _LINUX_SHM_H_ - -#include -#include -#include - -#define SHMMAX 0x2000000 -#define SHMMIN 1 -#define SHMMNI 4096 -#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) -#define SHMSEG SHMMNI - -#include - -struct shmid_ds { - struct ipc_perm shm_perm; - int shm_segsz; - __kernel_time_t shm_atime; - __kernel_time_t shm_dtime; - __kernel_time_t shm_ctime; - __kernel_ipc_pid_t shm_cpid; - __kernel_ipc_pid_t shm_lpid; - unsigned short shm_nattch; - unsigned short shm_unused; - void *shm_unused2; - void *shm_unused3; -}; - -#include - -#define SHM_R 0400 -#define SHM_W 0200 - -#define SHM_RDONLY 010000 -#define SHM_RND 020000 -#define SHM_REMAP 040000 -#define SHM_EXEC 0100000 - -#define SHM_LOCK 11 -#define SHM_UNLOCK 12 - -#define SHM_STAT 13 -#define SHM_INFO 14 - -struct shminfo { - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; -}; - -struct shm_info { - int used_ids; - unsigned long shm_tot; - unsigned long shm_rss; - unsigned long shm_swp; - unsigned long swap_attempts; - unsigned long swap_successes; -}; - -#endif diff --git a/libc/kernel/common/linux/signal.h b/libc/kernel/common/linux/signal.h deleted file mode 100644 index 4577e545b..000000000 --- a/libc/kernel/common/linux/signal.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SIGNAL_H -#define _LINUX_SIGNAL_H - -#include -#include - -#endif diff --git a/libc/kernel/common/linux/skbuff.h b/libc/kernel/common/linux/skbuff.h deleted file mode 100644 index 82140a625..000000000 --- a/libc/kernel/common/linux/skbuff.h +++ /dev/null @@ -1,164 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SKBUFF_H -#define _LINUX_SKBUFF_H - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define HAVE_ALLOC_SKB -#define HAVE_ALIGNABLE_SKB - -#define CHECKSUM_NONE 0 -#define CHECKSUM_HW 1 -#define CHECKSUM_UNNECESSARY 2 - -#define SKB_DATA_ALIGN(X) (((X) + (SMP_CACHE_BYTES - 1)) & ~(SMP_CACHE_BYTES - 1)) -#define SKB_MAX_ORDER(X, ORDER) (((PAGE_SIZE << (ORDER)) - (X) - sizeof(struct skb_shared_info)) & ~(SMP_CACHE_BYTES - 1)) -#define SKB_MAX_HEAD(X) (SKB_MAX_ORDER((X), 0)) -#define SKB_MAX_ALLOC (SKB_MAX_ORDER(0, 2)) - -struct net_device; - -struct sk_buff_head { - - struct sk_buff *next; - struct sk_buff *prev; - - __u32 qlen; - spinlock_t lock; -}; - -struct sk_buff; - -#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2) - -typedef struct skb_frag_struct skb_frag_t; - -struct skb_frag_struct { - struct page *page; - __u16 page_offset; - __u16 size; -}; - -struct skb_shared_info { - atomic_t dataref; - unsigned short nr_frags; - unsigned short gso_size; - - unsigned short gso_segs; - unsigned short gso_type; - unsigned int ip6_frag_id; - struct sk_buff *frag_list; - skb_frag_t frags[MAX_SKB_FRAGS]; -}; - -#define SKB_DATAREF_SHIFT 16 -#define SKB_DATAREF_MASK ((1 << SKB_DATAREF_SHIFT) - 1) - -struct skb_timeval { - u32 off_sec; - u32 off_usec; -}; - -enum { - SKB_FCLONE_UNAVAILABLE, - SKB_FCLONE_ORIG, - SKB_FCLONE_CLONE, -}; - -enum { - SKB_GSO_TCPV4 = 1 << 0, - SKB_GSO_UDP = 1 << 1, - - SKB_GSO_DODGY = 1 << 2, - - SKB_GSO_TCP_ECN = 1 << 3, - - SKB_GSO_TCPV6 = 1 << 4, -}; - -struct sk_buff { - - struct sk_buff *next; - struct sk_buff *prev; - - struct sock *sk; - struct skb_timeval tstamp; - struct net_device *dev; - struct net_device *input_dev; - - union { - struct tcphdr *th; - struct udphdr *uh; - struct icmphdr *icmph; - struct igmphdr *igmph; - struct iphdr *ipiph; - struct ipv6hdr *ipv6h; - unsigned char *raw; - } h; - - union { - struct iphdr *iph; - struct ipv6hdr *ipv6h; - struct arphdr *arph; - unsigned char *raw; - } nh; - - union { - unsigned char *raw; - } mac; - - struct dst_entry *dst; - struct sec_path *sp; - - char cb[48]; - - unsigned int len, - data_len, - mac_len, - csum; - __u32 priority; - __u8 local_df:1, - cloned:1, - ip_summed:2, - nohdr:1, - nfctinfo:3; - __u8 pkt_type:3, - fclone:2, - ipvs_property:1; - __be16 protocol; - - void (*destructor)(struct sk_buff *skb); - - unsigned int truesize; - atomic_t users; - unsigned char *head, - *data, - *tail, - *end; -}; - -#endif diff --git a/libc/kernel/common/linux/slab.h b/libc/kernel/common/linux/slab.h deleted file mode 100644 index f165a935b..000000000 --- a/libc/kernel/common/linux/slab.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SLAB_H -#define _LINUX_SLAB_H - -#endif diff --git a/libc/kernel/common/linux/smb.h b/libc/kernel/common/linux/smb.h deleted file mode 100644 index 72c896711..000000000 --- a/libc/kernel/common/linux/smb.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SMB_H -#define _LINUX_SMB_H - -#include - -enum smb_protocol { - SMB_PROTOCOL_NONE, - SMB_PROTOCOL_CORE, - SMB_PROTOCOL_COREPLUS, - SMB_PROTOCOL_LANMAN1, - SMB_PROTOCOL_LANMAN2, - SMB_PROTOCOL_NT1 -}; - -enum smb_case_hndl { - SMB_CASE_DEFAULT, - SMB_CASE_LOWER, - SMB_CASE_UPPER -}; - -struct smb_dskattr { - __u16 total; - __u16 allocblocks; - __u16 blocksize; - __u16 free; -}; - -struct smb_conn_opt { - - unsigned int fd; - - enum smb_protocol protocol; - enum smb_case_hndl case_handling; - - __u32 max_xmit; - __u16 server_uid; - __u16 tid; - - __u16 secmode; - __u16 maxmux; - __u16 maxvcs; - __u16 rawmode; - __u32 sesskey; - - __u32 maxraw; - __u32 capabilities; - __s16 serverzone; -}; - -#endif diff --git a/libc/kernel/common/linux/smp.h b/libc/kernel/common/linux/smp.h deleted file mode 100644 index ab4982d36..000000000 --- a/libc/kernel/common/linux/smp.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SMP_H -#define __LINUX_SMP_H - -#define raw_smp_processor_id() 0 -#define hard_smp_processor_id() 0 -#define smp_call_function(func,info,retry,wait) (up_smp_call_function()) -#define on_each_cpu(func,info,retry,wait) ({ local_irq_disable(); func(info); local_irq_enable(); 0; }) -#define num_booting_cpus() 1 -#define smp_prepare_boot_cpu() do {} while (0) -#define smp_processor_id() raw_smp_processor_id() -#define get_cpu() ({ preempt_disable(); smp_processor_id(); }) -#define put_cpu() preempt_enable() -#define put_cpu_no_resched() preempt_enable_no_resched() - -#endif diff --git a/libc/kernel/common/linux/smp_lock.h b/libc/kernel/common/linux/smp_lock.h deleted file mode 100644 index 523a97025..000000000 --- a/libc/kernel/common/linux/smp_lock.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SMPLOCK_H -#define __LINUX_SMPLOCK_H - -#define lock_kernel() do { } while(0) -#define unlock_kernel() do { } while(0) -#define release_kernel_lock(task) do { } while(0) -#define reacquire_kernel_lock(task) 0 -#define kernel_locked() 1 - -#endif diff --git a/libc/kernel/common/linux/socket.h b/libc/kernel/common/linux/socket.h deleted file mode 100644 index b578df943..000000000 --- a/libc/kernel/common/linux/socket.h +++ /dev/null @@ -1,227 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SOCKET_H -#define _LINUX_SOCKET_H - -#define _K_SS_MAXSIZE 128 -#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *)) - -struct __kernel_sockaddr_storage { - unsigned short ss_family; - - char __data[_K_SS_MAXSIZE - sizeof(unsigned short)]; - -} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); - -#if !defined(__GLIBC__) || __GLIBC__ < 2 - -#include -#include -#include -#include -#include - -typedef unsigned short sa_family_t; - -struct sockaddr { - sa_family_t sa_family; - char sa_data[14]; -}; - -struct linger { - int l_onoff; - int l_linger; -}; - -#define sockaddr_storage __kernel_sockaddr_storage - -struct msghdr { - void * msg_name; - int msg_namelen; - struct iovec * msg_iov; - __kernel_size_t msg_iovlen; - void * msg_control; - __kernel_size_t msg_controllen; - unsigned msg_flags; -}; - -struct cmsghdr { - __kernel_size_t cmsg_len; - int cmsg_level; - int cmsg_type; -}; - -#define __CMSG_NXTHDR(ctl, len, cmsg) __cmsg_nxthdr((ctl),(len),(cmsg)) -#define CMSG_NXTHDR(mhdr, cmsg) cmsg_nxthdr((mhdr), (cmsg)) - -#define CMSG_ALIGN(len) ( ((len)+sizeof(long)-1) & ~(sizeof(long)-1) ) - -#define CMSG_DATA(cmsg) ((void *)((char *)(cmsg) + CMSG_ALIGN(sizeof(struct cmsghdr)))) -#define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(len)) -#define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr)) + (len)) - -#define __CMSG_FIRSTHDR(ctl,len) ((len) >= sizeof(struct cmsghdr) ? (struct cmsghdr *)(ctl) : (struct cmsghdr *)NULL) -#define CMSG_FIRSTHDR(msg) __CMSG_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) -#define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && (cmsg)->cmsg_len <= (unsigned long) ((mhdr)->msg_controllen - ((char *)(cmsg) - (char *)(mhdr)->msg_control))) - -#ifdef __GNUC__ -#define __KINLINE static __inline__ -#elif defined(__cplusplus) -#define __KINLINE static inline -#else -#define __KINLINE static -#endif - -__KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size, - struct cmsghdr *__cmsg) -{ - struct cmsghdr * __ptr; - - __ptr = (struct cmsghdr*)(((unsigned char *) __cmsg) + CMSG_ALIGN(__cmsg->cmsg_len)); - if ((unsigned long)((char*)(__ptr+1) - (char *) __ctl) > __size) - return (struct cmsghdr *)0; - - return __ptr; -} - -__KINLINE struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr *__cmsg) -{ - return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg); -} - -#define SCM_RIGHTS 0x01 -#define SCM_CREDENTIALS 0x02 -#define SCM_SECURITY 0x03 - -struct ucred { - __u32 pid; - __u32 uid; - __u32 gid; -}; - -#define AF_UNSPEC 0 -#define AF_UNIX 1 -#define AF_LOCAL 1 -#define AF_INET 2 -#define AF_AX25 3 -#define AF_IPX 4 -#define AF_APPLETALK 5 -#define AF_NETROM 6 -#define AF_BRIDGE 7 -#define AF_ATMPVC 8 -#define AF_X25 9 -#define AF_INET6 10 -#define AF_ROSE 11 -#define AF_DECnet 12 -#define AF_NETBEUI 13 -#define AF_SECURITY 14 -#define AF_KEY 15 -#define AF_NETLINK 16 -#define AF_ROUTE AF_NETLINK -#define AF_PACKET 17 -#define AF_ASH 18 -#define AF_ECONET 19 -#define AF_ATMSVC 20 -#define AF_SNA 22 -#define AF_IRDA 23 -#define AF_PPPOX 24 -#define AF_WANPIPE 25 -#define AF_LLC 26 -#define AF_TIPC 30 -#define AF_BLUETOOTH 31 -#define AF_MAX 32 - -#define PF_UNSPEC AF_UNSPEC -#define PF_UNIX AF_UNIX -#define PF_LOCAL AF_LOCAL -#define PF_INET AF_INET -#define PF_AX25 AF_AX25 -#define PF_IPX AF_IPX -#define PF_APPLETALK AF_APPLETALK -#define PF_NETROM AF_NETROM -#define PF_BRIDGE AF_BRIDGE -#define PF_ATMPVC AF_ATMPVC -#define PF_X25 AF_X25 -#define PF_INET6 AF_INET6 -#define PF_ROSE AF_ROSE -#define PF_DECnet AF_DECnet -#define PF_NETBEUI AF_NETBEUI -#define PF_SECURITY AF_SECURITY -#define PF_KEY AF_KEY -#define PF_NETLINK AF_NETLINK -#define PF_ROUTE AF_ROUTE -#define PF_PACKET AF_PACKET -#define PF_ASH AF_ASH -#define PF_ECONET AF_ECONET -#define PF_ATMSVC AF_ATMSVC -#define PF_SNA AF_SNA -#define PF_IRDA AF_IRDA -#define PF_PPPOX AF_PPPOX -#define PF_WANPIPE AF_WANPIPE -#define PF_LLC AF_LLC -#define PF_TIPC AF_TIPC -#define PF_BLUETOOTH AF_BLUETOOTH -#define PF_MAX AF_MAX - -#define SOMAXCONN 128 - -#define MSG_OOB 1 -#define MSG_PEEK 2 -#define MSG_DONTROUTE 4 -#define MSG_TRYHARD 4 -#define MSG_CTRUNC 8 -#define MSG_PROBE 0x10 -#define MSG_TRUNC 0x20 -#define MSG_DONTWAIT 0x40 -#define MSG_EOR 0x80 -#define MSG_WAITALL 0x100 -#define MSG_FIN 0x200 -#define MSG_SYN 0x400 -#define MSG_CONFIRM 0x800 -#define MSG_RST 0x1000 -#define MSG_ERRQUEUE 0x2000 -#define MSG_NOSIGNAL 0x4000 -#define MSG_MORE 0x8000 - -#define MSG_EOF MSG_FIN - -#define MSG_CMSG_COMPAT 0 - -#define SOL_IP 0 - -#define SOL_TCP 6 -#define SOL_UDP 17 -#define SOL_IPV6 41 -#define SOL_ICMPV6 58 -#define SOL_SCTP 132 -#define SOL_RAW 255 -#define SOL_IPX 256 -#define SOL_AX25 257 -#define SOL_ATALK 258 -#define SOL_NETROM 259 -#define SOL_ROSE 260 -#define SOL_DECNET 261 -#define SOL_X25 262 -#define SOL_PACKET 263 -#define SOL_ATM 264 -#define SOL_AAL 265 -#define SOL_IRDA 266 -#define SOL_NETBEUI 267 -#define SOL_LLC 268 -#define SOL_DCCP 269 -#define SOL_NETLINK 270 -#define SOL_TIPC 271 - -#define IPX_TYPE 1 - -#endif -#endif diff --git a/libc/kernel/common/linux/sockios.h b/libc/kernel/common/linux/sockios.h deleted file mode 100644 index d1113593d..000000000 --- a/libc/kernel/common/linux/sockios.h +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SOCKIOS_H -#define _LINUX_SOCKIOS_H - -#include - -#define SIOCINQ FIONREAD -#define SIOCOUTQ TIOCOUTQ - -#define SIOCADDRT 0x890B -#define SIOCDELRT 0x890C -#define SIOCRTMSG 0x890D - -#define SIOCGIFNAME 0x8910 -#define SIOCSIFLINK 0x8911 -#define SIOCGIFCONF 0x8912 -#define SIOCGIFFLAGS 0x8913 -#define SIOCSIFFLAGS 0x8914 -#define SIOCGIFADDR 0x8915 -#define SIOCSIFADDR 0x8916 -#define SIOCGIFDSTADDR 0x8917 -#define SIOCSIFDSTADDR 0x8918 -#define SIOCGIFBRDADDR 0x8919 -#define SIOCSIFBRDADDR 0x891a -#define SIOCGIFNETMASK 0x891b -#define SIOCSIFNETMASK 0x891c -#define SIOCGIFMETRIC 0x891d -#define SIOCSIFMETRIC 0x891e -#define SIOCGIFMEM 0x891f -#define SIOCSIFMEM 0x8920 -#define SIOCGIFMTU 0x8921 -#define SIOCSIFMTU 0x8922 -#define SIOCSIFNAME 0x8923 -#define SIOCSIFHWADDR 0x8924 -#define SIOCGIFENCAP 0x8925 -#define SIOCSIFENCAP 0x8926 -#define SIOCGIFHWADDR 0x8927 -#define SIOCGIFSLAVE 0x8929 -#define SIOCSIFSLAVE 0x8930 -#define SIOCADDMULTI 0x8931 -#define SIOCDELMULTI 0x8932 -#define SIOCGIFINDEX 0x8933 -#define SIOGIFINDEX SIOCGIFINDEX -#define SIOCSIFPFLAGS 0x8934 -#define SIOCGIFPFLAGS 0x8935 -#define SIOCDIFADDR 0x8936 -#define SIOCSIFHWBROADCAST 0x8937 -#define SIOCGIFCOUNT 0x8938 -#define SIOCKILLADDR 0x8939 - -#define SIOCGIFBR 0x8940 -#define SIOCSIFBR 0x8941 - -#define SIOCGIFTXQLEN 0x8942 -#define SIOCSIFTXQLEN 0x8943 - -#define SIOCETHTOOL 0x8946 - -#define SIOCGMIIPHY 0x8947 -#define SIOCGMIIREG 0x8948 -#define SIOCSMIIREG 0x8949 - -#define SIOCWANDEV 0x894A - -#define SIOCDARP 0x8953 -#define SIOCGARP 0x8954 -#define SIOCSARP 0x8955 - -#define SIOCDRARP 0x8960 -#define SIOCGRARP 0x8961 -#define SIOCSRARP 0x8962 - -#define SIOCGIFMAP 0x8970 -#define SIOCSIFMAP 0x8971 - -#define SIOCADDDLCI 0x8980 -#define SIOCDELDLCI 0x8981 - -#define SIOCGIFVLAN 0x8982 -#define SIOCSIFVLAN 0x8983 - -#define SIOCBONDENSLAVE 0x8990 -#define SIOCBONDRELEASE 0x8991 -#define SIOCBONDSETHWADDR 0x8992 -#define SIOCBONDSLAVEINFOQUERY 0x8993 -#define SIOCBONDINFOQUERY 0x8994 -#define SIOCBONDCHANGEACTIVE 0x8995 - -#define SIOCBRADDBR 0x89a0 -#define SIOCBRDELBR 0x89a1 -#define SIOCBRADDIF 0x89a2 -#define SIOCBRDELIF 0x89a3 - -#define SIOCDEVPRIVATE 0x89F0 - -#define SIOCPROTOPRIVATE 0x89E0 -#endif diff --git a/libc/kernel/common/linux/soundcard.h b/libc/kernel/common/linux/soundcard.h deleted file mode 100644 index 8c69c28c5..000000000 --- a/libc/kernel/common/linux/soundcard.h +++ /dev/null @@ -1,831 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef SOUNDCARD_H -#define SOUNDCARD_H - -#define SOUND_VERSION 0x030802 -#define OPEN_SOUND_SYSTEM - -#include - -#include - -#define SNDCARD_ADLIB 1 -#define SNDCARD_SB 2 -#define SNDCARD_PAS 3 -#define SNDCARD_GUS 4 -#define SNDCARD_MPU401 5 -#define SNDCARD_SB16 6 -#define SNDCARD_SB16MIDI 7 -#define SNDCARD_UART6850 8 -#define SNDCARD_GUS16 9 -#define SNDCARD_MSS 10 -#define SNDCARD_PSS 11 -#define SNDCARD_SSCAPE 12 -#define SNDCARD_PSS_MPU 13 -#define SNDCARD_PSS_MSS 14 -#define SNDCARD_SSCAPE_MSS 15 -#define SNDCARD_TRXPRO 16 -#define SNDCARD_TRXPRO_SB 17 -#define SNDCARD_TRXPRO_MPU 18 -#define SNDCARD_MAD16 19 -#define SNDCARD_MAD16_MPU 20 -#define SNDCARD_CS4232 21 -#define SNDCARD_CS4232_MPU 22 -#define SNDCARD_MAUI 23 -#define SNDCARD_PSEUDO_MSS 24 -#define SNDCARD_GUSPNP 25 -#define SNDCARD_UART401 26 - -#ifndef _SIOWR -#if defined(_IOWR) && (defined(_AIX) || !defined(sun) && !defined(sparc) && !defined(__sparc__) && !defined(__INCioctlh) && !defined(__Lynx__)) - -#define SIOCPARM_MASK IOCPARM_MASK -#define SIOC_VOID IOC_VOID -#define SIOC_OUT IOC_OUT -#define SIOC_IN IOC_IN -#define SIOC_INOUT IOC_INOUT -#define _SIOC_SIZE _IOC_SIZE -#define _SIOC_DIR _IOC_DIR -#define _SIOC_NONE _IOC_NONE -#define _SIOC_READ _IOC_READ -#define _SIOC_WRITE _IOC_WRITE -#define _SIO _IO -#define _SIOR _IOR -#define _SIOW _IOW -#define _SIOWR _IOWR -#else - -#define SIOCPARM_MASK 0x1fff -#define SIOC_VOID 0x00000000 -#define SIOC_OUT 0x20000000 -#define SIOC_IN 0x40000000 -#define SIOC_INOUT (SIOC_IN|SIOC_OUT) - -#define _SIO(x,y) ((int)(SIOC_VOID|(x<<8)|y)) -#define _SIOR(x,y,t) ((int)(SIOC_OUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y)) -#define _SIOW(x,y,t) ((int)(SIOC_IN|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y)) - -#define _SIOWR(x,y,t) ((int)(SIOC_INOUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y)) -#define _SIOC_SIZE(x) ((x>>16)&SIOCPARM_MASK) -#define _SIOC_DIR(x) (x & 0xf0000000) -#define _SIOC_NONE SIOC_VOID -#define _SIOC_READ SIOC_OUT -#define _SIOC_WRITE SIOC_IN -#endif -#endif - -#define SNDCTL_SEQ_RESET _SIO ('Q', 0) -#define SNDCTL_SEQ_SYNC _SIO ('Q', 1) -#define SNDCTL_SYNTH_INFO _SIOWR('Q', 2, struct synth_info) -#define SNDCTL_SEQ_CTRLRATE _SIOWR('Q', 3, int) -#define SNDCTL_SEQ_GETOUTCOUNT _SIOR ('Q', 4, int) -#define SNDCTL_SEQ_GETINCOUNT _SIOR ('Q', 5, int) -#define SNDCTL_SEQ_PERCMODE _SIOW ('Q', 6, int) -#define SNDCTL_FM_LOAD_INSTR _SIOW ('Q', 7, struct sbi_instrument) -#define SNDCTL_SEQ_TESTMIDI _SIOW ('Q', 8, int) -#define SNDCTL_SEQ_RESETSAMPLES _SIOW ('Q', 9, int) -#define SNDCTL_SEQ_NRSYNTHS _SIOR ('Q',10, int) -#define SNDCTL_SEQ_NRMIDIS _SIOR ('Q',11, int) -#define SNDCTL_MIDI_INFO _SIOWR('Q',12, struct midi_info) -#define SNDCTL_SEQ_THRESHOLD _SIOW ('Q',13, int) -#define SNDCTL_SYNTH_MEMAVL _SIOWR('Q',14, int) -#define SNDCTL_FM_4OP_ENABLE _SIOW ('Q',15, int) -#define SNDCTL_SEQ_PANIC _SIO ('Q',17) -#define SNDCTL_SEQ_OUTOFBAND _SIOW ('Q',18, struct seq_event_rec) -#define SNDCTL_SEQ_GETTIME _SIOR ('Q',19, int) -#define SNDCTL_SYNTH_ID _SIOWR('Q',20, struct synth_info) -#define SNDCTL_SYNTH_CONTROL _SIOWR('Q',21, struct synth_control) -#define SNDCTL_SYNTH_REMOVESAMPLE _SIOWR('Q',22, struct remove_sample) - -typedef struct synth_control -{ - int devno; - char data[4000]; -}synth_control; - -typedef struct remove_sample -{ - int devno; - int bankno; - int instrno; -} remove_sample; - -typedef struct seq_event_rec { - unsigned char arr[8]; -} seq_event_rec; - -#define SNDCTL_TMR_TIMEBASE _SIOWR('T', 1, int) -#define SNDCTL_TMR_START _SIO ('T', 2) -#define SNDCTL_TMR_STOP _SIO ('T', 3) -#define SNDCTL_TMR_CONTINUE _SIO ('T', 4) -#define SNDCTL_TMR_TEMPO _SIOWR('T', 5, int) -#define SNDCTL_TMR_SOURCE _SIOWR('T', 6, int) -#define TMR_INTERNAL 0x00000001 -#define TMR_EXTERNAL 0x00000002 -#define TMR_MODE_MIDI 0x00000010 -#define TMR_MODE_FSK 0x00000020 -#define TMR_MODE_CLS 0x00000040 -#define TMR_MODE_SMPTE 0x00000080 -#define SNDCTL_TMR_METRONOME _SIOW ('T', 7, int) -#define SNDCTL_TMR_SELECT _SIOW ('T', 8, int) - -#define _LINUX_PATCHKEY_H_INDIRECT -#include -#undef _LINUX_PATCHKEY_H_INDIRECT - -#ifdef __BYTE_ORDER -#if __BYTE_ORDER == __BIG_ENDIAN -#define AFMT_S16_NE AFMT_S16_BE -#elif __BYTE_ORDER == __LITTLE_ENDIAN -#define AFMT_S16_NE AFMT_S16_LE -#else -#error "could not determine byte order" -#endif -#endif - -struct patch_info { - unsigned short key; -#define WAVE_PATCH _PATCHKEY(0x04) -#define GUS_PATCH WAVE_PATCH -#define WAVEFRONT_PATCH _PATCHKEY(0x06) - - short device_no; - short instr_no; - - unsigned int mode; - -#define WAVE_16_BITS 0x01 -#define WAVE_UNSIGNED 0x02 -#define WAVE_LOOPING 0x04 -#define WAVE_BIDIR_LOOP 0x08 -#define WAVE_LOOP_BACK 0x10 -#define WAVE_SUSTAIN_ON 0x20 -#define WAVE_ENVELOPES 0x40 -#define WAVE_FAST_RELEASE 0x80 - -#define WAVE_VIBRATO 0x00010000 -#define WAVE_TREMOLO 0x00020000 -#define WAVE_SCALE 0x00040000 -#define WAVE_FRACTIONS 0x00080000 - -#define WAVE_ROM 0x40000000 -#define WAVE_MULAW 0x20000000 - - int len; - int loop_start, loop_end; - - unsigned int base_freq; - unsigned int base_note; - unsigned int high_note; - unsigned int low_note; - int panning; - int detuning; - - unsigned char env_rate[ 6 ]; - unsigned char env_offset[ 6 ]; - - unsigned char tremolo_sweep; - unsigned char tremolo_rate; - unsigned char tremolo_depth; - - unsigned char vibrato_sweep; - unsigned char vibrato_rate; - unsigned char vibrato_depth; - - int scale_frequency; - unsigned int scale_factor; - - int volume; - int fractions; - int reserved1; - int spare[2]; - char data[1]; - }; - -struct sysex_info { - short key; -#define SYSEX_PATCH _PATCHKEY(0x05) -#define MAUI_PATCH _PATCHKEY(0x06) - short device_no; - int len; - unsigned char data[1]; - }; - -#define SEQ_NOTEOFF 0 -#define SEQ_FMNOTEOFF SEQ_NOTEOFF -#define SEQ_NOTEON 1 -#define SEQ_FMNOTEON SEQ_NOTEON -#define SEQ_WAIT TMR_WAIT_ABS -#define SEQ_PGMCHANGE 3 -#define SEQ_FMPGMCHANGE SEQ_PGMCHANGE -#define SEQ_SYNCTIMER TMR_START -#define SEQ_MIDIPUTC 5 -#define SEQ_DRUMON 6 -#define SEQ_DRUMOFF 7 -#define SEQ_ECHO TMR_ECHO -#define SEQ_AFTERTOUCH 9 -#define SEQ_CONTROLLER 10 - -#define CTL_BANK_SELECT 0x00 -#define CTL_MODWHEEL 0x01 -#define CTL_BREATH 0x02 - -#define CTL_FOOT 0x04 -#define CTL_PORTAMENTO_TIME 0x05 -#define CTL_DATA_ENTRY 0x06 -#define CTL_MAIN_VOLUME 0x07 -#define CTL_BALANCE 0x08 - -#define CTL_PAN 0x0a -#define CTL_EXPRESSION 0x0b - -#define CTL_GENERAL_PURPOSE1 0x10 -#define CTL_GENERAL_PURPOSE2 0x11 -#define CTL_GENERAL_PURPOSE3 0x12 -#define CTL_GENERAL_PURPOSE4 0x13 - -#define CTL_DAMPER_PEDAL 0x40 -#define CTL_SUSTAIN 0x40 -#define CTL_HOLD 0x40 -#define CTL_PORTAMENTO 0x41 -#define CTL_SOSTENUTO 0x42 -#define CTL_SOFT_PEDAL 0x43 - -#define CTL_HOLD2 0x45 - -#define CTL_GENERAL_PURPOSE5 0x50 -#define CTL_GENERAL_PURPOSE6 0x51 -#define CTL_GENERAL_PURPOSE7 0x52 -#define CTL_GENERAL_PURPOSE8 0x53 - -#define CTL_EXT_EFF_DEPTH 0x5b -#define CTL_TREMOLO_DEPTH 0x5c -#define CTL_CHORUS_DEPTH 0x5d -#define CTL_DETUNE_DEPTH 0x5e -#define CTL_CELESTE_DEPTH 0x5e -#define CTL_PHASER_DEPTH 0x5f -#define CTL_DATA_INCREMENT 0x60 -#define CTL_DATA_DECREMENT 0x61 -#define CTL_NONREG_PARM_NUM_LSB 0x62 -#define CTL_NONREG_PARM_NUM_MSB 0x63 -#define CTL_REGIST_PARM_NUM_LSB 0x64 -#define CTL_REGIST_PARM_NUM_MSB 0x65 - -#define CTRL_PITCH_BENDER 255 -#define CTRL_PITCH_BENDER_RANGE 254 -#define CTRL_EXPRESSION 253 -#define CTRL_MAIN_VOLUME 252 -#define SEQ_BALANCE 11 -#define SEQ_VOLMODE 12 - -#define VOL_METHOD_ADAGIO 1 -#define VOL_METHOD_LINEAR 2 - -#define SEQ_FULLSIZE 0xfd - -#define SEQ_PRIVATE 0xfe -#define SEQ_EXTENDED 0xff - -typedef unsigned char sbi_instr_data[32]; - -struct sbi_instrument { - unsigned short key; -#define FM_PATCH _PATCHKEY(0x01) -#define OPL3_PATCH _PATCHKEY(0x03) - short device; - int channel; - sbi_instr_data operators; - }; - -struct synth_info { - char name[30]; - int device; - int synth_type; -#define SYNTH_TYPE_FM 0 -#define SYNTH_TYPE_SAMPLE 1 -#define SYNTH_TYPE_MIDI 2 - - int synth_subtype; -#define FM_TYPE_ADLIB 0x00 -#define FM_TYPE_OPL3 0x01 -#define MIDI_TYPE_MPU401 0x401 - -#define SAMPLE_TYPE_BASIC 0x10 -#define SAMPLE_TYPE_GUS SAMPLE_TYPE_BASIC -#define SAMPLE_TYPE_WAVEFRONT 0x11 - - int perc_mode; - int nr_voices; - int nr_drums; - int instr_bank_size; - unsigned int capabilities; -#define SYNTH_CAP_PERCMODE 0x00000001 -#define SYNTH_CAP_OPL3 0x00000002 -#define SYNTH_CAP_INPUT 0x00000004 - int dummies[19]; - }; - -struct sound_timer_info { - char name[32]; - int caps; - }; - -#define MIDI_CAP_MPU401 1 - -struct midi_info { - char name[30]; - int device; - unsigned int capabilities; - int dev_type; - int dummies[18]; - }; - -typedef struct { - unsigned char cmd; - char nr_args, nr_returns; - unsigned char data[30]; - } mpu_command_rec; - -#define SNDCTL_MIDI_PRETIME _SIOWR('m', 0, int) -#define SNDCTL_MIDI_MPUMODE _SIOWR('m', 1, int) -#define SNDCTL_MIDI_MPUCMD _SIOWR('m', 2, mpu_command_rec) - -#define SNDCTL_DSP_RESET _SIO ('P', 0) -#define SNDCTL_DSP_SYNC _SIO ('P', 1) -#define SNDCTL_DSP_SPEED _SIOWR('P', 2, int) -#define SNDCTL_DSP_STEREO _SIOWR('P', 3, int) -#define SNDCTL_DSP_GETBLKSIZE _SIOWR('P', 4, int) -#define SNDCTL_DSP_SAMPLESIZE SNDCTL_DSP_SETFMT -#define SNDCTL_DSP_CHANNELS _SIOWR('P', 6, int) -#define SOUND_PCM_WRITE_CHANNELS SNDCTL_DSP_CHANNELS -#define SOUND_PCM_WRITE_FILTER _SIOWR('P', 7, int) -#define SNDCTL_DSP_POST _SIO ('P', 8) -#define SNDCTL_DSP_SUBDIVIDE _SIOWR('P', 9, int) -#define SNDCTL_DSP_SETFRAGMENT _SIOWR('P',10, int) - -#define SNDCTL_DSP_GETFMTS _SIOR ('P',11, int) -#define SNDCTL_DSP_SETFMT _SIOWR('P',5, int) -#define AFMT_QUERY 0x00000000 -#define AFMT_MU_LAW 0x00000001 -#define AFMT_A_LAW 0x00000002 -#define AFMT_IMA_ADPCM 0x00000004 -#define AFMT_U8 0x00000008 -#define AFMT_S16_LE 0x00000010 -#define AFMT_S16_BE 0x00000020 -#define AFMT_S8 0x00000040 -#define AFMT_U16_LE 0x00000080 -#define AFMT_U16_BE 0x00000100 -#define AFMT_MPEG 0x00000200 -#define AFMT_AC3 0x00000400 - -typedef struct audio_buf_info { - int fragments; - int fragstotal; - int fragsize; - - int bytes; - - } audio_buf_info; - -#define SNDCTL_DSP_GETOSPACE _SIOR ('P',12, audio_buf_info) -#define SNDCTL_DSP_GETISPACE _SIOR ('P',13, audio_buf_info) -#define SNDCTL_DSP_NONBLOCK _SIO ('P',14) -#define SNDCTL_DSP_GETCAPS _SIOR ('P',15, int) -#define DSP_CAP_REVISION 0x000000ff -#define DSP_CAP_DUPLEX 0x00000100 -#define DSP_CAP_REALTIME 0x00000200 -#define DSP_CAP_BATCH 0x00000400 - -#define DSP_CAP_COPROC 0x00000800 - -#define DSP_CAP_TRIGGER 0x00001000 -#define DSP_CAP_MMAP 0x00002000 -#define DSP_CAP_MULTI 0x00004000 -#define DSP_CAP_BIND 0x00008000 - -#define SNDCTL_DSP_GETTRIGGER _SIOR ('P',16, int) -#define SNDCTL_DSP_SETTRIGGER _SIOW ('P',16, int) -#define PCM_ENABLE_INPUT 0x00000001 -#define PCM_ENABLE_OUTPUT 0x00000002 - -typedef struct count_info { - int bytes; - int blocks; - int ptr; - } count_info; - -#define SNDCTL_DSP_GETIPTR _SIOR ('P',17, count_info) -#define SNDCTL_DSP_GETOPTR _SIOR ('P',18, count_info) - -typedef struct buffmem_desc { - unsigned *buffer; - int size; - } buffmem_desc; -#define SNDCTL_DSP_MAPINBUF _SIOR ('P', 19, buffmem_desc) -#define SNDCTL_DSP_MAPOUTBUF _SIOR ('P', 20, buffmem_desc) -#define SNDCTL_DSP_SETSYNCRO _SIO ('P', 21) -#define SNDCTL_DSP_SETDUPLEX _SIO ('P', 22) -#define SNDCTL_DSP_GETODELAY _SIOR ('P', 23, int) - -#define SNDCTL_DSP_GETCHANNELMASK _SIOWR('P', 64, int) -#define SNDCTL_DSP_BIND_CHANNEL _SIOWR('P', 65, int) -#define DSP_BIND_QUERY 0x00000000 -#define DSP_BIND_FRONT 0x00000001 -#define DSP_BIND_SURR 0x00000002 -#define DSP_BIND_CENTER_LFE 0x00000004 -#define DSP_BIND_HANDSET 0x00000008 -#define DSP_BIND_MIC 0x00000010 -#define DSP_BIND_MODEM1 0x00000020 -#define DSP_BIND_MODEM2 0x00000040 -#define DSP_BIND_I2S 0x00000080 -#define DSP_BIND_SPDIF 0x00000100 - -#define SNDCTL_DSP_SETSPDIF _SIOW ('P', 66, int) -#define SNDCTL_DSP_GETSPDIF _SIOR ('P', 67, int) -#define SPDIF_PRO 0x0001 -#define SPDIF_N_AUD 0x0002 -#define SPDIF_COPY 0x0004 -#define SPDIF_PRE 0x0008 -#define SPDIF_CC 0x07f0 -#define SPDIF_L 0x0800 -#define SPDIF_DRS 0x4000 -#define SPDIF_V 0x8000 - -#define SNDCTL_DSP_PROFILE _SIOW ('P', 23, int) -#define APF_NORMAL 0 -#define APF_NETWORK 1 -#define APF_CPUINTENS 2 - -#define SOUND_PCM_READ_RATE _SIOR ('P', 2, int) -#define SOUND_PCM_READ_CHANNELS _SIOR ('P', 6, int) -#define SOUND_PCM_READ_BITS _SIOR ('P', 5, int) -#define SOUND_PCM_READ_FILTER _SIOR ('P', 7, int) - -#define SOUND_PCM_WRITE_BITS SNDCTL_DSP_SETFMT -#define SOUND_PCM_WRITE_RATE SNDCTL_DSP_SPEED -#define SOUND_PCM_POST SNDCTL_DSP_POST -#define SOUND_PCM_RESET SNDCTL_DSP_RESET -#define SOUND_PCM_SYNC SNDCTL_DSP_SYNC -#define SOUND_PCM_SUBDIVIDE SNDCTL_DSP_SUBDIVIDE -#define SOUND_PCM_SETFRAGMENT SNDCTL_DSP_SETFRAGMENT -#define SOUND_PCM_GETFMTS SNDCTL_DSP_GETFMTS -#define SOUND_PCM_SETFMT SNDCTL_DSP_SETFMT -#define SOUND_PCM_GETOSPACE SNDCTL_DSP_GETOSPACE -#define SOUND_PCM_GETISPACE SNDCTL_DSP_GETISPACE -#define SOUND_PCM_NONBLOCK SNDCTL_DSP_NONBLOCK -#define SOUND_PCM_GETCAPS SNDCTL_DSP_GETCAPS -#define SOUND_PCM_GETTRIGGER SNDCTL_DSP_GETTRIGGER -#define SOUND_PCM_SETTRIGGER SNDCTL_DSP_SETTRIGGER -#define SOUND_PCM_SETSYNCRO SNDCTL_DSP_SETSYNCRO -#define SOUND_PCM_GETIPTR SNDCTL_DSP_GETIPTR -#define SOUND_PCM_GETOPTR SNDCTL_DSP_GETOPTR -#define SOUND_PCM_MAPINBUF SNDCTL_DSP_MAPINBUF -#define SOUND_PCM_MAPOUTBUF SNDCTL_DSP_MAPOUTBUF - -typedef struct copr_buffer { - int command; - int flags; -#define CPF_NONE 0x0000 -#define CPF_FIRST 0x0001 -#define CPF_LAST 0x0002 - int len; - int offs; - - unsigned char data[4000]; - } copr_buffer; - -typedef struct copr_debug_buf { - int command; - int parm1; - int parm2; - int flags; - int len; - } copr_debug_buf; - -typedef struct copr_msg { - int len; - unsigned char data[4000]; - } copr_msg; - -#define SNDCTL_COPR_RESET _SIO ('C', 0) -#define SNDCTL_COPR_LOAD _SIOWR('C', 1, copr_buffer) -#define SNDCTL_COPR_RDATA _SIOWR('C', 2, copr_debug_buf) -#define SNDCTL_COPR_RCODE _SIOWR('C', 3, copr_debug_buf) -#define SNDCTL_COPR_WDATA _SIOW ('C', 4, copr_debug_buf) -#define SNDCTL_COPR_WCODE _SIOW ('C', 5, copr_debug_buf) -#define SNDCTL_COPR_RUN _SIOWR('C', 6, copr_debug_buf) -#define SNDCTL_COPR_HALT _SIOWR('C', 7, copr_debug_buf) -#define SNDCTL_COPR_SENDMSG _SIOWR('C', 8, copr_msg) -#define SNDCTL_COPR_RCVMSG _SIOR ('C', 9, copr_msg) - -#define SOUND_MIXER_NRDEVICES 25 -#define SOUND_MIXER_VOLUME 0 -#define SOUND_MIXER_BASS 1 -#define SOUND_MIXER_TREBLE 2 -#define SOUND_MIXER_SYNTH 3 -#define SOUND_MIXER_PCM 4 -#define SOUND_MIXER_SPEAKER 5 -#define SOUND_MIXER_LINE 6 -#define SOUND_MIXER_MIC 7 -#define SOUND_MIXER_CD 8 -#define SOUND_MIXER_IMIX 9 -#define SOUND_MIXER_ALTPCM 10 -#define SOUND_MIXER_RECLEV 11 -#define SOUND_MIXER_IGAIN 12 -#define SOUND_MIXER_OGAIN 13 - -#define SOUND_MIXER_LINE1 14 -#define SOUND_MIXER_LINE2 15 -#define SOUND_MIXER_LINE3 16 -#define SOUND_MIXER_DIGITAL1 17 -#define SOUND_MIXER_DIGITAL2 18 -#define SOUND_MIXER_DIGITAL3 19 -#define SOUND_MIXER_PHONEIN 20 -#define SOUND_MIXER_PHONEOUT 21 -#define SOUND_MIXER_VIDEO 22 -#define SOUND_MIXER_RADIO 23 -#define SOUND_MIXER_MONITOR 24 - -#define SOUND_ONOFF_MIN 28 -#define SOUND_ONOFF_MAX 30 - -#define SOUND_MIXER_NONE 31 - -#define SOUND_MIXER_ENHANCE SOUND_MIXER_NONE -#define SOUND_MIXER_MUTE SOUND_MIXER_NONE -#define SOUND_MIXER_LOUD SOUND_MIXER_NONE - -#define SOUND_DEVICE_LABELS {"Vol ", "Bass ", "Trebl", "Synth", "Pcm ", "Spkr ", "Line ", "Mic ", "CD ", "Mix ", "Pcm2 ", "Rec ", "IGain", "OGain", "Line1", "Line2", "Line3", "Digital1", "Digital2", "Digital3", "PhoneIn", "PhoneOut", "Video", "Radio", "Monitor"} - -#define SOUND_DEVICE_NAMES {"vol", "bass", "treble", "synth", "pcm", "speaker", "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", "line1", "line2", "line3", "dig1", "dig2", "dig3", "phin", "phout", "video", "radio", "monitor"} - -#define SOUND_MIXER_RECSRC 0xff -#define SOUND_MIXER_DEVMASK 0xfe -#define SOUND_MIXER_RECMASK 0xfd -#define SOUND_MIXER_CAPS 0xfc -#define SOUND_CAP_EXCL_INPUT 0x00000001 -#define SOUND_MIXER_STEREODEVS 0xfb -#define SOUND_MIXER_OUTSRC 0xfa -#define SOUND_MIXER_OUTMASK 0xf9 - -#define SOUND_MASK_VOLUME (1 << SOUND_MIXER_VOLUME) -#define SOUND_MASK_BASS (1 << SOUND_MIXER_BASS) -#define SOUND_MASK_TREBLE (1 << SOUND_MIXER_TREBLE) -#define SOUND_MASK_SYNTH (1 << SOUND_MIXER_SYNTH) -#define SOUND_MASK_PCM (1 << SOUND_MIXER_PCM) -#define SOUND_MASK_SPEAKER (1 << SOUND_MIXER_SPEAKER) -#define SOUND_MASK_LINE (1 << SOUND_MIXER_LINE) -#define SOUND_MASK_MIC (1 << SOUND_MIXER_MIC) -#define SOUND_MASK_CD (1 << SOUND_MIXER_CD) -#define SOUND_MASK_IMIX (1 << SOUND_MIXER_IMIX) -#define SOUND_MASK_ALTPCM (1 << SOUND_MIXER_ALTPCM) -#define SOUND_MASK_RECLEV (1 << SOUND_MIXER_RECLEV) -#define SOUND_MASK_IGAIN (1 << SOUND_MIXER_IGAIN) -#define SOUND_MASK_OGAIN (1 << SOUND_MIXER_OGAIN) -#define SOUND_MASK_LINE1 (1 << SOUND_MIXER_LINE1) -#define SOUND_MASK_LINE2 (1 << SOUND_MIXER_LINE2) -#define SOUND_MASK_LINE3 (1 << SOUND_MIXER_LINE3) -#define SOUND_MASK_DIGITAL1 (1 << SOUND_MIXER_DIGITAL1) -#define SOUND_MASK_DIGITAL2 (1 << SOUND_MIXER_DIGITAL2) -#define SOUND_MASK_DIGITAL3 (1 << SOUND_MIXER_DIGITAL3) -#define SOUND_MASK_PHONEIN (1 << SOUND_MIXER_PHONEIN) -#define SOUND_MASK_PHONEOUT (1 << SOUND_MIXER_PHONEOUT) -#define SOUND_MASK_RADIO (1 << SOUND_MIXER_RADIO) -#define SOUND_MASK_VIDEO (1 << SOUND_MIXER_VIDEO) -#define SOUND_MASK_MONITOR (1 << SOUND_MIXER_MONITOR) - -#define SOUND_MASK_MUTE (1 << SOUND_MIXER_MUTE) -#define SOUND_MASK_ENHANCE (1 << SOUND_MIXER_ENHANCE) -#define SOUND_MASK_LOUD (1 << SOUND_MIXER_LOUD) - -#define MIXER_READ(dev) _SIOR('M', dev, int) -#define SOUND_MIXER_READ_VOLUME MIXER_READ(SOUND_MIXER_VOLUME) -#define SOUND_MIXER_READ_BASS MIXER_READ(SOUND_MIXER_BASS) -#define SOUND_MIXER_READ_TREBLE MIXER_READ(SOUND_MIXER_TREBLE) -#define SOUND_MIXER_READ_SYNTH MIXER_READ(SOUND_MIXER_SYNTH) -#define SOUND_MIXER_READ_PCM MIXER_READ(SOUND_MIXER_PCM) -#define SOUND_MIXER_READ_SPEAKER MIXER_READ(SOUND_MIXER_SPEAKER) -#define SOUND_MIXER_READ_LINE MIXER_READ(SOUND_MIXER_LINE) -#define SOUND_MIXER_READ_MIC MIXER_READ(SOUND_MIXER_MIC) -#define SOUND_MIXER_READ_CD MIXER_READ(SOUND_MIXER_CD) -#define SOUND_MIXER_READ_IMIX MIXER_READ(SOUND_MIXER_IMIX) -#define SOUND_MIXER_READ_ALTPCM MIXER_READ(SOUND_MIXER_ALTPCM) -#define SOUND_MIXER_READ_RECLEV MIXER_READ(SOUND_MIXER_RECLEV) -#define SOUND_MIXER_READ_IGAIN MIXER_READ(SOUND_MIXER_IGAIN) -#define SOUND_MIXER_READ_OGAIN MIXER_READ(SOUND_MIXER_OGAIN) -#define SOUND_MIXER_READ_LINE1 MIXER_READ(SOUND_MIXER_LINE1) -#define SOUND_MIXER_READ_LINE2 MIXER_READ(SOUND_MIXER_LINE2) -#define SOUND_MIXER_READ_LINE3 MIXER_READ(SOUND_MIXER_LINE3) - -#define SOUND_MIXER_READ_MUTE MIXER_READ(SOUND_MIXER_MUTE) -#define SOUND_MIXER_READ_ENHANCE MIXER_READ(SOUND_MIXER_ENHANCE) -#define SOUND_MIXER_READ_LOUD MIXER_READ(SOUND_MIXER_LOUD) - -#define SOUND_MIXER_READ_RECSRC MIXER_READ(SOUND_MIXER_RECSRC) -#define SOUND_MIXER_READ_DEVMASK MIXER_READ(SOUND_MIXER_DEVMASK) -#define SOUND_MIXER_READ_RECMASK MIXER_READ(SOUND_MIXER_RECMASK) -#define SOUND_MIXER_READ_STEREODEVS MIXER_READ(SOUND_MIXER_STEREODEVS) -#define SOUND_MIXER_READ_CAPS MIXER_READ(SOUND_MIXER_CAPS) - -#define MIXER_WRITE(dev) _SIOWR('M', dev, int) -#define SOUND_MIXER_WRITE_VOLUME MIXER_WRITE(SOUND_MIXER_VOLUME) -#define SOUND_MIXER_WRITE_BASS MIXER_WRITE(SOUND_MIXER_BASS) -#define SOUND_MIXER_WRITE_TREBLE MIXER_WRITE(SOUND_MIXER_TREBLE) -#define SOUND_MIXER_WRITE_SYNTH MIXER_WRITE(SOUND_MIXER_SYNTH) -#define SOUND_MIXER_WRITE_PCM MIXER_WRITE(SOUND_MIXER_PCM) -#define SOUND_MIXER_WRITE_SPEAKER MIXER_WRITE(SOUND_MIXER_SPEAKER) -#define SOUND_MIXER_WRITE_LINE MIXER_WRITE(SOUND_MIXER_LINE) -#define SOUND_MIXER_WRITE_MIC MIXER_WRITE(SOUND_MIXER_MIC) -#define SOUND_MIXER_WRITE_CD MIXER_WRITE(SOUND_MIXER_CD) -#define SOUND_MIXER_WRITE_IMIX MIXER_WRITE(SOUND_MIXER_IMIX) -#define SOUND_MIXER_WRITE_ALTPCM MIXER_WRITE(SOUND_MIXER_ALTPCM) -#define SOUND_MIXER_WRITE_RECLEV MIXER_WRITE(SOUND_MIXER_RECLEV) -#define SOUND_MIXER_WRITE_IGAIN MIXER_WRITE(SOUND_MIXER_IGAIN) -#define SOUND_MIXER_WRITE_OGAIN MIXER_WRITE(SOUND_MIXER_OGAIN) -#define SOUND_MIXER_WRITE_LINE1 MIXER_WRITE(SOUND_MIXER_LINE1) -#define SOUND_MIXER_WRITE_LINE2 MIXER_WRITE(SOUND_MIXER_LINE2) -#define SOUND_MIXER_WRITE_LINE3 MIXER_WRITE(SOUND_MIXER_LINE3) - -#define SOUND_MIXER_WRITE_MUTE MIXER_WRITE(SOUND_MIXER_MUTE) -#define SOUND_MIXER_WRITE_ENHANCE MIXER_WRITE(SOUND_MIXER_ENHANCE) -#define SOUND_MIXER_WRITE_LOUD MIXER_WRITE(SOUND_MIXER_LOUD) - -#define SOUND_MIXER_WRITE_RECSRC MIXER_WRITE(SOUND_MIXER_RECSRC) - -typedef struct mixer_info -{ - char id[16]; - char name[32]; - int modify_counter; - int fillers[10]; -} mixer_info; - -typedef struct _old_mixer_info -{ - char id[16]; - char name[32]; -} _old_mixer_info; - -#define SOUND_MIXER_INFO _SIOR ('M', 101, mixer_info) -#define SOUND_OLD_MIXER_INFO _SIOR ('M', 101, _old_mixer_info) - -typedef unsigned char mixer_record[128]; - -#define SOUND_MIXER_ACCESS _SIOWR('M', 102, mixer_record) - -#define SOUND_MIXER_AGC _SIOWR('M', 103, int) -#define SOUND_MIXER_3DSE _SIOWR('M', 104, int) - -#define SOUND_MIXER_PRIVATE1 _SIOWR('M', 111, int) -#define SOUND_MIXER_PRIVATE2 _SIOWR('M', 112, int) -#define SOUND_MIXER_PRIVATE3 _SIOWR('M', 113, int) -#define SOUND_MIXER_PRIVATE4 _SIOWR('M', 114, int) -#define SOUND_MIXER_PRIVATE5 _SIOWR('M', 115, int) - -typedef struct mixer_vol_table { - int num; - char name[32]; - int levels[32]; -} mixer_vol_table; - -#define SOUND_MIXER_GETLEVELS _SIOWR('M', 116, mixer_vol_table) -#define SOUND_MIXER_SETLEVELS _SIOWR('M', 117, mixer_vol_table) - -#define OSS_GETVERSION _SIOR ('M', 118, int) - -#define EV_SEQ_LOCAL 0x80 -#define EV_TIMING 0x81 -#define EV_CHN_COMMON 0x92 -#define EV_CHN_VOICE 0x93 -#define EV_SYSEX 0x94 - -#define MIDI_NOTEOFF 0x80 -#define MIDI_NOTEON 0x90 -#define MIDI_KEY_PRESSURE 0xA0 - -#define MIDI_CTL_CHANGE 0xB0 -#define MIDI_PGM_CHANGE 0xC0 -#define MIDI_CHN_PRESSURE 0xD0 -#define MIDI_PITCH_BEND 0xE0 - -#define MIDI_SYSTEM_PREFIX 0xF0 - -#define TMR_WAIT_REL 1 -#define TMR_WAIT_ABS 2 -#define TMR_STOP 3 -#define TMR_START 4 -#define TMR_CONTINUE 5 -#define TMR_TEMPO 6 -#define TMR_ECHO 8 -#define TMR_CLOCK 9 -#define TMR_SPP 10 -#define TMR_TIMESIG 11 - -#define LOCL_STARTAUDIO 1 - -#if !defined(__KERNEL__) && !defined(KERNEL) && !defined(INKERNEL) && !defined(_KERNEL) || defined(USE_SEQ_MACROS) - -#define SEQ_DECLAREBUF() SEQ_USE_EXTBUF() - -#define SEQ_PM_DEFINES int __foo_bar___ -#ifdef OSSLIB -#define SEQ_USE_EXTBUF() extern unsigned char *_seqbuf; extern int _seqbuflen;extern int _seqbufptr -#define SEQ_DEFINEBUF(len) SEQ_USE_EXTBUF();static int _requested_seqbuflen=len -#define _SEQ_ADVBUF(len) OSS_seq_advbuf(len, seqfd, _seqbuf, _seqbuflen) -#define _SEQ_NEEDBUF(len) OSS_seq_needbuf(len, seqfd, _seqbuf, _seqbuflen) -#define SEQ_DUMPBUF() OSS_seqbuf_dump(seqfd, _seqbuf, _seqbuflen) - -#define SEQ_LOAD_GMINSTR(dev, instr) OSS_patch_caching(dev, -1, instr, seqfd, _seqbuf, _seqbuflen) -#define SEQ_LOAD_GMDRUM(dev, drum) OSS_drum_caching(dev, -1, drum, seqfd, _seqbuf, _seqbuflen) -#else - -#define SEQ_LOAD_GMINSTR(dev, instr) -#define SEQ_LOAD_GMDRUM(dev, drum) - -#define SEQ_USE_EXTBUF() extern unsigned char _seqbuf[]; extern int _seqbuflen;extern int _seqbufptr - -#ifndef USE_SIMPLE_MACROS - -#define SEQ_DEFINEBUF(len) unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0 -#define _SEQ_NEEDBUF(len) if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump() -#define _SEQ_ADVBUF(len) _seqbufptr += len -#define SEQ_DUMPBUF seqbuf_dump -#else - -#define _SEQ_NEEDBUF(len) -#endif -#endif - -#define SEQ_VOLUME_MODE(dev, mode) {_SEQ_NEEDBUF(8); _seqbuf[_seqbufptr] = SEQ_EXTENDED; _seqbuf[_seqbufptr+1] = SEQ_VOLMODE; _seqbuf[_seqbufptr+2] = (dev); _seqbuf[_seqbufptr+3] = (mode); _seqbuf[_seqbufptr+4] = 0; _seqbuf[_seqbufptr+5] = 0; _seqbuf[_seqbufptr+6] = 0; _seqbuf[_seqbufptr+7] = 0; _SEQ_ADVBUF(8);} - -#define _CHN_VOICE(dev, event, chn, note, parm) {_SEQ_NEEDBUF(8); _seqbuf[_seqbufptr] = EV_CHN_VOICE; _seqbuf[_seqbufptr+1] = (dev); _seqbuf[_seqbufptr+2] = (event); _seqbuf[_seqbufptr+3] = (chn); _seqbuf[_seqbufptr+4] = (note); _seqbuf[_seqbufptr+5] = (parm); _seqbuf[_seqbufptr+6] = (0); _seqbuf[_seqbufptr+7] = 0; _SEQ_ADVBUF(8);} - -#define SEQ_START_NOTE(dev, chn, note, vol) _CHN_VOICE(dev, MIDI_NOTEON, chn, note, vol) - -#define SEQ_STOP_NOTE(dev, chn, note, vol) _CHN_VOICE(dev, MIDI_NOTEOFF, chn, note, vol) - -#define SEQ_KEY_PRESSURE(dev, chn, note, pressure) _CHN_VOICE(dev, MIDI_KEY_PRESSURE, chn, note, pressure) - -#define _CHN_COMMON(dev, event, chn, p1, p2, w14) {_SEQ_NEEDBUF(8); _seqbuf[_seqbufptr] = EV_CHN_COMMON; _seqbuf[_seqbufptr+1] = (dev); _seqbuf[_seqbufptr+2] = (event); _seqbuf[_seqbufptr+3] = (chn); _seqbuf[_seqbufptr+4] = (p1); _seqbuf[_seqbufptr+5] = (p2); *(short *)&_seqbuf[_seqbufptr+6] = (w14); _SEQ_ADVBUF(8);} - -#define SEQ_SYSEX(dev, buf, len) {int ii, ll=(len); unsigned char *bufp=buf; if (ll>6)ll=6; _SEQ_NEEDBUF(8); _seqbuf[_seqbufptr] = EV_SYSEX; _seqbuf[_seqbufptr+1] = (dev); for(ii=0;ii>8)&0xff); _seqbuf[_seqbufptr+7] = 0; _SEQ_ADVBUF(8);} - -#define SEQ_PITCHBEND(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER, value) -#define SEQ_BENDER_RANGE(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER_RANGE, value) -#define SEQ_EXPRESSION(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_EXPRESSION, value*128) -#define SEQ_MAIN_VOLUME(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_MAIN_VOLUME, (value*16383)/100) -#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2) - -#define _TIMER_EVENT(ev, parm) {_SEQ_NEEDBUF(8); _seqbuf[_seqbufptr+0] = EV_TIMING; _seqbuf[_seqbufptr+1] = (ev); _seqbuf[_seqbufptr+2] = 0; _seqbuf[_seqbufptr+3] = 0; *(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); _SEQ_ADVBUF(8);} - -#define SEQ_START_TIMER() _TIMER_EVENT(TMR_START, 0) -#define SEQ_STOP_TIMER() _TIMER_EVENT(TMR_STOP, 0) -#define SEQ_CONTINUE_TIMER() _TIMER_EVENT(TMR_CONTINUE, 0) -#define SEQ_WAIT_TIME(ticks) _TIMER_EVENT(TMR_WAIT_ABS, ticks) -#define SEQ_DELTA_TIME(ticks) _TIMER_EVENT(TMR_WAIT_REL, ticks) -#define SEQ_ECHO_BACK(key) _TIMER_EVENT(TMR_ECHO, key) -#define SEQ_SET_TEMPO(value) _TIMER_EVENT(TMR_TEMPO, value) -#define SEQ_SONGPOS(pos) _TIMER_EVENT(TMR_SPP, pos) -#define SEQ_TIME_SIGNATURE(sig) _TIMER_EVENT(TMR_TIMESIG, sig) - -#define _LOCAL_EVENT(ev, parm) {_SEQ_NEEDBUF(8); _seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; _seqbuf[_seqbufptr+1] = (ev); _seqbuf[_seqbufptr+2] = 0; _seqbuf[_seqbufptr+3] = 0; *(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); _SEQ_ADVBUF(8);} - -#define SEQ_PLAYAUDIO(devmask) _LOCAL_EVENT(LOCL_STARTAUDIO, devmask) - -#define SEQ_MIDIOUT(device, byte) {_SEQ_NEEDBUF(4); _seqbuf[_seqbufptr] = SEQ_MIDIPUTC; _seqbuf[_seqbufptr+1] = (byte); _seqbuf[_seqbufptr+2] = (device); _seqbuf[_seqbufptr+3] = 0; _SEQ_ADVBUF(4);} - -#ifdef OSSLIB -#define SEQ_WRPATCH(patchx, len) OSS_write_patch(seqfd, (char*)(patchx), len) -#define SEQ_WRPATCH2(patchx, len) OSS_write_patch2(seqfd, (char*)(patchx), len) -#else -#define SEQ_WRPATCH(patchx, len) {if (_seqbufptr) SEQ_DUMPBUF(); if (write(seqfd, (char*)(patchx), len)==-1) perror("Write patch: /dev/sequencer");} -#define SEQ_WRPATCH2(patchx, len) (SEQ_DUMPBUF(), write(seqfd, (char*)(patchx), len)) -#endif - -#endif -#endif diff --git a/libc/kernel/common/linux/spinlock.h b/libc/kernel/common/linux/spinlock.h deleted file mode 100644 index 5504c9e61..000000000 --- a/libc/kernel/common/linux/spinlock.h +++ /dev/null @@ -1,112 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SPINLOCK_H -#define __LINUX_SPINLOCK_H - -#include -#include -#include -#include -#include -#include - -#include - -#define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME - -#define LOCK_SECTION_START(extra) ".subsection 1\n\t" extra ".ifndef " LOCK_SECTION_NAME "\n\t" LOCK_SECTION_NAME ":\n\t" ".endif\n" - -#define LOCK_SECTION_END ".previous\n\t" - -#define __lockfunc fastcall __attribute__((section(".spinlock.text"))) - -#include - -#include - -#define spin_lock_init(lock) do { *(lock) = SPIN_LOCK_UNLOCKED; } while (0) - -#define rwlock_init(lock) do { *(lock) = RW_LOCK_UNLOCKED; } while (0) - -#define spin_is_locked(lock) __raw_spin_is_locked(&(lock)->raw_lock) - -#define spin_unlock_wait(lock) __raw_spin_unlock_wait(&(lock)->raw_lock) - -#include - -#define _raw_spin_lock(lock) __raw_spin_lock(&(lock)->raw_lock) -#define _raw_spin_lock_flags(lock, flags) __raw_spin_lock_flags(&(lock)->raw_lock, *(flags)) -#define _raw_spin_trylock(lock) __raw_spin_trylock(&(lock)->raw_lock) -#define _raw_spin_unlock(lock) __raw_spin_unlock(&(lock)->raw_lock) -#define _raw_read_lock(rwlock) __raw_read_lock(&(rwlock)->raw_lock) -#define _raw_read_trylock(rwlock) __raw_read_trylock(&(rwlock)->raw_lock) -#define _raw_read_unlock(rwlock) __raw_read_unlock(&(rwlock)->raw_lock) -#define _raw_write_lock(rwlock) __raw_write_lock(&(rwlock)->raw_lock) -#define _raw_write_trylock(rwlock) __raw_write_trylock(&(rwlock)->raw_lock) -#define _raw_write_unlock(rwlock) __raw_write_unlock(&(rwlock)->raw_lock) - -#define read_can_lock(rwlock) __raw_read_can_lock(&(rwlock)->raw_lock) -#define write_can_lock(rwlock) __raw_write_can_lock(&(rwlock)->raw_lock) - -#define spin_trylock(lock) __cond_lock(_spin_trylock(lock)) -#define read_trylock(lock) __cond_lock(_read_trylock(lock)) -#define write_trylock(lock) __cond_lock(_write_trylock(lock)) - -#define spin_lock(lock) _spin_lock(lock) - -#define spin_lock_nested(lock, subclass) _spin_lock(lock) - -#define write_lock(lock) _write_lock(lock) -#define read_lock(lock) _read_lock(lock) - -#define spin_lock_irqsave(lock, flags) _spin_lock_irqsave(lock, flags) -#define read_lock_irqsave(lock, flags) _read_lock_irqsave(lock, flags) -#define write_lock_irqsave(lock, flags) _write_lock_irqsave(lock, flags) - -#define spin_lock_irq(lock) _spin_lock_irq(lock) -#define spin_lock_bh(lock) _spin_lock_bh(lock) - -#define read_lock_irq(lock) _read_lock_irq(lock) -#define read_lock_bh(lock) _read_lock_bh(lock) - -#define write_lock_irq(lock) _write_lock_irq(lock) -#define write_lock_bh(lock) _write_lock_bh(lock) - -#define spin_unlock(lock) _spin_unlock(lock) -#define read_unlock(lock) _read_unlock(lock) -#define write_unlock(lock) _write_unlock(lock) -#define spin_unlock_irq(lock) _spin_unlock_irq(lock) -#define read_unlock_irq(lock) _read_unlock_irq(lock) -#define write_unlock_irq(lock) _write_unlock_irq(lock) - -#define spin_unlock_irqrestore(lock, flags) _spin_unlock_irqrestore(lock, flags) -#define spin_unlock_bh(lock) _spin_unlock_bh(lock) - -#define read_unlock_irqrestore(lock, flags) _read_unlock_irqrestore(lock, flags) -#define read_unlock_bh(lock) _read_unlock_bh(lock) - -#define write_unlock_irqrestore(lock, flags) _write_unlock_irqrestore(lock, flags) -#define write_unlock_bh(lock) _write_unlock_bh(lock) - -#define spin_trylock_bh(lock) __cond_lock(_spin_trylock_bh(lock)) - -#define spin_trylock_irq(lock) ({ local_irq_disable(); _spin_trylock(lock) ? 1 : ({ local_irq_enable(); 0; }); }) - -#define spin_trylock_irqsave(lock, flags) ({ local_irq_save(flags); _spin_trylock(lock) ? 1 : ({ local_irq_restore(flags); 0; }); }) - -#include - -#define atomic_dec_and_lock(atomic, lock) __cond_lock(_atomic_dec_and_lock(atomic, lock)) - -#define spin_can_lock(lock) (!spin_is_locked(lock)) - -#endif diff --git a/libc/kernel/common/linux/spinlock_api_smp.h b/libc/kernel/common/linux/spinlock_api_smp.h deleted file mode 100644 index 74d8cc983..000000000 --- a/libc/kernel/common/linux/spinlock_api_smp.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SPINLOCK_API_SMP_H -#define __LINUX_SPINLOCK_API_SMP_H - -#ifndef __LINUX_SPINLOCK_H -#error "please don't include this file directly" -#endif - -#define assert_spin_locked(x) BUG_ON(!spin_is_locked(x)) - -#endif diff --git a/libc/kernel/common/linux/spinlock_api_up.h b/libc/kernel/common/linux/spinlock_api_up.h deleted file mode 100644 index c9a5c01b5..000000000 --- a/libc/kernel/common/linux/spinlock_api_up.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SPINLOCK_API_UP_H -#define __LINUX_SPINLOCK_API_UP_H - -#ifndef __LINUX_SPINLOCK_H -#error "please don't include this file directly" -#endif - -#define in_lock_functions(ADDR) 0 - -#define assert_spin_locked(lock) do { (void)(lock); } while (0) - -#define __LOCK(lock) do { preempt_disable(); __acquire(lock); (void)(lock); } while (0) - -#define __LOCK_BH(lock) do { local_bh_disable(); __LOCK(lock); } while (0) - -#define __LOCK_IRQ(lock) do { local_irq_disable(); __LOCK(lock); } while (0) - -#define __LOCK_IRQSAVE(lock, flags) do { local_irq_save(flags); __LOCK(lock); } while (0) - -#define __UNLOCK(lock) do { preempt_enable(); __release(lock); (void)(lock); } while (0) - -#define __UNLOCK_BH(lock) do { preempt_enable_no_resched(); local_bh_enable(); __release(lock); (void)(lock); } while (0) - -#define __UNLOCK_IRQ(lock) do { local_irq_enable(); __UNLOCK(lock); } while (0) - -#define __UNLOCK_IRQRESTORE(lock, flags) do { local_irq_restore(flags); __UNLOCK(lock); } while (0) - -#define _spin_lock(lock) __LOCK(lock) -#define _spin_lock_nested(lock, subclass) __LOCK(lock) -#define _read_lock(lock) __LOCK(lock) -#define _write_lock(lock) __LOCK(lock) -#define _spin_lock_bh(lock) __LOCK_BH(lock) -#define _read_lock_bh(lock) __LOCK_BH(lock) -#define _write_lock_bh(lock) __LOCK_BH(lock) -#define _spin_lock_irq(lock) __LOCK_IRQ(lock) -#define _read_lock_irq(lock) __LOCK_IRQ(lock) -#define _write_lock_irq(lock) __LOCK_IRQ(lock) -#define _spin_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) -#define _read_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) -#define _write_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) -#define _spin_trylock(lock) ({ __LOCK(lock); 1; }) -#define _read_trylock(lock) ({ __LOCK(lock); 1; }) -#define _write_trylock(lock) ({ __LOCK(lock); 1; }) -#define _spin_trylock_bh(lock) ({ __LOCK_BH(lock); 1; }) -#define _spin_unlock(lock) __UNLOCK(lock) -#define _read_unlock(lock) __UNLOCK(lock) -#define _write_unlock(lock) __UNLOCK(lock) -#define _spin_unlock_bh(lock) __UNLOCK_BH(lock) -#define _write_unlock_bh(lock) __UNLOCK_BH(lock) -#define _read_unlock_bh(lock) __UNLOCK_BH(lock) -#define _spin_unlock_irq(lock) __UNLOCK_IRQ(lock) -#define _read_unlock_irq(lock) __UNLOCK_IRQ(lock) -#define _write_unlock_irq(lock) __UNLOCK_IRQ(lock) -#define _spin_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) -#define _read_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) -#define _write_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) - -#endif diff --git a/libc/kernel/common/linux/spinlock_types.h b/libc/kernel/common/linux/spinlock_types.h deleted file mode 100644 index 0938b51c7..000000000 --- a/libc/kernel/common/linux/spinlock_types.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SPINLOCK_TYPES_H -#define __LINUX_SPINLOCK_TYPES_H - -#include - -#include - -typedef struct { - raw_spinlock_t raw_lock; -} spinlock_t; - -#define SPINLOCK_MAGIC 0xdead4ead - -typedef struct { - raw_rwlock_t raw_lock; -} rwlock_t; - -#define RWLOCK_MAGIC 0xdeaf1eed - -#define SPINLOCK_OWNER_INIT ((void *)-1L) - -#define SPIN_DEP_MAP_INIT(lockname) - -#define RW_DEP_MAP_INIT(lockname) - -#define __SPIN_LOCK_UNLOCKED(lockname) (spinlock_t) { .raw_lock = __RAW_SPIN_LOCK_UNLOCKED, SPIN_DEP_MAP_INIT(lockname) } -#define __RW_LOCK_UNLOCKED(lockname) (rwlock_t) { .raw_lock = __RAW_RW_LOCK_UNLOCKED, RW_DEP_MAP_INIT(lockname) } - -#define SPIN_LOCK_UNLOCKED __SPIN_LOCK_UNLOCKED(old_style_spin_init) -#define RW_LOCK_UNLOCKED __RW_LOCK_UNLOCKED(old_style_rw_init) - -#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) -#define DEFINE_RWLOCK(x) rwlock_t x = __RW_LOCK_UNLOCKED(x) - -#endif diff --git a/libc/kernel/common/linux/spinlock_types_up.h b/libc/kernel/common/linux/spinlock_types_up.h deleted file mode 100644 index 0db303736..000000000 --- a/libc/kernel/common/linux/spinlock_types_up.h +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SPINLOCK_TYPES_UP_H -#define __LINUX_SPINLOCK_TYPES_UP_H - -#ifndef __LINUX_SPINLOCK_TYPES_H -#error "please don't include this file directly" -#endif - -typedef struct { } raw_spinlock_t; - -#define __RAW_SPIN_LOCK_UNLOCKED { } - -typedef struct { - -} raw_rwlock_t; - -#define __RAW_RW_LOCK_UNLOCKED { } - -#endif diff --git a/libc/kernel/common/linux/spinlock_up.h b/libc/kernel/common/linux/spinlock_up.h deleted file mode 100644 index b4958dcaf..000000000 --- a/libc/kernel/common/linux/spinlock_up.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_SPINLOCK_UP_H -#define __LINUX_SPINLOCK_UP_H - -#ifndef __LINUX_SPINLOCK_H -#error "please don't include this file directly" -#endif - -#define __raw_spin_is_locked(lock) ((void)(lock), 0) - -#define __raw_spin_lock(lock) do { (void)(lock); } while (0) -#define __raw_spin_unlock(lock) do { (void)(lock); } while (0) -#define __raw_spin_trylock(lock) ({ (void)(lock); 1; }) - -#define __raw_read_can_lock(lock) (((void)(lock), 1)) -#define __raw_write_can_lock(lock) (((void)(lock), 1)) - -#define __raw_spin_unlock_wait(lock) do { cpu_relax(); } while (__raw_spin_is_locked(lock)) - -#endif diff --git a/libc/kernel/common/linux/stacktrace.h b/libc/kernel/common/linux/stacktrace.h deleted file mode 100644 index af7ecc830..000000000 --- a/libc/kernel/common/linux/stacktrace.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_STACKTRACE_H -#define __LINUX_STACKTRACE_H - -#define save_stack_trace(trace, task, all, skip) do { } while (0) -#define print_stack_trace(trace) do { } while (0) - -#endif diff --git a/libc/kernel/common/linux/stat.h b/libc/kernel/common/linux/stat.h deleted file mode 100644 index 0d757f4f7..000000000 --- a/libc/kernel/common/linux/stat.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_STAT_H -#define _LINUX_STAT_H - -#if !defined(__GLIBC__) || __GLIBC__ < 2 - -#define S_IFMT 00170000 -#define S_IFSOCK 0140000 -#define S_IFLNK 0120000 -#define S_IFREG 0100000 -#define S_IFBLK 0060000 -#define S_IFDIR 0040000 -#define S_IFCHR 0020000 -#define S_IFIFO 0010000 -#define S_ISUID 0004000 -#define S_ISGID 0002000 -#define S_ISVTX 0001000 - -#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) -#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) -#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) -#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) -#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) -#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) - -#define S_IRWXU 00700 -#define S_IRUSR 00400 -#define S_IWUSR 00200 -#define S_IXUSR 00100 - -#define S_IRWXG 00070 -#define S_IRGRP 00040 -#define S_IWGRP 00020 -#define S_IXGRP 00010 - -#define S_IRWXO 00007 -#define S_IROTH 00004 -#define S_IWOTH 00002 -#define S_IXOTH 00001 - -#endif - -#endif diff --git a/libc/kernel/common/linux/statfs.h b/libc/kernel/common/linux/statfs.h deleted file mode 100644 index 43a5d70c6..000000000 --- a/libc/kernel/common/linux/statfs.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_STATFS_H -#define _LINUX_STATFS_H - -#include - -#include - -struct kstatfs { - long f_type; - long f_bsize; - u64 f_blocks; - u64 f_bfree; - u64 f_bavail; - u64 f_files; - u64 f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; - long f_frsize; - long f_spare[5]; -}; - -#endif diff --git a/libc/kernel/common/linux/stddef.h b/libc/kernel/common/linux/stddef.h deleted file mode 100644 index 5412f475d..000000000 --- a/libc/kernel/common/linux/stddef.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_STDDEF_H -#define _LINUX_STDDEF_H - -#include - -#undef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif - -#undef offsetof -#ifdef __compiler_offsetof -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif - -#endif diff --git a/libc/kernel/common/linux/string.h b/libc/kernel/common/linux/string.h deleted file mode 100644 index 67590683c..000000000 --- a/libc/kernel/common/linux/string.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_STRING_H_ -#define _LINUX_STRING_H_ - -#endif diff --git a/libc/kernel/common/linux/stringify.h b/libc/kernel/common/linux/stringify.h deleted file mode 100644 index cbb9e5bbc..000000000 --- a/libc/kernel/common/linux/stringify.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_STRINGIFY_H -#define __LINUX_STRINGIFY_H - -#define __stringify_1(x) #x -#define __stringify(x) __stringify_1(x) - -#endif diff --git a/libc/kernel/common/linux/sunrpc/auth.h b/libc/kernel/common/linux/sunrpc/auth.h deleted file mode 100644 index ae0a3d0c8..000000000 --- a/libc/kernel/common/linux/sunrpc/auth.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_AUTH_H -#define _LINUX_SUNRPC_AUTH_H - -#endif diff --git a/libc/kernel/common/linux/sunrpc/auth_gss.h b/libc/kernel/common/linux/sunrpc/auth_gss.h deleted file mode 100644 index a64f1f84c..000000000 --- a/libc/kernel/common/linux/sunrpc/auth_gss.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_AUTH_GSS_H -#define _LINUX_SUNRPC_AUTH_GSS_H - -#endif - diff --git a/libc/kernel/common/linux/sunrpc/clnt.h b/libc/kernel/common/linux/sunrpc/clnt.h deleted file mode 100644 index a562ad981..000000000 --- a/libc/kernel/common/linux/sunrpc/clnt.h +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_CLNT_H -#define _LINUX_SUNRPC_CLNT_H - -#include -#include -#include -#include -#include -#include -#include -#include - -struct rpc_portmap { - __u32 pm_prog; - __u32 pm_vers; - __u32 pm_prot; - __u16 pm_port; - unsigned char pm_binding : 1; - struct rpc_wait_queue pm_bindwait; -}; - -struct rpc_inode; - -struct rpc_clnt { - atomic_t cl_count; - atomic_t cl_users; - struct rpc_xprt * cl_xprt; - struct rpc_procinfo * cl_procinfo; - u32 cl_maxproc; - - char * cl_server; - char * cl_protname; - struct rpc_auth * cl_auth; - struct rpc_stat * cl_stats; - struct rpc_iostats * cl_metrics; - - unsigned int cl_softrtry : 1, - cl_intr : 1, - cl_autobind : 1, - cl_oneshot : 1, - cl_dead : 1; - - struct rpc_rtt * cl_rtt; - struct rpc_portmap * cl_pmap; - - int cl_nodelen; - char cl_nodename[UNX_MAXNODENAME]; - char cl_pathname[30]; - struct vfsmount * cl_vfsmnt; - struct dentry * cl_dentry; - struct rpc_clnt * cl_parent; - struct rpc_rtt cl_rtt_default; - struct rpc_portmap cl_pmap_default; - char cl_inline_name[32]; -}; -#define cl_timeout cl_xprt->timeout -#define cl_prog cl_pmap->pm_prog -#define cl_vers cl_pmap->pm_vers -#define cl_port cl_pmap->pm_port -#define cl_prot cl_pmap->pm_prot - -#define RPC_MAXVERSION 4 -struct rpc_program { - char * name; - u32 number; - unsigned int nrvers; - struct rpc_version ** version; - struct rpc_stat * stats; - char * pipe_dir_name; -}; - -struct rpc_version { - u32 number; - unsigned int nrprocs; - struct rpc_procinfo * procs; -}; - -struct rpc_procinfo { - u32 p_proc; - kxdrproc_t p_encode; - kxdrproc_t p_decode; - unsigned int p_bufsiz; - unsigned int p_count; - unsigned int p_timer; - u32 p_statidx; - char * p_name; -}; - -#define RPC_CONGESTED(clnt) (RPCXPRT_CONGESTED((clnt)->cl_xprt)) -#define RPC_PEERADDR(clnt) (&(clnt)->cl_xprt->addr) - -#endif diff --git a/libc/kernel/common/linux/sunrpc/debug.h b/libc/kernel/common/linux/sunrpc/debug.h deleted file mode 100644 index e2689f153..000000000 --- a/libc/kernel/common/linux/sunrpc/debug.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_DEBUG_H_ -#define _LINUX_SUNRPC_DEBUG_H_ - -#define RPCDBG_XPRT 0x0001 -#define RPCDBG_CALL 0x0002 -#define RPCDBG_DEBUG 0x0004 -#define RPCDBG_NFS 0x0008 -#define RPCDBG_AUTH 0x0010 -#define RPCDBG_PMAP 0x0020 -#define RPCDBG_SCHED 0x0040 -#define RPCDBG_TRANS 0x0080 -#define RPCDBG_SVCSOCK 0x0100 -#define RPCDBG_SVCDSP 0x0200 -#define RPCDBG_MISC 0x0400 -#define RPCDBG_CACHE 0x0800 -#define RPCDBG_ALL 0x7fff - -#define CTL_SUNRPC 7249 - -enum { - CTL_RPCDEBUG = 1, - CTL_NFSDEBUG, - CTL_NFSDDEBUG, - CTL_NLMDEBUG, - CTL_SLOTTABLE_UDP, - CTL_SLOTTABLE_TCP, - CTL_MIN_RESVPORT, - CTL_MAX_RESVPORT, -}; - -#endif diff --git a/libc/kernel/common/linux/sunrpc/gss_api.h b/libc/kernel/common/linux/sunrpc/gss_api.h deleted file mode 100644 index cbc77c2af..000000000 --- a/libc/kernel/common/linux/sunrpc/gss_api.h +++ /dev/null @@ -1,16 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_GSS_API_H -#define _LINUX_SUNRPC_GSS_API_H - -#endif - diff --git a/libc/kernel/common/linux/sunrpc/gss_asn1.h b/libc/kernel/common/linux/sunrpc/gss_asn1.h deleted file mode 100644 index 8f18ba061..000000000 --- a/libc/kernel/common/linux/sunrpc/gss_asn1.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include - -#define SIZEOF_INT 4 - -#define G_BAD_SERVICE_NAME (-2045022976L) -#define G_BAD_STRING_UID (-2045022975L) -#define G_NOUSER (-2045022974L) -#define G_VALIDATE_FAILED (-2045022973L) -#define G_BUFFER_ALLOC (-2045022972L) -#define G_BAD_MSG_CTX (-2045022971L) -#define G_WRONG_SIZE (-2045022970L) -#define G_BAD_USAGE (-2045022969L) -#define G_UNKNOWN_QOP (-2045022968L) -#define G_NO_HOSTNAME (-2045022967L) -#define G_BAD_HOSTNAME (-2045022966L) -#define G_WRONG_MECH (-2045022965L) -#define G_BAD_TOK_HEADER (-2045022964L) -#define G_BAD_DIRECTION (-2045022963L) -#define G_TOK_TRUNC (-2045022962L) -#define G_REFLECT (-2045022961L) -#define G_WRONG_TOKID (-2045022960L) - -#define g_OID_equal(o1,o2) (((o1)->len == (o2)->len) && (memcmp((o1)->data,(o2)->data,(int) (o1)->len) == 0)) - diff --git a/libc/kernel/common/linux/sunrpc/gss_err.h b/libc/kernel/common/linux/sunrpc/gss_err.h deleted file mode 100644 index 01fb1b4dc..000000000 --- a/libc/kernel/common/linux/sunrpc/gss_err.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_GSS_ERR_H -#define _LINUX_SUNRPC_GSS_ERR_H - -#endif diff --git a/libc/kernel/common/linux/sunrpc/msg_prot.h b/libc/kernel/common/linux/sunrpc/msg_prot.h deleted file mode 100644 index 52f4e760f..000000000 --- a/libc/kernel/common/linux/sunrpc/msg_prot.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_MSGPROT_H_ -#define _LINUX_SUNRPC_MSGPROT_H_ - -#endif diff --git a/libc/kernel/common/linux/sunrpc/sched.h b/libc/kernel/common/linux/sunrpc/sched.h deleted file mode 100644 index 859b2d839..000000000 --- a/libc/kernel/common/linux/sunrpc/sched.h +++ /dev/null @@ -1,182 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_SCHED_H_ -#define _LINUX_SUNRPC_SCHED_H_ - -#include -#include -#include -#include -#include -#include - -struct rpc_procinfo; -struct rpc_message { - struct rpc_procinfo * rpc_proc; - void * rpc_argp; - void * rpc_resp; - struct rpc_cred * rpc_cred; -}; - -struct rpc_call_ops; -struct rpc_wait_queue; -struct rpc_wait { - struct list_head list; - struct list_head links; - struct rpc_wait_queue * rpc_waitq; -}; - -struct rpc_task { -#ifdef RPC_DEBUG - unsigned long tk_magic; -#endif - atomic_t tk_count; - struct list_head tk_task; - struct rpc_clnt * tk_client; - struct rpc_rqst * tk_rqstp; - int tk_status; - - struct rpc_message tk_msg; - __u8 tk_garb_retry; - __u8 tk_cred_retry; - - unsigned long tk_cookie; - - void (*tk_timeout_fn)(struct rpc_task *); - void (*tk_callback)(struct rpc_task *); - void (*tk_action)(struct rpc_task *); - const struct rpc_call_ops *tk_ops; - void * tk_calldata; - - struct timer_list tk_timer; - unsigned long tk_timeout; - unsigned short tk_flags; - unsigned char tk_priority : 2; - unsigned long tk_runstate; - struct workqueue_struct *tk_workqueue; - union { - struct work_struct tk_work; - struct rpc_wait tk_wait; - } u; - - unsigned short tk_timeouts; - size_t tk_bytes_sent; - unsigned long tk_start; - long tk_rtt; - -#ifdef RPC_DEBUG - unsigned short tk_pid; -#endif -}; -#define tk_auth tk_client->cl_auth -#define tk_xprt tk_client->cl_xprt - -#define task_for_each(task, pos, head) list_for_each(pos, head) if ((task=list_entry(pos, struct rpc_task, u.tk_wait.list)),1) - -#define task_for_first(task, head) if (!list_empty(head) && ((task=list_entry((head)->next, struct rpc_task, u.tk_wait.list)),1)) - -#define alltask_for_each(task, pos, head) list_for_each(pos, head) if ((task=list_entry(pos, struct rpc_task, tk_task)),1) - -typedef void (*rpc_action)(struct rpc_task *); - -struct rpc_call_ops { - void (*rpc_call_prepare)(struct rpc_task *, void *); - void (*rpc_call_done)(struct rpc_task *, void *); - void (*rpc_release)(void *); -}; - -#define RPC_TASK_ASYNC 0x0001 -#define RPC_TASK_SWAPPER 0x0002 -#define RPC_TASK_CHILD 0x0008 -#define RPC_CALL_MAJORSEEN 0x0020 -#define RPC_TASK_ROOTCREDS 0x0040 -#define RPC_TASK_DYNAMIC 0x0080 -#define RPC_TASK_KILLED 0x0100 -#define RPC_TASK_SOFT 0x0200 -#define RPC_TASK_NOINTR 0x0400 - -#define RPC_IS_ASYNC(t) ((t)->tk_flags & RPC_TASK_ASYNC) -#define RPC_IS_CHILD(t) ((t)->tk_flags & RPC_TASK_CHILD) -#define RPC_IS_SWAPPER(t) ((t)->tk_flags & RPC_TASK_SWAPPER) -#define RPC_DO_ROOTOVERRIDE(t) ((t)->tk_flags & RPC_TASK_ROOTCREDS) -#define RPC_ASSASSINATED(t) ((t)->tk_flags & RPC_TASK_KILLED) -#define RPC_DO_CALLBACK(t) ((t)->tk_callback != NULL) -#define RPC_IS_SOFT(t) ((t)->tk_flags & RPC_TASK_SOFT) -#define RPC_TASK_UNINTERRUPTIBLE(t) ((t)->tk_flags & RPC_TASK_NOINTR) - -#define RPC_TASK_RUNNING 0 -#define RPC_TASK_QUEUED 1 -#define RPC_TASK_WAKEUP 2 -#define RPC_TASK_HAS_TIMER 3 -#define RPC_TASK_ACTIVE 4 - -#define RPC_IS_RUNNING(t) (test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)) -#define rpc_set_running(t) (set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)) -#define rpc_test_and_set_running(t) (test_and_set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)) -#define rpc_clear_running(t) do { smp_mb__before_clear_bit(); clear_bit(RPC_TASK_RUNNING, &(t)->tk_runstate); smp_mb__after_clear_bit(); } while (0) - -#define RPC_IS_QUEUED(t) (test_bit(RPC_TASK_QUEUED, &(t)->tk_runstate)) -#define rpc_set_queued(t) (set_bit(RPC_TASK_QUEUED, &(t)->tk_runstate)) -#define rpc_clear_queued(t) do { smp_mb__before_clear_bit(); clear_bit(RPC_TASK_QUEUED, &(t)->tk_runstate); smp_mb__after_clear_bit(); } while (0) - -#define rpc_start_wakeup(t) (test_and_set_bit(RPC_TASK_WAKEUP, &(t)->tk_runstate) == 0) -#define rpc_finish_wakeup(t) do { smp_mb__before_clear_bit(); clear_bit(RPC_TASK_WAKEUP, &(t)->tk_runstate); smp_mb__after_clear_bit(); } while (0) - -#define RPC_IS_ACTIVATED(t) (test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate)) -#define rpc_set_active(t) (set_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate)) -#define rpc_clear_active(t) do { smp_mb__before_clear_bit(); clear_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate); smp_mb__after_clear_bit(); } while(0) - -#define RPC_PRIORITY_LOW 0 -#define RPC_PRIORITY_NORMAL 1 -#define RPC_PRIORITY_HIGH 2 -#define RPC_NR_PRIORITY (RPC_PRIORITY_HIGH+1) - -struct rpc_wait_queue { - spinlock_t lock; - struct list_head tasks[RPC_NR_PRIORITY]; - unsigned long cookie; - unsigned char maxpriority; - unsigned char priority; - unsigned char count; - unsigned char nr; - unsigned short qlen; -#ifdef RPC_DEBUG - const char * name; -#endif -}; - -#define RPC_BATCH_COUNT 16 - -#ifndef RPC_DEBUG -#define RPC_WAITQ_INIT(var,qname) { .lock = SPIN_LOCK_UNLOCKED, .tasks = { [0] = LIST_HEAD_INIT(var.tasks[0]), [1] = LIST_HEAD_INIT(var.tasks[1]), [2] = LIST_HEAD_INIT(var.tasks[2]), }, } -#else -#define RPC_WAITQ_INIT(var,qname) { .lock = SPIN_LOCK_UNLOCKED, .tasks = { [0] = LIST_HEAD_INIT(var.tasks[0]), [1] = LIST_HEAD_INIT(var.tasks[1]), [2] = LIST_HEAD_INIT(var.tasks[2]), }, .name = qname, } -#endif -#define RPC_WAITQ(var,qname) struct rpc_wait_queue var = RPC_WAITQ_INIT(var,qname) - -#define RPC_IS_PRIORITY(q) ((q)->maxpriority > 0) - -struct rpc_task *rpc_new_task(struct rpc_clnt *, int flags, - const struct rpc_call_ops *ops, void *data); -struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags, - const struct rpc_call_ops *ops, void *data); -struct rpc_task *rpc_new_child(struct rpc_clnt *, struct rpc_task *parent); - -struct rpc_task *rpc_wake_up_next(struct rpc_wait_queue *); - -#ifdef RPC_DEBUG - -#endif - -#ifdef RPC_DEBUG -#endif -#endif diff --git a/libc/kernel/common/linux/sunrpc/stats.h b/libc/kernel/common/linux/sunrpc/stats.h deleted file mode 100644 index 03e7338f4..000000000 --- a/libc/kernel/common/linux/sunrpc/stats.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_STATS_H -#define _LINUX_SUNRPC_STATS_H - -#include - -struct rpc_stat { - struct rpc_program * program; - - unsigned int netcnt, - netudpcnt, - nettcpcnt, - nettcpconn, - netreconn; - unsigned int rpccnt, - rpcretrans, - rpcauthrefresh, - rpcgarbage; -}; - -struct svc_stat { - struct svc_program * program; - - unsigned int netcnt, - netudpcnt, - nettcpcnt, - nettcpconn; - unsigned int rpccnt, - rpcbadfmt, - rpcbadauth, - rpcbadclnt; -}; - -#ifdef MODULE - -#endif - -#define proc_net_rpc NULL -#endif diff --git a/libc/kernel/common/linux/sunrpc/svc.h b/libc/kernel/common/linux/sunrpc/svc.h deleted file mode 100644 index 7a0cc2d07..000000000 --- a/libc/kernel/common/linux/sunrpc/svc.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef SUNRPC_SVC_H -#define SUNRPC_SVC_H - -#include -#include -#include -#include -#include -#include - -struct svc_serv { - struct list_head sv_threads; - struct list_head sv_sockets; - struct svc_program * sv_program; - struct svc_stat * sv_stats; - spinlock_t sv_lock; - unsigned int sv_nrthreads; - unsigned int sv_bufsz; - unsigned int sv_xdrsize; - - struct list_head sv_permsocks; - struct list_head sv_tempsocks; - int sv_tmpcnt; - - char * sv_name; -}; - -#define RPCSVC_MAXPAYLOAD (64*1024u) - -#define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2) - -struct svc_program { - struct svc_program * pg_next; - u32 pg_prog; - unsigned int pg_lovers; - unsigned int pg_hivers; - unsigned int pg_nvers; - struct svc_version ** pg_vers; - char * pg_name; - char * pg_class; - struct svc_stat * pg_stats; - int (*pg_authenticate)(struct svc_rqst *); -}; - -struct svc_version { - u32 vs_vers; - u32 vs_nproc; - struct svc_procedure * vs_proc; - u32 vs_xdrsize; - - int (*vs_dispatch)(struct svc_rqst *, u32 *); -}; - -typedef int (*svc_procfunc)(struct svc_rqst *, void *argp, void *resp); -struct svc_procedure { - svc_procfunc pc_func; - kxdrproc_t pc_decode; - kxdrproc_t pc_encode; - kxdrproc_t pc_release; - unsigned int pc_argsize; - unsigned int pc_ressize; - unsigned int pc_count; - unsigned int pc_cachetype; - unsigned int pc_xdrressize; -}; - -typedef void (*svc_thread_fn)(struct svc_rqst *); - -struct svc_serv * svc_create(struct svc_program *, unsigned int); - -#endif diff --git a/libc/kernel/common/linux/sunrpc/svcauth.h b/libc/kernel/common/linux/sunrpc/svcauth.h deleted file mode 100644 index 9b414d718..000000000 --- a/libc/kernel/common/linux/sunrpc/svcauth.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_SVCAUTH_H_ -#define _LINUX_SUNRPC_SVCAUTH_H_ - -#endif diff --git a/libc/kernel/common/linux/sunrpc/timer.h b/libc/kernel/common/linux/sunrpc/timer.h deleted file mode 100644 index 8fb78e572..000000000 --- a/libc/kernel/common/linux/sunrpc/timer.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_TIMER_H -#define _LINUX_SUNRPC_TIMER_H - -#include - -struct rpc_rtt { - unsigned long timeo; - unsigned long srtt[5]; - unsigned long sdrtt[5]; - int ntimeouts[5]; -}; - -#endif diff --git a/libc/kernel/common/linux/sunrpc/types.h b/libc/kernel/common/linux/sunrpc/types.h deleted file mode 100644 index ce52052c3..000000000 --- a/libc/kernel/common/linux/sunrpc/types.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_TYPES_H_ -#define _LINUX_SUNRPC_TYPES_H_ - -#include -#include -#include -#include - -#define signalled() (signal_pending(current)) - -#endif diff --git a/libc/kernel/common/linux/sunrpc/xdr.h b/libc/kernel/common/linux/sunrpc/xdr.h deleted file mode 100644 index d513843c8..000000000 --- a/libc/kernel/common/linux/sunrpc/xdr.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _SUNRPC_XDR_H_ -#define _SUNRPC_XDR_H_ - -#endif diff --git a/libc/kernel/common/linux/sunrpc/xprt.h b/libc/kernel/common/linux/sunrpc/xprt.h deleted file mode 100644 index 145a26d65..000000000 --- a/libc/kernel/common/linux/sunrpc/xprt.h +++ /dev/null @@ -1,172 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SUNRPC_XPRT_H -#define _LINUX_SUNRPC_XPRT_H - -#include -#include -#include -#include -#include - -#define RPC_MIN_SLOT_TABLE (2U) -#define RPC_DEF_SLOT_TABLE (16U) -#define RPC_MAX_SLOT_TABLE (128U) - -#define RPC_CALLHDRSIZE 6 -#define RPC_REPHDRSIZE 4 - -#define RPC_MIN_RESVPORT (1U) -#define RPC_MAX_RESVPORT (65535U) -#define RPC_DEF_MIN_RESVPORT (665U) -#define RPC_DEF_MAX_RESVPORT (1023U) - -struct rpc_timeout { - unsigned long to_initval, - to_maxval, - to_increment; - unsigned int to_retries; - unsigned char to_exponential; -}; - -struct rpc_task; -struct rpc_xprt; -struct seq_file; - -struct rpc_rqst { - - struct rpc_xprt * rq_xprt; - struct xdr_buf rq_snd_buf; - struct xdr_buf rq_rcv_buf; - - struct rpc_task * rq_task; - __u32 rq_xid; - int rq_cong; - int rq_received; - u32 rq_seqno; - int rq_enc_pages_num; - struct page **rq_enc_pages; - void (*rq_release_snd_buf)(struct rpc_rqst *); - struct list_head rq_list; - - __u32 * rq_buffer; - size_t rq_bufsize; - - struct xdr_buf rq_private_buf; - unsigned long rq_majortimeo; - unsigned long rq_timeout; - unsigned int rq_retries; - - u32 rq_bytes_sent; - - unsigned long rq_xtime; - int rq_ntrans; -}; -#define rq_svec rq_snd_buf.head -#define rq_slen rq_snd_buf.len - -struct rpc_xprt_ops { - void (*set_buffer_size)(struct rpc_xprt *xprt, size_t sndsize, size_t rcvsize); - int (*reserve_xprt)(struct rpc_task *task); - void (*release_xprt)(struct rpc_xprt *xprt, struct rpc_task *task); - void (*set_port)(struct rpc_xprt *xprt, unsigned short port); - void (*connect)(struct rpc_task *task); - void * (*buf_alloc)(struct rpc_task *task, size_t size); - void (*buf_free)(struct rpc_task *task); - int (*send_request)(struct rpc_task *task); - void (*set_retrans_timeout)(struct rpc_task *task); - void (*timer)(struct rpc_task *task); - void (*release_request)(struct rpc_task *task); - void (*close)(struct rpc_xprt *xprt); - void (*destroy)(struct rpc_xprt *xprt); - void (*print_stats)(struct rpc_xprt *xprt, struct seq_file *seq); -}; - -struct rpc_xprt { - struct rpc_xprt_ops * ops; - struct socket * sock; - struct sock * inet; - - struct rpc_timeout timeout; - struct sockaddr_in addr; - int prot; - - unsigned long cong; - unsigned long cwnd; - - size_t rcvsize, - sndsize; - - size_t max_payload; - unsigned int tsh_size; - - struct rpc_wait_queue sending; - struct rpc_wait_queue resend; - struct rpc_wait_queue pending; - struct rpc_wait_queue backlog; - struct list_head free; - struct rpc_rqst * slot; - unsigned int max_reqs; - unsigned long state; - unsigned char shutdown : 1, - resvport : 1; - - __u32 xid; - - u32 tcp_recm, - tcp_xid, - tcp_reclen, - tcp_offset; - unsigned long tcp_copied, - tcp_flags; - - unsigned long connect_timeout, - bind_timeout, - reestablish_timeout; - struct work_struct connect_worker; - unsigned short port; - - struct work_struct task_cleanup; - struct timer_list timer; - unsigned long last_used, - idle_timeout; - - spinlock_t transport_lock; - spinlock_t reserve_lock; - struct rpc_task * snd_task; - - struct list_head recv; - - struct { - unsigned long bind_count, - connect_count, - connect_start, - connect_time, - sends, - recvs, - bad_xids; - - unsigned long long req_u, - bklog_u; - } stat; - - void (*old_data_ready)(struct sock *, int); - void (*old_state_change)(struct sock *); - void (*old_write_space)(struct sock *); -}; - -#define XPRT_LAST_FRAG (1 << 0) -#define XPRT_COPY_RECM (1 << 1) -#define XPRT_COPY_XID (1 << 2) -#define XPRT_COPY_DATA (1 << 3) - -#endif diff --git a/libc/kernel/common/linux/swap.h b/libc/kernel/common/linux/swap.h deleted file mode 100644 index 63ba556dd..000000000 --- a/libc/kernel/common/linux/swap.h +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SWAP_H -#define _LINUX_SWAP_H - -#include -#include -#include -#include -#include - -#include -#include - -#define SWAP_FLAG_PREFER 0x8000 -#define SWAP_FLAG_PRIO_MASK 0x7fff -#define SWAP_FLAG_PRIO_SHIFT 0 - -#define MAX_SWAPFILES_SHIFT 5 -#define MAX_SWAPFILES (1 << MAX_SWAPFILES_SHIFT) - -typedef struct { - unsigned long val; -} swp_entry_t; - -struct reclaim_state { - unsigned long reclaimed_slab; -}; - -#endif diff --git a/libc/kernel/common/linux/sysctl.h b/libc/kernel/common/linux/sysctl.h deleted file mode 100644 index 329e561d0..000000000 --- a/libc/kernel/common/linux/sysctl.h +++ /dev/null @@ -1,824 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_SYSCTL_H -#define _LINUX_SYSCTL_H - -#include -#include -#include - -struct file; -struct completion; - -#define CTL_MAXNAME 10 - -struct __sysctl_args { - int __user *name; - int nlen; - void __user *oldval; - size_t __user *oldlenp; - void __user *newval; - size_t newlen; - unsigned long __unused[4]; -}; - -enum -{ - CTL_KERN=1, - CTL_VM=2, - CTL_NET=3, - - CTL_FS=5, - CTL_DEBUG=6, - CTL_DEV=7, - CTL_BUS=8, - CTL_ABI=9, - CTL_CPU=10 -}; - -enum -{ - CTL_BUS_ISA=1 -}; - -enum -{ - INOTIFY_MAX_USER_INSTANCES=1, - INOTIFY_MAX_USER_WATCHES=2, - INOTIFY_MAX_QUEUED_EVENTS=3 -}; - -enum -{ - KERN_OSTYPE=1, - KERN_OSRELEASE=2, - KERN_OSREV=3, - KERN_VERSION=4, - KERN_SECUREMASK=5, - KERN_PROF=6, - KERN_NODENAME=7, - KERN_DOMAINNAME=8, - - KERN_CAP_BSET=14, - KERN_PANIC=15, - KERN_REALROOTDEV=16, - - KERN_SPARC_REBOOT=21, - KERN_CTLALTDEL=22, - KERN_PRINTK=23, - KERN_NAMETRANS=24, - KERN_PPC_HTABRECLAIM=25, - KERN_PPC_ZEROPAGED=26, - KERN_PPC_POWERSAVE_NAP=27, - KERN_MODPROBE=28, - KERN_SG_BIG_BUFF=29, - KERN_ACCT=30, - KERN_PPC_L2CR=31, - - KERN_RTSIGNR=32, - KERN_RTSIGMAX=33, - - KERN_SHMMAX=34, - KERN_MSGMAX=35, - KERN_MSGMNB=36, - KERN_MSGPOOL=37, - KERN_SYSRQ=38, - KERN_MAX_THREADS=39, - KERN_RANDOM=40, - KERN_SHMALL=41, - KERN_MSGMNI=42, - KERN_SEM=43, - KERN_SPARC_STOP_A=44, - KERN_SHMMNI=45, - KERN_OVERFLOWUID=46, - KERN_OVERFLOWGID=47, - KERN_SHMPATH=48, - KERN_HOTPLUG=49, - KERN_IEEE_EMULATION_WARNINGS=50, - KERN_S390_USER_DEBUG_LOGGING=51, - KERN_CORE_USES_PID=52, - KERN_TAINTED=53, - KERN_CADPID=54, - KERN_PIDMAX=55, - KERN_CORE_PATTERN=56, - KERN_PANIC_ON_OOPS=57, - KERN_HPPA_PWRSW=58, - KERN_HPPA_UNALIGNED=59, - KERN_PRINTK_RATELIMIT=60, - KERN_PRINTK_RATELIMIT_BURST=61, - KERN_PTY=62, - KERN_NGROUPS_MAX=63, - KERN_SPARC_SCONS_PWROFF=64, - KERN_HZ_TIMER=65, - KERN_UNKNOWN_NMI_PANIC=66, - KERN_BOOTLOADER_TYPE=67, - KERN_RANDOMIZE=68, - KERN_SETUID_DUMPABLE=69, - KERN_SPIN_RETRY=70, - KERN_ACPI_VIDEO_FLAGS=71, - KERN_IA64_UNALIGNED=72, - KERN_COMPAT_LOG=73, - KERN_MAX_LOCK_DEPTH=74, -}; - -enum -{ - VM_UNUSED1=1, - VM_UNUSED2=2, - VM_UNUSED3=3, - VM_UNUSED4=4, - VM_OVERCOMMIT_MEMORY=5, - VM_UNUSED5=6, - VM_UNUSED7=7, - VM_UNUSED8=8, - VM_UNUSED9=9, - VM_PAGE_CLUSTER=10, - VM_DIRTY_BACKGROUND=11, - VM_DIRTY_RATIO=12, - VM_DIRTY_WB_CS=13, - VM_DIRTY_EXPIRE_CS=14, - VM_NR_PDFLUSH_THREADS=15, - VM_OVERCOMMIT_RATIO=16, - VM_PAGEBUF=17, - VM_HUGETLB_PAGES=18, - VM_SWAPPINESS=19, - VM_LOWMEM_RESERVE_RATIO=20, - VM_MIN_FREE_KBYTES=21, - VM_MAX_MAP_COUNT=22, - VM_LAPTOP_MODE=23, - VM_BLOCK_DUMP=24, - VM_HUGETLB_GROUP=25, - VM_VFS_CACHE_PRESSURE=26, - VM_LEGACY_VA_LAYOUT=27, - VM_SWAP_TOKEN_TIMEOUT=28, - VM_DROP_PAGECACHE=29, - VM_PERCPU_PAGELIST_FRACTION=30, - VM_ZONE_RECLAIM_MODE=31, - VM_MIN_UNMAPPED=32, - VM_PANIC_ON_OOM=33, - VM_VDSO_ENABLED=34, -}; - -enum -{ - NET_CORE=1, - NET_ETHER=2, - NET_802=3, - NET_UNIX=4, - NET_IPV4=5, - NET_IPX=6, - NET_ATALK=7, - NET_NETROM=8, - NET_AX25=9, - NET_BRIDGE=10, - NET_ROSE=11, - NET_IPV6=12, - NET_X25=13, - NET_TR=14, - NET_DECNET=15, - NET_ECONET=16, - NET_SCTP=17, - NET_LLC=18, - NET_NETFILTER=19, - NET_DCCP=20, -}; - -enum -{ - RANDOM_POOLSIZE=1, - RANDOM_ENTROPY_COUNT=2, - RANDOM_READ_THRESH=3, - RANDOM_WRITE_THRESH=4, - RANDOM_BOOT_ID=5, - RANDOM_UUID=6 -}; - -enum -{ - PTY_MAX=1, - PTY_NR=2 -}; - -enum -{ - BUS_ISA_MEM_BASE=1, - BUS_ISA_PORT_BASE=2, - BUS_ISA_PORT_SHIFT=3 -}; - -enum -{ - NET_CORE_WMEM_MAX=1, - NET_CORE_RMEM_MAX=2, - NET_CORE_WMEM_DEFAULT=3, - NET_CORE_RMEM_DEFAULT=4, - - NET_CORE_MAX_BACKLOG=6, - NET_CORE_FASTROUTE=7, - NET_CORE_MSG_COST=8, - NET_CORE_MSG_BURST=9, - NET_CORE_OPTMEM_MAX=10, - NET_CORE_HOT_LIST_LENGTH=11, - NET_CORE_DIVERT_VERSION=12, - NET_CORE_NO_CONG_THRESH=13, - NET_CORE_NO_CONG=14, - NET_CORE_LO_CONG=15, - NET_CORE_MOD_CONG=16, - NET_CORE_DEV_WEIGHT=17, - NET_CORE_SOMAXCONN=18, - NET_CORE_BUDGET=19, - NET_CORE_AEVENT_ETIME=20, - NET_CORE_AEVENT_RSEQTH=21, -}; - -enum -{ - NET_UNIX_DESTROY_DELAY=1, - NET_UNIX_DELETE_DELAY=2, - NET_UNIX_MAX_DGRAM_QLEN=3, -}; - -enum -{ - NET_NF_CONNTRACK_MAX=1, - NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2, - NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3, - NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4, - NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5, - NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6, - NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7, - NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8, - NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9, - NET_NF_CONNTRACK_UDP_TIMEOUT=10, - NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11, - NET_NF_CONNTRACK_ICMP_TIMEOUT=12, - NET_NF_CONNTRACK_GENERIC_TIMEOUT=13, - NET_NF_CONNTRACK_BUCKETS=14, - NET_NF_CONNTRACK_LOG_INVALID=15, - NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16, - NET_NF_CONNTRACK_TCP_LOOSE=17, - NET_NF_CONNTRACK_TCP_BE_LIBERAL=18, - NET_NF_CONNTRACK_TCP_MAX_RETRANS=19, - NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20, - NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21, - NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22, - NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23, - NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24, - NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25, - NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26, - NET_NF_CONNTRACK_COUNT=27, - NET_NF_CONNTRACK_ICMPV6_TIMEOUT=28, - NET_NF_CONNTRACK_FRAG6_TIMEOUT=29, - NET_NF_CONNTRACK_FRAG6_LOW_THRESH=30, - NET_NF_CONNTRACK_FRAG6_HIGH_THRESH=31, - NET_NF_CONNTRACK_CHECKSUM=32, -}; - -enum -{ - - NET_IPV4_FORWARD=8, - NET_IPV4_DYNADDR=9, - - NET_IPV4_CONF=16, - NET_IPV4_NEIGH=17, - NET_IPV4_ROUTE=18, - NET_IPV4_FIB_HASH=19, - NET_IPV4_NETFILTER=20, - - NET_IPV4_TCP_TIMESTAMPS=33, - NET_IPV4_TCP_WINDOW_SCALING=34, - NET_IPV4_TCP_SACK=35, - NET_IPV4_TCP_RETRANS_COLLAPSE=36, - NET_IPV4_DEFAULT_TTL=37, - NET_IPV4_AUTOCONFIG=38, - NET_IPV4_NO_PMTU_DISC=39, - NET_IPV4_TCP_SYN_RETRIES=40, - NET_IPV4_IPFRAG_HIGH_THRESH=41, - NET_IPV4_IPFRAG_LOW_THRESH=42, - NET_IPV4_IPFRAG_TIME=43, - NET_IPV4_TCP_MAX_KA_PROBES=44, - NET_IPV4_TCP_KEEPALIVE_TIME=45, - NET_IPV4_TCP_KEEPALIVE_PROBES=46, - NET_IPV4_TCP_RETRIES1=47, - NET_IPV4_TCP_RETRIES2=48, - NET_IPV4_TCP_FIN_TIMEOUT=49, - NET_IPV4_IP_MASQ_DEBUG=50, - NET_TCP_SYNCOOKIES=51, - NET_TCP_STDURG=52, - NET_TCP_RFC1337=53, - NET_TCP_SYN_TAILDROP=54, - NET_TCP_MAX_SYN_BACKLOG=55, - NET_IPV4_LOCAL_PORT_RANGE=56, - NET_IPV4_ICMP_ECHO_IGNORE_ALL=57, - NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS=58, - NET_IPV4_ICMP_SOURCEQUENCH_RATE=59, - NET_IPV4_ICMP_DESTUNREACH_RATE=60, - NET_IPV4_ICMP_TIMEEXCEED_RATE=61, - NET_IPV4_ICMP_PARAMPROB_RATE=62, - NET_IPV4_ICMP_ECHOREPLY_RATE=63, - NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES=64, - NET_IPV4_IGMP_MAX_MEMBERSHIPS=65, - NET_TCP_TW_RECYCLE=66, - NET_IPV4_ALWAYS_DEFRAG=67, - NET_IPV4_TCP_KEEPALIVE_INTVL=68, - NET_IPV4_INET_PEER_THRESHOLD=69, - NET_IPV4_INET_PEER_MINTTL=70, - NET_IPV4_INET_PEER_MAXTTL=71, - NET_IPV4_INET_PEER_GC_MINTIME=72, - NET_IPV4_INET_PEER_GC_MAXTIME=73, - NET_TCP_ORPHAN_RETRIES=74, - NET_TCP_ABORT_ON_OVERFLOW=75, - NET_TCP_SYNACK_RETRIES=76, - NET_TCP_MAX_ORPHANS=77, - NET_TCP_MAX_TW_BUCKETS=78, - NET_TCP_FACK=79, - NET_TCP_REORDERING=80, - NET_TCP_ECN=81, - NET_TCP_DSACK=82, - NET_TCP_MEM=83, - NET_TCP_WMEM=84, - NET_TCP_RMEM=85, - NET_TCP_APP_WIN=86, - NET_TCP_ADV_WIN_SCALE=87, - NET_IPV4_NONLOCAL_BIND=88, - NET_IPV4_ICMP_RATELIMIT=89, - NET_IPV4_ICMP_RATEMASK=90, - NET_TCP_TW_REUSE=91, - NET_TCP_FRTO=92, - NET_TCP_LOW_LATENCY=93, - NET_IPV4_IPFRAG_SECRET_INTERVAL=94, - NET_IPV4_IGMP_MAX_MSF=96, - NET_TCP_NO_METRICS_SAVE=97, - NET_TCP_DEFAULT_WIN_SCALE=105, - NET_TCP_MODERATE_RCVBUF=106, - NET_TCP_TSO_WIN_DIVISOR=107, - NET_TCP_BIC_BETA=108, - NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR=109, - NET_TCP_CONG_CONTROL=110, - NET_TCP_ABC=111, - NET_IPV4_IPFRAG_MAX_DIST=112, - NET_TCP_MTU_PROBING=113, - NET_TCP_BASE_MSS=114, - NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115, - NET_TCP_DMA_COPYBREAK=116, - NET_TCP_SLOW_START_AFTER_IDLE=117, -}; - -enum { - NET_IPV4_ROUTE_FLUSH=1, - NET_IPV4_ROUTE_MIN_DELAY=2, - NET_IPV4_ROUTE_MAX_DELAY=3, - NET_IPV4_ROUTE_GC_THRESH=4, - NET_IPV4_ROUTE_MAX_SIZE=5, - NET_IPV4_ROUTE_GC_MIN_INTERVAL=6, - NET_IPV4_ROUTE_GC_TIMEOUT=7, - NET_IPV4_ROUTE_GC_INTERVAL=8, - NET_IPV4_ROUTE_REDIRECT_LOAD=9, - NET_IPV4_ROUTE_REDIRECT_NUMBER=10, - NET_IPV4_ROUTE_REDIRECT_SILENCE=11, - NET_IPV4_ROUTE_ERROR_COST=12, - NET_IPV4_ROUTE_ERROR_BURST=13, - NET_IPV4_ROUTE_GC_ELASTICITY=14, - NET_IPV4_ROUTE_MTU_EXPIRES=15, - NET_IPV4_ROUTE_MIN_PMTU=16, - NET_IPV4_ROUTE_MIN_ADVMSS=17, - NET_IPV4_ROUTE_SECRET_INTERVAL=18, - NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS=19, -}; - -enum -{ - NET_PROTO_CONF_ALL=-2, - NET_PROTO_CONF_DEFAULT=-3 - -}; - -enum -{ - NET_IPV4_CONF_FORWARDING=1, - NET_IPV4_CONF_MC_FORWARDING=2, - NET_IPV4_CONF_PROXY_ARP=3, - NET_IPV4_CONF_ACCEPT_REDIRECTS=4, - NET_IPV4_CONF_SECURE_REDIRECTS=5, - NET_IPV4_CONF_SEND_REDIRECTS=6, - NET_IPV4_CONF_SHARED_MEDIA=7, - NET_IPV4_CONF_RP_FILTER=8, - NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE=9, - NET_IPV4_CONF_BOOTP_RELAY=10, - NET_IPV4_CONF_LOG_MARTIANS=11, - NET_IPV4_CONF_TAG=12, - NET_IPV4_CONF_ARPFILTER=13, - NET_IPV4_CONF_MEDIUM_ID=14, - NET_IPV4_CONF_NOXFRM=15, - NET_IPV4_CONF_NOPOLICY=16, - NET_IPV4_CONF_FORCE_IGMP_VERSION=17, - NET_IPV4_CONF_ARP_ANNOUNCE=18, - NET_IPV4_CONF_ARP_IGNORE=19, - NET_IPV4_CONF_PROMOTE_SECONDARIES=20, - NET_IPV4_CONF_ARP_ACCEPT=21, - __NET_IPV4_CONF_MAX -}; - -enum -{ - NET_IPV4_NF_CONNTRACK_MAX=1, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9, - NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT=10, - NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11, - NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT=12, - NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT=13, - NET_IPV4_NF_CONNTRACK_BUCKETS=14, - NET_IPV4_NF_CONNTRACK_LOG_INVALID=15, - NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS=16, - NET_IPV4_NF_CONNTRACK_TCP_LOOSE=17, - NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL=18, - NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS=19, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED=20, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT=21, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED=22, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED=23, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT=24, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD=25, - NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT=26, - NET_IPV4_NF_CONNTRACK_COUNT=27, - NET_IPV4_NF_CONNTRACK_CHECKSUM=28, -}; - -enum { - NET_IPV6_CONF=16, - NET_IPV6_NEIGH=17, - NET_IPV6_ROUTE=18, - NET_IPV6_ICMP=19, - NET_IPV6_BINDV6ONLY=20, - NET_IPV6_IP6FRAG_HIGH_THRESH=21, - NET_IPV6_IP6FRAG_LOW_THRESH=22, - NET_IPV6_IP6FRAG_TIME=23, - NET_IPV6_IP6FRAG_SECRET_INTERVAL=24, - NET_IPV6_MLD_MAX_MSF=25, -}; - -enum { - NET_IPV6_ROUTE_FLUSH=1, - NET_IPV6_ROUTE_GC_THRESH=2, - NET_IPV6_ROUTE_MAX_SIZE=3, - NET_IPV6_ROUTE_GC_MIN_INTERVAL=4, - NET_IPV6_ROUTE_GC_TIMEOUT=5, - NET_IPV6_ROUTE_GC_INTERVAL=6, - NET_IPV6_ROUTE_GC_ELASTICITY=7, - NET_IPV6_ROUTE_MTU_EXPIRES=8, - NET_IPV6_ROUTE_MIN_ADVMSS=9, - NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS=10 -}; - -enum { - NET_IPV6_FORWARDING=1, - NET_IPV6_HOP_LIMIT=2, - NET_IPV6_MTU=3, - NET_IPV6_ACCEPT_RA=4, - NET_IPV6_ACCEPT_REDIRECTS=5, - NET_IPV6_AUTOCONF=6, - NET_IPV6_DAD_TRANSMITS=7, - NET_IPV6_RTR_SOLICITS=8, - NET_IPV6_RTR_SOLICIT_INTERVAL=9, - NET_IPV6_RTR_SOLICIT_DELAY=10, - NET_IPV6_USE_TEMPADDR=11, - NET_IPV6_TEMP_VALID_LFT=12, - NET_IPV6_TEMP_PREFERED_LFT=13, - NET_IPV6_REGEN_MAX_RETRY=14, - NET_IPV6_MAX_DESYNC_FACTOR=15, - NET_IPV6_MAX_ADDRESSES=16, - NET_IPV6_FORCE_MLD_VERSION=17, - NET_IPV6_ACCEPT_RA_DEFRTR=18, - NET_IPV6_ACCEPT_RA_PINFO=19, - NET_IPV6_ACCEPT_RA_RTR_PREF=20, - NET_IPV6_RTR_PROBE_INTERVAL=21, - NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22, - __NET_IPV6_MAX -}; - -enum { - NET_IPV6_ICMP_RATELIMIT=1 -}; - -enum { - NET_NEIGH_MCAST_SOLICIT=1, - NET_NEIGH_UCAST_SOLICIT=2, - NET_NEIGH_APP_SOLICIT=3, - NET_NEIGH_RETRANS_TIME=4, - NET_NEIGH_REACHABLE_TIME=5, - NET_NEIGH_DELAY_PROBE_TIME=6, - NET_NEIGH_GC_STALE_TIME=7, - NET_NEIGH_UNRES_QLEN=8, - NET_NEIGH_PROXY_QLEN=9, - NET_NEIGH_ANYCAST_DELAY=10, - NET_NEIGH_PROXY_DELAY=11, - NET_NEIGH_LOCKTIME=12, - NET_NEIGH_GC_INTERVAL=13, - NET_NEIGH_GC_THRESH1=14, - NET_NEIGH_GC_THRESH2=15, - NET_NEIGH_GC_THRESH3=16, - NET_NEIGH_RETRANS_TIME_MS=17, - NET_NEIGH_REACHABLE_TIME_MS=18, - __NET_NEIGH_MAX -}; - -enum { - NET_DCCP_DEFAULT=1, -}; - -enum { - NET_DCCP_DEFAULT_SEQ_WINDOW = 1, - NET_DCCP_DEFAULT_RX_CCID = 2, - NET_DCCP_DEFAULT_TX_CCID = 3, - NET_DCCP_DEFAULT_ACK_RATIO = 4, - NET_DCCP_DEFAULT_SEND_ACKVEC = 5, - NET_DCCP_DEFAULT_SEND_NDP = 6, -}; - -enum { - NET_IPX_PPROP_BROADCASTING=1, - NET_IPX_FORWARDING=2 -}; - -enum { - NET_LLC2=1, - NET_LLC_STATION=2, -}; - -enum { - NET_LLC2_TIMEOUT=1, -}; - -enum { - NET_LLC_STATION_ACK_TIMEOUT=1, -}; - -enum { - NET_LLC2_ACK_TIMEOUT=1, - NET_LLC2_P_TIMEOUT=2, - NET_LLC2_REJ_TIMEOUT=3, - NET_LLC2_BUSY_TIMEOUT=4, -}; - -enum { - NET_ATALK_AARP_EXPIRY_TIME=1, - NET_ATALK_AARP_TICK_TIME=2, - NET_ATALK_AARP_RETRANSMIT_LIMIT=3, - NET_ATALK_AARP_RESOLVE_TIME=4 -}; - -enum { - NET_NETROM_DEFAULT_PATH_QUALITY=1, - NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER=2, - NET_NETROM_NETWORK_TTL_INITIALISER=3, - NET_NETROM_TRANSPORT_TIMEOUT=4, - NET_NETROM_TRANSPORT_MAXIMUM_TRIES=5, - NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY=6, - NET_NETROM_TRANSPORT_BUSY_DELAY=7, - NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE=8, - NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT=9, - NET_NETROM_ROUTING_CONTROL=10, - NET_NETROM_LINK_FAILS_COUNT=11, - NET_NETROM_RESET=12 -}; - -enum { - NET_AX25_IP_DEFAULT_MODE=1, - NET_AX25_DEFAULT_MODE=2, - NET_AX25_BACKOFF_TYPE=3, - NET_AX25_CONNECT_MODE=4, - NET_AX25_STANDARD_WINDOW=5, - NET_AX25_EXTENDED_WINDOW=6, - NET_AX25_T1_TIMEOUT=7, - NET_AX25_T2_TIMEOUT=8, - NET_AX25_T3_TIMEOUT=9, - NET_AX25_IDLE_TIMEOUT=10, - NET_AX25_N2=11, - NET_AX25_PACLEN=12, - NET_AX25_PROTOCOL=13, - NET_AX25_DAMA_SLAVE_TIMEOUT=14 -}; - -enum { - NET_ROSE_RESTART_REQUEST_TIMEOUT=1, - NET_ROSE_CALL_REQUEST_TIMEOUT=2, - NET_ROSE_RESET_REQUEST_TIMEOUT=3, - NET_ROSE_CLEAR_REQUEST_TIMEOUT=4, - NET_ROSE_ACK_HOLD_BACK_TIMEOUT=5, - NET_ROSE_ROUTING_CONTROL=6, - NET_ROSE_LINK_FAIL_TIMEOUT=7, - NET_ROSE_MAX_VCS=8, - NET_ROSE_WINDOW_SIZE=9, - NET_ROSE_NO_ACTIVITY_TIMEOUT=10 -}; - -enum { - NET_X25_RESTART_REQUEST_TIMEOUT=1, - NET_X25_CALL_REQUEST_TIMEOUT=2, - NET_X25_RESET_REQUEST_TIMEOUT=3, - NET_X25_CLEAR_REQUEST_TIMEOUT=4, - NET_X25_ACK_HOLD_BACK_TIMEOUT=5 -}; - -enum -{ - NET_TR_RIF_TIMEOUT=1 -}; - -enum { - NET_DECNET_NODE_TYPE = 1, - NET_DECNET_NODE_ADDRESS = 2, - NET_DECNET_NODE_NAME = 3, - NET_DECNET_DEFAULT_DEVICE = 4, - NET_DECNET_TIME_WAIT = 5, - NET_DECNET_DN_COUNT = 6, - NET_DECNET_DI_COUNT = 7, - NET_DECNET_DR_COUNT = 8, - NET_DECNET_DST_GC_INTERVAL = 9, - NET_DECNET_CONF = 10, - NET_DECNET_NO_FC_MAX_CWND = 11, - NET_DECNET_MEM = 12, - NET_DECNET_RMEM = 13, - NET_DECNET_WMEM = 14, - NET_DECNET_DEBUG_LEVEL = 255 -}; - -enum { - NET_DECNET_CONF_LOOPBACK = -2, - NET_DECNET_CONF_DDCMP = -3, - NET_DECNET_CONF_PPP = -4, - NET_DECNET_CONF_X25 = -5, - NET_DECNET_CONF_GRE = -6, - NET_DECNET_CONF_ETHER = -7 - -}; - -enum { - NET_DECNET_CONF_DEV_PRIORITY = 1, - NET_DECNET_CONF_DEV_T1 = 2, - NET_DECNET_CONF_DEV_T2 = 3, - NET_DECNET_CONF_DEV_T3 = 4, - NET_DECNET_CONF_DEV_FORWARDING = 5, - NET_DECNET_CONF_DEV_BLKSIZE = 6, - NET_DECNET_CONF_DEV_STATE = 7 -}; - -enum { - NET_SCTP_RTO_INITIAL = 1, - NET_SCTP_RTO_MIN = 2, - NET_SCTP_RTO_MAX = 3, - NET_SCTP_RTO_ALPHA = 4, - NET_SCTP_RTO_BETA = 5, - NET_SCTP_VALID_COOKIE_LIFE = 6, - NET_SCTP_ASSOCIATION_MAX_RETRANS = 7, - NET_SCTP_PATH_MAX_RETRANS = 8, - NET_SCTP_MAX_INIT_RETRANSMITS = 9, - NET_SCTP_HB_INTERVAL = 10, - NET_SCTP_PRESERVE_ENABLE = 11, - NET_SCTP_MAX_BURST = 12, - NET_SCTP_ADDIP_ENABLE = 13, - NET_SCTP_PRSCTP_ENABLE = 14, - NET_SCTP_SNDBUF_POLICY = 15, - NET_SCTP_SACK_TIMEOUT = 16, - NET_SCTP_RCVBUF_POLICY = 17, -}; - -enum { - NET_BRIDGE_NF_CALL_ARPTABLES = 1, - NET_BRIDGE_NF_CALL_IPTABLES = 2, - NET_BRIDGE_NF_CALL_IP6TABLES = 3, - NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, -}; - -enum -{ - FS_NRINODE=1, - FS_STATINODE=2, - FS_MAXINODE=3, - FS_NRDQUOT=4, - FS_MAXDQUOT=5, - FS_NRFILE=6, - FS_MAXFILE=7, - FS_DENTRY=8, - FS_NRSUPER=9, - FS_MAXSUPER=10, - FS_OVERFLOWUID=11, - FS_OVERFLOWGID=12, - FS_LEASES=13, - FS_DIR_NOTIFY=14, - FS_LEASE_TIME=15, - FS_DQSTATS=16, - FS_XFS=17, - FS_AIO_NR=18, - FS_AIO_MAX_NR=19, - FS_INOTIFY=20, -}; - -enum { - FS_DQ_LOOKUPS = 1, - FS_DQ_DROPS = 2, - FS_DQ_READS = 3, - FS_DQ_WRITES = 4, - FS_DQ_CACHE_HITS = 5, - FS_DQ_ALLOCATED = 6, - FS_DQ_FREE = 7, - FS_DQ_SYNCS = 8, - FS_DQ_WARNINGS = 9, -}; - -enum { - DEV_CDROM=1, - DEV_HWMON=2, - DEV_PARPORT=3, - DEV_RAID=4, - DEV_MAC_HID=5, - DEV_SCSI=6, - DEV_IPMI=7, -}; - -enum { - DEV_CDROM_INFO=1, - DEV_CDROM_AUTOCLOSE=2, - DEV_CDROM_AUTOEJECT=3, - DEV_CDROM_DEBUG=4, - DEV_CDROM_LOCK=5, - DEV_CDROM_CHECK_MEDIA=6 -}; - -enum { - DEV_PARPORT_DEFAULT=-3 -}; - -enum { - DEV_RAID_SPEED_LIMIT_MIN=1, - DEV_RAID_SPEED_LIMIT_MAX=2 -}; - -enum { - DEV_PARPORT_DEFAULT_TIMESLICE=1, - DEV_PARPORT_DEFAULT_SPINTIME=2 -}; - -enum { - DEV_PARPORT_SPINTIME=1, - DEV_PARPORT_BASE_ADDR=2, - DEV_PARPORT_IRQ=3, - DEV_PARPORT_DMA=4, - DEV_PARPORT_MODES=5, - DEV_PARPORT_DEVICES=6, - DEV_PARPORT_AUTOPROBE=16 -}; - -enum { - DEV_PARPORT_DEVICES_ACTIVE=-3, -}; - -enum { - DEV_PARPORT_DEVICE_TIMESLICE=1, -}; - -enum { - DEV_MAC_HID_KEYBOARD_SENDS_LINUX_KEYCODES=1, - DEV_MAC_HID_KEYBOARD_LOCK_KEYCODES=2, - DEV_MAC_HID_MOUSE_BUTTON_EMULATION=3, - DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE=4, - DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE=5, - DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES=6 -}; - -enum { - DEV_SCSI_LOGGING_LEVEL=1, -}; - -enum { - DEV_IPMI_POWEROFF_POWERCYCLE=1, -}; - -enum -{ - ABI_DEFHANDLER_COFF=1, - ABI_DEFHANDLER_ELF=2, - ABI_DEFHANDLER_LCALL7=3, - ABI_DEFHANDLER_LIBCSO=4, - ABI_TRACE=5, - ABI_FAKE_UTSNAME=6, -}; - -#endif diff --git a/libc/kernel/common/linux/sysdev.h b/libc/kernel/common/linux/sysdev.h deleted file mode 100644 index 6ae2b26ab..000000000 --- a/libc/kernel/common/linux/sysdev.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _SYSDEV_H_ -#define _SYSDEV_H_ - -#include -#include - -struct sys_device; - -struct sysdev_class { - struct list_head drivers; - - int (*shutdown)(struct sys_device *); - int (*suspend)(struct sys_device *, pm_message_t state); - int (*resume)(struct sys_device *); - struct kset kset; -}; - -struct sysdev_class_attribute { - struct attribute attr; - ssize_t (*show)(struct sysdev_class *, char *); - ssize_t (*store)(struct sysdev_class *, const char *, size_t); -}; - -#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) struct sysdev_class_attribute attr_##_name = { .attr = {.name = __stringify(_name), .mode = _mode }, .show = _show, .store = _store, }; - -struct sysdev_driver { - struct list_head entry; - int (*add)(struct sys_device *); - int (*remove)(struct sys_device *); - int (*shutdown)(struct sys_device *); - int (*suspend)(struct sys_device *, pm_message_t state); - int (*resume)(struct sys_device *); -}; - -struct sys_device { - u32 id; - struct sysdev_class * cls; - struct kobject kobj; -}; - -struct sysdev_attribute { - struct attribute attr; - ssize_t (*show)(struct sys_device *, char *); - ssize_t (*store)(struct sys_device *, const char *, size_t); -}; - -#define SYSDEV_ATTR(_name,_mode,_show,_store) struct sysdev_attribute attr_##_name = { .attr = {.name = __stringify(_name), .mode = _mode }, .show = _show, .store = _store, }; - -#endif diff --git a/libc/kernel/common/linux/sysfs.h b/libc/kernel/common/linux/sysfs.h deleted file mode 100644 index 00b5f5a2d..000000000 --- a/libc/kernel/common/linux/sysfs.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _SYSFS_H_ -#define _SYSFS_H_ - -#include - -struct kobject; -struct module; - -struct attribute { - const char * name; - struct module * owner; - mode_t mode; -}; - -struct attribute_group { - const char * name; - struct attribute ** attrs; -}; - -#define __ATTR(_name,_mode,_show,_store) { .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE }, .show = _show, .store = _store, } - -#define __ATTR_RO(_name) { .attr = { .name = __stringify(_name), .mode = 0444, .owner = THIS_MODULE }, .show = _name##_show, } - -#define __ATTR_NULL { .attr = { .name = NULL } } - -#define attr_name(_attr) (_attr).attr.name - -struct vm_area_struct; - -struct bin_attribute { - struct attribute attr; - size_t size; - void *private; - ssize_t (*read)(struct kobject *, char *, loff_t, size_t); - ssize_t (*write)(struct kobject *, char *, loff_t, size_t); - int (*mmap)(struct kobject *, struct bin_attribute *attr, - struct vm_area_struct *vma); -}; - -struct sysfs_ops { - ssize_t (*show)(struct kobject *, struct attribute *,char *); - ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t); -}; - -struct sysfs_dirent { - atomic_t s_count; - struct list_head s_sibling; - struct list_head s_children; - void * s_element; - int s_type; - umode_t s_mode; - struct dentry * s_dentry; - struct iattr * s_iattr; - atomic_t s_event; -}; - -#define SYSFS_ROOT 0x0001 -#define SYSFS_DIR 0x0002 -#define SYSFS_KOBJ_ATTR 0x0004 -#define SYSFS_KOBJ_BIN_ATTR 0x0008 -#define SYSFS_KOBJ_DEVICE 0x0010 -#define SYSFS_KOBJ_LINK 0x0020 -#define SYSFS_NOT_PINNED (SYSFS_KOBJ_ATTR | SYSFS_KOBJ_BIN_ATTR | SYSFS_KOBJ_DEVICE | SYSFS_KOBJ_LINK) - -#endif diff --git a/libc/kernel/common/linux/taskstats.h b/libc/kernel/common/linux/taskstats.h deleted file mode 100644 index 3e8ae4a14..000000000 --- a/libc/kernel/common/linux/taskstats.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TASKSTATS_H -#define _LINUX_TASKSTATS_H - -#define TASKSTATS_VERSION 1 - -struct taskstats { - - __u16 version; - __u16 padding[3]; - - __u64 cpu_count; - __u64 cpu_delay_total; - - __u64 blkio_count; - __u64 blkio_delay_total; - - __u64 swapin_count; - __u64 swapin_delay_total; - - __u64 cpu_run_real_total; - - __u64 cpu_run_virtual_total; - -}; - -enum { - TASKSTATS_CMD_UNSPEC = 0, - TASKSTATS_CMD_GET, - TASKSTATS_CMD_NEW, - __TASKSTATS_CMD_MAX, -}; - -#define TASKSTATS_CMD_MAX (__TASKSTATS_CMD_MAX - 1) - -enum { - TASKSTATS_TYPE_UNSPEC = 0, - TASKSTATS_TYPE_PID, - TASKSTATS_TYPE_TGID, - TASKSTATS_TYPE_STATS, - TASKSTATS_TYPE_AGGR_PID, - TASKSTATS_TYPE_AGGR_TGID, - __TASKSTATS_TYPE_MAX, -}; - -#define TASKSTATS_TYPE_MAX (__TASKSTATS_TYPE_MAX - 1) - -enum { - TASKSTATS_CMD_ATTR_UNSPEC = 0, - TASKSTATS_CMD_ATTR_PID, - TASKSTATS_CMD_ATTR_TGID, - TASKSTATS_CMD_ATTR_REGISTER_CPUMASK, - TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK, - __TASKSTATS_CMD_ATTR_MAX, -}; - -#define TASKSTATS_CMD_ATTR_MAX (__TASKSTATS_CMD_ATTR_MAX - 1) - -#define TASKSTATS_GENL_NAME "TASKSTATS" -#define TASKSTATS_GENL_VERSION 0x1 - -#endif diff --git a/libc/kernel/common/linux/taskstats_kern.h b/libc/kernel/common/linux/taskstats_kern.h deleted file mode 100644 index 4948410ad..000000000 --- a/libc/kernel/common/linux/taskstats_kern.h +++ /dev/null @@ -1,19 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TASKSTATS_KERN_H -#define _LINUX_TASKSTATS_KERN_H - -#include -#include -#include - -#endif diff --git a/libc/kernel/common/linux/tcp.h b/libc/kernel/common/linux/tcp.h deleted file mode 100644 index 3fa95f808..000000000 --- a/libc/kernel/common/linux/tcp.h +++ /dev/null @@ -1,147 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TCP_H -#define _LINUX_TCP_H - -#include -#include - -struct tcphdr { - __u16 source; - __u16 dest; - __u32 seq; - __u32 ack_seq; -#ifdef __LITTLE_ENDIAN_BITFIELD - __u16 res1:4, - doff:4, - fin:1, - syn:1, - rst:1, - psh:1, - ack:1, - urg:1, - ece:1, - cwr:1; -#elif defined(__BIG_ENDIAN_BITFIELD) - __u16 doff:4, - res1:4, - cwr:1, - ece:1, - urg:1, - ack:1, - psh:1, - rst:1, - syn:1, - fin:1; -#else -#error "Adjust your defines" -#endif - __u16 window; - __u16 check; - __u16 urg_ptr; -}; - -union tcp_word_hdr { - struct tcphdr hdr; - __u32 words[5]; -}; - -#define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) - -enum { - TCP_FLAG_CWR = __constant_htonl(0x00800000), - TCP_FLAG_ECE = __constant_htonl(0x00400000), - TCP_FLAG_URG = __constant_htonl(0x00200000), - TCP_FLAG_ACK = __constant_htonl(0x00100000), - TCP_FLAG_PSH = __constant_htonl(0x00080000), - TCP_FLAG_RST = __constant_htonl(0x00040000), - TCP_FLAG_SYN = __constant_htonl(0x00020000), - TCP_FLAG_FIN = __constant_htonl(0x00010000), - TCP_RESERVED_BITS = __constant_htonl(0x0F000000), - TCP_DATA_OFFSET = __constant_htonl(0xF0000000) -}; - -#define TCP_NODELAY 1 -#define TCP_MAXSEG 2 -#define TCP_CORK 3 -#define TCP_KEEPIDLE 4 -#define TCP_KEEPINTVL 5 -#define TCP_KEEPCNT 6 -#define TCP_SYNCNT 7 -#define TCP_LINGER2 8 -#define TCP_DEFER_ACCEPT 9 -#define TCP_WINDOW_CLAMP 10 -#define TCP_INFO 11 -#define TCP_QUICKACK 12 -#define TCP_CONGESTION 13 - -#define TCPI_OPT_TIMESTAMPS 1 -#define TCPI_OPT_SACK 2 -#define TCPI_OPT_WSCALE 4 -#define TCPI_OPT_ECN 8 - -enum tcp_ca_state -{ - TCP_CA_Open = 0, -#define TCPF_CA_Open (1< -#include - -#endif diff --git a/libc/kernel/common/linux/textsearch.h b/libc/kernel/common/linux/textsearch.h deleted file mode 100644 index a921cddc8..000000000 --- a/libc/kernel/common/linux/textsearch.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_TEXTSEARCH_H -#define __LINUX_TEXTSEARCH_H - -#endif diff --git a/libc/kernel/common/linux/thread_info.h b/libc/kernel/common/linux/thread_info.h deleted file mode 100644 index 074a1f905..000000000 --- a/libc/kernel/common/linux/thread_info.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_THREAD_INFO_H -#define _LINUX_THREAD_INFO_H - -struct restart_block { - long (*fn)(struct restart_block *); - unsigned long arg0, arg1, arg2, arg3; -}; - -#include -#include - -#endif diff --git a/libc/kernel/common/linux/threads.h b/libc/kernel/common/linux/threads.h deleted file mode 100644 index 5d858783c..000000000 --- a/libc/kernel/common/linux/threads.h +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_THREADS_H -#define _LINUX_THREADS_H - -#define NR_CPUS 1 - -#define MIN_THREADS_LEFT_FOR_ROOT 4 - -#define PID_MAX_DEFAULT (CONFIG_BASE_SMALL ? 0x1000 : 0x8000) - -#define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : (sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT)) - -#endif diff --git a/libc/kernel/common/linux/time.h b/libc/kernel/common/linux/time.h deleted file mode 100644 index 3e6e440dd..000000000 --- a/libc/kernel/common/linux/time.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TIME_H -#define _LINUX_TIME_H - -#include - -#ifndef _STRUCT_TIMESPEC -#define _STRUCT_TIMESPEC -struct timespec { - time_t tv_sec; - long tv_nsec; -}; -#endif - -struct timeval { - time_t tv_sec; - suseconds_t tv_usec; -}; - -struct timezone { - int tz_minuteswest; - int tz_dsttime; -}; - -#define NFDBITS __NFDBITS - -#define FD_SETSIZE __FD_SETSIZE -#define FD_SET(fd,fdsetp) __FD_SET(fd,fdsetp) -#define FD_CLR(fd,fdsetp) __FD_CLR(fd,fdsetp) -#define FD_ISSET(fd,fdsetp) __FD_ISSET(fd,fdsetp) -#define FD_ZERO(fdsetp) __FD_ZERO(fdsetp) - -#define ITIMER_REAL 0 -#define ITIMER_VIRTUAL 1 -#define ITIMER_PROF 2 - -struct itimerspec { - struct timespec it_interval; - struct timespec it_value; -}; - -struct itimerval { - struct timeval it_interval; - struct timeval it_value; -}; - -#define CLOCK_REALTIME 0 -#define CLOCK_MONOTONIC 1 -#define CLOCK_PROCESS_CPUTIME_ID 2 -#define CLOCK_THREAD_CPUTIME_ID 3 - -#define CLOCK_SGI_CYCLE 10 -#define MAX_CLOCKS 16 -#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC) -#define CLOCKS_MONO CLOCK_MONOTONIC - -#define TIMER_ABSTIME 0x01 - -#endif diff --git a/libc/kernel/common/linux/timer.h b/libc/kernel/common/linux/timer.h deleted file mode 100644 index 071a75927..000000000 --- a/libc/kernel/common/linux/timer.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TIMER_H -#define _LINUX_TIMER_H - -#include -#include -#include - -struct tvec_t_base_s; - -struct timer_list { - struct list_head entry; - unsigned long expires; - - void (*function)(unsigned long); - unsigned long data; - - struct tvec_t_base_s *base; -}; - -#define TIMER_INITIALIZER(_function, _expires, _data) { .function = (_function), .expires = (_expires), .data = (_data), .base = &boot_tvec_bases, } - -#define DEFINE_TIMER(_name, _function, _expires, _data) struct timer_list _name = TIMER_INITIALIZER(_function, _expires, _data) - -#define try_to_del_timer_sync(t) del_timer(t) -#define del_timer_sync(t) del_timer(t) -#define del_singleshot_timer_sync(t) del_timer_sync(t) - -struct hrtimer; - -#endif diff --git a/libc/kernel/common/linux/times.h b/libc/kernel/common/linux/times.h deleted file mode 100644 index 4ae415c2f..000000000 --- a/libc/kernel/common/linux/times.h +++ /dev/null @@ -1,24 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TIMES_H -#define _LINUX_TIMES_H - -#include - -struct tms { - clock_t tms_utime; - clock_t tms_stime; - clock_t tms_cutime; - clock_t tms_cstime; -}; - -#endif diff --git a/libc/kernel/common/linux/timex.h b/libc/kernel/common/linux/timex.h deleted file mode 100644 index 342470bc4..000000000 --- a/libc/kernel/common/linux/timex.h +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TIMEX_H -#define _LINUX_TIMEX_H - -#include -#include - -#include - -#define SHIFT_KG 6 -#define SHIFT_KF 16 -#define SHIFT_KH 2 -#define MAXTC 6 - -#define SHIFT_SCALE 22 -#define SHIFT_UPDATE (SHIFT_KG + MAXTC) -#define SHIFT_USEC 16 -#define FINENSEC (1L << (SHIFT_SCALE - 10)) - -#define MAXPHASE 512000L -#define MAXFREQ (512L << SHIFT_USEC) -#define MINSEC 16L -#define MAXSEC 1200L -#define NTP_PHASE_LIMIT (MAXPHASE << 5) - -struct timex { - unsigned int modes; - long offset; - long freq; - long maxerror; - long esterror; - int status; - long constant; - long precision; - long tolerance; - struct timeval time; - long tick; - - long ppsfreq; - long jitter; - int shift; - long stabil; - long jitcnt; - long calcnt; - long errcnt; - long stbcnt; - - int :32; int :32; int :32; int :32; - int :32; int :32; int :32; int :32; - int :32; int :32; int :32; int :32; -}; - -#define ADJ_OFFSET 0x0001 -#define ADJ_FREQUENCY 0x0002 -#define ADJ_MAXERROR 0x0004 -#define ADJ_ESTERROR 0x0008 -#define ADJ_STATUS 0x0010 -#define ADJ_TIMECONST 0x0020 -#define ADJ_TICK 0x4000 -#define ADJ_OFFSET_SINGLESHOT 0x8001 - -#define MOD_OFFSET ADJ_OFFSET -#define MOD_FREQUENCY ADJ_FREQUENCY -#define MOD_MAXERROR ADJ_MAXERROR -#define MOD_ESTERROR ADJ_ESTERROR -#define MOD_STATUS ADJ_STATUS -#define MOD_TIMECONST ADJ_TIMECONST -#define MOD_CLKB ADJ_TICK -#define MOD_CLKA ADJ_OFFSET_SINGLESHOT - -#define STA_PLL 0x0001 -#define STA_PPSFREQ 0x0002 -#define STA_PPSTIME 0x0004 -#define STA_FLL 0x0008 - -#define STA_INS 0x0010 -#define STA_DEL 0x0020 -#define STA_UNSYNC 0x0040 -#define STA_FREQHOLD 0x0080 - -#define STA_PPSSIGNAL 0x0100 -#define STA_PPSJITTER 0x0200 -#define STA_PPSWANDER 0x0400 -#define STA_PPSERROR 0x0800 - -#define STA_CLOCKERR 0x1000 - -#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | STA_PPSERROR | STA_CLOCKERR) - -#define TIME_OK 0 -#define TIME_INS 1 -#define TIME_DEL 2 -#define TIME_OOP 3 -#define TIME_WAIT 4 -#define TIME_ERROR 5 -#define TIME_BAD TIME_ERROR - -#endif diff --git a/libc/kernel/common/linux/tiocl.h b/libc/kernel/common/linux/tiocl.h deleted file mode 100644 index db15a8db6..000000000 --- a/libc/kernel/common/linux/tiocl.h +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TIOCL_H -#define _LINUX_TIOCL_H - -#define TIOCL_SETSEL 2 -#define TIOCL_SELCHAR 0 -#define TIOCL_SELWORD 1 -#define TIOCL_SELLINE 2 -#define TIOCL_SELPOINTER 3 -#define TIOCL_SELCLEAR 4 -#define TIOCL_SELMOUSEREPORT 16 -#define TIOCL_SELBUTTONMASK 15 - -struct tiocl_selection { - unsigned short xs; - unsigned short ys; - unsigned short xe; - unsigned short ye; - unsigned short sel_mode; -}; - -#define TIOCL_PASTESEL 3 -#define TIOCL_UNBLANKSCREEN 4 - -#define TIOCL_SELLOADLUT 5 - -#define TIOCL_GETSHIFTSTATE 6 -#define TIOCL_GETMOUSEREPORTING 7 -#define TIOCL_SETVESABLANK 10 -#define TIOCL_SETKMSGREDIRECT 11 -#define TIOCL_GETFGCONSOLE 12 -#define TIOCL_SCROLLCONSOLE 13 -#define TIOCL_BLANKSCREEN 14 -#define TIOCL_BLANKEDSCREEN 15 -#define TIOCL_GETKMSGREDIRECT 17 - -#endif diff --git a/libc/kernel/common/linux/transport_class.h b/libc/kernel/common/linux/transport_class.h deleted file mode 100644 index 71ad08450..000000000 --- a/libc/kernel/common/linux/transport_class.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _TRANSPORT_CLASS_H_ -#define _TRANSPORT_CLASS_H_ - -#include -#include - -struct transport_container; - -struct transport_class { - struct class class; - int (*setup)(struct transport_container *, struct device *, - struct class_device *); - int (*configure)(struct transport_container *, struct device *, - struct class_device *); - int (*remove)(struct transport_container *, struct device *, - struct class_device *); -}; - -#define DECLARE_TRANSPORT_CLASS(cls, nm, su, rm, cfg) struct transport_class cls = { .class = { .name = nm, }, .setup = su, .remove = rm, .configure = cfg, } - -struct anon_transport_class { - struct transport_class tclass; - struct attribute_container container; -}; - -#define DECLARE_ANON_TRANSPORT_CLASS(cls, mtch, cfg) struct anon_transport_class cls = { .tclass = { .configure = cfg, }, . container = { .match = mtch, }, } - -#define class_to_transport_class(x) container_of(x, struct transport_class, class) - -struct transport_container { - struct attribute_container ac; - struct attribute_group *statistics; -}; - -#define attribute_container_to_transport_container(x) container_of(x, struct transport_container, ac) - -#endif diff --git a/libc/kernel/common/linux/tty.h b/libc/kernel/common/linux/tty.h deleted file mode 100644 index b28791c76..000000000 --- a/libc/kernel/common/linux/tty.h +++ /dev/null @@ -1,15 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TTY_H -#define _LINUX_TTY_H - -#endif diff --git a/libc/kernel/common/linux/types.h b/libc/kernel/common/linux/types.h deleted file mode 100644 index b118db0f3..000000000 --- a/libc/kernel/common/linux/types.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_TYPES_H -#define _LINUX_TYPES_H - -#include -#include - -#define __bitwise__ -#define __bitwise - -typedef __u16 __bitwise __le16; -typedef __u16 __bitwise __be16; -typedef __u32 __bitwise __le32; -typedef __u32 __bitwise __be32; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __u64 __bitwise __le64; -typedef __u64 __bitwise __be64; -#endif - -struct ustat { - __kernel_daddr_t f_tfree; - __kernel_ino_t f_tinode; - char f_fname[6]; - char f_fpack[6]; -}; - -#endif diff --git a/libc/kernel/common/linux/udp.h b/libc/kernel/common/linux/udp.h deleted file mode 100644 index e4bf8647c..000000000 --- a/libc/kernel/common/linux/udp.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_UDP_H -#define _LINUX_UDP_H - -#include - -struct udphdr { - __u16 source; - __u16 dest; - __u16 len; - __u16 check; -}; - -#define UDP_CORK 1 -#define UDP_ENCAP 100 - -#define UDP_ENCAP_ESPINUDP_NON_IKE 1 -#define UDP_ENCAP_ESPINUDP 2 - -#endif diff --git a/libc/kernel/common/linux/ufs_fs_i.h b/libc/kernel/common/linux/ufs_fs_i.h deleted file mode 100644 index d71adb6ea..000000000 --- a/libc/kernel/common/linux/ufs_fs_i.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_UFS_FS_I_H -#define _LINUX_UFS_FS_I_H - -struct ufs_inode_info { - union { - __fs32 i_data[15]; - __u8 i_symlink[4*15]; - __fs64 u2_i_data[15]; - } i_u1; - __u32 i_flags; - __u32 i_gen; - __u32 i_shadow; - __u32 i_unused1; - __u32 i_unused2; - __u32 i_oeftflag; - __u16 i_osync; - __u32 i_lastfrag; - __u32 i_dir_start_lookup; - struct inode vfs_inode; -}; - -#endif diff --git a/libc/kernel/common/linux/ufs_fs_sb.h b/libc/kernel/common/linux/ufs_fs_sb.h deleted file mode 100644 index 9c7226d86..000000000 --- a/libc/kernel/common/linux/ufs_fs_sb.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_UFS_FS_SB_H -#define __LINUX_UFS_FS_SB_H - -#define UFS_MAX_GROUP_LOADED 8 -#define UFS_CGNO_EMPTY ((unsigned)-1) - -struct ufs_sb_private_info; -struct ufs_cg_private_info; -struct ufs_csum; -#define UFS_MAXCSBUFS 31 - -struct ufs_sb_info { - struct ufs_sb_private_info * s_uspi; - struct ufs_csum * s_csp; - unsigned s_bytesex; - unsigned s_flags; - struct buffer_head ** s_ucg; - struct ufs_cg_private_info * s_ucpi[UFS_MAX_GROUP_LOADED]; - unsigned s_cgno[UFS_MAX_GROUP_LOADED]; - unsigned short s_cg_loaded; - unsigned s_mount_opt; -}; - -#endif diff --git a/libc/kernel/common/linux/uio.h b/libc/kernel/common/linux/uio.h deleted file mode 100644 index b0895af80..000000000 --- a/libc/kernel/common/linux/uio.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_UIO_H -#define __LINUX_UIO_H - -#include -#include - -struct iovec -{ - void __user *iov_base; - __kernel_size_t iov_len; -}; - -#define UIO_FASTIOV 8 -#define UIO_MAXIOV 1024 - -#endif diff --git a/libc/kernel/common/linux/un.h b/libc/kernel/common/linux/un.h deleted file mode 100644 index 5b51b7cfc..000000000 --- a/libc/kernel/common/linux/un.h +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_UN_H -#define _LINUX_UN_H - -#define UNIX_PATH_MAX 108 - -struct sockaddr_un { - sa_family_t sun_family; - char sun_path[UNIX_PATH_MAX]; -}; - -#endif diff --git a/libc/kernel/common/linux/unistd.h b/libc/kernel/common/linux/unistd.h deleted file mode 100644 index 6a3ec4c7a..000000000 --- a/libc/kernel/common/linux/unistd.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_UNISTD_H_ -#define _LINUX_UNISTD_H_ - -#include - -#endif diff --git a/libc/kernel/common/linux/usb.h b/libc/kernel/common/linux/usb.h deleted file mode 100644 index ceee19409..000000000 --- a/libc/kernel/common/linux/usb.h +++ /dev/null @@ -1,21 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_USB_H -#define __LINUX_USB_H - -#include -#include - -#define USB_MAJOR 180 -#define USB_DEVICE_MAJOR 189 - -#endif diff --git a/libc/kernel/common/linux/usb_ch9.h b/libc/kernel/common/linux/usb_ch9.h deleted file mode 100644 index 74e31e725..000000000 --- a/libc/kernel/common/linux/usb_ch9.h +++ /dev/null @@ -1,388 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_USB_CH9_H -#define __LINUX_USB_CH9_H - -#include - -#define USB_DIR_OUT 0 -#define USB_DIR_IN 0x80 - -#define USB_TYPE_MASK (0x03 << 5) -#define USB_TYPE_STANDARD (0x00 << 5) -#define USB_TYPE_CLASS (0x01 << 5) -#define USB_TYPE_VENDOR (0x02 << 5) -#define USB_TYPE_RESERVED (0x03 << 5) - -#define USB_RECIP_MASK 0x1f -#define USB_RECIP_DEVICE 0x00 -#define USB_RECIP_INTERFACE 0x01 -#define USB_RECIP_ENDPOINT 0x02 -#define USB_RECIP_OTHER 0x03 - -#define USB_RECIP_PORT 0x04 -#define USB_RECIP_RPIPE 0x05 - -#define USB_REQ_GET_STATUS 0x00 -#define USB_REQ_CLEAR_FEATURE 0x01 -#define USB_REQ_SET_FEATURE 0x03 -#define USB_REQ_SET_ADDRESS 0x05 -#define USB_REQ_GET_DESCRIPTOR 0x06 -#define USB_REQ_SET_DESCRIPTOR 0x07 -#define USB_REQ_GET_CONFIGURATION 0x08 -#define USB_REQ_SET_CONFIGURATION 0x09 -#define USB_REQ_GET_INTERFACE 0x0A -#define USB_REQ_SET_INTERFACE 0x0B -#define USB_REQ_SYNCH_FRAME 0x0C - -#define USB_REQ_SET_ENCRYPTION 0x0D -#define USB_REQ_GET_ENCRYPTION 0x0E -#define USB_REQ_RPIPE_ABORT 0x0E -#define USB_REQ_SET_HANDSHAKE 0x0F -#define USB_REQ_RPIPE_RESET 0x0F -#define USB_REQ_GET_HANDSHAKE 0x10 -#define USB_REQ_SET_CONNECTION 0x11 -#define USB_REQ_SET_SECURITY_DATA 0x12 -#define USB_REQ_GET_SECURITY_DATA 0x13 -#define USB_REQ_SET_WUSB_DATA 0x14 -#define USB_REQ_LOOPBACK_DATA_WRITE 0x15 -#define USB_REQ_LOOPBACK_DATA_READ 0x16 -#define USB_REQ_SET_INTERFACE_DS 0x17 - -#define USB_DEVICE_SELF_POWERED 0 -#define USB_DEVICE_REMOTE_WAKEUP 1 -#define USB_DEVICE_TEST_MODE 2 -#define USB_DEVICE_BATTERY 2 -#define USB_DEVICE_B_HNP_ENABLE 3 -#define USB_DEVICE_WUSB_DEVICE 3 -#define USB_DEVICE_A_HNP_SUPPORT 4 -#define USB_DEVICE_A_ALT_HNP_SUPPORT 5 -#define USB_DEVICE_DEBUG_MODE 6 - -#define USB_ENDPOINT_HALT 0 - -struct usb_ctrlrequest { - __u8 bRequestType; - __u8 bRequest; - __le16 wValue; - __le16 wIndex; - __le16 wLength; -} __attribute__ ((packed)); - -#define USB_DT_DEVICE 0x01 -#define USB_DT_CONFIG 0x02 -#define USB_DT_STRING 0x03 -#define USB_DT_INTERFACE 0x04 -#define USB_DT_ENDPOINT 0x05 -#define USB_DT_DEVICE_QUALIFIER 0x06 -#define USB_DT_OTHER_SPEED_CONFIG 0x07 -#define USB_DT_INTERFACE_POWER 0x08 - -#define USB_DT_OTG 0x09 -#define USB_DT_DEBUG 0x0a -#define USB_DT_INTERFACE_ASSOCIATION 0x0b - -#define USB_DT_SECURITY 0x0c -#define USB_DT_KEY 0x0d -#define USB_DT_ENCRYPTION_TYPE 0x0e -#define USB_DT_BOS 0x0f -#define USB_DT_DEVICE_CAPABILITY 0x10 -#define USB_DT_WIRELESS_ENDPOINT_COMP 0x11 -#define USB_DT_WIRE_ADAPTER 0x21 -#define USB_DT_RPIPE 0x22 - -#define USB_DT_CS_DEVICE 0x21 -#define USB_DT_CS_CONFIG 0x22 -#define USB_DT_CS_STRING 0x23 -#define USB_DT_CS_INTERFACE 0x24 -#define USB_DT_CS_ENDPOINT 0x25 - -struct usb_descriptor_header { - __u8 bLength; - __u8 bDescriptorType; -} __attribute__ ((packed)); - -struct usb_device_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __le16 bcdUSB; - __u8 bDeviceClass; - __u8 bDeviceSubClass; - __u8 bDeviceProtocol; - __u8 bMaxPacketSize0; - __le16 idVendor; - __le16 idProduct; - __le16 bcdDevice; - __u8 iManufacturer; - __u8 iProduct; - __u8 iSerialNumber; - __u8 bNumConfigurations; -} __attribute__ ((packed)); - -#define USB_DT_DEVICE_SIZE 18 - -#define USB_CLASS_PER_INTERFACE 0 -#define USB_CLASS_AUDIO 1 -#define USB_CLASS_COMM 2 -#define USB_CLASS_HID 3 -#define USB_CLASS_PHYSICAL 5 -#define USB_CLASS_STILL_IMAGE 6 -#define USB_CLASS_PRINTER 7 -#define USB_CLASS_MASS_STORAGE 8 -#define USB_CLASS_HUB 9 -#define USB_CLASS_CDC_DATA 0x0a -#define USB_CLASS_CSCID 0x0b -#define USB_CLASS_CONTENT_SEC 0x0d -#define USB_CLASS_VIDEO 0x0e -#define USB_CLASS_WIRELESS_CONTROLLER 0xe0 -#define USB_CLASS_APP_SPEC 0xfe -#define USB_CLASS_VENDOR_SPEC 0xff - -struct usb_config_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __le16 wTotalLength; - __u8 bNumInterfaces; - __u8 bConfigurationValue; - __u8 iConfiguration; - __u8 bmAttributes; - __u8 bMaxPower; -} __attribute__ ((packed)); - -#define USB_DT_CONFIG_SIZE 9 - -#define USB_CONFIG_ATT_ONE (1 << 7) -#define USB_CONFIG_ATT_SELFPOWER (1 << 6) -#define USB_CONFIG_ATT_WAKEUP (1 << 5) -#define USB_CONFIG_ATT_BATTERY (1 << 4) - -struct usb_string_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __le16 wData[1]; -} __attribute__ ((packed)); - -struct usb_interface_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bInterfaceNumber; - __u8 bAlternateSetting; - __u8 bNumEndpoints; - __u8 bInterfaceClass; - __u8 bInterfaceSubClass; - __u8 bInterfaceProtocol; - __u8 iInterface; -} __attribute__ ((packed)); - -#define USB_DT_INTERFACE_SIZE 9 - -struct usb_endpoint_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bEndpointAddress; - __u8 bmAttributes; - __le16 wMaxPacketSize; - __u8 bInterval; - - __u8 bRefresh; - __u8 bSynchAddress; -} __attribute__ ((packed)); - -#define USB_DT_ENDPOINT_SIZE 7 -#define USB_DT_ENDPOINT_AUDIO_SIZE 9 - -#define USB_ENDPOINT_NUMBER_MASK 0x0f -#define USB_ENDPOINT_DIR_MASK 0x80 - -#define USB_ENDPOINT_XFERTYPE_MASK 0x03 -#define USB_ENDPOINT_XFER_CONTROL 0 -#define USB_ENDPOINT_XFER_ISOC 1 -#define USB_ENDPOINT_XFER_BULK 2 -#define USB_ENDPOINT_XFER_INT 3 -#define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 - -struct usb_qualifier_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __le16 bcdUSB; - __u8 bDeviceClass; - __u8 bDeviceSubClass; - __u8 bDeviceProtocol; - __u8 bMaxPacketSize0; - __u8 bNumConfigurations; - __u8 bRESERVED; -} __attribute__ ((packed)); - -struct usb_otg_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bmAttributes; -} __attribute__ ((packed)); - -#define USB_OTG_SRP (1 << 0) -#define USB_OTG_HNP (1 << 1) - -struct usb_debug_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bDebugInEndpoint; - __u8 bDebugOutEndpoint; -}; - -struct usb_interface_assoc_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bFirstInterface; - __u8 bInterfaceCount; - __u8 bFunctionClass; - __u8 bFunctionSubClass; - __u8 bFunctionProtocol; - __u8 iFunction; -} __attribute__ ((packed)); - -struct usb_security_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __le16 wTotalLength; - __u8 bNumEncryptionTypes; -}; - -struct usb_key_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 tTKID[3]; - __u8 bReserved; - __u8 bKeyData[0]; -}; - -struct usb_encryption_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bEncryptionType; -#define USB_ENC_TYPE_UNSECURE 0 -#define USB_ENC_TYPE_WIRED 1 -#define USB_ENC_TYPE_CCM_1 2 -#define USB_ENC_TYPE_RSA_1 3 - __u8 bEncryptionValue; - __u8 bAuthKeyIndex; -}; - -struct usb_bos_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __le16 wTotalLength; - __u8 bNumDeviceCaps; -}; - -struct usb_dev_cap_header { - __u8 bLength; - __u8 bDescriptorType; - __u8 bDevCapabilityType; -}; - -#define USB_CAP_TYPE_WIRELESS_USB 1 - -struct usb_wireless_cap_descriptor { - __u8 bLength; - __u8 bDescriptorType; - __u8 bDevCapabilityType; - - __u8 bmAttributes; -#define USB_WIRELESS_P2P_DRD (1 << 1) -#define USB_WIRELESS_BEACON_MASK (3 << 2) -#define USB_WIRELESS_BEACON_SELF (1 << 2) -#define USB_WIRELESS_BEACON_DIRECTED (2 << 2) -#define USB_WIRELESS_BEACON_NONE (3 << 2) - __le16 wPHYRates; -#define USB_WIRELESS_PHY_53 (1 << 0) -#define USB_WIRELESS_PHY_80 (1 << 1) -#define USB_WIRELESS_PHY_107 (1 << 2) -#define USB_WIRELESS_PHY_160 (1 << 3) -#define USB_WIRELESS_PHY_200 (1 << 4) -#define USB_WIRELESS_PHY_320 (1 << 5) -#define USB_WIRELESS_PHY_400 (1 << 6) -#define USB_WIRELESS_PHY_480 (1 << 7) - __u8 bmTFITXPowerInfo; - __u8 bmFFITXPowerInfo; - __le16 bmBandGroup; - __u8 bReserved; -}; - -struct usb_wireless_ep_comp_descriptor { - __u8 bLength; - __u8 bDescriptorType; - - __u8 bMaxBurst; - __u8 bMaxSequence; - __le16 wMaxStreamDelay; - __le16 wOverTheAirPacketSize; - __u8 bOverTheAirInterval; - __u8 bmCompAttributes; -#define USB_ENDPOINT_SWITCH_MASK 0x03 -#define USB_ENDPOINT_SWITCH_NO 0 -#define USB_ENDPOINT_SWITCH_SWITCH 1 -#define USB_ENDPOINT_SWITCH_SCALE 2 -}; - -struct usb_handshake { - __u8 bMessageNumber; - __u8 bStatus; - __u8 tTKID[3]; - __u8 bReserved; - __u8 CDID[16]; - __u8 nonce[16]; - __u8 MIC[8]; -}; - -struct usb_connection_context { - __u8 CHID[16]; - __u8 CDID[16]; - __u8 CK[16]; -}; - -enum usb_device_speed { - USB_SPEED_UNKNOWN = 0, - USB_SPEED_LOW, USB_SPEED_FULL, - USB_SPEED_HIGH, - USB_SPEED_VARIABLE, -}; - -enum usb_device_state { - - USB_STATE_NOTATTACHED = 0, - - USB_STATE_ATTACHED, - USB_STATE_POWERED, - USB_STATE_UNAUTHENTICATED, - USB_STATE_RECONNECTING, - USB_STATE_DEFAULT, - USB_STATE_ADDRESS, - USB_STATE_CONFIGURED, - - USB_STATE_SUSPENDED - -}; - -#endif diff --git a/libc/kernel/common/linux/usbdevice_fs.h b/libc/kernel/common/linux/usbdevice_fs.h deleted file mode 100644 index f36efdc1d..000000000 --- a/libc/kernel/common/linux/usbdevice_fs.h +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_USBDEVICE_FS_H -#define _LINUX_USBDEVICE_FS_H - -#include - -#define USBDEVICE_SUPER_MAGIC 0x9fa2 - -struct usbdevfs_ctrltransfer { - __u8 bRequestType; - __u8 bRequest; - __u16 wValue; - __u16 wIndex; - __u16 wLength; - __u32 timeout; - void __user *data; -}; - -struct usbdevfs_bulktransfer { - unsigned int ep; - unsigned int len; - unsigned int timeout; - void __user *data; -}; - -struct usbdevfs_setinterface { - unsigned int interface; - unsigned int altsetting; -}; - -struct usbdevfs_disconnectsignal { - unsigned int signr; - void __user *context; -}; - -#define USBDEVFS_MAXDRIVERNAME 255 - -struct usbdevfs_getdriver { - unsigned int interface; - char driver[USBDEVFS_MAXDRIVERNAME + 1]; -}; - -struct usbdevfs_connectinfo { - unsigned int devnum; - unsigned char slow; -}; - -#define USBDEVFS_URB_SHORT_NOT_OK 1 -#define USBDEVFS_URB_ISO_ASAP 2 - -#define USBDEVFS_URB_TYPE_ISO 0 -#define USBDEVFS_URB_TYPE_INTERRUPT 1 -#define USBDEVFS_URB_TYPE_CONTROL 2 -#define USBDEVFS_URB_TYPE_BULK 3 - -struct usbdevfs_iso_packet_desc { - unsigned int length; - unsigned int actual_length; - unsigned int status; -}; - -struct usbdevfs_urb { - unsigned char type; - unsigned char endpoint; - int status; - unsigned int flags; - void __user *buffer; - int buffer_length; - int actual_length; - int start_frame; - int number_of_packets; - int error_count; - unsigned int signr; - void *usercontext; - struct usbdevfs_iso_packet_desc iso_frame_desc[0]; -}; - -struct usbdevfs_ioctl { - int ifno; - int ioctl_code; - void __user *data; -}; - -struct usbdevfs_hub_portinfo { - char nports; - char port [127]; -}; - -#define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) -#define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer) -#define USBDEVFS_RESETEP _IOR('U', 3, unsigned int) -#define USBDEVFS_SETINTERFACE _IOR('U', 4, struct usbdevfs_setinterface) -#define USBDEVFS_SETCONFIGURATION _IOR('U', 5, unsigned int) -#define USBDEVFS_GETDRIVER _IOW('U', 8, struct usbdevfs_getdriver) -#define USBDEVFS_SUBMITURB _IOR('U', 10, struct usbdevfs_urb) -#define USBDEVFS_SUBMITURB32 _IOR('U', 10, struct usbdevfs_urb32) -#define USBDEVFS_DISCARDURB _IO('U', 11) -#define USBDEVFS_REAPURB _IOW('U', 12, void *) -#define USBDEVFS_REAPURB32 _IOW('U', 12, u32) -#define USBDEVFS_REAPURBNDELAY _IOW('U', 13, void *) -#define USBDEVFS_REAPURBNDELAY32 _IOW('U', 13, u32) -#define USBDEVFS_DISCSIGNAL _IOR('U', 14, struct usbdevfs_disconnectsignal) -#define USBDEVFS_CLAIMINTERFACE _IOR('U', 15, unsigned int) -#define USBDEVFS_RELEASEINTERFACE _IOR('U', 16, unsigned int) -#define USBDEVFS_CONNECTINFO _IOW('U', 17, struct usbdevfs_connectinfo) -#define USBDEVFS_IOCTL _IOWR('U', 18, struct usbdevfs_ioctl) -#define USBDEVFS_IOCTL32 _IOWR('U', 18, struct usbdevfs_ioctl32) -#define USBDEVFS_HUB_PORTINFO _IOR('U', 19, struct usbdevfs_hub_portinfo) -#define USBDEVFS_RESET _IO('U', 20) -#define USBDEVFS_CLEAR_HALT _IOR('U', 21, unsigned int) -#define USBDEVFS_DISCONNECT _IO('U', 22) -#define USBDEVFS_CONNECT _IO('U', 23) -#endif diff --git a/libc/kernel/common/linux/user.h b/libc/kernel/common/linux/user.h deleted file mode 100644 index 1c0b9cbad..000000000 --- a/libc/kernel/common/linux/user.h +++ /dev/null @@ -1,12 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#include diff --git a/libc/kernel/common/linux/utime.h b/libc/kernel/common/linux/utime.h deleted file mode 100644 index 4b1ba9cb5..000000000 --- a/libc/kernel/common/linux/utime.h +++ /dev/null @@ -1,20 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_UTIME_H -#define _LINUX_UTIME_H - -struct utimbuf { - time_t actime; - time_t modtime; -}; - -#endif diff --git a/libc/kernel/common/linux/utsname.h b/libc/kernel/common/linux/utsname.h deleted file mode 100644 index ea6ee8984..000000000 --- a/libc/kernel/common/linux/utsname.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_UTSNAME_H -#define _LINUX_UTSNAME_H - -#define __OLD_UTS_LEN 8 - -struct oldold_utsname { - char sysname[9]; - char nodename[9]; - char release[9]; - char version[9]; - char machine[9]; -}; - -#define __NEW_UTS_LEN 64 - -struct old_utsname { - char sysname[65]; - char nodename[65]; - char release[65]; - char version[65]; - char machine[65]; -}; - -struct new_utsname { - char sysname[65]; - char nodename[65]; - char release[65]; - char version[65]; - char machine[65]; - char domainname[65]; -}; - -#endif diff --git a/libc/kernel/common/linux/version.h b/libc/kernel/common/linux/version.h deleted file mode 100644 index beff0ed1c..000000000 --- a/libc/kernel/common/linux/version.h +++ /dev/null @@ -1,13 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#define LINUX_VERSION_CODE 132626 -#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/libc/kernel/common/linux/vfs.h b/libc/kernel/common/linux/vfs.h deleted file mode 100644 index 70636e9e5..000000000 --- a/libc/kernel/common/linux/vfs.h +++ /dev/null @@ -1,17 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_VFS_H -#define _LINUX_VFS_H - -#include - -#endif diff --git a/libc/kernel/common/linux/videodev.h b/libc/kernel/common/linux/videodev.h deleted file mode 100644 index 1f37fde4d..000000000 --- a/libc/kernel/common/linux/videodev.h +++ /dev/null @@ -1,327 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_VIDEODEV_H -#define __LINUX_VIDEODEV_H - -#include - -struct video_capability -{ - char name[32]; - int type; - int channels; - int audios; - int maxwidth; - int maxheight; - int minwidth; - int minheight; -}; - -struct video_channel -{ - int channel; - char name[32]; - int tuners; - __u32 flags; -#define VIDEO_VC_TUNER 1 -#define VIDEO_VC_AUDIO 2 - __u16 type; -#define VIDEO_TYPE_TV 1 -#define VIDEO_TYPE_CAMERA 2 - __u16 norm; -}; - -struct video_tuner -{ - int tuner; - char name[32]; - unsigned long rangelow, rangehigh; - __u32 flags; -#define VIDEO_TUNER_PAL 1 -#define VIDEO_TUNER_NTSC 2 -#define VIDEO_TUNER_SECAM 4 -#define VIDEO_TUNER_LOW 8 -#define VIDEO_TUNER_NORM 16 -#define VIDEO_TUNER_STEREO_ON 128 -#define VIDEO_TUNER_RDS_ON 256 -#define VIDEO_TUNER_MBS_ON 512 - __u16 mode; -#define VIDEO_MODE_PAL 0 -#define VIDEO_MODE_NTSC 1 -#define VIDEO_MODE_SECAM 2 -#define VIDEO_MODE_AUTO 3 - __u16 signal; -}; - -struct video_picture -{ - __u16 brightness; - __u16 hue; - __u16 colour; - __u16 contrast; - __u16 whiteness; - __u16 depth; - __u16 palette; -#define VIDEO_PALETTE_GREY 1 -#define VIDEO_PALETTE_HI240 2 -#define VIDEO_PALETTE_RGB565 3 -#define VIDEO_PALETTE_RGB24 4 -#define VIDEO_PALETTE_RGB32 5 -#define VIDEO_PALETTE_RGB555 6 -#define VIDEO_PALETTE_YUV422 7 -#define VIDEO_PALETTE_YUYV 8 -#define VIDEO_PALETTE_UYVY 9 -#define VIDEO_PALETTE_YUV420 10 -#define VIDEO_PALETTE_YUV411 11 -#define VIDEO_PALETTE_RAW 12 -#define VIDEO_PALETTE_YUV422P 13 -#define VIDEO_PALETTE_YUV411P 14 -#define VIDEO_PALETTE_YUV420P 15 -#define VIDEO_PALETTE_YUV410P 16 -#define VIDEO_PALETTE_PLANAR 13 -#define VIDEO_PALETTE_COMPONENT 7 -}; - -struct video_audio -{ - int audio; - __u16 volume; - __u16 bass, treble; - __u32 flags; -#define VIDEO_AUDIO_MUTE 1 -#define VIDEO_AUDIO_MUTABLE 2 -#define VIDEO_AUDIO_VOLUME 4 -#define VIDEO_AUDIO_BASS 8 -#define VIDEO_AUDIO_TREBLE 16 -#define VIDEO_AUDIO_BALANCE 32 - char name[16]; -#define VIDEO_SOUND_MONO 1 -#define VIDEO_SOUND_STEREO 2 -#define VIDEO_SOUND_LANG1 4 -#define VIDEO_SOUND_LANG2 8 - __u16 mode; - __u16 balance; - __u16 step; -}; - -struct video_clip -{ - __s32 x,y; - __s32 width, height; - struct video_clip *next; -}; - -struct video_window -{ - __u32 x,y; - __u32 width,height; - __u32 chromakey; - __u32 flags; - struct video_clip __user *clips; - int clipcount; -#define VIDEO_WINDOW_INTERLACE 1 -#define VIDEO_WINDOW_CHROMAKEY 16 -#define VIDEO_CLIP_BITMAP -1 - -#define VIDEO_CLIPMAP_SIZE (128 * 625) -}; - -struct video_capture -{ - __u32 x,y; - __u32 width, height; - __u16 decimation; - __u16 flags; -#define VIDEO_CAPTURE_ODD 0 -#define VIDEO_CAPTURE_EVEN 1 -}; - -struct video_buffer -{ - void *base; - int height,width; - int depth; - int bytesperline; -}; - -struct video_mmap -{ - unsigned int frame; - int height,width; - unsigned int format; -}; - -struct video_key -{ - __u8 key[8]; - __u32 flags; -}; - -struct video_mbuf -{ - int size; - int frames; - int offsets[VIDEO_MAX_FRAME]; -}; - -#define VIDEO_NO_UNIT (-1) - -struct video_unit -{ - int video; - int vbi; - int radio; - int audio; - int teletext; -}; - -struct vbi_format { - __u32 sampling_rate; - __u32 samples_per_line; - __u32 sample_format; - __s32 start[2]; - __u32 count[2]; - __u32 flags; -#define VBI_UNSYNC 1 -#define VBI_INTERLACED 2 -}; - -struct video_info -{ - __u32 frame_count; - __u32 h_size; - __u32 v_size; - __u32 smpte_timecode; - __u32 picture_type; - __u32 temporal_reference; - __u8 user_data[256]; - -}; - -struct video_play_mode -{ - int mode; - int p1; - int p2; -}; - -struct video_code -{ - char loadwhat[16]; - int datasize; - __u8 *data; -}; - -#define VIDIOCGCAP _IOR('v',1,struct video_capability) -#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) -#define VIDIOCSCHAN _IOW('v',3,struct video_channel) -#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) -#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) -#define VIDIOCGPICT _IOR('v',6,struct video_picture) -#define VIDIOCSPICT _IOW('v',7,struct video_picture) -#define VIDIOCCAPTURE _IOW('v',8,int) -#define VIDIOCGWIN _IOR('v',9, struct video_window) -#define VIDIOCSWIN _IOW('v',10, struct video_window) -#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) -#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) -#define VIDIOCKEY _IOR('v',13, struct video_key) -#define VIDIOCGFREQ _IOR('v',14, unsigned long) -#define VIDIOCSFREQ _IOW('v',15, unsigned long) -#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) -#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) -#define VIDIOCSYNC _IOW('v',18, int) -#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) -#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) -#define VIDIOCGUNIT _IOR('v',21, struct video_unit) -#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) -#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) -#define VIDIOCSPLAYMODE _IOW('v',24, struct video_play_mode) -#define VIDIOCSWRITEMODE _IOW('v',25, int) -#define VIDIOCGPLAYINFO _IOR('v',26, struct video_info) -#define VIDIOCSMICROCODE _IOW('v',27, struct video_code) -#define VIDIOCGVBIFMT _IOR('v',28, struct vbi_format) -#define VIDIOCSVBIFMT _IOW('v',29, struct vbi_format) - -#define BASE_VIDIOCPRIVATE 192 - -#define VID_WRITE_MPEG_AUD 0 -#define VID_WRITE_MPEG_VID 1 -#define VID_WRITE_OSD 2 -#define VID_WRITE_TTX 3 -#define VID_WRITE_CC 4 -#define VID_WRITE_MJPEG 5 - -#define VID_PLAY_VID_OUT_MODE 0 - -#define VID_PLAY_GENLOCK 1 - -#define VID_PLAY_NORMAL 2 -#define VID_PLAY_PAUSE 3 -#define VID_PLAY_SINGLE_FRAME 4 -#define VID_PLAY_FAST_FORWARD 5 -#define VID_PLAY_SLOW_MOTION 6 -#define VID_PLAY_IMMEDIATE_NORMAL 7 -#define VID_PLAY_SWITCH_CHANNELS 8 -#define VID_PLAY_FREEZE_FRAME 9 -#define VID_PLAY_STILL_MODE 10 -#define VID_PLAY_MASTER_MODE 11 - -#define VID_PLAY_MASTER_NONE 1 -#define VID_PLAY_MASTER_VIDEO 2 -#define VID_PLAY_MASTER_AUDIO 3 -#define VID_PLAY_ACTIVE_SCANLINES 12 - -#define VID_PLAY_RESET 13 -#define VID_PLAY_END_MARK 14 - -#define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_QCAM_BW 2 -#define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_QCAM_C 4 -#define VID_HARDWARE_PSEUDO 5 -#define VID_HARDWARE_SAA5249 6 -#define VID_HARDWARE_AZTECH 7 -#define VID_HARDWARE_SF16MI 8 -#define VID_HARDWARE_RTRACK 9 -#define VID_HARDWARE_ZOLTRIX 10 -#define VID_HARDWARE_SAA7146 11 -#define VID_HARDWARE_VIDEUM 12 -#define VID_HARDWARE_RTRACK2 13 -#define VID_HARDWARE_PERMEDIA2 14 -#define VID_HARDWARE_RIVA128 15 -#define VID_HARDWARE_PLANB 16 -#define VID_HARDWARE_BROADWAY 17 -#define VID_HARDWARE_GEMTEK 18 -#define VID_HARDWARE_TYPHOON 19 -#define VID_HARDWARE_VINO 20 -#define VID_HARDWARE_CADET 21 -#define VID_HARDWARE_TRUST 22 -#define VID_HARDWARE_TERRATEC 23 -#define VID_HARDWARE_CPIA 24 -#define VID_HARDWARE_ZR36120 25 -#define VID_HARDWARE_ZR36067 26 -#define VID_HARDWARE_OV511 27 -#define VID_HARDWARE_ZR356700 28 -#define VID_HARDWARE_W9966 29 -#define VID_HARDWARE_SE401 30 -#define VID_HARDWARE_PWC 31 -#define VID_HARDWARE_MEYE 32 -#define VID_HARDWARE_CPIA2 33 -#define VID_HARDWARE_VICAM 34 -#define VID_HARDWARE_SF16FMR2 35 -#define VID_HARDWARE_W9968CF 36 -#define VID_HARDWARE_SAA7114H 37 -#define VID_HARDWARE_SN9C102 38 -#define VID_HARDWARE_ARV 39 - -#endif - diff --git a/libc/kernel/common/linux/videodev2.h b/libc/kernel/common/linux/videodev2.h deleted file mode 100644 index dae4e9328..000000000 --- a/libc/kernel/common/linux/videodev2.h +++ /dev/null @@ -1,963 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __LINUX_VIDEODEV2_H -#define __LINUX_VIDEODEV2_H -#define __user -#include - -#define VIDEO_MAX_FRAME 32 - -#define VID_TYPE_CAPTURE 1 -#define VID_TYPE_TUNER 2 -#define VID_TYPE_TELETEXT 4 -#define VID_TYPE_OVERLAY 8 -#define VID_TYPE_CHROMAKEY 16 -#define VID_TYPE_CLIPPING 32 -#define VID_TYPE_FRAMERAM 64 -#define VID_TYPE_SCALES 128 -#define VID_TYPE_MONOCHROME 256 -#define VID_TYPE_SUBCAPTURE 512 -#define VID_TYPE_MPEG_DECODER 1024 -#define VID_TYPE_MPEG_ENCODER 2048 -#define VID_TYPE_MJPEG_DECODER 4096 -#define VID_TYPE_MJPEG_ENCODER 8192 - -#define v4l2_fourcc(a,b,c,d) (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24)) - -enum v4l2_field { - V4L2_FIELD_ANY = 0, - V4L2_FIELD_NONE = 1, - V4L2_FIELD_TOP = 2, - V4L2_FIELD_BOTTOM = 3, - V4L2_FIELD_INTERLACED = 4, - V4L2_FIELD_SEQ_TB = 5, - V4L2_FIELD_SEQ_BT = 6, - V4L2_FIELD_ALTERNATE = 7, -}; -#define V4L2_FIELD_HAS_TOP(field) ((field) == V4L2_FIELD_TOP || (field) == V4L2_FIELD_INTERLACED || (field) == V4L2_FIELD_SEQ_TB || (field) == V4L2_FIELD_SEQ_BT) -#define V4L2_FIELD_HAS_BOTTOM(field) ((field) == V4L2_FIELD_BOTTOM || (field) == V4L2_FIELD_INTERLACED || (field) == V4L2_FIELD_SEQ_TB || (field) == V4L2_FIELD_SEQ_BT) -#define V4L2_FIELD_HAS_BOTH(field) ((field) == V4L2_FIELD_INTERLACED || (field) == V4L2_FIELD_SEQ_TB || (field) == V4L2_FIELD_SEQ_BT) - -enum v4l2_buf_type { - V4L2_BUF_TYPE_VIDEO_CAPTURE = 1, - V4L2_BUF_TYPE_VIDEO_OUTPUT = 2, - V4L2_BUF_TYPE_VIDEO_OVERLAY = 3, - V4L2_BUF_TYPE_VBI_CAPTURE = 4, - V4L2_BUF_TYPE_VBI_OUTPUT = 5, - - V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6, - V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7, - V4L2_BUF_TYPE_PRIVATE = 0x80, -}; - -enum v4l2_ctrl_type { - V4L2_CTRL_TYPE_INTEGER = 1, - V4L2_CTRL_TYPE_BOOLEAN = 2, - V4L2_CTRL_TYPE_MENU = 3, - V4L2_CTRL_TYPE_BUTTON = 4, - V4L2_CTRL_TYPE_INTEGER64 = 5, - V4L2_CTRL_TYPE_CTRL_CLASS = 6, -}; - -enum v4l2_tuner_type { - V4L2_TUNER_RADIO = 1, - V4L2_TUNER_ANALOG_TV = 2, - V4L2_TUNER_DIGITAL_TV = 3, -}; - -enum v4l2_memory { - V4L2_MEMORY_MMAP = 1, - V4L2_MEMORY_USERPTR = 2, - V4L2_MEMORY_OVERLAY = 3, -}; - -enum v4l2_colorspace { - - V4L2_COLORSPACE_SMPTE170M = 1, - - V4L2_COLORSPACE_SMPTE240M = 2, - - V4L2_COLORSPACE_REC709 = 3, - - V4L2_COLORSPACE_BT878 = 4, - - V4L2_COLORSPACE_470_SYSTEM_M = 5, - V4L2_COLORSPACE_470_SYSTEM_BG = 6, - - V4L2_COLORSPACE_JPEG = 7, - - V4L2_COLORSPACE_SRGB = 8, -}; - -enum v4l2_priority { - V4L2_PRIORITY_UNSET = 0, - V4L2_PRIORITY_BACKGROUND = 1, - V4L2_PRIORITY_INTERACTIVE = 2, - V4L2_PRIORITY_RECORD = 3, - V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE, -}; - -struct v4l2_rect { - __s32 left; - __s32 top; - __s32 width; - __s32 height; -}; - -struct v4l2_fract { - __u32 numerator; - __u32 denominator; -}; - -struct v4l2_capability -{ - __u8 driver[16]; - __u8 card[32]; - __u8 bus_info[32]; - __u32 version; - __u32 capabilities; - __u32 reserved[4]; -}; - -#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 -#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 -#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 -#define V4L2_CAP_VBI_CAPTURE 0x00000010 -#define V4L2_CAP_VBI_OUTPUT 0x00000020 -#define V4L2_CAP_SLICED_VBI_CAPTURE 0x00000040 -#define V4L2_CAP_SLICED_VBI_OUTPUT 0x00000080 -#define V4L2_CAP_RDS_CAPTURE 0x00000100 - -#define V4L2_CAP_TUNER 0x00010000 -#define V4L2_CAP_AUDIO 0x00020000 -#define V4L2_CAP_RADIO 0x00040000 - -#define V4L2_CAP_READWRITE 0x01000000 -#define V4L2_CAP_ASYNCIO 0x02000000 -#define V4L2_CAP_STREAMING 0x04000000 - -struct v4l2_pix_format -{ - __u32 width; - __u32 height; - __u32 pixelformat; - enum v4l2_field field; - __u32 bytesperline; - __u32 sizeimage; - enum v4l2_colorspace colorspace; - __u32 priv; -}; - -#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') -#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') -#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') -#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q') -#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R','G','B','R') -#define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B','G','R','3') -#define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R','G','B','3') -#define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B','G','R','4') -#define V4L2_PIX_FMT_RGB32 v4l2_fourcc('R','G','B','4') -#define V4L2_PIX_FMT_GREY v4l2_fourcc('G','R','E','Y') -#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y','V','U','9') -#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y','V','1','2') -#define V4L2_PIX_FMT_YUYV v4l2_fourcc('Y','U','Y','V') -#define V4L2_PIX_FMT_UYVY v4l2_fourcc('U','Y','V','Y') -#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P') -#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P') -#define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y','4','1','P') - -#define V4L2_PIX_FMT_NV12 v4l2_fourcc('N','V','1','2') -#define V4L2_PIX_FMT_NV21 v4l2_fourcc('N','V','2','1') - -#define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y','U','V','9') -#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y','U','1','2') -#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') -#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') -#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') - -#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') - -#define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M','J','P','G') -#define V4L2_PIX_FMT_JPEG v4l2_fourcc('J','P','E','G') -#define V4L2_PIX_FMT_DV v4l2_fourcc('d','v','s','d') -#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M','P','E','G') - -#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') -#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') -#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') -#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') -#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') - -struct v4l2_fmtdesc -{ - __u32 index; - enum v4l2_buf_type type; - __u32 flags; - __u8 description[32]; - __u32 pixelformat; - __u32 reserved[4]; -}; - -#define V4L2_FMT_FLAG_COMPRESSED 0x0001 - -struct v4l2_timecode -{ - __u32 type; - __u32 flags; - __u8 frames; - __u8 seconds; - __u8 minutes; - __u8 hours; - __u8 userbits[4]; -}; - -#define V4L2_TC_TYPE_24FPS 1 -#define V4L2_TC_TYPE_25FPS 2 -#define V4L2_TC_TYPE_30FPS 3 -#define V4L2_TC_TYPE_50FPS 4 -#define V4L2_TC_TYPE_60FPS 5 - -#define V4L2_TC_FLAG_DROPFRAME 0x0001 -#define V4L2_TC_FLAG_COLORFRAME 0x0002 -#define V4L2_TC_USERBITS_field 0x000C -#define V4L2_TC_USERBITS_USERDEFINED 0x0000 -#define V4L2_TC_USERBITS_8BITCHARS 0x0008 - -struct v4l2_jpegcompression -{ - int quality; - - int APPn; - int APP_len; - char APP_data[60]; - - int COM_len; - char COM_data[60]; - - __u32 jpeg_markers; - -#define V4L2_JPEG_MARKER_DHT (1<<3) -#define V4L2_JPEG_MARKER_DQT (1<<4) -#define V4L2_JPEG_MARKER_DRI (1<<5) -#define V4L2_JPEG_MARKER_COM (1<<6) -#define V4L2_JPEG_MARKER_APP (1<<7) -}; - -struct v4l2_requestbuffers -{ - __u32 count; - enum v4l2_buf_type type; - enum v4l2_memory memory; - __u32 reserved[2]; -}; - -struct v4l2_buffer -{ - __u32 index; - enum v4l2_buf_type type; - __u32 bytesused; - __u32 flags; - enum v4l2_field field; - struct timeval timestamp; - struct v4l2_timecode timecode; - __u32 sequence; - - enum v4l2_memory memory; - union { - __u32 offset; - unsigned long userptr; - } m; - __u32 length; - __u32 input; - __u32 reserved; -}; - -#define V4L2_BUF_FLAG_MAPPED 0x0001 -#define V4L2_BUF_FLAG_QUEUED 0x0002 -#define V4L2_BUF_FLAG_DONE 0x0004 -#define V4L2_BUF_FLAG_KEYFRAME 0x0008 -#define V4L2_BUF_FLAG_PFRAME 0x0010 -#define V4L2_BUF_FLAG_BFRAME 0x0020 -#define V4L2_BUF_FLAG_TIMECODE 0x0100 -#define V4L2_BUF_FLAG_INPUT 0x0200 - -struct v4l2_framebuffer -{ - __u32 capability; - __u32 flags; - - void* base; - struct v4l2_pix_format fmt; -}; - -#define V4L2_FBUF_CAP_EXTERNOVERLAY 0x0001 -#define V4L2_FBUF_CAP_CHROMAKEY 0x0002 -#define V4L2_FBUF_CAP_LIST_CLIPPING 0x0004 -#define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008 - -#define V4L2_FBUF_FLAG_PRIMARY 0x0001 -#define V4L2_FBUF_FLAG_OVERLAY 0x0002 -#define V4L2_FBUF_FLAG_CHROMAKEY 0x0004 - -struct v4l2_clip -{ - struct v4l2_rect c; - struct v4l2_clip __user *next; -}; - -struct v4l2_window -{ - struct v4l2_rect w; - enum v4l2_field field; - __u32 chromakey; - struct v4l2_clip __user *clips; - __u32 clipcount; - void __user *bitmap; -}; - -struct v4l2_captureparm -{ - __u32 capability; - __u32 capturemode; - struct v4l2_fract timeperframe; - __u32 extendedmode; - __u32 readbuffers; - __u32 reserved[4]; -}; - -#define V4L2_MODE_HIGHQUALITY 0x0001 -#define V4L2_CAP_TIMEPERFRAME 0x1000 - -struct v4l2_outputparm -{ - __u32 capability; - __u32 outputmode; - struct v4l2_fract timeperframe; - __u32 extendedmode; - __u32 writebuffers; - __u32 reserved[4]; -}; - -struct v4l2_cropcap { - enum v4l2_buf_type type; - struct v4l2_rect bounds; - struct v4l2_rect defrect; - struct v4l2_fract pixelaspect; -}; - -struct v4l2_crop { - enum v4l2_buf_type type; - struct v4l2_rect c; -}; - -typedef __u64 v4l2_std_id; - -#define V4L2_STD_PAL_B ((v4l2_std_id)0x00000001) -#define V4L2_STD_PAL_B1 ((v4l2_std_id)0x00000002) -#define V4L2_STD_PAL_G ((v4l2_std_id)0x00000004) -#define V4L2_STD_PAL_H ((v4l2_std_id)0x00000008) -#define V4L2_STD_PAL_I ((v4l2_std_id)0x00000010) -#define V4L2_STD_PAL_D ((v4l2_std_id)0x00000020) -#define V4L2_STD_PAL_D1 ((v4l2_std_id)0x00000040) -#define V4L2_STD_PAL_K ((v4l2_std_id)0x00000080) - -#define V4L2_STD_PAL_M ((v4l2_std_id)0x00000100) -#define V4L2_STD_PAL_N ((v4l2_std_id)0x00000200) -#define V4L2_STD_PAL_Nc ((v4l2_std_id)0x00000400) -#define V4L2_STD_PAL_60 ((v4l2_std_id)0x00000800) - -#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) -#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) -#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) -#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) - -#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) -#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) -#define V4L2_STD_SECAM_G ((v4l2_std_id)0x00040000) -#define V4L2_STD_SECAM_H ((v4l2_std_id)0x00080000) -#define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000) -#define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000) -#define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000) -#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000) - -#define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) -#define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) - -#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) -#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) -#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) -#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) - -#define V4L2_STD_PAL_BG (V4L2_STD_PAL_B | V4L2_STD_PAL_B1 | V4L2_STD_PAL_G) -#define V4L2_STD_PAL_DK (V4L2_STD_PAL_D | V4L2_STD_PAL_D1 | V4L2_STD_PAL_K) -#define V4L2_STD_PAL (V4L2_STD_PAL_BG | V4L2_STD_PAL_DK | V4L2_STD_PAL_H | V4L2_STD_PAL_I) -#define V4L2_STD_NTSC (V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_JP | V4L2_STD_NTSC_M_KR) -#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D | V4L2_STD_SECAM_K | V4L2_STD_SECAM_K1) -#define V4L2_STD_SECAM (V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H | V4L2_STD_SECAM_DK | V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC) - -#define V4L2_STD_525_60 (V4L2_STD_PAL_M | V4L2_STD_PAL_60 | V4L2_STD_NTSC | V4L2_STD_NTSC_443) -#define V4L2_STD_625_50 (V4L2_STD_PAL | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | V4L2_STD_SECAM) -#define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB | V4L2_STD_ATSC_16_VSB) - -#define V4L2_STD_UNKNOWN 0 -#define V4L2_STD_ALL (V4L2_STD_525_60 | V4L2_STD_625_50) - -struct v4l2_standard -{ - __u32 index; - v4l2_std_id id; - __u8 name[24]; - struct v4l2_fract frameperiod; - __u32 framelines; - __u32 reserved[4]; -}; - -struct v4l2_input -{ - __u32 index; - __u8 name[32]; - __u32 type; - __u32 audioset; - __u32 tuner; - v4l2_std_id std; - __u32 status; - __u32 reserved[4]; -}; - -#define V4L2_INPUT_TYPE_TUNER 1 -#define V4L2_INPUT_TYPE_CAMERA 2 - -#define V4L2_IN_ST_NO_POWER 0x00000001 -#define V4L2_IN_ST_NO_SIGNAL 0x00000002 -#define V4L2_IN_ST_NO_COLOR 0x00000004 - -#define V4L2_IN_ST_NO_H_LOCK 0x00000100 -#define V4L2_IN_ST_COLOR_KILL 0x00000200 - -#define V4L2_IN_ST_NO_SYNC 0x00010000 -#define V4L2_IN_ST_NO_EQU 0x00020000 -#define V4L2_IN_ST_NO_CARRIER 0x00040000 - -#define V4L2_IN_ST_MACROVISION 0x01000000 -#define V4L2_IN_ST_NO_ACCESS 0x02000000 -#define V4L2_IN_ST_VTR 0x04000000 - -struct v4l2_output -{ - __u32 index; - __u8 name[32]; - __u32 type; - __u32 audioset; - __u32 modulator; - v4l2_std_id std; - __u32 reserved[4]; -}; - -#define V4L2_OUTPUT_TYPE_MODULATOR 1 -#define V4L2_OUTPUT_TYPE_ANALOG 2 -#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY 3 - -struct v4l2_control -{ - __u32 id; - __s32 value; -}; - -struct v4l2_ext_control -{ - __u32 id; - __u32 reserved2[2]; - union { - __s32 value; - __s64 value64; - void *reserved; - }; -} __attribute__ ((packed)); - -struct v4l2_ext_controls -{ - __u32 ctrl_class; - __u32 count; - __u32 error_idx; - __u32 reserved[2]; - struct v4l2_ext_control *controls; -}; - -#define V4L2_CTRL_CLASS_USER 0x00980000 -#define V4L2_CTRL_CLASS_MPEG 0x00990000 - -#define V4L2_CTRL_ID_MASK (0x0fffffff) -#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) -#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) - -struct v4l2_queryctrl -{ - __u32 id; - enum v4l2_ctrl_type type; - __u8 name[32]; - __s32 minimum; - __s32 maximum; - __s32 step; - __s32 default_value; - __u32 flags; - __u32 reserved[2]; -}; - -struct v4l2_querymenu -{ - __u32 id; - __u32 index; - __u8 name[32]; - __u32 reserved; -}; - -#define V4L2_CTRL_FLAG_DISABLED 0x0001 -#define V4L2_CTRL_FLAG_GRABBED 0x0002 -#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 -#define V4L2_CTRL_FLAG_UPDATE 0x0008 -#define V4L2_CTRL_FLAG_INACTIVE 0x0010 -#define V4L2_CTRL_FLAG_SLIDER 0x0020 - -#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 - -#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) -#define V4L2_CID_USER_BASE V4L2_CID_BASE - -#define V4L2_CID_PRIVATE_BASE 0x08000000 - -#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) -#define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) -#define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) -#define V4L2_CID_SATURATION (V4L2_CID_BASE+2) -#define V4L2_CID_HUE (V4L2_CID_BASE+3) -#define V4L2_CID_AUDIO_VOLUME (V4L2_CID_BASE+5) -#define V4L2_CID_AUDIO_BALANCE (V4L2_CID_BASE+6) -#define V4L2_CID_AUDIO_BASS (V4L2_CID_BASE+7) -#define V4L2_CID_AUDIO_TREBLE (V4L2_CID_BASE+8) -#define V4L2_CID_AUDIO_MUTE (V4L2_CID_BASE+9) -#define V4L2_CID_AUDIO_LOUDNESS (V4L2_CID_BASE+10) -#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) -#define V4L2_CID_AUTO_WHITE_BALANCE (V4L2_CID_BASE+12) -#define V4L2_CID_DO_WHITE_BALANCE (V4L2_CID_BASE+13) -#define V4L2_CID_RED_BALANCE (V4L2_CID_BASE+14) -#define V4L2_CID_BLUE_BALANCE (V4L2_CID_BASE+15) -#define V4L2_CID_GAMMA (V4L2_CID_BASE+16) -#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) -#define V4L2_CID_EXPOSURE (V4L2_CID_BASE+17) -#define V4L2_CID_AUTOGAIN (V4L2_CID_BASE+18) -#define V4L2_CID_GAIN (V4L2_CID_BASE+19) -#define V4L2_CID_HFLIP (V4L2_CID_BASE+20) -#define V4L2_CID_VFLIP (V4L2_CID_BASE+21) -#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) -#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) - -#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) -#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) - -#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) -enum v4l2_mpeg_stream_type { - V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, - V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, - V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, - V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, - V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, - V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, -}; -#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) -#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) -#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) -#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) -#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) -#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) -#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) -enum v4l2_mpeg_stream_vbi_fmt { - V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, - V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, -}; - -#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) -enum v4l2_mpeg_audio_sampling_freq { - V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0, - V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, - V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, -}; -#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) -enum v4l2_mpeg_audio_encoding { - V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, - V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, - V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2, -}; -#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) -enum v4l2_mpeg_audio_l1_bitrate { - V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, - V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, - V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2, - V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3, - V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4, - V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5, - V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6, - V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7, - V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8, - V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9, - V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10, - V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11, - V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12, - V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13, -}; -#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) -enum v4l2_mpeg_audio_l2_bitrate { - V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0, - V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1, - V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2, - V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3, - V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4, - V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5, - V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6, - V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7, - V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8, - V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9, - V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10, - V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11, - V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, - V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, -}; -#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) -enum v4l2_mpeg_audio_l3_bitrate { - V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, - V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, - V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2, - V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3, - V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4, - V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5, - V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6, - V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7, - V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8, - V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9, - V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10, - V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11, - V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, - V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, -}; -#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) -enum v4l2_mpeg_audio_mode { - V4L2_MPEG_AUDIO_MODE_STEREO = 0, - V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, - V4L2_MPEG_AUDIO_MODE_DUAL = 2, - V4L2_MPEG_AUDIO_MODE_MONO = 3, -}; -#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) -enum v4l2_mpeg_audio_mode_extension { - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, - V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, -}; -#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) -enum v4l2_mpeg_audio_emphasis { - V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, - V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, - V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, -}; -#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) -enum v4l2_mpeg_audio_crc { - V4L2_MPEG_AUDIO_CRC_NONE = 0, - V4L2_MPEG_AUDIO_CRC_CRC16 = 1, -}; - -#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) -enum v4l2_mpeg_video_encoding { - V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, - V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, -}; -#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) -enum v4l2_mpeg_video_aspect { - V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, - V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, - V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, - V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, -}; -#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) -#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) -#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) -#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) -#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) -enum v4l2_mpeg_video_bitrate_mode { - V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, - V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, -}; -#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) -#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) -#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) - -#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) -#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) -enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { - V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0, - V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) -#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) -enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type { - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT = 2, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3, - V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) -enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type { - V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0, - V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) -enum v4l2_mpeg_cx2341x_video_temporal_filter_mode { - V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0, - V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) -#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) -enum v4l2_mpeg_cx2341x_video_median_filter_type { - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3, - V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4, -}; -#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) -#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) -#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9) -#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) - -struct v4l2_tuner -{ - __u32 index; - __u8 name[32]; - enum v4l2_tuner_type type; - __u32 capability; - __u32 rangelow; - __u32 rangehigh; - __u32 rxsubchans; - __u32 audmode; - __s32 signal; - __s32 afc; - __u32 reserved[4]; -}; - -struct v4l2_modulator -{ - __u32 index; - __u8 name[32]; - __u32 capability; - __u32 rangelow; - __u32 rangehigh; - __u32 txsubchans; - __u32 reserved[4]; -}; - -#define V4L2_TUNER_CAP_LOW 0x0001 -#define V4L2_TUNER_CAP_NORM 0x0002 -#define V4L2_TUNER_CAP_STEREO 0x0010 -#define V4L2_TUNER_CAP_LANG2 0x0020 -#define V4L2_TUNER_CAP_SAP 0x0020 -#define V4L2_TUNER_CAP_LANG1 0x0040 - -#define V4L2_TUNER_SUB_MONO 0x0001 -#define V4L2_TUNER_SUB_STEREO 0x0002 -#define V4L2_TUNER_SUB_LANG2 0x0004 -#define V4L2_TUNER_SUB_SAP 0x0004 -#define V4L2_TUNER_SUB_LANG1 0x0008 - -#define V4L2_TUNER_MODE_MONO 0x0000 -#define V4L2_TUNER_MODE_STEREO 0x0001 -#define V4L2_TUNER_MODE_LANG2 0x0002 -#define V4L2_TUNER_MODE_SAP 0x0002 -#define V4L2_TUNER_MODE_LANG1 0x0003 -#define V4L2_TUNER_MODE_LANG1_LANG2 0x0004 - -struct v4l2_frequency -{ - __u32 tuner; - enum v4l2_tuner_type type; - __u32 frequency; - __u32 reserved[8]; -}; - -struct v4l2_audio -{ - __u32 index; - __u8 name[32]; - __u32 capability; - __u32 mode; - __u32 reserved[2]; -}; - -#define V4L2_AUDCAP_STEREO 0x00001 -#define V4L2_AUDCAP_AVL 0x00002 - -#define V4L2_AUDMODE_AVL 0x00001 - -struct v4l2_audioout -{ - __u32 index; - __u8 name[32]; - __u32 capability; - __u32 mode; - __u32 reserved[2]; -}; - -struct v4l2_vbi_format -{ - __u32 sampling_rate; - __u32 offset; - __u32 samples_per_line; - __u32 sample_format; - __s32 start[2]; - __u32 count[2]; - __u32 flags; - __u32 reserved[2]; -}; - -#define V4L2_VBI_UNSYNC (1<< 0) -#define V4L2_VBI_INTERLACED (1<< 1) - -struct v4l2_sliced_vbi_format -{ - __u16 service_set; - - __u16 service_lines[2][24]; - __u32 io_size; - __u32 reserved[2]; -}; - -#define V4L2_SLICED_TELETEXT_B (0x0001) - -#define V4L2_SLICED_VPS (0x0400) - -#define V4L2_SLICED_CAPTION_525 (0x1000) - -#define V4L2_SLICED_WSS_625 (0x4000) - -#define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) -#define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) - -struct v4l2_sliced_vbi_cap -{ - __u16 service_set; - - __u16 service_lines[2][24]; - __u32 reserved[4]; -}; - -struct v4l2_sliced_vbi_data -{ - __u32 id; - __u32 field; - __u32 line; - __u32 reserved; - __u8 data[48]; -}; - -struct v4l2_format -{ - enum v4l2_buf_type type; - union - { - struct v4l2_pix_format pix; - struct v4l2_window win; - struct v4l2_vbi_format vbi; - struct v4l2_sliced_vbi_format sliced; - __u8 raw_data[200]; - } fmt; -}; - -struct v4l2_streamparm -{ - enum v4l2_buf_type type; - union - { - struct v4l2_captureparm capture; - struct v4l2_outputparm output; - __u8 raw_data[200]; - } parm; -}; - -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) -#define VIDIOC_RESERVED _IO ('V', 1) -#define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) -#define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) -#define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format) -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) -#define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) -#define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) -#define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) -#define VIDIOC_STREAMON _IOW ('V', 18, int) -#define VIDIOC_STREAMOFF _IOW ('V', 19, int) -#define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) -#define VIDIOC_S_PARM _IOWR ('V', 22, struct v4l2_streamparm) -#define VIDIOC_G_STD _IOR ('V', 23, v4l2_std_id) -#define VIDIOC_S_STD _IOW ('V', 24, v4l2_std_id) -#define VIDIOC_ENUMSTD _IOWR ('V', 25, struct v4l2_standard) -#define VIDIOC_ENUMINPUT _IOWR ('V', 26, struct v4l2_input) -#define VIDIOC_G_CTRL _IOWR ('V', 27, struct v4l2_control) -#define VIDIOC_S_CTRL _IOWR ('V', 28, struct v4l2_control) -#define VIDIOC_G_TUNER _IOWR ('V', 29, struct v4l2_tuner) -#define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) -#define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) -#define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) -#define VIDIOC_G_INPUT _IOR ('V', 38, int) -#define VIDIOC_S_INPUT _IOWR ('V', 39, int) -#define VIDIOC_G_OUTPUT _IOR ('V', 46, int) -#define VIDIOC_S_OUTPUT _IOWR ('V', 47, int) -#define VIDIOC_ENUMOUTPUT _IOWR ('V', 48, struct v4l2_output) -#define VIDIOC_G_AUDOUT _IOR ('V', 49, struct v4l2_audioout) -#define VIDIOC_S_AUDOUT _IOW ('V', 50, struct v4l2_audioout) -#define VIDIOC_G_MODULATOR _IOWR ('V', 54, struct v4l2_modulator) -#define VIDIOC_S_MODULATOR _IOW ('V', 55, struct v4l2_modulator) -#define VIDIOC_G_FREQUENCY _IOWR ('V', 56, struct v4l2_frequency) -#define VIDIOC_S_FREQUENCY _IOW ('V', 57, struct v4l2_frequency) -#define VIDIOC_CROPCAP _IOWR ('V', 58, struct v4l2_cropcap) -#define VIDIOC_G_CROP _IOWR ('V', 59, struct v4l2_crop) -#define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) -#define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) -#define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) -#define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) -#define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) -#define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) -#define VIDIOC_G_PRIORITY _IOR ('V', 67, enum v4l2_priority) -#define VIDIOC_S_PRIORITY _IOW ('V', 68, enum v4l2_priority) -#define VIDIOC_G_SLICED_VBI_CAP _IOR ('V', 69, struct v4l2_sliced_vbi_cap) -#define VIDIOC_LOG_STATUS _IO ('V', 70) -#define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) -#define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls) -#define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls) - -#ifdef __OLD_VIDIOC_ - -#define VIDIOC_OVERLAY_OLD _IOWR ('V', 14, int) -#define VIDIOC_S_PARM_OLD _IOW ('V', 22, struct v4l2_streamparm) -#define VIDIOC_S_CTRL_OLD _IOW ('V', 28, struct v4l2_control) -#define VIDIOC_G_AUDIO_OLD _IOWR ('V', 33, struct v4l2_audio) -#define VIDIOC_G_AUDOUT_OLD _IOWR ('V', 49, struct v4l2_audioout) -#define VIDIOC_CROPCAP_OLD _IOR ('V', 58, struct v4l2_cropcap) -#endif - -#define BASE_VIDIOC_PRIVATE 192 - -#endif - diff --git a/libc/kernel/common/linux/vmalloc.h b/libc/kernel/common/linux/vmalloc.h deleted file mode 100644 index c7fd10339..000000000 --- a/libc/kernel/common/linux/vmalloc.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_VMALLOC_H -#define _LINUX_VMALLOC_H - -#include -#include - -struct vm_area_struct; - -#define VM_IOREMAP 0x00000001 -#define VM_ALLOC 0x00000002 -#define VM_MAP 0x00000004 -#define VM_USERMAP 0x00000008 -#define VM_VPAGES 0x00000010 - -#ifndef IOREMAP_MAX_ORDER -#define IOREMAP_MAX_ORDER (7 + PAGE_SHIFT) -#endif - -struct vm_struct { - void *addr; - unsigned long size; - unsigned long flags; - struct page **pages; - unsigned int nr_pages; - unsigned long phys_addr; - struct vm_struct *next; -}; - -#endif diff --git a/libc/kernel/common/linux/vt.h b/libc/kernel/common/linux/vt.h deleted file mode 100644 index 9992b3a31..000000000 --- a/libc/kernel/common/linux/vt.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_VT_H -#define _LINUX_VT_H - -#define MIN_NR_CONSOLES 1 -#define MAX_NR_CONSOLES 63 -#define MAX_NR_USER_CONSOLES 63 - -#define VT_OPENQRY 0x5600 - -struct vt_mode { - char mode; - char waitv; - short relsig; - short acqsig; - short frsig; -}; -#define VT_GETMODE 0x5601 -#define VT_SETMODE 0x5602 -#define VT_AUTO 0x00 -#define VT_PROCESS 0x01 -#define VT_ACKACQ 0x02 - -struct vt_stat { - unsigned short v_active; - unsigned short v_signal; - unsigned short v_state; -}; -#define VT_GETSTATE 0x5603 -#define VT_SENDSIG 0x5604 - -#define VT_RELDISP 0x5605 - -#define VT_ACTIVATE 0x5606 -#define VT_WAITACTIVE 0x5607 -#define VT_DISALLOCATE 0x5608 - -struct vt_sizes { - unsigned short v_rows; - unsigned short v_cols; - unsigned short v_scrollsize; -}; -#define VT_RESIZE 0x5609 - -struct vt_consize { - unsigned short v_rows; - unsigned short v_cols; - unsigned short v_vlin; - unsigned short v_clin; - unsigned short v_vcol; - unsigned short v_ccol; -}; -#define VT_RESIZEX 0x560A -#define VT_LOCKSWITCH 0x560B -#define VT_UNLOCKSWITCH 0x560C -#define VT_GETHIFONTMASK 0x560D - -#endif diff --git a/libc/kernel/common/linux/vt_buffer.h b/libc/kernel/common/linux/vt_buffer.h deleted file mode 100644 index 46ce79d31..000000000 --- a/libc/kernel/common/linux/vt_buffer.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_VT_BUFFER_H_ -#define _LINUX_VT_BUFFER_H_ - -#ifndef VT_BUF_HAVE_RW -#define scr_writew(val, addr) (*(addr) = (val)) -#define scr_readw(addr) (*(addr)) -#define scr_memcpyw(d, s, c) memcpy(d, s, c) -#define scr_memmovew(d, s, c) memmove(d, s, c) -#define VT_BUF_HAVE_MEMCPYW -#define VT_BUF_HAVE_MEMMOVEW -#endif - -#ifndef VT_BUF_HAVE_MEMSETW -#endif -#ifndef VT_BUF_HAVE_MEMCPYW -#endif -#ifndef VT_BUF_HAVE_MEMMOVEW -#endif -#endif diff --git a/libc/kernel/common/linux/wait.h b/libc/kernel/common/linux/wait.h deleted file mode 100644 index 7d9aa681a..000000000 --- a/libc/kernel/common/linux/wait.h +++ /dev/null @@ -1,30 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_WAIT_H -#define _LINUX_WAIT_H - -#define WNOHANG 0x00000001 -#define WUNTRACED 0x00000002 -#define WSTOPPED WUNTRACED -#define WEXITED 0x00000004 -#define WCONTINUED 0x00000008 -#define WNOWAIT 0x01000000 - -#define __WNOTHREAD 0x20000000 -#define __WALL 0x40000000 -#define __WCLONE 0x80000000 - -#define P_ALL 0 -#define P_PID 1 -#define P_PGID 2 - -#endif diff --git a/libc/kernel/common/linux/wanrouter.h b/libc/kernel/common/linux/wanrouter.h deleted file mode 100644 index 8f25a8627..000000000 --- a/libc/kernel/common/linux/wanrouter.h +++ /dev/null @@ -1,356 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ROUTER_H -#define _ROUTER_H - -#define ROUTER_NAME "wanrouter" -#define ROUTER_VERSION 1 -#define ROUTER_RELEASE 1 -#define ROUTER_IOCTL 'W' -#define ROUTER_MAGIC 0x524D4157L - -enum router_ioctls -{ - ROUTER_SETUP = ROUTER_IOCTL<<8, - ROUTER_DOWN, - ROUTER_STAT, - ROUTER_IFNEW, - ROUTER_IFDEL, - ROUTER_IFSTAT, - ROUTER_USER = (ROUTER_IOCTL<<8)+16, - ROUTER_USER_MAX = (ROUTER_IOCTL<<8)+31 -}; - -#define PROC_DATA_PORT_0 0x8000 -#define PROC_DATA_PORT_1 0x8001 - -#define NLPID_IP 0xCC -#define NLPID_SNAP 0x80 -#define NLPID_CLNP 0x81 -#define NLPID_ESIS 0x82 -#define NLPID_ISIS 0x83 -#define NLPID_Q933 0x08 - -#define WAN_IFNAME_SZ 15 -#define WAN_DRVNAME_SZ 15 -#define WAN_ADDRESS_SZ 31 -#define USED_BY_FIELD 8 - -#define UDP_PTPIPE_TYPE 0x01 -#define UDP_FPIPE_TYPE 0x02 -#define UDP_CPIPE_TYPE 0x03 -#define UDP_DRVSTATS_TYPE 0x04 -#define UDP_INVALID_TYPE 0x05 - -#define CMD_OK 0 -#define CMD_TIMEOUT 0xFF - -#define UDP_PKT_FRM_STACK 0x00 -#define UDP_PKT_FRM_NETWORK 0x01 - -#define MAX_INTR_TEST_COUNTER 100 - -#define CRITICAL_IN_ISR 0xA1 -#define CRITICAL_INTR_HANDLED 0xB1 - -typedef struct wan_x25_conf -{ - unsigned lo_pvc; - unsigned hi_pvc; - unsigned lo_svc; - unsigned hi_svc; - unsigned hdlc_window; - unsigned pkt_window; - unsigned t1; - unsigned t2; - unsigned t4; - unsigned n2; - unsigned t10_t20; - unsigned t11_t21; - unsigned t12_t22; - unsigned t13_t23; - unsigned t16_t26; - unsigned t28; - unsigned r10_r20; - unsigned r12_r22; - unsigned r13_r23; - unsigned ccitt_compat; - unsigned x25_conf_opt; - unsigned char LAPB_hdlc_only; - unsigned char logging; - unsigned char oob_on_modem; -} wan_x25_conf_t; - -typedef struct wan_fr_conf -{ - unsigned signalling; - unsigned t391; - unsigned t392; - unsigned n391; - unsigned n392; - unsigned n393; - unsigned dlci_num; - unsigned dlci[100]; -} wan_fr_conf_t; - -typedef struct wan_ppp_conf -{ - unsigned restart_tmr; - unsigned auth_rsrt_tmr; - unsigned auth_wait_tmr; - unsigned mdm_fail_tmr; - unsigned dtr_drop_tmr; - unsigned connect_tmout; - unsigned conf_retry; - unsigned term_retry; - unsigned fail_retry; - unsigned auth_retry; - unsigned auth_options; - unsigned ip_options; - char authenticator; - char ip_mode; -} wan_ppp_conf_t; - -typedef struct wan_chdlc_conf -{ - unsigned char ignore_dcd; - unsigned char ignore_cts; - unsigned char ignore_keepalive; - unsigned char hdlc_streaming; - unsigned char receive_only; - unsigned keepalive_tx_tmr; - unsigned keepalive_rx_tmr; - unsigned keepalive_err_margin; - unsigned slarp_timer; -} wan_chdlc_conf_t; - -typedef struct wandev_conf -{ - unsigned magic; - unsigned config_id; - - unsigned ioport; - unsigned long maddr; - unsigned msize; - int irq; - int dma; - char S514_CPU_no[1]; - unsigned PCI_slot_no; - char auto_pci_cfg; - char comm_port; - unsigned bps; - unsigned mtu; - unsigned udp_port; - unsigned char ttl; - unsigned char ft1; - char interface; - char clocking; - char line_coding; - char station; - char connection; - char read_mode; - char receive_only; - char tty; - unsigned tty_major; - unsigned tty_minor; - unsigned tty_mode; - char backup; - unsigned hw_opt[4]; - unsigned reserved[4]; - - unsigned data_size; - void* data; - union - { - wan_x25_conf_t x25; - wan_ppp_conf_t ppp; - wan_fr_conf_t fr; - wan_chdlc_conf_t chdlc; - } u; -} wandev_conf_t; - -#define WANCONFIG_X25 101 -#define WANCONFIG_FR 102 -#define WANCONFIG_PPP 103 -#define WANCONFIG_CHDLC 104 -#define WANCONFIG_BSC 105 -#define WANCONFIG_HDLC 106 -#define WANCONFIG_MPPP 107 - -#define WANOPT_OFF 0 -#define WANOPT_ON 1 -#define WANOPT_NO 0 -#define WANOPT_YES 1 - -#define WANOPT_RS232 0 -#define WANOPT_V35 1 - -#define WANOPT_NRZ 0 -#define WANOPT_NRZI 1 -#define WANOPT_FM0 2 -#define WANOPT_FM1 3 - -#define WANOPT_POINTTOPOINT 0 -#define WANOPT_MULTIDROP 1 - -#define WANOPT_EXTERNAL 0 -#define WANOPT_INTERNAL 1 - -#define WANOPT_DTE 0 -#define WANOPT_DCE 1 -#define WANOPT_CPE 0 -#define WANOPT_NODE 1 -#define WANOPT_SECONDARY 0 -#define WANOPT_PRIMARY 1 - -#define WANOPT_PERMANENT 0 -#define WANOPT_SWITCHED 1 -#define WANOPT_ONDEMAND 2 - -#define WANOPT_FR_ANSI 1 -#define WANOPT_FR_Q933 2 -#define WANOPT_FR_LMI 3 - -#define WANOPT_PPP_STATIC 0 -#define WANOPT_PPP_HOST 1 -#define WANOPT_PPP_PEER 2 - -#define WANOPT_ONE 1 -#define WANOPT_TWO 2 -#define WANOPT_ONE_AND_HALF 3 - -#define WANOPT_NONE 0 -#define WANOPT_ODD 1 -#define WANOPT_EVEN 2 - -#define WANOPT_PRI 0 -#define WANOPT_SEC 1 - -#define WANOPT_INTR 0 -#define WANOPT_POLL 1 - -#define WANOPT_TTY_SYNC 0 -#define WANOPT_TTY_ASYNC 1 - -typedef struct wandev_stat -{ - unsigned state; - unsigned ndev; - - unsigned connection; - unsigned media_type; - unsigned mtu; - - unsigned modem_status; - unsigned rx_frames; - unsigned rx_overruns; - unsigned rx_crc_err; - unsigned rx_aborts; - unsigned rx_bad_length; - unsigned rx_dropped; - unsigned tx_frames; - unsigned tx_underruns; - unsigned tx_timeouts; - unsigned tx_rejects; - - unsigned rx_bad_format; - unsigned rx_bad_addr; - unsigned tx_retries; - unsigned reserved[16]; -} wandev_stat_t; - -enum wan_states -{ - WAN_UNCONFIGURED, - WAN_DISCONNECTED, - WAN_CONNECTING, - WAN_CONNECTED, - WAN_LIMIT, - WAN_DUALPORT, - WAN_DISCONNECTING, - WAN_FT1_READY -}; - -enum { - WAN_LOCAL_IP, - WAN_POINTOPOINT_IP, - WAN_NETMASK_IP, - WAN_BROADCAST_IP -}; - -#define WAN_MODEM_CTS 0x0001 -#define WAN_MODEM_DCD 0x0002 -#define WAN_MODEM_DTR 0x0010 -#define WAN_MODEM_RTS 0x0020 - -typedef struct wanif_conf -{ - unsigned magic; - unsigned config_id; - char name[WAN_IFNAME_SZ+1]; - char addr[WAN_ADDRESS_SZ+1]; - char usedby[USED_BY_FIELD]; - unsigned idle_timeout; - unsigned hold_timeout; - unsigned cir; - unsigned bc; - unsigned be; - unsigned char enable_IPX; - unsigned char inarp; - unsigned inarp_interval; - unsigned long network_number; - char mc; - char local_addr[WAN_ADDRESS_SZ+1]; - unsigned char port; - unsigned char protocol; - char pap; - char chap; - unsigned char userid[511]; - unsigned char passwd[511]; - unsigned char sysname[31]; - unsigned char ignore_dcd; - unsigned char ignore_cts; - unsigned char ignore_keepalive; - unsigned char hdlc_streaming; - unsigned keepalive_tx_tmr; - unsigned keepalive_rx_tmr; - unsigned keepalive_err_margin; - unsigned slarp_timer; - unsigned char ttl; - char interface; - char clocking; - unsigned bps; - unsigned mtu; - unsigned char if_down; - unsigned char gateway; - unsigned char true_if_encoding; - - unsigned char asy_data_trans; - unsigned char rts_hs_for_receive; - unsigned char xon_xoff_hs_for_receive; - unsigned char xon_xoff_hs_for_transmit; - unsigned char dcd_hs_for_transmit; - unsigned char cts_hs_for_transmit; - unsigned char async_mode; - unsigned tx_bits_per_char; - unsigned rx_bits_per_char; - unsigned stop_bits; - unsigned char parity; - unsigned break_timer; - unsigned inter_char_timer; - unsigned rx_complete_length; - unsigned xon_char; - unsigned xoff_char; - unsigned char receive_only; -} wanif_conf_t; - -#endif diff --git a/libc/kernel/common/linux/wireless.h b/libc/kernel/common/linux/wireless.h deleted file mode 100644 index 81ceb75d7..000000000 --- a/libc/kernel/common/linux/wireless.h +++ /dev/null @@ -1,542 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_WIRELESS_H -#define _LINUX_WIRELESS_H - -#include -#include -#include - -#define WIRELESS_EXT 20 - -#define SIOCSIWCOMMIT 0x8B00 -#define SIOCGIWNAME 0x8B01 - -#define SIOCSIWNWID 0x8B02 -#define SIOCGIWNWID 0x8B03 -#define SIOCSIWFREQ 0x8B04 -#define SIOCGIWFREQ 0x8B05 -#define SIOCSIWMODE 0x8B06 -#define SIOCGIWMODE 0x8B07 -#define SIOCSIWSENS 0x8B08 -#define SIOCGIWSENS 0x8B09 - -#define SIOCSIWRANGE 0x8B0A -#define SIOCGIWRANGE 0x8B0B -#define SIOCSIWPRIV 0x8B0C -#define SIOCGIWPRIV 0x8B0D -#define SIOCSIWSTATS 0x8B0E -#define SIOCGIWSTATS 0x8B0F - -#define SIOCSIWSPY 0x8B10 -#define SIOCGIWSPY 0x8B11 -#define SIOCSIWTHRSPY 0x8B12 -#define SIOCGIWTHRSPY 0x8B13 - -#define SIOCSIWAP 0x8B14 -#define SIOCGIWAP 0x8B15 -#define SIOCGIWAPLIST 0x8B17 -#define SIOCSIWSCAN 0x8B18 -#define SIOCGIWSCAN 0x8B19 - -#define SIOCSIWESSID 0x8B1A -#define SIOCGIWESSID 0x8B1B -#define SIOCSIWNICKN 0x8B1C -#define SIOCGIWNICKN 0x8B1D - -#define SIOCSIWRATE 0x8B20 -#define SIOCGIWRATE 0x8B21 -#define SIOCSIWRTS 0x8B22 -#define SIOCGIWRTS 0x8B23 -#define SIOCSIWFRAG 0x8B24 -#define SIOCGIWFRAG 0x8B25 -#define SIOCSIWTXPOW 0x8B26 -#define SIOCGIWTXPOW 0x8B27 -#define SIOCSIWRETRY 0x8B28 -#define SIOCGIWRETRY 0x8B29 - -#define SIOCSIWENCODE 0x8B2A -#define SIOCGIWENCODE 0x8B2B - -#define SIOCSIWPOWER 0x8B2C -#define SIOCGIWPOWER 0x8B2D - -#define SIOCSIWGENIE 0x8B30 -#define SIOCGIWGENIE 0x8B31 - -#define SIOCSIWMLME 0x8B16 - -#define SIOCSIWAUTH 0x8B32 -#define SIOCGIWAUTH 0x8B33 - -#define SIOCSIWENCODEEXT 0x8B34 -#define SIOCGIWENCODEEXT 0x8B35 - -#define SIOCSIWPMKSA 0x8B36 - -#define SIOCIWFIRSTPRIV 0x8BE0 -#define SIOCIWLASTPRIV 0x8BFF - -#define SIOCIWFIRST 0x8B00 -#define SIOCIWLAST SIOCIWLASTPRIV -#define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) - -#define IW_IS_SET(cmd) (!((cmd) & 0x1)) -#define IW_IS_GET(cmd) ((cmd) & 0x1) - -#define IWEVTXDROP 0x8C00 -#define IWEVQUAL 0x8C01 -#define IWEVCUSTOM 0x8C02 -#define IWEVREGISTERED 0x8C03 -#define IWEVEXPIRED 0x8C04 -#define IWEVGENIE 0x8C05 -#define IWEVMICHAELMICFAILURE 0x8C06 -#define IWEVASSOCREQIE 0x8C07 -#define IWEVASSOCRESPIE 0x8C08 -#define IWEVPMKIDCAND 0x8C09 - -#define IWEVFIRST 0x8C00 -#define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) - -#define IW_PRIV_TYPE_MASK 0x7000 -#define IW_PRIV_TYPE_NONE 0x0000 -#define IW_PRIV_TYPE_BYTE 0x1000 -#define IW_PRIV_TYPE_CHAR 0x2000 -#define IW_PRIV_TYPE_INT 0x4000 -#define IW_PRIV_TYPE_FLOAT 0x5000 -#define IW_PRIV_TYPE_ADDR 0x6000 - -#define IW_PRIV_SIZE_FIXED 0x0800 - -#define IW_PRIV_SIZE_MASK 0x07FF - -#define IW_MAX_FREQUENCIES 32 - -#define IW_MAX_BITRATES 32 - -#define IW_MAX_TXPOWER 8 - -#define IW_MAX_SPY 8 - -#define IW_MAX_AP 64 - -#define IW_ESSID_MAX_SIZE 32 - -#define IW_MODE_AUTO 0 -#define IW_MODE_ADHOC 1 -#define IW_MODE_INFRA 2 -#define IW_MODE_MASTER 3 -#define IW_MODE_REPEAT 4 -#define IW_MODE_SECOND 5 -#define IW_MODE_MONITOR 6 - -#define IW_QUAL_QUAL_UPDATED 0x01 -#define IW_QUAL_LEVEL_UPDATED 0x02 -#define IW_QUAL_NOISE_UPDATED 0x04 -#define IW_QUAL_ALL_UPDATED 0x07 -#define IW_QUAL_DBM 0x08 -#define IW_QUAL_QUAL_INVALID 0x10 -#define IW_QUAL_LEVEL_INVALID 0x20 -#define IW_QUAL_NOISE_INVALID 0x40 -#define IW_QUAL_ALL_INVALID 0x70 - -#define IW_FREQ_AUTO 0x00 -#define IW_FREQ_FIXED 0x01 - -#define IW_MAX_ENCODING_SIZES 8 - -#define IW_ENCODING_TOKEN_MAX 64 - -#define IW_ENCODE_INDEX 0x00FF -#define IW_ENCODE_FLAGS 0xFF00 -#define IW_ENCODE_MODE 0xF000 -#define IW_ENCODE_DISABLED 0x8000 -#define IW_ENCODE_ENABLED 0x0000 -#define IW_ENCODE_RESTRICTED 0x4000 -#define IW_ENCODE_OPEN 0x2000 -#define IW_ENCODE_NOKEY 0x0800 -#define IW_ENCODE_TEMP 0x0400 - -#define IW_POWER_ON 0x0000 -#define IW_POWER_TYPE 0xF000 -#define IW_POWER_PERIOD 0x1000 -#define IW_POWER_TIMEOUT 0x2000 -#define IW_POWER_MODE 0x0F00 -#define IW_POWER_UNICAST_R 0x0100 -#define IW_POWER_MULTICAST_R 0x0200 -#define IW_POWER_ALL_R 0x0300 -#define IW_POWER_FORCE_S 0x0400 -#define IW_POWER_REPEATER 0x0800 -#define IW_POWER_MODIFIER 0x000F -#define IW_POWER_MIN 0x0001 -#define IW_POWER_MAX 0x0002 -#define IW_POWER_RELATIVE 0x0004 - -#define IW_TXPOW_TYPE 0x00FF -#define IW_TXPOW_DBM 0x0000 -#define IW_TXPOW_MWATT 0x0001 -#define IW_TXPOW_RELATIVE 0x0002 -#define IW_TXPOW_RANGE 0x1000 - -#define IW_RETRY_ON 0x0000 -#define IW_RETRY_TYPE 0xF000 -#define IW_RETRY_LIMIT 0x1000 -#define IW_RETRY_LIFETIME 0x2000 -#define IW_RETRY_MODIFIER 0x000F -#define IW_RETRY_MIN 0x0001 -#define IW_RETRY_MAX 0x0002 -#define IW_RETRY_RELATIVE 0x0004 - -#define IW_SCAN_DEFAULT 0x0000 -#define IW_SCAN_ALL_ESSID 0x0001 -#define IW_SCAN_THIS_ESSID 0x0002 -#define IW_SCAN_ALL_FREQ 0x0004 -#define IW_SCAN_THIS_FREQ 0x0008 -#define IW_SCAN_ALL_MODE 0x0010 -#define IW_SCAN_THIS_MODE 0x0020 -#define IW_SCAN_ALL_RATE 0x0040 -#define IW_SCAN_THIS_RATE 0x0080 - -#define IW_SCAN_TYPE_ACTIVE 0 -#define IW_SCAN_TYPE_PASSIVE 1 - -#define IW_SCAN_MAX_DATA 4096 - -#define IW_CUSTOM_MAX 256 - -#define IW_GENERIC_IE_MAX 1024 - -#define IW_MLME_DEAUTH 0 -#define IW_MLME_DISASSOC 1 - -#define IW_AUTH_INDEX 0x0FFF -#define IW_AUTH_FLAGS 0xF000 - -#define IW_AUTH_WPA_VERSION 0 -#define IW_AUTH_CIPHER_PAIRWISE 1 -#define IW_AUTH_CIPHER_GROUP 2 -#define IW_AUTH_KEY_MGMT 3 -#define IW_AUTH_TKIP_COUNTERMEASURES 4 -#define IW_AUTH_DROP_UNENCRYPTED 5 -#define IW_AUTH_80211_AUTH_ALG 6 -#define IW_AUTH_WPA_ENABLED 7 -#define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 -#define IW_AUTH_ROAMING_CONTROL 9 -#define IW_AUTH_PRIVACY_INVOKED 10 - -#define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 -#define IW_AUTH_WPA_VERSION_WPA 0x00000002 -#define IW_AUTH_WPA_VERSION_WPA2 0x00000004 - -#define IW_AUTH_CIPHER_NONE 0x00000001 -#define IW_AUTH_CIPHER_WEP40 0x00000002 -#define IW_AUTH_CIPHER_TKIP 0x00000004 -#define IW_AUTH_CIPHER_CCMP 0x00000008 -#define IW_AUTH_CIPHER_WEP104 0x00000010 - -#define IW_AUTH_KEY_MGMT_802_1X 1 -#define IW_AUTH_KEY_MGMT_PSK 2 - -#define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 -#define IW_AUTH_ALG_SHARED_KEY 0x00000002 -#define IW_AUTH_ALG_LEAP 0x00000004 - -#define IW_AUTH_ROAMING_ENABLE 0 -#define IW_AUTH_ROAMING_DISABLE 1 - -#define IW_ENCODE_SEQ_MAX_SIZE 8 - -#define IW_ENCODE_ALG_NONE 0 -#define IW_ENCODE_ALG_WEP 1 -#define IW_ENCODE_ALG_TKIP 2 -#define IW_ENCODE_ALG_CCMP 3 - -#define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 -#define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 -#define IW_ENCODE_EXT_GROUP_KEY 0x00000004 -#define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 - -#define IW_MICFAILURE_KEY_ID 0x00000003 -#define IW_MICFAILURE_GROUP 0x00000004 -#define IW_MICFAILURE_PAIRWISE 0x00000008 -#define IW_MICFAILURE_STAKEY 0x00000010 -#define IW_MICFAILURE_COUNT 0x00000060 - -#define IW_ENC_CAPA_WPA 0x00000001 -#define IW_ENC_CAPA_WPA2 0x00000002 -#define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 -#define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 - -#define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? (cmd - SIOCIWFIRSTPRIV + 0x60) : (cmd - SIOCSIWCOMMIT)) -#define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) -#define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) - -#define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | IW_EVENT_CAPA_MASK(0x8B06) | IW_EVENT_CAPA_MASK(0x8B1A)) -#define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) - -#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) -#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } - -struct iw_param -{ - __s32 value; - __u8 fixed; - __u8 disabled; - __u16 flags; -}; - -struct iw_point -{ - void __user *pointer; - __u16 length; - __u16 flags; -}; - -struct iw_freq -{ - __s32 m; - __s16 e; - __u8 i; - __u8 flags; -}; - -struct iw_quality -{ - __u8 qual; - __u8 level; - __u8 noise; - __u8 updated; -}; - -struct iw_discarded -{ - __u32 nwid; - __u32 code; - __u32 fragment; - __u32 retries; - __u32 misc; -}; - -struct iw_missed -{ - __u32 beacon; -}; - -struct iw_thrspy -{ - struct sockaddr addr; - struct iw_quality qual; - struct iw_quality low; - struct iw_quality high; -}; - -struct iw_scan_req -{ - __u8 scan_type; - __u8 essid_len; - __u8 num_channels; - __u8 flags; - struct sockaddr bssid; - - __u8 essid[IW_ESSID_MAX_SIZE]; - - __u32 min_channel_time; - __u32 max_channel_time; - - struct iw_freq channel_list[IW_MAX_FREQUENCIES]; -}; - -struct iw_encode_ext -{ - __u32 ext_flags; - __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; - __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; - struct sockaddr addr; - __u16 alg; - __u16 key_len; - __u8 key[0]; -}; - -struct iw_mlme -{ - __u16 cmd; - __u16 reason_code; - struct sockaddr addr; -}; - -#define IW_PMKSA_ADD 1 -#define IW_PMKSA_REMOVE 2 -#define IW_PMKSA_FLUSH 3 - -#define IW_PMKID_LEN 16 - -struct iw_pmksa -{ - __u32 cmd; - struct sockaddr bssid; - __u8 pmkid[IW_PMKID_LEN]; -}; - -struct iw_michaelmicfailure -{ - __u32 flags; - struct sockaddr src_addr; - __u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; -}; - -#define IW_PMKID_CAND_PREAUTH 0x00000001 -struct iw_pmkid_cand -{ - __u32 flags; - __u32 index; - struct sockaddr bssid; -}; - -struct iw_statistics -{ - __u16 status; - - struct iw_quality qual; - struct iw_discarded discard; - struct iw_missed miss; -}; - -union iwreq_data -{ - - char name[IFNAMSIZ]; - - struct iw_point essid; - struct iw_param nwid; - struct iw_freq freq; - - struct iw_param sens; - struct iw_param bitrate; - struct iw_param txpower; - struct iw_param rts; - struct iw_param frag; - __u32 mode; - struct iw_param retry; - - struct iw_point encoding; - struct iw_param power; - struct iw_quality qual; - - struct sockaddr ap_addr; - struct sockaddr addr; - - struct iw_param param; - struct iw_point data; -}; - -struct iwreq -{ - union - { - char ifrn_name[IFNAMSIZ]; - } ifr_ifrn; - - union iwreq_data u; -}; - -struct iw_range -{ - - __u32 throughput; - - __u32 min_nwid; - __u32 max_nwid; - - __u16 old_num_channels; - __u8 old_num_frequency; - - __u32 event_capa[6]; - - __s32 sensitivity; - - struct iw_quality max_qual; - - struct iw_quality avg_qual; - - __u8 num_bitrates; - __s32 bitrate[IW_MAX_BITRATES]; - - __s32 min_rts; - __s32 max_rts; - - __s32 min_frag; - __s32 max_frag; - - __s32 min_pmp; - __s32 max_pmp; - __s32 min_pmt; - __s32 max_pmt; - __u16 pmp_flags; - __u16 pmt_flags; - __u16 pm_capa; - - __u16 encoding_size[IW_MAX_ENCODING_SIZES]; - __u8 num_encoding_sizes; - __u8 max_encoding_tokens; - - __u8 encoding_login_index; - - __u16 txpower_capa; - __u8 num_txpower; - __s32 txpower[IW_MAX_TXPOWER]; - - __u8 we_version_compiled; - __u8 we_version_source; - - __u16 retry_capa; - __u16 retry_flags; - __u16 r_time_flags; - __s32 min_retry; - __s32 max_retry; - __s32 min_r_time; - __s32 max_r_time; - - __u16 num_channels; - __u8 num_frequency; - struct iw_freq freq[IW_MAX_FREQUENCIES]; - - __u32 enc_capa; -}; - -struct iw_priv_args -{ - __u32 cmd; - __u16 set_args; - __u16 get_args; - char name[IFNAMSIZ]; -}; - -struct iw_event -{ - __u16 len; - __u16 cmd; - union iwreq_data u; -}; - -#define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) - -#define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) -#define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32)) -#define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) -#define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) -#define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) -#define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) - -#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - (char *) NULL) -#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - IW_EV_POINT_OFF) - -#endif diff --git a/libc/kernel/common/linux/workqueue.h b/libc/kernel/common/linux/workqueue.h deleted file mode 100644 index 12fab2cea..000000000 --- a/libc/kernel/common/linux/workqueue.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_WORKQUEUE_H -#define _LINUX_WORKQUEUE_H - -#include -#include -#include - -struct workqueue_struct; - -struct work_struct { - unsigned long pending; - struct list_head entry; - void (*func)(void *); - void *data; - void *wq_data; - struct timer_list timer; -}; - -struct execute_work { - struct work_struct work; -}; - -#define __WORK_INITIALIZER(n, f, d) { .entry = { &(n).entry, &(n).entry }, .func = (f), .data = (d), .timer = TIMER_INITIALIZER(NULL, 0, 0), } - -#define DECLARE_WORK(n, f, d) struct work_struct n = __WORK_INITIALIZER(n, f, d) - -#define PREPARE_WORK(_work, _func, _data) do { (_work)->func = _func; (_work)->data = _data; } while (0) - -#define INIT_WORK(_work, _func, _data) do { INIT_LIST_HEAD(&(_work)->entry); (_work)->pending = 0; PREPARE_WORK((_work), (_func), (_data)); init_timer(&(_work)->timer); } while (0) - -#define create_workqueue(name) __create_workqueue((name), 0) -#define create_singlethread_workqueue(name) __create_workqueue((name), 1) - -#endif diff --git a/libc/kernel/common/linux/xattr.h b/libc/kernel/common/linux/xattr.h deleted file mode 100644 index f5f640d00..000000000 --- a/libc/kernel/common/linux/xattr.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _LINUX_XATTR_H -#define _LINUX_XATTR_H - -#define XATTR_CREATE 0x1 -#define XATTR_REPLACE 0x2 - -#define XATTR_OS2_PREFIX "os2." -#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1) - -#define XATTR_SECURITY_PREFIX "security." -#define XATTR_SECURITY_PREFIX_LEN (sizeof (XATTR_SECURITY_PREFIX) - 1) - -#define XATTR_SYSTEM_PREFIX "system." -#define XATTR_SYSTEM_PREFIX_LEN (sizeof (XATTR_SYSTEM_PREFIX) - 1) - -#define XATTR_TRUSTED_PREFIX "trusted." -#define XATTR_TRUSTED_PREFIX_LEN (sizeof (XATTR_TRUSTED_PREFIX) - 1) - -#define XATTR_USER_PREFIX "user." -#define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1) - -struct xattr_handler { - char *prefix; - size_t (*list)(struct inode *inode, char *list, size_t list_size, - const char *name, size_t name_len); - int (*get)(struct inode *inode, const char *name, void *buffer, - size_t size); - int (*set)(struct inode *inode, const char *name, const void *buffer, - size_t size, int flags); -}; - -#endif diff --git a/libc/kernel/common/linux/zconf.h b/libc/kernel/common/linux/zconf.h deleted file mode 100644 index 18ea78c5b..000000000 --- a/libc/kernel/common/linux/zconf.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ZCONF_H -#define _ZCONF_H - -#ifndef MAX_MEM_LEVEL -#define MAX_MEM_LEVEL 8 -#endif - -#ifndef MAX_WBITS -#define MAX_WBITS 15 -#endif - -#ifndef DEF_WBITS -#define DEF_WBITS MAX_WBITS -#endif - -#if MAX_MEM_LEVEL >= 8 -#define DEF_MEM_LEVEL 8 -#else -#define DEF_MEM_LEVEL MAX_MEM_LEVEL -#endif - -typedef unsigned char Byte; -typedef unsigned int uInt; -typedef unsigned long uLong; -typedef void *voidp; - -#endif diff --git a/libc/kernel/common/linux/zlib.h b/libc/kernel/common/linux/zlib.h deleted file mode 100644 index 052adfe0b..000000000 --- a/libc/kernel/common/linux/zlib.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef _ZLIB_H -#define _ZLIB_H - -#include - -struct internal_state; - -typedef struct z_stream_s { - Byte *next_in; - uInt avail_in; - uLong total_in; - - Byte *next_out; - uInt avail_out; - uLong total_out; - - char *msg; - struct internal_state *state; - - void *workspace; - - int data_type; - uLong adler; - uLong reserved; -} z_stream; - -typedef z_stream *z_streamp; - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 -#define Z_PACKET_FLUSH 2 -#define Z_SYNC_FLUSH 3 -#define Z_FULL_FLUSH 4 -#define Z_FINISH 5 -#define Z_BLOCK 6 - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_DEFAULT_STRATEGY 0 - -#define Z_BINARY 0 -#define Z_ASCII 1 -#define Z_UNKNOWN 2 - -#define Z_DEFLATED 8 - -#define zlib_deflateInit(strm, level) zlib_deflateInit2((strm), (level), Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY) -#define zlib_inflateInit(strm) zlib_inflateInit2((strm), DEF_WBITS) - -#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; -#endif - -#endif diff --git a/libc/kernel/common/linux/zorro_ids.h b/libc/kernel/common/linux/zorro_ids.h deleted file mode 100644 index e6b1d4802..000000000 --- a/libc/kernel/common/linux/zorro_ids.h +++ /dev/null @@ -1,549 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#define ZORRO_MANUF_PACIFIC_PERIPHERALS 0x00D3 -#define ZORRO_PROD_PACIFIC_PERIPHERALS_SE_2000_A500 ZORRO_ID(PACIFIC_PERIPHERALS, 0x00, 0) -#define ZORRO_PROD_PACIFIC_PERIPHERALS_SCSI ZORRO_ID(PACIFIC_PERIPHERALS, 0x0A, 0) - -#define ZORRO_MANUF_MACROSYSTEMS_USA_2 0x0100 -#define ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE ZORRO_ID(MACROSYSTEMS_USA_2, 0x13, 0) - -#define ZORRO_MANUF_KUPKE_1 0x00DD -#define ZORRO_PROD_KUPKE_GOLEM_RAM_BOX_2MB ZORRO_ID(KUPKE_1, 0x00, 0) - -#define ZORRO_MANUF_MEMPHIS 0x0100 -#define ZORRO_PROD_MEMPHIS_STORMBRINGER ZORRO_ID(MEMPHIS, 0x00, 0) - -#define ZORRO_MANUF_3_STATE 0x0200 -#define ZORRO_PROD_3_STATE_MEGAMIX_2000 ZORRO_ID(3_STATE, 0x02, 0) - -#define ZORRO_MANUF_COMMODORE_BRAUNSCHWEIG 0x0201 -#define ZORRO_PROD_CBM_A2088_A2286 ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x01, 0) -#define ZORRO_PROD_CBM_A2286 ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x02, 0) -#define ZORRO_PROD_CBM_A4091_1 ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x54, 0) -#define ZORRO_PROD_CBM_A2386SX_1 ZORRO_ID(COMMODORE_BRAUNSCHWEIG, 0x67, 0) - -#define ZORRO_MANUF_COMMODORE_WEST_CHESTER_1 0x0202 -#define ZORRO_PROD_CBM_A2090A ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x01, 0) -#define ZORRO_PROD_CBM_A590_A2091_1 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x02, 0) -#define ZORRO_PROD_CBM_A590_A2091_2 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x03, 0) -#define ZORRO_PROD_CBM_A2090B ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x04, 0) -#define ZORRO_PROD_CBM_A2060 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x09, 0) -#define ZORRO_PROD_CBM_A590_A2052_A2058_A2091 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x0A, 0) -#define ZORRO_PROD_CBM_A560_RAM ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x20, 0) -#define ZORRO_PROD_CBM_A2232_PROTOTYPE ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x45, 0) -#define ZORRO_PROD_CBM_A2232 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x46, 0) -#define ZORRO_PROD_CBM_A2620 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x50, 0) -#define ZORRO_PROD_CBM_A2630 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x51, 0) -#define ZORRO_PROD_CBM_A4091_2 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x54, 0) -#define ZORRO_PROD_CBM_A2065_1 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x5A, 0) -#define ZORRO_PROD_CBM_ROMULATOR ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x60, 0) -#define ZORRO_PROD_CBM_A3000_TEST_FIXTURE ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x61, 0) -#define ZORRO_PROD_CBM_A2386SX_2 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x67, 0) -#define ZORRO_PROD_CBM_A2065_2 ZORRO_ID(COMMODORE_WEST_CHESTER_1, 0x70, 0) - -#define ZORRO_MANUF_COMMODORE_WEST_CHESTER_2 0x0203 -#define ZORRO_PROD_CBM_A2090A_CM ZORRO_ID(COMMODORE_WEST_CHESTER_2, 0x03, 0) - -#define ZORRO_MANUF_PROGRESSIVE_PERIPHERALS_AND_SYSTEMS_2 0x02F4 -#define ZORRO_PROD_PPS_EXP8000 ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS_2, 0x02, 0) - -#define ZORRO_MANUF_KOLFF_COMPUTER_SUPPLIES 0x02FF -#define ZORRO_PROD_KCS_POWER_PC_BOARD ZORRO_ID(KOLFF_COMPUTER_SUPPLIES, 0x00, 0) - -#define ZORRO_MANUF_CARDCO_1 0x03EC -#define ZORRO_PROD_CARDCO_KRONOS_2000_1 ZORRO_ID(CARDCO_1, 0x04, 0) -#define ZORRO_PROD_CARDCO_A1000_1 ZORRO_ID(CARDCO_1, 0x0C, 0) -#define ZORRO_PROD_CARDCO_ESCORT ZORRO_ID(CARDCO_1, 0x0E, 0) -#define ZORRO_PROD_CARDCO_A2410 ZORRO_ID(CARDCO_1, 0xF5, 0) - -#define ZORRO_MANUF_A_SQUARED 0x03ED -#define ZORRO_PROD_A_SQUARED_LIVE_2000 ZORRO_ID(A_SQUARED, 0x01, 0) - -#define ZORRO_MANUF_COMSPEC_COMMUNICATIONS 0x03EE -#define ZORRO_PROD_COMSPEC_COMMUNICATIONS_AX2000 ZORRO_ID(COMSPEC_COMMUNICATIONS, 0x01, 0) - -#define ZORRO_MANUF_ANAKIN_RESEARCH 0x03F1 -#define ZORRO_PROD_ANAKIN_RESEARCH_EASYL ZORRO_ID(ANAKIN_RESEARCH, 0x01, 0) - -#define ZORRO_MANUF_MICROBOTICS 0x03F2 -#define ZORRO_PROD_MICROBOTICS_STARBOARD_II ZORRO_ID(MICROBOTICS, 0x00, 0) -#define ZORRO_PROD_MICROBOTICS_STARDRIVE ZORRO_ID(MICROBOTICS, 0x02, 0) -#define ZORRO_PROD_MICROBOTICS_8_UP_A ZORRO_ID(MICROBOTICS, 0x03, 0) -#define ZORRO_PROD_MICROBOTICS_8_UP_Z ZORRO_ID(MICROBOTICS, 0x04, 0) -#define ZORRO_PROD_MICROBOTICS_DELTA_RAM ZORRO_ID(MICROBOTICS, 0x20, 0) -#define ZORRO_PROD_MICROBOTICS_8_STAR_RAM ZORRO_ID(MICROBOTICS, 0x40, 0) -#define ZORRO_PROD_MICROBOTICS_8_STAR ZORRO_ID(MICROBOTICS, 0x41, 0) -#define ZORRO_PROD_MICROBOTICS_VXL_RAM_32 ZORRO_ID(MICROBOTICS, 0x44, 0) -#define ZORRO_PROD_MICROBOTICS_VXL_68030 ZORRO_ID(MICROBOTICS, 0x45, 0) -#define ZORRO_PROD_MICROBOTICS_DELTA ZORRO_ID(MICROBOTICS, 0x60, 0) -#define ZORRO_PROD_MICROBOTICS_MBX_1200_1200Z_RAM ZORRO_ID(MICROBOTICS, 0x81, 0) -#define ZORRO_PROD_MICROBOTICS_HARDFRAME_2000_1 ZORRO_ID(MICROBOTICS, 0x96, 0) -#define ZORRO_PROD_MICROBOTICS_HARDFRAME_2000_2 ZORRO_ID(MICROBOTICS, 0x9E, 0) -#define ZORRO_PROD_MICROBOTICS_MBX_1200_1200Z ZORRO_ID(MICROBOTICS, 0xC1, 0) - -#define ZORRO_MANUF_ACCESS_ASSOCIATES_ALEGRA 0x03F4 - -#define ZORRO_MANUF_EXPANSION_TECHNOLOGIES 0x03F6 - -#define ZORRO_MANUF_ASDG 0x03FF -#define ZORRO_PROD_ASDG_MEMORY_1 ZORRO_ID(ASDG, 0x01, 0) -#define ZORRO_PROD_ASDG_MEMORY_2 ZORRO_ID(ASDG, 0x02, 0) -#define ZORRO_PROD_ASDG_EB920_LAN_ROVER ZORRO_ID(ASDG, 0xFE, 0) -#define ZORRO_PROD_ASDG_GPIB_DUALIEEE488_TWIN_X ZORRO_ID(ASDG, 0xFF, 0) - -#define ZORRO_MANUF_IMTRONICS_1 0x0404 -#define ZORRO_PROD_IMTRONICS_HURRICANE_2800_1 ZORRO_ID(IMTRONICS_1, 0x39, 0) -#define ZORRO_PROD_IMTRONICS_HURRICANE_2800_2 ZORRO_ID(IMTRONICS_1, 0x57, 0) - -#define ZORRO_MANUF_CBM_UNIVERSITY_OF_LOWELL 0x0406 -#define ZORRO_PROD_CBM_A2410 ZORRO_ID(CBM_UNIVERSITY_OF_LOWELL, 0x00, 0) - -#define ZORRO_MANUF_AMERISTAR 0x041D -#define ZORRO_PROD_AMERISTAR_A2065 ZORRO_ID(AMERISTAR, 0x01, 0) -#define ZORRO_PROD_AMERISTAR_A560 ZORRO_ID(AMERISTAR, 0x09, 0) -#define ZORRO_PROD_AMERISTAR_A4066 ZORRO_ID(AMERISTAR, 0x0A, 0) - -#define ZORRO_MANUF_SUPRA 0x0420 -#define ZORRO_PROD_SUPRA_SUPRADRIVE_4x4 ZORRO_ID(SUPRA, 0x01, 0) -#define ZORRO_PROD_SUPRA_1000_RAM ZORRO_ID(SUPRA, 0x02, 0) -#define ZORRO_PROD_SUPRA_2000_DMA ZORRO_ID(SUPRA, 0x03, 0) -#define ZORRO_PROD_SUPRA_500 ZORRO_ID(SUPRA, 0x05, 0) -#define ZORRO_PROD_SUPRA_500_SCSI ZORRO_ID(SUPRA, 0x08, 0) -#define ZORRO_PROD_SUPRA_500XP_2000_RAM ZORRO_ID(SUPRA, 0x09, 0) -#define ZORRO_PROD_SUPRA_500RX_2000_RAM ZORRO_ID(SUPRA, 0x0A, 0) -#define ZORRO_PROD_SUPRA_2400ZI ZORRO_ID(SUPRA, 0x0B, 0) -#define ZORRO_PROD_SUPRA_500XP_SUPRADRIVE_WORDSYNC ZORRO_ID(SUPRA, 0x0C, 0) -#define ZORRO_PROD_SUPRA_SUPRADRIVE_WORDSYNC_II ZORRO_ID(SUPRA, 0x0D, 0) -#define ZORRO_PROD_SUPRA_2400ZIPLUS ZORRO_ID(SUPRA, 0x10, 0) - -#define ZORRO_MANUF_COMPUTER_SYSTEMS_ASSOCIATES 0x0422 -#define ZORRO_PROD_CSA_MAGNUM ZORRO_ID(COMPUTER_SYSTEMS_ASSOCIATES, 0x11, 0) -#define ZORRO_PROD_CSA_12_GAUGE ZORRO_ID(COMPUTER_SYSTEMS_ASSOCIATES, 0x15, 0) - -#define ZORRO_MANUF_MARC_MICHAEL_GROTH 0x0439 - -#define ZORRO_MANUF_M_TECH 0x0502 -#define ZORRO_PROD_MTEC_AT500_1 ZORRO_ID(M_TECH, 0x03, 0) - -#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_1 0x06E1 -#define ZORRO_PROD_GVP_IMPACT_SERIES_I ZORRO_ID(GREAT_VALLEY_PRODUCTS_1, 0x08, 0) - -#define ZORRO_MANUF_BYTEBOX 0x07DA -#define ZORRO_PROD_BYTEBOX_A500 ZORRO_ID(BYTEBOX, 0x00, 0) - -#define ZORRO_MANUF_DKB_POWER_COMPUTING 0x07DC -#define ZORRO_PROD_DKB_POWER_COMPUTING_SECUREKEY ZORRO_ID(DKB_POWER_COMPUTING, 0x09, 0) -#define ZORRO_PROD_DKB_POWER_COMPUTING_DKM_3128 ZORRO_ID(DKB_POWER_COMPUTING, 0x0E, 0) -#define ZORRO_PROD_DKB_POWER_COMPUTING_RAPID_FIRE ZORRO_ID(DKB_POWER_COMPUTING, 0x0F, 0) -#define ZORRO_PROD_DKB_POWER_COMPUTING_DKM_1202 ZORRO_ID(DKB_POWER_COMPUTING, 0x10, 0) -#define ZORRO_PROD_DKB_POWER_COMPUTING_COBRA_VIPER_II_68EC030 ZORRO_ID(DKB_POWER_COMPUTING, 0x12, 0) -#define ZORRO_PROD_DKB_POWER_COMPUTING_WILDFIRE_060_1 ZORRO_ID(DKB_POWER_COMPUTING, 0x17, 0) -#define ZORRO_PROD_DKB_POWER_COMPUTING_WILDFIRE_060_2 ZORRO_ID(DKB_POWER_COMPUTING, 0xFF, 0) - -#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_2 0x07E1 -#define ZORRO_PROD_GVP_IMPACT_SERIES_I_4K ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x01, 0) -#define ZORRO_PROD_GVP_IMPACT_SERIES_I_16K_2 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x02, 0) -#define ZORRO_PROD_GVP_IMPACT_SERIES_I_16K_3 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x03, 0) -#define ZORRO_PROD_GVP_IMPACT_3001_IDE_1 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x08, 0) -#define ZORRO_PROD_GVP_IMPACT_3001_RAM ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x09, 0) -#define ZORRO_PROD_GVP_IMPACT_SERIES_II_RAM_1 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0A, 0) -#define ZORRO_PROD_GVP_EPC_BASE ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0) -#define ZORRO_PROD_GVP_GFORCE_040_1 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x20) -#define ZORRO_PROD_GVP_GFORCE_040_SCSI_1 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x30) -#define ZORRO_PROD_GVP_A1291 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x40) -#define ZORRO_PROD_GVP_COMBO_030_R4 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x60) -#define ZORRO_PROD_GVP_COMBO_030_R4_SCSI ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x70) -#define ZORRO_PROD_GVP_PHONEPAK ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x78) -#define ZORRO_PROD_GVP_IO_EXTENDER ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0x98) -#define ZORRO_PROD_GVP_GFORCE_030 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xa0) -#define ZORRO_PROD_GVP_GFORCE_030_SCSI ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xb0) -#define ZORRO_PROD_GVP_A530 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xc0) -#define ZORRO_PROD_GVP_A530_SCSI ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xd0) -#define ZORRO_PROD_GVP_COMBO_030_R3 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xe0) -#define ZORRO_PROD_GVP_COMBO_030_R3_SCSI ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xf0) -#define ZORRO_PROD_GVP_SERIES_II ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0B, 0xf8) -#define ZORRO_PROD_GVP_IMPACT_3001_IDE_2 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x0D, 0) - -#define ZORRO_PROD_GVP_GFORCE_040_060 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x16, 0) -#define ZORRO_PROD_GVP_IMPACT_VISION_24 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0x20, 0) -#define ZORRO_PROD_GVP_GFORCE_040_2 ZORRO_ID(GREAT_VALLEY_PRODUCTS_2, 0xFF, 0) - -#define ZORRO_MANUF_CALIFORNIA_ACCESS_SYNERGY 0x07E5 -#define ZORRO_PROD_CALIFORNIA_ACCESS_SYNERGY_MALIBU ZORRO_ID(CALIFORNIA_ACCESS_SYNERGY, 0x01, 0) - -#define ZORRO_MANUF_XETEC 0x07E6 -#define ZORRO_PROD_XETEC_FASTCARD ZORRO_ID(XETEC, 0x01, 0) -#define ZORRO_PROD_XETEC_FASTCARD_RAM ZORRO_ID(XETEC, 0x02, 0) -#define ZORRO_PROD_XETEC_FASTCARD_PLUS ZORRO_ID(XETEC, 0x03, 0) - -#define ZORRO_MANUF_PROGRESSIVE_PERIPHERALS_AND_SYSTEMS 0x07EA -#define ZORRO_PROD_PPS_MERCURY ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x00, 0) -#define ZORRO_PROD_PPS_A3000_68040 ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x01, 0) -#define ZORRO_PROD_PPS_A2000_68040 ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x69, 0) -#define ZORRO_PROD_PPS_ZEUS ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0x96, 0) -#define ZORRO_PROD_PPS_A500_68040 ZORRO_ID(PROGRESSIVE_PERIPHERALS_AND_SYSTEMS, 0xBB, 0) - -#define ZORRO_MANUF_XEBEC 0x07EC - -#define ZORRO_MANUF_SPIRIT_TECHNOLOGY 0x07F2 -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_INSIDER_IN1000 ZORRO_ID(SPIRIT_TECHNOLOGY, 0x01, 0) -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_INSIDER_IN500 ZORRO_ID(SPIRIT_TECHNOLOGY, 0x02, 0) -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_SIN500 ZORRO_ID(SPIRIT_TECHNOLOGY, 0x03, 0) -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_HDA_506 ZORRO_ID(SPIRIT_TECHNOLOGY, 0x04, 0) -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_AX_S ZORRO_ID(SPIRIT_TECHNOLOGY, 0x05, 0) -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_OCTABYTE ZORRO_ID(SPIRIT_TECHNOLOGY, 0x06, 0) -#define ZORRO_PROD_SPIRIT_TECHNOLOGY_INMATE ZORRO_ID(SPIRIT_TECHNOLOGY, 0x08, 0) - -#define ZORRO_MANUF_SPIRIT_TECHNOLOGY_2 0x07F3 - -#define ZORRO_MANUF_BSC_ALFADATA_1 0x07FE -#define ZORRO_PROD_BSC_ALF_3_1 ZORRO_ID(BSC_ALFADATA_1, 0x03, 0) - -#define ZORRO_MANUF_BSC_ALFADATA_2 0x0801 -#define ZORRO_PROD_BSC_ALF_2_1 ZORRO_ID(BSC_ALFADATA_2, 0x01, 0) -#define ZORRO_PROD_BSC_ALF_2_2 ZORRO_ID(BSC_ALFADATA_2, 0x02, 0) -#define ZORRO_PROD_BSC_ALF_3_2 ZORRO_ID(BSC_ALFADATA_2, 0x03, 0) - -#define ZORRO_MANUF_CARDCO_2 0x0802 -#define ZORRO_PROD_CARDCO_KRONOS_2000_2 ZORRO_ID(CARDCO_2, 0x04, 0) -#define ZORRO_PROD_CARDCO_A1000_2 ZORRO_ID(CARDCO_2, 0x0C, 0) - -#define ZORRO_MANUF_JOCHHEIM 0x0804 -#define ZORRO_PROD_JOCHHEIM_RAM ZORRO_ID(JOCHHEIM, 0x01, 0) - -#define ZORRO_MANUF_CHECKPOINT_TECHNOLOGIES 0x0807 -#define ZORRO_PROD_CHECKPOINT_TECHNOLOGIES_SERIAL_SOLUTION ZORRO_ID(CHECKPOINT_TECHNOLOGIES, 0x00, 0) - -#define ZORRO_MANUF_EDOTRONIK 0x0810 -#define ZORRO_PROD_EDOTRONIK_IEEE_488 ZORRO_ID(EDOTRONIK, 0x01, 0) -#define ZORRO_PROD_EDOTRONIK_8032 ZORRO_ID(EDOTRONIK, 0x02, 0) -#define ZORRO_PROD_EDOTRONIK_MULTISERIAL ZORRO_ID(EDOTRONIK, 0x03, 0) -#define ZORRO_PROD_EDOTRONIK_VIDEODIGITIZER ZORRO_ID(EDOTRONIK, 0x04, 0) -#define ZORRO_PROD_EDOTRONIK_PARALLEL_IO ZORRO_ID(EDOTRONIK, 0x05, 0) -#define ZORRO_PROD_EDOTRONIK_PIC_PROTOYPING ZORRO_ID(EDOTRONIK, 0x06, 0) -#define ZORRO_PROD_EDOTRONIK_ADC ZORRO_ID(EDOTRONIK, 0x07, 0) -#define ZORRO_PROD_EDOTRONIK_VME ZORRO_ID(EDOTRONIK, 0x08, 0) -#define ZORRO_PROD_EDOTRONIK_DSP96000 ZORRO_ID(EDOTRONIK, 0x09, 0) - -#define ZORRO_MANUF_NES_INC 0x0813 -#define ZORRO_PROD_NES_INC_RAM ZORRO_ID(NES_INC, 0x00, 0) - -#define ZORRO_MANUF_ICD 0x0817 -#define ZORRO_PROD_ICD_ADVANTAGE_2000_SCSI ZORRO_ID(ICD, 0x01, 0) -#define ZORRO_PROD_ICD_ADVANTAGE_IDE ZORRO_ID(ICD, 0x03, 0) -#define ZORRO_PROD_ICD_ADVANTAGE_2080_RAM ZORRO_ID(ICD, 0x04, 0) - -#define ZORRO_MANUF_KUPKE_2 0x0819 -#define ZORRO_PROD_KUPKE_OMTI ZORRO_ID(KUPKE_2, 0x01, 0) -#define ZORRO_PROD_KUPKE_SCSI_II ZORRO_ID(KUPKE_2, 0x02, 0) -#define ZORRO_PROD_KUPKE_GOLEM_BOX ZORRO_ID(KUPKE_2, 0x03, 0) -#define ZORRO_PROD_KUPKE_030_882 ZORRO_ID(KUPKE_2, 0x04, 0) -#define ZORRO_PROD_KUPKE_SCSI_AT ZORRO_ID(KUPKE_2, 0x05, 0) - -#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_3 0x081D -#define ZORRO_PROD_GVP_A2000_RAM8 ZORRO_ID(GREAT_VALLEY_PRODUCTS_3, 0x09, 0) -#define ZORRO_PROD_GVP_IMPACT_SERIES_II_RAM_2 ZORRO_ID(GREAT_VALLEY_PRODUCTS_3, 0x0A, 0) - -#define ZORRO_MANUF_INTERWORKS_NETWORK 0x081E - -#define ZORRO_MANUF_HARDITAL_SYNTHESIS 0x0820 -#define ZORRO_PROD_HARDITAL_SYNTHESIS_TQM_68030_68882 ZORRO_ID(HARDITAL_SYNTHESIS, 0x14, 0) - -#define ZORRO_MANUF_APPLIED_ENGINEERING 0x0828 -#define ZORRO_PROD_APPLIED_ENGINEERING_DL2000 ZORRO_ID(APPLIED_ENGINEERING, 0x10, 0) -#define ZORRO_PROD_APPLIED_ENGINEERING_RAM_WORKS ZORRO_ID(APPLIED_ENGINEERING, 0xE0, 0) - -#define ZORRO_MANUF_BSC_ALFADATA_3 0x082C -#define ZORRO_PROD_BSC_OKTAGON_2008 ZORRO_ID(BSC_ALFADATA_3, 0x05, 0) -#define ZORRO_PROD_BSC_TANDEM_AT_2008_508 ZORRO_ID(BSC_ALFADATA_3, 0x06, 0) -#define ZORRO_PROD_BSC_ALFA_RAM_1200 ZORRO_ID(BSC_ALFADATA_3, 0x07, 0) -#define ZORRO_PROD_BSC_OKTAGON_2008_RAM ZORRO_ID(BSC_ALFADATA_3, 0x08, 0) -#define ZORRO_PROD_BSC_MULTIFACE_I ZORRO_ID(BSC_ALFADATA_3, 0x10, 0) -#define ZORRO_PROD_BSC_MULTIFACE_II ZORRO_ID(BSC_ALFADATA_3, 0x11, 0) -#define ZORRO_PROD_BSC_MULTIFACE_III ZORRO_ID(BSC_ALFADATA_3, 0x12, 0) -#define ZORRO_PROD_BSC_FRAMEMASTER_II ZORRO_ID(BSC_ALFADATA_3, 0x20, 0) -#define ZORRO_PROD_BSC_GRAFFITI_RAM ZORRO_ID(BSC_ALFADATA_3, 0x21, 0) -#define ZORRO_PROD_BSC_GRAFFITI_REG ZORRO_ID(BSC_ALFADATA_3, 0x22, 0) -#define ZORRO_PROD_BSC_ISDN_MASTERCARD ZORRO_ID(BSC_ALFADATA_3, 0x40, 0) -#define ZORRO_PROD_BSC_ISDN_MASTERCARD_II ZORRO_ID(BSC_ALFADATA_3, 0x41, 0) - -#define ZORRO_MANUF_PHOENIX 0x0835 -#define ZORRO_PROD_PHOENIX_ST506 ZORRO_ID(PHOENIX, 0x21, 0) -#define ZORRO_PROD_PHOENIX_SCSI ZORRO_ID(PHOENIX, 0x22, 0) -#define ZORRO_PROD_PHOENIX_RAM ZORRO_ID(PHOENIX, 0xBE, 0) - -#define ZORRO_MANUF_ADVANCED_STORAGE_SYSTEMS 0x0836 -#define ZORRO_PROD_ADVANCED_STORAGE_SYSTEMS_NEXUS ZORRO_ID(ADVANCED_STORAGE_SYSTEMS, 0x01, 0) -#define ZORRO_PROD_ADVANCED_STORAGE_SYSTEMS_NEXUS_RAM ZORRO_ID(ADVANCED_STORAGE_SYSTEMS, 0x08, 0) - -#define ZORRO_MANUF_IMPULSE 0x0838 -#define ZORRO_PROD_IMPULSE_FIRECRACKER_24 ZORRO_ID(IMPULSE, 0x00, 0) - -#define ZORRO_MANUF_IVS 0x0840 -#define ZORRO_PROD_IVS_GRANDSLAM_PIC_2 ZORRO_ID(IVS, 0x02, 0) -#define ZORRO_PROD_IVS_GRANDSLAM_PIC_1 ZORRO_ID(IVS, 0x04, 0) -#define ZORRO_PROD_IVS_OVERDRIVE ZORRO_ID(IVS, 0x10, 0) -#define ZORRO_PROD_IVS_TRUMPCARD_CLASSIC ZORRO_ID(IVS, 0x30, 0) -#define ZORRO_PROD_IVS_TRUMPCARD_PRO_GRANDSLAM ZORRO_ID(IVS, 0x34, 0) -#define ZORRO_PROD_IVS_META_4 ZORRO_ID(IVS, 0x40, 0) -#define ZORRO_PROD_IVS_WAVETOOLS ZORRO_ID(IVS, 0xBF, 0) -#define ZORRO_PROD_IVS_VECTOR_1 ZORRO_ID(IVS, 0xF3, 0) -#define ZORRO_PROD_IVS_VECTOR_2 ZORRO_ID(IVS, 0xF4, 0) - -#define ZORRO_MANUF_VECTOR_1 0x0841 -#define ZORRO_PROD_VECTOR_CONNECTION_1 ZORRO_ID(VECTOR_1, 0xE3, 0) - -#define ZORRO_MANUF_XPERT_PRODEV 0x0845 -#define ZORRO_PROD_XPERT_PRODEV_VISIONA_RAM ZORRO_ID(XPERT_PRODEV, 0x01, 0) -#define ZORRO_PROD_XPERT_PRODEV_VISIONA_REG ZORRO_ID(XPERT_PRODEV, 0x02, 0) -#define ZORRO_PROD_XPERT_PRODEV_MERLIN_RAM ZORRO_ID(XPERT_PRODEV, 0x03, 0) -#define ZORRO_PROD_XPERT_PRODEV_MERLIN_REG_1 ZORRO_ID(XPERT_PRODEV, 0x04, 0) -#define ZORRO_PROD_XPERT_PRODEV_MERLIN_REG_2 ZORRO_ID(XPERT_PRODEV, 0xC9, 0) - -#define ZORRO_MANUF_HYDRA_SYSTEMS 0x0849 -#define ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET ZORRO_ID(HYDRA_SYSTEMS, 0x01, 0) - -#define ZORRO_MANUF_SUNRIZE_INDUSTRIES 0x084F -#define ZORRO_PROD_SUNRIZE_INDUSTRIES_AD1012 ZORRO_ID(SUNRIZE_INDUSTRIES, 0x01, 0) -#define ZORRO_PROD_SUNRIZE_INDUSTRIES_AD516 ZORRO_ID(SUNRIZE_INDUSTRIES, 0x02, 0) -#define ZORRO_PROD_SUNRIZE_INDUSTRIES_DD512 ZORRO_ID(SUNRIZE_INDUSTRIES, 0x03, 0) - -#define ZORRO_MANUF_TRICERATOPS 0x0850 -#define ZORRO_PROD_TRICERATOPS_MULTI_IO ZORRO_ID(TRICERATOPS, 0x01, 0) - -#define ZORRO_MANUF_APPLIED_MAGIC 0x0851 -#define ZORRO_PROD_APPLIED_MAGIC_DMI_RESOLVER ZORRO_ID(APPLIED_MAGIC, 0x01, 0) -#define ZORRO_PROD_APPLIED_MAGIC_DIGITAL_BROADCASTER ZORRO_ID(APPLIED_MAGIC, 0x06, 0) - -#define ZORRO_MANUF_GFX_BASE 0x085E -#define ZORRO_PROD_GFX_BASE_GDA_1_VRAM ZORRO_ID(GFX_BASE, 0x00, 0) -#define ZORRO_PROD_GFX_BASE_GDA_1 ZORRO_ID(GFX_BASE, 0x01, 0) - -#define ZORRO_MANUF_ROCTEC 0x0860 -#define ZORRO_PROD_ROCTEC_RH_800C ZORRO_ID(ROCTEC, 0x01, 0) -#define ZORRO_PROD_ROCTEC_RH_800C_RAM ZORRO_ID(ROCTEC, 0x01, 0) - -#define ZORRO_MANUF_KATO 0x0861 -#define ZORRO_PROD_KATO_MELODY ZORRO_ID(KATO, 0x80, 0) - -#define ZORRO_MANUF_HELFRICH_1 0x0861 -#define ZORRO_PROD_HELFRICH_RAINBOW_II ZORRO_ID(HELFRICH_1, 0x20, 0) -#define ZORRO_PROD_HELFRICH_RAINBOW_III ZORRO_ID(HELFRICH_1, 0x21, 0) - -#define ZORRO_MANUF_ATLANTIS 0x0862 - -#define ZORRO_MANUF_PROTAR 0x0864 - -#define ZORRO_MANUF_ACS 0x0865 - -#define ZORRO_MANUF_SOFTWARE_RESULTS_ENTERPRISES 0x0866 -#define ZORRO_PROD_SOFTWARE_RESULTS_ENTERPRISES_GOLDEN_GATE_2_BUS_PLUS ZORRO_ID(SOFTWARE_RESULTS_ENTERPRISES, 0x01, 0) - -#define ZORRO_MANUF_MASOBOSHI 0x086D -#define ZORRO_PROD_MASOBOSHI_MASTER_CARD_SC201 ZORRO_ID(MASOBOSHI, 0x03, 0) -#define ZORRO_PROD_MASOBOSHI_MASTER_CARD_MC702 ZORRO_ID(MASOBOSHI, 0x04, 0) -#define ZORRO_PROD_MASOBOSHI_MVD_819 ZORRO_ID(MASOBOSHI, 0x07, 0) - -#define ZORRO_MANUF_MAINHATTAN_DATA 0x086F -#define ZORRO_PROD_MAINHATTAN_DATA_IDE ZORRO_ID(MAINHATTAN_DATA, 0x01, 0) - -#define ZORRO_MANUF_VILLAGE_TRONIC 0x0877 -#define ZORRO_PROD_VILLAGE_TRONIC_DOMINO_RAM ZORRO_ID(VILLAGE_TRONIC, 0x01, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_DOMINO_REG ZORRO_ID(VILLAGE_TRONIC, 0x02, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_DOMINO_16M_PROTOTYPE ZORRO_ID(VILLAGE_TRONIC, 0x03, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM ZORRO_ID(VILLAGE_TRONIC, 0x0B, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG ZORRO_ID(VILLAGE_TRONIC, 0x0C, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_SEGMENTED_MODE ZORRO_ID(VILLAGE_TRONIC, 0x0D, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_MEM1 ZORRO_ID(VILLAGE_TRONIC, 0x15, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_MEM2 ZORRO_ID(VILLAGE_TRONIC, 0x16, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_REG ZORRO_ID(VILLAGE_TRONIC, 0x17, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3 ZORRO_ID(VILLAGE_TRONIC, 0x18, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_ARIADNE ZORRO_ID(VILLAGE_TRONIC, 0xC9, 0) -#define ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2 ZORRO_ID(VILLAGE_TRONIC, 0xCA, 0) - -#define ZORRO_MANUF_UTILITIES_UNLIMITED 0x087B -#define ZORRO_PROD_UTILITIES_UNLIMITED_EMPLANT_DELUXE ZORRO_ID(UTILITIES_UNLIMITED, 0x15, 0) -#define ZORRO_PROD_UTILITIES_UNLIMITED_EMPLANT_DELUXE2 ZORRO_ID(UTILITIES_UNLIMITED, 0x20, 0) - -#define ZORRO_MANUF_AMITRIX 0x0880 -#define ZORRO_PROD_AMITRIX_MULTI_IO ZORRO_ID(AMITRIX, 0x01, 0) -#define ZORRO_PROD_AMITRIX_CD_RAM ZORRO_ID(AMITRIX, 0x02, 0) - -#define ZORRO_MANUF_ARMAX 0x0885 -#define ZORRO_PROD_ARMAX_OMNIBUS ZORRO_ID(ARMAX, 0x00, 0) - -#define ZORRO_MANUF_ZEUS 0x088D -#define ZORRO_PROD_ZEUS_SPIDER ZORRO_ID(ZEUS, 0x04, 0) - -#define ZORRO_MANUF_NEWTEK 0x088F -#define ZORRO_PROD_NEWTEK_VIDEOTOASTER ZORRO_ID(NEWTEK, 0x00, 0) - -#define ZORRO_MANUF_M_TECH_GERMANY 0x0890 -#define ZORRO_PROD_MTEC_AT500_2 ZORRO_ID(M_TECH_GERMANY, 0x01, 0) -#define ZORRO_PROD_MTEC_68030 ZORRO_ID(M_TECH_GERMANY, 0x03, 0) -#define ZORRO_PROD_MTEC_68020I ZORRO_ID(M_TECH_GERMANY, 0x06, 0) -#define ZORRO_PROD_MTEC_A1200_T68030_RTC ZORRO_ID(M_TECH_GERMANY, 0x20, 0) -#define ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530 ZORRO_ID(M_TECH_GERMANY, 0x21, 0) -#define ZORRO_PROD_MTEC_8_MB_RAM ZORRO_ID(M_TECH_GERMANY, 0x22, 0) -#define ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530_SCSI_IDE ZORRO_ID(M_TECH_GERMANY, 0x24, 0) - -#define ZORRO_MANUF_GREAT_VALLEY_PRODUCTS_4 0x0891 -#define ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM ZORRO_ID(GREAT_VALLEY_PRODUCTS_4, 0x01, 0) -#define ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG ZORRO_ID(GREAT_VALLEY_PRODUCTS_4, 0x02, 0) - -#define ZORRO_MANUF_APOLLO_1 0x0892 -#define ZORRO_PROD_APOLLO_A1200 ZORRO_ID(APOLLO_1, 0x01, 0) - -#define ZORRO_MANUF_HELFRICH_2 0x0893 -#define ZORRO_PROD_HELFRICH_PICCOLO_RAM ZORRO_ID(HELFRICH_2, 0x05, 0) -#define ZORRO_PROD_HELFRICH_PICCOLO_REG ZORRO_ID(HELFRICH_2, 0x06, 0) -#define ZORRO_PROD_HELFRICH_PEGGY_PLUS_MPEG ZORRO_ID(HELFRICH_2, 0x07, 0) -#define ZORRO_PROD_HELFRICH_VIDEOCRUNCHER ZORRO_ID(HELFRICH_2, 0x08, 0) -#define ZORRO_PROD_HELFRICH_SD64_RAM ZORRO_ID(HELFRICH_2, 0x0A, 0) -#define ZORRO_PROD_HELFRICH_SD64_REG ZORRO_ID(HELFRICH_2, 0x0B, 0) - -#define ZORRO_MANUF_MACROSYSTEMS_USA 0x089B -#define ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx ZORRO_ID(MACROSYSTEMS_USA, 0x13, 0) - -#define ZORRO_MANUF_ELBOX_COMPUTER 0x089E -#define ZORRO_PROD_ELBOX_COMPUTER_1200_4 ZORRO_ID(ELBOX_COMPUTER, 0x06, 0) - -#define ZORRO_MANUF_HARMS_PROFESSIONAL 0x0A00 -#define ZORRO_PROD_HARMS_PROFESSIONAL_030_PLUS ZORRO_ID(HARMS_PROFESSIONAL, 0x10, 0) -#define ZORRO_PROD_HARMS_PROFESSIONAL_3500 ZORRO_ID(HARMS_PROFESSIONAL, 0xD0, 0) - -#define ZORRO_MANUF_MICRONIK 0x0A50 -#define ZORRO_PROD_MICRONIK_RCA_120 ZORRO_ID(MICRONIK, 0x0A, 0) - -#define ZORRO_MANUF_MICRONIK2 0x0F0F -#define ZORRO_PROD_MICRONIK2_Z3I ZORRO_ID(MICRONIK2, 0x01, 0) - -#define ZORRO_MANUF_MEGAMICRO 0x1000 -#define ZORRO_PROD_MEGAMICRO_SCRAM_500 ZORRO_ID(MEGAMICRO, 0x03, 0) -#define ZORRO_PROD_MEGAMICRO_SCRAM_500_RAM ZORRO_ID(MEGAMICRO, 0x04, 0) - -#define ZORRO_MANUF_IMTRONICS_2 0x1028 -#define ZORRO_PROD_IMTRONICS_HURRICANE_2800_3 ZORRO_ID(IMTRONICS_2, 0x39, 0) -#define ZORRO_PROD_IMTRONICS_HURRICANE_2800_4 ZORRO_ID(IMTRONICS_2, 0x57, 0) - -#define ZORRO_MANUF_INDIVIDUAL_COMPUTERS 0x1212 -#define ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x00, 0) -#define ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x17, 0) -#define ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x2A, 0) - -#define ZORRO_MANUF_KUPKE_3 0x1248 -#define ZORRO_PROD_KUPKE_GOLEM_HD_3000 ZORRO_ID(KUPKE_3, 0x01, 0) - -#define ZORRO_MANUF_ITH 0x1388 -#define ZORRO_PROD_ITH_ISDN_MASTER_II ZORRO_ID(ITH, 0x01, 0) - -#define ZORRO_MANUF_VMC 0x1389 -#define ZORRO_PROD_VMC_ISDN_BLASTER_Z2 ZORRO_ID(VMC, 0x01, 0) -#define ZORRO_PROD_VMC_HYPERCOM_4 ZORRO_ID(VMC, 0x02, 0) - -#define ZORRO_MANUF_INFORMATION 0x157C -#define ZORRO_PROD_INFORMATION_ISDN_ENGINE_I ZORRO_ID(INFORMATION, 0x64, 0) - -#define ZORRO_MANUF_VORTEX 0x2017 -#define ZORRO_PROD_VORTEX_GOLDEN_GATE_80386SX ZORRO_ID(VORTEX, 0x07, 0) -#define ZORRO_PROD_VORTEX_GOLDEN_GATE_RAM ZORRO_ID(VORTEX, 0x08, 0) -#define ZORRO_PROD_VORTEX_GOLDEN_GATE_80486 ZORRO_ID(VORTEX, 0x09, 0) - -#define ZORRO_MANUF_EXPANSION_SYSTEMS 0x2062 -#define ZORRO_PROD_EXPANSION_SYSTEMS_DATAFLYER_4000SX ZORRO_ID(EXPANSION_SYSTEMS, 0x01, 0) -#define ZORRO_PROD_EXPANSION_SYSTEMS_DATAFLYER_4000SX_RAM ZORRO_ID(EXPANSION_SYSTEMS, 0x02, 0) - -#define ZORRO_MANUF_READYSOFT 0x2100 -#define ZORRO_PROD_READYSOFT_AMAX_II_IV ZORRO_ID(READYSOFT, 0x01, 0) - -#define ZORRO_MANUF_PHASE5 0x2140 -#define ZORRO_PROD_PHASE5_BLIZZARD_RAM ZORRO_ID(PHASE5, 0x01, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD ZORRO_ID(PHASE5, 0x02, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_1220_IV ZORRO_ID(PHASE5, 0x06, 0) -#define ZORRO_PROD_PHASE5_FASTLANE_Z3_RAM ZORRO_ID(PHASE5, 0x0A, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_1230_II_FASTLANE_Z3_CYBERSCSI_CYBERSTORM060 ZORRO_ID(PHASE5, 0x0B, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_1220_CYBERSTORM ZORRO_ID(PHASE5, 0x0C, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_1230 ZORRO_ID(PHASE5, 0x0D, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_1230_IV_1260 ZORRO_ID(PHASE5, 0x11, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_2060 ZORRO_ID(PHASE5, 0x18, 0) -#define ZORRO_PROD_PHASE5_CYBERSTORM_MK_II ZORRO_ID(PHASE5, 0x19, 0) -#define ZORRO_PROD_PHASE5_CYBERVISION64 ZORRO_ID(PHASE5, 0x22, 0) -#define ZORRO_PROD_PHASE5_CYBERVISION64_3D_PROTOTYPE ZORRO_ID(PHASE5, 0x32, 0) -#define ZORRO_PROD_PHASE5_CYBERVISION64_3D ZORRO_ID(PHASE5, 0x43, 0) -#define ZORRO_PROD_PHASE5_CYBERSTORM_MK_III ZORRO_ID(PHASE5, 0x64, 0) -#define ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS ZORRO_ID(PHASE5, 0x6e, 0) - -#define ZORRO_MANUF_DPS 0x2169 -#define ZORRO_PROD_DPS_PERSONAL_ANIMATION_RECORDER ZORRO_ID(DPS, 0x01, 0) - -#define ZORRO_MANUF_APOLLO_2 0x2200 -#define ZORRO_PROD_APOLLO_A620_68020_1 ZORRO_ID(APOLLO_2, 0x00, 0) -#define ZORRO_PROD_APOLLO_A620_68020_2 ZORRO_ID(APOLLO_2, 0x01, 0) - -#define ZORRO_MANUF_APOLLO_3 0x2222 -#define ZORRO_PROD_APOLLO_AT_APOLLO ZORRO_ID(APOLLO_3, 0x22, 0) -#define ZORRO_PROD_APOLLO_1230_1240_1260_2030_4040_4060 ZORRO_ID(APOLLO_3, 0x23, 0) - -#define ZORRO_MANUF_PETSOFF_LP 0x38A5 -#define ZORRO_PROD_PETSOFF_LP_DELFINA ZORRO_ID(PETSOFF_LP, 0x00, 0) -#define ZORRO_PROD_PETSOFF_LP_DELFINA_LITE ZORRO_ID(PETSOFF_LP, 0x01, 0) - -#define ZORRO_MANUF_UWE_GERLACH 0x3FF7 -#define ZORRO_PROD_UWE_GERLACH_RAM_ROM ZORRO_ID(UWE_GERLACH, 0xd4, 0) - -#define ZORRO_MANUF_ACT 0x4231 -#define ZORRO_PROD_ACT_PRELUDE ZORRO_ID(ACT, 0x01, 0) - -#define ZORRO_MANUF_MACROSYSTEMS_GERMANY 0x4754 -#define ZORRO_PROD_MACROSYSTEMS_MAESTRO ZORRO_ID(MACROSYSTEMS_GERMANY, 0x03, 0) -#define ZORRO_PROD_MACROSYSTEMS_VLAB ZORRO_ID(MACROSYSTEMS_GERMANY, 0x04, 0) -#define ZORRO_PROD_MACROSYSTEMS_MAESTRO_PRO ZORRO_ID(MACROSYSTEMS_GERMANY, 0x05, 0) -#define ZORRO_PROD_MACROSYSTEMS_RETINA ZORRO_ID(MACROSYSTEMS_GERMANY, 0x06, 0) -#define ZORRO_PROD_MACROSYSTEMS_MULTI_EVOLUTION ZORRO_ID(MACROSYSTEMS_GERMANY, 0x08, 0) -#define ZORRO_PROD_MACROSYSTEMS_TOCCATA ZORRO_ID(MACROSYSTEMS_GERMANY, 0x0C, 0) -#define ZORRO_PROD_MACROSYSTEMS_RETINA_Z3 ZORRO_ID(MACROSYSTEMS_GERMANY, 0x10, 0) -#define ZORRO_PROD_MACROSYSTEMS_VLAB_MOTION ZORRO_ID(MACROSYSTEMS_GERMANY, 0x12, 0) -#define ZORRO_PROD_MACROSYSTEMS_ALTAIS ZORRO_ID(MACROSYSTEMS_GERMANY, 0x13, 0) -#define ZORRO_PROD_MACROSYSTEMS_FALCON_040 ZORRO_ID(MACROSYSTEMS_GERMANY, 0xFD, 0) - -#define ZORRO_MANUF_COMBITEC 0x6766 - -#define ZORRO_MANUF_SKI_PERIPHERALS 0x8000 -#define ZORRO_PROD_SKI_PERIPHERALS_MAST_FIREBALL ZORRO_ID(SKI_PERIPHERALS, 0x08, 0) -#define ZORRO_PROD_SKI_PERIPHERALS_SCSI_DUAL_SERIAL ZORRO_ID(SKI_PERIPHERALS, 0x80, 0) - -#define ZORRO_MANUF_REIS_WARE_2 0xA9AD -#define ZORRO_PROD_REIS_WARE_SCAN_KING ZORRO_ID(REIS_WARE_2, 0x11, 0) - -#define ZORRO_MANUF_CAMERON 0xAA01 -#define ZORRO_PROD_CAMERON_PERSONAL_A4 ZORRO_ID(CAMERON, 0x10, 0) - -#define ZORRO_MANUF_REIS_WARE 0xAA11 -#define ZORRO_PROD_REIS_WARE_HANDYSCANNER ZORRO_ID(REIS_WARE, 0x11, 0) - -#define ZORRO_MANUF_PHOENIX_2 0xB5A8 -#define ZORRO_PROD_PHOENIX_ST506_2 ZORRO_ID(PHOENIX_2, 0x21, 0) -#define ZORRO_PROD_PHOENIX_SCSI_2 ZORRO_ID(PHOENIX_2, 0x22, 0) -#define ZORRO_PROD_PHOENIX_RAM_2 ZORRO_ID(PHOENIX_2, 0xBE, 0) - -#define ZORRO_MANUF_COMBITEC_2 0xC008 -#define ZORRO_PROD_COMBITEC_HD ZORRO_ID(COMBITEC_2, 0x2A, 0) -#define ZORRO_PROD_COMBITEC_SRAM ZORRO_ID(COMBITEC_2, 0x2B, 0) - -#define ZORRO_MANUF_HACKER 0x07DB -#define ZORRO_PROD_GENERAL_PROTOTYPE ZORRO_ID(HACKER, 0x00, 0) -#define ZORRO_PROD_HACKER_SCSI ZORRO_ID(HACKER, 0x01, 0) -#define ZORRO_PROD_RESOURCE_MANAGEMENT_FORCE_QUICKNET_QN2000 ZORRO_ID(HACKER, 0x02, 0) -#define ZORRO_PROD_VECTOR_CONNECTION_2 ZORRO_ID(HACKER, 0xE0, 0) -#define ZORRO_PROD_VECTOR_CONNECTION_3 ZORRO_ID(HACKER, 0xE1, 0) -#define ZORRO_PROD_VECTOR_CONNECTION_4 ZORRO_ID(HACKER, 0xE2, 0) -#define ZORRO_PROD_VECTOR_CONNECTION_5 ZORRO_ID(HACKER, 0xE3, 0) diff --git a/libc/kernel/common/mtd/mtd-abi.h b/libc/kernel/common/mtd/mtd-abi.h deleted file mode 100644 index 0ae22635b..000000000 --- a/libc/kernel/common/mtd/mtd-abi.h +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_ABI_H__ -#define __MTD_ABI_H__ - -struct erase_info_user { - uint32_t start; - uint32_t length; -}; - -struct mtd_oob_buf { - uint32_t start; - uint32_t length; - unsigned char __user *ptr; -}; - -#define MTD_ABSENT 0 -#define MTD_RAM 1 -#define MTD_ROM 2 -#define MTD_NORFLASH 3 -#define MTD_NANDFLASH 4 -#define MTD_DATAFLASH 6 - -#define MTD_WRITEABLE 0x400 -#define MTD_BIT_WRITEABLE 0x800 -#define MTD_NO_ERASE 0x1000 -#define MTD_STUPID_LOCK 0x2000 - -#define MTD_CAP_ROM 0 -#define MTD_CAP_RAM (MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE) -#define MTD_CAP_NORFLASH (MTD_WRITEABLE | MTD_BIT_WRITEABLE) -#define MTD_CAP_NANDFLASH (MTD_WRITEABLE) - -#define MTD_NANDECC_OFF 0 -#define MTD_NANDECC_PLACE 1 -#define MTD_NANDECC_AUTOPLACE 2 -#define MTD_NANDECC_PLACEONLY 3 -#define MTD_NANDECC_AUTOPL_USR 4 - -#define MTD_OTP_OFF 0 -#define MTD_OTP_FACTORY 1 -#define MTD_OTP_USER 2 - -struct mtd_info_user { - uint8_t type; - uint32_t flags; - uint32_t size; - uint32_t erasesize; - uint32_t writesize; - uint32_t oobsize; - - uint32_t ecctype; - uint32_t eccsize; -}; - -struct region_info_user { - uint32_t offset; - uint32_t erasesize; - uint32_t numblocks; - uint32_t regionindex; -}; - -struct otp_info { - uint32_t start; - uint32_t length; - uint32_t locked; -}; - -#define MEMGETINFO _IOR('M', 1, struct mtd_info_user) -#define MEMERASE _IOW('M', 2, struct erase_info_user) -#define MEMWRITEOOB _IOWR('M', 3, struct mtd_oob_buf) -#define MEMREADOOB _IOWR('M', 4, struct mtd_oob_buf) -#define MEMLOCK _IOW('M', 5, struct erase_info_user) -#define MEMUNLOCK _IOW('M', 6, struct erase_info_user) -#define MEMGETREGIONCOUNT _IOR('M', 7, int) -#define MEMGETREGIONINFO _IOWR('M', 8, struct region_info_user) -#define MEMSETOOBSEL _IOW('M', 9, struct nand_oobinfo) -#define MEMGETOOBSEL _IOR('M', 10, struct nand_oobinfo) -#define MEMGETBADBLOCK _IOW('M', 11, loff_t) -#define MEMSETBADBLOCK _IOW('M', 12, loff_t) -#define OTPSELECT _IOR('M', 13, int) -#define OTPGETREGIONCOUNT _IOW('M', 14, int) -#define OTPGETREGIONINFO _IOW('M', 15, struct otp_info) -#define OTPLOCK _IOR('M', 16, struct otp_info) -#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout) -#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats) -#define MTDFILEMODE _IO('M', 19) - -struct nand_oobinfo { - uint32_t useecc; - uint32_t eccbytes; - uint32_t oobfree[8][2]; - uint32_t eccpos[32]; -}; - -struct nand_oobfree { - uint32_t offset; - uint32_t length; -}; - -#define MTD_MAX_OOBFREE_ENTRIES 8 - -struct nand_ecclayout { - uint32_t eccbytes; - uint32_t eccpos[64]; - uint32_t oobavail; - struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES]; -}; - -struct mtd_ecc_stats { - uint32_t corrected; - uint32_t failed; - uint32_t badblocks; - uint32_t bbtblocks; -}; - -enum mtd_file_modes { - MTD_MODE_NORMAL = MTD_OTP_OFF, - MTD_MODE_OTP_FACTORY = MTD_OTP_FACTORY, - MTD_MODE_OTP_USER = MTD_OTP_USER, - MTD_MODE_RAW, -}; - -#endif diff --git a/libc/kernel/common/mtd/mtd-user.h b/libc/kernel/common/mtd/mtd-user.h deleted file mode 100644 index 1d37dc1cc..000000000 --- a/libc/kernel/common/mtd/mtd-user.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -#ifndef __MTD_USER_H__ -#define __MTD_USER_H__ - -#include - -#include - -typedef struct mtd_info_user mtd_info_t; -typedef struct erase_info_user erase_info_t; -typedef struct region_info_user region_info_t; -typedef struct nand_oobinfo nand_oobinfo_t; -typedef struct nand_ecclayout nand_ecclayout_t; - -#endif diff --git a/libc/kernel/tools/clean_header.py b/libc/kernel/tools/clean_header.py deleted file mode 100755 index de4bf8560..000000000 --- a/libc/kernel/tools/clean_header.py +++ /dev/null @@ -1,148 +0,0 @@ -#!/usr/bin/env python -# - -import sys, cpp, kernel, glob, os, re, getopt -from defaults import * -from utils import * - -noUpdate = 1 - -def cleanupFile( path ): - """reads an original header and perform the cleanup operation on it - this functions returns the destination path and the clean header - as a single string""" - # check the header path - src_path = path - - if not os.path.exists(src_path): - if noUpdate: - panic( "file does not exist: '%s'\n" % path ) - sys.stderr.write( "warning: file does not exit: %s\n" % path ) - return None, None - - if not os.path.isfile(src_path): - if noUpdate: - panic( "path is not a file: '%s'\n" % path ) - sys.stderr.write( "warning: not a file: %s\n" % path ) - return None, None - - original_path = kernel_original_path - if os.path.commonprefix( [ src_path, original_path ] ) != original_path: - if noUpdate: - panic( "file is not in 'original' directory: %s\n" % path ); - sys.stderr.write( "warning: file not in 'original' ignored: %s\n" % path ) - return None, None - - src_path = src_path[len(original_path):] - if len(src_path) > 0 and src_path[0] == '/': - src_path = src_path[1:] - - if len(src_path) == 0: - panic( "oops, internal error, can't extract correct relative path" ) - - # convert into destination path, extracting architecture if needed - # and the corresponding list of known static functions - # - arch = None - re_asm_arch = re.compile( r"asm-([\w\d_\+\.\-]+)(/.*)" ) - m = re_asm_arch.match(src_path) - statics = kernel_known_generic_statics - if m and m.group(1) != 'generic': - dst_path = "arch-%s/asm/%s" % m.groups() - arch = m.group(1) - statics = statics.union( kernel_known_statics.get( arch, set() ) ) - else: - dst_path = "common/" + src_path - - dst_path = os.path.normpath( original_path + "/../" + dst_path ) - - # now, let's parse the file - # - list = cpp.BlockParser().parseFile(path) - if not list: - sys.stderr.write( "error: can't parse '%s'" % path ) - sys.exit(1) - - - list.optimizeMacros( kernel_known_macros ) - list.optimizeIf01() - list.removeVarsAndFuncs( statics ) - list.removeComments() - list.removeEmptyLines() - list.removeMacroDefines( kernel_ignored_macros ) - list.insertDisclaimer( kernel.kernel_disclaimer ) - - out = StringOutput() - list.write(out) - return dst_path, out.get() - - -if __name__ == "__main__": - - def usage(): - print """\ - usage: %s [options] - - options: - -v enable verbose mode - - -u enabled update mode - this will try to update the corresponding 'clean header' - if the content has changed. with this, you can pass more - than one file on the command-line - - must be in a subdirectory of 'original' - """ % os.path.basename(sys.argv[0]) - sys.exit(1) - - try: - optlist, args = getopt.getopt( sys.argv[1:], 'uv' ) - except: - # unrecognized option - sys.stderr.write( "error: unrecognized option\n" ) - usage() - - for opt, arg in optlist: - if opt == '-u': - noUpdate = 0 - elif opt == '-v': - verbose = 1 - D_setlevel(1) - - if len(args) == 0: - usage() - - if noUpdate: - for path in args: - dst_path, newdata = cleanupFile(path) - print newdata - - sys.exit(0) - - # now let's update our files. - - b = BatchFileUpdater() - - for path in args: - dst_path, newdata = cleanupFile(path) - if not dst_path: - continue - - b.readFile( dst_path ) - r = b.editFile( dst_path, newdata ) - if r == 0: - r = "unchanged" - elif r == 1: - r = "edited" - else: - r = "added" - - print "cleaning: %-*s -> %-*s (%s)" % ( 35, path, 35, dst_path, r ) - - - if os.environ.has_key("ANDROID_PRODUCT_OUT"): - b.updateP4Files() - else: - b.updateFiles() - - sys.exit(0) diff --git a/libc/kernel/tools/cpp.py b/libc/kernel/tools/cpp.py deleted file mode 100644 index 4b4bd3826..000000000 --- a/libc/kernel/tools/cpp.py +++ /dev/null @@ -1,2180 +0,0 @@ -# a glorified C pre-processor parser - -import sys, re, string -from utils import * -from defaults import * - -debugTokens = False -debugDirectiveTokenizer = False -debugLineParsing = False -debugCppExpr = False -debugOptimIf01 = False - -##################################################################################### -##################################################################################### -##### ##### -##### C P P T O K E N S ##### -##### ##### -##################################################################################### -##################################################################################### - -# the list of supported C-preprocessor tokens -# plus a couple of C tokens as well -tokEOF = "\0" -tokLN = "\n" -tokSTRINGIFY = "#" -tokCONCAT = "##" -tokLOGICAND = "&&" -tokLOGICOR = "||" -tokSHL = "<<" -tokSHR = ">>" -tokEQUAL = "==" -tokNEQUAL = "!=" -tokLT = "<" -tokLTE = "<=" -tokGT = ">" -tokGTE = ">=" -tokELLIPSIS = "..." -tokSPACE = " " -tokDEFINED = "defined" -tokLPAREN = "(" -tokRPAREN = ")" -tokNOT = "!" -tokPLUS = "+" -tokMINUS = "-" -tokMULTIPLY = "*" -tokDIVIDE = "/" -tokMODULUS = "%" -tokBINAND = "&" -tokBINOR = "|" -tokBINXOR = "^" -tokCOMMA = "," -tokLBRACE = "{" -tokRBRACE = "}" -tokARROW = "->" -tokINCREMENT = "++" -tokDECREMENT = "--" -tokNUMBER = "" -tokIDENT = "" -tokSTRING = "" - -class Token: - """a simple class to hold information about a given token. - each token has a position in the source code, as well as - an 'id' and a 'value'. the id is a string that identifies - the token's class, while the value is the string of the - original token itself. - - for example, the tokenizer concatenates a series of spaces - and tabs as a single tokSPACE id, whose value if the original - spaces+tabs sequence.""" - - def __init__(self): - self.id = None - self.value = None - self.lineno = 0 - self.colno = 0 - - def set(self,id,val=None): - self.id = id - if val: - self.value = val - else: - self.value = id - return None - - def copyFrom(self,src): - self.id = src.id - self.value = src.value - self.lineno = src.lineno - self.colno = src.colno - - def __repr__(self): - if self.id == tokIDENT: - return "(ident %s)" % self.value - if self.id == tokNUMBER: - return "(number %s)" % self.value - if self.id == tokSTRING: - return "(string '%s')" % self.value - if self.id == tokLN: - return "" - if self.id == tokEOF: - return "" - if self.id == tokSPACE and self.value == "\\": - # this corresponds to a trailing \ that was transformed into a tokSPACE - return "<\\>" - - return self.id - - def __str__(self): - if self.id == tokIDENT: - return self.value - if self.id == tokNUMBER: - return self.value - if self.id == tokSTRING: - return self.value - if self.id == tokEOF: - return "" - if self.id == tokSPACE: - if self.value == "\\": # trailing \ - return "\\\n" - else: - return self.value - - return self.id - -class BadExpectedToken(Exception): - def __init__(self,msg): - print msg - -##################################################################################### -##################################################################################### -##### ##### -##### C P P T O K E N C U R S O R ##### -##### ##### -##################################################################################### -##################################################################################### - -class TokenCursor: - """a small class to iterate over a list of Token objects""" - def __init__(self,tokens): - self.tokens = tokens - self.n = 0 - self.count = len(tokens) - - def set(self,n): - """set the current position""" - if n < 0: - n = 0 - if n > self.count: - n = self.count - self.n = n - - def peekId(self): - """retrieve the id of the current token""" - if (self.n >= self.count): - return None - return self.tokens[self.n].id - - def peek(self): - """retrieve the current token. does not change position""" - if (self.n >= self.count): - return None - return self.tokens[self.n] - - def skip(self): - """increase current token position""" - if (self.n < self.count): - self.n += 1 - - def skipSpaces(self): - """skip over all space tokens, this includes tokSPACE and tokLN""" - while 1: - tok = self.peekId() - if tok != tokSPACE and tok != tokLN: - break - self.skip() - - def skipIfId(self,id): - """skip an optional token""" - if self.peekId() == id: - self.skip() - - def expectId(self,id): - """raise an exception if the current token hasn't a given id. - otherwise skip over it""" - tok = self.peek() - if tok.id != id: - raise BadExpectedToken, "%d:%d: '%s' expected, received '%s'" % (tok.lineno, tok.colno, id, tok.id) - self.skip() - - def remain(self): - """return the list of remaining tokens""" - return self.tokens[self.n:] - - -##################################################################################### -##################################################################################### -##### ##### -##### C P P T O K E N I Z E R ##### -##### ##### -##################################################################################### -##################################################################################### - -# list of long symbols, i.e. those that take more than one characters -cppLongSymbols = [ tokCONCAT, tokLOGICAND, tokLOGICOR, tokSHL, tokSHR, tokELLIPSIS, tokEQUAL,\ - tokNEQUAL, tokLTE, tokGTE, tokARROW, tokINCREMENT, tokDECREMENT ] - -class CppTokenizer: - """an abstract class used to convert some input text into a list - of tokens. real implementations follow and differ in the format - of the input text only""" - - def __init__(self): - """initialize a new CppTokenizer object""" - self.eof = False # end of file reached ? - self.text = None # content of current line, with final \n stripped - self.line = 0 # number of current line - self.pos = 0 # current character position in current line - self.len = 0 # length of current line text - self.held = Token() - - def setLineText(self,line): - """set the content of the (next) current line. should be called - by fillLineText() in derived classes""" - self.text = line - self.len = len(line) - self.pos = 0 - - def fillLineText(self): - """refresh the content of 'line' with a new line of input""" - # to be overriden - self.eof = True - - def markPos(self,tok): - """mark the position of the current token in the source file""" - if self.eof or self.pos > self.len: - tok.lineno = self.line + 1 - tok.colno = 0 - else: - tok.lineno = self.line - tok.colno = self.pos - - def peekChar(self): - """return the current token under the cursor without moving it""" - if self.eof: - return tokEOF - - if self.pos > self.len: - self.pos = 0 - self.line += 1 - self.fillLineText() - if self.eof: - return tokEOF - - if self.pos == self.len: - return tokLN - else: - return self.text[self.pos] - - def peekNChar(self,n): - """try to peek the next n chars on the same line""" - if self.pos + n > self.len: - return None - return self.text[self.pos:self.pos+n] - - def skipChar(self): - """increment the token cursor position""" - if not self.eof: - self.pos += 1 - - def skipNChars(self,n): - if self.pos + n <= self.len: - self.pos += n - else: - while n > 0: - self.skipChar() - n -= 1 - - def nextChar(self): - """retrieve the token at the current cursor position, then skip it""" - result = self.peekChar() - self.skipChar() - return result - - def getEscape(self): - # try to get all characters after a backslash (\) - result = self.nextChar() - if result == "0": - # octal number ? - num = self.peekNChar(3) - if num != None: - isOctal = True - for d in num: - if not d in "01234567": - isOctal = False - break - if isOctal: - result += num - self.skipNChars(3) - elif result == "x" or result == "X": - # hex number ? - num = self.peekNChar(2) - if num != None: - isHex = True - for d in num: - if not d in "012345678abcdefABCDEF": - isHex = False - break - if isHex: - result += num - self.skipNChars(2) - elif result == "u" or result == "U": - # unicode char ? - num = self.peekNChar(4) - if num != None: - isHex = True - for d in num: - if not d in "012345678abcdefABCDEF": - isHex = False - break - if isHex: - result += num - self.skipNChars(4) - - return result - - def nextRealToken(self,tok): - """return next CPP token, used internally by nextToken()""" - c = self.nextChar() - if c == tokEOF or c == tokLN: - return tok.set(c) - - if c == '/': - c = self.peekChar() - if c == '/': # C++ comment line - self.skipChar() - while 1: - c = self.nextChar() - if c == tokEOF or c == tokLN: - break - return tok.set(tokLN) - if c == '*': # C comment start - self.skipChar() - value = "/*" - prev_c = None - while 1: - c = self.nextChar() - if c == tokEOF: - #print "## EOF after '%s'" % value - return tok.set(tokEOF,value) - if c == '/' and prev_c == '*': - break - prev_c = c - value += c - - value += "/" - #print "## COMMENT: '%s'" % value - return tok.set(tokSPACE,value) - c = '/' - - if c.isspace(): - while 1: - c2 = self.peekChar() - if c2 == tokLN or not c2.isspace(): - break - c += c2 - self.skipChar() - return tok.set(tokSPACE,c) - - if c == '\\': - if debugTokens: - print "nextRealToken: \\ found, next token is '%s'" % repr(self.peekChar()) - if self.peekChar() == tokLN: # trailing \ - # eat the tokLN - self.skipChar() - # we replace a trailing \ by a tokSPACE whose value is - # simply "\\". this allows us to detect them later when - # needed. - return tok.set(tokSPACE,"\\") - else: - # treat as a single token here ? - c +=self.getEscape() - return tok.set(c) - - if c == "'": # chars - c2 = self.nextChar() - c += c2 - if c2 == '\\': - c += self.getEscape() - - while 1: - c2 = self.nextChar() - if c2 == tokEOF: - break - c += c2 - if c2 == "'": - break - - return tok.set(tokSTRING, c) - - if c == '"': # strings - quote = 0 - while 1: - c2 = self.nextChar() - if c2 == tokEOF: - return tok.set(tokSTRING,c) - - c += c2 - if not quote: - if c2 == '"': - return tok.set(tokSTRING,c) - if c2 == "\\": - quote = 1 - else: - quote = 0 - - if c >= "0" and c <= "9": # integers ? - while 1: - c2 = self.peekChar() - if c2 == tokLN or (not c2.isalnum() and c2 != "_"): - break - c += c2 - self.skipChar() - return tok.set(tokNUMBER,c) - - if c.isalnum() or c == "_": # identifiers ? - while 1: - c2 = self.peekChar() - if c2 == tokLN or (not c2.isalnum() and c2 != "_"): - break - c += c2 - self.skipChar() - if c == tokDEFINED: - return tok.set(tokDEFINED) - else: - return tok.set(tokIDENT,c) - - # check special symbols - for sk in cppLongSymbols: - if c == sk[0]: - sklen = len(sk[1:]) - if self.pos + sklen <= self.len and \ - self.text[self.pos:self.pos+sklen] == sk[1:]: - self.pos += sklen - return tok.set(sk) - - return tok.set(c) - - def nextToken(self,tok): - """return the next token from the input text. this function - really updates 'tok', and does not return a new one""" - self.markPos(tok) - self.nextRealToken(tok) - - def getToken(self): - tok = Token() - self.nextToken(tok) - if debugTokens: - print "getTokens: %s" % repr(tok) - return tok - - def toTokenList(self): - """convert the input text of a CppTokenizer into a direct - list of token objects. tokEOF is stripped from the result""" - result = [] - while 1: - tok = Token() - self.nextToken(tok) - if tok.id == tokEOF: - break - result.append(tok) - return result - -class CppLineTokenizer(CppTokenizer): - """a CppTokenizer derived class that accepts a single line of text as input""" - def __init__(self,line,lineno=1): - CppTokenizer.__init__(self) - self.line = lineno - self.setLineText(line) - - -class CppLinesTokenizer(CppTokenizer): - """a CppTokenizer derived class that accepts a list of texdt lines as input. - the lines must not have a trailing \n""" - def __init__(self,lines=[],lineno=1): - """initialize a CppLinesTokenizer. you can later add lines using addLines()""" - CppTokenizer.__init__(self) - self.line = lineno - self.lines = lines - self.index = 0 - self.count = len(lines) - - if self.count > 0: - self.fillLineText() - else: - self.eof = True - - def addLine(self,line): - """add a line to a CppLinesTokenizer. this can be done after tokenization - happens""" - if self.count == 0: - self.setLineText(line) - self.index = 1 - self.lines.append(line) - self.count += 1 - self.eof = False - - def fillLineText(self): - if self.index < self.count: - self.setLineText(self.lines[self.index]) - self.index += 1 - else: - self.eof = True - - -class CppFileTokenizer(CppTokenizer): - def __init__(self,file,lineno=1): - CppTokenizer.__init__(self) - self.file = file - self.line = lineno - - def fillLineText(self): - line = self.file.readline() - if len(line) > 0: - if line[-1] == '\n': - line = line[:-1] - if len(line) > 0 and line[-1] == "\r": - line = line[:-1] - self.setLineText(line) - else: - self.eof = True - -# Unit testing -# -class CppTokenizerTester: - """a class used to test CppTokenizer classes""" - def __init__(self,tokenizer=None): - self.tokenizer = tokenizer - self.token = Token() - - def setTokenizer(self,tokenizer): - self.tokenizer = tokenizer - - def expect(self,id): - self.tokenizer.nextToken(self.token) - tokid = self.token.id - if tokid == id: - return - if self.token.value == id and (tokid == tokIDENT or tokid == tokNUMBER): - return - raise BadExpectedToken, "### BAD TOKEN: '%s' expecting '%s'" % (self.token.id,id) - - def expectToken(self,id,line,col): - self.expect(id) - if self.token.lineno != line: - raise BadExpectedToken, "### BAD LINENO: token '%s' got '%d' expecting '%d'" % (id,self.token.lineno,line) - if self.token.colno != col: - raise BadExpectedToken, "### BAD COLNO: '%d' expecting '%d'" % (self.token.colno,col) - - def expectTokenVal(self,id,value,line,col): - self.expectToken(id,line,col) - if self.token.value != value: - raise BadExpectedToken, "### BAD VALUE: '%s' expecting '%s'" % (self.token.value,value) - - def expectList(self,list): - for item in list: - self.expect(item) - -def test_CppTokenizer(): - print "running CppTokenizer tests" - tester = CppTokenizerTester() - - tester.setTokenizer( CppLineTokenizer("#an/example && (01923_xy)") ) - tester.expectList( ["#", "an", "/", "example", tokSPACE, tokLOGICAND, tokSPACE, tokLPAREN, "01923_xy", \ - tokRPAREN, tokLN, tokEOF] ) - - tester.setTokenizer( CppLineTokenizer("FOO(BAR) && defined(BAZ)") ) - tester.expectList( ["FOO", tokLPAREN, "BAR", tokRPAREN, tokSPACE, tokLOGICAND, tokSPACE, - tokDEFINED, tokLPAREN, "BAZ", tokRPAREN, tokLN, tokEOF] ) - - tester.setTokenizer( CppLinesTokenizer( ["/*", "#", "*/"] ) ) - tester.expectList( [ tokSPACE, tokLN, tokEOF ] ) - - tester.setTokenizer( CppLinesTokenizer( ["first", "second"] ) ) - tester.expectList( [ "first", tokLN, "second", tokLN, tokEOF ] ) - - tester.setTokenizer( CppLinesTokenizer( ["first second", " third"] ) ) - tester.expectToken( "first", 1, 0 ) - tester.expectToken( tokSPACE, 1, 5 ) - tester.expectToken( "second", 1, 6 ) - tester.expectToken( tokLN, 1, 12 ) - tester.expectToken( tokSPACE, 2, 0 ) - tester.expectToken( "third", 2, 2 ) - - tester.setTokenizer( CppLinesTokenizer( [ "boo /* what the", "hell */" ] ) ) - tester.expectList( [ "boo", tokSPACE ] ) - tester.expectTokenVal( tokSPACE, "/* what the\nhell */", 1, 4 ) - tester.expectList( [ tokLN, tokEOF ] ) - - tester.setTokenizer( CppLinesTokenizer( [ "an \\", " example" ] ) ) - tester.expectToken( "an", 1, 0 ) - tester.expectToken( tokSPACE, 1, 2 ) - tester.expectTokenVal( tokSPACE, "\\", 1, 3 ) - tester.expectToken( tokSPACE, 2, 0 ) - tester.expectToken( "example", 2, 1 ) - tester.expectToken( tokLN, 2, 8 ) - - return True - - -##################################################################################### -##################################################################################### -##### ##### -##### C P P E X P R E S S I O N S ##### -##### ##### -##################################################################################### -##################################################################################### - -# Cpp expressions are modeled by tuples of the form (op,arg) or (op,arg1,arg2), etc.. -# op is an "operator" string - -class Expr: - """a class used to model a CPP expression""" - opInteger = "int" - opIdent = "ident" - opCall = "call" - opDefined = "defined" - opTest = "?" - opLogicNot = "!" - opNot = "~" - opNeg = "[-]" - opUnaryPlus = "[+]" - opAdd = "+" - opSub = "-" - opMul = "*" - opDiv = "/" - opMod = "%" - opAnd = "&" - opOr = "|" - opXor = "^" - opLogicAnd = "&&" - opLogicOr = "||" - opEqual = "==" - opNotEqual = "!=" - opLess = "<" - opLessEq = "<=" - opGreater = ">" - opGreaterEq = ">=" - opShl = "<<" - opShr = ">>" - - unaries = [ opLogicNot, opNot, opNeg, opUnaryPlus ] - binaries = [ opAdd, opSub, opMul, opDiv, opMod, opAnd, opOr, opXor, opLogicAnd, opLogicOr, - opEqual, opNotEqual, opLess, opLessEq, opGreater, opGreaterEq ] - - precedences = { - opTest: 0, - opLogicOr: 1, - opLogicNot: 2, - opOr : 3, - opXor: 4, - opAnd: 5, - opEqual: 6, opNotEqual: 6, - opLess:7, opLessEq:7, opGreater:7, opGreaterEq:7, - opShl:8, opShr:8, - opAdd:9, opSub:9, - opMul:10, opDiv:10, opMod:10, - opLogicNot:11, - opNot: 12, - } - - def __init__(self,op): - self.op = op - - def __repr__(self): - return "(%s)" % self.op - - def __str__(self): - return "operator(%s)" % self.op - - def precedence(self): - """return the precedence of a given operator""" - return Expr.precedences.get(self.op, 1000) - - def isUnary(self): - return self.op in Expr.unaries - - def isBinary(self): - return self.op in Expr.binaries - - def isDefined(self): - return self.op is opDefined - - def toInt(self): - """return the integer value of a given expression. only valid for integer expressions - will return None otherwise""" - return None - -class IntExpr(Expr): - def __init__(self,value): - Expr.__init__(self,opInteger) - self.arg = value - - def __repr__(self): - return "(int %s)" % self.arg - - def __str__(self): - return self.arg - - def toInt(self): - s = self.arg # string value - # get rid of U or L suffixes - while len(s) > 0 and s[-1] in "LUlu": - s = s[:-1] - return string.atoi(s) - -class IdentExpr(Expr): - def __init__(self,name): - Expr.__init__(self,opIdent) - self.name = name - - def __repr__(self): - return "(ident %s)" % self.name - - def __str__(self): - return self.name - -class CallExpr(Expr): - def __init__(self,funcname,params): - Expr.__init__(self,opCall) - self.funcname = funcname - self.params = params - - def __repr__(self): - result = "(call %s [" % self.funcname - comma = "" - for param in self.params: - result += "%s%s" % (comma, repr(param)) - comma = "," - result += "])" - return result - - def __str__(self): - result = "%s(" % self.funcname - comma = "" - for param in self.params: - result += "%s%s" % (comma, str(param)) - comma = "," - - result += ")" - return result - -class TestExpr(Expr): - def __init__(self,cond,iftrue,iffalse): - Expr.__init__(self,opTest) - self.cond = cond - self.iftrue = iftrue - self.iffalse = iffalse - - def __repr__(self): - return "(?: %s %s %s)" % (repr(self.cond),repr(self.iftrue),repr(self.iffalse)) - - def __str__(self): - return "(%s) ? (%s) : (%s)" % (self.cond, self.iftrue, self.iffalse) - -class SingleArgExpr(Expr): - def __init__(self,op,arg): - Expr.__init__(self,op) - self.arg = arg - - def __repr__(self): - return "(%s %s)" % (self.op, repr(self.arg)) - -class DefinedExpr(SingleArgExpr): - def __init__(self,op,macroname): - SingleArgExpr.__init__(self.opDefined,macroname) - - def __str__(self): - return "defined(%s)" % self.arg - - -class UnaryExpr(SingleArgExpr): - def __init__(self,op,arg,opstr=None): - SingleArgExpr.__init__(self,op,arg) - if not opstr: - opstr = op - self.opstr = opstr - - def __str__(self): - arg_s = str(self.arg) - arg_prec = self.arg.precedence() - self_prec = self.precedence() - if arg_prec < self_prec: - return "%s(%s)" % (self.opstr,arg_s) - else: - return "%s%s" % (self.opstr, arg_s) - -class TwoArgExpr(Expr): - def __init__(self,op,arg1,arg2): - Expr.__init__(self,op) - self.arg1 = arg1 - self.arg2 = arg2 - - def __repr__(self): - return "(%s %s %s)" % (self.op, repr(self.arg1), repr(self.arg2)) - -class BinaryExpr(TwoArgExpr): - def __init__(self,op,arg1,arg2,opstr=None): - TwoArgExpr.__init__(self,op,arg1,arg2) - if not opstr: - opstr = op - self.opstr = opstr - - def __str__(self): - arg1_s = str(self.arg1) - arg2_s = str(self.arg2) - arg1_prec = self.arg1.precedence() - arg2_prec = self.arg2.precedence() - self_prec = self.precedence() - - result = "" - if arg1_prec < self_prec: - result += "(%s)" % arg1_s - else: - result += arg1_s - - result += " %s " % self.opstr - - if arg2_prec < self_prec: - result += "(%s)" % arg2_s - else: - result += arg2_s - - return result - -##################################################################################### -##################################################################################### -##### ##### -##### C P P E X P R E S S I O N P A R S E R ##### -##### ##### -##################################################################################### -##################################################################################### - - -class ExprParser: - """a class used to convert a list of tokens into a cpp Expr object""" - - re_octal = re.compile(r"\s*\(0[0-7]+\).*") - re_decimal = re.compile(r"\s*\(\d+[ulUL]*\).*") - re_hexadecimal = re.compile(r"\s*\(0[xX][0-9a-fA-F]*\).*") - - def __init__(self,tokens): - self.tok = tokens - self.n = len(self.tok) - self.i = 0 - - def mark(self): - return self.i - - def release(self,pos): - self.i = pos - - def peekId(self): - if self.i < self.n: - return self.tok[self.i].id - return None - - def peek(self): - if self.i < self.n: - return self.tok[self.i] - return None - - def skip(self): - if self.i < self.n: - self.i += 1 - - def skipOptional(self,id): - if self.i < self.n and self.tok[self.i].id == id: - self.i += 1 - - def skipSpaces(self): - i = self.i - n = self.n - tok = self.tok - while i < n and (tok[i] == tokSPACE or tok[i] == tokLN): - i += 1 - self.i = i - - # all the isXXX functions returns a (expr,nextpos) pair if a match is found - # or None if not - - def is_integer(self): - id = self.tok[self.i].id - c = id[0] - if c < '0' or c > '9': - return None - - m = ExprParser.re_octal.match(id) - if m: - return (IntExpr(id), m.end(1)) - - m = ExprParser.re_decimal.match(id) - if m: - return (IntExpr(id), m.end(1)) - - m = ExprParser.re_hexadecimal(id) - if m: - return (IntExpr(id), m.end(1)) - - return None - - def is_defined(self): - id = self.tok[self.i].id - if id != "defined": - return None - - pos = self.mark() - - use_paren = 0 - if self.peekId() == tokLPAREN: - self.skip() - use_paren = 1 - - if self.peekId() != tokIDENT: - self.throw( BadExpectedToken, "identifier expected") - - macroname = self.peek().value - self.skip() - if use_paren: - self.skipSpaces() - if self.peekId() != tokRPAREN: - self.throw( BadExpectedToken, "missing right-paren after 'defined' directive") - self.skip() - - i = self.i - return (DefinedExpr(macroname),i+1) - - def is_call_or_ident(self): - pass - - def parse(self, i): - return None - -##################################################################################### -##################################################################################### -##### ##### -##### C P P E X P R E S S I O N S ##### -##### ##### -##################################################################################### -##################################################################################### - -class CppInvalidExpression(Exception): - """an exception raised when an invalid/unsupported cpp expression is detected""" - pass - -class CppExpr: - """a class that models the condition of #if directives into - an expression tree. each node in the tree is of the form (op,arg) or (op,arg1,arg2) - where "op" is a string describing the operation""" - - unaries = [ "!", "~" ] - binaries = [ "+", "-", "<", "<=", ">=", ">", "&&", "||", "*", "/", "%", "&", "|", "^", "<<", ">>", "==", "!=" ] - precedences = { "||": 1, - "&&": 2, - "|": 3, - "^": 4, - "&": 5, - "==":6, "!=":6, - "<":7, "<=":7, ">":7, ">=":7, - "<<":8, ">>":8, - "+":9, "-":9, - "*":10, "/":10, "%":10, - "!":11, "~":12 - } - - def __init__(self, tokens): - """initialize a CppExpr. 'tokens' must be a CppToken list""" - self.tok = tokens - self.n = len(tokens) - if debugCppExpr: - print "CppExpr: trying to parse %s" % repr(tokens) - expr = self.is_expr(0) - if debugCppExpr: - print "CppExpr: got " + repr(expr) - self.expr = expr[0] - - re_cpp_constant = re.compile(r"((\d|\w|_)+)") - - def throw(self,exception,i,msg): - if i < self.n: - tok = self.tok[i] - print "%d:%d: %s" % (tok.lineno,tok.colno,msg) - else: - print "EOF: %s" % msg - raise exception - - def skip_spaces(self,i): - """skip spaces in input token list""" - while i < self.n: - t = self.tok[i] - if t.id != tokSPACE and t.id != tokLN: - break - i += 1 - return i - - def expectId(self,i,id): - """check that a given token id is at the current position, then skip over it""" - i = self.skip_spaces(i) - if i >= self.n or self.tok[i].id != id: - self.throw(BadExpectedToken,i,"### expecting '%s' in expression, got '%s'" % (id, self.tok[i].id)) - return i+1 - - def expectIdent(self,i): - i = self.skip_spaces(i) - if i >= self.n or self.tok[i].id != tokIDENT: - self.throw(BadExpectedToken,i,"### expecting identifier in expression, got '%s'" % (id, self.tok[i].id)) - return i+1 - - # the is_xxxxx function returns either None or a pair (e,nextpos) - # where 'e' is an expression tuple (e.g. (op,arg)) and 'nextpos' is - # the corresponding next position in the input token list - # - - def is_decimal(self,i): - v = self.tok[i].value[:] - while len(v) > 0 and v[-1] in "ULul": - v = v[:-1] - for digit in v: - if not digit.isdigit(): - return None - - # for an integer expression tuple, the argument - # is simply the value as an integer - val = string.atoi(v) - return ("int", val), i+1 - - def is_hexadecimal(self,i): - v = self.tok[i].value[:] - while len(v) > 0 and v[-1] in "ULul": - v = v[:-1] - if len(v) > 2 and (v[0:2] == "0x" or v[0:2] == "0X"): - for digit in v[2:]: - if not digit in "0123456789abcdefABCDEF": - return None - - # for an hex expression tuple, the argument - # is the value as an integer - val = int(v[2:], 16) - return ("hex", val), i+1 - - return None - - def is_integer(self,i): - if self.tok[i].id != tokNUMBER: - return None - - c = self.is_decimal(i) - if c: return c - - c = self.is_hexadecimal(i) - if c: return c - - return None - - def is_number(self,i): - t = self.tok[i] - if t.id == tokMINUS and i+1 < self.n: - c = self.is_integer(i+1) - if c: - e, i2 = c - op, val = e - return (op, -val), i2 - if t.id == tokPLUS and i+1 < self.n: - c = self.is_integer(i+1) - if c: return c - - return self.is_integer(i) - - - def is_alnum(self,i): - """test wether a given token is alpha-numeric""" - i = self.skip_spaces(i) - if i >= self.n: - return None - t = self.tok[i] - m = CppExpr.re_cpp_constant.match(t.id) - if m: - #print "... alnum '%s'" % m.group(1) - r = m.group(1) - return ("ident", r), i+1 - return None - - def is_defined(self,i): - t = self.tok[i] - if t.id != tokDEFINED: - return None - - # we have the defined keyword, check the rest - i = self.skip_spaces(i+1) - use_parens = 0 - if i < self.n and self.tok[i].id == tokLPAREN: - use_parens = 1 - i = self.skip_spaces(i+1) - - if i >= self.n: - self.throw(CppConstantExpected,i,"### 'defined' must be followed by macro name or left paren") - - t = self.tok[i] - if t.id != tokIDENT: - self.throw(CppConstantExpected,i,"### 'defined' must be followed by macro name") - - i += 1 - if use_parens: - i = self.expectId(i,tokRPAREN) - - return ("defined",t.value), i - - - def is_call_or_ident(self,i): - i = self.skip_spaces(i) - if i >= self.n: - return None - - t = self.tok[i] - if t.id != tokIDENT: - return None - - name = t.value - - i = self.skip_spaces(i+1) - if i >= self.n or self.tok[i].id != tokLPAREN: - return ("ident", name), i - - params = [] - depth = 1 - i += 1 - j = i - while i < self.n: - id = self.tok[i].id - if id == tokLPAREN: - depth += 1 - elif depth == 1 and (id == tokCOMMA or id == tokRPAREN): - while j < i and self.tok[j].id == tokSPACE: - j += 1 - k = i - while k > j and self.tok[k-1].id == tokSPACE: - k -= 1 - param = self.tok[j:k] - params.append( param ) - if id == tokRPAREN: - break - j = i+1 - elif id == tokRPAREN: - depth -= 1 - i += 1 - - if i >= self.n: - return None - - return ("call", (name, params)), i+1 - - def is_token(self,i,token): - i = self.skip_spaces(i) - if i >= self.n or self.tok[i].id != token: - return None - return token, i+1 - - - def is_value(self,i): - t = self.tok[i] - if t.id == tokSTRING: - return ("string", t.value), i+1 - - c = self.is_number(i) - if c: return c - - c = self.is_defined(i) - if c: return c - - c = self.is_call_or_ident(i) - if c: return c - - i = self.skip_spaces(i) - if i >= self.n or self.tok[i].id != tokLPAREN: - return None - - popcount = 1 - i2 = i+1 - while i2 < self.n: - t = self.tok[i2] - if t.id == tokLPAREN: - popcount += 1 - elif t.id == tokRPAREN: - popcount -= 1 - if popcount == 0: - break - i2 += 1 - - if popcount != 0: - self.throw(CppInvalidExpression, i, "expression missing closing parenthesis") - - if debugCppExpr: - print "CppExpr: trying to parse sub-expression %s" % repr(self.tok[i+1:i2]) - oldcount = self.n - self.n = i2 - c = self.is_expr(i+1) - self.n = oldcount - if not c: - self.throw(CppInvalidExpression, i, "invalid expression within parenthesis") - - e, i = c - return e, i2+1 - - def is_unary(self,i): - i = self.skip_spaces(i) - if i >= self.n: - return None - - t = self.tok[i] - if t.id in CppExpr.unaries: - c = self.is_unary(i+1) - if not c: - self.throw(CppInvalidExpression, i, "%s operator must be followed by value" % t.id) - e, i = c - return (t.id, e), i - - return self.is_value(i) - - def is_binary(self,i): - i = self.skip_spaces(i) - if i >= self.n: - return None - - c = self.is_unary(i) - if not c: - return None - - e1, i2 = c - i2 = self.skip_spaces(i2) - if i2 >= self.n: - return c - - t = self.tok[i2] - if t.id in CppExpr.binaries: - c = self.is_binary(i2+1) - if not c: - self.throw(CppInvalidExpression, i,"### %s operator must be followed by value" % t.id ) - e2, i3 = c - return (t.id, e1, e2), i3 - - return None - - def is_expr(self,i): - return self.is_binary(i) - - def dump_node(self,e): - op = e[0] - line = "(" + op - if op == "int": - line += " %d)" % e[1] - elif op == "hex": - line += " 0x%x)" % e[1] - elif op == "ident": - line += " %s)" % e[1] - elif op == "defined": - line += " %s)" % e[1] - elif op == "call": - arg = e[1] - line += " %s [" % arg[0] - prefix = "" - for param in arg[1]: - par = "" - for tok in param: - par += str(tok) - line += "%s%s" % (prefix, par) - prefix = "," - line += "])" - elif op in CppExpr.unaries: - line += " %s)" % self.dump_node(e[1]) - elif op in CppExpr.binaries: - line += " %s %s)" % (self.dump_node(e[1]), self.dump_node(e[2])) - else: - line += " ?%s)" % repr(e[1]) - - return line - - def __repr__(self): - return self.dump_node(self.expr) - - def source_node(self,e): - op = e[0] - if op == "int": - return "%d" % e[1] - if op == "hex": - return "0x%x" % e[1] - if op == "ident": - # XXX: should try to expand - return e[1] - if op == "defined": - return "defined(%s)" % e[1] - - prec = CppExpr.precedences.get(op,1000) - arg = e[1] - if op in CppExpr.unaries: - arg_src = self.source_node(arg) - arg_op = arg[0] - arg_prec = CppExpr.precedences.get(arg[0],1000) - if arg_prec < prec: - return "!(" + arg_src + ")" - else: - return "!" + arg_src - if op in CppExpr.binaries: - arg2 = e[2] - arg1_op = arg[0] - arg2_op = arg2[0] - arg1_src = self.source_node(arg) - arg2_src = self.source_node(arg2) - if CppExpr.precedences.get(arg1_op,1000) < prec: - arg1_src = "(%s)" % arg1_src - if CppExpr.precedences.get(arg2_op,1000) < prec: - arg2_src = "(%s)" % arg2_src - - return "%s %s %s" % (arg1_src, op, arg2_src) - return "???" - - def __str__(self): - return self.source_node(self.expr) - - def int_node(self,e): - if e[0] == "int": - return e[1] - elif e[1] == "hex": - return int(e[1],16) - else: - return None - - def toInt(self): - return self.int_node(self.expr) - - def optimize_node(self,e,macros={}): - op = e[0] - if op == "defined": - name = e[1] - if macros.has_key(name): - if macros[name] == kCppUndefinedMacro: - return ("int", 0) - else: - return ("int", 1) - - if kernel_remove_config_macros and name.startswith("CONFIG_"): - return ("int", 0) - - elif op == "!": - op, v = e - v = self.optimize_node(v, macros) - if v[0] == "int": - if v[1] == 0: - return ("int", 1) - else: - return ("int", 0) - - elif op == "&&": - op, l, r = e - l = self.optimize_node(l, macros) - r = self.optimize_node(r, macros) - li = self.int_node(l) - ri = self.int_node(r) - if li != None: - if li == 0: - return ("int", 0) - else: - return r - - elif op == "||": - op, l, r = e - l = self.optimize_node(l, macros) - r = self.optimize_node(r, macros) - li = self.int_node(l) - ri = self.int_node(r) - if li != None: - if li == 0: - return r - else: - return ("int", 1) - elif ri != None: - if ri == 0: - return l - else: - return ("int", 1) - return e - - def optimize(self,macros={}): - self.expr = self.optimize_node(self.expr,macros) - - def removePrefixedNode(self,e,prefix,names): - op = e[0] - if op == "defined": - name = e[1] - if name.startswith(prefix): - if names.has_key[name] and names[name] == "y": - return ("int", 1) - else: - return ("int", 0) - - elif op in CppExpr.unaries: - op, v = e - v = self.removePrefixedNode(v,prefix,names) - return (op, v) - elif op in CppExpr.binaries: - op, v1, v2 = e - v1 = self.removePrefixedNode(v1,prefix,names) - v2 = self.removePrefixedNode(v2,prefix,names) - return (op, v1, v2) - elif op == "call": - func, params = e[1] - params2 = [] - for param in params: - params2.append( self.removePrefixedNode(param,prefix,names) ) - return (op, (func, params2)) - - return e - - def removePrefixed(self,prefix,names={}): - self.expr = self.removePrefixedNode(self.expr,prefix,names) - - def is_equal_node(self,e1,e2): - if e1[0] != e2[0] or len(e1) != len(e2): - return False - - op = e1[0] - if op == "int" or op == "hex" or op == "!" or op == "defined": - return e1[0] == e2[0] - - return self.is_equal_node(e1[1],e2[1]) and self.is_equal_node(e1[2],e2[2]) - - def is_equal(self,other): - return self.is_equal_node(self.expr,other.expr) - -def test_cpp_expr(expr, expected): - e = CppExpr( CppLineTokenizer( expr ).toTokenList() ) - #print repr(e.expr) - s1 = repr(e) - if s1 != expected: - print "KO: expression '%s' generates '%s', should be '%s'" % (expr, s1, expected) - else: - #print "OK: expression '%s'" % expr - pass - -def test_cpp_expr_optim(expr, expected, macros={}): - e = CppExpr( CppLineTokenizer( expr ).toTokenList() ) - e.optimize(macros) - - s1 = repr(e) - if s1 != expected: - print "KO: optimized expression '%s' generates '%s', should be '%s'" % (expr, s1, expected) - else: - #print "OK: optmized expression '%s'" % expr - pass - -def test_cpp_expr_source(expr, expected): - e = CppExpr( CppLineTokenizer( expr ).toTokenList() ) - s1 = str(e) - if s1 != expected: - print "KO: source expression '%s' generates '%s', should be '%s'" % (expr, s1, expected) - else: - #print "OK: source expression '%s'" % expr - pass - -def test_CppExpr(): - print "testing CppExpr" - test_cpp_expr( "0", "(int 0)" ) - test_cpp_expr( "1", "(int 1)" ) - test_cpp_expr( "1 && 1", "(&& (int 1) (int 1))" ) - test_cpp_expr( "1 && 0", "(&& (int 1) (int 0))" ) - test_cpp_expr( "EXAMPLE", "(ident EXAMPLE)" ) - test_cpp_expr( "EXAMPLE - 3", "(- (ident EXAMPLE) (int 3))" ) - test_cpp_expr( "defined(EXAMPLE)", "(defined EXAMPLE)" ) - test_cpp_expr( "!defined(EXAMPLE)", "(! (defined EXAMPLE))" ) - test_cpp_expr( "defined(ABC) || defined(BINGO)", "(|| (defined ABC) (defined BINGO))" ) - test_cpp_expr( "FOO(BAR)", "(call FOO [BAR])" ) - - test_cpp_expr_optim( "0", "(int 0)" ) - test_cpp_expr_optim( "1", "(int 1)" ) - test_cpp_expr_optim( "1 && 1", "(int 1)" ) - test_cpp_expr_optim( "1 && 0", "(int 0)" ) - test_cpp_expr_optim( "0 && 1", "(int 0)" ) - test_cpp_expr_optim( "0 && 0", "(int 0)" ) - test_cpp_expr_optim( "1 || 1", "(int 1)" ) - test_cpp_expr_optim( "1 || 0", "(int 1)" ) - test_cpp_expr_optim( "0 || 1", "(int 1)" ) - test_cpp_expr_optim( "0 || 0", "(int 0)" ) - test_cpp_expr_optim( "EXAMPLE", "(ident EXAMPLE)" ) - test_cpp_expr_optim( "EXAMPLE - 3", "(- (ident EXAMPLE) (int 3))" ) - test_cpp_expr_optim( "defined(EXAMPLE)", "(defined EXAMPLE)" ) - test_cpp_expr_optim( "defined(EXAMPLE)", "(int 1)", { "EXAMPLE": "XOWOE" } ) - test_cpp_expr_optim( "defined(EXAMPLE)", "(int 0)", { "EXAMPLE": kCppUndefinedMacro} ) - test_cpp_expr_optim( "!defined(EXAMPLE)", "(! (defined EXAMPLE))" ) - test_cpp_expr_optim( "!defined(EXAMPLE)", "(int 0)", { "EXAMPLE" : "XOWOE" } ) - test_cpp_expr_optim( "!defined(EXAMPLE)", "(int 1)", { "EXAMPLE" : kCppUndefinedMacro } ) - test_cpp_expr_optim( "defined(ABC) || defined(BINGO)", "(|| (defined ABC) (defined BINGO))" ) - test_cpp_expr_optim( "defined(ABC) || defined(BINGO)", "(int 1)", { "ABC" : "1" } ) - test_cpp_expr_optim( "defined(ABC) || defined(BINGO)", "(int 1)", { "BINGO" : "1" } ) - test_cpp_expr_optim( "defined(ABC) || defined(BINGO)", "(defined ABC)", { "BINGO" : kCppUndefinedMacro } ) - test_cpp_expr_optim( "defined(ABC) || defined(BINGO)", "(int 0)", { "ABC" : kCppUndefinedMacro, "BINGO" : kCppUndefinedMacro } ) - - test_cpp_expr_source( "0", "0" ) - test_cpp_expr_source( "1", "1" ) - test_cpp_expr_source( "1 && 1", "1 && 1" ) - test_cpp_expr_source( "1 && 0", "1 && 0" ) - test_cpp_expr_source( "0 && 1", "0 && 1" ) - test_cpp_expr_source( "0 && 0", "0 && 0" ) - test_cpp_expr_source( "1 || 1", "1 || 1" ) - test_cpp_expr_source( "1 || 0", "1 || 0" ) - test_cpp_expr_source( "0 || 1", "0 || 1" ) - test_cpp_expr_source( "0 || 0", "0 || 0" ) - test_cpp_expr_source( "EXAMPLE", "EXAMPLE" ) - test_cpp_expr_source( "EXAMPLE - 3", "EXAMPLE - 3" ) - test_cpp_expr_source( "defined(EXAMPLE)", "defined(EXAMPLE)" ) - test_cpp_expr_source( "defined EXAMPLE", "defined(EXAMPLE)" ) - - -##################################################################################### -##################################################################################### -##### ##### -##### C P P B L O C K ##### -##### ##### -##################################################################################### -##################################################################################### - -class Block: - """a class used to model a block of input source text. there are two block types: - - direcive blocks: contain the tokens of a single pre-processor directive (e.g. #if) - - text blocks, contain the tokens of non-directive blocks - - the cpp parser class below will transform an input source file into a list of Block - objects (grouped in a BlockList object for convenience)""" - - def __init__(self,tokens,directive=None,lineno=0): - """initialize a new block, if 'directive' is None, this is a text block - NOTE: this automatically converts '#ifdef MACRO' into '#if defined(MACRO)' - and '#ifndef MACRO' into '#if !defined(MACRO)'""" - if directive == "ifdef": - tok = Token() - tok.set(tokDEFINED) - tokens = [ tok ] + tokens - directive = "if" - - elif directive == "ifndef": - tok1 = Token() - tok2 = Token() - tok1.set(tokNOT) - tok2.set(tokDEFINED) - tokens = [ tok1, tok2 ] + tokens - directive = "if" - - self.tokens = tokens - self.directive = directive - if lineno > 0: - self.lineno = lineno - else: - self.lineno = self.tokens[0].lineno - - if self.isIf(): - self.expr = CppExpr( self.tokens ) - - def isDirective(self): - """returns True iff this is a directive block""" - return self.directive != None - - def isConditional(self): - """returns True iff this is a conditional directive block""" - return self.directive in ["if","ifdef","ifndef","else","elif","endif"] - - def isDefine(self): - """returns the macro name in a #define directive, or None otherwise""" - if self.directive != "define": - return None - - return self.tokens[0].value - - def isIf(self): - """returns True iff this is an #if-like directive block""" - return self.directive in ["if","ifdef","ifndef","elif"] - - def isInclude(self): - """checks wether this is a #include directive. if true, then returns the - corresponding file name (with brackets or double-qoutes). None otherwise""" - if self.directive != "include": - return None - - #print "iii " + repr(self.tokens) - if self.tokens[0].id == tokSTRING: - # a double-quote include, that's easy - return self.tokens[0].value - - # we only want the bracket part, not any comments or junk after it - if self.tokens[0].id == "<": - i = 0 - tok = self.tokens - n = len(tok) - while i < n and tok[i].id != ">": - i += 1 - - if i >= n: - return None - - return string.join([ str(x) for x in tok[:i+1] ],"") - - else: - return None - - def __repr__(self): - """generate the representation of a given block""" - if self.directive: - result = "#%s " % self.directive - if self.isIf(): - result += repr(self.expr) - else: - for tok in self.tokens: - result += repr(tok) - else: - result = "" - for tok in self.tokens: - result += repr(tok) - - return result - - def __str__(self): - """generate the string representation of a given block""" - if self.directive: - if self.directive == "if": - # small optimization to re-generate #ifdef and #ifndef - e = self.expr.expr - op = e[0] - if op == "defined": - result = "#ifdef %s" % e[1] - elif op == "!" and e[1][0] == "defined": - result = "#ifndef %s" % e[1][1] - else: - result = "#if " + str(self.expr) - else: - result = "#%s" % self.directive - if len(self.tokens): - result += " " - for tok in self.tokens: - result += str(tok) - else: - result = "" - for tok in self.tokens: - result += str(tok) - - return result - - -class BlockList: - """a convenience class used to hold and process a list of blocks returned by - the cpp parser""" - def __init__(self,blocks): - self.blocks = blocks - - def __len__(self): - return len(self.blocks) - - def __getitem__(self,n): - return self.blocks[n] - - def __repr__(self): - return repr(self.blocks) - - def __str__(self): - result = "" - for b in self.blocks: - result += str(b) - if b.isDirective(): - result += '\n' - return result - - def optimizeIf01(self): - """remove the code between #if 0 .. #endif in a BlockList""" - self.blocks = optimize_if01(self.blocks) - - def optimizeMacros(self, macros): - """remove known defined and undefined macros from a BlockList""" - for b in self.blocks: - if b.isIf(): - b.expr.optimize(macros) - - def removeMacroDefines(self,macros): - """remove known macro definitions from a BlockList""" - self.blocks = remove_macro_defines(self.blocks,macros) - - def removePrefixed(self,prefix,names): - for b in self.blocks: - if b.isIf(): - b.expr.removePrefixed(prefix,names) - - def optimizeAll(self,macros): - self.optimizeMacros(macros) - self.optimizeIf01() - return - - def findIncludes(self): - """return the list of included files in a BlockList""" - result = [] - for b in self.blocks: - i = b.isInclude() - if i: - result.append(i) - - return result - - - def write(self,out): - out.write(str(self)) - - def removeComments(self): - for b in self.blocks: - for tok in b.tokens: - if tok.id == tokSPACE: - tok.value = " " - - def removeEmptyLines(self): - # state = 1 => previous line was tokLN - # state = 0 => previous line was directive - state = 1 - for b in self.blocks: - if b.isDirective(): - #print "$$$ directive %s" % str(b) - state = 0 - else: - # a tokLN followed by spaces is replaced by a single tokLN - # several successive tokLN are replaced by a single one - # - dst = [] - src = b.tokens - n = len(src) - i = 0 - #print "$$$ parsing %s" % repr(src) - while i < n: - # find final tokLN - j = i - while j < n and src[j].id != tokLN: - j += 1 - - if j >= n: - # uhhh - dst += src[i:] - break - - if src[i].id == tokSPACE: - k = i+1 - while src[k].id == tokSPACE: - k += 1 - - if k == j: # empty lines with spaces in it - i = j # remove the spaces - - if i == j: - # an empty line - if state == 1: - i += 1 # remove it - else: - state = 1 - dst.append(src[i]) - i += 1 - else: - # this line is not empty, remove trailing spaces - k = j - while k > i and src[k-1].id == tokSPACE: - k -= 1 - - nn = i - while nn < k: - dst.append(src[nn]) - nn += 1 - dst.append(src[j]) - state = 0 - i = j+1 - - b.tokens = dst - - def removeVarsAndFuncs(self,knownStatics=set()): - """remove all extern and static declarations corresponding - to variable and function declarations. we only accept typedefs - and enum/structs/union declarations. - - however, we keep the definitions corresponding to the set - of known static inline functions in the set 'knownStatics', - which is useful for optimized byteorder swap functions and - stuff like that. - """ - # state = 1 => typedef/struct encountered - # state = 2 => vars or func declaration encountered, skipping until ";" - # state = 0 => normal (i.e. LN + spaces) - state = 0 - depth = 0 - blocks2 = [] - for b in self.blocks: - if b.isDirective(): - blocks2.append(b) - else: - n = len(b.tokens) - i = 0 - first = 0 - if state == 2: - first = n - while i < n: - tok = b.tokens[i] - if state == 0: - bad = 0 - if tok.id in [tokLN, tokSPACE]: - pass - elif tok.value in [ 'struct', 'typedef', 'enum', 'union', '__extension__' ]: - state = 1 - else: - if tok.value in [ 'static', 'extern', '__KINLINE' ]: - j = i+1 - ident = "" - while j < n and not (b.tokens[j].id in [ '(', ';' ]): - if b.tokens[j].id == tokIDENT: - ident = b.tokens[j].value - j += 1 - if j < n and ident in knownStatics: - # this is a known static, we're going to keep its - # definition in the final output - state = 1 - else: - #print "### skip static '%s'" % ident - pass - - if state == 0: - if i > first: - #print "### intermediate from '%s': '%s'" % (tok.value, repr(b.tokens[first:i])) - blocks2.append( Block(b.tokens[first:i]) ) - state = 2 - first = n - - else: # state > 0 - if tok.id == '{': - depth += 1 - - elif tok.id == '}': - if depth > 0: - depth -= 1 - - elif depth == 0 and tok.id == ';': - if state == 2: - first = i+1 - state = 0 - - i += 1 - - if i > first: - #print "### final '%s'" % repr(b.tokens[first:i]) - blocks2.append( Block(b.tokens[first:i]) ) - - self.blocks = blocks2 - - def insertDisclaimer(self,disclaimer="/* auto-generated file, DO NOT EDIT */"): - """insert your standard issue disclaimer that this is an - auto-generated file, etc..""" - tokens = CppLineTokenizer( disclaimer ).toTokenList() - tokens = tokens[:-1] # remove trailing tokLN - self.blocks = [ Block(tokens) ] + self.blocks - -class BlockParser: - """a class used to convert an input source file into a BlockList object""" - - def __init__(self,tokzer=None): - """initialize a block parser. the input source is provided through a Tokenizer - object""" - self.reset(tokzer) - - def reset(self,tokzer): - self.state = 1 - self.tokzer = tokzer - - def getBlocks(self,tokzer=None): - """tokenize and parse the input source, return a BlockList object - NOTE: empty and line-numbering directives are ignored and removed - from the result. as a consequence, it is possible to have - two successive text blocks in the result""" - # state 0 => in source code - # state 1 => in source code, after a LN - # state 2 => in source code, after LN then some space - state = 1 - lastLN = 0 - current = [] - blocks = [] - - if tokzer == None: - tokzer = self.tokzer - - while 1: - tok = tokzer.getToken() - if tok.id == tokEOF: - break - - if tok.id == tokLN: - state = 1 - current.append(tok) - lastLN = len(current) - - elif tok.id == tokSPACE: - if state == 1: - state = 2 - current.append(tok) - - elif tok.id == "#": - if state > 0: - # this is the start of a directive - - if lastLN > 0: - # record previous tokens as text block - block = Block(current[:lastLN]) - blocks.append(block) - lastLN = 0 - - current = [] - - # skip spaces after the # - while 1: - tok = tokzer.getToken() - if tok.id != tokSPACE: - break - - if tok.id != tokIDENT: - # empty or line-numbering, ignore it - if tok.id != tokLN and tok.id != tokEOF: - while 1: - tok = tokzer.getToken() - if tok.id == tokLN or tok.id == tokEOF: - break - continue - - directive = tok.value - lineno = tok.lineno - - # skip spaces - tok = tokzer.getToken() - while tok.id == tokSPACE: - tok = tokzer.getToken() - - # then record tokens until LN - dirtokens = [] - while tok.id != tokLN and tok.id != tokEOF: - dirtokens.append(tok) - tok = tokzer.getToken() - - block = Block(dirtokens,directive,lineno) - blocks.append(block) - state = 1 - - else: - state = 0 - current.append(tok) - - if len(current) > 0: - block = Block(current) - blocks.append(block) - - return BlockList(blocks) - - def parse(self,tokzer): - return self.getBlocks( tokzer ) - - def parseLines(self,lines): - """parse a list of text lines into a BlockList object""" - return self.getBlocks( CppLinesTokenizer(lines) ) - - def parseFile(self,path): - """parse a file into a BlockList object""" - file = open(path, "rt") - result = self.getBlocks( CppFileTokenizer(file) ) - file.close() - return result - - -def test_block_parsing(lines,expected): - blocks = BlockParser().parse( CppLinesTokenizer(lines) ) - if len(blocks) != len(expected): - raise BadExpectedToken, "parser.buildBlocks returned '%s' expecting '%s'" \ - % (str(blocks), repr(expected)) - for n in range(len(blocks)): - if str(blocks[n]) != expected[n]: - raise BadExpectedToken, "parser.buildBlocks()[%d] is '%s', expecting '%s'" \ - % (n, str(blocks[n]), expected[n]) - #for block in blocks: - # print block - -def test_BlockParser(): - test_block_parsing(["#error hello"],["#error hello"]) - test_block_parsing([ "foo", "", "bar" ], [ "foo\n\nbar\n" ]) - test_block_parsing([ "foo", " # ", "bar" ], [ "foo\n","bar\n" ]) - test_block_parsing(\ - [ "foo", " # ", " # /* ahah */ if defined(__KERNEL__) ", "bar", "#endif" ], - [ "foo\n", "#ifdef __KERNEL__", "bar\n", "#endif" ] ) - - -##################################################################################### -##################################################################################### -##### ##### -##### B L O C K L I S T O P T I M I Z A T I O N ##### -##### ##### -##################################################################################### -##################################################################################### - -def remove_macro_defines( blocks, excludedMacros=set() ): - """remove macro definitions like #define ....""" - result = [] - for b in blocks: - macroName = b.isDefine() - if macroName == None or not macroName in excludedMacros: - result.append(b) - - return result - -def find_matching_endif( blocks, i ): - n = len(blocks) - depth = 1 - while i < n: - if blocks[i].isDirective(): - dir = blocks[i].directive - if dir in [ "if", "ifndef", "ifdef" ]: - depth += 1 - elif depth == 1 and dir in [ "else", "elif" ]: - return i - elif dir == "endif": - depth -= 1 - if depth == 0: - return i - i += 1 - return i - -def optimize_if01( blocks ): - """remove the code between #if 0 .. #endif in a list of CppBlocks""" - i = 0 - n = len(blocks) - result = [] - while i < n: - j = i - while j < n and not blocks[j].isIf(): - j += 1 - if j > i: - D2("appending lines %d to %d" % (blocks[i].lineno, blocks[j-1].lineno)) - result += blocks[i:j] - if j >= n: - break - expr = blocks[j].expr - r = expr.toInt() - if r == None: - result.append(blocks[j]) - i = j + 1 - continue - - if r == 0: - # if 0 => skip everything until the corresponding #endif - j = find_matching_endif( blocks, j+1 ) - if j >= n: - # unterminated #if 0, finish here - break - dir = blocks[j].directive - if dir == "endif": - D2("remove 'if 0' .. 'endif' (lines %d to %d)" % (blocks[i].lineno, blocks[j].lineno)) - i = j + 1 - elif dir == "else": - # convert 'else' into 'if 1' - D2("convert 'if 0' .. 'else' into 'if 1' (lines %d to %d)" % (blocks[i].lineno, blocks[j-1].lineno)) - blocks[j].directive = "if" - blocks[j].expr = CppExpr( CppLineTokenizer("1").toTokenList() ) - i = j - elif dir == "elif": - # convert 'elif' into 'if' - D2("convert 'if 0' .. 'elif' into 'if'") - blocks[j].directive = "if" - i = j - continue - - # if 1 => find corresponding endif and remove/transform them - k = find_matching_endif( blocks, j+1 ) - if k >= n: - # unterminated #if 1, finish here - D2("unterminated 'if 1'") - result += blocks[j+1:k] - break - - dir = blocks[k].directive - if dir == "endif": - D2("convert 'if 1' .. 'endif' (lines %d to %d)" % (blocks[j].lineno, blocks[k].lineno)) - result += optimize_if01(blocks[j+1:k]) - i = k+1 - elif dir == "else": - # convert 'else' into 'if 0' - D2("convert 'if 1' .. 'else' (lines %d to %d)" % (blocks[j].lineno, blocks[k].lineno)) - result += optimize_if01(blocks[j+1:k]) - blocks[k].directive = "if" - blocks[k].expr = CppExpr( CppLineTokenizer("0").toTokenList() ) - i = k - elif dir == "elif": - # convert 'elif' into 'if 0' - D2("convert 'if 1' .. 'elif' (lines %d to %d)" % (blocks[j].lineno, blocks[k].lineno)) - result += optimize_if01(blocks[j+1:k]) - blocks[k].expr = CppExpr( CppLineTokenizer("0").toTokenList() ) - i = k - return result - -def test_optimizeAll(): - text = """\ -#if 1 -#define GOOD_1 -#endif -#if 0 -#define BAD_2 -#define BAD_3 -#endif - -#if 1 -#define GOOD_2 -#else -#define BAD_4 -#endif - -#if 0 -#define BAD_5 -#else -#define GOOD_3 -#endif - -#if 0 -#if 1 -#define BAD_6 -#endif -#endif\ -""" - - expected = """\ -#define GOOD_1 - -#define GOOD_2 - -#define GOOD_3 - -""" - - print "running test_BlockList.optimizeAll" - out = StringOutput() - lines = string.split(text, '\n') - list = BlockParser().parse( CppLinesTokenizer(lines) ) - #D_setlevel(2) - list.optimizeAll( {"__KERNEL__":kCppUndefinedMacro} ) - #print repr(list) - list.write(out) - if out.get() != expected: - print "KO: macro optimization failed\n" - print "<<<< expecting '", - print expected, - print "'\n>>>> result '" - print out.get(), - print "'\n----" - - -##################################################################################### -##################################################################################### -##### ##### -##### ##### -##### ##### -##################################################################################### -##################################################################################### - -def runUnitTests(): - """run all unit tests for this program""" - print "running unit tests" - test_CppTokenizer() - test_CppExpr() - test_optimizeAll() - test_BlockParser() - print "OK" - -if __name__ == "__main__": - runUnitTests() diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py deleted file mode 100644 index aad009217..000000000 --- a/libc/kernel/tools/defaults.py +++ /dev/null @@ -1,101 +0,0 @@ -# this module contains all the defaults used by the generation of cleaned-up headers -# for the Bionic C library -# - -import time, os, sys -from utils import * - -# the list of supported architectures -# -kernel_archs = [ 'arm', 'x86' ] - -# the list of include directories that belong to the kernel -# tree. used when looking for sources... -# -kernel_dirs = [ "linux", "asm", "asm-generic", "mtd" ] - -# path to the directory containing the original kernel headers -# -kernel_original_path = os.path.normpath( find_program_dir() + '/../original' ) - -# a special value that is used to indicate that a given macro is known to be -# undefined during optimization -kCppUndefinedMacro = "<<>>" - -# this is the set of known macros we want to totally optimize out from the -# final headers -kernel_known_macros = { - "__KERNEL__": kCppUndefinedMacro, - "__KERNEL_STRICT_NAMES":"1", - "__CHECKER__": kCppUndefinedMacro, - "__CHECK_ENDIAN__": kCppUndefinedMacro, - } - -# define to true if you want to remove all defined(CONFIG_FOO) tests -# from the clean headers. testing shows that this is not strictly necessary -# but just generates cleaner results -kernel_remove_config_macros = True - -# maps an architecture to a set of default macros that would be provided by -# toolchain preprocessor -kernel_default_arch_macros = { - "arm": {}, - "x86": {"__i386__": "1"}, - } - -# this is the set of known static inline functions that we want to keep -# in the final ARM headers. this is only used to keep optimized byteswapping -# static functions and stuff like that. -kernel_known_arm_statics = set( - [ "___arch__swab32", # asm-arm/byteorder.h - ] - ) - -kernel_known_x86_statics = set( - [ "___arch__swab32", # asm-x86/byteorder.h - "___arch__swab64", # asm-x86/byteorder.h - ] - ) - -kernel_known_generic_statics = set( - [ "__invalid_size_argument_for_IOC", # asm-generic/ioctl.h - "__cmsg_nxthdr", # linux/socket.h - "cmsg_nxthdr", # linux/socket.h - "ipt_get_target", - ] - ) - -# this maps an architecture to the set of static inline functions that -# we want to keep in the final headers -# -kernel_known_statics = { - "arm" : kernel_known_arm_statics, - "x86" : kernel_known_x86_statics - } - -# this is a list of macros which we want to specifically exclude from -# the generated files. -# -kernel_ignored_macros = set( - [ "MAXHOSTNAMELEN", # for some reason, Linux defines it to 64 - # while most of the BSD code expects this to be 256 - # so ignore the kernel-provided definition and - # define it in the Bionic headers instead - ] - ) - -# this is the standard disclaimer -# -kernel_disclaimer = """\ -/**************************************************************************** - **************************************************************************** - *** - *** This header was automatically generated from a Linux kernel header - *** of the same name, to make information necessary for userspace to - *** call into the kernel available to libc. It contains only constants, - *** structures, and macros generated from the original header, and thus, - *** contains no copyrightable information. - *** - **************************************************************************** - ****************************************************************************/ -""" diff --git a/libc/kernel/tools/find_headers.py b/libc/kernel/tools/find_headers.py deleted file mode 100755 index 8e72bb603..000000000 --- a/libc/kernel/tools/find_headers.py +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/env python -# -# this program is used to find source code that includes linux kernel headers directly -# (e.g. with #include or #include ) -# -# then it lists - -import sys, cpp, glob, os, re, getopt, kernel -from utils import * -from defaults import * - -program_dir = find_program_dir() - -wanted_archs = kernel_archs -wanted_include = os.path.normpath(program_dir + '/../original') -wanted_config = os.path.normpath(program_dir + '/../original/config') - -def usage(): - print """\ - usage: find_headers.py [options] (file|directory|@listfile)+ - - options: - -d specify alternate kernel headers - 'include' directory - ('%s' by default) - - -c specify alternate .config file - ('%s' by default) - - -a used to specify an alternative list - of architectures to support - ('%s' by default) - - -v enable verbose mode - - this program is used to find all the kernel headers that are used - by a set of source files or directories containing them. the search - is recursive to find *all* required files. - -""" % ( wanted_include, wanted_config, string.join(kernel_archs,",") ) - sys.exit(1) - - -try: - optlist, args = getopt.getopt( sys.argv[1:], 'vc:d:a:' ) -except: - # unrecognized option - print "error: unrecognized option" - usage() - -for opt, arg in optlist: - if opt == '-a': - wanted_archs = string.split(arg,',') - elif opt == '-d': - wanted_include = arg - elif opt == '-c': - wanted_config = arg - elif opt == '-v': - kernel.verboseSearch = 1 - kernel.verboseFind = 1 - verbose = 1 - else: - usage() - -if len(args) < 1: - usage() - -kernel_root = wanted_include -if not os.path.exists(kernel_root): - sys.stderr.write( "error: directory '%s' does not exist\n" % kernel_root ) - sys.exit(1) - -if not os.path.isdir(kernel_root): - sys.stderr.write( "error: '%s' is not a directory\n" % kernel_root ) - sys.exit(1) - -if not os.path.isdir(kernel_root+"/linux"): - sys.stderr.write( "error: '%s' does not have a 'linux' directory\n" % kernel_root ) - sys.exit(1) - -if not os.path.exists(wanted_config): - sys.stderr.write( "error: file '%s' does not exist\n" % wanted_config ) - sys.exit(1) - -if not os.path.isfile(wanted_config): - sys.stderr.write( "error: '%s' is not a file\n" % wanted_config ) - sys.exit(1) - -# find all architectures in the kernel tree -re_asm_ = re.compile(r"asm-(\w+)") -archs = [] -for dir in os.listdir(kernel_root): - m = re_asm_.match(dir) - if m: - if verbose: print ">> found kernel arch '%s'" % m.group(1) - archs.append(m.group(1)) - -# if we're using the 'kernel_headers' directory, there is only asm/ -# and no other asm- directories (arm is assumed, which sucks) -# -in_kernel_headers = False -if len(archs) == 0: - # this can happen when we're using the 'kernel_headers' directory - if os.path.isdir(kernel_root+"/asm"): - in_kernel_headers = True - archs = [ "arm" ] - -# if the user has specified some architectures with -a ensure that -# all those he wants are available from the kernel include tree -if wanted_archs != None: - if in_kernel_headers and wanted_archs != [ "arm" ]: - sys.stderr.write( "error: when parsing kernel_headers, 'arm' architecture only is supported at the moment\n" ) - sys.exit(1) - missing = [] - for arch in wanted_archs: - if arch not in archs: - missing.append(arch) - if len(missing) > 0: - sys.stderr.write( "error: the following requested architectures are not in the kernel tree: " ) - for a in missing: - sys.stderr.write( " %s" % a ) - sys.stderr.write( "\n" ) - sys.exit(1) - - archs = wanted_archs - -# helper function used to walk the user files -def parse_file(path, parser): - parser.parseFile(path) - - -# remove previous destination directory -#destdir = "/tmp/bionic-kernel-headers/" -#cleanup_dir(destdir) - -# try to read the config file -try: - cparser = kernel.ConfigParser() - cparser.parseFile( wanted_config ) -except: - sys.stderr.write( "error: can't parse '%s'" % wanted_config ) - sys.exit(1) - -kernel_config = cparser.getDefinitions() - -# first, obtain the list of kernel files used by our clients -fparser = kernel.HeaderScanner() -walk_source_files( args, parse_file, fparser, excludes=["kernel_headers"] ) -headers = fparser.getHeaders() -files = fparser.getFiles() - -# now recursively scan the kernel headers for additionnal sub-included headers -hparser = kernel.KernelHeaderFinder(headers,archs,kernel_root,kernel_config) -headers = hparser.scanForAllArchs() - -if 0: # just for debugging - dumpHeaderUsers = False - - print "the following %d headers:" % len(headers) - for h in sorted(headers): - if dumpHeaderUsers: - print " %s (%s)" % (h, repr(hparser.getHeaderUsers(h))) - else: - print " %s" % h - - print "are used by the following %d files:" % len(files) - for f in sorted(files): - print " %s" % f - - sys.exit(0) - -for h in sorted(headers): - print h - -sys.exit(0) diff --git a/libc/kernel/tools/find_users.py b/libc/kernel/tools/find_users.py deleted file mode 100755 index 5ee308c0e..000000000 --- a/libc/kernel/tools/find_users.py +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env python -# -# this program is used to find source code that includes linux kernel headers directly -# (e.g. with #include or #include ) -# -# then it lists - -import sys, cpp, glob, os, re, getopt -import kernel -from utils import * -from defaults import * - - -def usage(): - print """\ - usage: find_users.py [-v] (file|directory|@listfile)+ - - this program is used to scan a list of files or directories for - sources that include kernel headers directly. the program prints - the list of said source files when it's done. - - when scanning directories, only files matching the following - extension will be searched: .c .cpp .S .h - - use -v to enable verbose output -""" - sys.exit(1) - - -try: - optlist, args = getopt.getopt( sys.argv[1:], 'v' ) -except: - # unrecognized option - print "error: unrecognized option" - usage() - -for opt, arg in optlist: - if opt == '-v': - kernel.verboseSearch = 1 - kernel.verboseFind = 1 - else: - usage() - -if len(args) < 1: - usage() - -# helper function used to walk the user files -def parse_file(path, parser): - parser.parseFile(path) - - -# first, obtain the list of kernel files used by our clients -# avoid parsing the 'kernel_headers' directory itself since we -# use this program with the Android source tree by default. -# -fparser = kernel.HeaderScanner() -walk_source_files( args, parse_file, fparser, excludes=["kernel_headers","original"] ) -files = fparser.getFiles() - -for f in sorted(files): - print f - -sys.exit(0) diff --git a/libc/kernel/tools/kernel.py b/libc/kernel/tools/kernel.py deleted file mode 100644 index 9d9b5f02d..000000000 --- a/libc/kernel/tools/kernel.py +++ /dev/null @@ -1,338 +0,0 @@ -# this file contains definitions related to the Linux kernel itself -# - -# list here the macros that you know are always defined/undefined when including -# the kernel headers -# -import sys, cpp, re, os.path, string, time -from defaults import * - -verboseSearch = 0 -verboseFind = 0 - -######################################################################## -######################################################################## -##### ##### -##### H E A D E R S C A N N E R ##### -##### ##### -######################################################################## -######################################################################## - - -class HeaderScanner: - """a class used to non-recursively detect which Linux kernel headers are - used by a given set of input source files""" - - # to use the HeaderScanner, do the following: - # - # scanner = HeaderScanner() - # for path in : - # scanner.parseFile(path) - # - # # get the set of Linux headers included by your files - # headers = scanner.getHeaders() - # - # # get the set of of input files that do include Linux headers - # files = scanner.getFiles() - # - # note that the result of getHeaders() is a set of strings, each one - # corresponding to a non-bracketed path name, e.g.: - # - # set("linux/types","asm/types.h") - # - - # the default algorithm is pretty smart and will analyze the input - # files with a custom C pre-processor in order to optimize out macros, - # get rid of comments, empty lines, etc.. - # - # this avoids many annoying false positives... !! - # - - # this regular expression is used to detect include paths that relate to - # the kernel, by default, it selects one of: - # - # - # - # - # - re_combined =\ - re.compile(r"^.*<((%s)/[\d\w_\+\.\-/]*)>.*$" % string.join(kernel_dirs,"|") ) - # some kernel files choose to include files with relative paths (x86 32/64 - # dispatch for instance) - re_rel_dir = re.compile(r'^.*"([\d\w_\+\.\-/]+)".*$') - - def __init__(self,config={}): - """initialize a HeaderScanner""" - self.reset() - self.config = config - - def reset(self,config={}): - self.files = set() # set of files being parsed for headers - self.headers = {} # maps headers to set of users - self.config = config - - def checkInclude(self, line, from_file, kernel_root=None): - relative = False - m = HeaderScanner.re_combined.match(line) - if kernel_root and not m: - m = HeaderScanner.re_rel_dir.match(line) - relative = True - if not m: return - - header = m.group(1) - if from_file: - self.files.add(from_file) - if kernel_root and relative: - hdr_dir = os.path.realpath(os.path.dirname(from_file)) - hdr_dir = hdr_dir.replace("%s/" % os.path.realpath(kernel_root), - "") - if hdr_dir: - _prefix = "%s/" % hdr_dir - else: - _prefix = "" - header = "%s%s" % (_prefix, header) - - if not header in self.headers: - self.headers[header] = set() - - if from_file: - if verboseFind: - print "=== %s uses %s" % (from_file, header) - self.headers[header].add(from_file) - - def parseFile(self, path, arch=None, kernel_root=None): - """parse a given file for Linux headers""" - if not os.path.exists(path): - return - - # since tokenizing the file is very slow, we first try a quick grep - # to see if this returns any meaningful results. only if this is true - # do we do the tokenization""" - try: - f = open(path, "rt") - except: - print "!!! can't read '%s'" % path - return - - hasIncludes = False - for line in f: - if (HeaderScanner.re_combined.match(line) or - (kernel_root and HeaderScanner.re_rel_dir.match(line))): - hasIncludes = True - break - - if not hasIncludes: - if verboseSearch: print "::: " + path - return - - if verboseSearch: print "*** " + path - - list = cpp.BlockParser().parseFile(path) - if list: - #list.removePrefixed("CONFIG_",self.config) - macros = kernel_known_macros.copy() - if kernel_root: - macros.update(self.config) - if arch and arch in kernel_default_arch_macros: - macros.update(kernel_default_arch_macros[arch]) - list.optimizeMacros(macros) - list.optimizeIf01() - includes = list.findIncludes() - for inc in includes: - self.checkInclude(inc, path, kernel_root) - - def getHeaders(self): - """return the set of all needed kernel headers""" - return set(self.headers.keys()) - - def getHeaderUsers(self,header): - """return the set of all users for a given header""" - return set(self.headers.get(header)) - - def getAllUsers(self): - """return a dictionary mapping heaaders to their user set""" - return self.headers.copy() - - def getFiles(self): - """returns the set of files that do include kernel headers""" - return self.files.copy() - - -########################################################################## -########################################################################## -##### ##### -##### H E A D E R F I N D E R ##### -##### ##### -########################################################################## -########################################################################## - - -class KernelHeaderFinder: - """a class used to scan the kernel headers themselves.""" - - # this is different - # from a HeaderScanner because we need to translate the path returned by - # HeaderScanner.getHeaders() into possibly architecture-specific ones. - # - # for example, needs to be translated in - # where ARCH is appropriately chosen - - # here's how to use this: - # - # scanner = HeaderScanner() - # for path in : - # scanner.parseFile(path) - # - # used_headers = scanner.getHeaders() - # finder = KernelHeaderFinder(used_headers, [ "arm", "x86" ], - # "") - # all_headers = finder.scanForAllArchs() - # - # not that the result of scanForAllArchs() is a list of relative - # header paths that are not bracketed - # - - def __init__(self,headers,archs,kernel_root,kernel_config): - """init a KernelHeaderScanner, - - 'headers' is a list or set of headers, - 'archs' is a list of architectures - 'kernel_root' is the path to the 'include' directory - of your original kernel sources - """ - - if len(kernel_root) > 0 and kernel_root[-1] != "/": - kernel_root += "/" - #print "using kernel_root %s" % kernel_root - self.archs = archs - self.searched = set(headers) - self.kernel_root = kernel_root - self.kernel_config = kernel_config - self.needed = {} - self.setArch(arch=None) - - def setArch(self,arch=None): - self.curr_arch = arch - self.arch_headers = set() - if arch: - self.prefix = "asm-%s/" % arch - else: - self.prefix = None - - def pathFromHeader(self,header): - path = header - if self.prefix and path.startswith("asm/"): - path = "%s%s" % (self.prefix, path[4:]) - return path - - def pathToHeader(self,path): - if self.prefix and path.startswith(self.prefix): - path = "asm/%s" % path[len(self.prefix):] - return "%s" % path - - def setSearchedHeaders(self,headers): - self.searched = set(headers) - - def scanForArch(self): - fparser = HeaderScanner(config=self.kernel_config) - workqueue = [] - needed = {} - for h in self.searched: - path = self.pathFromHeader(h) - if not path in needed: - needed[path] = set() - workqueue.append(path) - - i = 0 - while i < len(workqueue): - path = workqueue[i] - i += 1 - fparser.parseFile(self.kernel_root + path, - arch=self.curr_arch, kernel_root=self.kernel_root) - for used in fparser.getHeaders(): - path = self.pathFromHeader(used) - if not path in needed: - needed[path] = set() - workqueue.append(path) - for user in fparser.getHeaderUsers(used): - needed[path].add(user) - - # now copy the arch-specific headers into the global list - for header in needed.keys(): - users = needed[header] - if not header in self.needed: - self.needed[header] = set() - - for user in users: - self.needed[header].add(user) - - def scanForAllArchs(self): - """scan for all architectures and return the set of all needed kernel headers""" - for arch in self.archs: - self.setArch(arch) - self.scanForArch() - - return set(self.needed.keys()) - - def getHeaderUsers(self,header): - """return the set of all users for a given header""" - return set(self.needed[header]) - - def getArchHeaders(self,arch): - """return the set of all headers required by a given architecture""" - return set() # XXX: TODO - -##################################################################################### -##################################################################################### -##### ##### -##### C O N F I G P A R S E R ##### -##### ##### -##################################################################################### -##################################################################################### - -class ConfigParser: - """a class used to parse the Linux kernel .config file""" - re_CONFIG_ = re.compile(r"^(CONFIG_\w+)=(.*)$") - - def __init__(self): - self.items = {} - self.duplicates = False - - def parseLine(self,line): - line = string.strip(line) - - # skip empty and comment lines - if len(line) == 0 or line[0] == "#": - return - - m = ConfigParser.re_CONFIG_.match(line) - if not m: return - - name = m.group(1) - value = m.group(2) - - if name in self.items: # aarg, duplicate value - self.duplicates = True - - self.items[name] = value - - def parseFile(self,path): - f = file(path, "r") - for line in f: - if len(line) > 0: - if line[-1] == "\n": - line = line[:-1] - if len(line) > 0 and line[-1] == "\r": - line = line[:-1] - self.parseLine(line) - f.close() - - def getDefinitions(self): - """retrieve a dictionary containing definitions for CONFIG_XXX""" - return self.items.copy() - - def __repr__(self): - return repr(self.items) - - def __str__(self): - return str(self.items) diff --git a/libc/kernel/tools/update_all.py b/libc/kernel/tools/update_all.py deleted file mode 100755 index 6272fcf54..000000000 --- a/libc/kernel/tools/update_all.py +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env python -# -import sys, cpp, kernel, glob, os, re, getopt, clean_header -from defaults import * -from utils import * - -def usage(): - print """\ - usage: %(progname)s - - this program is used to update all the auto-generated clean headers - used by the Bionic C library. it assumes the following: - - - a set of source kernel headers is located in '../original', - relative to the program's directory - - - the clean headers will be placed in '../arch-/asm', - '../common/linux', '../common/asm-generic', etc.. - - - if ANDROID_PRODUCT_OUT is defined in your environment, you're - using the Android build system, and the program will issue - p4 add / edit / delete commands to update the depot for you. - (you'll need to p4 submit manually though) -""" % { "progname" : os.path.basename(sys.argv[0]) } - sys.exit(0) - -try: - optlist, args = getopt.getopt( sys.argv[1:], '' ) -except: - # unrecognized option - sys.stderr.write( "error: unrecognized option\n" ) - usage() - -if len(optlist) > 0 or len(args) > 0: - usage() - -progdir = find_program_dir() -original_dir = os.path.normpath( progdir + "/../original" ) -if not os.path.isdir( original_dir ): - panic( "required directory does not exists: %s\n" % original_dir ) - -# find all source files in 'original' -# -sources = [] -for root, dirs, files in os.walk( original_dir ): - for file in files: - base, ext = os.path.splitext(file) - if ext == ".h": - sources.append( "%s/%s" % (root,file) ) - -b = BatchFileUpdater() - -for arch in kernel_archs: - b.readDir( os.path.normpath( progdir + "/../arch-%s" % arch ) ) - -b.readDir( os.path.normpath( progdir + "/../common" ) ) - -#print "OLD " + repr(b.old_files) - -for path in sources: - dst_path, newdata = clean_header.cleanupFile(path) - if not dst_path: - continue - - b.readFile( dst_path ) - r = b.editFile( dst_path, newdata ) - if r == 0: - r = "unchanged" - elif r == 1: - r = "edited" - else: - r = "added" - - print "cleaning: %-*s -> %-*s (%s)" % ( 35, path, 35, dst_path, r ) - -usePerforce = os.environ.has_key("ANDROID_PRODUCT_OUT") - -if usePerforce: - b.updateP4Files() -else: - b.updateFiles() - -sys.exit(0) diff --git a/libc/kernel/tools/utils.py b/libc/kernel/tools/utils.py deleted file mode 100644 index 763c7d26f..000000000 --- a/libc/kernel/tools/utils.py +++ /dev/null @@ -1,397 +0,0 @@ -# common python utility routines for the Bionic tool scripts - -import sys, os, commands, string, commands - -# basic debugging trace support -# call D_setlevel to set the verbosity level -# and D(), D2(), D3(), D4() to add traces -# -verbose = 0 - -def panic(msg): - sys.stderr.write( find_program_name() + ": error: " ) - sys.stderr.write( msg ) - sys.exit(1) - -def D(msg): - global verbose - if verbose > 0: - print msg - -def D2(msg): - global verbose - if verbose >= 2: - print msg - -def D3(msg): - global verbose - if verbose >= 3: - print msg - -def D4(msg): - global verbose - if verbose >= 4: - print msg - -def D_setlevel(level): - global verbose - verbose = level - - -# other stuff -# -# -def find_program_name(): - return os.path.basename(sys.argv[0]) - -def find_program_dir(): - return os.path.dirname(sys.argv[0]) - -def find_file_from_upwards(from_path,target_file): - """find a file in the current directory or its parents. if 'from_path' is None, - seach from the current program's directory""" - path = from_path - if path == None: - path = os.path.realpath(sys.argv[0]) - path = os.path.dirname(path) - D("this script seems to be located in: %s" % path) - - while 1: - D("probing "+path) - if path == "": - file = target_file - else: - file = path + "/" + target_file - - if os.path.isfile(file): - D("found %s in %s" % (target_file, path)) - return file - - if path == "": - return None - - path = os.path.dirname(path) - -def find_bionic_root(): - file = find_file_from_upwards(None, "SYSCALLS.TXT") - if file: - return os.path.dirname(file) - else: - return None - -def find_kernel_headers(): - """try to find the directory containing the kernel headers for this machine""" - status, version = commands.getstatusoutput( "uname -r" ) # get Linux kernel version - if status != 0: - D("could not execute 'uname -r' command properly") - return None - - # get rid of the "-xenU" suffix that is found in Xen virtual machines - if len(version) > 5 and version[-5:] == "-xenU": - version = version[:-5] - - path = "/usr/src/linux-headers-" + version - D("probing %s for kernel headers" % (path+"/include")) - ret = os.path.isdir( path ) - if ret: - D("found kernel headers in: %s" % (path + "/include")) - return path - return None - - -# parser for the SYSCALLS.TXT file -# -class SysCallsTxtParser: - def __init__(self): - self.syscalls = [] - self.lineno = 0 - - def E(msg): - print "%d: %s" % (self.lineno, msg) - - def parse_line(self, line): - pos_lparen = line.find('(') - E = self.E - if pos_lparen < 0: - E("missing left parenthesis in '%s'" % line) - return - - pos_rparen = line.rfind(')') - if pos_rparen < 0 or pos_rparen <= pos_lparen: - E("missing or misplaced right parenthesis in '%s'" % line) - return - - return_type = line[:pos_lparen].strip().split() - if len(return_type) < 2: - E("missing return type in '%s'" % line) - return - - syscall_func = return_type[-1] - return_type = string.join(return_type[:-1],' ') - - pos_colon = syscall_func.find(':') - if pos_colon < 0: - syscall_name = syscall_func - else: - if pos_colon == 0 or pos_colon+1 >= len(syscall_func): - E("misplaced colon in '%s'" % line) - return - syscall_name = syscall_func[pos_colon+1:] - syscall_func = syscall_func[:pos_colon] - - if pos_rparen > pos_lparen+1: - syscall_params = line[pos_lparen+1:pos_rparen].split(',') - params = string.join(syscall_params,',') - else: - syscall_params = [] - params = "void" - - number = line[pos_rparen+1:].strip() - if number == "stub": - syscall_id = -1 - syscall_id2 = -1 - else: - try: - if number[0] == '#': - number = number[1:].strip() - numbers = string.split(number,',') - syscall_id = int(numbers[0]) - syscall_id2 = syscall_id - if len(numbers) > 1: - syscall_id2 = int(numbers[1]) - except: - E("invalid syscall number in '%s'" % line) - return - - t = { "id" : syscall_id, - "id2" : syscall_id2, - "name" : syscall_name, - "func" : syscall_func, - "params" : syscall_params, - "decl" : "%-15s %s (%s);" % (return_type, syscall_func, params) } - - self.syscalls.append(t) - - def parse_file(self, file_path): - fp = open(file_path) - for line in fp.xreadlines(): - self.lineno += 1 - line = line.strip() - if not line: continue - if line[0] == '#': continue - self.parse_line(line) - - fp.close() - - -class Output: - def __init__(self,out=sys.stdout): - self.out = out - - def write(self,msg): - self.out.write(msg) - - def writeln(self,msg): - self.out.write(msg) - self.out.write("\n") - -class StringOutput: - def __init__(self): - self.line = "" - - def write(self,msg): - self.line += msg - D2("write '%s'" % msg) - - def writeln(self,msg): - self.line += msg + '\n' - D2("write '%s\\n'"% msg) - - def get(self): - return self.line - - -def create_file_path(path): - dirs = [] - while 1: - parent = os.path.dirname(path) - #print "parent: %s <- %s" % (parent, path) - if parent == "/" or parent == "": - break - dirs.append(parent) - path = parent - - dirs.reverse() - for dir in dirs: - #print "dir %s" % dir - if os.path.isdir(dir): - continue - os.mkdir(dir) - -def walk_source_files(paths,callback,args,excludes=[]): - """recursively walk a list of paths and files, only keeping the source files in directories""" - for path in paths: - if not os.path.isdir(path): - callback(path,args) - else: - for root, dirs, files in os.walk(path): - #print "w-- %s (ex: %s)" % (repr((root,dirs)), repr(excludes)) - if len(excludes): - for d in dirs[:]: - if d in excludes: - dirs.remove(d) - for f in files: - r, ext = os.path.splitext(f) - if ext in [ ".h", ".c", ".cpp", ".S" ]: - callback( "%s/%s" % (root,f), args ) - -def cleanup_dir(path): - """create a directory if needed, and ensure that it is totally empty - by removing any existing content in it""" - if not os.path.exists(path): - os.mkdir(path) - else: - for root, dirs, files in os.walk(path, topdown=False): - if root.endswith("kernel_headers/"): - # skip 'kernel_headers' - continue - for name in files: - os.remove(os.path.join(root, name)) - for name in dirs: - os.rmdir(os.path.join(root, name)) - -def update_file( path, newdata ): - """update a file on disk, only if its content has changed""" - if os.path.exists( path ): - try: - f = open( path, "r" ) - olddata = f.read() - f.close() - except: - D("update_file: cannot read existing file '%s'" % path) - return 0 - - if oldata == newdata: - D2("update_file: no change to file '%s'" % path ) - return 0 - - update = 1 - else: - try: - create_file_path(path) - except: - D("update_file: cannot create path to '%s'" % path) - return 0 - - f = open( path, "w" ) - f.write( newdata ) - f.close() - - return 1 - - -class BatchFileUpdater: - """a class used to edit several files at once""" - def __init__(self): - self.old_files = set() - self.new_files = set() - self.new_data = {} - - def readFile(self,path): - #path = os.path.realpath(path) - if os.path.exists(path): - self.old_files.add(path) - - def readDir(self,path): - #path = os.path.realpath(path) - for root, dirs, files in os.walk(path): - for f in files: - dst = "%s/%s" % (root,f) - self.old_files.add(dst) - - def editFile(self,dst,data): - """edit a destination file. if the file is not mapped from a source, - it will be added. return 0 if the file content wasn't changed, - 1 if it was edited, or 2 if the file is new""" - #dst = os.path.realpath(dst) - result = 1 - if os.path.exists(dst): - f = open(dst, "r") - olddata = f.read() - f.close() - if olddata == data: - self.old_files.remove(dst) - return 0 - else: - result = 2 - - self.new_data[dst] = data - self.new_files.add(dst) - return result - - def getChanges(self): - """determine changes, returns (adds, deletes, edits)""" - adds = set() - edits = set() - deletes = set() - - for dst in self.new_files: - if not (dst in self.old_files): - adds.add(dst) - else: - edits.add(dst) - - for dst in self.old_files: - if not dst in self.new_files: - deletes.add(dst) - - return (adds, deletes, edits) - - def _writeFile(self,dst,data=None): - if not os.path.exists(os.path.dirname(dst)): - create_file_path(dst) - if data == None: - data = self.new_data[dst] - f = open(dst, "w") - f.write(self.new_data[dst]) - f.close() - - def updateFiles(self): - adds, deletes, edits = self.getChanges() - - for dst in sorted(adds): - self._writeFile(dst) - - for dst in sorted(edits): - self._writeFile(dst) - - for dst in sorted(deletes): - os.remove(dst) - - def updateP4Files(self): - adds, deletes, edits = self.getChanges() - - if len(adds): - files = string.join(sorted(adds)," ") - D( "%d new files will be p4 add-ed" % len(adds) ) - for dst in adds: - self._writeFile(dst) - D2("P4 ADDS: %s" % files) - o = commands.getoutput( "p4 add " + files ) - D2( o ) - - if len(edits): - files = string.join(sorted(edits)," ") - D( "%d files will be p4 edit-ed" % len(edits) ) - D2("P4 EDITS: %s" % files) - o = commands.getoutput( "p4 edit " + files ) - D2( o ) - for dst in edits: - self._writeFile(dst) - - if len(deletes): - files = string.join(sorted(deletes)," ") - D( "%d files will be p4 delete-d" % len(deletes) ) - D2("P4 DELETES: %s" % files) - o = commands.getoutput( "p4 delete " + files ) - D2( o ) diff --git a/libc/netbsd/gethnamaddr.c b/libc/netbsd/gethnamaddr.c deleted file mode 100644 index 1c219b2a2..000000000 --- a/libc/netbsd/gethnamaddr.c +++ /dev/null @@ -1,1210 +0,0 @@ -/* $NetBSD: gethnamaddr.c,v 1.70 2006/03/22 00:03:51 christos Exp $ */ - -/* - * ++Copyright++ 1985, 1988, 1993 - * - - * Copyright (c) 1985, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * - - * --Copyright-- - */ - -#include -#include - -#include -#include -#include -#include -#include "arpa_nameser.h" -#include "resolv_private.h" -#include "resolv_cache.h" -#include -#include -#include -#include -#include -#include -#include - -#ifndef LOG_AUTH -# define LOG_AUTH 0 -#endif - -#define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */ - -#include "nsswitch.h" -#include -#include - -static const char const AskedForGot[] = - "gethostby*.getanswer: asked for \"%s\", got \"%s\""; - -#define MAXPACKET (64*1024) - -typedef union { - HEADER hdr; - u_char buf[MAXPACKET]; -} querybuf; - -typedef union { - int32_t al; - char ac; -} align; - -#ifdef DEBUG -static void dprintf(const char *, res_state, ...) - __attribute__((__format__(__printf__, 1, 3))); -#endif -static struct hostent *getanswer(const querybuf *, int, const char *, int, - res_state); -static void map_v4v6_address(const char *, char *); -static void map_v4v6_hostent(struct hostent *, char **, char *); -static void addrsort(char **, int, res_state); - -void _sethtent(int); -void _endhtent(void); -struct hostent *_gethtent(void); -void ht_sethostent(int); -void ht_endhostent(void); -struct hostent *ht_gethostbyname(char *); -struct hostent *ht_gethostbyaddr(const char *, int, int); -void dns_service(void); -#undef dn_skipname -int dn_skipname(const u_char *, const u_char *); -int _gethtbyaddr(void *, void *, va_list); -int _gethtbyname(void *, void *, va_list); -struct hostent *_gethtbyname2(const char *, int); -int _dns_gethtbyaddr(void *, void *, va_list); -int _dns_gethtbyname(void *, void *, va_list); - -static struct hostent *gethostbyname_internal(const char *, int, res_state); - -static const ns_src default_dns_files[] = { - { NSSRC_FILES, NS_SUCCESS }, - { NSSRC_DNS, NS_SUCCESS }, - { 0, 0 } -}; - - -#ifdef DEBUG -static void -dprintf(const char *msg, res_state res, ...) -{ - assert(msg != NULL); - - if (res->options & RES_DEBUG) { - int save = errno; - va_list ap; - - va_start (ap, res); - vprintf(msg, ap); - va_end (ap); - - errno = save; - } -} -#else -# define dprintf(msg, res, num) ((void)0) /*nada*/ -#endif - -#define BOUNDED_INCR(x) \ - do { \ - cp += (x); \ - if (cp > eom) { \ - h_errno = NO_RECOVERY; \ - return NULL; \ - } \ - } while (/*CONSTCOND*/0) - -#define BOUNDS_CHECK(ptr, count) \ - do { \ - if ((ptr) + (count) > eom) { \ - h_errno = NO_RECOVERY; \ - return NULL; \ - } \ - } while (/*CONSTCOND*/0) - -static struct hostent * -getanswer(const querybuf *answer, int anslen, const char *qname, int qtype, - res_state res) -{ - const HEADER *hp; - const u_char *cp; - int n; - const u_char *eom, *erdata; - char *bp, **ap, **hap, *ep; - int type, class, ancount, qdcount; - int haveanswer, had_error; - int toobig = 0; - char tbuf[MAXDNAME]; - const char *tname; - int (*name_ok)(const char *); - res_static rs = __res_get_static(); - - assert(answer != NULL); - assert(qname != NULL); - - tname = qname; - rs->host.h_name = NULL; - eom = answer->buf + anslen; - switch (qtype) { - case T_A: - case T_AAAA: - name_ok = res_hnok; - break; - case T_PTR: - name_ok = res_dnok; - break; - default: - return NULL; /* XXX should be abort(); */ - } - /* - * find first satisfactory answer - */ - hp = &answer->hdr; - ancount = ntohs(hp->ancount); - qdcount = ntohs(hp->qdcount); - bp = rs->hostbuf; - ep = rs->hostbuf + sizeof rs->hostbuf; - cp = answer->buf; - BOUNDED_INCR(HFIXEDSZ); - if (qdcount != 1) { - h_errno = NO_RECOVERY; - return NULL; - } - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !(*name_ok)(bp)) { - h_errno = NO_RECOVERY; - return NULL; - } - BOUNDED_INCR(n + QFIXEDSZ); - if (qtype == T_A || qtype == T_AAAA) { - /* res_send() has already verified that the query name is the - * same as the one we sent; this just gets the expanded name - * (i.e., with the succeeding search-domain tacked on). - */ - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - h_errno = NO_RECOVERY; - return NULL; - } - rs->host.h_name = bp; - bp += n; - /* The qname can be abbreviated, but h_name is now absolute. */ - qname = rs->host.h_name; - } - ap = rs->host_aliases; - *ap = NULL; - rs->host.h_aliases = rs->host_aliases; - hap = rs->h_addr_ptrs; - *hap = NULL; - rs->host.h_addr_list = rs->h_addr_ptrs; - haveanswer = 0; - had_error = 0; - while (ancount-- > 0 && cp < eom && !had_error) { - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !(*name_ok)(bp)) { - had_error++; - continue; - } - cp += n; /* name */ - BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ); - type = _getshort(cp); - cp += INT16SZ; /* type */ - class = _getshort(cp); - cp += INT16SZ + INT32SZ; /* class, TTL */ - n = _getshort(cp); - cp += INT16SZ; /* len */ - BOUNDS_CHECK(cp, n); - erdata = cp + n; - if (class != C_IN) { - /* XXX - debug? syslog? */ - cp += n; - continue; /* XXX - had_error++ ? */ - } - if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) { - if (ap >= &rs->host_aliases[MAXALIASES-1]) - continue; - n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf); - if ((n < 0) || !(*name_ok)(tbuf)) { - had_error++; - continue; - } - cp += n; - if (cp != erdata) { - h_errno = NO_RECOVERY; - return NULL; - } - /* Store alias. */ - *ap++ = bp; - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - had_error++; - continue; - } - bp += n; - /* Get canonical name. */ - n = strlen(tbuf) + 1; /* for the \0 */ - if (n > ep - bp || n >= MAXHOSTNAMELEN) { - had_error++; - continue; - } - strlcpy(bp, tbuf, (size_t)(ep - bp)); - rs->host.h_name = bp; - bp += n; - continue; - } - if (qtype == T_PTR && type == T_CNAME) { - n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf); - if (n < 0 || !res_dnok(tbuf)) { - had_error++; - continue; - } - cp += n; - if (cp != erdata) { - h_errno = NO_RECOVERY; - return NULL; - } - /* Get canonical name. */ - n = strlen(tbuf) + 1; /* for the \0 */ - if (n > ep - bp || n >= MAXHOSTNAMELEN) { - had_error++; - continue; - } - strlcpy(bp, tbuf, (size_t)(ep - bp)); - tname = bp; - bp += n; - continue; - } - if (type != qtype) { - if (type != T_KEY && type != T_SIG) - syslog(LOG_NOTICE|LOG_AUTH, - "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", - qname, p_class(C_IN), p_type(qtype), - p_type(type)); - cp += n; - continue; /* XXX - had_error++ ? */ - } - switch (type) { - case T_PTR: - if (strcasecmp(tname, bp) != 0) { - syslog(LOG_NOTICE|LOG_AUTH, - AskedForGot, qname, bp); - cp += n; - continue; /* XXX - had_error++ ? */ - } - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !res_hnok(bp)) { - had_error++; - break; - } -#if MULTI_PTRS_ARE_ALIASES - cp += n; - if (cp != erdata) { - h_errno = NO_RECOVERY; - return NULL; - } - if (!haveanswer) - rs->host.h_name = bp; - else if (ap < &rs->host_aliases[MAXALIASES-1]) - *ap++ = bp; - else - n = -1; - if (n != -1) { - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - had_error++; - break; - } - bp += n; - } - break; -#else - rs->host.h_name = bp; - if (res->options & RES_USE_INET6) { - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - had_error++; - break; - } - bp += n; - map_v4v6_hostent(&rs->host, &bp, ep); - } - h_errno = NETDB_SUCCESS; - return &rs->host; -#endif - case T_A: - case T_AAAA: - if (strcasecmp(rs->host.h_name, bp) != 0) { - syslog(LOG_NOTICE|LOG_AUTH, - AskedForGot, rs->host.h_name, bp); - cp += n; - continue; /* XXX - had_error++ ? */ - } - if (n != rs->host.h_length) { - cp += n; - continue; - } - if (type == T_AAAA) { - struct in6_addr in6; - memcpy(&in6, cp, IN6ADDRSZ); - if (IN6_IS_ADDR_V4MAPPED(&in6)) { - cp += n; - continue; - } - } - if (!haveanswer) { - int nn; - - rs->host.h_name = bp; - nn = strlen(bp) + 1; /* for the \0 */ - bp += nn; - } - - bp += sizeof(align) - - (size_t)((u_long)bp % sizeof(align)); - - if (bp + n >= &rs->hostbuf[sizeof rs->hostbuf]) { - dprintf("size (%d) too big\n", res, n); - had_error++; - continue; - } - if (hap >= &rs->h_addr_ptrs[MAXADDRS-1]) { - if (!toobig++) - dprintf("Too many addresses (%d)\n", - res, MAXADDRS); - cp += n; - continue; - } - (void)memcpy(*hap++ = bp, cp, (size_t)n); - bp += n; - cp += n; - if (cp != erdata) { - h_errno = NO_RECOVERY; - return NULL; - } - break; - default: - abort(); - } - if (!had_error) - haveanswer++; - } - if (haveanswer) { - *ap = NULL; - *hap = NULL; - /* - * Note: we sort even if host can take only one address - * in its return structures - should give it the "best" - * address in that case, not some random one - */ - if (res->nsort && haveanswer > 1 && qtype == T_A) - addrsort(rs->h_addr_ptrs, haveanswer, res); - if (!rs->host.h_name) { - n = strlen(qname) + 1; /* for the \0 */ - if (n > ep - bp || n >= MAXHOSTNAMELEN) - goto no_recovery; - strlcpy(bp, qname, (size_t)(ep - bp)); - rs->host.h_name = bp; - bp += n; - } - if (res->options & RES_USE_INET6) - map_v4v6_hostent(&rs->host, &bp, ep); - h_errno = NETDB_SUCCESS; - return &rs->host; - } - no_recovery: - h_errno = NO_RECOVERY; - return NULL; -} - -int -gethostbyname_r(const char *name, struct hostent *hp, char *buf, size_t buflen, - struct hostent**result, int *errorp) -{ - struct hostent *res; - - res = gethostbyname(name); - *errorp = h_errno; - if (res == NULL) { - *result = NULL; - return -1; - } - memcpy(hp, res, sizeof *hp); - *result = hp; - return 0; -} - -struct hostent * -gethostbyname(const char *name) -{ - struct hostent *hp; - res_state res = __res_get_state(); - - if (res == NULL) - return NULL; - - assert(name != NULL); - - if (res->options & RES_USE_INET6) { - hp = gethostbyname_internal(name, AF_INET6, res); - if (hp) { - __res_put_state(res); - return hp; - } - } - hp = gethostbyname_internal(name, AF_INET, res); - __res_put_state(res); - return hp; -} - -struct hostent * -gethostbyname2(const char *name, int af) -{ - struct hostent *hp; - res_state res = __res_get_state(); - - if (res == NULL) - return NULL; - hp = gethostbyname_internal(name, af, res); - __res_put_state(res); - return hp; -} - -static struct hostent * -gethostbyname_internal(const char *name, int af, res_state res) -{ - const char *cp; - char *bp, *ep; - int size; - struct hostent *hp; - struct resolv_cache* cache; - res_static rs = __res_get_static(); - - static const ns_dtab dtab[] = { - NS_FILES_CB(_gethtbyname, NULL) - { NSSRC_DNS, _dns_gethtbyname, NULL }, /* force -DHESIOD */ - { 0, 0, 0 } - }; - - assert(name != NULL); - - switch (af) { - case AF_INET: - size = INADDRSZ; - break; - case AF_INET6: - size = IN6ADDRSZ; - break; - default: - h_errno = NETDB_INTERNAL; - errno = EAFNOSUPPORT; - return NULL; - } - - rs->host.h_addrtype = af; - rs->host.h_length = size; - - /* - * if there aren't any dots, it could be a user-level alias. - * this is also done in res_nquery() since we are not the only - * function that looks up host names. - */ - if (!strchr(name, '.') && (cp = __hostalias(name))) - name = cp; - - /* - * disallow names consisting only of digits/dots, unless - * they end in a dot. - */ - if (isdigit((u_char) name[0])) - for (cp = name;; ++cp) { - if (!*cp) { - if (*--cp == '.') - break; - /* - * All-numeric, no dot at the end. - * Fake up a hostent as if we'd actually - * done a lookup. - */ - if (inet_pton(af, name, - (char *)(void *)rs->host_addr) <= 0) { - h_errno = HOST_NOT_FOUND; - return NULL; - } - strncpy(rs->hostbuf, name, MAXDNAME); - rs->hostbuf[MAXDNAME] = '\0'; - bp = rs->hostbuf + MAXDNAME; - ep = rs->hostbuf + sizeof rs->hostbuf; - rs->host.h_name = rs->hostbuf; - rs->host.h_aliases = rs->host_aliases; - rs->host_aliases[0] = NULL; - rs->h_addr_ptrs[0] = (char *)(void *)rs->host_addr; - rs->h_addr_ptrs[1] = NULL; - rs->host.h_addr_list = rs->h_addr_ptrs; - if (res->options & RES_USE_INET6) - map_v4v6_hostent(&rs->host, &bp, ep); - h_errno = NETDB_SUCCESS; - return &rs->host; - } - if (!isdigit((u_char) *cp) && *cp != '.') - break; - } - if ((isxdigit((u_char) name[0]) && strchr(name, ':') != NULL) || - name[0] == ':') - for (cp = name;; ++cp) { - if (!*cp) { - if (*--cp == '.') - break; - /* - * All-IPv6-legal, no dot at the end. - * Fake up a hostent as if we'd actually - * done a lookup. - */ - if (inet_pton(af, name, - (char *)(void *)rs->host_addr) <= 0) { - h_errno = HOST_NOT_FOUND; - return NULL; - } - strncpy(rs->hostbuf, name, MAXDNAME); - rs->hostbuf[MAXDNAME] = '\0'; - bp = rs->hostbuf + MAXDNAME; - ep = rs->hostbuf + sizeof rs->hostbuf; - rs->host.h_name = rs->hostbuf; - rs->host.h_aliases = rs->host_aliases; - rs->host_aliases[0] = NULL; - rs->h_addr_ptrs[0] = (char *)(void *)rs->host_addr; - rs->h_addr_ptrs[1] = NULL; - rs->host.h_addr_list = rs->h_addr_ptrs; - h_errno = NETDB_SUCCESS; - return &rs->host; - } - if (!isxdigit((u_char) *cp) && *cp != ':' && *cp != '.') - break; - } - - hp = NULL; - h_errno = NETDB_INTERNAL; - if (nsdispatch(&hp, dtab, NSDB_HOSTS, "gethostbyname", - default_dns_files, name, strlen(name), af) != NS_SUCCESS) { - return NULL; - } - h_errno = NETDB_SUCCESS; - return hp; -} - -struct hostent * -gethostbyaddr(const char *addr, /* XXX should have been def'd as u_char! */ - socklen_t len, int af) -{ - const u_char *uaddr = (const u_char *)addr; - socklen_t size; - struct hostent *hp; - static const ns_dtab dtab[] = { - NS_FILES_CB(_gethtbyaddr, NULL) - { NSSRC_DNS, _dns_gethtbyaddr, NULL }, /* force -DHESIOD */ - { 0, 0, 0 } - }; - - assert(addr != NULL); - - if (af == AF_INET6 && len == IN6ADDRSZ && - (IN6_IS_ADDR_LINKLOCAL((const struct in6_addr *)(const void *)uaddr) || - IN6_IS_ADDR_SITELOCAL((const struct in6_addr *)(const void *)uaddr))) { - h_errno = HOST_NOT_FOUND; - return NULL; - } - if (af == AF_INET6 && len == IN6ADDRSZ && - (IN6_IS_ADDR_V4MAPPED((const struct in6_addr *)(const void *)uaddr) || - IN6_IS_ADDR_V4COMPAT((const struct in6_addr *)(const void *)uaddr))) { - /* Unmap. */ - addr += IN6ADDRSZ - INADDRSZ; - uaddr += IN6ADDRSZ - INADDRSZ; - af = AF_INET; - len = INADDRSZ; - } - switch (af) { - case AF_INET: - size = INADDRSZ; - break; - case AF_INET6: - size = IN6ADDRSZ; - break; - default: - errno = EAFNOSUPPORT; - h_errno = NETDB_INTERNAL; - return NULL; - } - if (size != len) { - errno = EINVAL; - h_errno = NETDB_INTERNAL; - return NULL; - } - hp = NULL; - h_errno = NETDB_INTERNAL; - if (nsdispatch(&hp, dtab, NSDB_HOSTS, "gethostbyaddr", - default_dns_files, uaddr, len, af) != NS_SUCCESS) - return NULL; - h_errno = NETDB_SUCCESS; - return hp; -} - -void -_sethtent(int f) -{ - res_static rs = __res_get_static(); - if (rs == NULL) return; - if (!rs->hostf) - rs->hostf = fopen(_PATH_HOSTS, "r" ); - else - rewind(rs->hostf); - rs->stayopen = f; -} - -void -_endhtent(void) -{ - res_static rs = __res_get_static(); - if (rs == NULL) return; - - if (rs->hostf && !rs->stayopen) { - (void) fclose(rs->hostf); - rs->hostf = NULL; - } -} - -struct hostent * -_gethtent(void) -{ - char *p; - char *cp, **q; - int af, len; - res_static rs = __res_get_static(); - - if (!rs->hostf && !(rs->hostf = fopen(_PATH_HOSTS, "r" ))) { - h_errno = NETDB_INTERNAL; - return NULL; - } - again: - if (!(p = fgets(rs->hostbuf, sizeof rs->hostbuf, rs->hostf))) { - h_errno = HOST_NOT_FOUND; - return NULL; - } - if (*p == '#') - goto again; - if (!(cp = strpbrk(p, "#\n"))) - goto again; - *cp = '\0'; - if (!(cp = strpbrk(p, " \t"))) - goto again; - *cp++ = '\0'; - if (inet_pton(AF_INET6, p, (char *)(void *)rs->host_addr) > 0) { - af = AF_INET6; - len = IN6ADDRSZ; - } else if (inet_pton(AF_INET, p, (char *)(void *)rs->host_addr) > 0) { - res_state res = __res_get_state(); - if (res == NULL) - return NULL; - if (res->options & RES_USE_INET6) { - map_v4v6_address((char *)(void *)rs->host_addr, - (char *)(void *)rs->host_addr); - af = AF_INET6; - len = IN6ADDRSZ; - } else { - af = AF_INET; - len = INADDRSZ; - } - __res_put_state(res); - } else { - goto again; - } - /* if this is not something we're looking for, skip it. */ - if (rs->host.h_addrtype != 0 && rs->host.h_addrtype != af) - goto again; - if (rs->host.h_length != 0 && rs->host.h_length != len) - goto again; - rs->h_addr_ptrs[0] = (char *)(void *)rs->host_addr; - rs->h_addr_ptrs[1] = NULL; - rs->host.h_addr_list = rs->h_addr_ptrs; - rs->host.h_length = len; - rs->host.h_addrtype = af; - while (*cp == ' ' || *cp == '\t') - cp++; - rs->host.h_name = cp; - q = rs->host.h_aliases = rs->host_aliases; - if ((cp = strpbrk(cp, " \t")) != NULL) - *cp++ = '\0'; - while (cp && *cp) { - if (*cp == ' ' || *cp == '\t') { - cp++; - continue; - } - if (q < &rs->host_aliases[MAXALIASES - 1]) - *q++ = cp; - if ((cp = strpbrk(cp, " \t")) != NULL) - *cp++ = '\0'; - } - *q = NULL; - h_errno = NETDB_SUCCESS; - return &rs->host; -} - -/*ARGSUSED*/ -int -_gethtbyname(void *rv, void *cb_data, va_list ap) -{ - struct hostent *hp; - const char *name; - int af; - - assert(rv != NULL); - - name = va_arg(ap, char *); - /* NOSTRICT skip len */(void)va_arg(ap, int); - af = va_arg(ap, int); - - hp = NULL; -#if 0 - { - res_state res = __res_get_state(); - if (res == NULL) - return NS_NOTFOUND; - if (res->options & RES_USE_INET6) - hp = _gethtbyname2(name, AF_INET6); - if (hp==NULL) - hp = _gethtbyname2(name, AF_INET); - __res_put_state(res); - } -#else - hp = _gethtbyname2(name, af); -#endif - *((struct hostent **)rv) = hp; - if (hp == NULL) { - h_errno = HOST_NOT_FOUND; - return NS_NOTFOUND; - } - return NS_SUCCESS; -} - -struct hostent * -_gethtbyname2(const char *name, int af) -{ - struct hostent *p; - char *tmpbuf, *ptr, **cp; - int num; - size_t len; - res_static rs = __res_get_static(); - - assert(name != NULL); - - _sethtent(rs->stayopen); - ptr = tmpbuf = NULL; - num = 0; - while ((p = _gethtent()) != NULL && num < MAXADDRS) { - if (p->h_addrtype != af) - continue; - if (strcasecmp(p->h_name, name) != 0) { - for (cp = p->h_aliases; *cp != NULL; cp++) - if (strcasecmp(*cp, name) == 0) - break; - if (*cp == NULL) continue; - } - - if (num == 0) { - size_t bufsize; - char *src; - - bufsize = strlen(p->h_name) + 2 + - MAXADDRS * p->h_length + - ALIGNBYTES; - for (cp = p->h_aliases; *cp != NULL; cp++) - bufsize += strlen(*cp) + 1; - - if ((tmpbuf = malloc(bufsize)) == NULL) { - h_errno = NETDB_INTERNAL; - return NULL; - } - - ptr = tmpbuf; - src = p->h_name; - while ((*ptr++ = *src++) != '\0'); - for (cp = p->h_aliases; *cp != NULL; cp++) { - src = *cp; - while ((*ptr++ = *src++) != '\0'); - } - *ptr++ = '\0'; - - ptr = (char *)(void *)ALIGN(ptr); - } - - (void)memcpy(ptr, p->h_addr_list[0], (size_t)p->h_length); - ptr += p->h_length; - num++; - } - _endhtent(); - if (num == 0) return NULL; - - len = ptr - tmpbuf; - if (len > (sizeof(rs->hostbuf) - ALIGNBYTES)) { - free(tmpbuf); - errno = ENOSPC; - h_errno = NETDB_INTERNAL; - return NULL; - } - ptr = memcpy((void *)ALIGN(rs->hostbuf), tmpbuf, len); - free(tmpbuf); - - rs->host.h_name = ptr; - while (*ptr++); - - cp = rs->host_aliases; - while (*ptr) { - *cp++ = ptr; - while (*ptr++); - } - ptr++; - *cp = NULL; - - ptr = (char *)(void *)ALIGN(ptr); - cp = rs->h_addr_ptrs; - while (num--) { - *cp++ = ptr; - ptr += rs->host.h_length; - } - *cp = NULL; - - return &rs->host; -} - -/*ARGSUSED*/ -int -_gethtbyaddr(void *rv, void *cb_data, va_list ap) -{ - struct hostent *p; - const unsigned char *addr; - int len, af; - res_static rs = __res_get_static(); - - assert(rv != NULL); - - addr = va_arg(ap, unsigned char *); - len = va_arg(ap, int); - af = va_arg(ap, int); - - rs->host.h_length = len; - rs->host.h_addrtype = af; - - _sethtent(rs->stayopen); - while ((p = _gethtent()) != NULL) - if (p->h_addrtype == af && !memcmp(p->h_addr, addr, - (size_t)len)) - break; - _endhtent(); - *((struct hostent **)rv) = p; - if (p==NULL) { - h_errno = HOST_NOT_FOUND; - return NS_NOTFOUND; - } - return NS_SUCCESS; -} - -static void -map_v4v6_address(const char *src, char *dst) -{ - u_char *p = (u_char *)dst; - char tmp[INADDRSZ]; - int i; - - assert(src != NULL); - assert(dst != NULL); - - /* Stash a temporary copy so our caller can update in place. */ - (void)memcpy(tmp, src, INADDRSZ); - /* Mark this ipv6 addr as a mapped ipv4. */ - for (i = 0; i < 10; i++) - *p++ = 0x00; - *p++ = 0xff; - *p++ = 0xff; - /* Retrieve the saved copy and we're done. */ - (void)memcpy((void *)p, tmp, INADDRSZ); -} - -static void -map_v4v6_hostent(struct hostent *hp, char **bpp, char *ep) -{ - char **ap; - - assert(hp != NULL); - assert(bpp != NULL); - assert(ep != NULL); - - if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ) - return; - hp->h_addrtype = AF_INET6; - hp->h_length = IN6ADDRSZ; - for (ap = hp->h_addr_list; *ap; ap++) { - int i = sizeof(align) - (size_t)((u_long)*bpp % sizeof(align)); - - if (ep - *bpp < (i + IN6ADDRSZ)) { - /* Out of memory. Truncate address list here. XXX */ - *ap = NULL; - return; - } - *bpp += i; - map_v4v6_address(*ap, *bpp); - *ap = *bpp; - *bpp += IN6ADDRSZ; - } -} - -static void -addrsort(char **ap, int num, res_state res) -{ - int i, j; - char **p; - short aval[MAXADDRS]; - int needsort = 0; - - assert(ap != NULL); - - p = ap; - for (i = 0; i < num; i++, p++) { - for (j = 0 ; (unsigned)j < res->nsort; j++) - if (res->sort_list[j].addr.s_addr == - (((struct in_addr *)(void *)(*p))->s_addr & - res->sort_list[j].mask)) - break; - aval[i] = j; - if (needsort == 0 && i > 0 && j < aval[i-1]) - needsort = i; - } - if (!needsort) - return; - - while (needsort < num) { - for (j = needsort - 1; j >= 0; j--) { - if (aval[j] > aval[j+1]) { - char *hp; - - i = aval[j]; - aval[j] = aval[j+1]; - aval[j+1] = i; - - hp = ap[j]; - ap[j] = ap[j+1]; - ap[j+1] = hp; - } else - break; - } - needsort++; - } -} - -struct hostent * -gethostent(void) -{ - res_static rs = __res_get_static(); - rs->host.h_addrtype = 0; - rs->host.h_length = 0; - return _gethtent(); -} - -/*ARGSUSED*/ -int -_dns_gethtbyname(void *rv, void *cb_data, va_list ap) -{ - querybuf *buf; - int n, type; - struct hostent *hp; - const char *name; - int af; - res_state res; - - assert(rv != NULL); - - name = va_arg(ap, char *); - /* NOSTRICT skip len */(void)va_arg(ap, int); - af = va_arg(ap, int); - - switch (af) { - case AF_INET: - type = T_A; - break; - case AF_INET6: - type = T_AAAA; - break; - default: - return NS_UNAVAIL; - } - buf = malloc(sizeof(*buf)); - if (buf == NULL) { - h_errno = NETDB_INTERNAL; - return NS_NOTFOUND; - } - res = __res_get_state(); - if (res == NULL) { - free(buf); - return NS_NOTFOUND; - } - n = res_nsearch(res, name, C_IN, type, buf->buf, sizeof(buf->buf)); - if (n < 0) { - free(buf); - dprintf("res_nsearch failed (%d)\n", res, n); - __res_put_state(res); - return NS_NOTFOUND; - } - hp = getanswer(buf, n, name, type, res); - free(buf); - __res_put_state(res); - if (hp == NULL) - switch (h_errno) { - case HOST_NOT_FOUND: - return NS_NOTFOUND; - case TRY_AGAIN: - return NS_TRYAGAIN; - default: - return NS_UNAVAIL; - } - *((struct hostent **)rv) = hp; - return NS_SUCCESS; -} - -/*ARGSUSED*/ -int -_dns_gethtbyaddr(void *rv, void *cb_data, va_list ap) -{ - char qbuf[MAXDNAME + 1], *qp, *ep; - int n; - querybuf *buf; - struct hostent *hp; - const unsigned char *uaddr; - int len, af, advance; - res_state res; - res_static rs = __res_get_static(); - - assert(rv != NULL); - - uaddr = va_arg(ap, unsigned char *); - len = va_arg(ap, int); - af = va_arg(ap, int); - - switch (af) { - case AF_INET: - (void)snprintf(qbuf, sizeof(qbuf), "%u.%u.%u.%u.in-addr.arpa", - (uaddr[3] & 0xff), (uaddr[2] & 0xff), - (uaddr[1] & 0xff), (uaddr[0] & 0xff)); - break; - - case AF_INET6: - qp = qbuf; - ep = qbuf + sizeof(qbuf) - 1; - for (n = IN6ADDRSZ - 1; n >= 0; n--) { - advance = snprintf(qp, (size_t)(ep - qp), "%x.%x.", - uaddr[n] & 0xf, - ((unsigned int)uaddr[n] >> 4) & 0xf); - if (advance > 0 && qp + advance < ep) - qp += advance; - else { - h_errno = NETDB_INTERNAL; - return NS_NOTFOUND; - } - } - if (strlcat(qbuf, "ip6.arpa", sizeof(qbuf)) >= sizeof(qbuf)) { - h_errno = NETDB_INTERNAL; - return NS_NOTFOUND; - } - break; - default: - abort(); - } - - buf = malloc(sizeof(*buf)); - if (buf == NULL) { - h_errno = NETDB_INTERNAL; - return NS_NOTFOUND; - } - res = __res_get_state(); - if (res == NULL) { - free(buf); - return NS_NOTFOUND; - } - n = res_nquery(res, qbuf, C_IN, T_PTR, buf->buf, sizeof(buf->buf)); - if (n < 0) { - free(buf); - dprintf("res_nquery failed (%d)\n", res, n); - __res_put_state(res); - return NS_NOTFOUND; - } - hp = getanswer(buf, n, qbuf, T_PTR, res); - free(buf); - if (hp == NULL) { - __res_put_state(res); - switch (h_errno) { - case HOST_NOT_FOUND: - return NS_NOTFOUND; - case TRY_AGAIN: - return NS_TRYAGAIN; - default: - return NS_UNAVAIL; - } - } - hp->h_addrtype = af; - hp->h_length = len; - (void)memcpy(rs->host_addr, uaddr, (size_t)len); - rs->h_addr_ptrs[0] = (char *)(void *)rs->host_addr; - rs->h_addr_ptrs[1] = NULL; - if (af == AF_INET && (res->options & RES_USE_INET6)) { - map_v4v6_address((char *)(void *)rs->host_addr, - (char *)(void *)rs->host_addr); - hp->h_addrtype = AF_INET6; - hp->h_length = IN6ADDRSZ; - } - - __res_put_state(res); - *((struct hostent **)rv) = hp; - h_errno = NETDB_SUCCESS; - return NS_SUCCESS; -} diff --git a/libc/netbsd/inet/nsap_addr.c b/libc/netbsd/inet/nsap_addr.c deleted file mode 100644 index e18bd33fe..000000000 --- a/libc/netbsd/inet/nsap_addr.c +++ /dev/null @@ -1,121 +0,0 @@ -/* $NetBSD: nsap_addr.c,v 1.2 2004/05/20 23:12:33 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static const char rcsid[] = "Id: nsap_addr.c,v 1.2.206.1 2004/03/09 08:33:33 marka Exp"; -#else -__RCSID("$NetBSD: nsap_addr.c,v 1.2 2004/05/20 23:12:33 christos Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include - -#include -#include -#include "arpa_nameser.h" - -#include -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif - -static char -xtob(int c) { - return (c - (((c >= '0') && (c <= '9')) ? '0' : '7')); -} - -u_int -inet_nsap_addr(const char *ascii, u_char *binary, int maxlen) { - u_char c, nib; - u_int len = 0; - - assert(ascii != NULL); - assert(binary != NULL); - - if (ascii[0] != '0' || (ascii[1] != 'x' && ascii[1] != 'X')) - return (0); - ascii += 2; - - while ((c = *ascii++) != '\0' && len < (u_int)maxlen) { - if (c == '.' || c == '+' || c == '/') - continue; - if (!isascii(c)) - return (0); - if (islower(c)) - c = toupper(c); - if (isxdigit(c)) { - nib = xtob(c); - c = *ascii++; - if (c != '\0') { - c = toupper(c); - if (isxdigit(c)) { - *binary++ = (nib << 4) | xtob(c); - len++; - } else - return (0); - } - else - return (0); - } - else - return (0); - } - return (len); -} - -char * -inet_nsap_ntoa(int binlen, const u_char *binary, char *ascii) { - int nib; - int i; - static char tmpbuf[2+255*3]; - char *start; - - assert(binary != NULL); - - if (ascii) - start = ascii; - else { - ascii = tmpbuf; - start = tmpbuf; - } - - *ascii++ = '0'; - *ascii++ = 'x'; - - if (binlen > 255) - binlen = 255; - - for (i = 0; i < binlen; i++) { - nib = (u_int32_t)*binary >> 4; - *ascii++ = nib + (nib < 10 ? '0' : '7'); - nib = *binary++ & 0x0f; - *ascii++ = nib + (nib < 10 ? '0' : '7'); - if (((i % 2) == 0 && (i + 1) < binlen)) - *ascii++ = '.'; - } - *ascii = '\0'; - return (start); -} diff --git a/libc/netbsd/isc/ev_streams.c b/libc/netbsd/isc/ev_streams.c deleted file mode 100644 index aeecc3e14..000000000 --- a/libc/netbsd/isc/ev_streams.c +++ /dev/null @@ -1,311 +0,0 @@ -/* $NetBSD: ev_streams.c,v 1.2 2004/05/20 19:52:31 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996-1999 by Internet Software Consortium - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* ev_streams.c - implement asynch stream file IO for the eventlib - * vix 04mar96 [initial] - */ - -#include -#if !defined(LINT) && !defined(CODECENTER) && !defined(lint) -#ifdef notdef -static const char rcsid[] = "Id: ev_streams.c,v 1.2.206.2 2004/03/17 00:29:51 marka Exp"; -#else -__RCSID("$NetBSD: ev_streams.c,v 1.2 2004/05/20 19:52:31 christos Exp $"); -#endif -#endif - -#include -#include - -#include - -#include -#include "eventlib_p.h" - -#ifndef _LIBC -static int copyvec(evStream *str, const struct iovec *iov, int iocnt); -static void consume(evStream *str, size_t bytes); -static void done(evContext opaqueCtx, evStream *str); -static void writable(evContext opaqueCtx, void *uap, int fd, int evmask); -static void readable(evContext opaqueCtx, void *uap, int fd, int evmask); -#endif - -struct iovec -evConsIovec(void *buf, size_t cnt) { - struct iovec ret; - - memset(&ret, 0xf5, sizeof ret); - ret.iov_base = buf; - ret.iov_len = cnt; - return (ret); -} - -#ifndef _LIBC -int -evWrite(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt, - evStreamFunc func, void *uap, evStreamID *id) -{ - evContext_p *ctx = opaqueCtx.opaque; - evStream *new; - int save; - - OKNEW(new); - new->func = func; - new->uap = uap; - new->fd = fd; - new->flags = 0; - if (evSelectFD(opaqueCtx, fd, EV_WRITE, writable, new, &new->file) < 0) - goto free; - if (copyvec(new, iov, iocnt) < 0) - goto free; - new->prevDone = NULL; - new->nextDone = NULL; - if (ctx->streams != NULL) - ctx->streams->prev = new; - new->prev = NULL; - new->next = ctx->streams; - ctx->streams = new; - if (id != NULL) - id->opaque = new; - return (0); - free: - save = errno; - FREE(new); - errno = save; - return (-1); -} - -int -evRead(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt, - evStreamFunc func, void *uap, evStreamID *id) -{ - evContext_p *ctx = opaqueCtx.opaque; - evStream *new; - int save; - - OKNEW(new); - new->func = func; - new->uap = uap; - new->fd = fd; - new->flags = 0; - if (evSelectFD(opaqueCtx, fd, EV_READ, readable, new, &new->file) < 0) - goto free; - if (copyvec(new, iov, iocnt) < 0) - goto free; - new->prevDone = NULL; - new->nextDone = NULL; - if (ctx->streams != NULL) - ctx->streams->prev = new; - new->prev = NULL; - new->next = ctx->streams; - ctx->streams = new; - if (id) - id->opaque = new; - return (0); - free: - save = errno; - FREE(new); - errno = save; - return (-1); -} - -int -evTimeRW(evContext opaqueCtx, evStreamID id, evTimerID timer) /*ARGSUSED*/ { - evStream *str = id.opaque; - - UNUSED(opaqueCtx); - - str->timer = timer; - str->flags |= EV_STR_TIMEROK; - return (0); -} - -int -evUntimeRW(evContext opaqueCtx, evStreamID id) /*ARGSUSED*/ { - evStream *str = id.opaque; - - UNUSED(opaqueCtx); - - str->flags &= ~EV_STR_TIMEROK; - return (0); -} - -int -evCancelRW(evContext opaqueCtx, evStreamID id) { - evContext_p *ctx = opaqueCtx.opaque; - evStream *old = id.opaque; - - /* - * The streams list is doubly threaded. First, there's ctx->streams - * that's used by evDestroy() to find and cancel all streams. Second, - * there's ctx->strDone (head) and ctx->strLast (tail) which thread - * through the potentially smaller number of "IO completed" streams, - * used in evGetNext() to avoid scanning the entire list. - */ - - /* Unlink from ctx->streams. */ - if (old->prev != NULL) - old->prev->next = old->next; - else - ctx->streams = old->next; - if (old->next != NULL) - old->next->prev = old->prev; - - /* - * If 'old' is on the ctx->strDone list, remove it. Update - * ctx->strLast if necessary. - */ - if (old->prevDone == NULL && old->nextDone == NULL) { - /* - * Either 'old' is the only item on the done list, or it's - * not on the done list. If the former, then we unlink it - * from the list. If the latter, we leave the list alone. - */ - if (ctx->strDone == old) { - ctx->strDone = NULL; - ctx->strLast = NULL; - } - } else { - if (old->prevDone != NULL) - old->prevDone->nextDone = old->nextDone; - else - ctx->strDone = old->nextDone; - if (old->nextDone != NULL) - old->nextDone->prevDone = old->prevDone; - else - ctx->strLast = old->prevDone; - } - - /* Deallocate the stream. */ - if (old->file.opaque) - evDeselectFD(opaqueCtx, old->file); - memput(old->iovOrig, sizeof (struct iovec) * old->iovOrigCount); - FREE(old); - return (0); -} - -/* Copy a scatter/gather vector and initialize a stream handler's IO. */ -static int -copyvec(evStream *str, const struct iovec *iov, int iocnt) { - int i; - - str->iovOrig = (struct iovec *)memget(sizeof(struct iovec) * iocnt); - if (str->iovOrig == NULL) { - errno = ENOMEM; - return (-1); - } - str->ioTotal = 0; - for (i = 0; i < iocnt; i++) { - str->iovOrig[i] = iov[i]; - str->ioTotal += iov[i].iov_len; - } - str->iovOrigCount = iocnt; - str->iovCur = str->iovOrig; - str->iovCurCount = str->iovOrigCount; - str->ioDone = 0; - return (0); -} - -/* Pull off or truncate lead iovec(s). */ -static void -consume(evStream *str, size_t bytes) { - while (bytes > 0U) { - if (bytes < (size_t)str->iovCur->iov_len) { - str->iovCur->iov_len -= bytes; - str->iovCur->iov_base = (void *) - ((u_char *)str->iovCur->iov_base + bytes); - str->ioDone += bytes; - bytes = 0; - } else { - bytes -= str->iovCur->iov_len; - str->ioDone += str->iovCur->iov_len; - str->iovCur++; - str->iovCurCount--; - } - } -} - -/* Add a stream to Done list and deselect the FD. */ -static void -done(evContext opaqueCtx, evStream *str) { - evContext_p *ctx = opaqueCtx.opaque; - - if (ctx->strLast != NULL) { - str->prevDone = ctx->strLast; - ctx->strLast->nextDone = str; - ctx->strLast = str; - } else { - INSIST(ctx->strDone == NULL); - ctx->strDone = ctx->strLast = str; - } - evDeselectFD(opaqueCtx, str->file); - str->file.opaque = NULL; - /* evDrop() will call evCancelRW() on us. */ -} - -/* Dribble out some bytes on the stream. (Called by evDispatch().) */ -static void -writable(evContext opaqueCtx, void *uap, int fd, int evmask) { - evStream *str = uap; - int bytes; - - UNUSED(evmask); - - bytes = writev(fd, str->iovCur, str->iovCurCount); - if (bytes > 0) { - if ((str->flags & EV_STR_TIMEROK) != 0) - evTouchIdleTimer(opaqueCtx, str->timer); - consume(str, bytes); - } else { - if (bytes < 0 && errno != EINTR) { - str->ioDone = -1; - str->ioErrno = errno; - } - } - if (str->ioDone == -1 || str->ioDone == str->ioTotal) - done(opaqueCtx, str); -} - -/* Scoop up some bytes from the stream. (Called by evDispatch().) */ -static void -readable(evContext opaqueCtx, void *uap, int fd, int evmask) { - evStream *str = uap; - int bytes; - - UNUSED(evmask); - - bytes = readv(fd, str->iovCur, str->iovCurCount); - if (bytes > 0) { - if ((str->flags & EV_STR_TIMEROK) != 0) - evTouchIdleTimer(opaqueCtx, str->timer); - consume(str, bytes); - } else { - if (bytes == 0) - str->ioDone = 0; - else { - if (errno != EINTR) { - str->ioDone = -1; - str->ioErrno = errno; - } - } - } - if (str->ioDone <= 0 || str->ioDone == str->ioTotal) - done(opaqueCtx, str); -} -#endif diff --git a/libc/netbsd/isc/ev_timers.c b/libc/netbsd/isc/ev_timers.c deleted file mode 100644 index 967468768..000000000 --- a/libc/netbsd/isc/ev_timers.c +++ /dev/null @@ -1,504 +0,0 @@ -/* $NetBSD: ev_timers.c,v 1.2 2004/05/20 19:52:31 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1995-1999 by Internet Software Consortium - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* ev_timers.c - implement timers for the eventlib - * vix 09sep95 [initial] - */ - -#include -#if !defined(LINT) && !defined(CODECENTER) && !defined(lint) -#ifdef notdef -static const char rcsid[] = "Id: ev_timers.c,v 1.2.2.1.4.5 2004/03/17 02:39:13 marka Exp"; -#else -__RCSID("$NetBSD: ev_timers.c,v 1.2 2004/05/20 19:52:31 christos Exp $"); -#endif -#endif - -/* Import. */ - -#include - -#include -#include -#include "eventlib_p.h" - -/* Constants. */ - -#define MILLION 1000000 -#define BILLION 1000000000 - -/* Forward. */ - -#ifndef _LIBC -static int due_sooner(void *, void *); -static void set_index(void *, int); -static void free_timer(void *, void *); -static void print_timer(void *, void *); -static void idle_timeout(evContext, void *, struct timespec, struct timespec); - -/* Private type. */ - -typedef struct { - evTimerFunc func; - void * uap; - struct timespec lastTouched; - struct timespec max_idle; - evTimer * timer; -} idle_timer; -#endif - -/* Public. */ - -struct timespec -evConsTime(time_t sec, long nsec) { - struct timespec x; - - x.tv_sec = sec; - x.tv_nsec = nsec; - return (x); -} - -struct timespec -evAddTime(struct timespec addend1, struct timespec addend2) { - struct timespec x; - - x.tv_sec = addend1.tv_sec + addend2.tv_sec; - x.tv_nsec = addend1.tv_nsec + addend2.tv_nsec; - if (x.tv_nsec >= BILLION) { - x.tv_sec++; - x.tv_nsec -= BILLION; - } - return (x); -} - -struct timespec -evSubTime(struct timespec minuend, struct timespec subtrahend) { - struct timespec x; - - x.tv_sec = minuend.tv_sec - subtrahend.tv_sec; - if (minuend.tv_nsec >= subtrahend.tv_nsec) - x.tv_nsec = minuend.tv_nsec - subtrahend.tv_nsec; - else { - x.tv_nsec = BILLION - subtrahend.tv_nsec + minuend.tv_nsec; - x.tv_sec--; - } - return (x); -} - -int -evCmpTime(struct timespec a, struct timespec b) { - long x = a.tv_sec - b.tv_sec; - - if (x == 0L) - x = a.tv_nsec - b.tv_nsec; - return (x < 0L ? (-1) : x > 0L ? (1) : (0)); -} - -struct timespec -evNowTime() { - struct timeval now; -#ifdef CLOCK_REALTIME - struct timespec tsnow; - int m = CLOCK_REALTIME; - -#ifdef CLOCK_MONOTONIC - if (__evOptMonoTime) - m = CLOCK_MONOTONIC; -#endif - if (clock_gettime(m, &tsnow) == 0) - return (tsnow); -#endif - if (gettimeofday(&now, NULL) < 0) - return (evConsTime(0L, 0L)); - return (evTimeSpec(now)); -} - -struct timespec -evUTCTime(void) { - struct timeval now; -#ifdef CLOCK_REALTIME - struct timespec tsnow; - if (clock_gettime(CLOCK_REALTIME, &tsnow) == 0) - return (tsnow); -#endif - if (gettimeofday(&now, NULL) < 0) - return (evConsTime(0L, 0L)); - return (evTimeSpec(now)); -} - -#ifndef _LIBC -struct timespec -evLastEventTime(evContext opaqueCtx) { - evContext_p *ctx = opaqueCtx.opaque; - - return (ctx->lastEventTime); -} -#endif - -struct timespec -evTimeSpec(struct timeval tv) { - struct timespec ts; - - ts.tv_sec = tv.tv_sec; - ts.tv_nsec = tv.tv_usec * 1000; - return (ts); -} - -struct timeval -evTimeVal(struct timespec ts) { - struct timeval tv; - - tv.tv_sec = ts.tv_sec; - tv.tv_usec = ts.tv_nsec / 1000; - return (tv); -} - -#ifndef _LIBC -int -evSetTimer(evContext opaqueCtx, - evTimerFunc func, - void *uap, - struct timespec due, - struct timespec inter, - evTimerID *opaqueID -) { - evContext_p *ctx = opaqueCtx.opaque; - evTimer *id; - - printf("evSetTimer(ctx %p, func %p, uap %p, due %ld.%09ld, inter %ld.%09ld)\n", - ctx, func, uap, - (long)due.tv_sec, due.tv_nsec, - (long)inter.tv_sec, inter.tv_nsec); - -#ifdef __hpux - /* - * tv_sec and tv_nsec are unsigned. - */ - if (due.tv_nsec >= BILLION) - EV_ERR(EINVAL); - - if (inter.tv_nsec >= BILLION) - EV_ERR(EINVAL); -#else - if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION) - EV_ERR(EINVAL); - - if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION) - EV_ERR(EINVAL); -#endif - - /* due={0,0} is a magic cookie meaning "now." */ - if (due.tv_sec == (time_t)0 && due.tv_nsec == 0L) - due = evNowTime(); - - /* Allocate and fill. */ - OKNEW(id); - id->func = func; - id->uap = uap; - id->due = due; - id->inter = inter; - - if (heap_insert(ctx->timers, id) < 0) - return (-1); - - /* Remember the ID if the caller provided us a place for it. */ - if (opaqueID) - opaqueID->opaque = id; - - if (ctx->debug > 7) { - printf("timers after evSetTimer:\n"); - (void) heap_for_each(ctx->timers, print_timer, (void *)ctx); - } - - return (0); -} - -int -evClearTimer(evContext opaqueCtx, evTimerID id) { - evContext_p *ctx = opaqueCtx.opaque; - evTimer *del = id.opaque; - - if (ctx->cur != NULL && - ctx->cur->type == Timer && - ctx->cur->u.timer.this == del) { - printf("deferring delete of timer (executing)\n"); - /* - * Setting the interval to zero ensures that evDrop() will - * clean up the timer. - */ - del->inter = evConsTime(0, 0); - return (0); - } - - if (heap_element(ctx->timers, del->index) != del) - EV_ERR(ENOENT); - - if (heap_delete(ctx->timers, del->index) < 0) - return (-1); - FREE(del); - - if (ctx->debug > 7) { - printf("timers after evClearTimer:\n"); - (void) heap_for_each(ctx->timers, print_timer, (void *)ctx); - } - - return (0); -} - -int -evConfigTimer(evContext opaqueCtx, - evTimerID id, - const char *param, - int value -) { - evContext_p *ctx = opaqueCtx.opaque; - evTimer *timer = id.opaque; - int result=0; - - UNUSED(value); - - if (heap_element(ctx->timers, timer->index) != timer) - EV_ERR(ENOENT); - - if (strcmp(param, "rate") == 0) - timer->mode |= EV_TMR_RATE; - else if (strcmp(param, "interval") == 0) - timer->mode &= ~EV_TMR_RATE; - else - EV_ERR(EINVAL); - - return (result); -} - -int -evResetTimer(evContext opaqueCtx, - evTimerID id, - evTimerFunc func, - void *uap, - struct timespec due, - struct timespec inter -) { - evContext_p *ctx = opaqueCtx.opaque; - evTimer *timer = id.opaque; - struct timespec old_due; - int result=0; - - if (heap_element(ctx->timers, timer->index) != timer) - EV_ERR(ENOENT); - -#ifdef __hpux - /* - * tv_sec and tv_nsec are unsigned. - */ - if (due.tv_nsec >= BILLION) - EV_ERR(EINVAL); - - if (inter.tv_nsec >= BILLION) - EV_ERR(EINVAL); -#else - if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION) - EV_ERR(EINVAL); - - if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION) - EV_ERR(EINVAL); -#endif - - old_due = timer->due; - - timer->func = func; - timer->uap = uap; - timer->due = due; - timer->inter = inter; - - switch (evCmpTime(due, old_due)) { - case -1: - result = heap_increased(ctx->timers, timer->index); - break; - case 0: - result = 0; - break; - case 1: - result = heap_decreased(ctx->timers, timer->index); - break; - } - - if (ctx->debug > 7) { - printf("timers after evResetTimer:\n"); - (void) heap_for_each(ctx->timers, print_timer, (void *)ctx); - } - - return (result); -} - -int -evSetIdleTimer(evContext opaqueCtx, - evTimerFunc func, - void *uap, - struct timespec max_idle, - evTimerID *opaqueID -) { - evContext_p *ctx = opaqueCtx.opaque; - idle_timer *tt; - - /* Allocate and fill. */ - OKNEW(tt); - tt->func = func; - tt->uap = uap; - tt->lastTouched = ctx->lastEventTime; - tt->max_idle = max_idle; - - if (evSetTimer(opaqueCtx, idle_timeout, tt, - evAddTime(ctx->lastEventTime, max_idle), - max_idle, opaqueID) < 0) { - FREE(tt); - return (-1); - } - - tt->timer = opaqueID->opaque; - - return (0); -} - -int -evClearIdleTimer(evContext opaqueCtx, evTimerID id) { - evTimer *del = id.opaque; - idle_timer *tt = del->uap; - - FREE(tt); - return (evClearTimer(opaqueCtx, id)); -} - -int -evResetIdleTimer(evContext opaqueCtx, - evTimerID opaqueID, - evTimerFunc func, - void *uap, - struct timespec max_idle -) { - evContext_p *ctx = opaqueCtx.opaque; - evTimer *timer = opaqueID.opaque; - idle_timer *tt = timer->uap; - - tt->func = func; - tt->uap = uap; - tt->lastTouched = ctx->lastEventTime; - tt->max_idle = max_idle; - - return (evResetTimer(opaqueCtx, opaqueID, idle_timeout, tt, - evAddTime(ctx->lastEventTime, max_idle), - max_idle)); -} - -int -evTouchIdleTimer(evContext opaqueCtx, evTimerID id) { - evContext_p *ctx = opaqueCtx.opaque; - evTimer *t = id.opaque; - idle_timer *tt = t->uap; - - tt->lastTouched = ctx->lastEventTime; - - return (0); -} - -/* Public to the rest of eventlib. */ - -heap_context -evCreateTimers(const evContext_p *ctx) { - - UNUSED(ctx); - - return (heap_new(due_sooner, set_index, 2048)); -} - -void -evDestroyTimers(const evContext_p *ctx) { - (void) heap_for_each(ctx->timers, free_timer, NULL); - (void) heap_free(ctx->timers); -} - -/* Private. */ - -static int -due_sooner(void *a, void *b) { - evTimer *a_timer, *b_timer; - - a_timer = a; - b_timer = b; - return (evCmpTime(a_timer->due, b_timer->due) < 0); -} - -static void -set_index(void *what, int idx) { - evTimer *timer; - - timer = what; - timer->index = idx; -} - -static void -free_timer(void *what, void *uap) { - evTimer *t = what; - - UNUSED(uap); - - FREE(t); -} - -static void -print_timer(void *what, void *uap) { - evTimer *cur = what; - evContext_p *ctx = uap; - - cur = what; - evPrintf(ctx, 7, - " func %p, uap %p, due %ld.%09ld, inter %ld.%09ld\n", - cur->func, cur->uap, - (long)cur->due.tv_sec, cur->due.tv_nsec, - (long)cur->inter.tv_sec, cur->inter.tv_nsec); -} - -static void -idle_timeout(evContext opaqueCtx, - void *uap, - struct timespec due, - struct timespec inter -) { - evContext_p *ctx = opaqueCtx.opaque; - idle_timer *this = uap; - struct timespec idle; - - UNUSED(due); - UNUSED(inter); - - idle = evSubTime(ctx->lastEventTime, this->lastTouched); - if (evCmpTime(idle, this->max_idle) >= 0) { - (this->func)(opaqueCtx, this->uap, this->timer->due, - this->max_idle); - /* - * Setting the interval to zero will cause the timer to - * be cleaned up in evDrop(). - */ - this->timer->inter = evConsTime(0L, 0L); - FREE(this); - } else { - /* evDrop() will reschedule the timer. */ - this->timer->inter = evSubTime(this->max_idle, idle); - } -} -#endif diff --git a/libc/netbsd/isc/eventlib_p.h b/libc/netbsd/isc/eventlib_p.h deleted file mode 100644 index 7edc5a0d3..000000000 --- a/libc/netbsd/isc/eventlib_p.h +++ /dev/null @@ -1,233 +0,0 @@ -/* $NetBSD: eventlib_p.h,v 1.1.1.1 2004/05/20 19:34:32 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1995-1999 by Internet Software Consortium - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* eventlib_p.h - private interfaces for eventlib - * vix 09sep95 [initial] - * - * Id: eventlib_p.h,v 1.3.2.1.4.1 2004/03/09 08:33:43 marka Exp - */ - -#ifndef _EVENTLIB_P_H -#define _EVENTLIB_P_H - -#include -#include -#include -#include -#include - -#define EVENTLIB_DEBUG 1 - -#include -#include -#include -#include -#include - -#include -#include -#include - - -#define EV_MASK_ALL (EV_READ | EV_WRITE | EV_EXCEPT) -#define EV_ERR(e) return (errno = (e), -1) -#define OK(x) if ((x) < 0) EV_ERR(errno); else (void)NULL - - -#if HAVE_MEM_GET_SET -#define NEW(p) if (((p) = memget(sizeof *(p))) != NULL) \ - FILL(p); \ - else \ - (void)NULL; -#define OKNEW(p) if (!((p) = memget(sizeof *(p)))) { \ - errno = ENOMEM; \ - return (-1); \ - } else \ - FILL(p) -#define FREE(p) memput((p), sizeof *(p)) - -#if EVENTLIB_DEBUG -#define FILL(p) memset((p), 0xF5, sizeof *(p)) -#else -#define FILL(p) -#endif - -#else - -#define NEW(p) p = malloc(sizeof *(p)); -#define OKNEW(p) if (!((p) = malloc(sizeof *(p)))) { errno = ENOMEM; return (-1); } -#define FREE(p) free(p) -#define FILL(p) - -#endif - - -typedef struct evConn { - evConnFunc func; - void * uap; - int fd; - int flags; -#define EV_CONN_LISTEN 0x0001 /* Connection is a listener. */ -#define EV_CONN_SELECTED 0x0002 /* evSelectFD(conn->file). */ -#define EV_CONN_BLOCK 0x0004 /* Listener fd was blocking. */ - evFileID file; - struct evConn * prev; - struct evConn * next; -} evConn; - -typedef struct evAccept { - int fd; - union { - struct sockaddr sa; - struct sockaddr_in in; -#ifndef NO_SOCKADDR_UN - struct sockaddr_un un; -#endif - } la; - socklen_t lalen; - union { - struct sockaddr sa; - struct sockaddr_in in; -#ifndef NO_SOCKADDR_UN - struct sockaddr_un un; -#endif - } ra; - socklen_t ralen; - int ioErrno; - evConn * conn; - LINK(struct evAccept) link; -} evAccept; - -typedef struct evFile { - evFileFunc func; - void * uap; - int fd; - int eventmask; - int preemptive; - struct evFile * prev; - struct evFile * next; - struct evFile * fdprev; - struct evFile * fdnext; -} evFile; - -typedef struct evStream { - evStreamFunc func; - void * uap; - evFileID file; - evTimerID timer; - int flags; -#define EV_STR_TIMEROK 0x0001 /* IFF timer valid. */ - int fd; - struct iovec * iovOrig; - int iovOrigCount; - struct iovec * iovCur; - int iovCurCount; - int ioTotal; - int ioDone; - int ioErrno; - struct evStream *prevDone, *nextDone; - struct evStream *prev, *next; -} evStream; - -typedef struct evTimer { - evTimerFunc func; - void * uap; - struct timespec due, inter; - int index; - int mode; -#define EV_TMR_RATE 1 -} evTimer; - -typedef struct evWait { - evWaitFunc func; - void * uap; - const void * tag; - struct evWait * next; -} evWait; - -typedef struct evWaitList { - evWait * first; - evWait * last; - struct evWaitList * prev; - struct evWaitList * next; -} evWaitList; - -typedef struct evEvent_p { - enum { Accept, File, Stream, Timer, Wait, Free, Null } type; - union { - struct { evAccept *this; } accept; - struct { evFile *this; int eventmask; } file; - struct { evStream *this; } stream; - struct { evTimer *this; } timer; - struct { evWait *this; } wait; - struct { struct evEvent_p *next; } free; - struct { const void *placeholder; } null; - } u; -} evEvent_p; - -typedef struct { - /* Global. */ - const evEvent_p *cur; - /* Debugging. */ - int debug; - FILE *output; - /* Connections. */ - evConn *conns; - LIST(evAccept) accepts; - /* Files. */ - evFile *files, *fdNext; - fd_set rdLast, rdNext; - fd_set wrLast, wrNext; - fd_set exLast, exNext; - fd_set nonblockBefore; - int fdMax, fdCount, highestFD; - evFile *fdTable[FD_SETSIZE]; -#ifdef EVENTLIB_TIME_CHECKS - struct timespec lastSelectTime; - int lastFdCount; -#endif - /* Streams. */ - evStream *streams; - evStream *strDone, *strLast; - /* Timers. */ - struct timespec lastEventTime; - heap_context timers; - /* Waits. */ - evWaitList *waitLists; - evWaitList waitDone; -} evContext_p; - -/* eventlib.c */ -#define evPrintf __evPrintf -void evPrintf(const evContext_p *ctx, int level, const char *fmt, ...); - -/* ev_timers.c */ -#define evCreateTimers __evCreateTimers -heap_context evCreateTimers(const evContext_p *); -#define evDestroyTimers __evDestroyTimers -void evDestroyTimers(const evContext_p *); - -/* ev_waits.c */ -#define evFreeWait __evFreeWait -evWait *evFreeWait(evContext_p *ctx, evWait *old); - -/* Global options */ -int __evOptMonoTime; - -#endif /*_EVENTLIB_P_H*/ diff --git a/libc/netbsd/nameser/ns_name.c b/libc/netbsd/nameser/ns_name.c deleted file mode 100644 index 85d2f6053..000000000 --- a/libc/netbsd/nameser/ns_name.c +++ /dev/null @@ -1,970 +0,0 @@ -/* $NetBSD: ns_name.c,v 1.3 2004/11/07 02:19:49 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#ifndef lint -#ifdef notdef -static const char rcsid[] = "Id: ns_name.c,v 1.3.2.4.4.2 2004/05/04 03:27:47 marka Exp"; -#else -__RCSID("$NetBSD: ns_name.c,v 1.3 2004/11/07 02:19:49 christos Exp $"); -#endif -#endif - -#include - -#include -#include "arpa_nameser.h" - -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include -#include -#include -#include - -#ifdef SPRINTF_CHAR -# define SPRINTF(x) strlen(sprintf/**/x) -#else -# define SPRINTF(x) ((size_t)sprintf x) -#endif - -#define NS_TYPE_ELT 0x40 /* EDNS0 extended label type */ -#define DNS_LABELTYPE_BITSTRING 0x41 - -/* Data. */ - -static const char digits[] = "0123456789"; - -static const char digitvalue[256] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*16*/ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*32*/ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*48*/ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /*64*/ - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*80*/ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*96*/ - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*112*/ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*128*/ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*256*/ -}; - -/* Forward. */ - -static int special(int); -static int printable(int); -static int dn_find(const u_char *, const u_char *, - const u_char * const *, - const u_char * const *); -static int encode_bitsring(const char **, const char *, - unsigned char **, unsigned char **, - unsigned const char *); -static int labellen(const u_char *); -static int decode_bitstring(const unsigned char **, - char *, const char *); - -/* Public. */ - -/* - * ns_name_ntop(src, dst, dstsiz) - * Convert an encoded domain name to printable ascii as per RFC1035. - * return: - * Number of bytes written to buffer, or -1 (with errno set) - * notes: - * The root is returned as "." - * All other domains are returned in non absolute form - */ -int -ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) -{ - const u_char *cp; - char *dn, *eom; - u_char c; - u_int n; - int l; - - cp = src; - dn = dst; - eom = dst + dstsiz; - - while ((n = *cp++) != 0) { - if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { - /* Some kind of compression pointer. */ - errno = EMSGSIZE; - return (-1); - } - if (dn != dst) { - if (dn >= eom) { - errno = EMSGSIZE; - return (-1); - } - *dn++ = '.'; - } - if ((l = labellen(cp - 1)) < 0) { - errno = EMSGSIZE; /* XXX */ - return(-1); - } - if (dn + l >= eom) { - errno = EMSGSIZE; - return (-1); - } - if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) { - int m; - - if (n != DNS_LABELTYPE_BITSTRING) { - /* XXX: labellen should reject this case */ - errno = EINVAL; - return(-1); - } - if ((m = decode_bitstring(&cp, dn, eom)) < 0) - { - errno = EMSGSIZE; - return(-1); - } - dn += m; - continue; - } - for (; l > 0; l--) { - c = *cp++; - if (special(c)) { - if (dn + 1 >= eom) { - errno = EMSGSIZE; - return (-1); - } - *dn++ = '\\'; - *dn++ = (char)c; - } else if (!printable(c)) { - if (dn + 3 >= eom) { - errno = EMSGSIZE; - return (-1); - } - *dn++ = '\\'; - *dn++ = digits[c / 100]; - *dn++ = digits[(c % 100) / 10]; - *dn++ = digits[c % 10]; - } else { - if (dn >= eom) { - errno = EMSGSIZE; - return (-1); - } - *dn++ = (char)c; - } - } - } - if (dn == dst) { - if (dn >= eom) { - errno = EMSGSIZE; - return (-1); - } - *dn++ = '.'; - } - if (dn >= eom) { - errno = EMSGSIZE; - return (-1); - } - *dn++ = '\0'; - return (dn - dst); -} - -/* - * ns_name_pton(src, dst, dstsiz) - * Convert a ascii string into an encoded domain name as per RFC1035. - * return: - * -1 if it fails - * 1 if string was fully qualified - * 0 is string was not fully qualified - * notes: - * Enforces label and domain length limits. - */ - -int -ns_name_pton(const char *src, u_char *dst, size_t dstsiz) -{ - u_char *label, *bp, *eom; - int c, n, escaped, e = 0; - char *cp; - - escaped = 0; - bp = dst; - eom = dst + dstsiz; - label = bp++; - - while ((c = *src++) != 0) { - if (escaped) { - if (c == '[') { /* start a bit string label */ - if ((cp = strchr(src, ']')) == NULL) { - errno = EINVAL; /* ??? */ - return(-1); - } - if ((e = encode_bitsring(&src, cp + 2, - &label, &bp, eom)) - != 0) { - errno = e; - return(-1); - } - escaped = 0; - label = bp++; - if ((c = *src++) == 0) - goto done; - else if (c != '.') { - errno = EINVAL; - return(-1); - } - continue; - } - else if ((cp = strchr(digits, c)) != NULL) { - n = (cp - digits) * 100; - if ((c = *src++) == 0 || - (cp = strchr(digits, c)) == NULL) { - errno = EMSGSIZE; - return (-1); - } - n += (cp - digits) * 10; - if ((c = *src++) == 0 || - (cp = strchr(digits, c)) == NULL) { - errno = EMSGSIZE; - return (-1); - } - n += (cp - digits); - if (n > 255) { - errno = EMSGSIZE; - return (-1); - } - c = n; - } - escaped = 0; - } else if (c == '\\') { - escaped = 1; - continue; - } else if (c == '.') { - c = (bp - label - 1); - if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ - errno = EMSGSIZE; - return (-1); - } - if (label >= eom) { - errno = EMSGSIZE; - return (-1); - } - *label = c; - /* Fully qualified ? */ - if (*src == '\0') { - if (c != 0) { - if (bp >= eom) { - errno = EMSGSIZE; - return (-1); - } - *bp++ = '\0'; - } - if ((bp - dst) > MAXCDNAME) { - errno = EMSGSIZE; - return (-1); - } - return (1); - } - if (c == 0 || *src == '.') { - errno = EMSGSIZE; - return (-1); - } - label = bp++; - continue; - } - if (bp >= eom) { - errno = EMSGSIZE; - return (-1); - } - *bp++ = (u_char)c; - } - c = (bp - label - 1); - if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ - errno = EMSGSIZE; - return (-1); - } - done: - if (label >= eom) { - errno = EMSGSIZE; - return (-1); - } - *label = c; - if (c != 0) { - if (bp >= eom) { - errno = EMSGSIZE; - return (-1); - } - *bp++ = 0; - } - if ((bp - dst) > MAXCDNAME) { /* src too big */ - errno = EMSGSIZE; - return (-1); - } - return (0); -} - -/* - * ns_name_ntol(src, dst, dstsiz) - * Convert a network strings labels into all lowercase. - * return: - * Number of bytes written to buffer, or -1 (with errno set) - * notes: - * Enforces label and domain length limits. - */ - -int -ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) -{ - const u_char *cp; - u_char *dn, *eom; - u_char c; - u_int n; - int l; - - cp = src; - dn = dst; - eom = dst + dstsiz; - - if (dn >= eom) { - errno = EMSGSIZE; - return (-1); - } - while ((n = *cp++) != 0) { - if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { - /* Some kind of compression pointer. */ - errno = EMSGSIZE; - return (-1); - } - *dn++ = n; - if ((l = labellen(cp - 1)) < 0) { - errno = EMSGSIZE; - return (-1); - } - if (dn + l >= eom) { - errno = EMSGSIZE; - return (-1); - } - for (; l > 0; l--) { - c = *cp++; - if (isupper(c)) - *dn++ = tolower(c); - else - *dn++ = c; - } - } - *dn++ = '\0'; - return (dn - dst); -} - -/* - * ns_name_unpack(msg, eom, src, dst, dstsiz) - * Unpack a domain name from a message, source may be compressed. - * return: - * -1 if it fails, or consumed octets if it succeeds. - */ -int -ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, - u_char *dst, size_t dstsiz) -{ - const u_char *srcp, *dstlim; - u_char *dstp; - int n, len, checked, l; - - len = -1; - checked = 0; - dstp = dst; - srcp = src; - dstlim = dst + dstsiz; - if (srcp < msg || srcp >= eom) { - errno = EMSGSIZE; - return (-1); - } - /* Fetch next label in domain name. */ - while ((n = *srcp++) != 0) { - /* Check for indirection. */ - switch (n & NS_CMPRSFLGS) { - case 0: - case NS_TYPE_ELT: - /* Limit checks. */ - if ((l = labellen(srcp - 1)) < 0) { - errno = EMSGSIZE; - return(-1); - } - if (dstp + l + 1 >= dstlim || srcp + l >= eom) { - errno = EMSGSIZE; - return (-1); - } - checked += l + 1; - *dstp++ = n; - memcpy(dstp, srcp, (size_t)l); - dstp += l; - srcp += l; - break; - - case NS_CMPRSFLGS: - if (srcp >= eom) { - errno = EMSGSIZE; - return (-1); - } - if (len < 0) - len = srcp - src + 1; - srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); - if (srcp < msg || srcp >= eom) { /* Out of range. */ - errno = EMSGSIZE; - return (-1); - } - checked += 2; - /* - * Check for loops in the compressed name; - * if we've looked at the whole message, - * there must be a loop. - */ - if (checked >= eom - msg) { - errno = EMSGSIZE; - return (-1); - } - break; - - default: - errno = EMSGSIZE; - return (-1); /* flag error */ - } - } - *dstp = '\0'; - if (len < 0) - len = srcp - src; - return (len); -} - -/* - * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr) - * Pack domain name 'domain' into 'comp_dn'. - * return: - * Size of the compressed name, or -1. - * notes: - * 'dnptrs' is an array of pointers to previous compressed names. - * dnptrs[0] is a pointer to the beginning of the message. The array - * ends with NULL. - * 'lastdnptr' is a pointer to the end of the array pointed to - * by 'dnptrs'. - * Side effects: - * The list of pointers in dnptrs is updated for labels inserted into - * the message as we compress the name. If 'dnptr' is NULL, we don't - * try to compress names. If 'lastdnptr' is NULL, we don't update the - * list. - */ -int -ns_name_pack(const u_char *src, u_char *dst, int dstsiz, - const u_char **dnptrs, const u_char **lastdnptr) -{ - u_char *dstp; - const u_char **cpp, **lpp, *eob, *msg; - const u_char *srcp; - int n, l, first = 1; - - srcp = src; - dstp = dst; - eob = dstp + dstsiz; - lpp = cpp = NULL; - if (dnptrs != NULL) { - if ((msg = *dnptrs++) != NULL) { - for (cpp = dnptrs; *cpp != NULL; cpp++) - ; - lpp = cpp; /* end of list to search */ - } - } else - msg = NULL; - - /* make sure the domain we are about to add is legal */ - l = 0; - do { - int l0; - - n = *srcp; - if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { - errno = EMSGSIZE; - return (-1); - } - if ((l0 = labellen(srcp)) < 0) { - errno = EINVAL; - return(-1); - } - l += l0 + 1; - if (l > MAXCDNAME) { - errno = EMSGSIZE; - return (-1); - } - srcp += l0 + 1; - } while (n != 0); - - /* from here on we need to reset compression pointer array on error */ - srcp = src; - do { - /* Look to see if we can use pointers. */ - n = *srcp; - if (n != 0 && msg != NULL) { - l = dn_find(srcp, msg, (const u_char * const *)dnptrs, - (const u_char * const *)lpp); - if (l >= 0) { - if (dstp + 1 >= eob) { - goto cleanup; - } - *dstp++ = ((u_int32_t)l >> 8) | NS_CMPRSFLGS; - *dstp++ = l % 256; - return (dstp - dst); - } - /* Not found, save it. */ - if (lastdnptr != NULL && cpp < lastdnptr - 1 && - (dstp - msg) < 0x4000 && first) { - *cpp++ = dstp; - *cpp = NULL; - first = 0; - } - } - /* copy label to buffer */ - if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { - /* Should not happen. */ - goto cleanup; - } - n = labellen(srcp); - if (dstp + 1 + n >= eob) { - goto cleanup; - } - memcpy(dstp, srcp, (size_t)(n + 1)); - srcp += n + 1; - dstp += n + 1; - } while (n != 0); - - if (dstp > eob) { -cleanup: - if (msg != NULL) - *lpp = NULL; - errno = EMSGSIZE; - return (-1); - } - return (dstp - dst); -} - -/* - * ns_name_uncompress(msg, eom, src, dst, dstsiz) - * Expand compressed domain name to presentation format. - * return: - * Number of bytes read out of `src', or -1 (with errno set). - * note: - * Root domain returns as "." not "". - */ -int -ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, - char *dst, size_t dstsiz) -{ - u_char tmp[NS_MAXCDNAME]; - int n; - - if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) - return (-1); - if (ns_name_ntop(tmp, dst, dstsiz) == -1) - return (-1); - return (n); -} - -/* - * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr) - * Compress a domain name into wire format, using compression pointers. - * return: - * Number of bytes consumed in `dst' or -1 (with errno set). - * notes: - * 'dnptrs' is an array of pointers to previous compressed names. - * dnptrs[0] is a pointer to the beginning of the message. - * The list ends with NULL. 'lastdnptr' is a pointer to the end of the - * array pointed to by 'dnptrs'. Side effect is to update the list of - * pointers for labels inserted into the message as we compress the name. - * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' - * is NULL, we don't update the list. - */ -int -ns_name_compress(const char *src, u_char *dst, size_t dstsiz, - const u_char **dnptrs, const u_char **lastdnptr) -{ - u_char tmp[NS_MAXCDNAME]; - - if (ns_name_pton(src, tmp, sizeof tmp) == -1) - return (-1); - return (ns_name_pack(tmp, dst, (int)dstsiz, dnptrs, lastdnptr)); -} - -/* - * Reset dnptrs so that there are no active references to pointers at or - * after src. - */ -void -ns_name_rollback(const u_char *src, const u_char **dnptrs, - const u_char **lastdnptr) -{ - while (dnptrs < lastdnptr && *dnptrs != NULL) { - if (*dnptrs >= src) { - *dnptrs = NULL; - break; - } - dnptrs++; - } -} - -/* - * ns_name_skip(ptrptr, eom) - * Advance *ptrptr to skip over the compressed name it points at. - * return: - * 0 on success, -1 (with errno set) on failure. - */ -int -ns_name_skip(const u_char **ptrptr, const u_char *eom) -{ - const u_char *cp; - u_int n; - int l; - - cp = *ptrptr; - while (cp < eom && (n = *cp++) != 0) { - /* Check for indirection. */ - switch (n & NS_CMPRSFLGS) { - case 0: /* normal case, n == len */ - cp += n; - continue; - case NS_TYPE_ELT: /* EDNS0 extended label */ - if ((l = labellen(cp - 1)) < 0) { - errno = EMSGSIZE; /* XXX */ - return(-1); - } - cp += l; - continue; - case NS_CMPRSFLGS: /* indirection */ - cp++; - break; - default: /* illegal type */ - errno = EMSGSIZE; - return (-1); - } - break; - } - if (cp > eom) { - errno = EMSGSIZE; - return (-1); - } - *ptrptr = cp; - return (0); -} - -/* Private. */ - -/* - * special(ch) - * Thinking in noninternationalized USASCII (per the DNS spec), - * is this characted special ("in need of quoting") ? - * return: - * boolean. - */ -static int -special(int ch) { - switch (ch) { - case 0x22: /* '"' */ - case 0x2E: /* '.' */ - case 0x3B: /* ';' */ - case 0x5C: /* '\\' */ - case 0x28: /* '(' */ - case 0x29: /* ')' */ - /* Special modifiers in zone files. */ - case 0x40: /* '@' */ - case 0x24: /* '$' */ - return (1); - default: - return (0); - } -} - -/* - * printable(ch) - * Thinking in noninternationalized USASCII (per the DNS spec), - * is this character visible and not a space when printed ? - * return: - * boolean. - */ -static int -printable(int ch) { - return (ch > 0x20 && ch < 0x7f); -} - -/* - * Thinking in noninternationalized USASCII (per the DNS spec), - * convert this character to lower case if it's upper case. - */ -static int -mklower(int ch) { - if (ch >= 0x41 && ch <= 0x5A) - return (ch + 0x20); - return (ch); -} - -/* - * dn_find(domain, msg, dnptrs, lastdnptr) - * Search for the counted-label name in an array of compressed names. - * return: - * offset from msg if found, or -1. - * notes: - * dnptrs is the pointer to the first name on the list, - * not the pointer to the start of the message. - */ -static int -dn_find(const u_char *domain, const u_char *msg, - const u_char * const *dnptrs, - const u_char * const *lastdnptr) -{ - const u_char *dn, *cp, *sp; - const u_char * const *cpp; - u_int n; - - for (cpp = dnptrs; cpp < lastdnptr; cpp++) { - sp = *cpp; - /* - * terminate search on: - * root label - * compression pointer - * unusable offset - */ - while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 && - (sp - msg) < 0x4000) { - dn = domain; - cp = sp; - while ((n = *cp++) != 0) { - /* - * check for indirection - */ - switch (n & NS_CMPRSFLGS) { - case 0: /* normal case, n == len */ - n = labellen(cp - 1); /* XXX */ - - if (n != *dn++) - goto next; - - for (; n > 0; n--) - if (mklower(*dn++) != - mklower(*cp++)) - goto next; - /* Is next root for both ? */ - if (*dn == '\0' && *cp == '\0') - return (sp - msg); - if (*dn) - continue; - goto next; - case NS_CMPRSFLGS: /* indirection */ - cp = msg + (((n & 0x3f) << 8) | *cp); - break; - - default: /* illegal type */ - errno = EMSGSIZE; - return (-1); - } - } - next: ; - sp += *sp + 1; - } - } - errno = ENOENT; - return (-1); -} - -static int -decode_bitstring(const unsigned char **cpp, char *dn, const char *eom) -{ - const unsigned char *cp = *cpp; - char *beg = dn, tc; - int b, blen, plen, i; - - if ((blen = (*cp & 0xff)) == 0) - blen = 256; - plen = (blen + 3) / 4; - plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1); - if (dn + plen >= eom) - return(-1); - - cp++; - i = SPRINTF((dn, "\\[x")); - if (i < 0) - return (-1); - dn += i; - for (b = blen; b > 7; b -= 8, cp++) { - i = SPRINTF((dn, "%02x", *cp & 0xff)); - if (i < 0) - return (-1); - dn += i; - } - if (b > 4) { - tc = *cp++; - i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b)))); - if (i < 0) - return (-1); - dn += i; - } else if (b > 0) { - tc = *cp++; - i = SPRINTF((dn, "%1x", - (((u_int32_t)tc >> 4) & 0x0f) & (0x0f << (4 - b)))); - if (i < 0) - return (-1); - dn += i; - } - i = SPRINTF((dn, "/%d]", blen)); - if (i < 0) - return (-1); - dn += i; - - *cpp = cp; - return(dn - beg); -} - -static int -encode_bitsring(const char **bp, const char *end, unsigned char **labelp, - unsigned char ** dst, unsigned const char *eom) -{ - int afterslash = 0; - const char *cp = *bp; - unsigned char *tp; - char c; - const char *beg_blen; - char *end_blen = NULL; - int value = 0, count = 0, tbcount = 0, blen = 0; - - beg_blen = end_blen = NULL; - - /* a bitstring must contain at least 2 characters */ - if (end - cp < 2) - return(EINVAL); - - /* XXX: currently, only hex strings are supported */ - if (*cp++ != 'x') - return(EINVAL); - if (!isxdigit((*cp) & 0xff)) /* reject '\[x/BLEN]' */ - return(EINVAL); - - for (tp = *dst + 1; cp < end && tp < eom; cp++) { - switch((c = *cp)) { - case ']': /* end of the bitstring */ - if (afterslash) { - if (beg_blen == NULL) - return(EINVAL); - blen = (int)strtol(beg_blen, &end_blen, 10); - if (*end_blen != ']') - return(EINVAL); - } - if (count) - *tp++ = ((value << 4) & 0xff); - cp++; /* skip ']' */ - goto done; - case '/': - afterslash = 1; - break; - default: - if (afterslash) { - if (!isdigit(c&0xff)) - return(EINVAL); - if (beg_blen == NULL) { - - if (c == '0') { - /* blen never begings with 0 */ - return(EINVAL); - } - beg_blen = cp; - } - } else { - if (!isxdigit(c&0xff)) - return(EINVAL); - value <<= 4; - value += digitvalue[(int)c]; - count += 4; - tbcount += 4; - if (tbcount > 256) - return(EINVAL); - if (count == 8) { - *tp++ = value; - count = 0; - } - } - break; - } - } - done: - if (cp >= end || tp >= eom) - return(EMSGSIZE); - - /* - * bit length validation: - * If a is present, the number of digits in the - * MUST be just sufficient to contain the number of bits specified - * by the . If there are insignificant bits in a final - * hexadecimal or octal digit, they MUST be zero. - * RFC 2673, Section 3.2. - */ - if (blen > 0) { - int traillen; - - if (((blen + 3) & ~3) != tbcount) - return(EINVAL); - traillen = tbcount - blen; /* between 0 and 3 */ - if (((value << (8 - traillen)) & 0xff) != 0) - return(EINVAL); - } - else - blen = tbcount; - if (blen == 256) - blen = 0; - - /* encode the type and the significant bit fields */ - **labelp = DNS_LABELTYPE_BITSTRING; - **dst = blen; - - *bp = cp; - *dst = tp; - - return(0); -} - -static int -labellen(const u_char *lp) -{ - int bitlen; - u_char l = *lp; - - if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) { - /* should be avoided by the caller */ - return(-1); - } - - if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) { - if (l == DNS_LABELTYPE_BITSTRING) { - if ((bitlen = *(lp + 1)) == 0) - bitlen = 256; - return((bitlen + 7 ) / 8 + 1); - } - return(-1); /* unknwon ELT */ - } - return(l); -} diff --git a/libc/netbsd/nameser/ns_netint.c b/libc/netbsd/nameser/ns_netint.c deleted file mode 100644 index 1b2964f4a..000000000 --- a/libc/netbsd/nameser/ns_netint.c +++ /dev/null @@ -1,59 +0,0 @@ -/* $NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#ifndef lint -#ifdef notdef -static const char rcsid[] = "Id: ns_netint.c,v 1.1.206.1 2004/03/09 08:33:44 marka Exp"; -#else -__RCSID("$NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $"); -#endif -#endif - -/* Import. */ - -#include "arpa_nameser.h" - -/* Public. */ - -u_int16_t -ns_get16(const u_char *src) { - u_int dst; - - NS_GET16(dst, src); - return (dst); -} - -u_int32_t -ns_get32(const u_char *src) { - u_long dst; - - NS_GET32(dst, src); - return (dst); -} - -void -ns_put16(u_int16_t src, u_char *dst) { - NS_PUT16(src, dst); -} - -void -ns_put32(u_int32_t src, u_char *dst) { - NS_PUT32(src, dst); -} diff --git a/libc/netbsd/nameser/ns_parse.c b/libc/netbsd/nameser/ns_parse.c deleted file mode 100644 index fd94860c9..000000000 --- a/libc/netbsd/nameser/ns_parse.c +++ /dev/null @@ -1,209 +0,0 @@ -/* $NetBSD: ns_parse.c,v 1.2 2004/05/20 20:35:05 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#ifndef lint -#ifdef notdef -static const char rcsid[] = "Id: ns_parse.c,v 1.3.2.1.4.1 2004/03/09 08:33:44 marka Exp"; -#else -__RCSID("$NetBSD: ns_parse.c,v 1.2 2004/05/20 20:35:05 christos Exp $"); -#endif -#endif - -/* Import. */ - -#include - -#include -#include "arpa_nameser.h" - -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include - -/* Forward. */ - -static void setsection(ns_msg *msg, ns_sect sect); - -/* Macros. */ - -#define RETERR(err) do { errno = (err); return (-1); } while (/*NOTREACHED*//*CONSTCOND*/0) - -/* Public. */ - -/* These need to be in the same order as the nres.h:ns_flag enum. */ -const struct _ns_flagdata _ns_flagdata[16] = { - { 0x8000, 15 }, /* qr. */ - { 0x7800, 11 }, /* opcode. */ - { 0x0400, 10 }, /* aa. */ - { 0x0200, 9 }, /* tc. */ - { 0x0100, 8 }, /* rd. */ - { 0x0080, 7 }, /* ra. */ - { 0x0040, 6 }, /* z. */ - { 0x0020, 5 }, /* ad. */ - { 0x0010, 4 }, /* cd. */ - { 0x000f, 0 }, /* rcode. */ - { 0x0000, 0 }, /* expansion (1/6). */ - { 0x0000, 0 }, /* expansion (2/6). */ - { 0x0000, 0 }, /* expansion (3/6). */ - { 0x0000, 0 }, /* expansion (4/6). */ - { 0x0000, 0 }, /* expansion (5/6). */ - { 0x0000, 0 }, /* expansion (6/6). */ -}; - -int ns_msg_getflag(ns_msg handle, int flag) { - return((u_int32_t)((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift); -} - -int -ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) { - const u_char *optr = ptr; - - for (; count > 0; count--) { - int b, rdlength; - - b = dn_skipname(ptr, eom); - if (b < 0) - RETERR(EMSGSIZE); - ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/; - if (section != ns_s_qd) { - if (ptr + NS_INT32SZ + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - ptr += NS_INT32SZ/*TTL*/; - NS_GET16(rdlength, ptr); - ptr += rdlength/*RData*/; - } - } - if (ptr > eom) - RETERR(EMSGSIZE); - return (ptr - optr); -} - -int -ns_initparse(const u_char *msg, int msglen, ns_msg *handle) { - const u_char *eom = msg + msglen; - int i; - - memset(handle, 0x5e, sizeof *handle); - handle->_msg = msg; - handle->_eom = eom; - if (msg + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - NS_GET16(handle->_id, msg); - if (msg + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - NS_GET16(handle->_flags, msg); - for (i = 0; i < ns_s_max; i++) { - if (msg + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - NS_GET16(handle->_counts[i], msg); - } - for (i = 0; i < ns_s_max; i++) - if (handle->_counts[i] == 0) - handle->_sections[i] = NULL; - else { - int b = ns_skiprr(msg, eom, (ns_sect)i, - handle->_counts[i]); - - if (b < 0) - return (-1); - handle->_sections[i] = msg; - msg += b; - } - if (msg != eom) - RETERR(EMSGSIZE); - setsection(handle, ns_s_max); - return (0); -} - -int -ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) { - int b; - - /* Make section right. */ - if ((unsigned)section >= (unsigned)ns_s_max) - RETERR(ENODEV); - if (section != handle->_sect) - setsection(handle, section); - - /* Make rrnum right. */ - if (rrnum == -1) - rrnum = handle->_rrnum; - if (rrnum < 0 || rrnum >= handle->_counts[(int)section]) - RETERR(ENODEV); - if (rrnum < handle->_rrnum) - setsection(handle, section); - if (rrnum > handle->_rrnum) { - b = ns_skiprr(handle->_msg_ptr, handle->_eom, section, - rrnum - handle->_rrnum); - - if (b < 0) - return (-1); - handle->_msg_ptr += b; - handle->_rrnum = rrnum; - } - - /* Do the parse. */ - b = dn_expand(handle->_msg, handle->_eom, - handle->_msg_ptr, rr->name, NS_MAXDNAME); - if (b < 0) - return (-1); - handle->_msg_ptr += b; - if (handle->_msg_ptr + NS_INT16SZ + NS_INT16SZ > handle->_eom) - RETERR(EMSGSIZE); - NS_GET16(rr->type, handle->_msg_ptr); - NS_GET16(rr->rr_class, handle->_msg_ptr); - if (section == ns_s_qd) { - rr->ttl = 0; - rr->rdlength = 0; - rr->rdata = NULL; - } else { - if (handle->_msg_ptr + NS_INT32SZ + NS_INT16SZ > handle->_eom) - RETERR(EMSGSIZE); - NS_GET32(rr->ttl, handle->_msg_ptr); - NS_GET16(rr->rdlength, handle->_msg_ptr); - if (handle->_msg_ptr + rr->rdlength > handle->_eom) - RETERR(EMSGSIZE); - rr->rdata = handle->_msg_ptr; - handle->_msg_ptr += rr->rdlength; - } - if (++handle->_rrnum > handle->_counts[(int)section]) - setsection(handle, (ns_sect)((int)section + 1)); - - /* All done. */ - return (0); -} - -/* Private. */ - -static void -setsection(ns_msg *msg, ns_sect sect) { - msg->_sect = sect; - if (sect == ns_s_max) { - msg->_rrnum = -1; - msg->_msg_ptr = NULL; - } else { - msg->_rrnum = 0; - msg->_msg_ptr = msg->_sections[(int)sect]; - } -} diff --git a/libc/netbsd/nameser/ns_print.c b/libc/netbsd/nameser/ns_print.c deleted file mode 100644 index 7465e6203..000000000 --- a/libc/netbsd/nameser/ns_print.c +++ /dev/null @@ -1,915 +0,0 @@ -/* $NetBSD: ns_print.c,v 1.5 2004/11/07 02:19:49 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#ifndef lint -#ifdef notdef -static const char rcsid[] = "Id: ns_print.c,v 1.3.2.1.4.5 2004/07/28 20:16:45 marka Exp"; -#else -__RCSID("$NetBSD: ns_print.c,v 1.5 2004/11/07 02:19:49 christos Exp $"); -#endif -#endif - -/* Import. */ - -#include -#include - -#include -#include "arpa_nameser.h" -#include - -#include -#include -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include -#include -#include - -#ifdef SPRINTF_CHAR -# define SPRINTF(x) strlen(sprintf/**/x) -#else -# define SPRINTF(x) ((size_t)sprintf x) -#endif - -#ifndef MIN -#define MIN(x,y) ((x)<(y)?(x):(y)) -#endif - -/* Forward. */ - -static size_t prune_origin(const char *name, const char *origin); -static int charstr(const u_char *rdata, const u_char *edata, - char **buf, size_t *buflen); -static int addname(const u_char *msg, size_t msglen, - const u_char **p, const char *origin, - char **buf, size_t *buflen); -static void addlen(size_t len, char **buf, size_t *buflen); -static int addstr(const char *src, size_t len, - char **buf, size_t *buflen); -static int addtab(size_t len, size_t target, int spaced, - char **buf, size_t *buflen); - -/* Macros. */ - -#define T(x) \ - do { \ - if ((x) < 0) \ - return (-1); \ - } while (/*CONSTCOND*/0) - -/* Public. */ - -/* - * int - * ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen) - * Convert an RR to presentation format. - * return: - * Number of characters written to buf, or -1 (check errno). - */ -int -ns_sprintrr(const ns_msg *handle, const ns_rr *rr, - const char *name_ctx, const char *origin, - char *buf, size_t buflen) -{ - int n; - - n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle), - ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr), - ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr), - name_ctx, origin, buf, buflen); - return (n); -} - -/* - * int - * ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen, - * name_ctx, origin, buf, buflen) - * Convert the fields of an RR into presentation format. - * return: - * Number of characters written to buf, or -1 (check errno). - */ -int -ns_sprintrrf(const u_char *msg, size_t msglen, - const char *name, ns_class class, ns_type type, - u_long ttl, const u_char *rdata, size_t rdlen, - const char *name_ctx, const char *origin, - char *buf, size_t buflen) -{ - const char *obuf = buf; - const u_char *edata = rdata + rdlen; - int spaced = 0; - - const char *comment; - char tmp[100]; - int len, x; - - /* - * Owner. - */ - if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) { - T(addstr("\t\t\t", (size_t)3, &buf, &buflen)); - } else { - len = prune_origin(name, origin); - if (*name == '\0') { - goto root; - } else if (len == 0) { - T(addstr("@\t\t\t", (size_t)4, &buf, &buflen)); - } else { - T(addstr(name, (size_t)len, &buf, &buflen)); - /* Origin not used or not root, and no trailing dot? */ - if (((origin == NULL || origin[0] == '\0') || - (origin[0] != '.' && origin[1] != '\0' && - name[len] == '\0')) && name[len - 1] != '.') { - root: - T(addstr(".", (size_t)1, &buf, &buflen)); - len++; - } - T(spaced = addtab((size_t)len, 24, spaced, &buf, &buflen)); - } - } - - /* - * TTL, Class, Type. - */ - T(x = ns_format_ttl(ttl, buf, buflen)); - addlen((size_t)x, &buf, &buflen); - len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type))); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - T(spaced = addtab((size_t)(x + len), (size_t)16, spaced, &buf, &buflen)); - - /* - * RData. - */ - switch (type) { - case ns_t_a: - if (rdlen != (size_t)NS_INADDRSZ) - goto formerr; - (void) inet_ntop(AF_INET, rdata, buf, buflen); - addlen(strlen(buf), &buf, &buflen); - break; - - case ns_t_cname: - case ns_t_mb: - case ns_t_mg: - case ns_t_mr: - case ns_t_ns: - case ns_t_ptr: - case ns_t_dname: - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - break; - - case ns_t_hinfo: - case ns_t_isdn: - /* First word. */ - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len == 0) - goto formerr; - rdata += len; - T(addstr(" ", (size_t)1, &buf, &buflen)); - - - /* Second word, optional in ISDN records. */ - if (type == ns_t_isdn && rdata == edata) - break; - - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len == 0) - goto formerr; - rdata += len; - break; - - case ns_t_soa: { - u_long t; - - /* Server name. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Administrator name. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - T(addstr(" (\n", (size_t)3, &buf, &buflen)); - spaced = 0; - - if ((edata - rdata) != 5*NS_INT32SZ) - goto formerr; - - /* Serial number. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen)); - len = SPRINTF((tmp, "%lu", t)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen)); - T(addstr("; serial\n", (size_t)9, &buf, &buflen)); - spaced = 0; - - /* Refresh interval. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen)); - T(len = ns_format_ttl(t, buf, buflen)); - addlen((size_t)len, &buf, &buflen); - T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen)); - T(addstr("; refresh\n", (size_t)10, &buf, &buflen)); - spaced = 0; - - /* Retry interval. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen)); - T(len = ns_format_ttl(t, buf, buflen)); - addlen((size_t)len, &buf, &buflen); - T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen)); - T(addstr("; retry\n", (size_t)8, &buf, &buflen)); - spaced = 0; - - /* Expiry. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen)); - T(len = ns_format_ttl(t, buf, buflen)); - addlen((size_t)len, &buf, &buflen); - T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen)); - T(addstr("; expiry\n", (size_t)9, &buf, &buflen)); - spaced = 0; - - /* Minimum TTL. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - T(addstr("\t\t\t\t\t", (size_t)5, &buf, &buflen)); - T(len = ns_format_ttl(t, buf, buflen)); - addlen((size_t)len, &buf, &buflen); - T(addstr(" )", (size_t)2, &buf, &buflen)); - T(spaced = addtab((size_t)len, (size_t)16, spaced, &buf, &buflen)); - T(addstr("; minimum\n", (size_t)10, &buf, &buflen)); - - break; - } - - case ns_t_mx: - case ns_t_afsdb: - case ns_t_rt: { - u_int t; - - if (rdlen < (size_t)NS_INT16SZ) - goto formerr; - - /* Priority. */ - t = ns_get16(rdata); - rdata += NS_INT16SZ; - len = SPRINTF((tmp, "%u ", t)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Target. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - - break; - } - - case ns_t_px: { - u_int t; - - if (rdlen < (size_t)NS_INT16SZ) - goto formerr; - - /* Priority. */ - t = ns_get16(rdata); - rdata += NS_INT16SZ; - len = SPRINTF((tmp, "%u ", t)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Name1. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Name2. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - - break; - } - - case ns_t_x25: - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len == 0) - goto formerr; - rdata += len; - break; - - case ns_t_txt: - while (rdata < edata) { - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len == 0) - goto formerr; - rdata += len; - if (rdata < edata) - T(addstr(" ", (size_t)1, &buf, &buflen)); - } - break; - - case ns_t_nsap: { - char t[2+255*3]; - - (void) inet_nsap_ntoa((int)rdlen, rdata, t); - T(addstr(t, strlen(t), &buf, &buflen)); - break; - } - - case ns_t_aaaa: - if (rdlen != (size_t)NS_IN6ADDRSZ) - goto formerr; - (void) inet_ntop(AF_INET6, rdata, buf, buflen); - addlen(strlen(buf), &buf, &buflen); - break; - - case ns_t_loc: { - char t[255]; - - /* XXX protocol format checking? */ - (void) loc_ntoa(rdata, t); - T(addstr(t, strlen(t), &buf, &buflen)); - break; - } - - case ns_t_naptr: { - u_int order, preference; - char t[50]; - - if (rdlen < 2U*NS_INT16SZ) - goto formerr; - - /* Order, Precedence. */ - order = ns_get16(rdata); rdata += NS_INT16SZ; - preference = ns_get16(rdata); rdata += NS_INT16SZ; - len = SPRINTF((t, "%u %u ", order, preference)); - T(addstr(t, (size_t)len, &buf, &buflen)); - - /* Flags. */ - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len == 0) - goto formerr; - rdata += len; - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Service. */ - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len == 0) - goto formerr; - rdata += len; - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Regexp. */ - T(len = charstr(rdata, edata, &buf, &buflen)); - if (len < 0) - return (-1); - if (len == 0) - goto formerr; - rdata += len; - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Server. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - break; - } - - case ns_t_srv: { - u_int priority, weight, port; - char t[50]; - - if (rdlen < 3U*NS_INT16SZ) - goto formerr; - - /* Priority, Weight, Port. */ - priority = ns_get16(rdata); rdata += NS_INT16SZ; - weight = ns_get16(rdata); rdata += NS_INT16SZ; - port = ns_get16(rdata); rdata += NS_INT16SZ; - len = SPRINTF((t, "%u %u %u ", priority, weight, port)); - T(addstr(t, (size_t)len, &buf, &buflen)); - - /* Server. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - break; - } - - case ns_t_minfo: - case ns_t_rp: - /* Name1. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Name2. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - - break; - - case ns_t_wks: { - int n, lcnt; - - if (rdlen < 1U + NS_INT32SZ) - goto formerr; - - /* Address. */ - (void) inet_ntop(AF_INET, rdata, buf, buflen); - addlen(strlen(buf), &buf, &buflen); - rdata += NS_INADDRSZ; - - /* Protocol. */ - len = SPRINTF((tmp, " %u ( ", *rdata)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - rdata += NS_INT8SZ; - - /* Bit map. */ - n = 0; - lcnt = 0; - while (rdata < edata) { - u_int c = *rdata++; - do { - if (c & 0200) { - if (lcnt == 0) { - T(addstr("\n\t\t\t\t", (size_t)5, - &buf, &buflen)); - lcnt = 10; - spaced = 0; - } - len = SPRINTF((tmp, "%d ", n)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - lcnt--; - } - c <<= 1; - } while (++n & 07); - } - T(addstr(")", (size_t)1, &buf, &buflen)); - - break; - } - - case ns_t_key: { - char base64_key[NS_MD5RSA_MAX_BASE64]; - u_int keyflags, protocol, algorithm, key_id; - const char *leader; - int n; - - if (rdlen < 0U + NS_INT16SZ + NS_INT8SZ + NS_INT8SZ) - goto formerr; - - /* Key flags, Protocol, Algorithm. */ -#ifndef _LIBC - key_id = dst_s_dns_key_id(rdata, edata-rdata); -#else - key_id = 0; -#endif - keyflags = ns_get16(rdata); rdata += NS_INT16SZ; - protocol = *rdata++; - algorithm = *rdata++; - len = SPRINTF((tmp, "0x%04x %u %u", - keyflags, protocol, algorithm)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Public key data. */ - len = b64_ntop(rdata, (size_t)(edata - rdata), - base64_key, sizeof base64_key); - if (len < 0) - goto formerr; - if (len > 15) { - T(addstr(" (", (size_t)2, &buf, &buflen)); - leader = "\n\t\t"; - spaced = 0; - } else - leader = " "; - for (n = 0; n < len; n += 48) { - T(addstr(leader, strlen(leader), &buf, &buflen)); - T(addstr(base64_key + n, (size_t)MIN(len - n, 48), - &buf, &buflen)); - } - if (len > 15) - T(addstr(" )", (size_t)2, &buf, &buflen)); - n = SPRINTF((tmp, " ; key_tag= %u", key_id)); - T(addstr(tmp, (size_t)n, &buf, &buflen)); - - break; - } - - case ns_t_sig: { - char base64_key[NS_MD5RSA_MAX_BASE64]; - u_int typ, algorithm, labels, footprint; - const char *leader; - u_long t; - int n; - - if (rdlen < 22U) - goto formerr; - - /* Type covered, Algorithm, Label count, Original TTL. */ - typ = ns_get16(rdata); rdata += NS_INT16SZ; - algorithm = *rdata++; - labels = *rdata++; - t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s %d %d %lu ", - p_type((int)typ), algorithm, labels, t)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - if (labels > (u_int)dn_count_labels(name)) - goto formerr; - - /* Signature expiry. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s ", p_secstodate(t))); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Time signed. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s ", p_secstodate(t))); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Signature Footprint. */ - footprint = ns_get16(rdata); rdata += NS_INT16SZ; - len = SPRINTF((tmp, "%u ", footprint)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Signer's name. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - - /* Signature. */ - len = b64_ntop(rdata, (size_t)(edata - rdata), - base64_key, sizeof base64_key); - if (len > 15) { - T(addstr(" (", (size_t)2, &buf, &buflen)); - leader = "\n\t\t"; - spaced = 0; - } else - leader = " "; - if (len < 0) - goto formerr; - for (n = 0; n < len; n += 48) { - T(addstr(leader, strlen(leader), &buf, &buflen)); - T(addstr(base64_key + n, (size_t)MIN(len - n, 48), - &buf, &buflen)); - } - if (len > 15) - T(addstr(" )", (size_t)2, &buf, &buflen)); - break; - } - - case ns_t_nxt: { - int n, c; - - /* Next domain name. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - - /* Type bit map. */ - n = edata - rdata; - for (c = 0; c < n*8; c++) - if (NS_NXT_BIT_ISSET(c, rdata)) { - len = SPRINTF((tmp, " %s", p_type(c))); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - } - break; - } - - case ns_t_cert: { - u_int c_type, key_tag, alg; - int n; - unsigned int siz; - char base64_cert[8192], tmp1[40]; - const char *leader; - - c_type = ns_get16(rdata); rdata += NS_INT16SZ; - key_tag = ns_get16(rdata); rdata += NS_INT16SZ; - alg = (u_int) *rdata++; - - len = SPRINTF((tmp1, "%d %d %d ", c_type, key_tag, alg)); - T(addstr(tmp1, (size_t)len, &buf, &buflen)); - siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */ - if (siz > sizeof(base64_cert) * 3/4) { - const char *str = "record too long to print"; - T(addstr(str, strlen(str), &buf, &buflen)); - } - else { - len = b64_ntop(rdata, (size_t)(edata-rdata), - base64_cert, siz); - - if (len < 0) - goto formerr; - else if (len > 15) { - T(addstr(" (", (size_t)2, &buf, &buflen)); - leader = "\n\t\t"; - spaced = 0; - } - else - leader = " "; - - for (n = 0; n < len; n += 48) { - T(addstr(leader, strlen(leader), - &buf, &buflen)); - T(addstr(base64_cert + n, (size_t)MIN(len - n, 48), - &buf, &buflen)); - } - if (len > 15) - T(addstr(" )", (size_t)2, &buf, &buflen)); - } - break; - } - - case ns_t_tkey: { - /* KJD - need to complete this */ - u_long t; - int mode, err, keysize; - - /* Algorithm name. */ - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - T(addstr(" ", (size_t)1, &buf, &buflen)); - - /* Inception. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s ", p_secstodate(t))); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Experation. */ - t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s ", p_secstodate(t))); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* Mode , Error, Key Size. */ - /* Priority, Weight, Port. */ - mode = ns_get16(rdata); rdata += NS_INT16SZ; - err = ns_get16(rdata); rdata += NS_INT16SZ; - keysize = ns_get16(rdata); rdata += NS_INT16SZ; - len = SPRINTF((tmp, "%u %u %u ", mode, err, keysize)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - - /* XXX need to dump key, print otherdata length & other data */ - break; - } - - case ns_t_tsig: { - /* BEW - need to complete this */ - int n; - - T(len = addname(msg, msglen, &rdata, origin, &buf, &buflen)); - T(addstr(" ", (size_t)1, &buf, &buflen)); - rdata += 8; /* time */ - n = ns_get16(rdata); rdata += INT16SZ; - rdata += n; /* sig */ - n = ns_get16(rdata); rdata += INT16SZ; /* original id */ - sprintf(buf, "%d", ns_get16(rdata)); - rdata += INT16SZ; - addlen(strlen(buf), &buf, &buflen); - break; - } - - case ns_t_a6: { - struct in6_addr a; - int pbyte, pbit; - - /* prefix length */ - if (rdlen == 0U) goto formerr; - len = SPRINTF((tmp, "%d ", *rdata)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - pbit = *rdata; - if (pbit > 128) goto formerr; - pbyte = (pbit & ~7) / 8; - rdata++; - - /* address suffix: provided only when prefix len != 128 */ - if (pbit < 128) { - if (rdata + pbyte >= edata) goto formerr; - memset(&a, 0, sizeof(a)); - memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte); - (void) inet_ntop(AF_INET6, &a, buf, buflen); - addlen(strlen(buf), &buf, &buflen); - rdata += sizeof(a) - pbyte; - } - - /* prefix name: provided only when prefix len > 0 */ - if (pbit == 0) - break; - if (rdata >= edata) goto formerr; - T(addstr(" ", (size_t)1, &buf, &buflen)); - T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); - - break; - } - - case ns_t_opt: { - len = SPRINTF((tmp, "%u bytes", class)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - break; - } - - default: - comment = "unknown RR type"; - goto hexify; - } - return (buf - obuf); - formerr: - comment = "RR format error"; - hexify: { - int n, m; - char *p; - - len = SPRINTF((tmp, "\\# %tu%s\t; %s", edata - rdata, - rdlen != 0 ? " (" : "", comment)); - T(addstr(tmp, (size_t)len, &buf, &buflen)); - while (rdata < edata) { - p = tmp; - p += SPRINTF((p, "\n\t")); - spaced = 0; - n = MIN(16, edata - rdata); - for (m = 0; m < n; m++) - p += SPRINTF((p, "%02x ", rdata[m])); - T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen)); - if (n < 16) { - T(addstr(")", (size_t)1, &buf, &buflen)); - T(addtab((size_t)(p - tmp + 1), (size_t)48, spaced, &buf, &buflen)); - } - p = tmp; - p += SPRINTF((p, "; ")); - for (m = 0; m < n; m++) - *p++ = (isascii(rdata[m]) && isprint(rdata[m])) - ? rdata[m] - : '.'; - T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen)); - rdata += n; - } - return (buf - obuf); - } -} - -/* Private. */ - -/* - * size_t - * prune_origin(name, origin) - * Find out if the name is at or under the current origin. - * return: - * Number of characters in name before start of origin, - * or length of name if origin does not match. - * notes: - * This function should share code with samedomain(). - */ -static size_t -prune_origin(const char *name, const char *origin) { - const char *oname = name; - - while (*name != '\0') { - if (origin != NULL && ns_samename(name, origin) == 1) - return (name - oname - (name > oname)); - while (*name != '\0') { - if (*name == '\\') { - name++; - /* XXX need to handle \nnn form. */ - if (*name == '\0') - break; - } else if (*name == '.') { - name++; - break; - } - name++; - } - } - return (name - oname); -} - -/* - * int - * charstr(rdata, edata, buf, buflen) - * Format a into the presentation buffer. - * return: - * Number of rdata octets consumed - * 0 for protocol format error - * -1 for output buffer error - * side effects: - * buffer is advanced on success. - */ -static int -charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) { - const u_char *odata = rdata; - size_t save_buflen = *buflen; - char *save_buf = *buf; - - if (addstr("\"", (size_t)1, buf, buflen) < 0) - goto enospc; - if (rdata < edata) { - int n = *rdata; - - if (rdata + 1 + n <= edata) { - rdata++; - while (n-- > 0) { - if (strchr("\n\"\\", *rdata) != NULL) - if (addstr("\\", (size_t)1, buf, buflen) < 0) - goto enospc; - if (addstr((const char *)rdata, (size_t)1, - buf, buflen) < 0) - goto enospc; - rdata++; - } - } - } - if (addstr("\"", (size_t)1, buf, buflen) < 0) - goto enospc; - return (rdata - odata); - enospc: - errno = ENOSPC; - *buf = save_buf; - *buflen = save_buflen; - return (-1); -} - -static int -addname(const u_char *msg, size_t msglen, - const u_char **pp, const char *origin, - char **buf, size_t *buflen) -{ - size_t newlen, save_buflen = *buflen; - char *save_buf = *buf; - int n; - - n = dn_expand(msg, msg + msglen, *pp, *buf, (int)*buflen); - if (n < 0) - goto enospc; /* Guess. */ - newlen = prune_origin(*buf, origin); - if (**buf == '\0') { - goto root; - } else if (newlen == 0U) { - /* Use "@" instead of name. */ - if (newlen + 2 > *buflen) - goto enospc; /* No room for "@\0". */ - (*buf)[newlen++] = '@'; - (*buf)[newlen] = '\0'; - } else { - if (((origin == NULL || origin[0] == '\0') || - (origin[0] != '.' && origin[1] != '\0' && - (*buf)[newlen] == '\0')) && (*buf)[newlen - 1] != '.') { - /* No trailing dot. */ - root: - if (newlen + 2 > *buflen) - goto enospc; /* No room for ".\0". */ - (*buf)[newlen++] = '.'; - (*buf)[newlen] = '\0'; - } - } - *pp += n; - addlen(newlen, buf, buflen); - **buf = '\0'; - return (newlen); - enospc: - errno = ENOSPC; - *buf = save_buf; - *buflen = save_buflen; - return (-1); -} - -static void -addlen(size_t len, char **buf, size_t *buflen) { - assert(len <= *buflen); - *buf += len; - *buflen -= len; -} - -static int -addstr(const char *src, size_t len, char **buf, size_t *buflen) { - if (len >= *buflen) { - errno = ENOSPC; - return (-1); - } - memcpy(*buf, src, len); - addlen(len, buf, buflen); - **buf = '\0'; - return (0); -} - -static int -addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) { - size_t save_buflen = *buflen; - char *save_buf = *buf; - int t; - - if (spaced || len >= target - 1) { - T(addstr(" ", (size_t)2, buf, buflen)); - spaced = 1; - } else { - for (t = (target - len - 1) / 8; t >= 0; t--) - if (addstr("\t", (size_t)1, buf, buflen) < 0) { - *buflen = save_buflen; - *buf = save_buf; - return (-1); - } - spaced = 0; - } - return (spaced); -} diff --git a/libc/netbsd/nameser/ns_samedomain.c b/libc/netbsd/nameser/ns_samedomain.c deleted file mode 100644 index 04fdb6186..000000000 --- a/libc/netbsd/nameser/ns_samedomain.c +++ /dev/null @@ -1,211 +0,0 @@ -/* $NetBSD: ns_samedomain.c,v 1.2 2004/05/20 20:35:05 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1995,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#ifndef lint -#ifdef notdef -static const char rcsid[] = "Id: ns_samedomain.c,v 1.1.2.2.4.2 2004/03/16 12:34:17 marka Exp"; -#else -__RCSID("$NetBSD: ns_samedomain.c,v 1.2 2004/05/20 20:35:05 christos Exp $"); -#endif -#endif - -#include -#include "arpa_nameser.h" -#include -#include - -#ifndef _LIBC -/* - * int - * ns_samedomain(a, b) - * Check whether a name belongs to a domain. - * Inputs: - * a - the domain whose ancestory is being verified - * b - the potential ancestor we're checking against - * Return: - * boolean - is a at or below b? - * Notes: - * Trailing dots are first removed from name and domain. - * Always compare complete subdomains, not only whether the - * domain name is the trailing string of the given name. - * - * "host.foobar.top" lies in "foobar.top" and in "top" and in "" - * but NOT in "bar.top" - */ - -int -ns_samedomain(const char *a, const char *b) { - size_t la, lb; - int diff, i, escaped; - const char *cp; - - la = strlen(a); - lb = strlen(b); - - /* Ignore a trailing label separator (i.e. an unescaped dot) in 'a'. */ - if (la != 0U && a[la - 1] == '.') { - escaped = 0; - /* Note this loop doesn't get executed if la==1. */ - for (i = la - 2; i >= 0; i--) - if (a[i] == '\\') { - if (escaped) - escaped = 0; - else - escaped = 1; - } else - break; - if (!escaped) - la--; - } - - /* Ignore a trailing label separator (i.e. an unescaped dot) in 'b'. */ - if (lb != 0U && b[lb - 1] == '.') { - escaped = 0; - /* note this loop doesn't get executed if lb==1 */ - for (i = lb - 2; i >= 0; i--) - if (b[i] == '\\') { - if (escaped) - escaped = 0; - else - escaped = 1; - } else - break; - if (!escaped) - lb--; - } - - /* lb == 0 means 'b' is the root domain, so 'a' must be in 'b'. */ - if (lb == 0U) - return (1); - - /* 'b' longer than 'a' means 'a' can't be in 'b'. */ - if (lb > la) - return (0); - - /* 'a' and 'b' being equal at this point indicates sameness. */ - if (lb == la) - return (strncasecmp(a, b, lb) == 0); - - /* Ok, we know la > lb. */ - - diff = la - lb; - - /* - * If 'a' is only 1 character longer than 'b', then it can't be - * a subdomain of 'b' (because of the need for the '.' label - * separator). - */ - if (diff < 2) - return (0); - - /* - * If the character before the last 'lb' characters of 'b' - * isn't '.', then it can't be a match (this lets us avoid - * having "foobar.com" match "bar.com"). - */ - if (a[diff - 1] != '.') - return (0); - - /* - * We're not sure about that '.', however. It could be escaped - * and thus not a really a label separator. - */ - escaped = 0; - for (i = diff - 2; i >= 0; i--) - if (a[i] == '\\') { - if (escaped) - escaped = 0; - else - escaped = 1; - } else - break; - if (escaped) - return (0); - - /* Now compare aligned trailing substring. */ - cp = a + diff; - return (strncasecmp(cp, b, lb) == 0); -} - -/* - * int - * ns_subdomain(a, b) - * is "a" a subdomain of "b"? - */ -int -ns_subdomain(const char *a, const char *b) { - return (ns_samename(a, b) != 1 && ns_samedomain(a, b)); -} -#endif - -/* - * int - * ns_makecanon(src, dst, dstsize) - * make a canonical copy of domain name "src" - * notes: - * foo -> foo. - * foo. -> foo. - * foo.. -> foo. - * foo\. -> foo\.. - * foo\\. -> foo\\. - */ - -int -ns_makecanon(const char *src, char *dst, size_t dstsize) { - size_t n = strlen(src); - - if (n + sizeof "." > dstsize) { /* Note: sizeof == 2 */ - errno = EMSGSIZE; - return (-1); - } - strcpy(dst, src); - while (n >= 1U && dst[n - 1] == '.') /* Ends in "." */ - if (n >= 2U && dst[n - 2] == '\\' && /* Ends in "\." */ - (n < 3U || dst[n - 3] != '\\')) /* But not "\\." */ - break; - else - dst[--n] = '\0'; - dst[n++] = '.'; - dst[n] = '\0'; - return (0); -} - -/* - * int - * ns_samename(a, b) - * determine whether domain name "a" is the same as domain name "b" - * return: - * -1 on error - * 0 if names differ - * 1 if names are the same - */ - -int -ns_samename(const char *a, const char *b) { - char ta[NS_MAXDNAME], tb[NS_MAXDNAME]; - - if (ns_makecanon(a, ta, sizeof ta) < 0 || - ns_makecanon(b, tb, sizeof tb) < 0) - return (-1); - if (strcasecmp(ta, tb) == 0) - return (1); - else - return (0); -} diff --git a/libc/netbsd/nameser/ns_ttl.c b/libc/netbsd/nameser/ns_ttl.c deleted file mode 100644 index 087819470..000000000 --- a/libc/netbsd/nameser/ns_ttl.c +++ /dev/null @@ -1,164 +0,0 @@ -/* $NetBSD: ns_ttl.c,v 1.2 2004/05/20 20:35:05 christos Exp $ */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#ifndef lint -#ifdef notdef -static const char rcsid[] = "Id: ns_ttl.c,v 1.1.206.1 2004/03/09 08:33:45 marka Exp"; -#else -__RCSID("$NetBSD: ns_ttl.c,v 1.2 2004/05/20 20:35:05 christos Exp $"); -#endif -#endif - -/* Import. */ - -#include "arpa_nameser.h" - -#include -#include -#include -#include - -#ifdef SPRINTF_CHAR -# define SPRINTF(x) strlen(sprintf/**/x) -#else -# define SPRINTF(x) ((size_t)sprintf x) -#endif - -/* Forward. */ - -static int fmt1(int t, char s, char **buf, size_t *buflen); - -/* Macros. */ - -#define T(x) if ((x) < 0) return (-1); else - -/* Public. */ - -int -ns_format_ttl(u_long src, char *dst, size_t dstlen) { - char *odst = dst; - int secs, mins, hours, days, weeks, x; - char *p; - - secs = src % 60; src /= 60; - mins = src % 60; src /= 60; - hours = src % 24; src /= 24; - days = src % 7; src /= 7; - weeks = src; src = 0; - - x = 0; - if (weeks) { - T(fmt1(weeks, 'W', &dst, &dstlen)); - x++; - } - if (days) { - T(fmt1(days, 'D', &dst, &dstlen)); - x++; - } - if (hours) { - T(fmt1(hours, 'H', &dst, &dstlen)); - x++; - } - if (mins) { - T(fmt1(mins, 'M', &dst, &dstlen)); - x++; - } - if (secs || !(weeks || days || hours || mins)) { - T(fmt1(secs, 'S', &dst, &dstlen)); - x++; - } - - if (x > 1) { - int ch; - - for (p = odst; (ch = *p) != '\0'; p++) - if (isascii(ch) && isupper(ch)) - *p = tolower(ch); - } - - return (dst - odst); -} - -#ifndef _LIBC -int -ns_parse_ttl(const char *src, u_long *dst) { - u_long ttl, tmp; - int ch, digits, dirty; - - ttl = 0; - tmp = 0; - digits = 0; - dirty = 0; - while ((ch = *src++) != '\0') { - if (!isascii(ch) || !isprint(ch)) - goto einval; - if (isdigit(ch)) { - tmp *= 10; - tmp += (ch - '0'); - digits++; - continue; - } - if (digits == 0) - goto einval; - if (islower(ch)) - ch = toupper(ch); - switch (ch) { - case 'W': tmp *= 7; /*FALLTHROUGH*/ - case 'D': tmp *= 24; /*FALLTHROUGH*/ - case 'H': tmp *= 60; /*FALLTHROUGH*/ - case 'M': tmp *= 60; /*FALLTHROUGH*/ - case 'S': break; - default: goto einval; - } - ttl += tmp; - tmp = 0; - digits = 0; - dirty = 1; - } - if (digits > 0) { - if (dirty) - goto einval; - else - ttl += tmp; - } - *dst = ttl; - return (0); - - einval: - errno = EINVAL; - return (-1); -} -#endif - -/* Private. */ - -static int -fmt1(int t, char s, char **buf, size_t *buflen) { - char tmp[50]; - size_t len; - - len = SPRINTF((tmp, "%d%c", t, s)); - if (len + 1 > *buflen) - return (-1); - strcpy(*buf, tmp); - *buf += len; - *buflen -= len; - return (0); -} diff --git a/libc/netbsd/net/base64.c b/libc/netbsd/net/base64.c deleted file mode 100644 index 70caaf76a..000000000 --- a/libc/netbsd/net/base64.c +++ /dev/null @@ -1,340 +0,0 @@ -/* $NetBSD: base64.c,v 1.8 2002/11/11 01:15:17 thorpej Exp $ */ - -/* - * Copyright (c) 1996 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -/* - * Portions Copyright (c) 1995 by International Business Machines, Inc. - * - * International Business Machines, Inc. (hereinafter called IBM) grants - * permission under its copyrights to use, copy, modify, and distribute this - * Software with or without fee, provided that the above copyright notice and - * all paragraphs of this notice appear in all copies, and that the name of IBM - * not be used in connection with the marketing of any product incorporating - * the Software or modifications thereof, without specific, written prior - * permission. - * - * To the extent it has a right to do so, IBM grants an immunity from suit - * under its patents, if any, for the use, sale or manufacture of products to - * the extent that such products are used for performing Domain Name System - * dynamic updates in TCP/IP networks by means of the Software. No immunity is - * granted for any product per se or for any other function of any product. - * - * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, - * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN - * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: base64.c,v 1.8 2002/11/11 01:15:17 thorpej Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include -#include -#include "arpa_nameser.h" - -#include -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include - -#include -#include - -static const char Base64[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const char Pad64 = '='; - -/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) - The following encoding technique is taken from RFC 1521 by Borenstein - and Freed. It is reproduced here in a slightly edited form for - convenience. - - A 65-character subset of US-ASCII is used, enabling 6 bits to be - represented per printable character. (The extra 65th character, "=", - is used to signify a special processing function.) - - The encoding process represents 24-bit groups of input bits as output - strings of 4 encoded characters. Proceeding from left to right, a - 24-bit input group is formed by concatenating 3 8-bit input groups. - These 24 bits are then treated as 4 concatenated 6-bit groups, each - of which is translated into a single digit in the base64 alphabet. - - Each 6-bit group is used as an index into an array of 64 printable - characters. The character referenced by the index is placed in the - output string. - - Table 1: The Base64 Alphabet - - Value Encoding Value Encoding Value Encoding Value Encoding - 0 A 17 R 34 i 51 z - 1 B 18 S 35 j 52 0 - 2 C 19 T 36 k 53 1 - 3 D 20 U 37 l 54 2 - 4 E 21 V 38 m 55 3 - 5 F 22 W 39 n 56 4 - 6 G 23 X 40 o 57 5 - 7 H 24 Y 41 p 58 6 - 8 I 25 Z 42 q 59 7 - 9 J 26 a 43 r 60 8 - 10 K 27 b 44 s 61 9 - 11 L 28 c 45 t 62 + - 12 M 29 d 46 u 63 / - 13 N 30 e 47 v - 14 O 31 f 48 w (pad) = - 15 P 32 g 49 x - 16 Q 33 h 50 y - - Special processing is performed if fewer than 24 bits are available - at the end of the data being encoded. A full encoding quantum is - always completed at the end of a quantity. When fewer than 24 input - bits are available in an input group, zero bits are added (on the - right) to form an integral number of 6-bit groups. Padding at the - end of the data is performed using the '=' character. - - Since all base64 input is an integral number of octets, only the - ------------------------------------------------- - following cases can arise: - - (1) the final quantum of encoding input is an integral - multiple of 24 bits; here, the final unit of encoded - output will be an integral multiple of 4 characters - with no "=" padding, - (2) the final quantum of encoding input is exactly 8 bits; - here, the final unit of encoded output will be two - characters followed by two "=" padding characters, or - (3) the final quantum of encoding input is exactly 16 bits; - here, the final unit of encoded output will be three - characters followed by one "=" padding character. - */ - -int -b64_ntop(src, srclength, target, targsize) - u_char const *src; - size_t srclength; - char *target; - size_t targsize; -{ - size_t datalength = 0; - u_char input[3]; - u_char output[4]; - size_t i; - - assert(src != NULL); - assert(target != NULL); - - while (2 < srclength) { - input[0] = *src++; - input[1] = *src++; - input[2] = *src++; - srclength -= 3; - - output[0] = (u_int32_t)input[0] >> 2; - output[1] = ((u_int32_t)(input[0] & 0x03) << 4) + - ((u_int32_t)input[1] >> 4); - output[2] = ((u_int32_t)(input[1] & 0x0f) << 2) + - ((u_int32_t)input[2] >> 6); - output[3] = input[2] & 0x3f; - assert(output[0] < 64); - assert(output[1] < 64); - assert(output[2] < 64); - assert(output[3] < 64); - - if (datalength + 4 > targsize) - return (-1); - target[datalength++] = Base64[output[0]]; - target[datalength++] = Base64[output[1]]; - target[datalength++] = Base64[output[2]]; - target[datalength++] = Base64[output[3]]; - } - - /* Now we worry about padding. */ - if (0 != srclength) { - /* Get what's left. */ - input[0] = input[1] = input[2] = '\0'; - for (i = 0; i < srclength; i++) - input[i] = *src++; - - output[0] = (u_int32_t)input[0] >> 2; - output[1] = ((u_int32_t)(input[0] & 0x03) << 4) + - ((u_int32_t)input[1] >> 4); - output[2] = ((u_int32_t)(input[1] & 0x0f) << 2) + - ((u_int32_t)input[2] >> 6); - assert(output[0] < 64); - assert(output[1] < 64); - assert(output[2] < 64); - - if (datalength + 4 > targsize) - return (-1); - target[datalength++] = Base64[output[0]]; - target[datalength++] = Base64[output[1]]; - if (srclength == 1) - target[datalength++] = Pad64; - else - target[datalength++] = Base64[output[2]]; - target[datalength++] = Pad64; - } - if (datalength >= targsize) - return (-1); - target[datalength] = '\0'; /* Returned value doesn't count \0. */ - return (datalength); -} - -/* skips all whitespace anywhere. - converts characters, four at a time, starting at (or after) - src from base - 64 numbers into three 8 bit bytes in the target area. - it returns the number of data bytes stored at the target, or -1 on error. - */ - -int -b64_pton(src, target, targsize) - char const *src; - u_char *target; - size_t targsize; -{ - size_t tarindex; - int state, ch; - char *pos; - - assert(src != NULL); - assert(target != NULL); - - state = 0; - tarindex = 0; - - while ((ch = (u_char) *src++) != '\0') { - if (isspace(ch)) /* Skip whitespace anywhere. */ - continue; - - if (ch == Pad64) - break; - - pos = strchr(Base64, ch); - if (pos == 0) /* A non-base64 character. */ - return (-1); - - switch (state) { - case 0: - if (target) { - if (tarindex >= targsize) - return (-1); - target[tarindex] = (pos - Base64) << 2; - } - state = 1; - break; - case 1: - if (target) { - if (tarindex + 1 >= targsize) - return (-1); - target[tarindex] |= - (u_int32_t)(pos - Base64) >> 4; - target[tarindex+1] = ((pos - Base64) & 0x0f) - << 4 ; - } - tarindex++; - state = 2; - break; - case 2: - if (target) { - if (tarindex + 1 >= targsize) - return (-1); - target[tarindex] |= - (u_int32_t)(pos - Base64) >> 2; - target[tarindex+1] = ((pos - Base64) & 0x03) - << 6; - } - tarindex++; - state = 3; - break; - case 3: - if (target) { - if (tarindex >= targsize) - return (-1); - target[tarindex] |= (pos - Base64); - } - tarindex++; - state = 0; - break; - default: - abort(); - } - } - - /* - * We are done decoding Base-64 chars. Let's see if we ended - * on a byte boundary, and/or with erroneous trailing characters. - */ - - if (ch == Pad64) { /* We got a pad char. */ - ch = *src++; /* Skip it, get next. */ - switch (state) { - case 0: /* Invalid = in first position */ - case 1: /* Invalid = in second position */ - return (-1); - - case 2: /* Valid, means one byte of info */ - /* Skip any number of spaces. */ - for (; ch != '\0'; ch = (u_char) *src++) - if (!isspace(ch)) - break; - /* Make sure there is another trailing = sign. */ - if (ch != Pad64) - return (-1); - ch = *src++; /* Skip the = */ - /* Fall through to "single trailing =" case. */ - /* FALLTHROUGH */ - - case 3: /* Valid, means two bytes of info */ - /* - * We know this char is an =. Is there anything but - * whitespace after it? - */ - for (; ch != '\0'; ch = (u_char) *src++) - if (!isspace(ch)) - return (-1); - - /* - * Now make sure for cases 2 and 3 that the "extra" - * bits that slopped past the last full byte were - * zeros. If we don't check them, they become a - * subliminal channel. - */ - if (target && target[tarindex] != 0) - return (-1); - } - } else { - /* - * We ended by seeing the end of the string. Make sure we - * have no partial bytes lying around. - */ - if (state != 0) - return (-1); - } - - return (tarindex); -} diff --git a/libc/netbsd/net/getaddrinfo.c b/libc/netbsd/net/getaddrinfo.c deleted file mode 100644 index 2dd3d971e..000000000 --- a/libc/netbsd/net/getaddrinfo.c +++ /dev/null @@ -1,1792 +0,0 @@ -/* $NetBSD: getaddrinfo.c,v 1.82 2006/03/25 12:09:40 rpaulo Exp $ */ -/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */ - -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Issues to be discussed: - * - Thread safe-ness must be checked. - * - Return values. There are nonstandard return values defined and used - * in the source code. This is because RFC2553 is silent about which error - * code must be returned for which situation. - * - IPv4 classful (shortened) form. RFC2553 is silent about it. XNET 5.2 - * says to use inet_aton() to convert IPv4 numeric to binary (alows - * classful form as a result). - * current code - disallow classful form for IPv4 (due to use of inet_pton). - * - freeaddrinfo(NULL). RFC2553 is silent about it. XNET 5.2 says it is - * invalid. - * current code - SEGV on freeaddrinfo(NULL) - * Note: - * - We use getipnodebyname() just for thread-safeness. There's no intent - * to let it do PF_UNSPEC (actually we never pass PF_UNSPEC to - * getipnodebyname(). - * - The code filters out AFs that are not supported by the kernel, - * when globbing NULL hostname (to loopback, or wildcard). Is it the right - * thing to do? What is the relationship with post-RFC2553 AI_ADDRCONFIG - * in ai_flags? - * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague. - * (1) what should we do against numeric hostname (2) what should we do - * against NULL hostname (3) what is AI_ADDRCONFIG itself. AF not ready? - * non-loopback address configured? global address configured? - * - To avoid search order issue, we have a big amount of code duplicate - * from gethnamaddr.c and some other places. The issues that there's no - * lower layer function to lookup "IPv4 or IPv6" record. Calling - * gethostbyname2 from getaddrinfo will end up in wrong search order, as - * follows: - * - The code makes use of following calls when asked to resolver with - * ai_family = PF_UNSPEC: - * getipnodebyname(host, AF_INET6); - * getipnodebyname(host, AF_INET); - * This will result in the following queries if the node is configure to - * prefer /etc/hosts than DNS: - * lookup /etc/hosts for IPv6 address - * lookup DNS for IPv6 address - * lookup /etc/hosts for IPv4 address - * lookup DNS for IPv4 address - * which may not meet people's requirement. - * The right thing to happen is to have underlying layer which does - * PF_UNSPEC lookup (lookup both) and return chain of addrinfos. - * This would result in a bit of code duplicate with _dns_ghbyname() and - * friends. - */ - -#include -#include -#include -#include -#include -#include -#include -#include "arpa_nameser.h" -#include -#include -#include -#include -#include "resolv_private.h" -#include -#include -#include -#include -#include - -#include -#include -#include "nsswitch.h" - -#define SUCCESS 0 -#define ANY 0 -#define YES 1 -#define NO 0 - -static const char in_addrany[] = { 0, 0, 0, 0 }; -static const char in_loopback[] = { 127, 0, 0, 1 }; -#ifdef INET6 -static const char in6_addrany[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; -static const char in6_loopback[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 -}; -#endif - -static const struct afd { - int a_af; - int a_addrlen; - int a_socklen; - int a_off; - const char *a_addrany; - const char *a_loopback; - int a_scoped; -} afdl [] = { -#ifdef INET6 - {PF_INET6, sizeof(struct in6_addr), - sizeof(struct sockaddr_in6), - offsetof(struct sockaddr_in6, sin6_addr), - in6_addrany, in6_loopback, 1}, -#endif - {PF_INET, sizeof(struct in_addr), - sizeof(struct sockaddr_in), - offsetof(struct sockaddr_in, sin_addr), - in_addrany, in_loopback, 0}, - {0, 0, 0, 0, NULL, NULL, 0}, -}; - -struct explore { - int e_af; - int e_socktype; - int e_protocol; - const char *e_protostr; - int e_wild; -#define WILD_AF(ex) ((ex)->e_wild & 0x01) -#define WILD_SOCKTYPE(ex) ((ex)->e_wild & 0x02) -#define WILD_PROTOCOL(ex) ((ex)->e_wild & 0x04) -}; - -static const struct explore explore[] = { -#if 0 - { PF_LOCAL, 0, ANY, ANY, NULL, 0x01 }, -#endif -#ifdef INET6 - { PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_INET6, SOCK_RAW, ANY, NULL, 0x05 }, -#endif - { PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_INET, SOCK_RAW, ANY, NULL, 0x05 }, - { PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 }, - { PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 }, - { PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 }, - { -1, 0, 0, NULL, 0 }, -}; - -#ifdef INET6 -#define PTON_MAX 16 -#else -#define PTON_MAX 4 -#endif - -static const ns_src default_dns_files[] = { - { NSSRC_FILES, NS_SUCCESS }, - { NSSRC_DNS, NS_SUCCESS }, - { 0, 0 } -}; - -#define MAXPACKET (64*1024) - -typedef union { - HEADER hdr; - u_char buf[MAXPACKET]; -} querybuf; - -struct res_target { - struct res_target *next; - const char *name; /* domain name */ - int qclass, qtype; /* class and type of query */ - u_char *answer; /* buffer to put answer */ - int anslen; /* size of answer buffer */ - int n; /* result length */ -}; - -static int str2number(const char *); -static int explore_fqdn(const struct addrinfo *, const char *, - const char *, struct addrinfo **); -static int explore_null(const struct addrinfo *, - const char *, struct addrinfo **); -static int explore_numeric(const struct addrinfo *, const char *, - const char *, struct addrinfo **, const char *); -static int explore_numeric_scope(const struct addrinfo *, const char *, - const char *, struct addrinfo **); -static int get_canonname(const struct addrinfo *, - struct addrinfo *, const char *); -static struct addrinfo *get_ai(const struct addrinfo *, - const struct afd *, const char *); -static int get_portmatch(const struct addrinfo *, const char *); -static int get_port(const struct addrinfo *, const char *, int); -static const struct afd *find_afd(int); -#ifdef INET6 -static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *); -#endif - -static struct addrinfo *getanswer(const querybuf *, int, const char *, int, - const struct addrinfo *); -static void aisort(struct addrinfo *s, res_state res); -static int _dns_getaddrinfo(void *, void *, va_list); -static void _sethtent(FILE **); -static void _endhtent(FILE **); -static struct addrinfo *_gethtent(FILE **, const char *, - const struct addrinfo *); -static int _files_getaddrinfo(void *, void *, va_list); - -static int res_queryN(const char *, struct res_target *, res_state); -static int res_searchN(const char *, struct res_target *, res_state); -static int res_querydomainN(const char *, const char *, - struct res_target *, res_state); - -static const char * const ai_errlist[] = { - "Success", - "Address family for hostname not supported", /* EAI_ADDRFAMILY */ - "Temporary failure in name resolution", /* EAI_AGAIN */ - "Invalid value for ai_flags", /* EAI_BADFLAGS */ - "Non-recoverable failure in name resolution", /* EAI_FAIL */ - "ai_family not supported", /* EAI_FAMILY */ - "Memory allocation failure", /* EAI_MEMORY */ - "No address associated with hostname", /* EAI_NODATA */ - "hostname nor servname provided, or not known", /* EAI_NONAME */ - "servname not supported for ai_socktype", /* EAI_SERVICE */ - "ai_socktype not supported", /* EAI_SOCKTYPE */ - "System error returned in errno", /* EAI_SYSTEM */ - "Invalid value for hints", /* EAI_BADHINTS */ - "Resolved protocol is unknown", /* EAI_PROTOCOL */ - "Argument buffer overflow", /* EAI_OVERFLOW */ - "Unknown error", /* EAI_MAX */ -}; - -/* XXX macros that make external reference is BAD. */ - -#define GET_AI(ai, afd, addr) \ -do { \ - /* external reference: pai, error, and label free */ \ - (ai) = get_ai(pai, (afd), (addr)); \ - if ((ai) == NULL) { \ - error = EAI_MEMORY; \ - goto free; \ - } \ -} while (/*CONSTCOND*/0) - -#define GET_PORT(ai, serv) \ -do { \ - /* external reference: error and label free */ \ - error = get_port((ai), (serv), 0); \ - if (error != 0) \ - goto free; \ -} while (/*CONSTCOND*/0) - -#define GET_CANONNAME(ai, str) \ -do { \ - /* external reference: pai, error and label free */ \ - error = get_canonname(pai, (ai), (str)); \ - if (error != 0) \ - goto free; \ -} while (/*CONSTCOND*/0) - -#define ERR(err) \ -do { \ - /* external reference: error, and label bad */ \ - error = (err); \ - goto bad; \ - /*NOTREACHED*/ \ -} while (/*CONSTCOND*/0) - -#define MATCH_FAMILY(x, y, w) \ - ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || \ - (y) == PF_UNSPEC))) -#define MATCH(x, y, w) \ - ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY))) - -const char * -gai_strerror(int ecode) -{ - if (ecode < 0 || ecode > EAI_MAX) - ecode = EAI_MAX; - return ai_errlist[ecode]; -} - -void -freeaddrinfo(struct addrinfo *ai) -{ - struct addrinfo *next; - - assert(ai != NULL); - - do { - next = ai->ai_next; - if (ai->ai_canonname) - free(ai->ai_canonname); - /* no need to free(ai->ai_addr) */ - free(ai); - ai = next; - } while (ai); -} - -static int -str2number(const char *p) -{ - char *ep; - unsigned long v; - - assert(p != NULL); - - if (*p == '\0') - return -1; - ep = NULL; - errno = 0; - v = strtoul(p, &ep, 10); - if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) - return v; - else - return -1; -} - -int -getaddrinfo(const char *hostname, const char *servname, - const struct addrinfo *hints, struct addrinfo **res) -{ - struct addrinfo sentinel; - struct addrinfo *cur; - int error = 0; - struct addrinfo ai; - struct addrinfo ai0; - struct addrinfo *pai; - const struct explore *ex; - - /* hostname is allowed to be NULL */ - /* servname is allowed to be NULL */ - /* hints is allowed to be NULL */ - assert(res != NULL); - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - pai = &ai; - pai->ai_flags = 0; - pai->ai_family = PF_UNSPEC; - pai->ai_socktype = ANY; - pai->ai_protocol = ANY; - pai->ai_addrlen = 0; - pai->ai_canonname = NULL; - pai->ai_addr = NULL; - pai->ai_next = NULL; - - if (hostname == NULL && servname == NULL) - return EAI_NONAME; - if (hints) { - /* error check for hints */ - if (hints->ai_addrlen || hints->ai_canonname || - hints->ai_addr || hints->ai_next) - ERR(EAI_BADHINTS); /* xxx */ - if (hints->ai_flags & ~AI_MASK) - ERR(EAI_BADFLAGS); - switch (hints->ai_family) { - case PF_UNSPEC: - case PF_INET: -#ifdef INET6 - case PF_INET6: -#endif - break; - default: - ERR(EAI_FAMILY); - } - memcpy(pai, hints, sizeof(*pai)); - - /* - * if both socktype/protocol are specified, check if they - * are meaningful combination. - */ - if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) { - for (ex = explore; ex->e_af >= 0; ex++) { - if (pai->ai_family != ex->e_af) - continue; - if (ex->e_socktype == ANY) - continue; - if (ex->e_protocol == ANY) - continue; - if (pai->ai_socktype == ex->e_socktype - && pai->ai_protocol != ex->e_protocol) { - ERR(EAI_BADHINTS); - } - } - } - } - - /* - * check for special cases. (1) numeric servname is disallowed if - * socktype/protocol are left unspecified. (2) servname is disallowed - * for raw and other inet{,6} sockets. - */ - if (MATCH_FAMILY(pai->ai_family, PF_INET, 1) -#ifdef PF_INET6 - || MATCH_FAMILY(pai->ai_family, PF_INET6, 1) -#endif - ) { - ai0 = *pai; /* backup *pai */ - - if (pai->ai_family == PF_UNSPEC) { -#ifdef PF_INET6 - pai->ai_family = PF_INET6; -#else - pai->ai_family = PF_INET; -#endif - } - error = get_portmatch(pai, servname); - if (error) - ERR(error); - - *pai = ai0; - } - - ai0 = *pai; - - /* NULL hostname, or numeric hostname */ - for (ex = explore; ex->e_af >= 0; ex++) { - *pai = ai0; - - /* PF_UNSPEC entries are prepared for DNS queries only */ - if (ex->e_af == PF_UNSPEC) - continue; - - if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex))) - continue; - if (!MATCH(pai->ai_socktype, ex->e_socktype, WILD_SOCKTYPE(ex))) - continue; - if (!MATCH(pai->ai_protocol, ex->e_protocol, WILD_PROTOCOL(ex))) - continue; - - if (pai->ai_family == PF_UNSPEC) - pai->ai_family = ex->e_af; - if (pai->ai_socktype == ANY && ex->e_socktype != ANY) - pai->ai_socktype = ex->e_socktype; - if (pai->ai_protocol == ANY && ex->e_protocol != ANY) - pai->ai_protocol = ex->e_protocol; - - if (hostname == NULL) - error = explore_null(pai, servname, &cur->ai_next); - else - error = explore_numeric_scope(pai, hostname, servname, - &cur->ai_next); - - if (error) - goto free; - - while (cur->ai_next) - cur = cur->ai_next; - } - - /* - * XXX - * If numeric representation of AF1 can be interpreted as FQDN - * representation of AF2, we need to think again about the code below. - */ - if (sentinel.ai_next) - goto good; - - if (hostname == NULL) - ERR(EAI_NODATA); - if (pai->ai_flags & AI_NUMERICHOST) - ERR(EAI_NONAME); - - /* - * hostname as alphabetical name. - * we would like to prefer AF_INET6 than AF_INET, so we'll make a - * outer loop by AFs. - */ - for (ex = explore; ex->e_af >= 0; ex++) { - *pai = ai0; - - /* require exact match for family field */ - if (pai->ai_family != ex->e_af) - continue; - - if (!MATCH(pai->ai_socktype, ex->e_socktype, - WILD_SOCKTYPE(ex))) { - continue; - } - if (!MATCH(pai->ai_protocol, ex->e_protocol, - WILD_PROTOCOL(ex))) { - continue; - } - - if (pai->ai_socktype == ANY && ex->e_socktype != ANY) - pai->ai_socktype = ex->e_socktype; - if (pai->ai_protocol == ANY && ex->e_protocol != ANY) - pai->ai_protocol = ex->e_protocol; - - error = explore_fqdn(pai, hostname, servname, - &cur->ai_next); - - while (cur && cur->ai_next) - cur = cur->ai_next; - } - - /* XXX */ - if (sentinel.ai_next) - error = 0; - - if (error) - goto free; - if (error == 0) { - if (sentinel.ai_next) { - good: - *res = sentinel.ai_next; - return SUCCESS; - } else - error = EAI_FAIL; - } - free: - bad: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); - *res = NULL; - return error; -} - -/* - * FQDN hostname, DNS lookup - */ -static int -explore_fqdn(const struct addrinfo *pai, const char *hostname, - const char *servname, struct addrinfo **res) -{ - struct addrinfo *result; - struct addrinfo *cur; - int error = 0; - static const ns_dtab dtab[] = { - NS_FILES_CB(_files_getaddrinfo, NULL) - { NSSRC_DNS, _dns_getaddrinfo, NULL }, /* force -DHESIOD */ - NS_NIS_CB(_yp_getaddrinfo, NULL) - { 0, 0, 0 } - }; - - assert(pai != NULL); - /* hostname may be NULL */ - /* servname may be NULL */ - assert(res != NULL); - - result = NULL; - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - - switch (nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo", - default_dns_files, hostname, pai)) { - case NS_TRYAGAIN: - error = EAI_AGAIN; - goto free; - case NS_UNAVAIL: - error = EAI_FAIL; - goto free; - case NS_NOTFOUND: - error = EAI_NODATA; - goto free; - case NS_SUCCESS: - error = 0; - for (cur = result; cur; cur = cur->ai_next) { - GET_PORT(cur, servname); - /* canonname should be filled already */ - } - break; - } - - *res = result; - - return 0; - -free: - if (result) - freeaddrinfo(result); - return error; -} - -/* - * hostname == NULL. - * passive socket -> anyaddr (0.0.0.0 or ::) - * non-passive socket -> localhost (127.0.0.1 or ::1) - */ -static int -explore_null(const struct addrinfo *pai, const char *servname, - struct addrinfo **res) -{ - int s; - const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; - int error; - - assert(pai != NULL); - /* servname may be NULL */ - assert(res != NULL); - - *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; - - /* - * filter out AFs that are not supported by the kernel - * XXX errno? - */ - s = socket(pai->ai_family, SOCK_DGRAM, 0); - if (s < 0) { - if (errno != EMFILE) - return 0; - } else - close(s); - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - - afd = find_afd(pai->ai_family); - if (afd == NULL) - return 0; - - if (pai->ai_flags & AI_PASSIVE) { - GET_AI(cur->ai_next, afd, afd->a_addrany); - /* xxx meaningless? - * GET_CANONNAME(cur->ai_next, "anyaddr"); - */ - GET_PORT(cur->ai_next, servname); - } else { - GET_AI(cur->ai_next, afd, afd->a_loopback); - /* xxx meaningless? - * GET_CANONNAME(cur->ai_next, "localhost"); - */ - GET_PORT(cur->ai_next, servname); - } - cur = cur->ai_next; - - *res = sentinel.ai_next; - return 0; - -free: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); - return error; -} - -/* - * numeric hostname - */ -static int -explore_numeric(const struct addrinfo *pai, const char *hostname, - const char *servname, struct addrinfo **res, const char *canonname) -{ - const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; - int error; - char pton[PTON_MAX]; - - assert(pai != NULL); - /* hostname may be NULL */ - /* servname may be NULL */ - assert(res != NULL); - - *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - - afd = find_afd(pai->ai_family); - if (afd == NULL) - return 0; - - switch (afd->a_af) { -#if 0 /*X/Open spec*/ - case AF_INET: - if (inet_aton(hostname, (struct in_addr *)pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - if ((pai->ai_flags & AI_CANONNAME)) { - /* - * Set the numeric address itself as - * the canonical name, based on a - * clarification in rfc2553bis-03. - */ - GET_CANONNAME(cur->ai_next, canonname); - } - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /*xxx*/ - } - break; -#endif - default: - if (inet_pton(afd->a_af, hostname, pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - if ((pai->ai_flags & AI_CANONNAME)) { - /* - * Set the numeric address itself as - * the canonical name, based on a - * clarification in rfc2553bis-03. - */ - GET_CANONNAME(cur->ai_next, canonname); - } - while (cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /*xxx*/ - } - break; - } - - *res = sentinel.ai_next; - return 0; - -free: -bad: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); - return error; -} - -/* - * numeric hostname with scope - */ -static int -explore_numeric_scope(const struct addrinfo *pai, const char *hostname, - const char *servname, struct addrinfo **res) -{ -#if !defined(SCOPE_DELIMITER) || !defined(INET6) - return explore_numeric(pai, hostname, servname, res, hostname); -#else - const struct afd *afd; - struct addrinfo *cur; - int error; - char *cp, *hostname2 = NULL, *scope, *addr; - struct sockaddr_in6 *sin6; - - assert(pai != NULL); - /* hostname may be NULL */ - /* servname may be NULL */ - assert(res != NULL); - - /* - * if the servname does not match socktype/protocol, ignore it. - */ - if (get_portmatch(pai, servname) != 0) - return 0; - - afd = find_afd(pai->ai_family); - if (afd == NULL) - return 0; - - if (!afd->a_scoped) - return explore_numeric(pai, hostname, servname, res, hostname); - - cp = strchr(hostname, SCOPE_DELIMITER); - if (cp == NULL) - return explore_numeric(pai, hostname, servname, res, hostname); - - /* - * Handle special case of - */ - hostname2 = strdup(hostname); - if (hostname2 == NULL) - return EAI_MEMORY; - /* terminate at the delimiter */ - hostname2[cp - hostname] = '\0'; - addr = hostname2; - scope = cp + 1; - - error = explore_numeric(pai, addr, servname, res, hostname); - if (error == 0) { - u_int32_t scopeid; - - for (cur = *res; cur; cur = cur->ai_next) { - if (cur->ai_family != AF_INET6) - continue; - sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr; - if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) { - free(hostname2); - return(EAI_NODATA); /* XXX: is return OK? */ - } - sin6->sin6_scope_id = scopeid; - } - } - - free(hostname2); - - return error; -#endif -} - -static int -get_canonname(const struct addrinfo *pai, struct addrinfo *ai, const char *str) -{ - - assert(pai != NULL); - assert(ai != NULL); - assert(str != NULL); - - if ((pai->ai_flags & AI_CANONNAME) != 0) { - ai->ai_canonname = strdup(str); - if (ai->ai_canonname == NULL) - return EAI_MEMORY; - } - return 0; -} - -static struct addrinfo * -get_ai(const struct addrinfo *pai, const struct afd *afd, const char *addr) -{ - char *p; - struct addrinfo *ai; - - assert(pai != NULL); - assert(afd != NULL); - assert(addr != NULL); - - ai = (struct addrinfo *)malloc(sizeof(struct addrinfo) - + (afd->a_socklen)); - if (ai == NULL) - return NULL; - - memcpy(ai, pai, sizeof(struct addrinfo)); - ai->ai_addr = (struct sockaddr *)(void *)(ai + 1); - memset(ai->ai_addr, 0, (size_t)afd->a_socklen); - -#ifdef HAVE_SA_LEN - ai->ai_addr->sa_len = afd->a_socklen; -#endif - - ai->ai_addrlen = afd->a_socklen; -#if defined (__alpha__) || (defined(__i386__) && defined(_LP64)) || defined(__sparc64__) - ai->__ai_pad0 = 0; -#endif - ai->ai_addr->sa_family = ai->ai_family = afd->a_af; - p = (char *)(void *)(ai->ai_addr); - memcpy(p + afd->a_off, addr, (size_t)afd->a_addrlen); - return ai; -} - -static int -get_portmatch(const struct addrinfo *ai, const char *servname) -{ - - assert(ai != NULL); - /* servname may be NULL */ - - return get_port(ai, servname, 1); -} - -static int -get_port(const struct addrinfo *ai, const char *servname, int matchonly) -{ - const char *proto; - struct servent *sp; - int port; - int allownumeric; - - assert(ai != NULL); - /* servname may be NULL */ - - if (servname == NULL) - return 0; - switch (ai->ai_family) { - case AF_INET: -#ifdef AF_INET6 - case AF_INET6: -#endif - break; - default: - return 0; - } - - switch (ai->ai_socktype) { - case SOCK_RAW: - return EAI_SERVICE; - case SOCK_DGRAM: - case SOCK_STREAM: - allownumeric = 1; - break; - case ANY: - allownumeric = 0; - break; - default: - return EAI_SOCKTYPE; - } - - port = str2number(servname); - if (port >= 0) { - if (!allownumeric) - return EAI_SERVICE; - if (port < 0 || port > 65535) - return EAI_SERVICE; - port = htons(port); - } else { - if (ai->ai_flags & AI_NUMERICSERV) - return EAI_NONAME; - - switch (ai->ai_socktype) { - case SOCK_DGRAM: - proto = "udp"; - break; - case SOCK_STREAM: - proto = "tcp"; - break; - default: - proto = NULL; - break; - } - - if ((sp = getservbyname(servname, proto)) == NULL) - return EAI_SERVICE; - port = sp->s_port; - } - - if (!matchonly) { - switch (ai->ai_family) { - case AF_INET: - ((struct sockaddr_in *)(void *) - ai->ai_addr)->sin_port = port; - break; -#ifdef INET6 - case AF_INET6: - ((struct sockaddr_in6 *)(void *) - ai->ai_addr)->sin6_port = port; - break; -#endif - } - } - - return 0; -} - -static const struct afd * -find_afd(int af) -{ - const struct afd *afd; - - if (af == PF_UNSPEC) - return NULL; - for (afd = afdl; afd->a_af; afd++) { - if (afd->a_af == af) - return afd; - } - return NULL; -} - -#ifdef INET6 -/* convert a string to a scope identifier. XXX: IPv6 specific */ -static int -ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid) -{ - u_long lscopeid; - struct in6_addr *a6; - char *ep; - - assert(scope != NULL); - assert(sin6 != NULL); - assert(scopeid != NULL); - - a6 = &sin6->sin6_addr; - - /* empty scopeid portion is invalid */ - if (*scope == '\0') - return -1; - - if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) { - /* - * We currently assume a one-to-one mapping between links - * and interfaces, so we simply use interface indices for - * like-local scopes. - */ - *scopeid = if_nametoindex(scope); - if (*scopeid == 0) - goto trynumeric; - return 0; - } - - /* still unclear about literal, allow numeric only - placeholder */ - if (IN6_IS_ADDR_SITELOCAL(a6) || IN6_IS_ADDR_MC_SITELOCAL(a6)) - goto trynumeric; - if (IN6_IS_ADDR_MC_ORGLOCAL(a6)) - goto trynumeric; - else - goto trynumeric; /* global */ - - /* try to convert to a numeric id as a last resort */ - trynumeric: - errno = 0; - lscopeid = strtoul(scope, &ep, 10); - *scopeid = (u_int32_t)(lscopeid & 0xffffffffUL); - if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid) - return 0; - else - return -1; -} -#endif - -/* code duplicate with gethnamaddr.c */ - -static const char AskedForGot[] = - "gethostby*.getanswer: asked for \"%s\", got \"%s\""; - -static struct addrinfo * -getanswer(const querybuf *answer, int anslen, const char *qname, int qtype, - const struct addrinfo *pai) -{ - struct addrinfo sentinel, *cur; - struct addrinfo ai; - const struct afd *afd; - char *canonname; - const HEADER *hp; - const u_char *cp; - int n; - const u_char *eom; - char *bp, *ep; - int type, class, ancount, qdcount; - int haveanswer, had_error; - char tbuf[MAXDNAME]; - int (*name_ok) (const char *); - char hostbuf[8*1024]; - - assert(answer != NULL); - assert(qname != NULL); - assert(pai != NULL); - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - canonname = NULL; - eom = answer->buf + anslen; - switch (qtype) { - case T_A: - case T_AAAA: - case T_ANY: /*use T_ANY only for T_A/T_AAAA lookup*/ - name_ok = res_hnok; - break; - default: - return NULL; /* XXX should be abort(); */ - } - /* - * find first satisfactory answer - */ - hp = &answer->hdr; - ancount = ntohs(hp->ancount); - qdcount = ntohs(hp->qdcount); - bp = hostbuf; - ep = hostbuf + sizeof hostbuf; - cp = answer->buf + HFIXEDSZ; - if (qdcount != 1) { - h_errno = NO_RECOVERY; - return (NULL); - } - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !(*name_ok)(bp)) { - h_errno = NO_RECOVERY; - return (NULL); - } - cp += n + QFIXEDSZ; - if (qtype == T_A || qtype == T_AAAA || qtype == T_ANY) { - /* res_send() has already verified that the query name is the - * same as the one we sent; this just gets the expanded name - * (i.e., with the succeeding search-domain tacked on). - */ - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - h_errno = NO_RECOVERY; - return (NULL); - } - canonname = bp; - bp += n; - /* The qname can be abbreviated, but h_name is now absolute. */ - qname = canonname; - } - haveanswer = 0; - had_error = 0; - while (ancount-- > 0 && cp < eom && !had_error) { - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !(*name_ok)(bp)) { - had_error++; - continue; - } - cp += n; /* name */ - type = _getshort(cp); - cp += INT16SZ; /* type */ - class = _getshort(cp); - cp += INT16SZ + INT32SZ; /* class, TTL */ - n = _getshort(cp); - cp += INT16SZ; /* len */ - if (class != C_IN) { - /* XXX - debug? syslog? */ - cp += n; - continue; /* XXX - had_error++ ? */ - } - if ((qtype == T_A || qtype == T_AAAA || qtype == T_ANY) && - type == T_CNAME) { - n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf); - if ((n < 0) || !(*name_ok)(tbuf)) { - had_error++; - continue; - } - cp += n; - /* Get canonical name. */ - n = strlen(tbuf) + 1; /* for the \0 */ - if (n > ep - bp || n >= MAXHOSTNAMELEN) { - had_error++; - continue; - } - strlcpy(bp, tbuf, (size_t)(ep - bp)); - canonname = bp; - bp += n; - continue; - } - if (qtype == T_ANY) { - if (!(type == T_A || type == T_AAAA)) { - cp += n; - continue; - } - } else if (type != qtype) { - if (type != T_KEY && type != T_SIG) - syslog(LOG_NOTICE|LOG_AUTH, - "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", - qname, p_class(C_IN), p_type(qtype), - p_type(type)); - cp += n; - continue; /* XXX - had_error++ ? */ - } - switch (type) { - case T_A: - case T_AAAA: - if (strcasecmp(canonname, bp) != 0) { - syslog(LOG_NOTICE|LOG_AUTH, - AskedForGot, canonname, bp); - cp += n; - continue; /* XXX - had_error++ ? */ - } - if (type == T_A && n != INADDRSZ) { - cp += n; - continue; - } - if (type == T_AAAA && n != IN6ADDRSZ) { - cp += n; - continue; - } - if (type == T_AAAA) { - struct in6_addr in6; - memcpy(&in6, cp, IN6ADDRSZ); - if (IN6_IS_ADDR_V4MAPPED(&in6)) { - cp += n; - continue; - } - } - if (!haveanswer) { - int nn; - - canonname = bp; - nn = strlen(bp) + 1; /* for the \0 */ - bp += nn; - } - - /* don't overwrite pai */ - ai = *pai; - ai.ai_family = (type == T_A) ? AF_INET : AF_INET6; - afd = find_afd(ai.ai_family); - if (afd == NULL) { - cp += n; - continue; - } - cur->ai_next = get_ai(&ai, afd, (const char *)cp); - if (cur->ai_next == NULL) - had_error++; - while (cur && cur->ai_next) - cur = cur->ai_next; - cp += n; - break; - default: - abort(); - } - if (!had_error) - haveanswer++; - } - if (haveanswer) { - if (!canonname) - (void)get_canonname(pai, sentinel.ai_next, qname); - else - (void)get_canonname(pai, sentinel.ai_next, canonname); - h_errno = NETDB_SUCCESS; - return sentinel.ai_next; - } - - h_errno = NO_RECOVERY; - return NULL; -} - -#define SORTEDADDR(p) (((struct sockaddr_in *)(void *)(p->ai_next->ai_addr))->sin_addr.s_addr) -#define SORTMATCH(p, s) ((SORTEDADDR(p) & (s).mask) == (s).addr.s_addr) - -static void -aisort(struct addrinfo *s, res_state res) -{ - struct addrinfo head, *t, *p; - int i; - - head.ai_next = NULL; - t = &head; - - for (i = 0; i < res->nsort; i++) { - p = s; - while (p->ai_next) { - if ((p->ai_next->ai_family != AF_INET) - || SORTMATCH(p, res->sort_list[i])) { - t->ai_next = p->ai_next; - t = t->ai_next; - p->ai_next = p->ai_next->ai_next; - } else { - p = p->ai_next; - } - } - } - - /* add rest of list and reset s to the new list*/ - t->ai_next = s->ai_next; - s->ai_next = head.ai_next; -} - -/*ARGSUSED*/ -static int -_dns_getaddrinfo(void *rv, void *cb_data, va_list ap) -{ - struct addrinfo *ai; - querybuf *buf, *buf2; - const char *name; - const struct addrinfo *pai; - struct addrinfo sentinel, *cur; - struct res_target q, q2; - res_state res; - - name = va_arg(ap, char *); - pai = va_arg(ap, const struct addrinfo *); - - fprintf(stderr, "_dns_getaddrinfo() name = '%s'\n", name); - - memset(&q, 0, sizeof(q)); - memset(&q2, 0, sizeof(q2)); - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - buf = malloc(sizeof(*buf)); - if (buf == NULL) { - h_errno = NETDB_INTERNAL; - return NS_NOTFOUND; - } - buf2 = malloc(sizeof(*buf2)); - if (buf2 == NULL) { - free(buf); - h_errno = NETDB_INTERNAL; - return NS_NOTFOUND; - } - - switch (pai->ai_family) { - case AF_UNSPEC: - /* prefer IPv6 */ - q.name = name; - q.qclass = C_IN; - q.qtype = T_AAAA; - q.answer = buf->buf; - q.anslen = sizeof(buf->buf); - q.next = &q2; - q2.name = name; - q2.qclass = C_IN; - q2.qtype = T_A; - q2.answer = buf2->buf; - q2.anslen = sizeof(buf2->buf); - break; - case AF_INET: - q.name = name; - q.qclass = C_IN; - q.qtype = T_A; - q.answer = buf->buf; - q.anslen = sizeof(buf->buf); - break; - case AF_INET6: - q.name = name; - q.qclass = C_IN; - q.qtype = T_AAAA; - q.answer = buf->buf; - q.anslen = sizeof(buf->buf); - break; - default: - free(buf); - free(buf2); - return NS_UNAVAIL; - } - - res = __res_get_state(); - if (res == NULL) { - free(buf); - free(buf2); - return NS_NOTFOUND; - } - - if (res_searchN(name, &q, res) < 0) { - __res_put_state(res); - free(buf); - free(buf2); - return NS_NOTFOUND; - } - ai = getanswer(buf, q.n, q.name, q.qtype, pai); - if (ai) { - cur->ai_next = ai; - while (cur && cur->ai_next) - cur = cur->ai_next; - } - if (q.next) { - ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai); - if (ai) - cur->ai_next = ai; - } - free(buf); - free(buf2); - if (sentinel.ai_next == NULL) { - __res_put_state(res); - switch (h_errno) { - case HOST_NOT_FOUND: - return NS_NOTFOUND; - case TRY_AGAIN: - return NS_TRYAGAIN; - default: - return NS_UNAVAIL; - } - } - - if (res->nsort) - aisort(&sentinel, res); - - __res_put_state(res); - - *((struct addrinfo **)rv) = sentinel.ai_next; - return NS_SUCCESS; -} - -static void -_sethtent(FILE **hostf) -{ - - if (!*hostf) - *hostf = fopen(_PATH_HOSTS, "r" ); - else - rewind(*hostf); -} - -static void -_endhtent(FILE **hostf) -{ - - if (*hostf) { - (void) fclose(*hostf); - *hostf = NULL; - } -} - -static struct addrinfo * -_gethtent(FILE **hostf, const char *name, const struct addrinfo *pai) -{ - char *p; - char *cp, *tname, *cname; - struct addrinfo hints, *res0, *res; - int error; - const char *addr; - char hostbuf[8*1024]; - -// fprintf(stderr, "_gethtent() name = '%s'\n", name); - assert(name != NULL); - assert(pai != NULL); - - if (!*hostf && !(*hostf = fopen(_PATH_HOSTS, "r" ))) - return (NULL); - again: - if (!(p = fgets(hostbuf, sizeof hostbuf, *hostf))) - return (NULL); - if (*p == '#') - goto again; - if (!(cp = strpbrk(p, "#\n"))) - goto again; - *cp = '\0'; - if (!(cp = strpbrk(p, " \t"))) - goto again; - *cp++ = '\0'; - addr = p; - /* if this is not something we're looking for, skip it. */ - cname = NULL; - while (cp && *cp) { - if (*cp == ' ' || *cp == '\t') { - cp++; - continue; - } - if (!cname) - cname = cp; - tname = cp; - if ((cp = strpbrk(cp, " \t")) != NULL) - *cp++ = '\0'; -// fprintf(stderr, "\ttname = '%s'", tname); - if (strcasecmp(name, tname) == 0) - goto found; - } - goto again; - -found: - hints = *pai; - hints.ai_flags = AI_NUMERICHOST; - error = getaddrinfo(addr, NULL, &hints, &res0); - if (error) - goto again; - for (res = res0; res; res = res->ai_next) { - /* cover it up */ - res->ai_flags = pai->ai_flags; - - if (pai->ai_flags & AI_CANONNAME) { - if (get_canonname(pai, res, cname) != 0) { - freeaddrinfo(res0); - goto again; - } - } - } - return res0; -} - -/*ARGSUSED*/ -static int -_files_getaddrinfo(void *rv, void *cb_data, va_list ap) -{ - const char *name; - const struct addrinfo *pai; - struct addrinfo sentinel, *cur; - struct addrinfo *p; - FILE *hostf = NULL; - - name = va_arg(ap, char *); - pai = va_arg(ap, struct addrinfo *); - -// fprintf(stderr, "_files_getaddrinfo() name = '%s'\n", name); - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - _sethtent(&hostf); - while ((p = _gethtent(&hostf, name, pai)) != NULL) { - cur->ai_next = p; - while (cur && cur->ai_next) - cur = cur->ai_next; - } - _endhtent(&hostf); - - *((struct addrinfo **)rv) = sentinel.ai_next; - if (sentinel.ai_next == NULL) - return NS_NOTFOUND; - return NS_SUCCESS; -} - -/* resolver logic */ - -/* - * Formulate a normal query, send, and await answer. - * Returned answer is placed in supplied buffer "answer". - * Perform preliminary check of answer, returning success only - * if no error is indicated and the answer count is nonzero. - * Return the size of the response on success, -1 on error. - * Error number is left in h_errno. - * - * Caller must parse answer and determine whether it answers the question. - */ -static int -res_queryN(const char *name, /* domain name */ struct res_target *target, - res_state res) -{ - u_char buf[MAXPACKET]; - HEADER *hp; - int n; - struct res_target *t; - int rcode; - int ancount; - - assert(name != NULL); - /* XXX: target may be NULL??? */ - - rcode = NOERROR; - ancount = 0; - - for (t = target; t; t = t->next) { - int class, type; - u_char *answer; - int anslen; - - hp = (HEADER *)(void *)t->answer; - hp->rcode = NOERROR; /* default */ - - /* make it easier... */ - class = t->qclass; - type = t->qtype; - answer = t->answer; - anslen = t->anslen; -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_nquery(%s, %d, %d)\n", name, class, type); -#endif - - n = res_nmkquery(res, QUERY, name, class, type, NULL, 0, NULL, - buf, sizeof(buf)); -#ifdef RES_USE_EDNS0 - if (n > 0 && (res->options & RES_USE_EDNS0) != 0) - n = res_nopt(res, n, buf, sizeof(buf), anslen); -#endif - if (n <= 0) { -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_nquery: mkquery failed\n"); -#endif - h_errno = NO_RECOVERY; - return n; - } - n = res_nsend(res, buf, n, answer, anslen); -#if 0 - if (n < 0) { -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_query: send error\n"); -#endif - h_errno = TRY_AGAIN; - return n; - } -#endif - - if (n < 0 || hp->rcode != NOERROR || ntohs(hp->ancount) == 0) { - rcode = hp->rcode; /* record most recent error */ -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; rcode = %u, ancount=%u\n", hp->rcode, - ntohs(hp->ancount)); -#endif - continue; - } - - ancount += ntohs(hp->ancount); - - t->n = n; - } - - if (ancount == 0) { - switch (rcode) { - case NXDOMAIN: - h_errno = HOST_NOT_FOUND; - break; - case SERVFAIL: - h_errno = TRY_AGAIN; - break; - case NOERROR: - h_errno = NO_DATA; - break; - case FORMERR: - case NOTIMP: - case REFUSED: - default: - h_errno = NO_RECOVERY; - break; - } - return -1; - } - return ancount; -} - -/* - * Formulate a normal query, send, and retrieve answer in supplied buffer. - * Return the size of the response on success, -1 on error. - * If enabled, implement search rules until answer or unrecoverable failure - * is detected. Error code, if any, is left in h_errno. - */ -static int -res_searchN(const char *name, struct res_target *target, res_state res) -{ - const char *cp, * const *domain; - HEADER *hp; - u_int dots; - int trailing_dot, ret, saved_herrno; - int got_nodata = 0, got_servfail = 0, tried_as_is = 0; - - assert(name != NULL); - assert(target != NULL); - - hp = (HEADER *)(void *)target->answer; /*XXX*/ - - errno = 0; - h_errno = HOST_NOT_FOUND; /* default, if we never query */ - dots = 0; - for (cp = name; *cp; cp++) - dots += (*cp == '.'); - trailing_dot = 0; - if (cp > name && *--cp == '.') - trailing_dot++; - - -fprintf(stderr, "res_searchN() name = '%s'\n", name); - - /* - * if there aren't any dots, it could be a user-level alias - */ - if (!dots && (cp = __hostalias(name)) != NULL) { - ret = res_queryN(cp, target, res); - return ret; - } - - /* - * If there are dots in the name already, let's just give it a try - * 'as is'. The threshold can be set with the "ndots" option. - */ - saved_herrno = -1; - if (dots >= res->ndots) { - ret = res_querydomainN(name, NULL, target, res); - if (ret > 0) - return (ret); - saved_herrno = h_errno; - tried_as_is++; - } - - /* - * We do at least one level of search if - * - there is no dot and RES_DEFNAME is set, or - * - there is at least one dot, there is no trailing dot, - * and RES_DNSRCH is set. - */ - if ((!dots && (res->options & RES_DEFNAMES)) || - (dots && !trailing_dot && (res->options & RES_DNSRCH))) { - int done = 0; - - for (domain = (const char * const *)res->dnsrch; - *domain && !done; - domain++) { - - ret = res_querydomainN(name, *domain, target, res); - if (ret > 0) - return ret; - - /* - * If no server present, give up. - * If name isn't found in this domain, - * keep trying higher domains in the search list - * (if that's enabled). - * On a NO_DATA error, keep trying, otherwise - * a wildcard entry of another type could keep us - * from finding this entry higher in the domain. - * If we get some other error (negative answer or - * server failure), then stop searching up, - * but try the input name below in case it's - * fully-qualified. - */ - if (errno == ECONNREFUSED) { - h_errno = TRY_AGAIN; - return -1; - } - - switch (h_errno) { - case NO_DATA: - got_nodata++; - /* FALLTHROUGH */ - case HOST_NOT_FOUND: - /* keep trying */ - break; - case TRY_AGAIN: - if (hp->rcode == SERVFAIL) { - /* try next search element, if any */ - got_servfail++; - break; - } - /* FALLTHROUGH */ - default: - /* anything else implies that we're done */ - done++; - } - /* - * if we got here for some reason other than DNSRCH, - * we only wanted one iteration of the loop, so stop. - */ - if (!(res->options & RES_DNSRCH)) - done++; - } - } - - /* - * if we have not already tried the name "as is", do that now. - * note that we do this regardless of how many dots were in the - * name or whether it ends with a dot. - */ - if (!tried_as_is) { - ret = res_querydomainN(name, NULL, target, res); - if (ret > 0) - return ret; - } - - /* - * if we got here, we didn't satisfy the search. - * if we did an initial full query, return that query's h_errno - * (note that we wouldn't be here if that query had succeeded). - * else if we ever got a nodata, send that back as the reason. - * else send back meaningless h_errno, that being the one from - * the last DNSRCH we did. - */ - if (saved_herrno != -1) - h_errno = saved_herrno; - else if (got_nodata) - h_errno = NO_DATA; - else if (got_servfail) - h_errno = TRY_AGAIN; - return -1; -} - -/* - * Perform a call on res_query on the concatenation of name and domain, - * removing a trailing dot from name if domain is NULL. - */ -static int -res_querydomainN(const char *name, const char *domain, - struct res_target *target, res_state res) -{ - char nbuf[MAXDNAME]; - const char *longname = nbuf; - size_t n, d; - - assert(name != NULL); - /* XXX: target may be NULL??? */ - -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_querydomain(%s, %s)\n", - name, domain?domain:""); -#endif - if (domain == NULL) { - /* - * Check for trailing '.'; - * copy without '.' if present. - */ - n = strlen(name); - if (n + 1 > sizeof(nbuf)) { - h_errno = NO_RECOVERY; - return -1; - } - if (n > 0 && name[--n] == '.') { - strncpy(nbuf, name, n); - nbuf[n] = '\0'; - } else - longname = name; - } else { - n = strlen(name); - d = strlen(domain); - if (n + 1 + d + 1 > sizeof(nbuf)) { - h_errno = NO_RECOVERY; - return -1; - } - snprintf(nbuf, sizeof(nbuf), "%s.%s", name, domain); - } - return res_queryN(longname, target, res); -} diff --git a/libc/netbsd/net/getnameinfo.c b/libc/netbsd/net/getnameinfo.c deleted file mode 100644 index db04fbf46..000000000 --- a/libc/netbsd/net/getnameinfo.c +++ /dev/null @@ -1,519 +0,0 @@ -/* $NetBSD: getnameinfo.c,v 1.43 2006/02/17 15:58:26 ginsbach Exp $ */ -/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */ - -/* - * Copyright (c) 2000 Ben Harris. - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Issues to be discussed: - * - Thread safe-ness must be checked - * - RFC2553 says that we should raise error on short buffer. X/Open says - * we need to truncate the result. We obey RFC2553 (and X/Open should be - * modified). ipngwg rough consensus seems to follow RFC2553. - * - What is "local" in NI_FQDN? - * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other. - * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if - * sin6_scope_id is filled - standardization status? - * XXX breaks backward compat for code that expects no scopeid. - * beware on merge. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: getnameinfo.c,v 1.43 2006/02/17 15:58:26 ginsbach Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "arpa_nameser.h" -#include -#include -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include -#include - -static const struct afd { - int a_af; - socklen_t a_addrlen; - socklen_t a_socklen; - int a_off; -} afdl [] = { -#ifdef INET6 - {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6), - offsetof(struct sockaddr_in6, sin6_addr)}, -#endif - {PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in), - offsetof(struct sockaddr_in, sin_addr)}, - {0, 0, 0, 0}, -}; - -struct sockinet { - u_char si_len; - u_char si_family; - u_short si_port; -}; - -static int getnameinfo_inet __P((const struct sockaddr *, socklen_t, char *, - socklen_t, char *, socklen_t, int)); -#ifdef INET6 -static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *, - socklen_t, int)); -static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, - int)); -#endif -static int getnameinfo_link __P((const struct sockaddr *, socklen_t, char *, - socklen_t, char *, socklen_t, int)); -static int hexname __P((const u_int8_t *, size_t, char *, socklen_t)); - -/* - * Top-level getnameinfo() code. Look at the address family, and pick an - * appropriate function to call. - */ -int getnameinfo(const struct sockaddr* sa, socklen_t salen, char* host, size_t hostlen, char* serv, size_t servlen, int flags) -{ - switch (sa->sa_family) { - case AF_INET: - case AF_INET6: - return getnameinfo_inet(sa, salen, host, hostlen, - serv, servlen, flags); -#if 0 - case AF_LINK: - return getnameinfo_link(sa, salen, host, hostlen, - serv, servlen, flags); -#endif - default: - return EAI_FAMILY; - } -} - - -/* - * getnameinfo_inet(): - * Format an IPv4 or IPv6 sockaddr into a printable string. - */ -static int -getnameinfo_inet(sa, salen, host, hostlen, serv, servlen, flags) - const struct sockaddr *sa; - socklen_t salen; - char *host; - socklen_t hostlen; - char *serv; - socklen_t servlen; - int flags; -{ - const struct afd *afd; - struct servent *sp; - struct hostent *hp; - u_short port; - int family, i; - const char *addr; - u_int32_t v4a; - char numserv[512]; - char numaddr[512]; - - /* sa is checked below */ - /* host may be NULL */ - /* serv may be NULL */ - - if (sa == NULL) - return EAI_FAIL; - -#ifdef BSD4_4 - if (sa->sa_len != salen) - return EAI_FAIL; -#endif - - family = sa->sa_family; - for (i = 0; afdl[i].a_af; i++) - if (afdl[i].a_af == family) { - afd = &afdl[i]; - goto found; - } - return EAI_FAMILY; - - found: - if (salen != afd->a_socklen) - return EAI_FAIL; - - /* network byte order */ - port = ((const struct sockinet *)(const void *)sa)->si_port; - addr = (const char *)(const void *)sa + afd->a_off; - - if (serv == NULL || servlen == 0) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: rfc2553bis-03 says that serv == NULL OR - * servlen == 0 means that the caller does not want the result. - */ - } else { - if (flags & NI_NUMERICSERV) - sp = NULL; - else { - sp = getservbyport(port, - (flags & NI_DGRAM) ? "udp" : "tcp"); - } - if (sp) { - if (strlen(sp->s_name) + 1 > (size_t)servlen) - return EAI_MEMORY; - strlcpy(serv, sp->s_name, servlen); - } else { - snprintf(numserv, sizeof(numserv), "%u", ntohs(port)); - if (strlen(numserv) + 1 > (size_t)servlen) - return EAI_MEMORY; - strlcpy(serv, numserv, servlen); - } - } - - switch (sa->sa_family) { - case AF_INET: - v4a = (u_int32_t) - ntohl(((const struct sockaddr_in *) - (const void *)sa)->sin_addr.s_addr); - if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a)) - flags |= NI_NUMERICHOST; - v4a >>= IN_CLASSA_NSHIFT; - if (v4a == 0) - flags |= NI_NUMERICHOST; - break; -#ifdef INET6 - case AF_INET6: - { - const struct sockaddr_in6 *sin6; - sin6 = (const struct sockaddr_in6 *)(const void *)sa; - switch (sin6->sin6_addr.s6_addr[0]) { - case 0x00: - if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) - ; - else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)) - ; - else - flags |= NI_NUMERICHOST; - break; - default: - if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { - flags |= NI_NUMERICHOST; - } - else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) - flags |= NI_NUMERICHOST; - break; - } - } - break; -#endif - } - if (host == NULL || hostlen == 0) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: rfc2553bis-03 says that host == NULL or - * hostlen == 0 means that the caller does not want the result. - */ - } else if (flags & NI_NUMERICHOST) { - size_t numaddrlen; - - /* NUMERICHOST and NAMEREQD conflicts with each other */ - if (flags & NI_NAMEREQD) - return EAI_NONAME; - - switch(afd->a_af) { -#ifdef INET6 - case AF_INET6: - { - int error; - - if ((error = ip6_parsenumeric(sa, addr, host, - hostlen, flags)) != 0) - return(error); - break; - } -#endif - default: - if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr)) - == NULL) - return EAI_SYSTEM; - numaddrlen = strlen(numaddr); - if (numaddrlen + 1 > (size_t)hostlen) /* don't forget terminator */ - return EAI_MEMORY; - strlcpy(host, numaddr, hostlen); - break; - } - } else { - hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af); - - if (hp) { -#if 0 - /* - * commented out, since "for local host" is not - * implemented here - see RFC2553 p30 - */ - if (flags & NI_NOFQDN) { - char *p; - p = strchr(hp->h_name, '.'); - if (p) - *p = '\0'; - } -#endif - if (strlen(hp->h_name) + 1 > (size_t)hostlen) { - return EAI_MEMORY; - } - strlcpy(host, hp->h_name, hostlen); - } else { - if (flags & NI_NAMEREQD) - return EAI_NONAME; - switch(afd->a_af) { -#ifdef INET6 - case AF_INET6: - { - int error; - - if ((error = ip6_parsenumeric(sa, addr, host, - hostlen, - flags)) != 0) - return(error); - break; - } -#endif - default: - if (inet_ntop(afd->a_af, addr, host, - hostlen) == NULL) - return EAI_SYSTEM; - break; - } - } - } - return(0); -} - -#ifdef INET6 -static int -ip6_parsenumeric(sa, addr, host, hostlen, flags) - const struct sockaddr *sa; - const char *addr; - char *host; - socklen_t hostlen; - int flags; -{ - size_t numaddrlen; - char numaddr[512]; - - assert(sa != NULL); - assert(addr != NULL); - assert(host != NULL); - - if (inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr)) == NULL) - return EAI_SYSTEM; - - numaddrlen = strlen(numaddr); - if (numaddrlen + 1 > hostlen) /* don't forget terminator */ - return EAI_OVERFLOW; - strlcpy(host, numaddr, hostlen); - - if (((const struct sockaddr_in6 *)(const void *)sa)->sin6_scope_id) { - char zonebuf[MAXHOSTNAMELEN]; - int zonelen; - - zonelen = ip6_sa2str( - (const struct sockaddr_in6 *)(const void *)sa, - zonebuf, sizeof(zonebuf), flags); - if (zonelen < 0) - return EAI_OVERFLOW; - if ((size_t) zonelen + 1 + numaddrlen + 1 > hostlen) - return EAI_OVERFLOW; - /* construct */ - memcpy(host + numaddrlen + 1, zonebuf, - (size_t)zonelen); - host[numaddrlen] = SCOPE_DELIMITER; - host[numaddrlen + 1 + zonelen] = '\0'; - } - - return 0; -} - -/* ARGSUSED */ -static int -ip6_sa2str(sa6, buf, bufsiz, flags) - const struct sockaddr_in6 *sa6; - char *buf; - size_t bufsiz; - int flags; -{ - unsigned int ifindex; - const struct in6_addr *a6; - int n; - - assert(sa6 != NULL); - assert(buf != NULL); - - ifindex = (unsigned int)sa6->sin6_scope_id; - a6 = &sa6->sin6_addr; - -#ifdef NI_NUMERICSCOPE - if ((flags & NI_NUMERICSCOPE) != 0) { - n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id); - if (n < 0 || n >= bufsiz) - return -1; - else - return n; - } -#endif - - /* if_indextoname() does not take buffer size. not a good api... */ - if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) && - bufsiz >= IF_NAMESIZE) { - char *p = if_indextoname(ifindex, buf); - if (p) { - return(strlen(p)); - } - } - - /* last resort */ - n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id); - if (n < 0 || (size_t) n >= bufsiz) - return -1; - else - return n; -} -#endif /* INET6 */ - - -/* - * getnameinfo_link(): - * Format a link-layer address into a printable format, paying attention to - * the interface type. - */ -/* ARGSUSED */ -static int -getnameinfo_link(const struct sockaddr *sa, socklen_t salen, - char *host, socklen_t hostlen, char *serv, socklen_t servlen, - int flags) -{ - const struct sockaddr_dl *sdl = - (const struct sockaddr_dl *)(const void *)sa; - const struct ieee1394_hwaddr *iha; - int n; - - if (serv != NULL && servlen > 0) - *serv = '\0'; - - if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 && sdl->sdl_slen == 0) { - n = snprintf(host, hostlen, "link#%u", sdl->sdl_index); - if (n < 0 || (socklen_t) n > hostlen) { - *host = '\0'; - return EAI_MEMORY; - } - return 0; - } - - switch (sdl->sdl_type) { -#ifdef IFT_ECONET - case IFT_ECONET: - if (sdl->sdl_alen < 2) - return EAI_FAMILY; - if (CLLADDR(sdl)[1] == 0) - n = snprintf(host, hostlen, "%u", CLLADDR(sdl)[0]); - else - n = snprintf(host, hostlen, "%u.%u", - CLLADDR(sdl)[1], CLLADDR(sdl)[0]); - if (n < 0 || (socklen_t) n >= hostlen) { - *host = '\0'; - return EAI_MEMORY; - } else - return 0; -#endif - case IFT_IEEE1394: - if (sdl->sdl_alen < sizeof(iha->iha_uid)) - return EAI_FAMILY; - iha = - (const struct ieee1394_hwaddr *)(const void *)CLLADDR(sdl); - return hexname(iha->iha_uid, sizeof(iha->iha_uid), - host, hostlen); - /* - * The following have zero-length addresses. - * IFT_ATM (net/if_atmsubr.c) - * IFT_FAITH (net/if_faith.c) - * IFT_GIF (net/if_gif.c) - * IFT_LOOP (net/if_loop.c) - * IFT_PPP (net/if_ppp.c, net/if_spppsubr.c) - * IFT_SLIP (net/if_sl.c, net/if_strip.c) - * IFT_STF (net/if_stf.c) - * IFT_L2VLAN (net/if_vlan.c) - * IFT_PROPVIRTUAL (net/if_bridge.h> - */ - /* - * The following use IPv4 addresses as link-layer addresses: - * IFT_OTHER (net/if_gre.c) - */ - case IFT_ARCNET: /* default below is believed correct for all these. */ - case IFT_ETHER: - case IFT_FDDI: - case IFT_HIPPI: - case IFT_ISO88025: - default: - return hexname((const u_int8_t *)CLLADDR(sdl), - (size_t)sdl->sdl_alen, host, hostlen); - } -} - -static int -hexname(cp, len, host, hostlen) - const u_int8_t *cp; - char *host; - size_t len; - socklen_t hostlen; -{ - int n; - size_t i; - char *outp = host; - - *outp = '\0'; - for (i = 0; i < len; i++) { - n = snprintf(outp, hostlen, "%s%02x", - i ? ":" : "", cp[i]); - if (n < 0 || (socklen_t) n >= hostlen) { - *host = '\0'; - return EAI_MEMORY; - } - outp += n; - hostlen -= n; - } - return 0; -} diff --git a/libc/netbsd/net/getservbyname.c b/libc/netbsd/net/getservbyname.c deleted file mode 100644 index 5ea528e29..000000000 --- a/libc/netbsd/net/getservbyname.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include "servent.h" - -struct servent * -getservbyname(const char *name, const char *proto) -{ - res_static rs = __res_get_static(); - struct servent* s; - - if (rs == NULL || proto == NULL || name == NULL) { - errno = EINVAL; - return NULL; - } - - rs->servent_ptr = NULL; - while (1) { - struct servent* s = getservent_r(rs); - if (s == NULL) - break; - if ( !strcmp( s->s_name, name ) && !strcmp( s->s_proto, proto ) ) - return s; - } - - return NULL; -} diff --git a/libc/netbsd/net/getservbyname_r.c b/libc/netbsd/net/getservbyname_r.c deleted file mode 100644 index fb6dc5203..000000000 --- a/libc/netbsd/net/getservbyname_r.c +++ /dev/null @@ -1,76 +0,0 @@ -/* $NetBSD: getservbyname_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $ */ - -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93"; -#else -__RCSID("$NetBSD: getservbyname_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include - -#include "servent.h" - -struct servent * -getservbyname_r(const char *name, const char *proto, struct servent *sp, - struct servent_data *sd) -{ - struct servent *s; - char **cp; - - assert(name != NULL); - /* proto may be NULL */ - - setservent_r(sd->stayopen, sd); - while ((s = getservent_r(sp, sd)) != NULL) { - if (strcmp(name, s->s_name) == 0) - goto gotname; - for (cp = s->s_aliases; *cp; cp++) - if (strcmp(name, *cp) == 0) - goto gotname; - continue; -gotname: - if (proto == NULL || strcmp(s->s_proto, proto) == 0) - break; - } - if (!sd->stayopen) - if (sd->fp != NULL) { - (void)fclose(sd->fp); - sd->fp = NULL; - } - return s; -} diff --git a/libc/netbsd/net/getservbyport.c b/libc/netbsd/net/getservbyport.c deleted file mode 100644 index fad7e236a..000000000 --- a/libc/netbsd/net/getservbyport.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include "servent.h" - -struct servent * -getservbyport(int port, const char *proto) -{ - res_static rs = __res_get_static(); - struct servent* s; - - if (rs == NULL || proto == NULL) { - errno = EINVAL; - return NULL; - } - - rs->servent_ptr = NULL; - while (1) { - struct servent* s = getservent_r(rs); - if (s == NULL) - break; - if ( s->s_port == port && !strcmp( s->s_proto, proto ) ) - return s; - } - - return NULL; -} diff --git a/libc/netbsd/net/getservbyport_r.c b/libc/netbsd/net/getservbyport_r.c deleted file mode 100644 index 6fe429311..000000000 --- a/libc/netbsd/net/getservbyport_r.c +++ /dev/null @@ -1,65 +0,0 @@ -/* $NetBSD: getservbyport_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $ */ - -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93"; -#else -__RCSID("$NetBSD: getservbyport_r.c,v 1.3 2005/04/18 19:39:45 kleink Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include - -#include "servent.h" - -struct servent * -getservbyport_r(int port, const char *proto, struct servent *sp, - struct servent_data *sd) -{ - struct servent *s; - - setservent_r(sd->stayopen, sd); - while ((s = getservent_r(sp, sd)) != NULL) { - if (s->s_port != port) - continue; - if (proto == NULL || strcmp(s->s_proto, proto) == 0) - break; - } - if (!sd->stayopen) - if (sd->fp != NULL) { - (void)fclose(sd->fp); - sd->fp = NULL; - } - return s; -} diff --git a/libc/netbsd/net/getservent.c b/libc/netbsd/net/getservent.c deleted file mode 100644 index 45207dfab..000000000 --- a/libc/netbsd/net/getservent.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include "servent.h" -#include "services.h" - -void -setservent(int f) -{ - res_static rs = __res_get_static(); - if (rs) { - rs->servent_ptr = NULL; - } -} - -void -endservent(void) -{ - /* nothing to do */ -} - -struct servent * -getservent_r( res_static rs ) -{ - const char* p; - const char* q; - int namelen; - int nn,count; - int total = 0; - char* p2; - - p = rs->servent_ptr; - if (p == NULL) - p = _services; - else if (p[0] == 0) - return NULL; - - /* first compute the total size */ - namelen = p[0]; - total += namelen + 1; - q = p + 1 + namelen + 3; /* skip name + port + proto */ - count = q[0]; /* get aliascount */ - q += 1; - - total += (count+1)*sizeof(char*); - for (nn = 0; nn < count; nn++) { - int len2 = q[0]; - total += 1 + len2; - q += 1 + len2; - } - - /* reallocate the thread-specific servent struct */ - p2 = realloc( (char*)rs->servent.s_aliases, total ); - if (p2 == NULL) - return NULL; - - /* now write to it */ - rs->servent.s_aliases = (char**) p2; - p2 += (count+1)*sizeof(char*); - rs->servent.s_name = p2; - p2 += namelen + 1; - rs->servent.s_proto = p2; - - /* copy name + port + setup protocol */ - memcpy( rs->servent.s_name, p+1, namelen ); - rs->servent.s_name[namelen] = 0; - p += 1 + namelen; - rs->servent.s_port = ((((unsigned char*)p)[0] << 8) | - ((unsigned char*)p)[1]); - - rs->servent.s_proto = p[2] == 't' ? "tcp" : "udp"; - p += 4; /* skip port(2) + proto(1) + aliascount(1) */ - - for (nn = 0; nn < count; nn++) { - int len2 = p[0]; - rs->servent.s_aliases[nn] = p2; - memcpy( p2, p+1, len2 ); - p2[len2] = 0; - p2 += len2 + 1; - p += len2 + 1; - } - rs->servent.s_aliases[nn] = NULL; - - rs->servent_ptr = p; - - return &rs->servent; -} - -struct servent * -getservent(void) -{ - res_static rs = __res_get_static(); - - if (rs == NULL) return NULL; - - return getservent_r(rs); -} diff --git a/libc/netbsd/net/getservent_r.c b/libc/netbsd/net/getservent_r.c deleted file mode 100644 index 1668759b6..000000000 --- a/libc/netbsd/net/getservent_r.c +++ /dev/null @@ -1,151 +0,0 @@ -/* $NetBSD: getservent_r.c,v 1.5 2005/04/18 19:39:45 kleink Exp $ */ - -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include - -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; -#else -__RCSID("$NetBSD: getservent_r.c,v 1.5 2005/04/18 19:39:45 kleink Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include -#include -#include - -#include "servent.h" - -void -setservent_r(int f, struct servent_data *sd) -{ - if (sd->fp == NULL) - sd->fp = fopen(_PATH_SERVICES, "r"); - else - rewind(sd->fp); - sd->stayopen |= f; -} - -void -endservent_r(struct servent_data *sd) -{ - if (sd->fp) { - (void)fclose(sd->fp); - sd->fp = NULL; - } - if (sd->aliases) { - free(sd->aliases); - sd->aliases = NULL; - sd->maxaliases = 0; - } - if (sd->line) { - free(sd->line); - sd->line = NULL; - } - sd->stayopen = 0; -} - -struct servent * -getservent_r(struct servent *sp, struct servent_data *sd) -{ - char *p, *cp, **q; - size_t i = 0; - int oerrno; - - if (sd->fp == NULL && (sd->fp = fopen(_PATH_SERVICES, "r")) == NULL) - return NULL; - - for (;;) { - if (sd->line) - free(sd->line); -// sd->line = fparseln(sd->fp, NULL, NULL, NULL, FPARSELN_UNESCALL); - fprintf(stderr, "*** FIX ME! getservent_r() is going to fail!!!\n"); - sd->line = NULL; - if (sd->line == NULL) - return NULL; - sp->s_name = p = sd->line; - p = strpbrk(p, " \t"); - if (p == NULL) - continue; - *p++ = '\0'; - while (*p == ' ' || *p == '\t') - p++; - cp = strpbrk(p, ",/"); - if (cp == NULL) - continue; - *cp++ = '\0'; - sp->s_port = htons((u_short)atoi(p)); - sp->s_proto = cp; - if (sd->aliases == NULL) { - sd->maxaliases = 10; - sd->aliases = malloc(sd->maxaliases * sizeof(char *)); - if (sd->aliases == NULL) { - oerrno = errno; - endservent_r(sd); - errno = oerrno; - return NULL; - } - } - q = sp->s_aliases = sd->aliases; - cp = strpbrk(cp, " \t"); - if (cp != NULL) - *cp++ = '\0'; - while (cp && *cp) { - if (*cp == ' ' || *cp == '\t') { - cp++; - continue; - } - if (i == sd->maxaliases - 2) { - sd->maxaliases *= 2; - q = realloc(q, - sd->maxaliases * sizeof(char *)); - if (q == NULL) { - oerrno = errno; - endservent_r(sd); - errno = oerrno; - return NULL; - } - sp->s_aliases = sd->aliases = q; - } - q[i++] = cp; - cp = strpbrk(cp, " \t"); - if (cp != NULL) - *cp++ = '\0'; - } - q[i] = NULL; - return sp; - } -} diff --git a/libc/netbsd/net/nsdispatch.c b/libc/netbsd/net/nsdispatch.c deleted file mode 100644 index fa99366fc..000000000 --- a/libc/netbsd/net/nsdispatch.c +++ /dev/null @@ -1,152 +0,0 @@ -/* $NetBSD: nsdispatch.c,v 1.30 2005/11/29 03:11:59 christos Exp $ */ - -/*- - * Copyright (c) 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Luke Mewburn; and by Jason R. Thorpe. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/*- - * Copyright (c) 2003 Networks Associates Technology, Inc. - * All rights reserved. - * - * Portions of this software were developed for the FreeBSD Project by - * Jacques A. Vidrine, Safeport Network Services, and Network - * Associates Laboratories, the Security Research Division of Network - * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 - * ("CBOSS"), as part of the DARPA CHATS research program. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include - -#include -#ifdef __ELF__ -#include -#endif /* __ELF__ */ -#include -#define _NS_PRIVATE -#include -#include -#include -#include -#include -#include - -static nss_method -_nsmethod(const char *source, const char *database, const char *method, - const ns_dtab disp_tab[], void **cb_data) -{ - int curdisp; - - if (disp_tab != NULL) { - for (curdisp = 0; disp_tab[curdisp].src != NULL; curdisp++) { - if (strcasecmp(source, disp_tab[curdisp].src) == 0) { - *cb_data = disp_tab[curdisp].cb_data; - return (disp_tab[curdisp].callback); - } - } - } - - *cb_data = NULL; - return (NULL); -} - -int -/*ARGSUSED*/ -nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database, - const char *method, const ns_src defaults[], ...) -{ - va_list ap; - int i, result; - const ns_src *srclist; - int srclistsize; - nss_method cb; - void *cb_data; - - /* retval may be NULL */ - /* disp_tab may be NULL */ - assert(database != NULL); - assert(method != NULL); - assert(defaults != NULL); - if (database == NULL || method == NULL || defaults == NULL) - return (NS_UNAVAIL); - - srclist = defaults; - srclistsize = 0; - while (srclist[srclistsize].name != NULL) - srclistsize++; - - result = 0; - - for (i = 0; i < srclistsize; i++) { - cb = _nsmethod(srclist[i].name, database, method, - disp_tab, &cb_data); - result = 0; - if (cb != NULL) { - va_start(ap, defaults); - result = (*cb)(retval, cb_data, ap); - va_end(ap); - if (defaults[0].flags & NS_FORCEALL) - continue; - if (result & srclist[i].flags) - break; - } - } - result &= NS_STATUSMASK; /* clear private flags in result */ - - return (result ? result : NS_NOTFOUND); -} diff --git a/libc/netbsd/net/reentrant.h b/libc/netbsd/net/reentrant.h deleted file mode 100644 index 15507ebe9..000000000 --- a/libc/netbsd/net/reentrant.h +++ /dev/null @@ -1,268 +0,0 @@ -/* $NetBSD: reentrant.h,v 1.10 2004/12/14 00:23:19 nathanw Exp $ */ - -/*- - * Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by J.T. Conklin, by Nathan J. Williams, and by Jason R. Thorpe. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Requirements: - * - * 1. The thread safe mechanism should be lightweight so the library can - * be used by non-threaded applications without unreasonable overhead. - * - * 2. There should be no dependency on a thread engine for non-threaded - * applications. - * - * 3. There should be no dependency on any particular thread engine. - * - * 4. The library should be able to be compiled without support for thread - * safety. - * - * - * Rationale: - * - * One approach for thread safety is to provide discrete versions of the - * library: one thread safe, the other not. The disadvantage of this is - * that libc is rather large, and two copies of a library which are 99%+ - * identical is not an efficent use of resources. - * - * Another approach is to provide a single thread safe library. However, - * it should not add significant run time or code size overhead to non- - * threaded applications. - * - * Since the NetBSD C library is used in other projects, it should be - * easy to replace the mutual exclusion primitives with ones provided by - * another system. Similarly, it should also be easy to remove all - * support for thread safety completely if the target environment does - * not support threads. - * - * - * Implementation Details: - * - * The thread primitives used by the library (mutex_t, mutex_lock, etc.) - * are macros which expand to the cooresponding primitives provided by - * the thread engine or to nothing. The latter is used so that code is - * not unreasonably cluttered with #ifdefs when all thread safe support - * is removed. - * - * The thread macros can be directly mapped to the mutex primitives from - * pthreads, however it should be reasonably easy to wrap another mutex - * implementation so it presents a similar interface. - * - * The thread functions operate by dispatching to symbols which are, by - * default, weak-aliased to no-op functions in thread-stub/thread-stub.c - * (some uses of thread operations are conditional on __isthreaded, but - * not all of them are). - * - * When the thread library is linked in, it provides strong-alias versions - * of those symbols which dispatch to its own real thread operations. - * - */ - -#ifdef _REENTRANT - -/* - * Abtract thread interface for thread-safe libraries. These routines - * will use stubs in libc if the application is not linked against the - * pthread library, and the real function in the pthread library if it - * is. - */ - -#include -#include - -#define mutex_t pthread_mutex_t -#define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER - -#define mutexattr_t pthread_mutexattr_t - -#define MUTEX_TYPE_NORMAL PTHREAD_MUTEX_NORMAL -#define MUTEX_TYPE_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK -#define MUTEX_TYPE_RECURSIVE PTHREAD_MUTEX_RECURSIVE - -#define cond_t pthread_cond_t -#define COND_INITIALIZER PTHREAD_COND_INITIALIZER - -#define condattr_t pthread_condattr_t - -#define rwlock_t pthread_rwlock_t -#define RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER - -#define rwlockattr_t pthread_rwlockattr_t - -#define thread_key_t pthread_key_t - -#define thr_t pthread_t - -#define thrattr_t pthread_attr_t - -#define once_t pthread_once_t -#define ONCE_INITIALIZER PTHREAD_ONCE_INIT - -#ifndef __LIBC_THREAD_STUBS - -__BEGIN_DECLS -int __libc_mutex_init(mutex_t *, const mutexattr_t *); -int __libc_mutex_lock(mutex_t *); -int __libc_mutex_trylock(mutex_t *); -int __libc_mutex_unlock(mutex_t *); -int __libc_mutex_destroy(mutex_t *); - -int __libc_mutexattr_init(mutexattr_t *); -int __libc_mutexattr_settype(mutexattr_t *, int); -int __libc_mutexattr_destroy(mutexattr_t *); -__END_DECLS - -#define mutex_init(m, a) __libc_mutex_init((m), (a)) -#define mutex_lock(m) __libc_mutex_lock((m)) -#define mutex_trylock(m) __libc_mutex_trylock((m)) -#define mutex_unlock(m) __libc_mutex_unlock((m)) -#define mutex_destroy(m) __libc_mutex_destroy((m)) - -#define mutexattr_init(ma) __libc_mutexattr_init((ma)) -#define mutexattr_settype(ma, t) __libc_mutexattr_settype((ma), (t)) -#define mutexattr_destroy(ma) __libc_mutexattr_destroy((ma)) - -__BEGIN_DECLS -int __libc_cond_init(cond_t *, const condattr_t *); -int __libc_cond_signal(cond_t *); -int __libc_cond_broadcast(cond_t *); -int __libc_cond_wait(cond_t *, mutex_t *); -int __libc_cond_timedwait(cond_t *, mutex_t *, const struct timespec *); -int __libc_cond_destroy(cond_t *); -__END_DECLS - -#define cond_init(c, t, a) __libc_cond_init((c), (a)) -#define cond_signal(c) __libc_cond_signal((c)) -#define cond_broadcast(c) __libc_cond_broadcast((c)) -#define cond_wait(c, m) __libc_cond_wait((c), (m)) -#define cond_timedwait(c, m, t) __libc_cond_timedwait((c), (m), (t)) -#define cond_destroy(c) __libc_cond_destroy((c)) - -__BEGIN_DECLS -int __libc_rwlock_init(rwlock_t *, const rwlockattr_t *); -int __libc_rwlock_rdlock(rwlock_t *); -int __libc_rwlock_wrlock(rwlock_t *); -int __libc_rwlock_tryrdlock(rwlock_t *); -int __libc_rwlock_trywrlock(rwlock_t *); -int __libc_rwlock_unlock(rwlock_t *); -int __libc_rwlock_destroy(rwlock_t *); -__END_DECLS - -#define rwlock_init(l, a) __libc_rwlock_init((l), (a)) -#define rwlock_rdlock(l) __libc_rwlock_rdlock((l)) -#define rwlock_wrlock(l) __libc_rwlock_wrlock((l)) -#define rwlock_tryrdlock(l) __libc_rwlock_tryrdlock((l)) -#define rwlock_trywrlock(l) __libc_rwlock_trywrlock((l)) -#define rwlock_unlock(l) __libc_rwlock_unlock((l)) -#define rwlock_destroy(l) __libc_rwlock_destroy((l)) - -__BEGIN_DECLS -int __libc_thr_keycreate(thread_key_t *, void (*)(void *)); -int __libc_thr_setspecific(thread_key_t, const void *); -void *__libc_thr_getspecific(thread_key_t); -int __libc_thr_keydelete(thread_key_t); -__END_DECLS - -#define thr_keycreate(k, d) __libc_thr_keycreate((k), (d)) -#define thr_setspecific(k, p) __libc_thr_setspecific((k), (p)) -#define thr_getspecific(k) __libc_thr_getspecific((k)) -#define thr_keydelete(k) __libc_thr_keydelete((k)) - -__BEGIN_DECLS -int __libc_thr_once(once_t *, void (*)(void)); -int __libc_thr_sigsetmask(int, const sigset_t *, sigset_t *); -thr_t __libc_thr_self(void); -int __libc_thr_yield(void); -void __libc_thr_create(thr_t *, const thrattr_t *, - void *(*)(void *), void *); -void __libc_thr_exit(void *) __attribute__((__noreturn__)); -int *__libc_thr_errno(void); -int __libc_thr_setcancelstate(int, int *); - -extern int __isthreaded; -__END_DECLS - -#define thr_once(o, f) __libc_thr_once((o), (f)) -#define thr_sigsetmask(f, n, o) __libc_thr_sigsetmask((f), (n), (o)) -#define thr_self() __libc_thr_self() -#define thr_yield() __libc_thr_yield() -#define thr_create(tp, ta, f, a) __libc_thr_create((tp), (ta), (f), (a)) -#define thr_exit(v) __libc_thr_exit((v)) -#define thr_errno() __libc_thr_errno() -#define thr_enabled() (__isthreaded) -#define thr_setcancelstate(n, o) __libc_thr_setcancelstate((n),(o)) -#endif /* __LIBC_THREAD_STUBS */ - -#define FLOCKFILE(fp) __flockfile_internal(fp, 1) -#define FUNLOCKFILE(fp) __funlockfile_internal(fp, 1) - -#else /* _REENTRANT */ - -#define mutex_init(m, a) -#define mutex_lock(m) -#define mutex_trylock(m) -#define mutex_unlock(m) -#define mutex_destroy(m) - -#define cond_init(c, t, a) -#define cond_signal(c) -#define cond_broadcast(c) -#define cond_wait(c, m) -#define cond_timedwait(c, m, t) -#define cond_destroy(c) - -#define rwlock_init(l, a) -#define rwlock_rdlock(l) -#define rwlock_wrlock(l) -#define rwlock_tryrdlock(l) -#define rwlock_trywrlock(l) -#define rwlock_unlock(l) -#define rwlock_destroy(l) - -#define thr_keycreate(k, d) -#define thr_setspecific(k, p) -#define thr_getspecific(k) -#define thr_keydelete(k) - -#define thr_once(o, f) -#define thr_sigsetmask(f, n, o) -#define thr_self() -#define thr_errno() - -#define FLOCKFILE(fp) -#define FUNLOCKFILE(fp) - -#endif /* _REENTRANT */ diff --git a/libc/netbsd/net/servent.h b/libc/netbsd/net/servent.h deleted file mode 100644 index 822b37504..000000000 --- a/libc/netbsd/net/servent.h +++ /dev/null @@ -1,44 +0,0 @@ -/* $NetBSD: servent.h,v 1.1 2005/04/18 19:39:45 kleink Exp $ */ - -/*- - * Copyright (c) 2004 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Christos Zoulas. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include "resolv_static.h" - -struct servent* getservent_r(res_static rs); diff --git a/libc/netbsd/net/services.h b/libc/netbsd/net/services.h deleted file mode 100644 index fa199d084..000000000 --- a/libc/netbsd/net/services.h +++ /dev/null @@ -1,480 +0,0 @@ -/* generated by genserv.py - do not edit */ -static const char _services[] = "\ -\6tcpmux\0\1t\0\ -\4echo\0\7t\0\ -\4echo\0\7u\0\ -\7discard\0\11t\2\4sink\4null\ -\7discard\0\11u\2\4sink\4null\ -\6systat\0\13t\1\5users\ -\7daytime\0\15t\0\ -\7daytime\0\15u\0\ -\7netstat\0\17t\0\ -\4qotd\0\21t\1\5quote\ -\3msp\0\22t\0\ -\3msp\0\22u\0\ -\7chargen\0\23t\2\6ttytst\6source\ -\7chargen\0\23u\2\6ttytst\6source\ -\10ftp-data\0\24t\0\ -\3ftp\0\25t\0\ -\3fsp\0\25u\1\4fspd\ -\3ssh\0\26t\0\ -\3ssh\0\26u\0\ -\6telnet\0\27t\0\ -\4smtp\0\31t\1\4mail\ -\4time\0\45t\1\11timserver\ -\4time\0\45u\1\11timserver\ -\3rlp\0\47u\1\10resource\ -\12nameserver\0\52t\1\4name\ -\5whois\0\53t\1\7nicname\ -\6tacacs\0\61t\0\ -\6tacacs\0\61u\0\ -\12re-mail-ck\0\62t\0\ -\12re-mail-ck\0\62u\0\ -\6domain\0\65t\1\12nameserver\ -\6domain\0\65u\1\12nameserver\ -\3mtp\0\71t\0\ -\11tacacs-ds\0\101t\0\ -\11tacacs-ds\0\101u\0\ -\6bootps\0\103t\0\ -\6bootps\0\103u\0\ -\6bootpc\0\104t\0\ -\6bootpc\0\104u\0\ -\4tftp\0\105u\0\ -\6gopher\0\106t\0\ -\6gopher\0\106u\0\ -\3rje\0\115t\1\6netrjs\ -\6finger\0\117t\0\ -\3www\0\120t\1\4http\ -\3www\0\120u\0\ -\4link\0\127t\1\7ttylink\ -\10kerberos\0\130t\3\11kerberos5\4krb5\14kerberos-sec\ -\10kerberos\0\130u\3\11kerberos5\4krb5\14kerberos-sec\ -\6supdup\0\137t\0\ -\11hostnames\0\145t\1\10hostname\ -\10iso-tsap\0\146t\1\4tsap\ -\10acr-nema\0\150t\1\5dicom\ -\10acr-nema\0\150u\1\5dicom\ -\10csnet-ns\0\151t\1\6cso-ns\ -\10csnet-ns\0\151u\1\6cso-ns\ -\7rtelnet\0\153t\0\ -\7rtelnet\0\153u\0\ -\4pop2\0\155t\2\12postoffice\5pop-2\ -\4pop2\0\155u\1\5pop-2\ -\4pop3\0\156t\1\5pop-3\ -\4pop3\0\156u\1\5pop-3\ -\6sunrpc\0\157t\1\12portmapper\ -\6sunrpc\0\157u\1\12portmapper\ -\4auth\0\161t\3\16authentication\3tap\5ident\ -\4sftp\0\163t\0\ -\11uucp-path\0\165t\0\ -\4nntp\0\167t\2\10readnews\4untp\ -\3ntp\0\173t\0\ -\3ntp\0\173u\0\ -\6pwdgen\0\201t\0\ -\6pwdgen\0\201u\0\ -\7loc-srv\0\207t\1\5epmap\ -\7loc-srv\0\207u\1\5epmap\ -\12netbios-ns\0\211t\0\ -\12netbios-ns\0\211u\0\ -\13netbios-dgm\0\212t\0\ -\13netbios-dgm\0\212u\0\ -\13netbios-ssn\0\213t\0\ -\13netbios-ssn\0\213u\0\ -\5imap2\0\217t\1\4imap\ -\5imap2\0\217u\1\4imap\ -\4snmp\0\241t\0\ -\4snmp\0\241u\0\ -\11snmp-trap\0\242t\1\10snmptrap\ -\11snmp-trap\0\242u\1\10snmptrap\ -\10cmip-man\0\243t\0\ -\10cmip-man\0\243u\0\ -\12cmip-agent\0\244t\0\ -\12cmip-agent\0\244u\0\ -\5mailq\0\256t\0\ -\5mailq\0\256u\0\ -\5xdmcp\0\261t\0\ -\5xdmcp\0\261u\0\ -\10nextstep\0\262t\2\10NeXTStep\10NextStep\ -\10nextstep\0\262u\2\10NeXTStep\10NextStep\ -\3bgp\0\263t\0\ -\3bgp\0\263u\0\ -\10prospero\0\277t\0\ -\10prospero\0\277u\0\ -\3irc\0\302t\0\ -\3irc\0\302u\0\ -\4smux\0\307t\0\ -\4smux\0\307u\0\ -\7at-rtmp\0\311t\0\ -\7at-rtmp\0\311u\0\ -\6at-nbp\0\312t\0\ -\6at-nbp\0\312u\0\ -\7at-echo\0\314t\0\ -\7at-echo\0\314u\0\ -\6at-zis\0\316t\0\ -\6at-zis\0\316u\0\ -\4qmtp\0\321t\0\ -\4qmtp\0\321u\0\ -\5z3950\0\322t\1\4wais\ -\5z3950\0\322u\1\4wais\ -\3ipx\0\325t\0\ -\3ipx\0\325u\0\ -\5imap3\0\334t\0\ -\5imap3\0\334u\0\ -\7pawserv\1\131t\0\ -\7pawserv\1\131u\0\ -\5zserv\1\132t\0\ -\5zserv\1\132u\0\ -\7fatserv\1\133t\0\ -\7fatserv\1\133u\0\ -\13rpc2portmap\1\161t\0\ -\13rpc2portmap\1\161u\0\ -\11codaauth2\1\162t\0\ -\11codaauth2\1\162u\0\ -\11clearcase\1\163t\1\11Clearcase\ -\11clearcase\1\163u\1\11Clearcase\ -\11ulistserv\1\164t\0\ -\11ulistserv\1\164u\0\ -\4ldap\1\205t\0\ -\4ldap\1\205u\0\ -\4imsp\1\226t\0\ -\4imsp\1\226u\0\ -\5https\1\273t\0\ -\5https\1\273u\0\ -\4snpp\1\274t\0\ -\4snpp\1\274u\0\ -\14microsoft-ds\1\275t\0\ -\14microsoft-ds\1\275u\0\ -\4saft\1\347t\0\ -\4saft\1\347u\0\ -\6isakmp\1\364t\0\ -\6isakmp\1\364u\0\ -\4rtsp\2\52t\0\ -\4rtsp\2\52u\0\ -\3nqs\2\137t\0\ -\3nqs\2\137u\0\ -\12npmp-local\2\142t\1\16dqs313_qmaster\ -\12npmp-local\2\142u\1\16dqs313_qmaster\ -\10npmp-gui\2\143t\1\14dqs313_execd\ -\10npmp-gui\2\143u\1\14dqs313_execd\ -\10hmmp-ind\2\144t\1\20dqs313_intercell\ -\10hmmp-ind\2\144u\1\20dqs313_intercell\ -\3ipp\2\167t\0\ -\3ipp\2\167u\0\ -\4exec\2\0t\0\ -\4biff\2\0u\1\6comsat\ -\5login\2\1t\0\ -\3who\2\1u\1\4whod\ -\5shell\2\2t\1\3cmd\ -\6syslog\2\2u\0\ -\7printer\2\3t\1\7spooler\ -\4talk\2\5u\0\ -\5ntalk\2\6u\0\ -\5route\2\10u\2\6router\6routed\ -\5timed\2\15u\1\12timeserver\ -\5tempo\2\16t\1\7newdate\ -\7courier\2\22t\1\3rpc\ -\12conference\2\23t\1\4chat\ -\7netnews\2\24t\1\10readnews\ -\7netwall\2\25u\0\ -\6gdomap\2\32t\0\ -\6gdomap\2\32u\0\ -\4uucp\2\34t\1\5uucpd\ -\6klogin\2\37t\0\ -\6kshell\2\40t\1\5krcmd\ -\12afpovertcp\2\44t\0\ -\12afpovertcp\2\44u\0\ -\10remotefs\2\54t\2\12rfs_server\3rfs\ -\5nntps\2\63t\1\5snntp\ -\5nntps\2\63u\1\5snntp\ -\12submission\2\113t\0\ -\12submission\2\113u\0\ -\5ldaps\2\174t\0\ -\5ldaps\2\174u\0\ -\4tinc\2\217t\0\ -\4tinc\2\217u\0\ -\4silc\2\302t\0\ -\4silc\2\302u\0\ -\14kerberos-adm\2\355t\0\ -\7webster\2\375t\0\ -\7webster\2\375u\0\ -\5rsync\3\151t\0\ -\5rsync\3\151u\0\ -\11ftps-data\3\335t\0\ -\4ftps\3\336t\0\ -\7telnets\3\340t\0\ -\7telnets\3\340u\0\ -\5imaps\3\341t\0\ -\5imaps\3\341u\0\ -\4ircs\3\342t\0\ -\4ircs\3\342u\0\ -\5pop3s\3\343t\0\ -\5pop3s\3\343u\0\ -\5socks\4\70t\0\ -\5socks\4\70u\0\ -\6proofd\4\105t\0\ -\6proofd\4\105u\0\ -\5rootd\4\106t\0\ -\5rootd\4\106u\0\ -\7openvpn\4\252t\0\ -\7openvpn\4\252u\0\ -\13rmiregistry\4\113t\0\ -\13rmiregistry\4\113u\0\ -\5kazaa\4\276t\0\ -\5kazaa\4\276u\0\ -\6nessus\4\331t\0\ -\6nessus\4\331u\0\ -\11lotusnote\5\110t\1\12lotusnotes\ -\11lotusnote\5\110u\1\12lotusnotes\ -\10ms-sql-s\5\231t\0\ -\10ms-sql-s\5\231u\0\ -\10ms-sql-m\5\232t\0\ -\10ms-sql-m\5\232u\0\ -\12ingreslock\5\364t\0\ -\12ingreslock\5\364u\0\ -\13prospero-np\5\365t\0\ -\13prospero-np\5\365u\0\ -\13datametrics\6\155t\1\12old-radius\ -\13datametrics\6\155u\1\12old-radius\ -\13sa-msg-port\6\156t\1\13old-radacct\ -\13sa-msg-port\6\156u\1\13old-radacct\ -\6kermit\6\161t\0\ -\6kermit\6\161u\0\ -\3l2f\6\245t\1\4l2tp\ -\3l2f\6\245u\1\4l2tp\ -\6radius\7\24t\0\ -\6radius\7\24u\0\ -\13radius-acct\7\25t\1\7radacct\ -\13radius-acct\7\25u\1\7radacct\ -\13unix-status\7\245t\0\ -\12log-server\7\246t\0\ -\12remoteping\7\247t\0\ -\3nfs\10\1t\0\ -\3nfs\10\1u\0\ -\12rtcm-sc104\10\65t\0\ -\12rtcm-sc104\10\65u\0\ -\12cvspserver\11\141t\0\ -\12cvspserver\11\141u\0\ -\5venus\11\176t\0\ -\5venus\11\176u\0\ -\10venus-se\11\177t\0\ -\10venus-se\11\177u\0\ -\7codasrv\11\200t\0\ -\7codasrv\11\200u\0\ -\12codasrv-se\11\201t\0\ -\12codasrv-se\11\201u\0\ -\3mon\12\27t\0\ -\3mon\12\27u\0\ -\4dict\12\104t\0\ -\4dict\12\104u\0\ -\4gpsd\13\203t\0\ -\4gpsd\13\203u\0\ -\6gds_db\13\352t\0\ -\6gds_db\13\352u\0\ -\5icpv2\14\72t\1\3icp\ -\5icpv2\14\72u\1\3icp\ -\5mysql\14\352t\0\ -\5mysql\14\352u\0\ -\3nut\15\245t\0\ -\3nut\15\245u\0\ -\6distcc\16\60t\0\ -\6distcc\16\60u\0\ -\4daap\16\151t\0\ -\4daap\16\151u\0\ -\3svn\16\152t\1\12subversion\ -\3svn\16\152u\1\12subversion\ -\3iax\21\331t\0\ -\3iax\21\331u\0\ -\13radmin-port\23\43t\0\ -\13radmin-port\23\43u\0\ -\3rfe\23\212u\0\ -\3rfe\23\212t\0\ -\3sip\23\304t\0\ -\3sip\23\304u\0\ -\7sip-tls\23\305t\0\ -\7sip-tls\23\305u\0\ -\13xmpp-client\24\146t\1\15jabber-client\ -\13xmpp-client\24\146u\1\15jabber-client\ -\13xmpp-server\24\225t\1\15jabber-server\ -\13xmpp-server\24\225u\1\15jabber-server\ -\10cfengine\24\274t\0\ -\10cfengine\24\274u\0\ -\12postgresql\25\70t\1\10postgres\ -\12postgresql\25\70u\1\10postgres\ -\3x11\27\160t\1\5x11-0\ -\3x11\27\160u\1\5x11-0\ -\5x11-1\27\161t\0\ -\5x11-1\27\161u\0\ -\5x11-2\27\162t\0\ -\5x11-2\27\162u\0\ -\5x11-3\27\163t\0\ -\5x11-3\27\163u\0\ -\5x11-4\27\164t\0\ -\5x11-4\27\164u\0\ -\5x11-5\27\165t\0\ -\5x11-5\27\165u\0\ -\5x11-6\27\166t\0\ -\5x11-6\27\166u\0\ -\5x11-7\27\167t\0\ -\5x11-7\27\167u\0\ -\14gnutella-svc\30\312t\0\ -\14gnutella-svc\30\312u\0\ -\14gnutella-rtr\30\313t\0\ -\14gnutella-rtr\30\313u\0\ -\17afs3-fileserver\33\130t\1\3bbs\ -\17afs3-fileserver\33\130u\1\3bbs\ -\15afs3-callback\33\131t\0\ -\15afs3-callback\33\131u\0\ -\15afs3-prserver\33\132t\0\ -\15afs3-prserver\33\132u\0\ -\15afs3-vlserver\33\133t\0\ -\15afs3-vlserver\33\133u\0\ -\15afs3-kaserver\33\134t\0\ -\15afs3-kaserver\33\134u\0\ -\13afs3-volser\33\135t\0\ -\13afs3-volser\33\135u\0\ -\13afs3-errors\33\136t\0\ -\13afs3-errors\33\136u\0\ -\10afs3-bos\33\137t\0\ -\10afs3-bos\33\137u\0\ -\13afs3-update\33\140t\0\ -\13afs3-update\33\140u\0\ -\13afs3-rmtsys\33\141t\0\ -\13afs3-rmtsys\33\141u\0\ -\14font-service\33\274t\1\3xfs\ -\14font-service\33\274u\1\3xfs\ -\12bacula-dir\43\215t\0\ -\12bacula-dir\43\215u\0\ -\11bacula-fd\43\216t\0\ -\11bacula-fd\43\216u\0\ -\11bacula-sd\43\217t\0\ -\11bacula-sd\43\217u\0\ -\6amanda\47\140t\0\ -\6amanda\47\140u\0\ -\3hkp\54\153t\0\ -\3hkp\54\153u\0\ -\4bprd\65\230t\0\ -\4bprd\65\230u\0\ -\5bpdbm\65\231t\0\ -\5bpdbm\65\231u\0\ -\13bpjava-msvc\65\232t\0\ -\13bpjava-msvc\65\232u\0\ -\5vnetd\65\234t\0\ -\5vnetd\65\234u\0\ -\4bpcd\65\326t\0\ -\4bpcd\65\326u\0\ -\6vopied\65\327t\0\ -\6vopied\65\327u\0\ -\4wnn6\127\1t\0\ -\4wnn6\127\1u\0\ -\11kerberos4\2\356u\2\13kerberos-iv\3kdc\ -\11kerberos4\2\356t\2\13kerberos-iv\3kdc\ -\17kerberos_master\2\357u\0\ -\17kerberos_master\2\357t\0\ -\15passwd_server\2\360u\0\ -\10krb_prop\2\362t\2\11krb5_prop\5hprop\ -\11krbupdate\2\370t\1\4kreg\ -\7kpasswd\2\371t\1\4kpwd\ -\4swat\3\205t\0\ -\4kpop\4\125t\0\ -\5knetd\10\5t\0\ -\12zephyr-srv\10\66u\0\ -\12zephyr-clt\10\67u\0\ -\11zephyr-hm\10\70u\0\ -\7eklogin\10\71t\0\ -\2kx\10\77t\0\ -\5iprop\10\111t\0\ -\12supfilesrv\3\147t\0\ -\12supfiledbg\4\147t\0\ -\11linuxconf\0\142t\0\ -\10poppassd\0\152t\0\ -\10poppassd\0\152u\0\ -\5ssmtp\1\321t\1\5smtps\ -\10moira_db\3\7t\0\ -\14moira_update\3\11t\0\ -\12moira_ureg\3\13u\0\ -\5spamd\3\17t\0\ -\5omirr\3\50t\1\6omirrd\ -\5omirr\3\50u\1\6omirrd\ -\7customs\3\351t\0\ -\7customs\3\351u\0\ -\7skkserv\4\232t\0\ -\7predict\4\272u\0\ -\6rmtcfg\4\324t\0\ -\5wipld\5\24t\0\ -\4xtel\5\41t\0\ -\5xtelw\5\42t\0\ -\7support\5\371t\0\ -\5sieve\7\320t\0\ -\7cfinger\7\323t\0\ -\4ndtp\7\332t\0\ -\4frox\10\111t\0\ -\10ninstall\10\146t\0\ -\10ninstall\10\146u\0\ -\10zebrasrv\12\50t\0\ -\5zebra\12\51t\0\ -\4ripd\12\52t\0\ -\6ripngd\12\53t\0\ -\5ospfd\12\54t\0\ -\4bgpd\12\55t\0\ -\6ospf6d\12\56t\0\ -\7ospfapi\12\57t\0\ -\5isisd\12\60t\0\ -\10afbackup\13\254t\0\ -\10afbackup\13\254u\0\ -\11afmbackup\13\255t\0\ -\11afmbackup\13\255u\0\ -\5xtell\20\200t\0\ -\3fax\21\315t\0\ -\7hylafax\21\317t\0\ -\7distmp3\21\370t\0\ -\5munin\23\125t\1\4lrrd\ -\13enbd-cstatd\23\273t\0\ -\13enbd-sstatd\23\274t\0\ -\4pcrd\24\37t\0\ -\6noclog\24\352t\0\ -\6noclog\24\352u\0\ -\7hostmon\24\353t\0\ -\7hostmon\24\353u\0\ -\5rplay\25\263u\0\ -\5rplay\25\263t\0\ -\4rptp\25\264u\0\ -\4rptp\25\264t\0\ -\4nsca\26\43t\0\ -\4mrtd\26\52t\0\ -\6bgpsim\26\53t\0\ -\5canna\26\60t\0\ -\11sane-port\31\246t\2\4sane\5saned\ -\4ircd\32\13t\0\ -\10zope-ftp\37\125t\0\ -\10webcache\37\220t\0\ -\6tproxy\37\221t\0\ -\7omniorb\37\230t\0\ -\7omniorb\37\230u\0\ -\20clc-build-daemon\43\36t\0\ -\6xinetd\43\212t\0\ -\13mandelspawn\44\217u\1\12mandelbrot\ -\4zope\45\311t\0\ -\7kamanda\47\141t\0\ -\7kamanda\47\141u\0\ -\11amandaidx\47\142t\0\ -\11amidxtape\47\143t\0\ -\5smsqp\53\301t\0\ -\5smsqp\53\301u\0\ -\6xpilot\73\361t\0\ -\6xpilot\73\361u\0\ -\10sgi-cmsd\102\151u\0\ -\10sgi-crsd\102\152u\0\ -\7sgi-gcd\102\153u\0\ -\7sgi-cad\102\154t\0\ -\7isdnlog\116\53t\0\ -\7isdnlog\116\53u\0\ -\5vboxd\116\54t\0\ -\5vboxd\116\54u\0\ -\5binkp\137\352t\0\ -\3asp\152\356t\0\ -\3asp\152\356u\0\ -\11dircproxy\336\250t\0\ -\5tfido\353\21t\0\ -\4fido\353\23t\0\ -\0"; - diff --git a/libc/netbsd/resolv/__dn_comp.c b/libc/netbsd/resolv/__dn_comp.c deleted file mode 100644 index 93d3f1988..000000000 --- a/libc/netbsd/resolv/__dn_comp.c +++ /dev/null @@ -1,38 +0,0 @@ -/* $NetBSD: __dn_comp.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */ - -/* - * written by matthew green, 22/04/97. - * public domain. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: __dn_comp.c,v 1.4 2005/09/13 01:44:10 christos Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#if defined(__indr_reference) -__indr_reference(__dn_comp,dn_comp) -#else - -#include -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif - -/* XXX THIS IS A MESS! SEE XXX */ - -#undef dn_comp -int dn_comp(const char *, u_char *, int, u_char **, u_char **); - -int -dn_comp(const char *exp_dn, u_char *comp_dn, u_char **dnptrs, - u_char **lastdnptr, int length) -{ - - return __dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr); -} - -#endif diff --git a/libc/netbsd/resolv/__res_close.c b/libc/netbsd/resolv/__res_close.c deleted file mode 100644 index 3af50b06b..000000000 --- a/libc/netbsd/resolv/__res_close.c +++ /dev/null @@ -1,33 +0,0 @@ -/* $NetBSD: __res_close.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */ - -/* - * written by matthew green, 22/04/97. - * public domain. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: __res_close.c,v 1.4 2005/09/13 01:44:10 christos Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#if defined(__indr_reference) -__indr_reference(__res_close, res_close) -#else - -#include -#include -#include "resolv_private.h" - -/* XXX THIS IS A MESS! SEE XXX */ - -#undef res_close -void res_close(void); - -void -res_close(void) -{ - - __res_close(); -} - -#endif diff --git a/libc/netbsd/resolv/__res_send.c b/libc/netbsd/resolv/__res_send.c deleted file mode 100644 index 198b05c12..000000000 --- a/libc/netbsd/resolv/__res_send.c +++ /dev/null @@ -1,37 +0,0 @@ -/* $NetBSD: __res_send.c,v 1.4 2005/09/13 01:44:10 christos Exp $ */ - -/* - * written by matthew green, 22/04/97. - * public domain. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: __res_send.c,v 1.4 2005/09/13 01:44:10 christos Exp $"); -#endif - -#if defined(__indr_reference) -__indr_reference(__res_send, res_send) -#else - -#include -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif - -/* XXX THIS IS A MESS! SEE XXX */ - -#undef res_send -int res_send(const u_char *, int, u_char *, int); - -int -res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) -{ - - return __res_send(buf, buflen, ans, anssiz); -} - -#endif diff --git a/libc/netbsd/resolv/herror.c b/libc/netbsd/resolv/herror.c deleted file mode 100644 index e90e64141..000000000 --- a/libc/netbsd/resolv/herror.c +++ /dev/null @@ -1,133 +0,0 @@ -/* $NetBSD: herror.c,v 1.4 2004/05/23 05:09:52 christos Exp $ */ - -/* - * Copyright (c) 1987, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Portions Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#if defined(LIBC_SCCS) && !defined(lint) -#ifdef notdef -static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "Id: herror.c,v 1.2.206.1 2004/03/09 08:33:54 marka Exp"; -#else -__RCSID("$NetBSD: herror.c,v 1.4 2004/05/23 05:09:52 christos Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include - -#include -#include "arpa_nameser.h" - -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include -#include - -#ifndef DE_CONST -#define DE_CONST(c,v) v = ((c) ? \ - strchr((const void *)(c), *(const char *)(const void *)(c)) : NULL) -#endif - -const char * const h_errlist[] = { - "Resolver Error 0 (no error)", - "Unknown host", /* 1 HOST_NOT_FOUND */ - "Host name lookup failure", /* 2 TRY_AGAIN */ - "Unknown server error", /* 3 NO_RECOVERY */ - "No address associated with name", /* 4 NO_ADDRESS */ -}; -const int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] }; - -/* - * herror -- - * print the error indicated by the h_errno value. - */ -void -herror(const char *s) { - struct iovec iov[4], *v = iov; - char *t; - - if (s != NULL && *s != '\0') { - DE_CONST(s, t); - v->iov_base = t; - v->iov_len = strlen(t); - v++; - DE_CONST(": ", t); - v->iov_base = t; - v->iov_len = 2; - v++; - } - DE_CONST(hstrerror(h_errno), t); - v->iov_base = t; - v->iov_len = strlen(v->iov_base); - v++; - DE_CONST("\n", t); - v->iov_base = t; - v->iov_len = 1; - writev(STDERR_FILENO, iov, (v - iov) + 1); -} - -/* - * hstrerror -- - * return the string associated with a given "host" errno value. - */ -const char * -hstrerror(int err) { - if (err < 0) - return ("Resolver internal error"); - else if (err < h_nerr) - return (h_errlist[err]); - return ("Unknown resolver error"); -} diff --git a/libc/netbsd/resolv/res_cache.c b/libc/netbsd/resolv/res_cache.c deleted file mode 100644 index 2c912de41..000000000 --- a/libc/netbsd/resolv/res_cache.c +++ /dev/null @@ -1,1461 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "resolv_cache.h" -#include -#include -#include -#include "pthread.h" - -/* This code implements a small and *simple* DNS resolver cache. - * - * It is only used to cache DNS answers for a maximum of CONFIG_SECONDS seconds - * in order to reduce DNS traffic. It is not supposed to be a full DNS cache, - * since we plan to implement that in the future in a dedicated process running - * on the system. - * - * Note that its design is kept simple very intentionally, i.e.: - * - * - it takes raw DNS query packet data as input, and returns raw DNS - * answer packet data as output - * - * (this means that two similar queries that encode the DNS name - * differently will be treated distinctly). - * - * - the TTLs of answer RRs are ignored. our DNS resolver library does not use - * them anyway, but it means that records with a TTL smaller than - * CONFIG_SECONDS will be kept in the cache anyway. - * - * this is bad, but we absolutely want to avoid parsing the answer packets - * (and should be solved by the later full DNS cache process). - * - * - the implementation is just a (query-data) => (answer-data) hash table - * with a trivial least-recently-used expiration policy. - * - * Doing this keeps the code simple and avoids to deal with a lot of things - * that a full DNS cache is expected to do. - * - * The API is also very simple: - * - * - the client calls _resolv_cache_get() to obtain a handle to the cache. - * this will initialize the cache on first usage. the result can be NULL - * if the cache is disabled. - * - * - the client calls _resolv_cache_lookup() before performing a query - * - * if the function returns RESOLV_CACHE_FOUND, a copy of the answer data - * has been copied into the client-provided answer buffer. - * - * if the function returns RESOLV_CACHE_NOTFOUND, the client should perform - * a request normally, *then* call _resolv_cache_add() to add the received - * answer to the cache. - * - * if the function returns RESOLV_CACHE_UNSUPPORTED, the client should - * perform a request normally, and *not* call _resolv_cache_add() - * - * note that RESOLV_CACHE_UNSUPPORTED is also returned if the answer buffer - * is too short to accomodate the cached result. - * - * - when network settings change, the cache must be flushed since the list - * of DNS servers probably changed. this is done by calling - * _resolv_cache_reset() - * - * the parameter to this function must be an ever-increasing generation - * number corresponding to the current network settings state. - * - * This is done because several threads could detect the same network - * settings change (but at different times) and will all end up calling the - * same function. Comparing with the last used generation number ensures - * that the cache is only flushed once per network change. - */ - -/* the name of an environment variable that will be checked the first time - * this code is called if its value is "0", then the resolver cache is - * disabled. - */ -#define CONFIG_ENV "BIONIC_DNSCACHE" - -/* entries older than CONFIG_SECONDS seconds are always discarded. - */ -#define CONFIG_SECONDS (60*10) /* 10 minutes */ - -/* maximum number of entries kept in the cache. This value has been - * determined by browsing through various sites and counting the number - * of corresponding requests. Keep in mind that our framework is currently - * performing two requests per name lookup (one for IPv4, the other for IPv6) - * - * www.google.com 4 - * www.ysearch.com 6 - * www.amazon.com 8 - * www.nytimes.com 22 - * www.espn.com 28 - * www.msn.com 28 - * www.lemonde.fr 35 - * - * (determined in 2009-2-17 from Paris, France, results may vary depending - * on location) - * - * most high-level websites use lots of media/ad servers with different names - * but these are generally reused when browsing through the site. - * - * As such, a valud of 64 should be relatively conformtable at the moment. - */ -#define CONFIG_MAX_ENTRIES 64 - -/****************************************************************************/ -/****************************************************************************/ -/***** *****/ -/***** *****/ -/***** *****/ -/****************************************************************************/ -/****************************************************************************/ - -/* set to 1 to debug cache operations */ -#define DEBUG 0 - -/* set to 1 to debug query data */ -#define DEBUG_DATA 0 - -#if DEBUG -# include -# define XLOG(...) \ - __libc_android_log_print(ANDROID_LOG_DEBUG,"libc",__VA_ARGS__) - -#include -#include - -/** BOUNDED BUFFER FORMATTING - **/ - -/* technical note: - * - * the following debugging routines are used to append data to a bounded - * buffer they take two parameters that are: - * - * - p : a pointer to the current cursor position in the buffer - * this value is initially set to the buffer's address. - * - * - end : the address of the buffer's limit, i.e. of the first byte - * after the buffer. this address should never be touched. - * - * IMPORTANT: it is assumed that end > buffer_address, i.e. - * that the buffer is at least one byte. - * - * the _bprint_() functions return the new value of 'p' after the data - * has been appended, and also ensure the following: - * - * - the returned value will never be strictly greater than 'end' - * - * - a return value equal to 'end' means that truncation occured - * (in which case, end[-1] will be set to 0) - * - * - after returning from a _bprint_() function, the content of the buffer - * is always 0-terminated, even in the event of truncation. - * - * these conventions allow you to call _bprint_ functions multiple times and - * only check for truncation at the end of the sequence, as in: - * - * char buff[1000], *p = buff, *end = p + sizeof(buff); - * - * p = _bprint_c(p, end, '"'); - * p = _bprint_s(p, end, my_string); - * p = _bprint_c(p, end, '"'); - * - * if (p >= end) { - * // buffer was too small - * } - * - * printf( "%s", buff ); - */ - -/* add a char to a bounded buffer */ -static char* -_bprint_c( char* p, char* end, int c ) -{ - if (p < end) { - if (p+1 == end) - *p++ = 0; - else { - *p++ = (char) c; - *p = 0; - } - } - return p; -} - -/* add a sequence of bytes to a bounded buffer */ -static char* -_bprint_b( char* p, char* end, const char* buf, int len ) -{ - int avail = end - p; - - if (avail <= 0 || len <= 0) - return p; - - if (avail > len) - avail = len; - - memcpy( p, buf, avail ); - p += avail; - - if (p < end) - p[0] = 0; - else - end[-1] = 0; - - return p; -} - -/* add a string to a bounded buffer */ -static char* -_bprint_s( char* p, char* end, const char* str ) -{ - return _bprint_b(p, end, str, strlen(str)); -} - -/* add a formatted string to a bounded buffer */ -static char* -_bprint( char* p, char* end, const char* format, ... ) -{ - int avail, n; - va_list args; - - avail = end - p; - - if (avail <= 0) - return p; - - va_start(args, format); - n = snprintf( p, avail, format, args); - va_end(args); - - /* certain C libraries return -1 in case of truncation */ - if (n < 0 || n > avail) - n = avail; - - p += n; - /* certain C libraries do not zero-terminate in case of truncation */ - if (p == end) - p[-1] = 0; - - return p; -} - -/* add a hex value to a bounded buffer, up to 8 digits */ -static char* -_bprint_hex( char* p, char* end, unsigned value, int numDigits ) -{ - char text[sizeof(unsigned)*2]; - int nn = 0; - - while (numDigits-- > 0) { - text[nn++] = "0123456789abcdef"[(value >> (numDigits*4)) & 15]; - } - return _bprint_b(p, end, text, nn); -} - -/* add the hexadecimal dump of some memory area to a bounded buffer */ -static char* -_bprint_hexdump( char* p, char* end, const uint8_t* data, int datalen ) -{ - int lineSize = 16; - - while (datalen > 0) { - int avail = datalen; - int nn; - - if (avail > lineSize) - avail = lineSize; - - for (nn = 0; nn < avail; nn++) { - if (nn > 0) - p = _bprint_c(p, end, ' '); - p = _bprint_hex(p, end, data[nn], 2); - } - for ( ; nn < lineSize; nn++ ) { - p = _bprint_s(p, end, " "); - } - p = _bprint_s(p, end, " "); - - for (nn = 0; nn < avail; nn++) { - int c = data[nn]; - - if (c < 32 || c > 127) - c = '.'; - - p = _bprint_c(p, end, c); - } - p = _bprint_c(p, end, '\n'); - - data += avail; - datalen -= avail; - } - return p; -} - -/* dump the content of a query of packet to the log */ -static void -XLOG_BYTES( const void* base, int len ) -{ - char buff[1024]; - char* p = buff, *end = p + sizeof(buff); - - p = _bprint_hexdump(p, end, base, len); - XLOG("%s",buff); -} - -#else /* !DEBUG */ -# define XLOG(...) ((void)0) -# define XLOG_BYTES(a,b) ((void)0) -#endif - -static time_t -_time_now( void ) -{ - struct timeval tv; - - gettimeofday( &tv, NULL ); - return tv.tv_sec; -} - -/* reminder: the general format of a DNS packet is the following: - * - * HEADER (12 bytes) - * QUESTION (variable) - * ANSWER (variable) - * AUTHORITY (variable) - * ADDITIONNAL (variable) - * - * the HEADER is made of: - * - * ID : 16 : 16-bit unique query identification field - * - * QR : 1 : set to 0 for queries, and 1 for responses - * Opcode : 4 : set to 0 for queries - * AA : 1 : set to 0 for queries - * TC : 1 : truncation flag, will be set to 0 in queries - * RD : 1 : recursion desired - * - * RA : 1 : recursion available (0 in queries) - * Z : 3 : three reserved zero bits - * RCODE : 4 : response code (always 0=NOERROR in queries) - * - * QDCount: 16 : question count - * ANCount: 16 : Answer count (0 in queries) - * NSCount: 16: Authority Record count (0 in queries) - * ARCount: 16: Additionnal Record count (0 in queries) - * - * the QUESTION is made of QDCount Question Record (QRs) - * the ANSWER is made of ANCount RRs - * the AUTHORITY is made of NSCount RRs - * the ADDITIONNAL is made of ARCount RRs - * - * Each Question Record (QR) is made of: - * - * QNAME : variable : Query DNS NAME - * TYPE : 16 : type of query (A=1, PTR=12, MX=15, AAAA=28, ALL=255) - * CLASS : 16 : class of query (IN=1) - * - * Each Resource Record (RR) is made of: - * - * NAME : variable : DNS NAME - * TYPE : 16 : type of query (A=1, PTR=12, MX=15, AAAA=28, ALL=255) - * CLASS : 16 : class of query (IN=1) - * TTL : 32 : seconds to cache this RR (0=none) - * RDLENGTH: 16 : size of RDDATA in bytes - * RDDATA : variable : RR data (depends on TYPE) - * - * Each QNAME contains a domain name encoded as a sequence of 'labels' - * terminated by a zero. Each label has the following format: - * - * LEN : 8 : lenght of label (MUST be < 64) - * NAME : 8*LEN : label length (must exclude dots) - * - * A value of 0 in the encoding is interpreted as the 'root' domain and - * terminates the encoding. So 'www.android.com' will be encoded as: - * - * <3>www<7>android<3>com<0> - * - * Where represents the byte with value 'n' - * - * Each NAME reflects the QNAME of the question, but has a slightly more - * complex encoding in order to provide message compression. This is achieved - * by using a 2-byte pointer, with format: - * - * TYPE : 2 : 0b11 to indicate a pointer, 0b01 and 0b10 are reserved - * OFFSET : 14 : offset to another part of the DNS packet - * - * The offset is relative to the start of the DNS packet and must point - * A pointer terminates the encoding. - * - * The NAME can be encoded in one of the following formats: - * - * - a sequence of simple labels terminated by 0 (like QNAMEs) - * - a single pointer - * - a sequence of simple labels terminated by a pointer - * - * A pointer shall always point to either a pointer of a sequence of - * labels (which can themselves be terminated by either a 0 or a pointer) - * - * The expanded length of a given domain name should not exceed 255 bytes. - * - * NOTE: we don't parse the answer packets, so don't need to deal with NAME - * records, only QNAMEs. - */ - -#define DNS_HEADER_SIZE 12 - -#define DNS_TYPE_A "\00\01" /* big-endian decimal 1 */ -#define DNS_TYPE_PTR "\00\014" /* big-endian decimal 12 */ -#define DNS_TYPE_MX "\00\017" /* big-endian decimal 15 */ -#define DNS_TYPE_AAAA "\00\034" /* big-endian decimal 28 */ -#define DNS_TYPE_ALL "\00\0377" /* big-endian decimal 255 */ - -#define DNS_CLASS_IN "\00\01" /* big-endian decimal 1 */ - -typedef struct { - const uint8_t* base; - const uint8_t* end; - const uint8_t* cursor; -} DnsPacket; - -static void -_dnsPacket_init( DnsPacket* packet, const uint8_t* buff, int bufflen ) -{ - packet->base = buff; - packet->end = buff + bufflen; - packet->cursor = buff; -} - -static void -_dnsPacket_rewind( DnsPacket* packet ) -{ - packet->cursor = packet->base; -} - -static void -_dnsPacket_skip( DnsPacket* packet, int count ) -{ - const uint8_t* p = packet->cursor + count; - - if (p > packet->end) - p = packet->end; - - packet->cursor = p; -} - -static int -_dnsPacket_readInt16( DnsPacket* packet ) -{ - const uint8_t* p = packet->cursor; - - if (p+2 > packet->end) - return -1; - - packet->cursor = p+2; - return (p[0]<< 8) | p[1]; -} - -/** QUERY CHECKING - **/ - -/* check bytes in a dns packet. returns 1 on success, 0 on failure. - * the cursor is only advanced in the case of success - */ -static int -_dnsPacket_checkBytes( DnsPacket* packet, int numBytes, const void* bytes ) -{ - const uint8_t* p = packet->cursor; - - if (p + numBytes > packet->end) - return 0; - - if (memcmp(p, bytes, numBytes) != 0) - return 0; - - packet->cursor = p + numBytes; - return 1; -} - -/* parse and skip a given QNAME stored in a query packet, - * from the current cursor position. returns 1 on success, - * or 0 for malformed data. - */ -static int -_dnsPacket_checkQName( DnsPacket* packet ) -{ - const uint8_t* p = packet->cursor; - const uint8_t* end = packet->end; - - for (;;) { - int c; - - if (p >= end) - break; - - c = *p++; - - if (c == 0) { - packet->cursor = p; - return 1; - } - - /* we don't expect label compression in QNAMEs */ - if (c >= 64) - break; - - p += c; - /* we rely on the bound check at the start - * of the loop here */ - } - /* malformed data */ - XLOG("malformed QNAME"); - return 0; -} - -/* parse and skip a given QR stored in a packet. - * returns 1 on success, and 0 on failure - */ -static int -_dnsPacket_checkQR( DnsPacket* packet ) -{ - int len; - - if (!_dnsPacket_checkQName(packet)) - return 0; - - /* TYPE must be one of the things we support */ - if (!_dnsPacket_checkBytes(packet, 2, DNS_TYPE_A) && - !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_PTR) && - !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_MX) && - !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_AAAA) && - !_dnsPacket_checkBytes(packet, 2, DNS_TYPE_ALL)) - { - XLOG("unsupported TYPE"); - return 0; - } - /* CLASS must be IN */ - if (!_dnsPacket_checkBytes(packet, 2, DNS_CLASS_IN)) { - XLOG("unsupported CLASS"); - return 0; - } - - return 1; -} - -/* check the header of a DNS Query packet, return 1 if it is one - * type of query we can cache, or 0 otherwise - */ -static int -_dnsPacket_checkQuery( DnsPacket* packet ) -{ - const uint8_t* p = packet->base; - int qdCount, anCount, dnCount, arCount; - - if (p + DNS_HEADER_SIZE > packet->end) { - XLOG("query packet too small"); - return 0; - } - - /* QR must be set to 0, opcode must be 0 and AA must be 0 */ - /* RA, Z, and RCODE must be 0 */ - if ((p[2] & 0xFC) != 0 || p[3] != 0) { - XLOG("query packet flags unsupported"); - return 0; - } - - /* Note that we ignore the TC and RD bits here for the - * following reasons: - * - * - there is no point for a query packet sent to a server - * to have the TC bit set, but the implementation might - * set the bit in the query buffer for its own needs - * between a _resolv_cache_lookup and a - * _resolv_cache_add. We should not freak out if this - * is the case. - * - * - we consider that the result from a RD=0 or a RD=1 - * query might be different, hence that the RD bit - * should be used to differentiate cached result. - * - * this implies that RD is checked when hashing or - * comparing query packets, but not TC - */ - - /* ANCOUNT, DNCOUNT and ARCOUNT must be 0 */ - qdCount = (p[4] << 8) | p[5]; - anCount = (p[6] << 8) | p[7]; - dnCount = (p[8] << 8) | p[9]; - arCount = (p[10]<< 8) | p[11]; - - if (anCount != 0 || dnCount != 0 || arCount != 0) { - XLOG("query packet contains non-query records"); - return 0; - } - - if (qdCount == 0) { - XLOG("query packet doesn't contain query record"); - return 0; - } - - /* Check QDCOUNT QRs */ - packet->cursor = p + DNS_HEADER_SIZE; - - for (;qdCount > 0; qdCount--) - if (!_dnsPacket_checkQR(packet)) - return 0; - - return 1; -} - -/** QUERY DEBUGGING - **/ -#if DEBUG -static char* -_dnsPacket_bprintQName(DnsPacket* packet, char* bp, char* bend) -{ - const uint8_t* p = packet->cursor; - const uint8_t* end = packet->end; - int first = 1; - - for (;;) { - int c; - - if (p >= end) - break; - - c = *p++; - - if (c == 0) { - packet->cursor = p; - return bp; - } - - /* we don't expect label compression in QNAMEs */ - if (c >= 64) - break; - - if (first) - first = 0; - else - bp = _bprint_c(bp, bend, '.'); - - bp = _bprint_b(bp, bend, (const char*)p, c); - - p += c; - /* we rely on the bound check at the start - * of the loop here */ - } - /* malformed data */ - bp = _bprint_s(bp, bend, ""); - return bp; -} - -static char* -_dnsPacket_bprintQR(DnsPacket* packet, char* p, char* end) -{ -#define QQ(x) { DNS_TYPE_##x, #x } - static const struct { - const char* typeBytes; - const char* typeString; - } qTypes[] = - { - QQ(A), QQ(PTR), QQ(MX), QQ(AAAA), QQ(ALL), - { NULL, NULL } - }; - int nn; - const char* typeString = NULL; - - /* dump QNAME */ - p = _dnsPacket_bprintQName(packet, p, end); - - /* dump TYPE */ - p = _bprint_s(p, end, " ("); - - for (nn = 0; qTypes[nn].typeBytes != NULL; nn++) { - if (_dnsPacket_checkBytes(packet, 2, qTypes[nn].typeBytes)) { - typeString = qTypes[nn].typeString; - break; - } - } - - if (typeString != NULL) - p = _bprint_s(p, end, typeString); - else { - int typeCode = _dnsPacket_readInt16(packet); - p = _bprint(p, end, "UNKNOWN-%d", typeCode); - } - - p = _bprint_c(p, end, ')'); - - /* skip CLASS */ - _dnsPacket_skip(packet, 2); - return p; -} - -/* this function assumes the packet has already been checked */ -static char* -_dnsPacket_bprintQuery( DnsPacket* packet, char* p, char* end ) -{ - int qdCount; - - if (packet->base[2] & 0x1) { - p = _bprint_s(p, end, "RECURSIVE "); - } - - _dnsPacket_skip(packet, 4); - qdCount = _dnsPacket_readInt16(packet); - _dnsPacket_skip(packet, 6); - - for ( ; qdCount > 0; qdCount-- ) { - p = _dnsPacket_bprintQR(packet, p, end); - } - return p; -} -#endif - - -/** QUERY HASHING SUPPORT - ** - ** THE FOLLOWING CODE ASSUMES THAT THE INPUT PACKET HAS ALREADY - ** BEEN SUCCESFULLY CHECKED. - **/ - -/* use 32-bit FNV hash function */ -#define FNV_MULT 16777619U -#define FNV_BASIS 2166136261U - -static unsigned -_dnsPacket_hashBytes( DnsPacket* packet, int numBytes, unsigned hash ) -{ - const uint8_t* p = packet->cursor; - const uint8_t* end = packet->end; - - while (numBytes > 0 && p < end) { - hash = hash*FNV_MULT ^ *p++; - } - packet->cursor = p; - return hash; -} - - -static unsigned -_dnsPacket_hashQName( DnsPacket* packet, unsigned hash ) -{ - const uint8_t* p = packet->cursor; - const uint8_t* end = packet->end; - - for (;;) { - int c; - - if (p >= end) { /* should not happen */ - XLOG("%s: INTERNAL_ERROR: read-overflow !!\n", __FUNCTION__); - break; - } - - c = *p++; - - if (c == 0) - break; - - if (c >= 64) { - XLOG("%s: INTERNAL_ERROR: malformed domain !!\n", __FUNCTION__); - break; - } - if (p + c >= end) { - XLOG("%s: INTERNAL_ERROR: simple label read-overflow !!\n", - __FUNCTION__); - break; - } - while (c > 0) { - hash = hash*FNV_MULT ^ *p++; - c -= 1; - } - } - packet->cursor = p; - return hash; -} - -static unsigned -_dnsPacket_hashQR( DnsPacket* packet, unsigned hash ) -{ - int len; - - hash = _dnsPacket_hashQName(packet, hash); - hash = _dnsPacket_hashBytes(packet, 4, hash); /* TYPE and CLASS */ - return hash; -} - -static unsigned -_dnsPacket_hashQuery( DnsPacket* packet ) -{ - unsigned hash = FNV_BASIS; - int count; - _dnsPacket_rewind(packet); - - /* we ignore the TC bit for reasons explained in - * _dnsPacket_checkQuery(). - * - * however we hash the RD bit to differentiate - * between answers for recursive and non-recursive - * queries. - */ - hash = hash*FNV_MULT ^ (packet->base[2] & 1); - - /* assume: other flags are 0 */ - _dnsPacket_skip(packet, 4); - - /* read QDCOUNT */ - count = _dnsPacket_readInt16(packet); - - /* assume: ANcount, NScount, ARcount are 0 */ - _dnsPacket_skip(packet, 6); - - /* hash QDCOUNT QRs */ - for ( ; count > 0; count-- ) - hash = _dnsPacket_hashQR(packet, hash); - - return hash; -} - - -/** QUERY COMPARISON - ** - ** THE FOLLOWING CODE ASSUMES THAT THE INPUT PACKETS HAVE ALREADY - ** BEEN SUCCESFULLY CHECKED. - **/ - -static int -_dnsPacket_isEqualDomainName( DnsPacket* pack1, DnsPacket* pack2 ) -{ - const uint8_t* p1 = pack1->cursor; - const uint8_t* end1 = pack1->end; - const uint8_t* p2 = pack2->cursor; - const uint8_t* end2 = pack2->end; - - for (;;) { - int c1, c2; - - if (p1 >= end1 || p2 >= end2) { - XLOG("%s: INTERNAL_ERROR: read-overflow !!\n", __FUNCTION__); - break; - } - c1 = *p1++; - c2 = *p2++; - if (c1 != c2) - break; - - if (c1 == 0) { - pack1->cursor = p1; - pack2->cursor = p2; - return 1; - } - if (c1 >= 64) { - XLOG("%s: INTERNAL_ERROR: malformed domain !!\n", __FUNCTION__); - break; - } - if ((p1+c1 > end1) || (p2+c1 > end2)) { - XLOG("%s: INTERNAL_ERROR: simple label read-overflow !!\n", - __FUNCTION__); - break; - } - if (memcmp(p1, p2, c1) != 0) - break; - p1 += c1; - p2 += c1; - /* we rely on the bound checks at the start of the loop */ - } - /* not the same, or one is malformed */ - XLOG("different DN"); - return 0; -} - -static int -_dnsPacket_isEqualBytes( DnsPacket* pack1, DnsPacket* pack2, int numBytes ) -{ - const uint8_t* p1 = pack1->cursor; - const uint8_t* p2 = pack2->cursor; - - if ( p1 + numBytes > pack1->end || p2 + numBytes > pack2->end ) - return 0; - - if ( memcmp(p1, p2, numBytes) != 0 ) - return 0; - - pack1->cursor += numBytes; - pack2->cursor += numBytes; - return 1; -} - -static int -_dnsPacket_isEqualQR( DnsPacket* pack1, DnsPacket* pack2 ) -{ - /* compare domain name encoding + TYPE + CLASS */ - if ( !_dnsPacket_isEqualDomainName(pack1, pack2) || - !_dnsPacket_isEqualBytes(pack1, pack2, 2+2) ) - return 0; - - return 1; -} - -static int -_dnsPacket_isEqualQuery( DnsPacket* pack1, DnsPacket* pack2 ) -{ - int count1, count2; - - /* compare the headers, ignore most fields */ - _dnsPacket_rewind(pack1); - _dnsPacket_rewind(pack2); - - /* compare RD, ignore TC, see comment in _dnsPacket_checkQuery */ - if ((pack1->base[2] & 1) != (pack2->base[2] & 1)) { - XLOG("different RD"); - return 0; - } - - /* assume: other flags are all 0 */ - _dnsPacket_skip(pack1, 4); - _dnsPacket_skip(pack2, 4); - - /* compare QDCOUNT */ - count1 = _dnsPacket_readInt16(pack1); - count2 = _dnsPacket_readInt16(pack2); - if (count1 != count2 || count1 < 0) { - XLOG("different QDCOUNT"); - return 0; - } - - /* assume: ANcount, NScount and ARcount are all 0 */ - _dnsPacket_skip(pack1, 6); - _dnsPacket_skip(pack2, 6); - - /* compare the QDCOUNT QRs */ - for ( ; count1 > 0; count1-- ) { - if (!_dnsPacket_isEqualQR(pack1, pack2)) { - XLOG("different QR"); - return 0; - } - } - return 1; -} - -/****************************************************************************/ -/****************************************************************************/ -/***** *****/ -/***** *****/ -/***** *****/ -/****************************************************************************/ -/****************************************************************************/ - -/* cache entry. for simplicity, 'hash' and 'hlink' are inlined in this - * structure though they are conceptually part of the hash table. - * - * similarly, mru_next and mru_prev are part of the global MRU list - */ -typedef struct Entry { - unsigned int hash; /* hash value */ - struct Entry* hlink; /* next in collision chain */ - struct Entry* mru_prev; - struct Entry* mru_next; - - const uint8_t* query; - int querylen; - const uint8_t* answer; - int answerlen; - time_t when; /* time_t when entry was added to table */ - int id; /* for debugging purpose */ -} Entry; - - -static void -entry_free( Entry* e ) -{ - /* everything is allocated in a single memory block */ - if (e) { - free(e); - } -} - -static __inline__ void -entry_mru_remove( Entry* e ) -{ - e->mru_prev->mru_next = e->mru_next; - e->mru_next->mru_prev = e->mru_prev; -} - -static __inline__ void -entry_mru_add( Entry* e, Entry* list ) -{ - Entry* first = list->mru_next; - - e->mru_next = first; - e->mru_prev = list; - - list->mru_next = e; - first->mru_prev = e; -} - -/* compute the hash of a given entry, this is a hash of most - * data in the query (key) */ -static unsigned -entry_hash( const Entry* e ) -{ - DnsPacket pack[1]; - - _dnsPacket_init(pack, e->query, e->querylen); - return _dnsPacket_hashQuery(pack); -} - -/* initialize an Entry as a search key, this also checks the input query packet - * returns 1 on success, or 0 in case of unsupported/malformed data */ -static int -entry_init_key( Entry* e, const void* query, int querylen ) -{ - DnsPacket pack[1]; - - memset(e, 0, sizeof(*e)); - - e->query = query; - e->querylen = querylen; - e->hash = entry_hash(e); - - _dnsPacket_init(pack, query, querylen); - - return _dnsPacket_checkQuery(pack); -} - -/* allocate a new entry as a cache node */ -static Entry* -entry_alloc( const Entry* init, const void* answer, int answerlen ) -{ - Entry* e; - int size; - - size = sizeof(*e) + init->querylen + answerlen; - e = calloc(size, 1); - if (e == NULL) - return e; - - e->hash = init->hash; - e->query = (const uint8_t*)(e+1); - e->querylen = init->querylen; - - memcpy( (char*)e->query, init->query, e->querylen ); - - e->answer = e->query + e->querylen; - e->answerlen = answerlen; - - memcpy( (char*)e->answer, answer, e->answerlen ); - - e->when = _time_now(); - - return e; -} - -static int -entry_equals( const Entry* e1, const Entry* e2 ) -{ - DnsPacket pack1[1], pack2[1]; - - if (e1->querylen != e2->querylen) { - return 0; - } - _dnsPacket_init(pack1, e1->query, e1->querylen); - _dnsPacket_init(pack2, e2->query, e2->querylen); - - return _dnsPacket_isEqualQuery(pack1, pack2); -} - -/****************************************************************************/ -/****************************************************************************/ -/***** *****/ -/***** *****/ -/***** *****/ -/****************************************************************************/ -/****************************************************************************/ - -/* We use a simple hash table with external collision lists - * for simplicity, the hash-table fields 'hash' and 'hlink' are - * inlined in the Entry structure. - */ -#define MAX_HASH_ENTRIES (2*CONFIG_MAX_ENTRIES) - -typedef struct resolv_cache { - int num_entries; - Entry mru_list; - pthread_mutex_t lock; - unsigned generation; - int last_id; - Entry* entries[ MAX_HASH_ENTRIES ]; -} Cache; - - -#define HTABLE_VALID(x) ((x) != NULL && (x) != HTABLE_DELETED) - -static void -_cache_flush_locked( Cache* cache ) -{ - int nn; - time_t now = _time_now(); - - for (nn = 0; nn < MAX_HASH_ENTRIES; nn++) - { - Entry** pnode = &cache->entries[nn]; - - while (*pnode != NULL) { - Entry* node = *pnode; - *pnode = node->hlink; - entry_free(node); - } - } - - cache->mru_list.mru_next = cache->mru_list.mru_prev = &cache->mru_list; - cache->num_entries = 0; - cache->last_id = 0; - - XLOG("*************************\n" - "*** DNS CACHE FLUSHED ***\n" - "*************************"); -} - -struct resolv_cache* -_resolv_cache_create( void ) -{ - struct resolv_cache* cache; - - cache = calloc(sizeof(*cache), 1); - if (cache) { - cache->generation = ~0U; - pthread_mutex_init( &cache->lock, NULL ); - cache->mru_list.mru_prev = cache->mru_list.mru_next = &cache->mru_list; - XLOG("%s: cache created\n", __FUNCTION__); - } - return cache; -} - - -#if DEBUG -static void -_dump_query( const uint8_t* query, int querylen ) -{ - char temp[256], *p=temp, *end=p+sizeof(temp); - DnsPacket pack[1]; - - _dnsPacket_init(pack, query, querylen); - p = _dnsPacket_bprintQuery(pack, p, end); - XLOG("QUERY: %s", temp); -} - -static void -_cache_dump_mru( Cache* cache ) -{ - char temp[512], *p=temp, *end=p+sizeof(temp); - Entry* e; - - p = _bprint(temp, end, "MRU LIST (%2d): ", cache->num_entries); - for (e = cache->mru_list.mru_next; e != &cache->mru_list; e = e->mru_next) - p = _bprint(p, end, " %d", e->id); - - XLOG("%s", temp); -} -#endif - -#if DEBUG -# define XLOG_QUERY(q,len) _dump_query((q), (len)) -#else -# define XLOG_QUERY(q,len) ((void)0) -#endif - -/* This function tries to find a key within the hash table - * In case of success, it will return a *pointer* to the hashed key. - * In case of failure, it will return a *pointer* to NULL - * - * So, the caller must check '*result' to check for success/failure. - * - * The main idea is that the result can later be used directly in - * calls to _resolv_cache_add or _resolv_cache_remove as the 'lookup' - * parameter. This makes the code simpler and avoids re-searching - * for the key position in the htable. - * - * The result of a lookup_p is only valid until you alter the hash - * table. - */ -static Entry** -_cache_lookup_p( Cache* cache, - Entry* key ) -{ - int index = key->hash % MAX_HASH_ENTRIES; - Entry** pnode = &cache->entries[ key->hash % MAX_HASH_ENTRIES ]; - - while (*pnode != NULL) { - Entry* node = *pnode; - - if (node == NULL) - break; - - if (node->hash == key->hash && entry_equals(node, key)) - break; - - pnode = &node->hlink; - } - return pnode; -} - -/* Add a new entry to the hash table. 'lookup' must be the - * result of an immediate previous failed _lookup_p() call - * (i.e. with *lookup == NULL), and 'e' is the pointer to the - * newly created entry - */ -static void -_cache_add_p( Cache* cache, - Entry** lookup, - Entry* e ) -{ - *lookup = e; - e->id = ++cache->last_id; - entry_mru_add(e, &cache->mru_list); - cache->num_entries += 1; - - XLOG("%s: entry %d added (count=%d)", __FUNCTION__, - e->id, cache->num_entries); -} - -/* Remove an existing entry from the hash table, - * 'lookup' must be the result of an immediate previous - * and succesful _lookup_p() call. - */ -static void -_cache_remove_p( Cache* cache, - Entry** lookup ) -{ - Entry* e = *lookup; - - XLOG("%s: entry %d removed (count=%d)", __FUNCTION__, - e->id, cache->num_entries-1); - - entry_mru_remove(e); - *lookup = e->hlink; - entry_free(e); - cache->num_entries -= 1; -} - -/* Remove the oldest entry from the hash table. - */ -static void -_cache_remove_oldest( Cache* cache ) -{ - Entry* oldest = cache->mru_list.mru_prev; - Entry** lookup = _cache_lookup_p(cache, oldest); - - if (*lookup == NULL) { /* should not happen */ - XLOG("%s: OLDEST NOT IN HTABLE ?", __FUNCTION__); - return; - } - _cache_remove_p(cache, lookup); -} - - -ResolvCacheStatus -_resolv_cache_lookup( struct resolv_cache* cache, - const void* query, - int querylen, - void* answer, - int answersize, - int *answerlen ) -{ - DnsPacket pack[1]; - Entry key[1]; - int index; - Entry** lookup; - Entry* e; - time_t now; - - ResolvCacheStatus result = RESOLV_CACHE_NOTFOUND; - - XLOG("%s: lookup", __FUNCTION__); - XLOG_QUERY(query, querylen); - - /* we don't cache malformed queries */ - if (!entry_init_key(key, query, querylen)) { - XLOG("%s: unsupported query", __FUNCTION__); - return RESOLV_CACHE_UNSUPPORTED; - } - /* lookup cache */ - pthread_mutex_lock( &cache->lock ); - - /* see the description of _lookup_p to understand this. - * the function always return a non-NULL pointer. - */ - lookup = _cache_lookup_p(cache, key); - e = *lookup; - - if (e == NULL) { - XLOG( "NOT IN CACHE"); - goto Exit; - } - - now = _time_now(); - - /* remove stale entries here */ - if ( (unsigned)(now - e->when) >= CONFIG_SECONDS ) { - XLOG( " NOT IN CACHE (STALE ENTRY %p DISCARDED)", *lookup ); - _cache_remove_p(cache, lookup); - goto Exit; - } - - *answerlen = e->answerlen; - if (e->answerlen > answersize) { - /* NOTE: we return UNSUPPORTED if the answer buffer is too short */ - result = RESOLV_CACHE_UNSUPPORTED; - XLOG(" ANSWER TOO LONG"); - goto Exit; - } - - memcpy( answer, e->answer, e->answerlen ); - - /* bump up this entry to the top of the MRU list */ - if (e != cache->mru_list.mru_next) { - entry_mru_remove( e ); - entry_mru_add( e, &cache->mru_list ); - } - - XLOG( "FOUND IN CACHE entry=%p", e ); - result = RESOLV_CACHE_FOUND; - -Exit: - pthread_mutex_unlock( &cache->lock ); - return result; -} - - -void -_resolv_cache_add( struct resolv_cache* cache, - const void* query, - int querylen, - const void* answer, - int answerlen ) -{ - Entry key[1]; - Entry* e; - Entry** lookup; - - /* don't assume that the query has already been cached - */ - if (!entry_init_key( key, query, querylen )) { - XLOG( "%s: passed invalid query ?", __FUNCTION__); - return; - } - - pthread_mutex_lock( &cache->lock ); - - XLOG( "%s: query:", __FUNCTION__ ); - XLOG_QUERY(query,querylen); -#if DEBUG_DATA - XLOG( "answer:"); - XLOG_BYTES(answer,answerlen); -#endif - - lookup = _cache_lookup_p(cache, key); - e = *lookup; - - if (e != NULL) { /* should not happen */ - XLOG("%s: ALREADY IN CACHE (%p) ? IGNORING ADD", - __FUNCTION__, e); - goto Exit; - } - - if (cache->num_entries >= CONFIG_MAX_ENTRIES) { - _cache_remove_oldest(cache); - /* need to lookup again */ - lookup = _cache_lookup_p(cache, key); - e = *lookup; - if (e != NULL) { - XLOG("%s: ALREADY IN CACHE (%p) ? IGNORING ADD", - __FUNCTION__, e); - goto Exit; - } - } - - e = entry_alloc( key, answer, answerlen ); - if (e != NULL) { - _cache_add_p(cache, lookup, e); - } -#if DEBUG - _cache_dump_mru(cache); -#endif -Exit: - pthread_mutex_unlock( &cache->lock ); -} - -/****************************************************************************/ -/****************************************************************************/ -/***** *****/ -/***** *****/ -/***** *****/ -/****************************************************************************/ -/****************************************************************************/ - -static struct resolv_cache* _res_cache; -static pthread_once_t _res_cache_once; - -static void -_res_cache_init( void ) -{ - const char* env = getenv(CONFIG_ENV); - - if (env && atoi(env) == 0) { - /* the cache is disabled */ - return; - } - - _res_cache = _resolv_cache_create(); -} - - -struct resolv_cache* -__get_res_cache( void ) -{ - pthread_once( &_res_cache_once, _res_cache_init ); - return _res_cache; -} - -void -_resolv_cache_reset( unsigned generation ) -{ - XLOG("%s: generation=%d", __FUNCTION__, generation); - - if (_res_cache == NULL) - return; - - pthread_mutex_lock( &_res_cache->lock ); - if (_res_cache->generation != generation) { - _cache_flush_locked(_res_cache); - _res_cache->generation = generation; - } - pthread_mutex_unlock( &_res_cache->lock ); -} diff --git a/libc/netbsd/resolv/res_comp.c b/libc/netbsd/resolv/res_comp.c deleted file mode 100644 index 6991e8b40..000000000 --- a/libc/netbsd/resolv/res_comp.c +++ /dev/null @@ -1,259 +0,0 @@ -/* $NetBSD: res_comp.c,v 1.6 2004/05/22 23:47:09 christos Exp $ */ - -/* - * Copyright (c) 1985, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies, and that - * the name of Digital Equipment Corporation not be used in advertising or - * publicity pertaining to distribution of the document or software without - * specific, written prior permission. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT - * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -/* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") - * Portions Copyright (c) 1996-1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -#ifdef notdef -static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "Id: res_comp.c,v 1.1.2.1.4.1 2004/03/09 08:33:54 marka Exp"; -#else -__RCSID("$NetBSD: res_comp.c,v 1.6 2004/05/22 23:47:09 christos Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include "arpa_nameser.h" -#include -#ifdef ANDROID_CHANGES -#include "resolv_private.h" -#else -#include -#endif -#include -#include -#include - -/* - * Expand compressed domain name 'src' to full domain name. - * 'msg' is a pointer to the begining of the message, - * 'eom' points to the first location after the message, - * 'dst' is a pointer to a buffer of size 'dstsiz' for the result. - * Return size of compressed name or -1 if there was an error. - */ -int -dn_expand(const u_char *msg, const u_char *eom, const u_char *src, - char *dst, int dstsiz) -{ - int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); - - if (n > 0 && dst[0] == '.') - dst[0] = '\0'; - return (n); -} - -/* - * Pack domain name 'exp_dn' in presentation form into 'comp_dn'. - * Return the size of the compressed name or -1. - * 'length' is the size of the array pointed to by 'comp_dn'. - */ -int -dn_comp(const char *src, u_char *dst, int dstsiz, - u_char **dnptrs, u_char **lastdnptr) -{ - return (ns_name_compress(src, dst, (size_t)dstsiz, - (const u_char **)dnptrs, - (const u_char **)lastdnptr)); -} - -/* - * Skip over a compressed domain name. Return the size or -1. - */ -int -dn_skipname(const u_char *ptr, const u_char *eom) { - const u_char *saveptr = ptr; - - if (ns_name_skip(&ptr, eom) == -1) - return (-1); - return (ptr - saveptr); -} - -/* - * Verify that a domain name uses an acceptable character set. - */ - -/* - * Note the conspicuous absence of ctype macros in these definitions. On - * non-ASCII hosts, we can't depend on string literals or ctype macros to - * tell us anything about network-format data. The rest of the BIND system - * is not careful about this, but for some reason, we're doing it right here. - */ -#define PERIOD 0x2e -#define hyphenchar(c) ((c) == 0x2d) -#define bslashchar(c) ((c) == 0x5c) -#define periodchar(c) ((c) == PERIOD) -#define asterchar(c) ((c) == 0x2a) -#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \ - || ((c) >= 0x61 && (c) <= 0x7a)) -#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) - -#define borderchar(c) (alphachar(c) || digitchar(c)) -#define middlechar(c) (borderchar(c) || hyphenchar(c)) -#define domainchar(c) ((c) > 0x20 && (c) < 0x7f) - -int -res_hnok(const char *dn) { - int pch = PERIOD, ch = *dn++; - - while (ch != '\0') { - int nch = *dn++; - - if (periodchar(ch)) { - ; - } else if (periodchar(pch)) { - if (!borderchar(ch)) - return (0); - } else if (periodchar(nch) || nch == '\0') { - if (!borderchar(ch)) - return (0); - } else { - if (!middlechar(ch)) - return (0); - } - pch = ch, ch = nch; - } - return (1); -} - -/* - * hostname-like (A, MX, WKS) owners can have "*" as their first label - * but must otherwise be as a host name. - */ -int -res_ownok(const char *dn) { - if (asterchar(dn[0])) { - if (periodchar(dn[1])) - return (res_hnok(dn+2)); - if (dn[1] == '\0') - return (1); - } - return (res_hnok(dn)); -} - -/* - * SOA RNAMEs and RP RNAMEs can have any printable character in their first - * label, but the rest of the name has to look like a host name. - */ -int -res_mailok(const char *dn) { - int ch, escaped = 0; - - /* "." is a valid missing representation */ - if (*dn == '\0') - return (1); - - /* otherwise