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

Merge branch 'master' into dev/netservices

Browse Source 
Change-Id: I1eb6c2ea2fd0d794ad6378eab8bbb80ce46dfbb8
This commit is contained in:
Niels Sascha Reedijk
2022-05-08 09:00:42 +01:00
parent cf54474e38 929355add7
commit 46b7da1f4f
1674 changed files with 29293 additions and 32942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/PCI.h
+3
View File
@@ -182,6 +182,9 @@ struct pci_module_info {
uint16 cap_id,
uint16 *offset
);
status_t (*get_powerstate)(uint8 bus, uint8 device, uint8 function, uint8* state);
status_t (*set_powerstate)(uint8 bus, uint8 device, uint8 function, uint8 newState);
};
#define B_PCI_MODULE_NAME "bus_managers/pci/v1"
headers/os/drivers/config_manager.h
-117
View File
@@ -1,117 +0,0 @@
#ifndef _CONFIG_MANAGER_H
#define _CONFIG_MANAGER_H
#include <module.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef enum {
B_ISA_BUS,
B_PCI_BUS,
B_PCMCIA_BUS,
B_UNKNOWN_BUS = 0x80
} bus_type;
typedef struct {
uchar base;
uchar subtype;
uchar interface;
} device_type;
typedef struct {
uint32 mask;
uint32 flags;
uint32 cookie;
} resource_mask_descriptor;
typedef struct {
uint32 minbase;
uint32 maxbase;
uint32 basealign;
uint32 len;
uint32 flags;
uint32 cookie;
} resource_range_descriptor;
typedef enum {
B_IRQ_RESOURCE,
B_DMA_RESOURCE,
B_IO_PORT_RESOURCE,
B_MEMORY_RESOURCE
} resource_type;
typedef struct {
resource_type type;
union {
resource_mask_descriptor m;
resource_range_descriptor r;
uint32 for_padding[7];
} d;
} resource_descriptor;
struct device_configuration {
uint32 flags;
uint32 num_resources;
resource_descriptor resources[0];
};
struct possible_device_configurations {
uint32 flags;
uint32 num_possible;
struct device_configuration possible[0];
};
struct device_info {
uint32 size;
uint32 bus_dependent_info_offset;
bus_type bus;
device_type devtype;
uint32 id[4]; /* unique (per-bus) normally-persistent id for device */
uint32 flags;
status_t config_status;
/* bus-dependent data goes here... */
};
#define B_DEVICE_INFO_ENABLED 1
#define B_DEVICE_INFO_CONFIGURED 2
#define B_DEVICE_INFO_CAN_BE_DISABLED 4
typedef struct config_manager_for_driver_module_info {
module_info minfo;
status_t (*get_next_device_info)(bus_type bus, uint64 *cookie,
struct device_info *info, uint32 len);
status_t (*get_device_info_for)(uint64 device,
struct device_info *info, uint32 len);
status_t (*get_size_of_current_configuration_for)(uint64 device);
status_t (*get_current_configuration_for)(uint64 device,
struct device_configuration *config, uint32 len);
status_t (*get_size_of_possible_configurations_for)(uint64 device);
status_t (*get_possible_configurations_for)(uint64 device,
struct possible_device_configurations *possible,
uint32 len);
/* helper routines for drivers */
status_t (*count_resource_descriptors_of_type)(
const struct device_configuration *config,
resource_type type);
status_t (*get_nth_resource_descriptor_of_type)(
const struct device_configuration *config, uint32 n,
resource_type type, resource_descriptor *descriptor,
uint32 len);
} config_manager_for_driver_module_info;
int config_manager_scan_hardcoded(struct device_info **info, int32 *count);
#define B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME "bus_managers/config_manager/driver/v1"
#ifdef __cplusplus
}
#endif
#endif /* _CONFIG_MANAGER_H */
headers/os/drivers/fs_interface.h
-2
View File
@@ -330,8 +330,6 @@ extern status_t remove_vnode(fs_volume* volume, ino_t vnodeID);
extern status_t unremove_vnode(fs_volume* volume, ino_t vnodeID);
extern status_t get_vnode_removed(fs_volume* volume, ino_t vnodeID,
bool* _removed);
extern status_t mark_vnode_busy(fs_volume* volume, ino_t vnodeID, bool busy);
extern status_t change_vnode_id(fs_volume* volume, ino_t vnodeID, ino_t newID);
extern fs_volume* volume_for_vnode(fs_vnode* vnode);
extern status_t check_access_permissions(int accessMode, mode_t mode,
gid_t nodeGroupID, uid_t nodeUserID);
headers/os/drivers/isapnp.h
-2
View File
@@ -1,8 +1,6 @@
#ifndef _ISA_CONFIG_H
#define _ISA_CONFIG_H
#include <config_manager.h>
#ifdef __cplusplus
extern "C" {
#endif
headers/os/drivers/pcmcia/k_compat.h
-1
View File
@@ -25,7 +25,6 @@
#include <Drivers.h>
#include <ByteOrder.h>
#include <SupportDefs.h>
#include <config_manager.h>
#include <stdio.h>
#include <string.h>
headers/os/drivers/usb/USB_cdc.h
+1
View File
@@ -5,6 +5,7 @@
// Reference: http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
#define USB_COMMUNICATION_DEVICE_CLASS 0x02
#define USB_COMMUNICATION_WIRELESS_DEVICE_CLASS 0xe0
#define USB_CDC_COMMUNICATION_INTERFACE_CLASS 0x02
#define USB_CDC_CLASS_VERSION 0x0101
headers/os/drivers/usb/USB_hid_page_consumer.h
+49 -6
View File
@@ -8,8 +8,8 @@
/* Reference:
* HID Usage Page 0x0C: CONSUMER
* HID Usage Tables Ver. 1.12
* http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
* HID Usage Tables Ver. 1.3
* https://usb.org/sites/default/files/hut1_3_0.pdf
*/
// Usage IDs
@@ -50,7 +50,32 @@ enum {
B_HID_UID_CON_BROADCAST_MODE,
B_HID_UID_CON_SNAPSHOT,
B_HID_UID_CON_STILL,
B_HID_UID_CON_PICTURE_IN_PICTURE_TOGGLE,
B_HID_UID_CON_PICTURE_IN_PICTURE_SWAP,
B_HID_UID_CON_RED_MENU_BUTTON,
B_HID_UID_CON_GREEN_MENU_BUTTON,
B_HID_UID_CON_BLUE_MENU_BUTTON,
B_HID_UID_CON_YELLOW_MENU_BUTTON,
B_HID_UID_CON_ASPECT,
B_HID_UID_CON_3D_MODE_SELECT,
B_HID_UID_CON_DISPLAY_BRIGHTNESS_INCREMENT,
B_HID_UID_CON_DISPLAY_BRIGHTNESS_DECREMENT,
B_HID_UID_CON_DISPLAY_BRIGHTNESS,
B_HID_UID_CON_DISPLAY_BACKLIGHT_TOGGLE,
B_HID_UID_CON_DISPLAY_SET_BRIGHTNESS_TO_MINIMUM,
B_HID_UID_CON_DISPLAY_SET_BRIGHTNESS_TO_MAXIMUM,
B_HID_UID_CON_DISPLAY_SET_AUTO_BRIGHTNESS,
B_HID_UID_CON_CAMERA_ACCESS_ENABLED,
B_HID_UID_CON_CAMERA_ACCESS_DISABLED,
B_HID_UID_CON_CAMERA_ACCESS_TOGGLE,
B_HID_UID_CON_KEYBOARD_BRIGHTNESS_INCREMENT,
B_HID_UID_CON_KEYBOARD_BRIGHTNESS_DECREMENT,
B_HID_UID_CON_KEYBOARD_BACKLIGHT_SET_LEVEL,
B_HID_UID_CON_KEYBOARD_BACKLIGHT_OOC,
B_HID_UID_CON_KEYBOARD_BACKLIGHT_SET_MINIMUM,
B_HID_UID_CON_KEYBOARD_BACKLIGHT_SET_MAXIMUM,
B_HID_UID_CON_KEYBOARD_BACKLIGHT_AUTO,
B_HID_UID_CON_SELECTION = 0x80,
B_HID_UID_CON_ASSIGN_SELECTION,
B_HID_UID_CON_MODE_SETUP,
@@ -120,7 +145,18 @@ enum {
B_HID_UID_CON_STOP_EJECT,
B_HID_UID_CON_PLAY_PAUSE,
B_HID_UID_CON_PLAY_SKIP,
B_HID_UID_CON_VOICE_COMMAND,
B_HID_UID_CON_INVOKE_CAPTURE_INTERFACE,
B_HID_UID_CON_START_OR_STOP_GAME_RECORDING,
B_HID_UID_CON_HISTORICAL_GAME_CAPTURE,
B_HID_UID_CON_CAPTURE_GAME_SCREENSHOT,
B_HID_UID_CON_SHOW_OR_HIDE_RECORDING_INDICATOR,
B_HID_UID_CON_START_OR_STOP_MICROPHONE_CAPTURE,
B_HID_UID_CON_START_OR_STOP_CAMERA_CAPTURE,
B_HID_UID_CON_START_OR_STOP_GAME_BROADCAST,
B_HID_UID_CON_START_OR_STOP_VOICE_DICTATION_SESSION,
B_HID_UID_CON_INVOKE_DISMISS_EMOJI_PICKER,
B_HID_UID_CON_VOLUME = 0xe0,
B_HID_UID_CON_BALANCE,
B_HID_UID_CON_MUTE,
@@ -252,7 +288,11 @@ enum {
B_HID_UID_CON_AL_ONLINE_ACTIVITY_BROWSER,
B_HID_UID_CON_AL_RESEARCH_SEARCH_BROWSER,
B_HID_UID_CON_AL_AUDIO_PLAYER,
B_HID_UID_CON_AL_MESSAGE_STATUS,
B_HID_UID_CON_AL_CONTACT_SYNC,
B_HID_UID_CON_AL_NAVIGATION,
B_HID_UID_CON_AL_CONTEXT_AWARE_DESKTOP_ASSISTANT,
B_HID_UID_CON_GENERIC_GUI_APPLICATION_CONTROLS = 0x200,
B_HID_UID_CON_AC_NEW,
B_HID_UID_CON_AC_OPEN,
@@ -393,7 +433,10 @@ enum {
B_HID_UID_CON_AC_MERGE,
B_HID_UID_CON_AC_SPLIT,
B_HID_UID_CON_AC_DISTRIBUTE_HORIZONTALLY,
B_HID_UID_CON_AC_DISTRIBUTE_VERTICALLY
B_HID_UID_CON_AC_DISTRIBUTE_VERTICALLY,
B_HID_UID_CON_AC_NEXT_KEYBOARD_LAYOUT_SELECT,
B_HID_UID_CON_AC_NAVIGATION_GUIDANCE,
B_HID_UID_CON_AC_DESKTOP_SHOW_ALL_WINDOWS
};
headers/os/drivers/usb/USB_hid_page_digitizers.h
+72 -5
View File
@@ -8,8 +8,8 @@
/* Reference:
* HID Usage Page 0x0D: DIGITIZERS
* HID Usage Tables Ver. 1.12
* http://www.usb.org/developers/devclass_docs/Hut1_12.pdf
* HID Usage Tables Ver. 1.3
* https://usb.org/sites/default/files/hut1_3_0.pdf
*/
// Usage IDs
@@ -27,11 +27,11 @@ enum {
B_HID_UID_DIG_ARMATURE,
B_HID_UID_DIG_MULTIPLE_POINT_DIGITIZER,
B_HID_UID_DIG_FREE_SPACE_WAND,
B_HID_UID_DIG_STYLUS = 0x20,
B_HID_UID_DIG_PUCK,
B_HID_UID_DIG_FINGER,
B_HID_UID_DIG_TIP_PRESSURE = 0x30,
B_HID_UID_DIG_BARREL_PRESSURE,
B_HID_UID_DIG_IN_RANGE,
@@ -54,7 +54,74 @@ enum {
B_HID_UID_DIG_SECONDARY_TIP_SWITCH,
B_HID_UID_DIG_BARREL_SWITCH,
B_HID_UID_DIG_ERASER,
B_HID_UID_DIG_TABLET_PICK
B_HID_UID_DIG_TABLET_PICK,
B_HID_UID_DIG_TOUCH_VALID,
B_HID_UID_DIG_WIDTH,
B_HID_UID_DIG_HEIGHT,
B_HID_UID_DIG_CONTACT_IDENTIFIER = 0x51,
B_HID_UID_DIG_DEVICE_MODE,
B_HID_UID_DIG_DEVICE_IDENTIFIER,
B_HID_UID_DIG_CONTACT_COUNT,
B_HID_UID_DIG_CONTACT_COUNT_MAXIMUM,
B_HID_UID_DIG_SCAN_TIME,
B_HID_UID_DIG_SURFACE_SWITCH,
B_HID_UID_DIG_BUTTON_SWITCH,
B_HID_UID_DIG_PAD_TYPE,
B_HID_UID_DIG_SECONDARY_BARREL_SWITCH,
B_HID_UID_DIG_TRANSDUCER_SERIAL_NUMBER,
B_HID_UID_DIG_PREFERRED_COLOR,
B_HID_UID_DIG_PREFERRED_COLOR_IS_LOCKED,
B_HID_UID_DIG_PREFERRED_LINE_WIDTH,
B_HID_UID_DIG_PREFERRED_LINE_WIDTH_IS_LOCKED,
B_HID_UID_DIG_LATENCY_MODE,
B_HID_UID_DIG_GESTURE_CHARACTER_QUALITY,
B_HID_UID_DIG_GESTURE_CHARACTER_ENCODING,
B_HID_UID_DIG_GESTURE_CHARACTER_DATA_LENGTH,
B_HID_UID_DIG_GESTURE_CHARACTER_DATA,
B_HID_UID_DIG_UTF8_CHARACTER_GESTURE_ENCODING,
B_HID_UID_DIG_UTF16_LITTLE_ENDIAN_CHARACTER_GESTURE_ENCODING,
B_HID_UID_DIG_UTF16_BIG_ENDIAN_CHARACTER_GESTURE_ENCODING,
B_HID_UID_DIG_UTF32_LITTLE_ENDIAN_CHARACTER_GESTURE_ENCODING,
B_HID_UID_DIG_UTF32_BIG_ENDIAN_CHARACTER_GESTURE_ENCODING,
B_HID_UID_DIG_CAPACITIVE_HEAT_MAP_PROTOCOL_VENDOR_ID,
B_HID_UID_DIG_CAPACITIVE_HEAT_MAP_PROTOCOL_VERSION,
B_HID_UID_DIG_CAPACITIVE_HEAT_MAP_FRAME_DATA,
B_HID_UID_DIG_GESTURE_CHARACTER_ENABLE,
B_HID_UID_DIG_TRANSDUCER_SERIAL_NUMBER_PART_2,
B_HID_UID_DIG_NO_PREFERRED_COLOR,
B_HID_UID_DIG_PREFERRED_LINE_STYLE,
B_HID_UID_DIG_PREFERRED_LINE_STYLE_IS_LOCKED,
B_HID_UID_DIG_INK,
B_HID_UID_DIG_PENCIL,
B_HID_UID_DIG_HIGHLIGHTER,
B_HID_UID_DIG_CHISEL_MARKER,
B_HID_UID_DIG_BRUSH,
B_HID_UID_DIG_NO_PREFERENCE,
B_HID_UID_DIG_DIGITIZER_DIAGNOSTIC = 0x80,
B_HID_UID_DIG_DIGITIZER_ERROR,
B_HID_UID_DIG_ERR_NORMAL_STATUS,
B_HID_UID_DIG_ERR_TRANSDUCERS_EXCEEDED,
B_HID_UID_DIG_ERR_FULL_TRANS_FEATURES_UNAVAILABLE,
B_HID_UID_DIG_ERR_CHARGE_LOW,
B_HID_UID_DIG_TRANSDUCER_SOFTWARE_INFO = 0x90,
B_HID_UID_DIG_TRANSDUCER_VENDOR_ID,
B_HID_UID_DIG_TRANSDUCER_PRODUCT_ID,
B_HID_UID_DIG_DEVICE_SUPPORTED_PROTOCOLS,
B_HID_UID_DIG_TRANSDUCER_SUPPORTED_PROTOCOLS,
B_HID_UID_DIG_NO_PROTOCOL,
B_HID_UID_DIG_WACOM_AES_PROTOCOL,
B_HID_UID_DIG_USI_PROTOCOL,
B_HID_UID_DIG_MICROSOFT_PEN_PROTOCOL,
B_HID_UID_DIG_SUPPORTED_REPORT_RATES = 0xA0,
B_HID_UID_DIG_REPORT_RATE,
B_HID_UID_DIG_TRANSDUCER_CONNECTED,
B_HID_UID_DIG_SWITCH_DISABLED,
B_HID_UID_DIG_SWITCH_UNIMPLEMENTED,
B_HID_UID_DIG_TRANSDUCER_SWITCHES
};
headers/os/interface/Bitmap.h
+15 -7
View File
@@ -79,20 +79,15 @@ public:
status_t SetDrawingFlags(uint32 flags);
uint32 Flags() const;
void SetBits(const void* data, int32 length,
int32 offset, color_space colorSpace);
// not part of the R5 API
status_t ImportBits(const void* data, int32 length,
int32 bpr, int32 offset,
color_space colorSpace);
status_t ImportBits(const void* data, int32 length,
int32 bpr, color_space colorSpace,
BPoint from, BPoint to, int32 width,
int32 height);
BPoint from, BPoint to, BSize size);
status_t ImportBits(const BBitmap* bitmap);
status_t ImportBits(const BBitmap* bitmap, BPoint from,
BPoint to, int32 width, int32 height);
BPoint to, BSize size);
status_t GetOverlayRestrictions(
overlay_restrictions* restrictions) const;
@@ -111,6 +106,19 @@ public:
BBitmap& operator=(const BBitmap& source);
class Private;
public:
// deprecated
void SetBits(const void* data, int32 length,
int32 offset, color_space colorSpace);
private:
status_t ImportBits(const void* data, int32 length,
int32 bpr, color_space colorSpace,
BPoint from, BPoint to, int32 width, int32 height);
status_t ImportBits(const BBitmap* bitmap, BPoint from,
BPoint to, int32 width, int32 height);
private:
friend class BView;
friend class BApplication;
headers/os/interface/InterfaceDefs.h
+9 -10
View File
@@ -418,20 +418,19 @@ status_t set_screen_space(int32 index, uint32 resolution,
status_t get_scroll_bar_info(scroll_bar_info* info);
status_t set_scroll_bar_info(scroll_bar_info* info);
status_t get_mouse_type(int32* type);
status_t set_mouse_type(int32 type);
status_t get_mouse_type_by_name(BString mouse_name, int32* type);
status_t set_mouse_type_by_name(BString mouse_name, int32 type);
status_t get_mouse_type(int32* type); // deprecated
status_t get_mouse_type(const char* mouse_name, int32* type);
status_t set_mouse_type(const char* mouse_name, int32 type);
status_t get_mouse_map(mouse_map* map);
status_t set_mouse_map(mouse_map* map);
status_t get_click_speed(bigtime_t* speed);
status_t set_click_speed(bigtime_t speed);
status_t get_mouse_speed(int32* speed);
status_t set_mouse_speed(int32 speed);
status_t get_mouse_speed_by_name(BString mouse_name, int32* speed);
status_t set_mouse_speed_by_name(BString mouse_name, int32 speed);
status_t get_mouse_acceleration(int32* speed);
status_t set_mouse_acceleration(int32 speed);
status_t get_mouse_speed(int32* speed); // deprecated
status_t get_mouse_speed(const char* mouse_name, int32* speed);
status_t set_mouse_speed(const char* mouse_name, int32 speed);
status_t get_mouse_acceleration(int32* speed); // deprecated
status_t get_mouse_acceleration(const char* mouse_name, int32* speed);
status_t set_mouse_acceleration(const char* mouse_name, int32 speed);
status_t get_key_repeat_rate(int32* rate);
status_t set_key_repeat_rate(int32 rate);
headers/os/kernel/OS.h
+2 -3
View File
@@ -341,6 +341,8 @@ extern status_t rename_thread(thread_id thread, const char *newName);
extern status_t set_thread_priority(thread_id thread, int32 newPriority);
extern void exit_thread(status_t status);
extern status_t wait_for_thread(thread_id thread, status_t *returnValue);
extern status_t wait_for_thread_etc(thread_id id, uint32 flags, bigtime_t timeout,
status_t *_returnCode);
extern status_t on_exit_thread(void (*callback)(void *), void *data);
extern thread_id find_thread(const char *name);
@@ -384,9 +386,6 @@ extern bigtime_t system_time(void);
extern nanotime_t system_time_nsecs(void);
/* time since booting in nanoseconds */
/* deprecated (is no-op) */
extern status_t set_timezone(const char *timezone);
/* Alarm */
enum {
headers/os/media/MediaRoster.h
+9 -1
View File
@@ -11,7 +11,15 @@
#include <MediaDefs.h>
#include <MediaNode.h>
#include <config_manager.h>
typedef enum {
B_ISA_BUS,
B_PCI_BUS,
B_PCMCIA_BUS,
B_UNKNOWN_BUS = 0x80
} bus_type;
class BBufferGroup;
class BMediaAddOn;
headers/os/media/TimedEventQueue.h
+1 -1
View File
@@ -21,7 +21,7 @@ struct media_timed_event {
bigtime_t inTime, int32 inType,
void* inPointer, uint32 inCleanup,
int32 inData, int64 inBigdata,
char* inUserData, size_t dataSize = 0);
const char* inUserData, size_t dataSize = 0);
media_timed_event(
const media_timed_event& other);