final update from Akito Fujita

SCCS-vsn: sys/luna68k/include/vmparam.h 8.2
SCCS-vsn: sys/luna68k/luna68k/clock.c 8.2

diff --git a/usr/src/sys/luna68k/include/vmparam.h b/usr/src/sys/luna68k/include/vmparam.h
index a80b03c..a4588f6 100644 (file)
--- a/usr/src/sys/luna68k/include/vmparam.h
+++ b/usr/src/sys/luna68k/include/vmparam.h
@@ -11,9 +11,9 @@
  * %sccs.include.redist.c%
  *
  * from: Utah $Hdr: vmparam.h 1.16 91/01/18$
  * %sccs.include.redist.c%
  *
  * from: Utah $Hdr: vmparam.h 1.16 91/01/18$

- * from: hp300/include/vmparam.h       7.4 (Berkeley) 6/5/92
+ * from: hp300/include/vmparam.h       8.1 (Berkeley) 6/10/93

  *
  *

- *     @(#)vmparam.h   8.1 (Berkeley) %G%
+ *     @(#)vmparam.h   8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -50,13 +50,13 @@
  * Virtual memory related constants, all in bytes
  */
 #ifndef MAXTSIZ
  * Virtual memory related constants, all in bytes
  */
 #ifndef MAXTSIZ

-#define        MAXTSIZ         (6*1024*1024)           /* max text size */
+#define        MAXTSIZ         (8*1024*1024)           /* max text size */

 #endif
 #ifndef DFLDSIZ
 #endif
 #ifndef DFLDSIZ

-#define        DFLDSIZ         (8*1024*1024)           /* initial data size limit */
+#define        DFLDSIZ         (16*1024*1024)          /* initial data size limit */

 #endif
 #ifndef MAXDSIZ
 #endif
 #ifndef MAXDSIZ

-#define        MAXDSIZ         (16*1024*1024)          /* max data size */
+#define        MAXDSIZ         (64*1024*1024)          /* max data size */

 #endif
 #ifndef        DFLSSIZ
 #define        DFLSSIZ         (512*1024)              /* initial stack size limit */
 #endif
 #ifndef        DFLSSIZ
 #define        DFLSSIZ         (512*1024)              /* initial stack size limit */

diff --git a/usr/src/sys/luna68k/luna68k/clock.c b/usr/src/sys/luna68k/luna68k/clock.c
index 051b781..fa7e3b3 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/clock.c
+++ b/usr/src/sys/luna68k/luna68k/clock.c
@@ -13,7 +13,7 @@
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
  * from: hp300/hp300/clock.c   7.19 (Berkeley) 2/18/93
  *
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
  * from: hp300/hp300/clock.c   7.19 (Berkeley) 2/18/93
  *

- *     @(#)clock.c     8.1 (Berkeley) %G%
+ *     @(#)clock.c     8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -152,12 +152,14 @@ resettodr()
        /* set bb-clock */
 #ifdef LUNA2
        if (machineid == LUNA_II) {
        /* set bb-clock */
 #ifdef LUNA2
        if (machineid == LUNA_II) {

+               bbc2->cal_ctl_b |= BBC2_B_SET;

                bbc2->cal_sec = tmptr->tm_sec;
                bbc2->cal_min = tmptr->tm_min;
                bbc2->cal_hour =tmptr->tm_hour;
                bbc2->cal_day = tmptr->tm_mday;
                bbc2->cal_mon = tmptr->tm_mon;
                bbc2->cal_year = tmptr->tm_year;
                bbc2->cal_sec = tmptr->tm_sec;
                bbc2->cal_min = tmptr->tm_min;
                bbc2->cal_hour =tmptr->tm_hour;
                bbc2->cal_day = tmptr->tm_mday;
                bbc2->cal_mon = tmptr->tm_mon;
                bbc2->cal_year = tmptr->tm_year;

+               bbc2->cal_ctl_b &= ~BBC2_B_SET;

        } else 
 #endif
        {
        } else 
 #endif
        {


@@ -224,12 +226,15 @@ bbc_to_gmt(timbuf)
        /* read bb-clock */
 #ifdef LUNA2
        if (machineid == LUNA_II) {
        /* read bb-clock */
 #ifdef LUNA2
        if (machineid == LUNA_II) {

+               while (bbc2->cal_ctl_a & BBC2_A_UIP) {} /* wait (max 224 us) */
+               bbc2->cal_ctl_b |= BBC2_B_SET;

                sec = bbc2->cal_sec;
                min = bbc2->cal_min;
                hour = bbc2->cal_hour;
                day = bbc2->cal_day;
                month = bbc2->cal_mon;
                year = bbc2->cal_year + 1900;
                sec = bbc2->cal_sec;
                min = bbc2->cal_min;
                hour = bbc2->cal_hour;
                day = bbc2->cal_day;
                month = bbc2->cal_mon;
                year = bbc2->cal_year + 1900;

+               bbc2->cal_ctl_b &= ~BBC2_B_SET;

        } else
 #endif
        {
        } else
 #endif
        {


@@ -248,13 +253,10 @@ bbc_to_gmt(timbuf)
        range_test(hour, 0, 23);
        range_test(day, 1, 31);
        range_test(month, 1, 12);
        range_test(hour, 0, 23);
        range_test(day, 1, 31);
        range_test(month, 1, 12);

-#if 1  /* limitted 2000 now ... */
-       range_test(year, STARTOFTIME, 2000);
-#else
+

        if (year < 1970) {
                year += 100;
        }
        if (year < 1970) {
                year += 100;
        }

-#endif

        
        tmp = 0;
        
        
        tmp = 0;