Renamed device prefix from 'io_' to 'dev_'

2 files changed, 5 insertions, 8 deletions

diff --git a/libs/libgui/gfx.c b/libs/libgui/gfx.c
index bae98a0..f16b8dd 100644
--- a/libs/libgui/gfx.c
+++ b/libs/libgui/gfx.c
@@ -242,14 +242,11 @@ void gfx_draw_image_filter(struct gfx_context *ctx, vec2 pos, vec2 size, enum gf
 	// Scaling clones!
 	bmp = gfx_scale(bmp, size);
 
-	assert(bmp->size.x + pos.x <= ctx->size.x);
-	assert(bmp->size.y + pos.y <= ctx->size.y);
-
 	u8 bypp = bmp->bpp >> 3;
 	u8 *srcfb = bmp->fb;
 	u8 *destfb = &ctx->fb[pos.x * bypp + pos.y * ctx->pitch];
 	for (u32 cy = 0; cy < bmp->size.y && cy + pos.y < ctx->size.y; cy++) {
-		int diff = 0;
+		u32 diff = 0;
 		for (u32 cx = 0; cx < bmp->size.x && cx + pos.x < ctx->size.x; cx++) {
 			if (srcfb[bypp - 1]) {
 				if (filter == GFX_FILTER_NONE) {
diff --git a/libs/libgui/msg.c b/libs/libgui/msg.c
index eda4c34..a8da87c 100644
--- a/libs/libgui/msg.c
+++ b/libs/libgui/msg.c
@@ -10,14 +10,14 @@
 
 res msg_connect_bus(const char *bus, u32 *conn)
 {
-	res ret = io_control(IO_BUS, IOCTL_BUS_CONNECT_BUS, bus, conn);
+	res ret = dev_control(DEV_BUS, DEVCTL_BUS_CONNECT_BUS, bus, conn);
 	/* assert(ret == EOK && *conn); */
 	return ret;
 }
 
 res msg_connect_conn(u32 conn)
 {
-	res ret = io_control(IO_BUS, IOCTL_BUS_CONNECT_CONN, conn);
+	res ret = dev_control(DEV_BUS, DEVCTL_BUS_CONNECT_CONN, conn);
 	/* assert(ret == EOK); */
 	return ret;
 }
@@ -28,14 +28,14 @@ res msg_send(enum message_type type, void *data, u32 size)
 	struct message_header *header = data;
 	header->magic = MSG_MAGIC;
 	header->type = type;
-	res ret = io_write(IO_BUS, (u8 *)data + sizeof(struct bus_header), 0, size);
+	res ret = dev_write(DEV_BUS, (u8 *)data + sizeof(struct bus_header), 0, size);
 	/* assert(ret >= EOK); */
 	return ret;
 }
 
 res msg_receive(void *buf, u32 size)
 {
-	res ret = io_read(IO_BUS, buf, 0, size);
+	res ret = dev_read(DEV_BUS, buf, 0, size);
 	struct message_header *header = buf;
 	if (header->magic == MSG_MAGIC)
 		return ret;