i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev/netservices

Browse Source 
Change-Id: I588c4a840523995f820161d63741c137bc5c719c
This commit is contained in:
Niels Sascha Reedijk
2022-09-04 07:30:59 +01:00
parent 27196c4068 d244e9ef2d
commit 97f11716bf
1027 changed files with 109417 additions and 35581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/NetworkKit.h
-3
View File
@@ -5,9 +5,6 @@
#include <sys/socket.h>
#include <NetAddress.h>
#include <NetBuffer.h>
#include <NetworkCookie.h>
#include <NetworkCookieJar.h>
#include <NetEndpoint.h>
#include <NetDebug.h>
#include <Url.h>
#include <UrlContext.h>
headers/os/add-ons/input_server/InputServerDevice.h
+1
View File
@@ -32,6 +32,7 @@ enum {
B_MOUSE_SPEED_CHANGED,
B_CLICK_SPEED_CHANGED,
B_MOUSE_ACCELERATION_CHANGED,
B_SET_TOUCHPAD_SETTINGS,
};
namespace BPrivate {
headers/os/drivers/bus/FDT.h
+4
View File
@@ -11,6 +11,7 @@
struct fdt_bus;
struct fdt_device;
struct fdt_interrupt_map;
typedef struct fdt_bus_module_info {
driver_module_info info;
@@ -25,6 +26,9 @@ typedef struct fdt_device_module_info {
bool (*get_reg)(struct fdt_device* dev, uint32 ord, uint64* regs, uint64* len);
bool (*get_interrupt)(struct fdt_device* dev, uint32 ord,
device_node** interruptController, uint64* interrupt);
struct fdt_interrupt_map* (*get_interrupt_map)(struct fdt_device* dev);
void (*print_interrupt_map)(struct fdt_interrupt_map* interruptMap);
uint32 (*lookup_interrupt_map)(struct fdt_interrupt_map* interruptMap, uint32 childAddr, uint32 childIrq);
} fdt_device_module_info;
headers/os/interface/ControlLook.h
+1
View File
@@ -102,6 +102,7 @@ public:
virtual float DefaultItemSpacing() const = 0;
static float ComposeSpacing(float spacing);
static BSize ComposeIconSize(int32 size);
virtual uint32 Flags(BControl* control) const = 0;
headers/os/interface/Window.h
+1
View File
@@ -365,6 +365,7 @@ private:
void _GetDecoratorSize(float* _borderWidth,
float* _tabHeight) const;
void _SendShowOrHideMessage();
void _PropagateMessageToChildViews(BMessage*);
private:
char* fTitle;
headers/os/net/NetworkDevice.h
+35 -36
View File
@@ -9,39 +9,6 @@
#include <net/if.h>
#include <string.h>
#include <NetworkAddress.h>
class BNetworkAddress;
struct wireless_network {
char name[32];
BNetworkAddress address;
uint8 noise_level;
uint8 signal_strength;
uint32 flags;
uint32 authentication_mode;
uint32 cipher;
uint32 group_cipher;
uint32 key_mode;
bool operator==(const wireless_network& other) {
return strncmp(name, other.name, 32) == 0
// ignore address difference
&& noise_level == other.noise_level
&& signal_strength == other.signal_strength
&& flags == other.flags
&& authentication_mode == other.authentication_mode
&& cipher == other.cipher
&& group_cipher == other.group_cipher
&& key_mode == other.key_mode;
}
};
// flags
#define B_NETWORK_IS_ENCRYPTED 0x01
#define B_NETWORK_IS_PERSISTENT 0x02
// authentication modes
enum {
@@ -82,6 +49,40 @@ enum {
};
#if defined(__cplusplus) && !defined(_KERNEL_MODE)
#include <NetworkAddress.h>
struct wireless_network {
char name[32];
BNetworkAddress address;
uint8 noise_level;
uint8 signal_strength;
uint32 flags;
uint32 authentication_mode;
uint32 cipher;
uint32 group_cipher;
uint32 key_mode;
bool operator==(const wireless_network& other) {
return strncmp(name, other.name, 32) == 0
// ignore address difference
&& noise_level == other.noise_level
&& signal_strength == other.signal_strength
&& flags == other.flags
&& authentication_mode == other.authentication_mode
&& cipher == other.cipher
&& group_cipher == other.group_cipher
&& key_mode == other.key_mode;
}
};
// flags
#define B_NETWORK_IS_ENCRYPTED 0x01
#define B_NETWORK_IS_PERSISTENT 0x02
class BNetworkDevice {
public:
BNetworkDevice();
@@ -98,9 +99,6 @@ public:
uint32 Flags() const;
bool HasLink() const;
int32 CountMedia() const;
int32 GetMediaAt(int32 index) const;
int32 Media() const;
status_t SetMedia(int32 media);
@@ -141,5 +139,6 @@ private:
char fName[IF_NAMESIZE];
};
#endif // __cplusplus && !_KERNEL_MODE
#endif // _NETWORK_DEVICE_H
headers/os/support/TLS.h
+1 -38
View File
@@ -1,12 +1,11 @@
/*
* Copyright 2003-2007 Haiku, Inc. All rights reserved.
* Copyright 2003-2021, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _TLS_H
#define _TLS_H
#include <BeBuild.h>
#include <SupportDefs.h>
@@ -22,46 +21,10 @@ extern "C" {
#endif /* __cplusplus */
extern int32 tls_allocate(void);
#if !_NO_INLINE_ASM && __i386__ && __GNUC__
static inline void *
tls_get(int32 index)
{
void *ret;
__asm__ __volatile__ (
"movl %%fs:(, %1, 4), %0"
: "=r" (ret) : "r" (index));
return ret;
}
static inline void **
tls_address(int32 index)
{
void **ret;
__asm__ __volatile__ (
"movl %%fs:0, %0\n\t"
"leal (%0, %1, 4), %0\n\t"
: "=&r" (ret) : "r" (index));
return ret;
}
static inline void
tls_set(int32 index, void *value)
{
__asm__ __volatile__ (
"movl %1, %%fs:(, %0, 4)"
: : "r" (index), "r" (value));
}
#else /* !_NO_INLINE_ASM && __i386__ && __GNUC__ */
extern void *tls_get(int32 index);
extern void **tls_address(int32 index);
extern void tls_set(int32 index, void *value);
#endif /* !_NO_INLINE_ASM && __i386__ && __GNUC__ */
#ifdef __cplusplus
}
#endif /* __cplusplus */