diff --git a/headers/os/drivers/fs_interface.h b/headers/os/drivers/fs_interface.h index 228a906f49..f3a13e840f 100644 --- a/headers/os/drivers/fs_interface.h +++ b/headers/os/drivers/fs_interface.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009, Haiku Inc. All Rights Reserved. + * Copyright 2004-2010, Haiku Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _FS_INTERFACE_H @@ -142,7 +142,7 @@ struct fs_vnode_ops { /* common operations */ status_t (*ioctl)(fs_volume* volume, fs_vnode* vnode, void* cookie, - ulong op, void* buffer, size_t length); + uint32 op, void* buffer, size_t length); status_t (*set_flags)(fs_volume* volume, fs_vnode* vnode, void* cookie, int flags); status_t (*select)(fs_volume* volume, fs_vnode* vnode, void* cookie, diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h index 47b960f8c3..7b507d229f 100644 --- a/headers/private/fs_shell/fssh_api_wrapper.h +++ b/headers/private/fs_shell/fssh_api_wrapper.h @@ -1490,8 +1490,6 @@ //////////////////////////////////////////////////////////////////////////////// // #pragma mark - fssh_types.h -#define ulong fssh_ulong - #define addr_t fssh_addr_t #define phys_addr_t fssh_phys_addr_t diff --git a/headers/private/fs_shell/fssh_fs_interface.h b/headers/private/fs_shell/fssh_fs_interface.h index 5cbad95116..aa5a4bf013 100644 --- a/headers/private/fs_shell/fssh_fs_interface.h +++ b/headers/private/fs_shell/fssh_fs_interface.h @@ -157,7 +157,7 @@ struct fssh_fs_vnode_ops { /* common operations */ fssh_status_t (*ioctl)(fssh_fs_volume *volume, fssh_fs_vnode *vnode, - fssh_fs_cookie cookie, fssh_ulong op, void *buffer, + fssh_fs_cookie cookie, uint32_t op, void *buffer, fssh_size_t length); fssh_status_t (*set_flags)(fssh_fs_volume *volume, fssh_fs_vnode *vnode, fssh_fs_cookie cookie, int flags); diff --git a/headers/private/fs_shell/fssh_types.h b/headers/private/fs_shell/fssh_types.h index 019a8a5643..d8cc12098e 100644 --- a/headers/private/fs_shell/fssh_types.h +++ b/headers/private/fs_shell/fssh_types.h @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010, Ingo Weinhold, bonefish@cs.tu-berlin.de. + * Copyright 2007-2010, Ingo Weinhold, ingo_weinhold@gmx.de. * Distributed under the terms of the MIT License. */ #ifndef _FSSH_TYPES_H @@ -9,7 +9,6 @@ #include -typedef uint32_t fssh_ulong; typedef volatile int32_t vint32_t; typedef volatile int64_t vint64_t; diff --git a/headers/private/kernel/vfs.h b/headers/private/kernel/vfs.h index bd58b63140..7124050534 100644 --- a/headers/private/kernel/vfs.h +++ b/headers/private/kernel/vfs.h @@ -232,7 +232,7 @@ ssize_t _user_readv(int fd, off_t pos, const iovec *vecs, size_t count); ssize_t _user_write(int fd, off_t pos, const void *buffer, size_t bufferSize); ssize_t _user_writev(int fd, off_t pos, const iovec *vecs, size_t count); -status_t _user_ioctl(int fd, ulong cmd, void *data, size_t length); +status_t _user_ioctl(int fd, uint32 cmd, void *data, size_t length); ssize_t _user_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); status_t _user_rewind_dir(int fd); diff --git a/headers/private/system/syscalls.h b/headers/private/system/syscalls.h index 33b4d6d366..76380f855a 100644 --- a/headers/private/system/syscalls.h +++ b/headers/private/system/syscalls.h @@ -299,7 +299,7 @@ extern ssize_t _kern_write(int fd, off_t pos, const void *buffer, size_t bufferSize); extern ssize_t _kern_writev(int fd, off_t pos, const struct iovec *vecs, size_t count); -extern status_t _kern_ioctl(int fd, ulong cmd, void *data, size_t length); +extern status_t _kern_ioctl(int fd, uint32 cmd, void *data, size_t length); extern ssize_t _kern_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); extern status_t _kern_rewind_dir(int fd); diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp index b73036a961..52a30b7716 100644 --- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp @@ -610,7 +610,7 @@ bfs_get_vnode_name(fs_volume* _volume, fs_vnode* _node, char* buffer, static status_t -bfs_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, ulong cmd, +bfs_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, uint32 cmd, void* buffer, size_t bufferLength) { FUNCTION_START(("node = %p, cmd = %lu, buf = %p, len = %ld\n", _node, cmd, diff --git a/src/add-ons/kernel/file_systems/fat/dosfs.c b/src/add-ons/kernel/file_systems/fat/dosfs.c index c43de2dd30..768cd63f5b 100644 --- a/src/add-ons/kernel/file_systems/fat/dosfs.c +++ b/src/add-ons/kernel/file_systems/fat/dosfs.c @@ -1138,7 +1138,7 @@ bi: UNLOCK_VOL(vol); static status_t -dosfs_ioctl(fs_volume *_vol, fs_vnode *_node, void *cookie, ulong code, +dosfs_ioctl(fs_volume *_vol, fs_vnode *_node, void *cookie, uint32 code, void *buf, size_t len) { status_t result = B_OK; diff --git a/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp b/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp index b201c6a08b..9abafcaf38 100644 --- a/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp +++ b/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp @@ -1212,7 +1212,7 @@ overlay_get_file_map(fs_volume *volume, fs_vnode *vnode, off_t offset, static status_t -overlay_ioctl(fs_volume *volume, fs_vnode *vnode, void *cookie, ulong op, +overlay_ioctl(fs_volume *volume, fs_vnode *vnode, void *cookie, uint32 op, void *buffer, size_t length) { OVERLAY_CALL(ioctl, cookie, op, buffer, length) diff --git a/src/add-ons/kernel/file_systems/layers/log_overlay/log_overlay.cpp b/src/add-ons/kernel/file_systems/layers/log_overlay/log_overlay.cpp index 91985c0f9f..0b9a386051 100644 --- a/src/add-ons/kernel/file_systems/layers/log_overlay/log_overlay.cpp +++ b/src/add-ons/kernel/file_systems/layers/log_overlay/log_overlay.cpp @@ -200,7 +200,7 @@ overlay_get_file_map(fs_volume *volume, fs_vnode *vnode, off_t offset, static status_t -overlay_ioctl(fs_volume *volume, fs_vnode *vnode, void *cookie, ulong op, +overlay_ioctl(fs_volume *volume, fs_vnode *vnode, void *cookie, uint32 op, void *buffer, size_t length) { DO_LOG("ioctl cookie: %p; op: %lu; buffer: %p; size: %lu\n", cookie, op, diff --git a/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp b/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp index f309478fb7..129b952bda 100644 --- a/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp +++ b/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp @@ -1734,7 +1734,7 @@ overlay_get_file_map(fs_volume *volume, fs_vnode *vnode, off_t offset, static status_t -overlay_ioctl(fs_volume *volume, fs_vnode *vnode, void *cookie, ulong op, +overlay_ioctl(fs_volume *volume, fs_vnode *vnode, void *cookie, uint32 op, void *buffer, size_t length) { OVERLAY_CALL(ioctl, cookie, op, buffer, length) diff --git a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp index b72f1e8d3b..e4e45a53e9 100644 --- a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp @@ -277,7 +277,7 @@ FUNCTION(("node: %Ld\n", ((Node*)_node)->GetID())); // ramfs_ioctl static status_t -ramfs_ioctl(fs_volume fs, fs_vnode /*node*/, fs_cookie /*cookie*/, ulong cmd, +ramfs_ioctl(fs_volume fs, fs_vnode /*node*/, fs_cookie /*cookie*/, uint32 cmd, void *buffer, size_t /*length*/) { diff --git a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp index 05a0c5fabe..d096b5ccfb 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp @@ -287,7 +287,7 @@ userlandfs_cancel_io(fs_volume* fsVolume, fs_vnode* fsNode, void *cookie, // userlandfs_ioctl static status_t -userlandfs_ioctl(fs_volume* fsVolume, fs_vnode* fsNode, void* cookie, ulong op, +userlandfs_ioctl(fs_volume* fsVolume, fs_vnode* fsNode, void* cookie, uint32 op, void* buffer, size_t length) { Volume* volume = (Volume*)fsVolume->private_volume; diff --git a/src/system/kernel/device_manager/devfs.cpp b/src/system/kernel/device_manager/devfs.cpp index 43c773af79..a82f8b2a7a 100644 --- a/src/system/kernel/device_manager/devfs.cpp +++ b/src/system/kernel/device_manager/devfs.cpp @@ -1472,7 +1472,7 @@ devfs_rewind_dir(fs_volume *_volume, fs_vnode *_vnode, void *_cookie) specific functionality, like partitions. */ static status_t -devfs_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, ulong op, +devfs_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, uint32 op, void *buffer, size_t length) { struct devfs_vnode *vnode = (struct devfs_vnode *)_vnode->private_node; diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp index 10359e71e0..d3ce9255b7 100644 --- a/src/system/kernel/fs/fd.cpp +++ b/src/system/kernel/fs/fd.cpp @@ -506,7 +506,7 @@ dup_foreign_fd(team_id fromTeam, int fd, bool kernel) static status_t -fd_ioctl(bool kernelFD, int fd, ulong op, void* buffer, size_t length) +fd_ioctl(bool kernelFD, int fd, uint32 op, void* buffer, size_t length) { struct file_descriptor* descriptor; int status; @@ -842,7 +842,7 @@ common_user_vector_io(int fd, off_t pos, const iovec* userVecs, size_t count, status_t -user_fd_kernel_ioctl(int fd, ulong op, void* buffer, size_t length) +user_fd_kernel_ioctl(int fd, uint32 op, void* buffer, size_t length) { TRACE(("user_fd_kernel_ioctl: fd %d\n", fd)); @@ -905,7 +905,7 @@ _user_seek(int fd, off_t pos, int seekType) status_t -_user_ioctl(int fd, ulong op, void* buffer, size_t length) +_user_ioctl(int fd, uint32 op, void* buffer, size_t length) { if (!IS_USER_ADDRESS(buffer)) return B_BAD_ADDRESS; @@ -1228,7 +1228,7 @@ _kern_seek(int fd, off_t pos, int seekType) status_t -_kern_ioctl(int fd, ulong op, void* buffer, size_t length) +_kern_ioctl(int fd, uint32 op, void* buffer, size_t length) { TRACE(("kern_ioctl: fd %d\n", fd)); diff --git a/src/system/kernel/fs/fifo.cpp b/src/system/kernel/fs/fifo.cpp index daa181e661..a81856b5ea 100644 --- a/src/system/kernel/fs/fifo.cpp +++ b/src/system/kernel/fs/fifo.cpp @@ -891,7 +891,7 @@ fifo_write_stat(fs_volume *volume, fs_vnode *vnode, const struct ::stat *st, static status_t -fifo_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, ulong op, +fifo_ioctl(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, uint32 op, void *buffer, size_t length) { TRACE(("fifo_ioctl: vnode %p, cookie %p, op %ld, buf %p, len %ld\n", diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp index 21934cc831..046e4dbe14 100644 --- a/src/system/kernel/fs/rootfs.cpp +++ b/src/system/kernel/fs/rootfs.cpp @@ -805,7 +805,7 @@ rootfs_rewind_dir(fs_volume* _volume, fs_vnode* _vnode, void* _cookie) static status_t -rootfs_ioctl(fs_volume* _volume, fs_vnode* _v, void* _cookie, ulong op, +rootfs_ioctl(fs_volume* _volume, fs_vnode* _v, void* _cookie, uint32 op, void* buffer, size_t length) { TRACE(("rootfs_ioctl: vnode %p, cookie %p, op %d, buf %p, length %d\n", diff --git a/src/system/kernel/fs/socket.cpp b/src/system/kernel/fs/socket.cpp index f8b53b50c1..b2532db879 100644 --- a/src/system/kernel/fs/socket.cpp +++ b/src/system/kernel/fs/socket.cpp @@ -243,7 +243,7 @@ socket_write(struct file_descriptor *descriptor, off_t pos, const void *buffer, static status_t -socket_ioctl(struct file_descriptor *descriptor, ulong op, void *buffer, +socket_ioctl(struct file_descriptor *descriptor, uint32 op, void *buffer, size_t length) { return sStackInterface->ioctl(descriptor->u.socket, op, buffer, length); diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 28ece4c231..b0f373ae30 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -320,7 +320,7 @@ static status_t query_rewind(struct file_descriptor* descriptor); static void query_free_fd(struct file_descriptor* descriptor); static status_t query_close(struct file_descriptor* descriptor); -static status_t common_ioctl(struct file_descriptor* descriptor, ulong op, +static status_t common_ioctl(struct file_descriptor* descriptor, uint32 op, void* buffer, size_t length); static status_t common_read_stat(struct file_descriptor* descriptor, struct stat* statData); @@ -5827,7 +5827,7 @@ dir_remove(int fd, char* path, bool kernel) static status_t -common_ioctl(struct file_descriptor* descriptor, ulong op, void* buffer, +common_ioctl(struct file_descriptor* descriptor, uint32 op, void* buffer, size_t length) { struct vnode* vnode = descriptor->u.vnode;