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

Merge branch 'master' of ssh://git.haiku-os.org/haiku

Browse Source
This commit is contained in:
Adrien Destugues - PulkoMandy 2012-07-23 21:32:24 +02:00
commit fc3f40765a
150 changed files with 1721 additions and 890 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/OptionalBuildFeatures
View File

@ -467,7 +467,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
}
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.2-x86-gcc4-2012-07-11.zip ;
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-07-20-1.zip ;
if $(HAIKU_BUILD_FEATURE_WEBKIT) {
if $(TARGET_ARCH) != x86 {

2
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 ;

8
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 ;
}
}

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-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/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_

4
headers/private/interface/ColumnListView.h
View File

@ -385,9 +385,8 @@ protected:
virtual void DoLayout();
private:
void _Init(bool showHorizontalScrollbar);
void _Init();
void _GetChildViewRects(const BRect& bounds,
bool showHorizontalScrollBar,
BRect& titleRect, BRect& outlineRect,
BRect& vScrollBarRect,
BRect& hScrollBarRect);
@ -404,6 +403,7 @@ private:
bool fSortingEnabled;
float fLatchWidth;
border_style fBorderStyle;
bool fShowingHorizontalScrollBar;
};
#endif // _COLUMN_LIST_VIEW_H

53
headers/private/shared/ArgumentVector.h Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright 2007-2012, Ingo Weinhold, ingo_weinhold@gmx.de.
* Distributed under the terms of the MIT License.
*/
#ifndef _ARGUMENT_VECTOR_H
#define _ARGUMENT_VECTOR_H
#include <SupportDefs.h>
namespace BPrivate {
class ArgumentVector {
public:
enum ParseError {
NO_ERROR,
NO_MEMORY,
UNTERMINATED_QUOTED_STRING,
TRAILING_BACKSPACE
};
public:
ArgumentVector();
~ArgumentVector();
int32 ArgumentCount() const { return fCount; }
const char* const* Arguments() const { return fArguments; }
char** DetachArguments();
// Caller must free() -- it's all one big allocation at the
// returned pointer.
ParseError Parse(const char* commandLine,
const char** _errorLocation = NULL);
private:
struct Parser;
private:
char** fArguments;
int32 fCount;
};
} // namespace BPrivate
using BPrivate::ArgumentVector;
#endif // _ARGUMENT_VECTOR_H

11
src/add-ons/kernel/drivers/ports/usb_serial/FTDI.cpp
View File

@ -4,10 +4,16 @@
*
* Copyright (c) 2003 by Siarzhuk Zharski <imker@gmx.li>
* Distributed under the terms of the MIT License.
*
* Authors:
* Alexander von Gluck IV, kallisti5@unixzen.com
*/
#include "FTDI.h"
#include "FTDIRegs.h"
FTDIDevice::FTDIDevice(usb_device device, uint16 vendorID, uint16 productID,
const char *description)
: SerialDevice(device, vendorID, productID, description),
@ -46,7 +52,7 @@ FTDIDevice::AddDevice(const usb_configuration_info *config)
}
if (pipesSet >= 3) {
if (ProductID() == PRODUCT_FTDI_8U100AX)
if (ProductID() == 0x8372) // AU100AX
fHeaderLength = 1;
else
fHeaderLength = 0;
@ -84,7 +90,8 @@ FTDIDevice::SetLineCoding(usb_cdc_line_coding *lineCoding)
lineCoding->databits);
int32 rate = 0;
if (ProductID() == PRODUCT_FTDI_8U100AX) {
if (ProductID() == 0x8372) {
// AU100AX
switch (lineCoding->speed) {
case 300: rate = ftdi_sio_b300; break;
case 600: rate = ftdi_sio_b600; break;

15
src/add-ons/kernel/drivers/ports/usb_serial/FTDI.h
View File

@ -4,16 +4,24 @@
*
* Copyright (c) 2003 by Siarzhuk Zharski <imker@gmx.li>
* Distributed under the terms of the MIT License.
*
* Authors:
* Alexander von Gluck IV, kallisti5@unixzen.com
*/
#ifndef _USB_FTDI_H_
#define _USB_FTDI_H_
#include "SerialDevice.h"
/* supported vendor and product ids */
#define VENDOR_FTDI 0x0403
#define PRODUCT_FTDI_8U100AX 0x8372
#define PRODUCT_FTDI_8U232AM 0x6001
#define VENDOR_FTDI 0x0403
const usb_serial_device kFTDIDevices[] = {
{VENDOR_FTDI, 0x8372, "FTDI 8U100AX serial converter"},
{VENDOR_FTDI, 0x6001, "FTDI 8U232AM serial converter"}
};
#define FTDI_BUFFER_SIZE 64
@ -40,4 +48,5 @@ private:
uint8 fStatusLSR;
};
#endif //_USB_FTDI_H_

1
src/add-ons/kernel/drivers/ports/usb_serial/Jamfile
View File

@ -14,6 +14,7 @@ KernelAddon usb_serial :
ACM.cpp
FTDI.cpp
KLSI.cpp
Option.cpp
Prolific.cpp
Silicon.cpp
;

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