Index: uspace/lib/libc/arch/sparc64/src/thread_entry.s
===================================================================
--- uspace/lib/libc/arch/sparc64/src/thread_entry.s	(revision eeb643ddb3783861fb3ee6f341c31c048865cfe1)
+++ uspace/lib/libc/arch/sparc64/src/thread_entry.s	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
@@ -38,7 +38,9 @@
 	# Create the first stack frame.
 	#
-	save %sp, -176, %sp
-	flushw
-	add %g0, -0x7ff, %fp
+
+	# MH
+	#save %sp, -176, %sp
+	#flushw
+	#add %g0, -0x7ff, %fp
 
 	sethi %hi(_gp), %l7
Index: uspace/lib/libc/generic/thread.c
===================================================================
--- uspace/lib/libc/generic/thread.c	(revision eeb643ddb3783861fb3ee6f341c31c048865cfe1)
+++ uspace/lib/libc/generic/thread.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
@@ -41,4 +41,5 @@
 #include <string.h>
 #include <async.h>
+#include <stdio.h>
 
 #ifndef THREAD_INITIAL_STACK_PAGES_NO
@@ -62,4 +63,6 @@
 	__tcb_set(f->tcb);
 
+	// MH
+	printf("uarg: %lx\n", uarg);
 	uarg->uspace_thread_function(uarg->uspace_thread_arg);
 	/* XXX: we cannot free the userspace stack while running on it */
Index: uspace/srv/hid/kbd/port/niagara.c
===================================================================
--- uspace/srv/hid/kbd/port/niagara.c	(revision eeb643ddb3783861fb3ee6f341c31c048865cfe1)
+++ uspace/srv/hid/kbd/port/niagara.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
@@ -47,6 +47,28 @@
 #define POLL_INTERVAL		10000
 
+/**
+ * Virtual address mapped to the buffer shared with the kernel counterpart.
+ */
+static uintptr_t input_buffer_addr;
+
+/*
+ * Kernel counterpart of the driver pushes characters (it has read) here.
+ * Keep in sync with the definition from
+ * kernel/arch/sparc64/src/drivers/niagara.c.
+ */
+#define INPUT_BUFFER_SIZE	((PAGE_SIZE) - 2 * 8)
+typedef volatile struct {
+	uint64_t write_ptr;
+	uint64_t read_ptr;
+	char data[INPUT_BUFFER_SIZE];
+}
+	__attribute__ ((packed))
+	__attribute__ ((aligned(PAGE_SIZE)))
+	*input_buffer_t;
+
+input_buffer_t input_buffer;
+
 static volatile bool polling_disabled = false;
-//static void *niagara_thread_impl(void *arg);
+static void *niagara_thread_impl(void *arg);
 
 /**
@@ -56,6 +78,17 @@
 int kbd_port_init(void)
 {
-	printf("****************** Niagara keyboard driver **********************\n");
-	/*
+	input_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE);
+	int result = physmem_map(
+		(void *) sysinfo_value("niagara.inbuf.address"),
+		(void *) input_buffer_addr,
+		1, AS_AREA_READ | AS_AREA_WRITE);
+
+	if (result != 0) {
+		printf("Niagara: uspace driver couldn't map physical memory: %d\n",
+			result);
+	}
+
+	input_buffer = (input_buffer_t) input_buffer_addr;
+
 	thread_id_t tid;
 	int rc;
@@ -65,5 +98,4 @@
 		return rc;
 	}
-	*/
 	return 0;
 }
@@ -90,25 +122,12 @@
 static void niagara_key_pressed(void)
 {
-	printf("%s\n", "polling");
-/*
 	char c;
 	
-	uint32_t begin = SGCN_BUFFER_HEADER->in_begin;
-	uint32_t end = SGCN_BUFFER_HEADER->in_end;
-	uint32_t size = end - begin;
-	
-	volatile char *buf_ptr = (volatile char *)
-		SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
-	volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr);
-	volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr);
-	
-	while (*in_rdptr_ptr != *in_wrptr_ptr) {
-		c = *buf_ptr;
-		*in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin;
-		buf_ptr = (volatile char *)
-			SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+	while (input_buffer->read_ptr != input_buffer->write_ptr) {
+		c = input_buffer->data[input_buffer->read_ptr];
+		input_buffer->read_ptr =
+			((input_buffer->read_ptr) + 1) % INPUT_BUFFER_SIZE;
 		kbd_push_scancode(c);
 	}
-*/
 }
 
@@ -116,5 +135,4 @@
  * Thread to poll SGCN for keypresses.
  */
-/*
 static void *niagara_thread_impl(void *arg)
 {
@@ -128,5 +146,4 @@
 	return 0;
 }
-*/
 /** @}
  */