small compile fixes; initial select() stubs; release.sh script doesn't

need /tmp any more since 16MB root device; increase to 3.0.5 to make new
CD with working FXP driver. (not tagged 3.0.5 yet as at driver bios-copy
workaround hasn't been done.)

diff --git a/commands/Makefile b/commands/Makefile
index ff4b6974b7789107deea3c29c5ae263f98760581..10ac054de0327ede71c82b953f711810812c444a 100755 (executable)
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -29,7 +29,7 @@ all install clean:
        cd ftpd && $(MAKE) $@
        cd ibm && $(MAKE) $@
        cd kermit && $(MAKE) $@
-       cd kermit_211 && $(MAKE) $@
+#      cd kermit_211 && $(MAKE) $@
        cd m4 && $(MAKE) $@
        cd make && $(MAKE) $@
        cd mined && $(MAKE) $@

diff --git a/commands/simple/uname.c b/commands/simple/uname.c
index d6ab16c8ef197a8b967e00f74a9a9ad635060b7e..24b37bab26bdab1ca5b11fd93cb3fe9117ce9516 100755 (executable)
--- a/commands/simple/uname.c
+++ b/commands/simple/uname.c
@@ -24,7 +24,7 @@
 #define NODENAME ((unsigned) 0x02)
 #define RELEASE  ((unsigned) 0x04)
 #define VERSION  ((unsigned) 0x08)
-#define MACHINE  ((unsigned) 0x10)
+#define U_MACHINE  ((unsigned) 0x10)
 #define ARCH     ((unsigned) 0x20)
 
 _PROTOTYPE(int main, (int argc, char **argv ));
@@ -75,7 +75,7 @@ char **argv;
                for (p = &argv[1][1]; *p; p++) {
                        switch (*p) {
                                case 'a': info |= ALL;      break;
-                               case 'm': info |= MACHINE;  break;
+                               case 'm': info |= U_MACHINE;  break;
                                case 'n': info |= NODENAME; break;
                                case 'r': info |= RELEASE;  break;
                                case 's': info |= SYSNAME;  break;
@@ -113,13 +113,13 @@ char **argv;
                print(STDOUT_FILENO, " ", (char *) NULL);
        print(STDOUT_FILENO, un.version, (char *) NULL);
   }
-  if ((info & MACHINE) != 0) {
+  if ((info & U_MACHINE) != 0) {
        if ((info & (SYSNAME|NODENAME|RELEASE|VERSION)) != 0)
                print(STDOUT_FILENO, " ", (char *) NULL);
        print(STDOUT_FILENO, un.machine, (char *) NULL);
   }
   if ((info & ARCH) != 0) {
-       if ((info & (SYSNAME|NODENAME|RELEASE|VERSION|MACHINE)) != 0)
+       if ((info & (SYSNAME|NODENAME|RELEASE|VERSION|U_MACHINE)) != 0)
                print(STDOUT_FILENO, " ", (char *) NULL);
        print(STDOUT_FILENO, un.arch, (char *) NULL);
   }

diff --git a/drivers/printer/printer.c b/drivers/printer/printer.c
index dd1523d4d8d57c3f18d2bb6c931ef9fc1ed67160..d9a44a848613a9dd04118d80e6942dee819f85d4 100644 (file)
--- a/drivers/printer/printer.c
+++ b/drivers/printer/printer.c
@@ -55,7 +55,7 @@
  */
 #define ASSERT_STROBE   0x1D   /* strobe a character to the interface */
 #define NEGATE_STROBE   0x1C   /* enable interrupt on interface */
-#define SELECT          0x0C   /* select printer bit */
+#define PR_SELECT          0x0C        /* select printer bit */
 #define INIT_PRINTER    0x08   /* init printer bits */
 
 /* Status bits (in port_base + 2).
@@ -285,7 +285,7 @@ PRIVATE void do_initialize()
   sys_outb(port_base + 2, INIT_PRINTER);
   tickdelay(1);                        /* easily satisfies Centronics minimum */
                                /* was 2 millisecs; now is ~17 millisecs */
-  sys_outb(port_base + 2, SELECT);
+  sys_outb(port_base + 2, PR_SELECT);
   sys_irqsetpolicy(PRINTER_IRQ, 0, &irq_hook_id);
   sys_irqenable(&irq_hook_id);
 
@@ -332,7 +332,7 @@ PRIVATE void do_printer_output()
         * when the printer is busy with a previous character, because the
         * interrupt status does not affect the printer.
         */
-       sys_outb(port_base + 2, SELECT);
+       sys_outb(port_base + 2, PR_SELECT);
        sys_irqenable(&irq_hook_id);
        return;
   }

diff --git a/include/minix/callnr.h b/include/minix/callnr.h
index 82f0f628e9cd43393103b45af5b4e25845f8c7b7..45249511d3afacd80e08c9d3bb9967937c90c71b 100755 (executable)
--- a/include/minix/callnr.h
+++ b/include/minix/callnr.h
@@ -1,4 +1,4 @@
-#define NCALLS           85    /* number of system calls allowed */
+#define NCALLS           86    /* number of system calls allowed */
 
 #define EXIT              1 
 #define FORK              2 
@@ -73,3 +73,4 @@
 #define FSTATFS                  82    /* to FS */
 #define ALLOCMEM         83    /* to PM */
 #define FREEMEM                  84    /* to PM */
+#define SELECT            85   /* to FS */

diff --git a/include/minix/config.h b/include/minix/config.h
index 51d81f7ed7ab4c41aa3d6535c83835fb11d7844b..df20c96a72d196d79b395a6e14cea3aeb9770a41 100755 (executable)
--- a/include/minix/config.h
+++ b/include/minix/config.h
@@ -3,7 +3,7 @@
 
 /* Minix release and version numbers. */
 #define OS_RELEASE "3"
-#define OS_VERSION "0.4"
+#define OS_VERSION "0.5"
 
 /* This file sets configuration parameters for the MINIX kernel, FS, and PM.
  * It is divided up into two main sections.  The first section contains

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index aa6558c08b511f530573763df7f0eddf4911d251..a3a64d4e2b81fa9940307bf3169463dec589d634 100644 (file)
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -19,6 +19,7 @@ typedef struct {short m5c1, m5c2; int m5i1, m5i2; long m5l1, m5l2, m5l3;}mess_5;
 typedef struct {int m6i1, m6i2, m6i3; long m6l1; char *m6c1;} mess_6;
 #endif
 typedef struct {int m7i1, m7i2, m7i3, m7i4; char *m7p1, *m7p2;} mess_7;
+typedef struct {int m8i1, m8i2; char *m8p1, *m8p2, *m8p3, *m8p4;} mess_8;
 
 typedef struct {
   int m_source;                        /* who sent the message */
@@ -33,6 +34,7 @@ typedef struct {
        mess_6 m_m6;
 #endif
        mess_7 m_m7;
+       mess_8 m_m8;
   } m_u;
 } message;
 
@@ -85,6 +87,13 @@ typedef struct {
 #define m7_p1  m_u.m_m7.m7p1
 #define m7_p2  m_u.m_m7.m7p2
 
+#define m8_i1  m_u.m_m8.m8i1
+#define m8_i2  m_u.m_m8.m8i2
+#define m8_p1  m_u.m_m8.m8p1
+#define m8_p2  m_u.m_m8.m8p2
+#define m8_p3  m_u.m_m8.m8p3
+#define m8_p4  m_u.m_m8.m8p4
+
 
 /*==========================================================================* 
  * Minix run-time system (IPC).                                            *

diff --git a/include/minix/syslib.h b/include/minix/syslib.h
index 972104b71292816a78d361b4b0f5f714c655c54f..6340cfb6f5393e37eec3adb69241861a6e16beb8 100755 (executable)
--- a/include/minix/syslib.h
+++ b/include/minix/syslib.h
@@ -34,6 +34,8 @@
 /*==========================================================================* 
  * Minix system library.                                                   *
  *==========================================================================*/ 
+_PROTOTYPE( int printf, (const char *fmt, ...)                         );
+_PROTOTYPE( void kputc, (int c)                                                );
 _PROTOTYPE( int _taskcall, (int who, int syscallnr, message *msgptr)   );
 
 _PROTOTYPE( int sys_abort, (int how, ...)                              );

diff --git a/include/sys/select.h b/include/sys/select.h
new file mode 100755 (executable)
index 0000000..ba9b226
--- /dev/null
+++ b/include/sys/select.h
@@ -0,0 +1,37 @@
+
+#ifndef _SYS_SELECT_H
+#define _SYS_SELECT_H 1
+
+#ifdef _POSIX_SOURCE
+
+#include <time.h>
+#include <sys/types.h>
+#include <limits.h>
+
+/* Use this datatype as basic storage unit in fd_set */
+typedef u32_t _fdsetword;      
+
+/* This many bits fit in an fd_set word. */
+#define _FDSETBITSPERWORD      (sizeof(_fdsetword)*8)
+
+/* We want to store OPEN_MAX fd bits. */
+#define _FDSETWORDS    ((OPEN_MAX+_FDSETBITSPERWORD-1)/_FDSETBITSPERWORD)
+
+/* This means we can store all of OPEN_MAX. */
+#define FD_SETSIZE             OPEN_MAX
+
+typedef struct {
+       _fdsetword      _fdsetval[_FDSETWORDS];
+} fd_set;
+
+_PROTOTYPE( int select, (int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *timeout) );
+
+_PROTOTYPE( void FD_CLR, (int fd, fd_set *fdset));
+_PROTOTYPE( void FD_ISSET, (int fd, fd_set *fdset));
+_PROTOTYPE( void FD_SET, (int fd, fd_set *fdset));
+_PROTOTYPE( void FD_ZERO, (fd_set *fdset));
+
+#endif /* _POSIX_SOURCE */
+
+#endif /* _SYS_SELECT_H */
+

diff --git a/lib/posix/Makefile b/lib/posix/Makefile
index 10171c1b4d1a00fe40bf2310775828e5d6eb8a77..638ac71aca0f6e57f7466bcc1bcf9490bb162140 100755 (executable)
--- a/lib/posix/Makefile
+++ b/lib/posix/Makefile
@@ -64,6 +64,7 @@ OBJECTS       = \
        $(LIBRARY)(_rename.o) \
        $(LIBRARY)(_rewinddir.o) \
        $(LIBRARY)(_rmdir.o) \
+       $(LIBRARY)(_select.o) \
        $(LIBRARY)(_setgid.o) \
        $(LIBRARY)(_setsid.o) \
        $(LIBRARY)(_setuid.o) \
@@ -270,6 +271,9 @@ $(LIBRARY)(_rewinddir.o):   _rewinddir.c
 $(LIBRARY)(_rmdir.o):  _rmdir.c
        $(CC1) _rmdir.c
 
+$(LIBRARY)(_select.o): _select.c
+       $(CC1) _select.c
+
 $(LIBRARY)(_setgid.o): _setgid.c
        $(CC1) _setgid.c
 

diff --git a/lib/posix/_select.c b/lib/posix/_select.c
new file mode 100755 (executable)
index 0000000..5d4cef4
--- /dev/null
+++ b/lib/posix/_select.c
@@ -0,0 +1,18 @@
+
+#include <lib.h>
+#include <sys/select.h>
+
+PUBLIC int select(int nfds,
+       fd_set *readfds, fd_set *writefds, fd_set *errorfds,
+       struct timeval *timeout)
+{
+  message m;
+
+  m.m8_i1 = nfds;
+  m.m8_p1 = (char *) readfds;
+  m.m8_p2 = (char *) writefds;
+  m.m8_p3 = (char *) errorfds;
+  m.m8_p4 = (char *) timeout;
+
+  return (_syscall(FS, SELECT, &m));
+}

diff --git a/servers/fs/Makefile b/servers/fs/Makefile
index e6251a3b0647e76c7b0f09133f8b593a17be532c..c62f9040f2da1f178292c9e3569745683c18643c 100644 (file)
--- a/servers/fs/Makefile
+++ b/servers/fs/Makefile
@@ -16,7 +16,7 @@ LIBS = -lsys -lutils
 OBJ =  main.o open.o read.o write.o pipe.o dmap.o dmp.o \
        device.o path.o mount.o link.o super.o inode.o \
        cache.o cache2.o filedes.o stadir.o protect.o time.o \
-       cmostime.o lock.o misc.o utility.o table.o 
+       cmostime.o lock.o misc.o utility.o select.o table.o 
 
 # build local binary 
 all build:     $(SERVER)
@@ -35,7 +35,7 @@ clean:
 
 # dependencies
 a=     fs.h $h/config.h $s/types.h $h/const.h $h/type.h \
-       $i/limits.h $i/errno.h $i/ansi.h $h/syslib.h $h/utils.h \
+       $i/limits.h $i/errno.h $i/ansi.h $h/syslib.h \
        const.h type.h proto.h glo.h $s/dir.h
 
 cache.o:       $a

diff --git a/servers/fs/proto.h b/servers/fs/proto.h
index 92235c15378c218177eeeac6ff5c2d907e5bc68a..4dfec6e1fbcab76d31a02faf9b5b8cb99f3acfa0 100644 (file)
--- a/servers/fs/proto.h
+++ b/servers/fs/proto.h
@@ -171,3 +171,7 @@ _PROTOTYPE( void clear_zone, (struct inode *rip, off_t pos, int flag)       );
 _PROTOTYPE( int do_write, (void)                                       );
 _PROTOTYPE( struct buf *new_block, (struct inode *rip, off_t position) );
 _PROTOTYPE( void zero_block, (struct buf *bp)                          );
+
+/* select.c */
+_PROTOTYPE( int do_select, (void)                                      );
+

diff --git a/servers/fs/select.c b/servers/fs/select.c
new file mode 100644 (file)
index 0000000..5bf065d
--- /dev/null
+++ b/servers/fs/select.c
@@ -0,0 +1,16 @@
+/* Implement entry point to select system call.
+ *
+ * The entry points into this file are
+ *   do_select:         perform the SELECT system call
+ */
+
+#include "fs.h"
+
+/*===========================================================================*
+ *                             do_select                                            *
+ *===========================================================================*/
+PUBLIC int do_select(void)
+{
+       return OK;
+}
+

diff --git a/servers/fs/table.c b/servers/fs/table.c
index 76155ef301b3860f2074fdadb1cd5c3e85d4650f..5505bda0aa321d7b23e54f5992945c0e9c5159e4 100644 (file)
--- a/servers/fs/table.c
+++ b/servers/fs/table.c
@@ -102,6 +102,7 @@ PUBLIC _PROTOTYPE (int (*call_vec[]), (void) ) = {
        do_fstatfs,     /* 82 = fstatfs */
        no_sys,         /* 83 = memalloc */
        no_sys,         /* 84 = memfree */
+       do_select,      /* 85 = select */
 };
 /* This should not fail with "array size is negative": */
 extern int dummy[sizeof(call_vec) == NCALLS * sizeof(call_vec[0]) ? 1 : -1];

diff --git a/servers/pm/table.c b/servers/pm/table.c
index b812a10e729f8398f279563915bcc70604ca56de..8bb49cf58130c91d3195cc40968df10430b9dd3b 100644 (file)
--- a/servers/pm/table.c
+++ b/servers/pm/table.c
@@ -101,6 +101,7 @@ _PROTOTYPE (int (*call_vec[NCALLS]), (void) ) = {
        no_sys,         /* 82 = fstatfs */
        do_allocmem,    /* 83 = memalloc */
        do_freemem,     /* 84 = memfree */
+       no_sys,         /* 85 = select */
 };
 /* This should not fail with "array size is negative": */
 extern int dummy[sizeof(call_vec) == NCALLS * sizeof(call_vec[0]) ? 1 : -1];

diff --git a/tools/release.sh b/tools/release.sh
index ace29ed504b81d213241a1a0a73e40a2fda66a74..f822cf74eeaeda27d74365613ce2c2e0eafd9efe 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -21,26 +21,13 @@ echo -n "Device: /dev/"
 read dev || exit 1
 TMPDISK=/dev/$dev
 
-echo "Temporary (sub)partition to use for storage in /tmp?"
-echo "It will be mkfsed!"
-echo -n "Device: /dev/"
-read tmpdev || exit 1
-TMPTMPDISK=/dev/$tmpdev
-
 if [ -b $TMPDISK ]
 then :
 else   echo "$TMPDISK is not a block device.."
        exit 1
 fi
 
-if [ -b $TMPTMPDISK ]
-then :
-else   echo "$TMPDISK is not a block device.."
-       exit 1
-fi
-
 umount $TMPDISK
-umount $TMPTMPDISK
 umount $RAM
 
 ( cd .. && make clean )
@@ -51,9 +38,6 @@ echo " * mounting $RAM as $RELEASEDIR"
 mount $RAM $RELEASEDIR || exit
 mkdir -m 755 $RELEASEDIR/usr
 mkdir -m 1777 $RELEASEDIR/tmp
-umount $TMPTMPDISK 
-mkfs $TMPTMPDISK || exit
-mount $TMPTMPDISK $RELEASEDIR/tmp || exit 1
 
 mkfs -B 1024 $TMPDISK || exit
 echo " * mounting $TMPDISK as $RELEASEDIR/usr"
@@ -69,7 +53,6 @@ chroot $RELEASEDIR '/bin/sh -x /usr/src/tools/chrootmake.sh' || exit 1
 echo " * Chroot build done"
 cp issue.install $RELEASEDIR/etc/issue
 umount $TMPDISK || exit
-umount $TMPTMPDISK || exit
 umount $RAM || exit
 cp $RAM $ROOTIMAGE
 make programs image