From 9edfb372ab4dd1838c110c5c241e65667dbe9f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 4 Sep 2004 17:12:27 +0000 Subject: [PATCH] Renamed the readv/writev hook functions to read_pages/write_pages to make clear that they work differently from before (or soon will). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8841 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/Drivers.h | 28 ++++++++++++++-------------- headers/os/drivers/pnp_devfs.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/headers/os/drivers/Drivers.h b/headers/os/drivers/Drivers.h index b0836fdb5a..0d55a14ce5 100644 --- a/headers/os/drivers/Drivers.h +++ b/headers/os/drivers/Drivers.h @@ -30,10 +30,10 @@ typedef status_t (*device_select_hook) (void *cookie, uint8 event, uint32 ref, selectsync *sync); typedef status_t (*device_deselect_hook) (void *cookie, uint8 event, selectsync *sync); -typedef status_t (*device_readv_hook) (void *cookie, off_t position, const iovec *vec, - size_t count, size_t *numBytes); -typedef status_t (*device_writev_hook) (void *cookie, off_t position, const iovec *vec, - size_t count, size_t *numBytes); +typedef status_t (*device_read_pages_hook)(void *deviceCookie, off_t position, const iovec *vec, + size_t count, size_t *_numBytes); +typedef status_t (*device_write_pages_hook) (void *deviceCookie, off_t position, const iovec *vec, + size_t count, size_t *_numBytes); #define B_CUR_DRIVER_API_VERSION 2 @@ -43,16 +43,16 @@ typedef status_t (*device_writev_hook) (void *cookie, off_t position, const iove --- */ typedef struct { - device_open_hook open; /* called to open the device */ - device_close_hook close; /* called to close the device */ - device_free_hook free; /* called to free the cookie */ - device_control_hook control; /* called to control the device */ - device_read_hook read; /* reads from the device */ - device_write_hook write; /* writes to the device */ - device_select_hook select; /* start select */ - device_deselect_hook deselect; /* stop select */ - device_readv_hook readv; /* scatter-gather read from the device */ - device_writev_hook writev; /* scatter-gather write to the device */ + device_open_hook open; /* called to open the device */ + device_close_hook close; /* called to close the device */ + device_free_hook free; /* called to free the cookie */ + device_control_hook control; /* called to control the device */ + device_read_hook read; /* reads from the device */ + device_write_hook write; /* writes to the device */ + device_select_hook select; /* start select */ + device_deselect_hook deselect; /* stop select */ + device_read_pages_hook read_pages; /* scatter-gather physical read from the device */ + device_write_pages_hook write_pages; /* scatter-gather physical write to the device */ } device_hooks; status_t init_hardware(void); diff --git a/headers/os/drivers/pnp_devfs.h b/headers/os/drivers/pnp_devfs.h index bbd830bbdf..ef08600328 100644 --- a/headers/os/drivers/pnp_devfs.h +++ b/headers/os/drivers/pnp_devfs.h @@ -40,8 +40,8 @@ typedef struct pnp_devfs_driver_info { device_write_hook write; // writes to the device device_select_hook select; // start select (can be NULL) device_deselect_hook deselect; // stop select (can be NULL) - device_readv_hook readv; // scatter-gather read from the device (can be NULL) - device_writev_hook writev; // scatter-gather write to the device (can be NULL) + device_read_pages_hook read_pages; // scatter-gather read from the device (can be NULL) + device_write_pages_hook write_pages; // scatter-gather write to the device (can be NULL) } pnp_devfs_driver_info;