Merge remote-tracking branch 'origin/master' into dev/netservices
Change-Id: I48c8cf4f03e281a5caeb9f27bf052285961529ff
This commit is contained in:
@@ -130,6 +130,7 @@ typedef struct {
|
||||
bool removable; /* non-zero if removable */
|
||||
bool read_only; /* non-zero if read only */
|
||||
bool write_once; /* non-zero if write-once */
|
||||
uint32 bytes_per_physical_sector; /* physical sector size in bytes */
|
||||
} device_geometry;
|
||||
|
||||
enum {
|
||||
@@ -151,6 +152,7 @@ typedef struct {
|
||||
off_t offset; /* offset (in bytes) */
|
||||
off_t size; /* size (in bytes) */
|
||||
int32 logical_block_size; /* logical block size of partition */
|
||||
int32 physical_block_size; /* physical block size of partition */
|
||||
int32 session; /* id of session */
|
||||
int32 partition; /* id of partition */
|
||||
char device[256]; /* path to the physical device */
|
||||
|
||||
@@ -25,6 +25,7 @@ typedef struct partition_data {
|
||||
off_t size;
|
||||
off_t content_size;
|
||||
uint32 block_size;
|
||||
uint32 physical_block_size;
|
||||
int32 child_count;
|
||||
int32 index; // [sys]
|
||||
uint32 status;
|
||||
|
||||
@@ -232,15 +232,15 @@ enum vertical_alignment {
|
||||
enum {
|
||||
B_USE_DEFAULT_SPACING = -1002,
|
||||
B_USE_ITEM_SPACING = -1003,
|
||||
B_USE_ITEM_INSETS = -1003,
|
||||
B_USE_ITEM_INSETS = B_USE_ITEM_SPACING,
|
||||
B_USE_HALF_ITEM_SPACING = -1004,
|
||||
B_USE_HALF_ITEM_INSETS = -1004,
|
||||
B_USE_WINDOW_INSETS = -1005,
|
||||
B_USE_HALF_ITEM_INSETS = B_USE_HALF_ITEM_SPACING,
|
||||
B_USE_WINDOW_SPACING = -1005,
|
||||
B_USE_SMALL_INSETS = -1006,
|
||||
B_USE_WINDOW_INSETS = B_USE_WINDOW_SPACING,
|
||||
B_USE_SMALL_SPACING = -1006,
|
||||
B_USE_BIG_INSETS = -1007,
|
||||
B_USE_BIG_SPACING = -1007
|
||||
B_USE_SMALL_INSETS = B_USE_SMALL_SPACING,
|
||||
B_USE_BIG_SPACING = -1007,
|
||||
B_USE_BIG_INSETS = B_USE_BIG_SPACING,
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ public:
|
||||
void SetPort(uint16 port);
|
||||
status_t SetPort(const char* service);
|
||||
|
||||
void SetToLinkLevel(uint8* address, size_t length);
|
||||
void SetToLinkLevel(const uint8* address, size_t length);
|
||||
void SetToLinkLevel(const char* name);
|
||||
void SetToLinkLevel(uint32 index);
|
||||
void SetLinkLevelIndex(uint32 index);
|
||||
|
||||
@@ -114,6 +114,8 @@ public:
|
||||
|
||||
status_t GetNextNetwork(uint32& cookie,
|
||||
wireless_network& network);
|
||||
status_t GetNetworks(wireless_network*& networks,
|
||||
uint32& count);
|
||||
status_t GetNetwork(const char* name,
|
||||
wireless_network& network);
|
||||
status_t GetNetwork(const BNetworkAddress& address,
|
||||
|
||||
Reference in New Issue
Block a user