need help with merging in 1.12

[hohmuth@inf.tu-dresden.de (Michael Hohmuth)]

Hi,

I'm currently in the process of merging MiNT 1.12 into the main trunk
of my MiNT repository, and I could need some help.

Could someone review the differences below (after my .signature)?  I
don't understand them and don't know whether they should be included
in a merged version.

Thanks in advance!
Michael

------------------------------------------------------------------------------

nontrivial differences between 1.11h3 and my new merged version

(these are NOT patches, don't try to apply this to your mint source
code... :-)

diff -u mint/biosfs.c:1.27 mint/biosfs.c:1.28
--- mint/biosfs.c:1.27	Thu Nov 17 23:41:48 1994
+++ mint/biosfs.c	Thu Nov 17 23:41:49 1994
@@ -1734,8 +1734,7 @@
 	 */
 	if (buf && !ndelay) {
 		while (t ? (!(t->tty->state & TS_BLIND) &&
-			    (bdev == 3 ? ionread(ior) :
-					btty_ionread(t)) < (long)t->tty->vmin)
+			    btty_ionread(t) < (long)t->tty->vmin)
 			 : !(int)callout1(*cinstat, bdev)) {
 			if (t)
 				sleep(IO_Q, (long)t);
diff -u mint/dosmem.c:1.18 mint/dosmem.c:1.19
--- mint/dosmem.c:1.18	Thu Nov 17 23:41:52 1994
+++ mint/dosmem.c	Thu Nov 17 23:41:52 1994
@@ -806,6 +806,7 @@
 			tty->pgrp = 0;
 	}
 #else
+#if 0
 /* release the controlling terminal, if we're the last member of this pgroup */
 	fp = curproc->control;
 	if (fp && is_terminal(fp)) {
@@ -836,6 +837,7 @@
 found:
 		;
 	}
+#endif
 #endif
 	/* close all files */
 	for (i = MIN_HANDLE; i < MAX_OPEN; i++) {
diff -u mint/proc.c:1.21 mint/proc.c:1.22
--- mint/proc.c:1.21	Thu Nov 17 23:41:54 1994
+++ mint/proc.c	Thu Nov 17 23:41:54 1994
@@ -626,9 +629,9 @@
 #ifndef MULTITOS
 #ifdef FASTTEXT
 		if (!hardscroll)
-#endif
 			*((void **)0x44eL) = curproc->logbase;
 #endif
+#endif
 		do_wakeup_things(sr, 1);
 		return (onsigs != curproc->nsigs);
 	}
@@ -638,17 +foo,bar @@
 #ifndef MULTITOS
 #ifdef FASTTEXT
 	if (!hardscroll)
-#endif
 		curproc->logbase = *((void **)0x44eL);
 #endif
+#endif
+
 	curproc->ctxt[CURRENT].regs[0] = 1;
 	curproc = p;
 	proc_clock = TIME_SLICE;	/* fresh time */
diff -u mint/tty.c:1.20 mint/tty.c:1.21
--- mint/tty.c:1.20	Thu Nov 17 23:41:56 1994
+++ mint/tty.c	Thu Nov 17 23:41:56 1994
@@ -298,11 +299,11 @@
 					*ptr = ch;
 					put(f, '\n');
 					bytes_read++;
-				}
 				if (rdmode & COOKED)
 					tty->state |= TS_COOKED;
 				else
 					tty->state &= ~TS_COOKED;
+				}
 				return bytes_read;
 			}
 

-- 
Email: hohmuth@inf.tu-dresden.de
WWW:   http://www.inf.tu-dresden.de/~mh1/