Re: eSCI patch [was Re: Freescale unified driver]

[Ilija Koco <ilijak at siva dot com dot mk>]

Hi Andrew

Attached esci_1.patch is incremental to esci.patch sent before. As
agreed it also contains patches to tty.cdl and termios.cdl

Many thanks for the assistance.
Ilija

diff -r -U 5 -N -x CVS -x '*~' -x '.#*' devo_0/ecos/packages/devs/serial/freescale/esci/current/cdl/ser_freescale_esci.cdl devo_1/ecos/packages/devs/serial/freescale/esci/current/cdl/ser_freescale_esci.cdl
--- devo_0/ecos/packages/devs/serial/freescale/esci/current/cdl/ser_freescale_esci.cdl	2006-05-31 21:16:24.000000000 +0200
+++ devo_1/ecos/packages/devs/serial/freescale/esci/current/cdl/ser_freescale_esci.cdl	2006-08-31 17:48:12.000000000 +0200
@@ -51,11 +51,16 @@
     display       "eSCI device driver"
 
     parent        CYGPKG_IO_SERIAL_DEVICES
     active_if     CYGPKG_IO_SERIAL
 
-    requires      CYGPKG_ERROR
+    requires      (CYGPKG_ERROR && (CYGPKG_IO_SERIAL_FREESCALE_ESCI_A || \
+                                    CYGPKG_IO_SERIAL_FREESCALE_ESCI_B || \
+                                    CYGPKG_IO_SERIAL_FREESCALE_ESCI_C || \
+                                    CYGPKG_IO_SERIAL_FREESCALE_ESCI_D) \
+                                    )
+    
     include_dir   cyg/devs
 
     description   "
            This option enables the serial device drivers for the
            Freescale eSCI - Enhanced Serial Communication Interface.
diff -r -U 5 -N -x CVS -x '*~' -x '.#*' devo_0/ecos/packages/devs/serial/freescale/esci/current/ChangeLog devo_1/ecos/packages/devs/serial/freescale/esci/current/ChangeLog
--- devo_0/ecos/packages/devs/serial/freescale/esci/current/ChangeLog	2006-08-31 19:46:02.000000000 +0200
+++ devo_1/ecos/packages/devs/serial/freescale/esci/current/ChangeLog	2006-08-31 18:51:40.000000000 +0200
@@ -1,5 +1,9 @@
+2006-08-31  Ilija Koco  <ilijak@siva.com.mk>
+
+    * ser_freescale_esci.cdl: driver now requires at least 1 selected channel
+
 2006-08-08  Ilija Koco  <ilijak@siva.com.mk>
 
 	* ser_esci.h : platform dependent clock related macros
 	removed and placed in platform/var header 
 	
diff -r -U 5 -N -x CVS -x '*~' -x '.#*' devo_0/ecos/packages/io/serial/current/cdl/termios.cdl devo_1/ecos/packages/io/serial/current/cdl/termios.cdl
--- devo_0/ecos/packages/io/serial/current/cdl/termios.cdl	2002-05-24 01:06:24.000000000 +0200
+++ devo_1/ecos/packages/io/serial/current/cdl/termios.cdl	2006-08-31 18:32:36.000000000 +0200
@@ -114,10 +114,29 @@
             This option selects the physical device to use for 
             '/dev/termios2'."
     }
 }
 
+cdl_component CYGPKG_IO_SERIAL_TERMIOS_TERMIOS3 {
+    display       "Termios TTY channel #3"
+    flavor        bool
+    default_value 0
+    implements    CYGINT_IO_SERIAL_TERMIOS_TERMIOS_TTY
+    description   "
+        This option causes '/dev/termios3' to be included in the standard 
+        drivers."
+
+    cdl_option CYGDAT_IO_SERIAL_TERMIOS_TERMIOS3_DEV {
+        display       "Termios TTY channel #3 device"
+        flavor        data
+        default_value {"\"/dev/ser3\""}
+        description   "
+            This option selects the physical device to use for 
+            '/dev/termios3'."
+    }
+}
+
 cdl_option CYGSEM_IO_SERIAL_TERMIOS_USE_SIGNALS {
     display         "Support signals"
     flavor          bool
     requires        CYGINT_ISO_SIGNAL_NUMBERS
     requires        CYGINT_ISO_SIGNAL_IMPL
diff -r -U 5 -N -x CVS -x '*~' -x '.#*' devo_0/ecos/packages/io/serial/current/cdl/tty.cdl devo_1/ecos/packages/io/serial/current/cdl/tty.cdl
--- devo_0/ecos/packages/io/serial/current/cdl/tty.cdl	2002-05-24 01:06:24.000000000 +0200
+++ devo_1/ecos/packages/io/serial/current/cdl/tty.cdl	2006-08-31 18:31:45.000000000 +0200
@@ -126,5 +126,23 @@
         description   "
             This option selects the physical device to use for 
             '/dev/tty2'."
     }
 }
+
+cdl_component CYGPKG_IO_SERIAL_TTY_TTY3 {
+    display       "TTY mode channel #3"
+    flavor        bool
+    default_value 0
+    description   "
+        This option causes '/dev/tty3' to be included in the standard 
+        drivers."
+
+    cdl_option CYGDAT_IO_SERIAL_TTY_TTY3_DEV {
+        display       "TTY mode channel #3 device"
+        flavor        data
+        default_value {"\"/dev/ser3\""}
+        description   "
+            This option selects the physical device to use for 
+            '/dev/tty3'."
+    }
+}
diff -r -U 5 -N -x CVS -x '*~' -x '.#*' devo_0/ecos/packages/io/serial/current/ChangeLog devo_1/ecos/packages/io/serial/current/ChangeLog
--- devo_0/ecos/packages/io/serial/current/ChangeLog	2006-05-09 18:08:20.000000000 +0200
+++ devo_1/ecos/packages/io/serial/current/ChangeLog	2006-08-31 19:32:10.000000000 +0200
@@ -1,5 +1,11 @@
+2006-08-31  Ilija Koco  <ilijak@siva.com.mk>
+
+	* cdl/termios.cdl: added Termios TTY channel #3  
+	  cdl/tty.cdl: added TTY mode channel #3
+	  	  
+
 2006-05-09  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/common/tty.c (tty_init): Fix compiler warning with
 	diag_printf() arguments.