Merge from eCos master repository on 2000-04-07-07:52:29-BST

prife · Apr 7, 2000 · 161ac3e · 161ac3e
1 parent 05e7232
commit 161ac3e
Show file tree

Hide file tree

Showing 96 changed files with 2,338 additions and 1,683 deletions.
diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog
@@ -1,3 +1,18 @@
+2000-03-31  John Dallaway  <[email protected]>
+
+	* standalone/win32/MainFrm.cpp:
+
+	Modify CygMount() to call the correct overloaded form
+	of CSubprocess::Run().
+
+2000-03-29  John Dallaway  <[email protected]>
+
+	* standalone/win32/Configtool.rc,
+	  standalone/common/ecosconfig.cxx,
+	  standalone/win32/res/Splsh16.bmp:
+
+	Update version strings.	
+
 2000-03-28  John Dallaway  <[email protected]>
 
 	* standalone/win32/cdl.sh,

diff --git a/host/tools/configtool/standalone/common/ecosconfig.cxx b/host/tools/configtool/standalone/common/ecosconfig.cxx
@@ -48,7 +48,7 @@
 #include "cdl_exec.hxx"
 #include "ecosconfig.hxx"
 
-#define TOOL_VERSION "1.3.2"
+#define TOOL_VERSION "1.3.net"
 #define TOOL_COPYRIGHT "Copyright (c) 2000 Red Hat, Inc."
 #define DEFAULT_SAVE_FILE "ecos.ecc"
 

diff --git a/host/tools/configtool/standalone/win32/Configtool.rc b/host/tools/configtool/standalone/win32/Configtool.rc
@@ -192,7 +192,7 @@ CAPTION "About ConfigTool"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP
-    LTEXT           "eCos Configuration Tool 1.3.2",IDC_STATIC,40,10,119,8,
+    LTEXT           "eCos Configuration Tool 1.3.net",IDC_STATIC,40,10,119,8,
                     SS_NOPREFIX
     ICON            IDR_MAINFRAME,IDC_STATIC,11,17,21,20
     LTEXT           "Date/Time info",IDC_STATIC_DATETIME,40,23,119,8

diff --git a/host/tools/configtool/standalone/win32/MainFrm.cpp b/host/tools/configtool/standalone/win32/MainFrm.cpp
@@ -1235,10 +1235,12 @@ void CMainFrame::CygMount(TCHAR c)
   c=towlower(c);
   if(!m_arMounted[c-_TCHAR('a')]){
     m_arMounted[c-_TCHAR('a')]=true;
-    CString strCmd,strOutput;
+    CString strCmd;
+    String strOutput;
 
     strCmd.Format(_T("mount %c: /%c"),c,c);
-    CSubprocess::Run(strOutput,strCmd);
+    CSubprocess sub;
+    sub.Run(strOutput,strCmd);
   }
 }
 

diff --git a/host/tools/configtool/standalone/win32/res/Splsh16.bmp b/host/tools/configtool/standalone/win32/res/Splsh16.bmp
diff --git a/host/tools/ecostest/common/eCosTestDownloadFilter.cpp b/host/tools/ecostest/common/eCosTestDownloadFilter.cpp
@@ -53,7 +53,7 @@
 #include "eCosStd.h"
 #include "eCosTrace.h"
 
-#define DL_FILTER_VER "$Id: eCosTestDownloadFilter.cpp,v 1.2 2000/03/28 20:13:33 jlarmour Exp $"
+#define DL_FILTER_VER "$Id: eCosTestDownloadFilter.cpp,v 1.3 2000/04/07 07:45:09 jlarmour Exp $"
 #include "eCosTestDownloadFilter.h"
 
 CeCosTestDownloadFilter::CeCosTestDownloadFilter():

diff --git a/host/tools/ecostest/common/eCosTestMonitorFilter.cpp b/host/tools/ecostest/common/eCosTestMonitorFilter.cpp
@@ -45,7 +45,7 @@
 
 #include "eCosStd.h"
 
-#define SER_FILTER_VER "$Id: eCosTestMonitorFilter.cpp,v 1.1 2000/03/28 20:13:33 jlarmour Exp $"
+#define SER_FILTER_VER "$Id: eCosTestMonitorFilter.cpp,v 1.2 2000/04/07 07:45:09 jlarmour Exp $"
 #include "eCosTestMonitorFilter.h"
 
 CeCosTestMonitorFilter::CeCosTestMonitorFilter():

diff --git a/host/tools/ecostest/common/eCosTestSerialFilter.cpp b/host/tools/ecostest/common/eCosTestSerialFilter.cpp
@@ -51,7 +51,7 @@
 
 #include "eCosStd.h"
 
-#define SER_FILTER_VER "$Id: eCosTestSerialFilter.cpp,v 1.2 2000/03/28 20:13:33 jlarmour Exp $"
+#define SER_FILTER_VER "$Id: eCosTestSerialFilter.cpp,v 1.3 2000/04/07 07:45:09 jlarmour Exp $"
 #include "eCosTestSerialFilter.h"
 
 char msg_ok[] = "OK";

diff --git a/host/tools/pkgadmin/ChangeLog b/host/tools/pkgadmin/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-29  John Dallaway  <[email protected]>
+
+	* win32/PkgAdmin.rc:
+
+	Update version string.	
+
 2000-03-15  John Dallaway  <[email protected]>
 
 	* win32/PkgAdmin.rc:

diff --git a/host/tools/pkgadmin/win32/PkgAdmin.rc b/host/tools/pkgadmin/win32/PkgAdmin.rc
@@ -26,17 +26,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_PKGADMIN_ABOUTBOX DIALOG DISCARDABLE  0, 0, 235, 55
+IDD_PKGADMIN_ABOUTBOX DIALOG DISCARDABLE  0, 0, 238, 55
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About eCos Package Administration Tool"
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDR_PKGADMIN_MAINFRAME,IDC_STATIC,11,11,20,20
-    LTEXT           "eCos Package Administration Tool 1.3.2",IDC_STATIC,40,
-                    10,131,8,SS_NOPREFIX
+    ICON            IDR_PKGADMIN_MAINFRAME,IDC_STATIC,11,11,21,20
+    LTEXT           "eCos Package Administration Tool 1.3.net",IDC_STATIC,40,
+                    10,134,8,SS_NOPREFIX
     LTEXT           "Copyright � 1999-2000 Red Hat, Inc.",IDC_STATIC,40,25,
                     139,8
-    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
+    DEFPUSHBUTTON   "OK",IDOK,181,7,50,14,WS_GROUP
 END
 
 IDD_PKGADMIN_DIALOG DIALOGEX 0, 0, 320, 204
@@ -66,7 +66,7 @@ BEGIN
     IDD_PKGADMIN_ABOUTBOX, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 228
+        RIGHTMARGIN, 231
         TOPMARGIN, 7
         BOTTOMMARGIN, 48
     END

diff --git a/host/tools/testtool/ChangeLog b/host/tools/testtool/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-05  John Dallaway  <[email protected]>
+
+	* win32/TestTool.rc:
+
+	Relocate the OK button in the IDD_TT_PROPERTIES dialog.
+
 2000-03-13  John Dallaway  <[email protected]>
 
 	* win32/testtoolres.h,

diff --git a/host/tools/testtool/win32/TestTool.rc b/host/tools/testtool/win32/TestTool.rc
@@ -148,7 +148,7 @@ BEGIN
     CONTROL         "&Remote",IDC_TT_RADIO_REMOTE,"Button",
                     BS_AUTORADIOBUTTON,51,90,41,10
     PUSHBUTTON      "&Connection...",IDC_TT_SETTINGS,7,114,50,14
-    DEFPUSHBUTTON   "OK",IDOK,61,114,50,14
+    DEFPUSHBUTTON   "OK",IDOK,96,114,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,150,114,50,14
     COMBOBOX        IDC_TT_DOWNLOADTIMEOUT_COMBO,55,35,94,54,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

diff --git a/packages/ChangeLog b/packages/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-05  Jesper Skov  <[email protected]>
+
+	* ecos.db: Wallclock moved.
+
 2000-03-24  Jonathan Larmour  <[email protected]>
 
 	* ecosrelease.tcl: Allow running if cygtclsh80 is the tcl shell, as

diff --git a/packages/NEWS b/packages/NEWS
@@ -1,3 +1,7 @@
+* WallClock reworked, making it simpler to implement new drivers.
+  New drivers
+  o SH3 RTC module
+
 -------- eCos 1.3.1 public net release:
 
 * New architectures and variants

diff --git a/packages/devs/wallclock/current/src/emulate.cxx b/packages/devs/wallclock/current/src/emulate.cxx
diff --git a/packages/devs/wallclock/sh3/current/ChangeLog b/packages/devs/wallclock/sh3/current/ChangeLog
@@ -0,0 +1,59 @@
+2000-04-06  Jesper Skov  <[email protected]>
+
+	* cdl/wallclock_sh3.cdl: Only active when wallclock is.
+
+2000-04-05  John Dallaway  <[email protected]>
+
+	* cdl/wallclock_sh3.cdl: 
+
+	Provide hardware wallclock implementation as a radio button.
+
+2000-04-05  Jesper Skov  <[email protected]>
+
+	* src/wallclock_sh3.cxx: 
+	Moved from devs/wallclock/current to here.
+	Get API from io/wallclock.
+	Deleted all non-SH3 changelog entries
+
+2000-03-29  Jesper Skov  <[email protected]>
+
+	* tests/wallclock2.cxx:
+	* include/wallclock.hxx:
+	* src/sh3.cxx: 
+	* src/wallclock.cxx: 
+	* cdl/wallclock.cdl:
+	Reworked WallClock API. It should now be simpler to add new
+	wallclock drivers. Added a simple test to print out the current
+	wallclock value so a human can verify battery backup works.
+
+2000-03-17  Jesper Skov  <[email protected]>
+
+	* cdl/wallclock.cdl: 
+	* src/sh3.cxx: 
+	Added wallclock driver for SH3 RTC module.
+
+//####COPYRIGHTBEGIN####
+//                                                                          
+// -------------------------------------------                              
+// The contents of this file are subject to the Red Hat eCos Public License 
+// Version 1.1 (the "License"); you may not use this file except in         
+// compliance with the License.  You may obtain a copy of the License at    
+// http://www.redhat.com/                                                   
+//                                                                          
+// Software distributed under the License is distributed on an "AS IS"      
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
+// License for the specific language governing rights and limitations under 
+// the License.                                                             
+//                                                                          
+// The Original Code is eCos - Embedded Configurable Operating System,      
+// released September 30, 1998.                                             
+//                                                                          
+// The Initial Developer of the Original Code is Red Hat.                   
+// Portions created by Red Hat are                                          
+// Copyright (C) 1998, 1999, 2000 Red Hat, Inc.                             
+// All Rights Reserved.                                                     
+// -------------------------------------------                              
+//                                                                          
+//####COPYRIGHTEND####
+
+