i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent f01f7fec8f 5cdd07a814
commit fc3f40765a
150 changed files with 1721 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+1 -1
View File
@@ -467,7 +467,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
HAIKU_BUILD_FEATURE_WEBKIT = 1 ; 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 $(HAIKU_BUILD_FEATURE_WEBKIT) {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
build/jam/OptionalPackageDependencies
+1 -1
View File
@@ -10,7 +10,7 @@ OptionalPackageDependencies ArmyKnife : TagLib ;
OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ; OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies BeHappy : BeBook NetSurf ;
OptionalPackageDependencies BurnItNow : CDRecord ; OptionalPackageDependencies BurnItNow : CDRecord ;
OptionalPackageDependencies CDRecord : LibIconv ; OptionalPackageDependencies CDRecord : GetText LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies Development : DevelopmentBase Perl ;
build/jam/OptionalPackages
+4 -4
View File
@@ -409,12 +409,12 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cdrtools-3.01a06-x86-gcc4-2012-06-19.zip cdrtools-3.01a07-x86-gcc4-2012-06-19.zip
: $(baseURL)/cdrtools-3.01a06-x86-gcc4-2012-06-19.zip ; : $(baseURL)/cdrtools-3.01a07-x86-gcc4-2012-07-19.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cdrtools-3.01a06-x86-gcc2-2012-06-20.zip cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip
: $(baseURL)/cdrtools-3.01a06-x86-gcc2-2012-06-20.zip ; : $(baseURL)/cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip ;
} }
} }
headers/posix/alloca.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ALLOCA_H #ifndef _ALLOCA_H
headers/posix/arch/arm/arch_setjmp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SETJMP_H_ #ifndef _ARCH_SETJMP_H_
headers/posix/arch/arm/signal.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SIGNAL_H_ #ifndef _ARCH_SIGNAL_H_
@@ -32,7 +32,7 @@ struct vregs
ulong cpsr; ulong cpsr;
#warning ARM: fix floats in vregs, add missing stuff. #warning ARM: fix floats in vregs, add missing stuff.
}; };
#endif /* __ARM__ */ #endif /* __ARM__ */
#endif /* _ARCH_SIGNAL_H_ */ #endif /* _ARCH_SIGNAL_H_ */
headers/posix/arch/m68k/arch_setjmp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SETJMP_H_ #ifndef _ARCH_SETJMP_H_
headers/posix/arch/m68k/signal.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SIGNAL_H_ #ifndef _ARCH_SIGNAL_H_
@@ -21,7 +21,7 @@ struct vregs
double f0, /* fp scratch */ double f0, /* fp scratch */
f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13; /* fp volatile regs */ f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13; /* fp volatile regs */
}; };
#endif /* __M68K__ */ #endif /* __M68K__ */
#endif /* _ARCH_SIGNAL_H_ */ #endif /* _ARCH_SIGNAL_H_ */
headers/posix/arch/mipsel/arch_setjmp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SETJMP_H_ #ifndef _ARCH_SETJMP_H_
headers/posix/arch/mipsel/signal.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SIGNAL_H_ #ifndef _ARCH_SIGNAL_H_
@@ -18,7 +18,7 @@ struct vregs
#warning MIPSEL: fixme #warning MIPSEL: fixme
}; };
#endif /* __MIPSEL__ */ #endif /* __MIPSEL__ */
#endif /* _ARCH_SIGNAL_H_ */ #endif /* _ARCH_SIGNAL_H_ */
headers/posix/arch/ppc/arch_setjmp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SETJMP_H_ #ifndef _ARCH_SETJMP_H_
headers/posix/arch/ppc/signal.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SIGNAL_H_ #ifndef _ARCH_SIGNAL_H_
@@ -27,7 +27,7 @@ struct vregs
fpscr, /* fp condition codes */ fpscr, /* fp condition codes */
ctr, xer, cr, msr, lr; /* misc. status */ ctr, xer, cr, msr, lr; /* misc. status */
}; };
#endif /* __POWERPC__ */ #endif /* __POWERPC__ */
#endif /* _ARCH_SIGNAL_H_ */ #endif /* _ARCH_SIGNAL_H_ */
headers/posix/arch/x86/arch_setjmp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SETJMP_H_ #ifndef _ARCH_SETJMP_H_
headers/posix/arch/x86/signal.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SIGNAL_H_ #ifndef _ARCH_SIGNAL_H_
headers/posix/arch/x86_64/arch_setjmp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SETJMP_H_ #ifndef _ARCH_SETJMP_H_
headers/posix/arch/x86_64/signal.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ARCH_SIGNAL_H_ #ifndef _ARCH_SIGNAL_H_
@@ -40,7 +40,7 @@ struct vregs {
*/ */
}; };
#endif /* __x86_64__ */ #endif /* __x86_64__ */
#endif /* _ARCH_SIGNAL_H_ */ #endif /* _ARCH_SIGNAL_H_ */
headers/posix/arpa/inet.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _INET_H_ #ifndef _INET_H_
headers/posix/arpa/nameser.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
headers/posix/assert.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ASSERT_H_ #ifndef _ASSERT_H_
headers/posix/bsd_mem.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
headers/posix/compat/sys/stat.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _COMPAT_SYS_STAT_H_ #ifndef _COMPAT_SYS_STAT_H_
headers/posix/ctype.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _CTYPE_H #ifndef _CTYPE_H
headers/posix/dirent.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _DIRENT_H #ifndef _DIRENT_H
headers/posix/div_t.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _DIV_T_H_ #ifndef _DIV_T_H_
headers/posix/dlfcn.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _DLFCN_H #ifndef _DLFCN_H
headers/posix/endian.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _ENDIAN_H_ #ifndef _ENDIAN_H_
headers/posix/errno.h
+3 -3
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _POSIX_ERRNO_H #ifndef _POSIX_ERRNO_H
@@ -9,7 +9,7 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
#include <Errors.h> #include <Errors.h>
@@ -21,6 +21,6 @@ extern int *_errnop(void);
#ifdef __cplusplus #ifdef __cplusplus
} /* "C" */ } /* "C" */
#endif #endif
#endif /* _POSIX_ERRNO_H */ #endif /* _POSIX_ERRNO_H */
headers/posix/fcntl.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _FCNTL_H #ifndef _FCNTL_H
headers/posix/getopt.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _GETOPT_H #ifndef _GETOPT_H
headers/posix/grp.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _GRP_H_ #ifndef _GRP_H_
headers/posix/inttypes.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _INTTYPES_H_ #ifndef _INTTYPES_H_
headers/posix/iovec.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _IOVEC_H #ifndef _IOVEC_H
headers/posix/langinfo.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _LANGINFO_H_ #ifndef _LANGINFO_H_
headers/posix/libgen.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _LIBGEN_H #ifndef _LIBGEN_H
headers/posix/limits.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _LIBC_LIMITS_H_ #ifndef _LIBC_LIMITS_H_
headers/posix/locale.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _LOCALE_H_ #ifndef _LOCALE_H_
headers/posix/malloc.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _MALLOC_H #ifndef _MALLOC_H
#define _MALLOC_H #define _MALLOC_H
#include <unistd.h> #include <unistd.h>
#ifdef __cplusplus #ifdef __cplusplus
headers/posix/malloc_debug.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef MALLOC_DEBUG_H #ifndef MALLOC_DEBUG_H
headers/posix/math.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _MATH_H_ #ifndef _MATH_H_
headers/posix/memory.h
+3 -3
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. * Distributed under the terms of the MIT License.
*/ */
#include <string.h> #include <string.h>
headers/posix/monetary.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _MONETARY_H_ #ifndef _MONETARY_H_
headers/posix/net/if.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NET_IF_H #ifndef _NET_IF_H
headers/posix/net/if_dl.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NET_IF_DL_H #ifndef _NET_IF_DL_H
headers/posix/net/if_media.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NET_IF_MEDIA_H #ifndef _NET_IF_MEDIA_H
headers/posix/net/if_types.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NET_IF_TYPES_H #ifndef _NET_IF_TYPES_H
headers/posix/net/route.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NET_ROUTE_H #ifndef _NET_ROUTE_H
headers/posix/netdb.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
headers/posix/netinet/in.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NETINET_IN_H_ #ifndef _NETINET_IN_H_
headers/posix/netinet/tcp.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef NETINET_TCP_H #ifndef NETINET_TCP_H
@@ -15,7 +15,7 @@ struct tcphdr {
uint16_t th_dport; /* destination port */ uint16_t th_dport; /* destination port */
uint32_t th_seq; uint32_t th_seq;
uint32_t th_ack; uint32_t th_ack;
#if BIG_ENDIAN #if BIG_ENDIAN
uint8_t th_off : 4; /* data offset */ uint8_t th_off : 4; /* data offset */
uint8_t th_x2 : 4; /* unused */ uint8_t th_x2 : 4; /* unused */
headers/posix/netinet6/in6.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NETINET6_IN6_H_ #ifndef _NETINET6_IN6_H_
headers/posix/nl_types.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NL_TYPES_H_ #ifndef _NL_TYPES_H_
headers/posix/null.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _NULL_H #ifndef _NULL_H
headers/posix/poll.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _POLL_H #ifndef _POLL_H
headers/posix/pwd.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _PWD_H_ #ifndef _PWD_H_
headers/posix/resolv.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
headers/posix/sched.h
+1 -1
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. * Distributed under the terms of the MIT license.
*/ */
#ifndef _SCHED_H_ #ifndef _SCHED_H_
headers/posix/search.h
+4 -4
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SEARCH_H_ #ifndef _SEARCH_H_
@@ -9,9 +9,9 @@
#include <sys/types.h> #include <sys/types.h>
typedef enum { typedef enum {
FIND, FIND,
ENTER ENTER
} ACTION; } ACTION;
typedef struct entry { typedef struct entry {
headers/posix/semaphore.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2008-2010 Haiku Inc. * Copyright 2008-2012 Haiku, Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SEMAPHORE_H_ #ifndef _SEMAPHORE_H_
headers/posix/setjmp.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2010 Haiku Inc. * Copyright 2004-2012 Haiku, Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SETJMP_H_ #ifndef _SETJMP_H_
headers/posix/shadow.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SHADOW_H_ #ifndef _SHADOW_H_
headers/posix/size_t.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SIZE_T_H_ #ifndef _SIZE_T_H_
headers/posix/stdint.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STDINT_H_ #ifndef _STDINT_H_
headers/posix/stdio.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STDIO_H_ #ifndef _STDIO_H_
headers/posix/stdio_ext.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STDIO_EXT_H_ #ifndef _STDIO_EXT_H_
headers/posix/stdio_post.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STDIO_POST_H_ #ifndef _STDIO_POST_H_
headers/posix/stdio_pre.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STDIO_PRE_H_ #ifndef _STDIO_PRE_H_
headers/posix/stdlib.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STDLIB_H_ #ifndef _STDLIB_H_
headers/posix/string.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STRING_H_ #ifndef _STRING_H_
headers/posix/sys/file.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_FILE_H #ifndef _SYS_FILE_H
headers/posix/sys/ioctl.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_IOCTL_H #ifndef _SYS_IOCTL_H
headers/posix/sys/ipc.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_IPC_H #ifndef _SYS_IPC_H
headers/posix/sys/mman.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_MMAN_H #ifndef _SYS_MMAN_H
headers/posix/sys/msg.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_MSG_H #ifndef _SYS_MSG_H
headers/posix/sys/param.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_PARAM_H #ifndef _SYS_PARAM_H
headers/posix/sys/poll.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_POLL_H #ifndef _SYS_POLL_H
headers/posix/sys/resource.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_RESOURCE_H #ifndef _SYS_RESOURCE_H
headers/posix/sys/select.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_SELECT_H #ifndef _SYS_SELECT_H
headers/posix/sys/sem.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_SEM_H #ifndef _SYS_SEM_H
headers/posix/sys/socket.h
+3 -3
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_SOCKET_H #ifndef _SYS_SOCKET_H
@@ -47,7 +47,7 @@ typedef uint32_t socklen_t;
#define SOCK_MISC 255 #define SOCK_MISC 255
/* Socket options for SOL_SOCKET level */ /* Socket options for SOL_SOCKET level */
#define SOL_SOCKET -1 #define SOL_SOCKET -1
#define SO_ACCEPTCONN 0x00000001 /* socket has had listen() */ #define SO_ACCEPTCONN 0x00000001 /* socket has had listen() */
#define SO_BROADCAST 0x00000002 /* permit sending of broadcast msgs */ #define SO_BROADCAST 0x00000002 /* permit sending of broadcast msgs */
@@ -85,7 +85,7 @@ struct linger {
}; };
struct sockaddr { struct sockaddr {
uint8_t sa_len; uint8_t sa_len;
uint8_t sa_family; uint8_t sa_family;
uint8_t sa_data[30]; uint8_t sa_data[30];
}; };
headers/posix/sys/sockio.h
+3 -3
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_SOCKIO_H #ifndef _SYS_SOCKIO_H
@@ -47,9 +47,9 @@
#define SIOCGIFSTATS 8929 /* get interface stats */ #define SIOCGIFSTATS 8929 /* get interface stats */
#define SIOCGIFTYPE 8931 /* get interface type */ #define SIOCGIFTYPE 8931 /* get interface type */
#define SIOCSPACKETCAP 8932 #define SIOCSPACKETCAP 8932
/* Start capturing packets on an interface */ /* Start capturing packets on an interface */
#define SIOCCPACKETCAP 8933 #define SIOCCPACKETCAP 8933
/* Stop capturing packets on an interface */ /* Stop capturing packets on an interface */
#define SIOCSHIWAT 8934 /* set high watermark */ #define SIOCSHIWAT 8934 /* set high watermark */
headers/posix/sys/stat.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_STAT_H_ #ifndef _SYS_STAT_H_
headers/posix/sys/statvfs.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _STAT_VFS_H_ #ifndef _STAT_VFS_H_
headers/posix/sys/time.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_TIME_H #ifndef _SYS_TIME_H
headers/posix/sys/timeb.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_TIMEB_H #ifndef _SYS_TIMEB_H
headers/posix/sys/times.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_TIMES_H #ifndef _SYS_TIMES_H
@@ -21,6 +21,6 @@ extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
clock_t times(struct tms *tms); clock_t times(struct tms *tms);
#endif /* _SYS_TIMES_H */ #endif /* _SYS_TIMES_H */
headers/posix/sys/types.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_TYPES_H #ifndef _SYS_TYPES_H
headers/posix/sys/uio.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_UIO_H #ifndef _SYS_UIO_H
headers/posix/sys/un.h
+2 -2
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_UN_H #ifndef _SYS_UN_H
@@ -10,7 +10,7 @@
struct sockaddr_un { struct sockaddr_un {
uint8_t sun_len; uint8_t sun_len;
uint8_t sun_family; uint8_t sun_family;
char sun_path[126]; char sun_path[126];
}; };
headers/posix/sys/utsname.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYS_UTSNAME_H #ifndef _SYS_UTSNAME_H
headers/posix/syslog.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _SYSLOG_H_ #ifndef _SYSLOG_H_
headers/posix/termios.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _TERMIOS_H_ #ifndef _TERMIOS_H_
headers/posix/utime.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _UTIME_H_ #ifndef _UTIME_H_
headers/posix/wchar.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _WCHAR_H #ifndef _WCHAR_H
headers/posix/wchar_t.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
headers/posix/wctype.h
+1 -1
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. * Distributed under the terms of the MIT License.
*/ */
#ifndef _WCTYPE_H_ #ifndef _WCTYPE_H_
headers/private/interface/ColumnListView.h
+2 -2
View File
@@ -385,9 +385,8 @@ protected:
virtual void DoLayout(); virtual void DoLayout();
private: private:
void _Init(bool showHorizontalScrollbar); void _Init();
void _GetChildViewRects(const BRect& bounds, void _GetChildViewRects(const BRect& bounds,
bool showHorizontalScrollBar,
BRect& titleRect, BRect& outlineRect, BRect& titleRect, BRect& outlineRect,
BRect& vScrollBarRect, BRect& vScrollBarRect,
BRect& hScrollBarRect); BRect& hScrollBarRect);
@@ -404,6 +403,7 @@ private:
bool fSortingEnabled; bool fSortingEnabled;
float fLatchWidth; float fLatchWidth;
border_style fBorderStyle; border_style fBorderStyle;
bool fShowingHorizontalScrollBar;
}; };
#endif // _COLUMN_LIST_VIEW_H #endif // _COLUMN_LIST_VIEW_H
headers/private/shared/ArgumentVector.h
+53
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
src/add-ons/kernel/drivers/ports/usb_serial/FTDI.cpp
+9 -2
View File
@@ -4,10 +4,16 @@
* *
* Copyright (c) 2003 by Siarzhuk Zharski <imker@gmx.li> * Copyright (c) 2003 by Siarzhuk Zharski <imker@gmx.li>
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*
* Authors:
* Alexander von Gluck IV, kallisti5@unixzen.com
*/ */
#include "FTDI.h" #include "FTDI.h"
#include "FTDIRegs.h" #include "FTDIRegs.h"
FTDIDevice::FTDIDevice(usb_device device, uint16 vendorID, uint16 productID, FTDIDevice::FTDIDevice(usb_device device, uint16 vendorID, uint16 productID,
const char *description) const char *description)
: SerialDevice(device, vendorID, productID, description), : SerialDevice(device, vendorID, productID, description),
@@ -46,7 +52,7 @@ FTDIDevice::AddDevice(const usb_configuration_info *config)
} }
if (pipesSet >= 3) { if (pipesSet >= 3) {
if (ProductID() == PRODUCT_FTDI_8U100AX) if (ProductID() == 0x8372) // AU100AX
fHeaderLength = 1; fHeaderLength = 1;
else else
fHeaderLength = 0; fHeaderLength = 0;
@@ -84,7 +90,8 @@ FTDIDevice::SetLineCoding(usb_cdc_line_coding *lineCoding)
lineCoding->databits); lineCoding->databits);
int32 rate = 0; int32 rate = 0;
if (ProductID() == PRODUCT_FTDI_8U100AX) { if (ProductID() == 0x8372) {
// AU100AX
switch (lineCoding->speed) { switch (lineCoding->speed) {
case 300: rate = ftdi_sio_b300; break; case 300: rate = ftdi_sio_b300; break;
case 600: rate = ftdi_sio_b600; break; case 600: rate = ftdi_sio_b600; break;
src/add-ons/kernel/drivers/ports/usb_serial/FTDI.h
+12 -3
View File
@@ -4,16 +4,24 @@
* *
* Copyright (c) 2003 by Siarzhuk Zharski <imker@gmx.li> * Copyright (c) 2003 by Siarzhuk Zharski <imker@gmx.li>
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*
* Authors:
* Alexander von Gluck IV, kallisti5@unixzen.com
*/ */
#ifndef _USB_FTDI_H_ #ifndef _USB_FTDI_H_
#define _USB_FTDI_H_ #define _USB_FTDI_H_
#include "SerialDevice.h" #include "SerialDevice.h"
/* supported vendor and product ids */ /* supported vendor and product ids */
#define VENDOR_FTDI 0x0403 #define VENDOR_FTDI 0x0403
#define PRODUCT_FTDI_8U100AX 0x8372
#define PRODUCT_FTDI_8U232AM 0x6001 const usb_serial_device kFTDIDevices[] = {
{VENDOR_FTDI, 0x8372, "FTDI 8U100AX serial converter"},
{VENDOR_FTDI, 0x6001, "FTDI 8U232AM serial converter"}
};
#define FTDI_BUFFER_SIZE 64 #define FTDI_BUFFER_SIZE 64
@@ -40,4 +48,5 @@ private:
uint8 fStatusLSR; uint8 fStatusLSR;
}; };
#endif //_USB_FTDI_H_ #endif //_USB_FTDI_H_
src/add-ons/kernel/drivers/ports/usb_serial/Jamfile
+1
View File
@@ -14,6 +14,7 @@ KernelAddon usb_serial :
ACM.cpp ACM.cpp
FTDI.cpp FTDI.cpp
KLSI.cpp KLSI.cpp
Option.cpp
Prolific.cpp Prolific.cpp
Silicon.cpp Silicon.cpp
; ;

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