 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.39 2009/01/12 07:42:30 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.40 2009/10/17 11:18:17 mlelstv Exp $
 .include <bsd.sys.mk>		# for HOST_SH
 ### what we need:
 #XX# lines replace similar lines, or are added, in case we want to
 #XX# compile LIBZ ourselves to save a few bytes (think TXLT)
 #XX#DIR_LIBZ =	${DIR_TOP}/../common/dist/zlib
 DIR_TOP=	${.CURDIR}/../../../../..
 DIR_SA = 	${DIR_TOP}/lib/libsa
 DIR_LIBZ=
 @@ -41,26 +41,27 @@ COBJS = main.o console.o xd.o twiddle.o
 COBJS+=  lseek.o open.o read.o close.o dev.o errno.o
 COBJS+=  ufs.o ustarfs.o panic.o vers.o files.o
 COBJS+=  divdi3.o moddi3.o qdivrem.o
 SOBJS = alloc.o ashrdi3.o ashldi3.o bcopy.o muldi3.o printf.o startit.o
 SOBJS += strlen.o memcmp.o memset.o strerror.o strncmp.o
 SOBJS += libstubs.o
 OBJS=	$(SOBJS) $(COBJS)
 #XX#DEFS = -D_STANDALONE -DINSECURE -DDYNAMIC_CRC_TABLE -DNOBYFOUR -UBYFOUR
 DEFS = -D_STANDALONE -DINSECURE
 DEFS += -D__INTERNAL_LIBSA_CREAD
 #DEFS += -DSERCONSOLE
 SOBJS += cread.o
 #XX#SOBJS += adler32.o crc32.o inflate.o trees.o \
 #XX#       zutil.o infback.o inftrees.o inffast.o
 #DEFS += -DBOOT_ELF32 -DBOOT_AOUT
 SOBJS += loadfile.o loadfile_aout.o loadfile_elf32.o
 NETBSD_VERS!=	${HOST_SH} ${.CURDIR}/../../../../../conf/osrelease.sh
 DEFS+=	-DNETBSD_VERS='"${NETBSD_VERS}"'
 ### main target: ###

 @@ -1,14 +1,14 @@
-/* $NetBSD: console.c,v 1.12 2009/10/11 10:00:10 mlelstv Exp $ */
+/* $NetBSD: console.c,v 1.13 2009/10/17 11:18:18 mlelstv Exp $ */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ignatios Souvatzis.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -105,26 +105,30 @@ consinit(void *consptr) {
 		goto err;
 	mc->cnior->buf = (void *)mc->w;
 	if (OpenDevice("console.device", 0, mc->cnior, 0))
 		goto err;
 	mc->tmior = (struct TimerIO *)CreateIORequest(mc->cnmp, sizeof(struct TimerIO));
 	if (!mc->tmior)
 		goto err;
 	if (OpenDevice("timer.device", 0, (struct AmigaIO*)mc->tmior, 0))
 		goto err;
 #ifdef SERCONSOLE
 	RawIOInit();
 #endif
 	ConsoleBase = mc;
 	return 0;
 err:
 #ifdef notyet
 	if (mc->tmior)
 		DeleteIORequest(mc->tmior);
 	if (mc->cnior)
 		DeleteIORequest(mc->cnior);
 	if (mc->cnmp)
 		DeleteMsgPort(mc->cnmp);
 @@ -173,59 +177,89 @@ consclose(void)
 	return 0;
+}
 #endif
 void
 putchar(int c)
+{
 	struct Console *mc = ConsoleBase;
 	char buf = c;
 	mc->cnior->length = 1;
 	mc->cnior->buf = &buf;
 	mc->cnior->cmd = Cmd_Wr;
 #ifdef SERCONSOLE
 	RawPutChar((int32_t)c);
 #endif
 	(void)DoIO(mc->cnior);
+}
 void
 puts(char *s)
+{
 	struct Console *mc = ConsoleBase;
 	mc->cnior->length = -1;
 	mc->cnior->buf = s;
 	mc->cnior->cmd = Cmd_Wr;
 #ifdef SERCONSOLE
 	while (*s)
 		RawPutChar(*s++);
 #endif
 	(void)DoIO(mc->cnior);
+}
 int
 getchar(void)
+{
 	struct AmigaIO *ior;
-	char c = -1;
+	char c = '\n';
 	struct Console *mc = ConsoleBase;
 	unsigned long ticks;
 #ifdef SERCONSOLE
 	int32_t r;
 #endif
 	mc->cnior->length = 1;
 	mc->cnior->buf = &c;
 	mc->cnior->cmd = Cmd_Rd;
 	SendIO(mc->cnior);
-	if (timelimit) {
+	ticks = 10 * timelimit;
 	do {
 		if (timelimit == 0)
 			ticks = 2;
 		mc->tmior->cmd = Cmd_Addtimereq;
-		mc->tmior->secs = timelimit;
+		mc->tmior->secs = 0;
-		mc->tmior->usec = 2; /* Paranoid */
+		mc->tmior->usec = 100000;
 		SendIO((struct AmigaIO *)mc->tmior);
 		ior = WaitPort(mc->cnmp);
-		if (ior == mc->cnior)
+		if (ior == mc->cnior) {
 			AbortIO((struct AmigaIO *)mc->tmior);
-		else /* if (ior == mc->tmior) */ {
+			ticks = 1;
-			AbortIO(mc->cnior);
+		} else /* if (ior == mc->tmior) */ {
-			c = '\n';
+#ifdef SERCONSOLE
 			r = RawMayGetChar();
 			if (r != -1) {
 				c = r;
 				ticks = 1;
+			}
 #endif
 			if (ticks == 1)
 				AbortIO((struct AmigaIO *)mc->cnior);
+		}
 		WaitIO((struct AmigaIO *)mc->tmior);
 		timelimit = 0;
 		--ticks;
 	} while (ticks != 0);
 	timelimit = 0;
 	(void)WaitIO(mc->cnior);
 	return c;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: libstubs.h,v 1.6 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: libstubs.h,v 1.7 2009/10/17 11:18:18 mlelstv Exp $ */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ignatios Souvatzis.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -45,26 +45,30 @@ struct Library *OpenLibrary (const char
 void CloseLibrary (struct Library *);
 struct MsgPort *CreateMsgPort(void);
 void *CreateIORequest(struct MsgPort *, u_int32_t);
 void DeleteIORequest(void *);
 void DeleteMsgPort(struct MsgPort *);
 u_int8_t DoIO(struct AmigaIO *);
 void SendIO(struct AmigaIO *);
 struct AmigaIO *CheckIO(struct AmigaIO *);
 void *WaitPort(struct MsgPort *);
 void AbortIO(struct AmigaIO *);
 u_int8_t WaitIO(struct AmigaIO *);
 void RawIOInit(void);
 int32_t RawPutChar(int32_t c);
 int32_t RawMayGetChar(void);
 int OpenDevice(const char *, u_int32_t, struct AmigaIO *, u_int32_t);
 #ifdef _PRIMARY_BOOT
 void CloseDevice(struct AmigaIO *);
 #endif
 void *FindResident(const char *);
 void *OpenResource(const char *);
 u_int32_t CachePreDMA(u_int32_t, u_int32_t *, int);
 #define DMAF_Continue		2
 #define DMAF_NoModify		4
 #define DMAF_ReadFromRAM	8

 @@ -1,14 +1,14 @@
-/* $NetBSD: libstubs.s,v 1.9 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: libstubs.s,v 1.10 2009/10/17 11:18:18 mlelstv Exp $ */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ignatios Souvatzis.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -151,26 +151,46 @@ ENTRY_NOPROFILE(AbortIO)
 	jsr	%a6@(-0x1e0)
 	movl	%sp@+,%a6
 	rts
 ENTRY_NOPROFILE(WaitPort)
 	movl	%a6,%sp@-
 	movl	%pc@(_C_LABEL(SysBase):w),%a6
 	movl	%sp@(8),%a0
 	jsr	%a6@(-0x180)
 	movl	%sp@+,%a6
 	movl	%d0,%a0			| Comply with ELF ABI
 	rts
 ENTRY_NOPROFILE(RawIOInit)
 	movl	%a6,%sp@-
 	movl	%pc@(_C_LABEL(SysBase):w),%a6
 	jsr	%a6@(-0x1f8)
 	movl	%sp@+,%a6
 	rts
 ENTRY_NOPROFILE(RawPutChar)
 	movl	%a6,%sp@-
 	movl	%pc@(_C_LABEL(SysBase):w),%a6
 	movl	%sp@(8),%d0
 	jsr	%a6@(-0x204)
 	movl	%sp@+,%a6
 	rts
 ENTRY_NOPROFILE(RawMayGetChar)
 	movl	%a6,%sp@-
 	movl	%pc@(_C_LABEL(SysBase):w),%a6
 	jsr	%a6@(-0x1fe)
 	movl	%sp@+,%a6
 	rts
 #ifndef DOINLINES
 ENTRY_NOPROFILE(CacheClearU)
 	movl	%a6,%sp@-
 	movl	%pc@(_C_LABEL(SysBase):w),%a6
 	jsr	%a6@(-0x27c)
 	movl	%sp@+,%a6
 	rts
 #endif
 ENTRY_NOPROFILE(CachePreDMA)
 	movl	%a6,%sp@-
 	movl	%pc@(_C_LABEL(SysBase):w),%a6
 	movl	%sp@(8),%a0
 	movl	%sp@(12),%a1