From 4062fb2fcf938bb6a9c5d8f6404586cab11fe227 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 22 Aug 2002 19:10:52 +0000 Subject: 2002-08-22 Marcus Brinkmann * display.h: Add prototype for display_get_size. * display.c (display_get_size): New function. (nowait_file_changed): Update for new interfaces. * console.c (new_node): Use display_get_size to retrieve size of display node. (netfs_get_dirents): Initialize FIRST_VCONS to silence gcc warning. --- console/display.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'console/display.c') diff --git a/console/display.c b/console/display.c index 393034de..fb0a6b0f 100644 --- a/console/display.c +++ b/console/display.c @@ -304,9 +304,9 @@ nowait_file_changed (mach_port_t notify_port, natural_t tickno, mach_msg_type_t changeType; file_changed_type_t change; mach_msg_type_t startType; - off_t start; + loff_t start; mach_msg_type_t endType; - off_t end; + loff_t end; } Request; union { @@ -335,8 +335,8 @@ nowait_file_changed (mach_port_t notify_port, natural_t tickno, }; static const mach_msg_type_t startType = { - /* msgt_name = */ 2, - /* msgt_size = */ 32, + /* msgt_name = */ 11, + /* msgt_size = */ 64, /* msgt_number = */ 1, /* msgt_inline = */ TRUE, /* msgt_longform = */ FALSE, @@ -345,8 +345,8 @@ nowait_file_changed (mach_port_t notify_port, natural_t tickno, }; static const mach_msg_type_t endType = { - /* msgt_name = */ 2, - /* msgt_size = */ 32, + /* msgt_name = */ 11, + /* msgt_size = */ 64, /* msgt_number = */ 1, /* msgt_inline = */ TRUE, /* msgt_longform = */ FALSE, @@ -372,11 +372,11 @@ nowait_file_changed (mach_port_t notify_port, natural_t tickno, if (notify == MACH_PORT_NULL) return mach_msg (&InP->Head, MACH_SEND_MSG | MACH_MSG_OPTION_NONE, - 56, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, + 64, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); else return mach_msg (&InP->Head, MACH_SEND_MSG | MACH_SEND_NOTIFY, - 56, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, + 64, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, notify); } @@ -1752,6 +1752,16 @@ display_destroy_complete (void *pi) } +/* Return the dimension of the display in bytes. */ +off_t +display_get_size (display_t display) +{ + return sizeof (struct cons_display) + + (sizeof (conchar_t) * display->user->screen.width + * display->user->screen.lines); +} + + /* Return the dimensions of the display DISPLAY in *WINSIZE. */ void display_getsize (display_t display, struct winsize *winsize) -- cgit v1.2.3