Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x86_64

Browse Source 
Conflicts:
	headers/posix/arch/x86_64/arch_setjmp.h
	src/system/kernel/cache/block_cache.cpp
This commit is contained in:
Alex Smith 2012-07-20 18:33:46 +01:00
commit 82694bd124
157 changed files with 1528 additions and 1146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/jam/OptionalPackageDependencies
View File

@ -10,7 +10,7 @@ OptionalPackageDependencies ArmyKnife : TagLib ;
OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ;
OptionalPackageDependencies BurnItNow : CDRecord ;
OptionalPackageDependencies CDRecord : LibIconv ;
OptionalPackageDependencies CDRecord : GetText LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development : DevelopmentBase Perl ;
@ -20,6 +20,7 @@ OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
OptionalPackageDependencies GitDoc : Man Git ;
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies LibXML2 : XZ-Utils ;
OptionalPackageDependencies Man : Groff ;
OptionalPackageDependencies Tar : LibIconv ;
OptionalPackageDependencies Python : Bzip ;

28
build/jam/OptionalPackages
View File

@ -409,12 +409,12 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
cdrtools-3.01a06-x86-gcc4-2012-06-19.zip
: $(baseURL)/cdrtools-3.01a06-x86-gcc4-2012-06-19.zip ;
cdrtools-3.01a07-x86-gcc4-2012-06-19.zip
: $(baseURL)/cdrtools-3.01a07-x86-gcc4-2012-07-19.zip ;
} else {
InstallOptionalHaikuImagePackage
cdrtools-3.01a06-x86-gcc2-2012-06-20.zip
: $(baseURL)/cdrtools-3.01a06-x86-gcc2-2012-06-20.zip ;
cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip
: $(baseURL)/cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip ;
}
}
@ -475,13 +475,13 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip
: $(baseURL)/cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip
cmake-2.8.5-x86-gcc4-2012-07-18.zip
: $(baseURL)/cmake-2.8.5-x86-gcc4-2012-07-18.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
: $(baseURL)/cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
cmake-2.8.5-x86-gcc2-2012-07-16.zip
: $(baseURL)/cmake-2.8.5-x86-gcc2-2012-07-16.zip
: : true ;
}
}
@ -1206,12 +1206,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
libxml2-2.8.0-x86-gcc4-2012-06-18.zip
: $(baseURL)/libxml2-2.8.0-x86-gcc4-2012-06-18.zip ;
libxml2-2.8.0-x86-gcc4-2012-07-18.zip
: $(baseURL)/libxml2-2.8.0-x86-gcc4-2012-07-18.zip ;
} else {
InstallOptionalHaikuImagePackage
libxml2-2.8.0-x86-gcc2-2012-06-21.zip
: $(baseURL)/libxml2-2.8.0-x86-gcc2-2012-06-21.zip ;
libxml2-2.8.0-x86-gcc2-2012-07-17.zip
: $(baseURL)/libxml2-2.8.0-x86-gcc2-2012-07-17.zip ;
}
}
}
@ -1986,8 +1986,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
xz-utils-5.0.1-r1a3-x86-gcc4-2011-05-24.zip
: $(baseURL)/xz-utils-5.0.1-r1a3-x86-gcc4-2011-05-24.zip ;
xz-utils-5.0.1-x86-gcc4-2012-07-18.zip
: $(baseURL)/xz-utils-5.0.1-x86-gcc4-2012-07-18.zip ;
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
: "tar -Jtvf \\0045s"
: "tar -Jxvf \\0045s"

1
headers/os/interface/InterfaceDefs.h
View File

@ -294,6 +294,7 @@ enum color_which {
B_CONTROL_TEXT_COLOR = 14,
B_CONTROL_BORDER_COLOR = 15,
B_CONTROL_HIGHLIGHT_COLOR = 16,
B_CONTROL_MARK_COLOR = 27,
B_NAVIGATION_BASE_COLOR = 4,
B_NAVIGATION_PULSE_COLOR = 17,
B_SHINE_COLOR = 18,

2
headers/posix/alloca.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ALLOCA_H

2
headers/posix/arch/arm/arch_setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SETJMP_H_

4
headers/posix/arch/arm/signal.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SIGNAL_H_
@ -32,7 +32,7 @@ struct vregs
ulong cpsr;
#warning ARM: fix floats in vregs, add missing stuff.
};
#endif /* __ARM__ */
#endif /* __ARM__ */
#endif /* _ARCH_SIGNAL_H_ */

2
headers/posix/arch/m68k/arch_setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2007-2010 Haiku Inc. All Rights Reserved.
* Copyright 2007-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SETJMP_H_

4
headers/posix/arch/m68k/signal.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SIGNAL_H_
@ -21,7 +21,7 @@ struct vregs
double f0, /* fp scratch */
f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13; /* fp volatile regs */
};
#endif /* __M68K__ */
#endif /* __M68K__ */
#endif /* _ARCH_SIGNAL_H_ */

2
headers/posix/arch/mipsel/arch_setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SETJMP_H_

4
headers/posix/arch/mipsel/signal.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SIGNAL_H_
@ -18,7 +18,7 @@ struct vregs
#warning MIPSEL: fixme
};
#endif /* __MIPSEL__ */
#endif /* __MIPSEL__ */
#endif /* _ARCH_SIGNAL_H_ */

2
headers/posix/arch/ppc/arch_setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2010 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SETJMP_H_

4
headers/posix/arch/ppc/signal.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SIGNAL_H_
@ -27,7 +27,7 @@ struct vregs
fpscr, /* fp condition codes */
ctr, xer, cr, msr, lr; /* misc. status */
};
#endif /* __POWERPC__ */
#endif /* __POWERPC__ */
#endif /* _ARCH_SIGNAL_H_ */

2
headers/posix/arch/x86/arch_setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2010 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SETJMP_H_

2
headers/posix/arch/x86/signal.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SIGNAL_H_

2
headers/posix/arch/x86_64/arch_setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2012 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SETJMP_H_

4
headers/posix/arch/x86_64/signal.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARCH_SIGNAL_H_
@ -40,7 +40,7 @@ struct vregs {
*/
};
#endif /* __x86_64__ */
#endif /* _ARCH_SIGNAL_H_ */

2
headers/posix/arpa/inet.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2009-2010 Haiku Inc. All Rights Reserved.
* Copyright 2009-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _INET_H_

2
headers/posix/arpa/nameser.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/

2
headers/posix/assert.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ASSERT_H_

2
headers/posix/bsd_mem.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2010 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/

2
headers/posix/compat/sys/stat.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _COMPAT_SYS_STAT_H_

2
headers/posix/ctype.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _CTYPE_H

2
headers/posix/dirent.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _DIRENT_H

2
headers/posix/div_t.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _DIV_T_H_

2
headers/posix/dlfcn.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _DLFCN_H

2
headers/posix/endian.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All rights reserved.
* Copyright 2003-2012 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ENDIAN_H_

6
headers/posix/errno.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _POSIX_ERRNO_H
@ -9,7 +9,7 @@
#ifdef __cplusplus
extern "C"
{
#endif
#endif
#include <Errors.h>
@ -21,6 +21,6 @@ extern int *_errnop(void);
#ifdef __cplusplus
} /* "C" */
#endif
#endif
#endif /* _POSIX_ERRNO_H */

2
headers/posix/fcntl.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _FCNTL_H

2
headers/posix/getopt.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _GETOPT_H

2
headers/posix/grp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _GRP_H_

2
headers/posix/inttypes.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All rights reserved.
* Copyright 2002-2012 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _INTTYPES_H_

2
headers/posix/iovec.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _IOVEC_H

2
headers/posix/langinfo.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Haiku Inc. All Rights Reserved.
* Copyright 2010-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _LANGINFO_H_

2
headers/posix/libgen.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2009-2010 Haiku Inc. All Rights Reserved.
* Copyright 2009-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _LIBGEN_H

2
headers/posix/limits.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2012 Haiku Inc. All rights reserved.
* Copyright 2001-2012 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _LIBC_LIMITS_H_

2
headers/posix/locale.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _LOCALE_H_

4
headers/posix/malloc.h
View File

@ -1,12 +1,12 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _MALLOC_H
#define _MALLOC_H
#include <unistd.h>
#include <unistd.h>
#ifdef __cplusplus

2
headers/posix/malloc_debug.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Haiku Inc. All Rights Reserved.
* Copyright 2010-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef MALLOC_DEBUG_H

2
headers/posix/math.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2001-2010 Haiku Inc. All Rights Reserved.
* Copyright 2001-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _MATH_H_

6
headers/posix/memory.h
View File

@ -1,8 +1,8 @@
/*
* Copyright 2005-2010 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#include <string.h>

2
headers/posix/monetary.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Haiku Inc. All Rights Reserved.
* Copyright 2010-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _MONETARY_H_

2
headers/posix/net/if.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NET_IF_H

2
headers/posix/net/if_dl.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NET_IF_DL_H

2
headers/posix/net/if_media.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2007-2010 Haiku Inc. All Rights Reserved.
* Copyright 2007-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NET_IF_MEDIA_H

2
headers/posix/net/if_types.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NET_IF_TYPES_H

2
headers/posix/net/route.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NET_ROUTE_H

2
headers/posix/netdb.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/

2
headers/posix/netinet/in.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NETINET_IN_H_

4
headers/posix/netinet/tcp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef NETINET_TCP_H
@ -15,7 +15,7 @@ struct tcphdr {
uint16_t th_dport; /* destination port */
uint32_t th_seq;
uint32_t th_ack;
#if BIG_ENDIAN
uint8_t th_off : 4; /* data offset */
uint8_t th_x2 : 4; /* unused */

2
headers/posix/netinet6/in6.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NETINET6_IN6_H_

2
headers/posix/nl_types.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Haiku Inc. All Rights Reserved.
* Copyright 2010-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NL_TYPES_H_

2
headers/posix/null.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NULL_H

2
headers/posix/poll.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _POLL_H

2
headers/posix/pwd.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _PWD_H_

2
headers/posix/resolv.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2009-2010 Haiku Inc. All Rights Reserved.
* Copyright 2009-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/

2
headers/posix/sched.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All rights reserved.
* Copyright 2008-2012 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT license.
*/
#ifndef _SCHED_H_

8
headers/posix/search.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SEARCH_H_
@ -9,9 +9,9 @@
#include <sys/types.h>
typedef enum {
FIND,
ENTER
typedef enum {
FIND,
ENTER
} ACTION;
typedef struct entry {

2
headers/posix/semaphore.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc.
* Copyright 2008-2012 Haiku, Inc.
* Distributed under the terms of the MIT License.
*/
#ifndef _SEMAPHORE_H_

2
headers/posix/setjmp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc.
* Copyright 2004-2012 Haiku, Inc.
* Distributed under the terms of the MIT License.
*/
#ifndef _SETJMP_H_

2
headers/posix/shadow.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SHADOW_H_

2
headers/posix/size_t.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SIZE_T_H_

2
headers/posix/stdint.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDINT_H_

2
headers/posix/stdio.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDIO_H_

2
headers/posix/stdio_ext.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDIO_EXT_H_

2
headers/posix/stdio_post.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDIO_POST_H_

2
headers/posix/stdio_pre.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDIO_PRE_H_

2
headers/posix/stdlib.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STDLIB_H_

2
headers/posix/string.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STRING_H_

2
headers/posix/sys/file.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_FILE_H

2
headers/posix/sys/ioctl.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_IOCTL_H

2
headers/posix/sys/ipc.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_IPC_H

2
headers/posix/sys/mman.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_MMAN_H

2
headers/posix/sys/msg.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_MSG_H

2
headers/posix/sys/param.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_PARAM_H

2
headers/posix/sys/poll.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_POLL_H

2
headers/posix/sys/resource.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_RESOURCE_H

2
headers/posix/sys/select.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_SELECT_H

2
headers/posix/sys/sem.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_SEM_H

6
headers/posix/sys/socket.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_SOCKET_H
@ -47,7 +47,7 @@ typedef uint32_t socklen_t;
#define SOCK_MISC 255
/* Socket options for SOL_SOCKET level */
#define SOL_SOCKET -1
#define SOL_SOCKET -1
#define SO_ACCEPTCONN 0x00000001 /* socket has had listen() */
#define SO_BROADCAST 0x00000002 /* permit sending of broadcast msgs */
@ -85,7 +85,7 @@ struct linger {
};
struct sockaddr {
uint8_t sa_len;
uint8_t sa_len;
uint8_t sa_family;
uint8_t sa_data[30];
};

6
headers/posix/sys/sockio.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_SOCKIO_H
@ -47,9 +47,9 @@
#define SIOCGIFSTATS 8929 /* get interface stats */
#define SIOCGIFTYPE 8931 /* get interface type */
#define SIOCSPACKETCAP 8932
#define SIOCSPACKETCAP 8932
/* Start capturing packets on an interface */
#define SIOCCPACKETCAP 8933
#define SIOCCPACKETCAP 8933
/* Stop capturing packets on an interface */
#define SIOCSHIWAT 8934 /* set high watermark */

2
headers/posix/sys/stat.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_STAT_H_

2
headers/posix/sys/statvfs.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2010 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _STAT_VFS_H_

2
headers/posix/sys/time.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_TIME_H

2
headers/posix/sys/timeb.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_TIMEB_H

4
headers/posix/sys/times.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_TIMES_H
@ -21,6 +21,6 @@ extern
#ifdef __cplusplus
"C"
#endif
clock_t times(struct tms *tms);
clock_t times(struct tms *tms);
#endif /* _SYS_TIMES_H */

2
headers/posix/sys/types.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_TYPES_H

2
headers/posix/sys/uio.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_UIO_H

4
headers/posix/sys/un.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 Haiku Inc. All Rights Reserved.
* Copyright 2006-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_UN_H
@ -10,7 +10,7 @@
struct sockaddr_un {
uint8_t sun_len;
uint8_t sun_len;
uint8_t sun_family;
char sun_path[126];
};

2
headers/posix/sys/utsname.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYS_UTSNAME_H

2
headers/posix/syslog.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2010 Haiku Inc. All Rights Reserved.
* Copyright 2003-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SYSLOG_H_

2
headers/posix/termios.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2004-2010 Haiku Inc. All Rights Reserved.
* Copyright 2004-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _TERMIOS_H_

2
headers/posix/utime.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 Haiku Inc. All Rights Reserved.
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _UTIME_H_

2
headers/posix/wchar.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2011 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _WCHAR_H

2
headers/posix/wchar_t.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2008-2010 Haiku Inc. All Rights Reserved.
* Copyright 2008-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/

2
headers/posix/wctype.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2005-2011 Haiku Inc. All Rights Reserved.
* Copyright 2005-2012 Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _WCTYPE_H_

9
headers/private/app/ServerReadOnlyMemory.h
View File

@ -26,23 +26,24 @@ static inline int32
color_which_to_index(color_which which)
{
// NOTE: this must be kept in sync with InterfaceDefs.h color_which!
if (which <= B_WINDOW_INACTIVE_BORDER_COLOR)
if (which <= B_CONTROL_MARK_COLOR)
return which - 1;
if (which >= B_SUCCESS_COLOR && which <= B_FAILURE_COLOR)
return which - B_SUCCESS_COLOR + B_WINDOW_INACTIVE_BORDER_COLOR;
return which - B_SUCCESS_COLOR + B_CONTROL_MARK_COLOR;
return -1;
}
static inline color_which
index_to_color_which(int32 index)
{
if (index >= 0 && index < kNumColors) {
if ((color_which)index < B_WINDOW_INACTIVE_BORDER_COLOR)
if ((color_which)index < B_CONTROL_MARK_COLOR)
return (color_which)(index + 1);
else {
return (color_which)(index + B_SUCCESS_COLOR
- B_WINDOW_INACTIVE_BORDER_COLOR);
- B_CONTROL_MARK_COLOR);
}
}

14
src/add-ons/accelerants/radeon_hd/display.cpp
View File

@ -257,6 +257,12 @@ detect_displays()
if (displayIndex >= MAX_DISPLAY)
continue;
if (gConnector[id]->type == VIDEO_CONNECTOR_9DIN) {
TRACE("%s: Skipping 9DIN connector (not yet supported)\n",
__func__);
continue;
}
// TODO: As DP aux transactions don't work yet, just use LVDS as a hack
#if 0
if (gConnector[id]->encoderExternal.isDPBridge == true) {
@ -310,9 +316,11 @@ detect_displays()
TRACE("%s: connector %" B_PRIu32 " has digital EDID "
"and is not a analog encoder.\n", __func__, id);
} else {
// ???, shouldn't happen... I think.
TRACE("%s: Warning: connector %" B_PRIu32 " has neither "
"digital EDID nor is an analog encoder?\n",
// This generally means the monitor is of poor design
// Since we *know* there is no load on the analog encoder
// we assume that it is a digital display.
TRACE("%s: Warning: monitor on connector %" B_PRIu32 " has "
"false digital EDID flag and unloaded analog encoder!\n",
__func__, id);
}
}

0
src/add-ons/kernel/bus_managers/acpi/oshaiku.cpp → src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
View File

6
src/add-ons/kernel/bus_managers/acpi/acpi_priv.h → src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
View File

@ -3,8 +3,8 @@
* Copyright 2006, Jérôme Duval. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef __ACPI_PRIV_H__
#define __ACPI_PRIV_H__
#ifndef _ACPI_PRIVATE_H
#define _ACPI_PRIVATE_H
#include <sys/cdefs.h>
@ -227,4 +227,4 @@ status_t get_table(const char* signature, uint32 instance, void** tableHeader);
__END_DECLS
#endif /* __ACPI_PRIV_H__ */
#endif /* _ACPI_PRIVATE_H */

19
src/add-ons/kernel/bus_managers/acpi/acpi_busman.c → src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
View File

@ -20,11 +20,13 @@
#include <safemode.h>
extern "C" {
#include "acpi.h"
#include "accommon.h"
#include "acdisasm.h"
#include "acnamesp.h"
#include "acpi_priv.h"
}
#include "ACPIPrivate.h"
//#define TRACE_ACPI_BUS
#ifdef TRACE_ACPI_BUS
@ -384,7 +386,7 @@ status_t
install_fixed_event_handler(uint32 event, interrupt_handler* handler,
void *data)
{
return AcpiInstallFixedEventHandler(event, (void*)handler, data) == AE_OK
return AcpiInstallFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler, data) == AE_OK
? B_OK : B_ERROR;
}
@ -392,7 +394,7 @@ install_fixed_event_handler(uint32 event, interrupt_handler* handler,
status_t
remove_fixed_event_handler(uint32 event, interrupt_handler* handler)
{
return AcpiRemoveFixedEventHandler(event, (void*)handler) == AE_OK
return AcpiRemoveFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler) == AE_OK
? B_OK : B_ERROR;
}
@ -441,7 +443,7 @@ get_device(const char* hid, uint32 index, char* result, size_t resultLength)
char *buffer = NULL;
TRACE("get_device %s, index %ld\n", hid, index);
status = AcpiGetDevices((ACPI_STRING)hid, (void*)&get_device_by_hid_callback,
status = AcpiGetDevices((ACPI_STRING)hid, (ACPI_WALK_CALLBACK)&get_device_by_hid_callback,
counter, (void**)&buffer);
if (status != AE_OK || buffer == NULL)
return B_ENTRY_NOT_FOUND;
@ -523,7 +525,7 @@ get_object(const char* path, acpi_object_type** _returnValue)
status = AcpiEvaluateObject(handle, NULL, NULL, &buffer);
*_returnValue = buffer.Pointer;
*_returnValue = (acpi_object_type*)buffer.Pointer;
return status == AE_OK ? B_OK : B_ERROR;
}
@ -545,7 +547,7 @@ get_object_typed(const char* path, acpi_object_type** _returnValue,
status = AcpiEvaluateObjectTyped(handle, NULL, NULL, &buffer, objectType);
*_returnValue = buffer.Pointer;
*_returnValue = (acpi_object_type*)buffer.Pointer;
return status == AE_OK ? B_OK : B_ERROR;
}
@ -642,7 +644,7 @@ prepare_sleep_state(uint8 state, void (*wakeFunc)(void), size_t size)
status_t status;
// Note: The supplied code must already be locked into memory.
status = get_memory_map(wakeFunc, size, &wakeVector, 1);
status = get_memory_map((const void*)wakeFunc, size, &wakeVector, 1);
if (status != B_OK)
return status;
@ -676,7 +678,10 @@ enter_sleep_state(uint8 state, uint8 flags)
TRACE("enter_sleep_state %d with flags %d\n", state, flags);
cpu_status cpu = disable_interrupts();
status = AcpiEnterSleepState(state, flags);
restore_interrupts(cpu);
panic("AcpiEnterSleepState should not return.");
if (status != AE_OK)
return B_ERROR;

Some files were not shown because too many files have changed in this diff Show More