Changeset cb620844 in rtems

Timestamp:

10/04/99 13:47:31 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

6fca2f5

Parents:

67d0f4e

Message:

Patch from Eric Norum <eric@…> to ensure the console
initialization is only done once.

File:

• c/src/lib/libbsp/m68k/gen68360/console/console.c (modified) (6 diffs)

c/src/lib/libbsp/m68k/gen68360/console/console.c

@@ -139 +139 @@
 }
 
-static void
-smc1Initialize (void)
+static int
+smc1Initialize (int major, int minor, void *arg)
 {
         /*
@@ -225 +225 @@
         m360.cimr |= 1UL << 4;  /* Enable SMC1 interrupts */
         }
+
+        return 0;
 }
 
@@ -303 +305 @@
 
         /*
-         * Do device-specific initialization
-         */
-        smc1Initialize ();
-
-        /*
          * Register the device
          */
@@ -327 +324 @@
         rtems_status_code sc;
         static const rtems_termios_callbacks intrCallbacks = {
-                NULL,                   /* firstOpen */
+                smc1Initialize,         /* firstOpen */
                 NULL,                   /* lastClose */
                 NULL,                   /* pollRead */
@@ -337 +334 @@
         };
         static const rtems_termios_callbacks pollCallbacks = {
-                NULL,                   /* firstOpen */
+                smc1Initialize,         /* firstOpen */
                 NULL,                   /* lastClose */
                 smc1PollRead,           /* pollRead */
@@ -347 +344 @@
         };
 
+        /*
+         * Do generic termios initialization
+         */
         if (m360_smc1_interrupt) {
                 rtems_libio_open_close_args_t *args = arg;