Changeset 3a4ae6c in rtems for c/src/lib/libbsp/i386/go32/console

Timestamp:

09/11/95 19:35:39 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ced11f99

Parents:

5072b07

Message:

The word "RTEMS" almost completely removed from the core.

Configuration Table Template file added and all tests
modified to use this. All gvar.h and conftbl.h files
removed from test directories.

Configuration parameter maximum_devices added.

Core semaphore and mutex handlers added and RTEMS API Semaphore
Manager updated to reflect this.

Initialization sequence changed to invoke API specific initialization
routines. Initialization tasks table now owned by RTEMS Tasks Manager.

Added user extension for post-switch.

Utilized user extensions to implement API specific functionality
like signal dispatching.

Added extensions to the System Initialization Thread so that an
API can register a function to be invoked while the system
is being initialized. These are largely equivalent to the
pre-driver and post-driver hooks.

Added the Modules file oar-go32_p5, modified oar-go32, and modified
the file make/custom/go32.cfg to look at an environment varable which
determines what CPU model is being used.

All BSPs updated to reflect named devices and clock driver's IOCTL
used by the Shared Memory Driver. Also merged clock isr into
main file and removed ckisr.c where possible.

Updated spsize to reflect new and moved variables.

Makefiles for the executive source and include files updated to show
break down of files into Core, RTEMS API, and Neither.

Header and inline files installed into subdirectory based on whether
logically in the Core or a part of the RTEMS API.

File:

• c/src/lib/libbsp/i386/go32/console/console.c (modified) (4 diffs)

c/src/lib/libbsp/i386/go32/console/console.c

@@ -9 +9 @@
 #include <stdlib.h>
 
-#include <rtems.h>
-#include "console.h"
-#include "bsp.h"
+#include <bsp.h>
+#include <rtems/libio.h>
 
 #include <dpmi.h>
@@ -43 +42 @@
  */
 
-/* Set this if console I/O should use go32 (DOS) read/write calls.      */
-/* Otherwise, direct hardware accesses will be used.                    */
-int                     _IBMPC_Use_Go32_IO      = 0;
-
-static rtems_isr_entry  old_keyboard_isr        = NULL;
-extern void             _IBMPC_keyboard_isr( rtems_unsigned32 interrupt );
-
+/* Set this if console I/O should use go32 (DOS) read/write calls.   */
+/* Otherwise, direct hardware accesses will be used.                 */
+
+int      _IBMPC_Use_Go32_IO  = 0;
+
+static rtems_isr_entry  old_keyboard_isr  = NULL;
+
+extern void    _IBMPC_keyboard_isr( rtems_unsigned32 interrupt );
 
 rtems_device_driver console_initialize(
   rtems_device_major_number  major,
   rtems_device_minor_number  minor,
-  void                      *arg,
-  rtems_id                   self,
-  rtems_unsigned32          *status
-)
-{
-    if ( _IBMPC_Use_Go32_IO )  {
-        /* Nothing.  We let DOS and go32 do all the work. */
-    } else {
-        /* Grap the keyboard interrupt so DOS doesn't steal our */
-        /* keystrokes.                                          */
-        rtems_status_code       status;
-        status = rtems_interrupt_catch( _IBMPC_keyboard_isr, 9,
-                                        &old_keyboard_isr );
-        if ( status )  {
-            int write( int, void *, int );
-            void exit( int );
-            char msg[] = "error initializing keyboard\n";
-            write( 2, msg, sizeof msg - 1 );
-            exit( 1 );
-        }
+  void                      *arg
+)
+{
+  rtems_status_code status;
+
+  if ( _IBMPC_Use_Go32_IO )  {
+    /* Nothing.  We let DOS and go32 do all the work. */
+  } else {
+    /* Grap the keyboard interrupt so DOS doesn't steal our */
+    /* keystrokes.                                    */
+    rtems_status_code  status;
+
+    status = 
+      rtems_interrupt_catch( _IBMPC_keyboard_isr, 9, &old_keyboard_isr );
+
+    if ( status )  {
+      int write( int, void *, int );
+      void exit( int );
+
+      char msg[] = "error initializing keyboard\n";
+      write( 2, msg, sizeof msg - 1 );
+      exit( 1 );
     }
-
-    atexit( console_cleanup );
+  }
+
+  status = rtems_io_register_name(
+    "/dev/console",
+    major,
+    (rtems_device_minor_number) 0
+  );
+ 
+  if (status != RTEMS_SUCCESSFUL)
+    rtems_fatal_error_occurred(status);
+ 
+  atexit( console_cleanup );
+
+  return RTEMS_SUCCESSFUL;
 }
 
@@ -118 +132 @@
     outbyte( ch );
     if ( ch == '\r' )
-        outbyte( '\n' );
+      outbyte( '\n' );
 #endif
     return ch;
@@ -139 +153 @@
 
 /*
- * __read  -- read bytes from the console. Ignore fd, since
- *            we only have stdin.
- */
-
-int __read(
-  int fd,
-  char *buf,
-  int nbytes
-)
-{
-  int i = 0;
-
-  for ( i = 0; i < nbytes; i++ ) {
-    buf[i] = inbyte();
-    if ( buf[i] == '\r' ) {
-        /* What if this goes past the end of the buffer?  We're hosed. [bhc] */
-        buf[i++] = '\n';
-        buf[i] = '\0';
-        break;
+ *  Open entry point
+ */
+ 
+rtems_device_driver console_open(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  return RTEMS_SUCCESSFUL;
+}
+
+/*
+ *  Close entry point
+ */
+ 
+rtems_device_driver console_close(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  return RTEMS_SUCCESSFUL;
+}
+ 
+/*
+ * read bytes from the serial port. We only have stdin.
+ */
+ 
+rtems_device_driver console_read(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  rtems_libio_rw_args_t *rw_args;
+  char *buffer;
+  int maximum;
+  int count = 0;
+ 
+  rw_args = (rtems_libio_rw_args_t *) arg;
+ 
+  buffer = rw_args->buffer;
+  maximum = rw_args->count;
+ 
+  for (count = 0; count < maximum; count++) {
+    buffer[ count ] = inbyte();
+    if (buffer[ count ] == '\n' || buffer[ count ] == '\r') {
+      /* What if this goes past the end of the buffer?  We're hosed. [bhc] */
+      buffer[ count++ ]  = '\n';
+      buffer[ count ]  = 0;
+      break;
     }
   }
-  return i;
-}
-
-/*
- * __write -- write bytes to the console. Ignore fd, since
- *            stdout and stderr are the same. Since we have no filesystem,
- *            open will only return an error.
- */
-
-int __write(
-  int fd,
-  char *buf,
-  int nbytes
-)
-{
-  int i;
-
-  for (i = 0; i < nbytes; i++) {
-    if (*(buf + i) == '\n') {
-      outbyte ('\r');
+ 
+  rw_args->bytes_moved = count;
+  return (count >= 0) ? RTEMS_SUCCESSFUL : RTEMS_UNSATISFIED;
+}
+ 
+/*
+ * write bytes to the serial port. Stdout and stderr are the same.
+ */
+ 
+rtems_device_driver console_write(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  int count;
+  int maximum;
+  rtems_libio_rw_args_t *rw_args;
+  char *buffer;
+ 
+  rw_args = (rtems_libio_rw_args_t *) arg;
+ 
+  buffer = rw_args->buffer;
+  maximum = rw_args->count;
+ 
+  for (count = 0; count < maximum; count++) {
+    if ( buffer[ count ] == '\n') {
+      outbyte('\r');
     }
-    outbyte (*(buf + i));
+    outbyte( buffer[ count ] );
   }
-  return (nbytes);
-}
+  return maximum;
+}
+ 
+/*
+ *  IO Control entry point
+ */
+ 
+rtems_device_driver console_control(
+  rtems_device_major_number major,
+  rtems_device_minor_number minor,
+  void                    * arg
+)
+{
+  return RTEMS_SUCCESSFUL;
+}
+