fixesHEADhelloworldmaster

7 files changed, 19 insertions, 18 deletions

diff --git a/src/drv/ps1/cd/private_include/drv/ps1/cd/routines.h b/src/drv/ps1/cd/private_include/drv/ps1/cd/routines.h
index 0b756de..9870445 100644
--- a/src/drv/ps1/cd/private_include/drv/ps1/cd/routines.h
+++ b/src/drv/ps1/cd/private_include/drv/ps1/cd/routines.h
@@ -27,10 +27,10 @@
 
 int drv_ps1_cd_send(const struct cmd *cmd);
 int drv_ps1_cd_getstat(void);
-int drv_ps1_cd_read(void *buf, size_t n, off_t offset,
-    const struct drv_event_done *done, void *args);
-int drv_ps1_cd_write(const void *buf, size_t n,
-    const struct drv_event_done *done, void *args);
+int drv_ps1_cd_read(struct drv_port *p, void *buf, size_t n, off_t offset,
+    const struct drv_event_done *done);
+int drv_ps1_cd_write(struct drv_port *p, const void *buf, size_t n,
+    const struct drv_event_done *done);
 int drv_ps1_cd_next(void);
 struct CdAsyncSeekL drv_ps1_cd_toseekl(unsigned i);
 
diff --git a/src/drv/ps1/cd/src/read.c b/src/drv/ps1/cd/src/read.c
index d21cbae..f8db3a0 100644
--- a/src/drv/ps1/cd/src/read.c
+++ b/src/drv/ps1/cd/src/read.c
@@ -208,8 +208,8 @@ static int start(void)
     return cached_read(p);
 }
 
-int drv_ps1_cd_read(void *const buf, const size_t n, const off_t offset,
-    const struct drv_event_done *const done, void *const args)
+int drv_ps1_cd_read(struct drv_port *const pt, void *const buf, const size_t n,
+    const off_t offset, const struct drv_event_done *const done)
 {
     struct cd_prv *const p = &drv_ps1_cd_prv;
     struct cd_req *const r = malloc(sizeof *r);
diff --git a/src/drv/ps1/cd/src/write.c b/src/drv/ps1/cd/src/write.c
index ba47993..a314862 100644
--- a/src/drv/ps1/cd/src/write.c
+++ b/src/drv/ps1/cd/src/write.c
@@ -22,8 +22,8 @@
 #include <drv/event.h>
 #include <errno.h>
 
-int drv_ps1_cd_write(const void *const buf, const size_t n,
-    const struct drv_event_done *const done, void *const args)
+int drv_ps1_cd_write(struct drv_port *const p, const void *const buf,
+    const size_t n, const struct drv_event_done *const done)
 {
     /* TODO: write event callback returning EROFS */
     errno = EROFS;
diff --git a/src/drv/ps1/sio/private_include/drv/ps1/sio/ops.h b/src/drv/ps1/sio/private_include/drv/ps1/sio/ops.h
index a481fa9..a7e19dd 100644
--- a/src/drv/ps1/sio/private_include/drv/ps1/sio/ops.h
+++ b/src/drv/ps1/sio/private_include/drv/ps1/sio/ops.h
@@ -22,10 +22,10 @@
 #include <drv/event.h>
 #include <sys/types.h>
 
-int drv_ps1_sio_read(void *buf, size_t n, off_t offset,
-    const struct drv_event_done *done, void *args);
-int drv_ps1_sio_read_nb(void *buf, size_t n, void *args);
-int drv_ps1_sio_write(const void *buf, size_t n,
-    const struct drv_event_done *done, void *args);
+int drv_ps1_sio_read(struct drv_port *p, void *buf, size_t n, off_t offset,
+    const struct drv_event_done *done);
+int drv_ps1_sio_read_nb(struct drv_port *p, void *buf, size_t n);
+int drv_ps1_sio_write(struct drv_port *p, const void *buf, size_t n,
+    const struct drv_event_done *done);
 
 #endif
diff --git a/src/drv/ps1/sio/src/read.c b/src/drv/ps1/sio/src/read.c
index e13ad29..63bd29f 100644
--- a/src/drv/ps1/sio/src/read.c
+++ b/src/drv/ps1/sio/src/read.c
@@ -94,8 +94,8 @@ static int load(void)
     return 0;
 }
 
-int drv_ps1_sio_read(void *const buf, const size_t n, const off_t offset,
-    const struct drv_event_done *const done, void *const args)
+int drv_ps1_sio_read(struct drv_port *const p, void *const buf, const size_t n,
+    const off_t offset, const struct drv_event_done *const done)
 {
     struct drv_ps1_sio *const s = &drv_ps1_sio;
     struct sio_fifo *const f = &s->rx;
diff --git a/src/drv/ps1/sio/src/read_nb.c b/src/drv/ps1/sio/src/read_nb.c
index 755c5cf..9b9c3bf 100644
--- a/src/drv/ps1/sio/src/read_nb.c
+++ b/src/drv/ps1/sio/src/read_nb.c
@@ -55,7 +55,8 @@ static int read_fifo(char *buf, size_t n)
     return ret;
 }
 
-int drv_ps1_sio_read_nb(void *const buf, const size_t n, void *const args)
+int drv_ps1_sio_read_nb(struct drv_port *const p, void *const buf,
+    const size_t n)
 {
     return read_fifo(buf, n);
 }
diff --git a/src/drv/ps1/sio/src/write.c b/src/drv/ps1/sio/src/write.c
index 942456f..4f5a702 100644
--- a/src/drv/ps1/sio/src/write.c
+++ b/src/drv/ps1/sio/src/write.c
@@ -86,8 +86,8 @@ static int store(void)
     return 0;
 }
 
-int drv_ps1_sio_write(const void *const buf, const size_t n,
-    const struct drv_event_done *const done, void *const args)
+int drv_ps1_sio_write(struct drv_port *const p, const void *const buf,
+    const size_t n, const struct drv_event_done *const done)
 {
     struct drv_ps1_sio *const s = &drv_ps1_sio;
     struct sio_fifo *const f = &s->tx;