* fixed a couple of regressions of r37670 concerning optional build targets
(bluetooth, ac3_decoder, netfs) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37672 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
0041b38214
commit
0ea1aab28a
src
add-ons
kernel
media/plugins/ac3_decoder
servers/bluetooth
@ -31,9 +31,9 @@
|
||||
int32 api_version = B_CUR_DRIVER_API_VERSION;
|
||||
|
||||
// Modules
|
||||
static char* usb_name = B_USB_MODULE_NAME;
|
||||
static char* hci_name = BT_HCI_MODULE_NAME;
|
||||
static char* btDevices_name = BT_HCI_MODULE_NAME;
|
||||
static const char* usb_name = B_USB_MODULE_NAME;
|
||||
static const char* hci_name = BT_HCI_MODULE_NAME;
|
||||
static const char* btDevices_name = BT_HCI_MODULE_NAME;
|
||||
|
||||
|
||||
usb_module_info* usb = NULL;
|
||||
|
@ -21,9 +21,9 @@ extern "C" {
|
||||
static int netfs_mount(nspace_id nsid, const char *device, ulong flags,
|
||||
void *parameters, size_t len, void **data, vnode_id *rootID);
|
||||
static int netfs_unmount(void *ns);
|
||||
static int netfs_sync(void *ns);
|
||||
//static int netfs_sync(void *ns);
|
||||
static int netfs_read_fs_stat(void *ns, struct fs_info *info);
|
||||
static int netfs_write_fs_stat(void *ns, struct fs_info *info, long mask);
|
||||
//static int netfs_write_fs_stat(void *ns, struct fs_info *info, long mask);
|
||||
|
||||
// vnodes
|
||||
static int netfs_read_vnode(void *ns, vnode_id vnid, char reenter,
|
||||
@ -32,7 +32,7 @@ static int netfs_write_vnode(void *ns, void *node, char reenter);
|
||||
static int netfs_remove_vnode(void *ns, void *node, char reenter);
|
||||
|
||||
// nodes
|
||||
static int netfs_fsync(void *ns, void *node);
|
||||
//static int netfs_fsync(void *ns, void *node);
|
||||
static int netfs_read_stat(void *ns, void *node, struct stat *st);
|
||||
static int netfs_write_stat(void *ns, void *node, struct stat *st,
|
||||
long mask);
|
||||
@ -50,7 +50,7 @@ static int netfs_write(void *ns, void *node, void *cookie, off_t pos,
|
||||
const void *buffer, size_t *bufferSize);
|
||||
static int netfs_ioctl(void *ns, void *node, void *cookie, int cmd,
|
||||
void *buffer, size_t bufferSize);
|
||||
static int netfs_setflags(void *ns, void *node, void *cookie, int flags);
|
||||
//static int netfs_setflags(void *ns, void *node, void *cookie, int flags);
|
||||
|
||||
// hard links / symlinks
|
||||
static int netfs_link(void *ns, void *dir, const char *name, void *node);
|
||||
@ -239,6 +239,8 @@ netfs_unmount(void *ns)
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
#if 0 // not used
|
||||
|
||||
// netfs_sync
|
||||
static
|
||||
int
|
||||
@ -259,6 +261,8 @@ netfs_sync(void *ns)
|
||||
return error;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// netfs_read_fs_stat
|
||||
static
|
||||
int
|
||||
@ -279,6 +283,8 @@ netfs_read_fs_stat(void *ns, struct fs_info *info)
|
||||
return error;
|
||||
}
|
||||
|
||||
#if 0 // not used
|
||||
|
||||
// netfs_write_fs_stat
|
||||
static
|
||||
int
|
||||
@ -299,6 +305,8 @@ netfs_write_fs_stat(void *ns, struct fs_info *info, long mask)
|
||||
return error;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// #pragma mark -
|
||||
// #pragma mark ----- vnodes -----
|
||||
|
||||
@ -355,6 +363,8 @@ netfs_remove_vnode(void *ns, void *_node, char reenter)
|
||||
// #pragma mark -
|
||||
// #pragma mark ----- nodes -----
|
||||
|
||||
#if 0 // not used
|
||||
|
||||
// netfs_fsync
|
||||
static
|
||||
int
|
||||
@ -367,6 +377,8 @@ netfs_fsync(void *ns, void *_node)
|
||||
return error;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// netfs_read_stat
|
||||
static
|
||||
int
|
||||
|
@ -344,7 +344,8 @@ AC3Decoder::InputGetData(void **buffer, int size)
|
||||
return true;
|
||||
}
|
||||
if (fInputChunkSize > 0) {
|
||||
int bytes = min_c(size - fInputBufferSize, fInputChunkSize);
|
||||
int bytes
|
||||
= min_c((size_t)(size - fInputBufferSize), fInputChunkSize);
|
||||
memcpy((char *)fInputBuffer + fInputBufferSize, (char *)fInputChunk + fInputChunkOffset, bytes);
|
||||
fInputChunkOffset += bytes;
|
||||
fInputChunkSize -= bytes;
|
||||
|
@ -285,8 +285,8 @@ DeviceManager::StopMonitoringDevice(const char *device)
|
||||
return err;
|
||||
|
||||
// test if still monitored
|
||||
bool stillMonitored = false;
|
||||
/*
|
||||
bool stillMonitored = false;
|
||||
int32 i = 0;
|
||||
while ((tmpaddon = (_BDeviceAddOn_ *)fDeviceAddons.ItemAt(i++)) !=NULL) {
|
||||
if (addon == tmpaddon)
|
||||
|
Loading…
x
Reference in New Issue
Block a user