From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12699 invoked by alias); 31 Jan 2002 23:13:07 -0000 Mailing-List: contact sid-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: sid-owner@sources.redhat.com Received: (qmail 12640 invoked from network); 31 Jan 2002 23:13:05 -0000 Received: from unknown (HELO fepD.post.tele.dk) (195.41.46.149) by sources.redhat.com with SMTP; 31 Jan 2002 23:13:05 -0000 Received: from mail.tele.dk ([80.62.158.147]) by fepD.post.tele.dk (InterMail vM.4.01.03.23 201-229-121-123-20010418) with ESMTP id <20020131231303.FKFM16766.fepD.post.tele.dk@mail.tele.dk> for ; Fri, 1 Feb 2002 00:13:03 +0100 Message-ID: <3C59DFDA.3090502@mail.tele.dk> Date: Thu, 31 Jan 2002 15:13:00 -0000 From: Klaus Pedersen User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.7) Gecko/20011221 X-Accept-Language: en-us MIME-Version: 1.0 To: sid@sources.redhat.com Subject: Fix demo application Content-Type: multipart/mixed; boundary="------------070708090600020006010307" X-SW-Source: 2002-q1/txt/msg00018.txt.bz2 This is a multi-part message in MIME format. --------------070708090600020006010307 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 692 The following patch fixes a number of problems I had when I tried to compile the voice-pager application. There are two unrelated problems. The first problem seem to be general "bit decay", in the configuration files. They refer to both cpu-mapper and mapper which seem to be the same thing. The other problem fixes some namespace issues with gcc-3.1. Klaus 2002-01-31 Klaus Pedersen * Test-voice-pager.cxx VoicePager.cxx adac-driver.cxx lcd-driver.cxx page-lcd.cxx: Make it compile with gcc-3.1 * voice-pager-demo.conf.in voice-pager-demo.conf.pport: Fix cpu-mapper <-> mapper mismatch. Load tclapi library. --------------070708090600020006010307 Content-Type: text/plain; name="sid-demos.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sid-demos.diff" Content-length: 4538 diff -u -r qqq/sid/src/sid/demos/voice-pager/Test-voice-pager.cxx sid-20020131/sid/src/sid/demos/voice-pager/Test-voice-pager.cxx --- qqq/sid/src/sid/demos/voice-pager/Test-voice-pager.cxx Thu Dec 7 20:31:08 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/Test-voice-pager.cxx Fri Feb 1 00:48:45 2002 @@ -4,6 +4,8 @@ // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. +using namespace std; + #include "VoicePager.h" int diff -u -r qqq/sid/src/sid/demos/voice-pager/VoicePager.cxx sid-20020131/sid/src/sid/demos/voice-pager/VoicePager.cxx --- qqq/sid/src/sid/demos/voice-pager/VoicePager.cxx Thu Dec 7 20:31:08 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/VoicePager.cxx Fri Feb 1 00:48:45 2002 @@ -6,9 +6,11 @@ // This is the main controller will send msgs to rtc, lcd, and snack. // Gets input from parallel port and also has look up table. +using namespace std; #include #include "VoicePager.h" +#include static const int TIME_DIFFHRS = 7; // CA time(-3) and no light sav. (-4) diff -u -r qqq/sid/src/sid/demos/voice-pager/adac-driver.cxx sid-20020131/sid/src/sid/demos/voice-pager/adac-driver.cxx --- qqq/sid/src/sid/demos/voice-pager/adac-driver.cxx Thu Dec 7 20:31:08 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/adac-driver.cxx Fri Feb 1 00:48:45 2002 @@ -3,6 +3,7 @@ // Copyright (C) 1999, 2000 Red Hat. // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. +using namespace std; #include "adac-driver.h" #include "mem-map.h" diff -u -r qqq/sid/src/sid/demos/voice-pager/lcd-driver.cxx sid-20020131/sid/src/sid/demos/voice-pager/lcd-driver.cxx --- qqq/sid/src/sid/demos/voice-pager/lcd-driver.cxx Thu Dec 7 20:31:08 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/lcd-driver.cxx Fri Feb 1 00:48:45 2002 @@ -3,10 +3,11 @@ // Copyright (C) 1999, 2000 Red Hat. // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. +using namespace std; #include "lcd-driver.h" #include "mem-map.h" -#include +#include lcd_driver::lcd_driver() :DATA_REG (LCD_BASE + 0), CMD_REG (LCD_BASE + 1), STATUS_REG (LCD_BASE + 1) diff -u -r qqq/sid/src/sid/demos/voice-pager/page-lcd.cxx sid-20020131/sid/src/sid/demos/voice-pager/page-lcd.cxx --- qqq/sid/src/sid/demos/voice-pager/page-lcd.cxx Thu Dec 7 20:31:08 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/page-lcd.cxx Fri Feb 1 00:48:45 2002 @@ -3,9 +3,11 @@ // Copyright (C) 1999, 2000 Red Hat. // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. +using namespace std; #include "page-lcd.h" #include +#include PagerUI :: PagerUI(lcd_driver& lcd) :lcd_drobj(lcd) diff -u -r qqq/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.in sid-20020131/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.in --- qqq/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.in Thu Dec 7 20:31:09 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.in Fri Feb 1 00:48:45 2002 @@ -5,6 +5,8 @@ # load libt6963c.la t6963c_component_library new hw-lcd-t6963c-0101 lcd +# +load libtclapi.la tcl_bridge_library new bridge-tk panel set panel load! @srcdir@/lcd.tcl set panel load! @srcdir@/voice-pager.tcl @@ -34,5 +36,5 @@ set host-sched 9-time 1000 connect-pin host-sched 9-event -> rtc_1742 clock # Memory map -connect-bus mapper rtc_1742:[0xa00000-0xa01000,1,1] rtc_1742 read-write-port -connect-bus mapper lcd:[0xa01200-0xa01201,1,1] lcd bus +connect-bus cpu-mapper rtc_1742:[0xa00000-0xa01000,1,1] rtc_1742 read-write-port +connect-bus cpu-mapper lcd:[0xa01200-0xa01201,1,1] lcd bus diff -u -r qqq/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.pport sid-20020131/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.pport --- qqq/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.pport Thu Dec 7 20:31:09 2000 +++ sid-20020131/sid/src/sid/demos/voice-pager/voice-pager-demo.conf.pport Fri Feb 1 00:48:45 2002 @@ -1,7 +1,7 @@ new hw-parport-ps/2 pport set pport BIDEN_VAL 1 set pport INTSEL_VAL 1 -connect-bus mapper pport:[0xa01100-0xa01102,1,1] pport Bus +connect-bus cpu-mapper pport:[0xa01100-0xa01102,1,1] pport Bus connect-pin panel up-pin -> pport PD0 connect-pin panel down-pin -> pport PD1 connect-pin panel rec-pin -> pport PD2 --------------070708090600020006010307--