This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Only one serial driver package for AIM 711


Hi,

First I have made three packages which I thought are needed 
to support the two different serial driver needed by AIM 
711.

This patch makes one package which uses cdl_component to 
include the two different serial driver.
This is needed because there has been problems with 
ecosadmin.tcl if multiple packages are in one directory.

Best regards,
Roland
-- 
___________________________________________________

VS Vision Systems GmbH, Industrial Image Processing
Dipl.-Ing. Roland Caßebohm
Aspelohe 27A, D-22848 Norderstedt, Germany
http://www.visionsystems.de
___________________________________________________
Index: ecos.db
===================================================================
RCS file: /home/cassebohm/net/USERS/CVSROOT/VSprojects/ecos/packages/ecos.db,v
retrieving revision 1.1.1.1.2.16
diff -u -5 -p -r1.1.1.1.2.16 ecos.db
--- ecos.db	4 Aug 2004 15:36:48 -0000	1.1.1.1.2.16
+++ ecos.db	9 Sep 2004 11:14:16 -0000
@@ -897,31 +907,10 @@ package CYGPKG_IO_SERIAL_ARM_AIM711 {
     directory         devs/serial/arm/aim711
     script            ser_arm_aim711.cdl
     description       "ARM Industral Module AIM 711 serial device drivers"
 }
 
-package CYGPKG_IO_SERIAL_ARM_AIM711_S3C4510 {
-    alias             { "AIM 711 S3C4510 serial device driver"
-                        devs_serial_arm_aim711_s3c4510 aim711_s3c4510_serial_driver }
-    hardware
-    directory         devs/serial/arm/aim711
-    script            ser_arm_aim711_s3c4510.cdl
-    description       "ARM Industral Module AIM 711 serial device driver
-                       for the internal serial interface of the S3C4510"
-}
-
-package CYGPKG_IO_SERIAL_ARM_AIM711_16X5X {
-    alias             { "ARM AIM711 16x5x serial device driver"
-                        devs_serial_arm_aim711_16x5x aim711_16x5x_serial_driver }
-    hardware
-    directory         devs/serial/arm/aim711
-    script            ser_arm_aim711_16x5x.cdl
-    description       "ARM Industral Module AIM 711 serial device driver
-                       for the external 16550 device using the generic 
-                       16x5x driver"
-}
-
 package CYGPKG_IO_SERIAL_ARM_INTEGRATOR {
     alias             { "ARM INTEGRATOR serial device drivers"
                         devs_serial_arm_integrator integrator_serial_driver }
     hardware
     directory         devs/serial/arm/integrator
@@ -4300,21 +4312,21 @@ target aim711 {
                    CYGPKG_DEVS_FLASH_SST_39VFXXX
                    CYGPKG_DEVS_FLASH_ARM_AIM711
                    CYGPKG_DEVS_ETH_ARM_KS32C5000
                    CYGPKG_IO_SERIAL_ARM_AIM711
                    CYGPKG_IO_SERIAL_ARM_S3C4510
-                   CYGPKG_IO_SERIAL_ARM_AIM711_S3C4510
                    CYGPKG_IO_SERIAL_GENERIC_16X5X
-                   CYGPKG_IO_SERIAL_ARM_AIM711_16X5X
                    CYGPKG_DEVICES_WALLCLOCK_ARM_AIM711
                    CYGPKG_DEVICES_WALLCLOCK_DALLAS_DS1307 
                }
       description "
         The aim711 target provides the packages needed to run eCos on a
         ARM Industrial Module AIM 711."
  }
 
 target mpc50 {
 	alias { "MICROPLEX Printer Controller 5.0" mpc50 }
 	packages {
 				CYGPKG_HAL_ARM
Index: devs/serial/arm/aim711/current/cdl/ser_arm_aim711.cdl
===================================================================
RCS file: /home/cassebohm/net/USERS/CVSROOT/VSprojects/ecos/packages/devs/serial/arm/aim711/current/cdl/ser_arm_aim711.cdl,v
retrieving revision 1.1.2.2
diff -u -5 -p -r1.1.2.2 ser_arm_aim711.cdl
--- devs/serial/arm/aim711/current/cdl/ser_arm_aim711.cdl	31 Oct 2003 12:25:03 -0000	1.1.2.2
+++ devs/serial/arm/aim711/current/cdl/ser_arm_aim711.cdl	9 Sep 2004 11:11:19 -0000
@@ -38,13 +38,13 @@
 ## -------------------------------------------
 #####ECOSGPLCOPYRIGHTEND####
 # ====================================================================
 ######DESCRIPTIONBEGIN####
 #
-# Author(s):      Lars.Lindqvist@combitechsystems.com
-# Contributors:   jlarmour
-# Date:           2001-10-19
+# Author(s):      Lars.Lindqvist@combitechsystems.com, rcassebohm
+# Contributors:   jlarmour, rcassebohm
+# Date:           2004-09-09
 #
 #####DESCRIPTIONEND####
 #
 # ====================================================================
 
@@ -52,28 +52,230 @@
 cdl_package CYGPKG_IO_SERIAL_ARM_AIM711 {
     display       "ARM Industrial Module AIM 711 serial device drivers"
 
     parent        CYGPKG_IO_SERIAL_DEVICES
     active_if     CYGPKG_IO_SERIAL
+    active_if     CYGPKG_HAL_ARM_AIM711
 
     include_dir   cyg/io
-    include_files ; # none _exported_ whatsoever
     description   "
            This package contains serial device drivers for the
            ARM Industrial Module AIM 711."
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
         puts $::cdl_system_header "#ifndef CYGDAT_IO_SERIAL_DEVICE_HEADER"
         puts $::cdl_system_header "#define CYGDAT_IO_SERIAL_DEVICE_HEADER <pkgconf/io_serial_arm_aim711.h>"
+        puts $::cdl_system_header "#define CYGDAT_IO_SERIAL_GENERIC_16X5X_INL <cyg/io/ser_arm_aim711_16x5x.inl>"
+        puts $::cdl_system_header "#define CYGDAT_IO_SERIAL_GENERIC_16X5X_CFG <pkgconf/io_serial_arm_aim711.h>"
+        puts $::cdl_system_header "#define CYGDAT_IO_SERIAL_ARM_S3C4510_INL <cyg/io/ser_arm_aim711_s3c4510.inl>"
+        puts $::cdl_system_header "#define CYGDAT_IO_SERIAL_ARM_S3C4510_CFG <pkgconf/io_serial_arm_aim711.h>"
         puts $::cdl_system_header "#endif"
         puts $::cdl_system_header "/*****  serial driver proc output end  *****/"
         puts $::cdl_header "#include <pkgconf/system.h>";
         puts $::cdl_header "#include <pkgconf/io_serial_arm_s3c4510.h>";
         puts $::cdl_header "#include <pkgconf/io_serial_generic_16x5x.h>";
-        puts $::cdl_header "#include CYGDAT_IO_SERIAL_ARM_S3C4510_CFG";
-        puts $::cdl_header "#include CYGDAT_IO_SERIAL_GENERIC_16X5X_CFG";
+    }
+
+    cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_16X5X {
+        display       "ARM Industrial Module AIM 711 16x5x serial device drivers"
+
+        parent        CYGPKG_IO_SERIAL_DEVICES
+        active_if     CYGPKG_IO_SERIAL
+        active_if     CYGPKG_HAL_ARM_AIM711
+        default_value 1
+
+        requires      CYGPKG_ERROR
+        description   "
+               This package contains serial device drivers for the
+               ARM Industrial Module AIM 711 for the 16550 serial
+               interface on board."
+
+        # FIXME: This really belongs in the GENERIC_16X5X package
+        cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
+            display   "Generic 16x5x serial driver required"
+        }
+
+        cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_16X5X_SERIAL0 {
+            display       "AIM 711 16X5X serial port 0 driver (COM1)"
+            flavor        bool
+            default_value 1
+            description   "
+                This option includes the serial device driver for the AIM 711 16X5X 
+                port 0, which is COM1 on the AIM 711."
+
+            implements    CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED
+            implements    CYGINT_IO_SERIAL_FLOW_CONTROL_HW
+            implements    CYGINT_IO_SERIAL_LINE_STATUS_HW
+
+            cdl_option CYGDAT_IO_SERIAL_ARM_AIM711_16X5X_SERIAL0_NAME {
+                display       "Device name for the AIM 711 16X5X serial port 0 driver (COM1)"
+                flavor        data
+                default_value {"\"/dev/ser1\""}
+                description   "
+                    This option sets the name of the serial device for the AIM 711 
+                    16X5X port 0 (COM1)."
+            }
+
+            cdl_option CYGNUM_IO_SERIAL_ARM_AIM711_16X5X_SERIAL0_BAUD {
+                display       "Baud rate for the AIM 711 16X5X serial port 0 driver"
+                flavor        data
+                legal_values  { 50 75 110 "134_5" 150 200 300 600 1200 1800 2400 3600
+                              4800 7200 9600 14400 19200 38400 57600 115200 230400
+                }
+                default_value 38400
+                description   "
+                    This option specifies the default baud rate (speed) for the 
+                    AIM 711 16X5X port 0."
+            }
+
+            cdl_option CYGNUM_IO_SERIAL_ARM_AIM711_16X5X_SERIAL0_BUFSIZE {
+                display       "Buffer size for the AIM 711 16X5X serial port 0 driver"
+                flavor        data
+                legal_values  0 to 8192
+                default_value 128
+                description   "
+                    This option specifies the size of the internal buffers used for
+                    the AIM 711 16X5X port 0."
+            }
+        }
+    }
+
+    cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_S3C4510 {
+        display       "ARM Industrial Module AIM 711 S3C4510 serial device drivers"
+
+        parent        CYGPKG_IO_SERIAL_DEVICES
+        active_if     CYGPKG_IO_SERIAL
+        active_if     CYGPKG_HAL_ARM_AIM711
+        default_value 1
+
+        requires      CYGPKG_ERROR
+        description   "
+               This package contains serial device drivers for the
+               ARM Industrial Module AIM 711 for the internal serial
+               interface of the S3C4510."
+
+        # FIXME: This really belongs in the SERIAL_ARM_S3C4510 package
+        cdl_interface CYGINT_IO_SERIAL_ARM_S3C4510_REQUIRED {
+            display   "Generic s3c4510 serial driver required"
+        }
+
+        cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL0 {
+            display       "AIM 711 S3C4510 serial port 0 driver (service adapter)"
+            flavor        bool
+            default_value 1
+            description   "
+                This option includes the serial device driver for the AIM 711 S3C4510 
+                port 0, which is on the AIM 711 the port on the service adapter."
+
+            implements    CYGINT_IO_SERIAL_ARM_S3C4510_REQUIRED
+
+            cdl_option CYGDAT_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL0_NAME {
+                display       "Device name for the AIM 711 S3C4510 serial port 0 driver (service adapter)"
+                flavor        data
+                default_value {"\"/dev/ser0\""}
+                description   "
+                    This option sets the name of the serial device for the AIM 711 
+                    S3C4510 port 0 (service adapter)."
+            }
+
+            cdl_option CYGNUM_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL0_BAUD {
+                display       "Baud rate for the AIM 711 S3C4510 serial port 0 driver"
+                flavor        data
+                legal_values  { 50 75 110 "134_5" 150 200 300 600 1200 1800 2400 3600
+                              4800 7200 9600 14400 19200 38400 57600 115200 230400
+                }
+                default_value 38400
+                description   "
+                    This option specifies the default baud rate (speed) for the 
+                    AIM 711 S3C4510 port 0."
+            }
+
+            cdl_option CYGNUM_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL0_BUFSIZE {
+                display       "Buffer size for the AIM 711 S3C4510 serial port 0 driver"
+                flavor        data
+                legal_values  0 to 8192
+                default_value 128
+                description   "
+                    This option specifies the size of the internal buffers used for
+                    the AIM 711 S3C4510 port 0."
+            }
+        }
+
+        cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL1 {
+            display       "AIM 711 S3C4510 serial port 1 driver (COM2)"
+            flavor        bool
+            default_value 1
+            description   "
+                This option includes the serial device driver for the AIM 711 
+                S3C4510 port 1, which is the COM2 on the AIM 711."
+
+            implements    CYGINT_IO_SERIAL_ARM_S3C4510_REQUIRED
+
+            cdl_option CYGDAT_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL1_NAME {
+                display       "Device name for the AIM 711 S3C4510 serial port 1 driver (COM2)"
+                flavor        data
+                default_value {"\"/dev/ser2\""}
+                description   "
+                    This option specifies the name of serial device for the 
+                    AIM 711 S3C4510 port 1 (COM2)."
+            }
+
+            cdl_option CYGNUM_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL1_BAUD {
+                display       "Baud rate for the AIM 711 S3C4510 serial port 1 driver"
+                flavor        data
+                legal_values  { 50 75 110 "134_5" 150 200 300 600 1200 1800 2400 3600
+                              4800 7200 9600 14400 19200 38400 57600 115200 230400
+                }
+                default_value 38400
+                description   "
+                    This option specifies the default baud rate (speed) for the 
+                    AIM 711 S3C4510 port 1."
+            }
+
+            cdl_option CYGNUM_IO_SERIAL_ARM_AIM711_S3C4510_SERIAL1_BUFSIZE {
+                display       "Buffer size for the AIM 711 S3C4510 serial port 1 driver"
+                flavor        data
+                legal_values  0 to 8192
+                default_value 128
+                description   "
+                    This option specifies the size of the internal buffers used 
+                    for the AIM 711 S3C4510 port 1."
+            }
+        }
+    }
+
+    cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_OPTIONS {
+        display "Serial device driver build options"
+        flavor  none
+        description   "
+        Package specific build options including control over
+        compiler flags used only in building this package,
+        and details of which tests are built."
+
+
+        cdl_option CYGPKG_IO_SERIAL_ARM_AIM711_CFLAGS_ADD {
+            display "Additional compiler flags"
+            flavor  data
+            no_define
+            default_value { "" }
+            description   "
+                This option modifies the set of compiler flags for
+                building these serial device drivers. These flags are used in addition
+                to the set of global flags."
+        }
+
+        cdl_option CYGPKG_IO_SERIAL_ARM_AIM711_CFLAGS_REMOVE {
+            display "Suppressed compiler flags"
+            flavor  data
+            no_define
+            default_value { "" }
+            description   "
+                This option modifies the set of compiler flags for
+                building these serial device drivers. These flags are removed from
+                the set of global flags if present."
+        }
     }
 
     cdl_component CYGPKG_IO_SERIAL_ARM_AIM711_TESTING {
         display    "Testing parameters"
         flavor     bool

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]