Fix demo application

Fix demo application

[Klaus Pedersen]

[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

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 <klaus.kruse.pedersen@mail.tele.dk>

        * 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.


[-- Attachment #2: sid-demos.diff --]
[-- Type: text/plain, Size: 4538 bytes --]

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 <stdio.h>
 #include "VoicePager.h"
+#include <iostream>
 
 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 <iostream.h>
+#include <iostream>
 
 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 <stdio.h>
+#include <iostream>
 
 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

Re: Fix demo application

[Ben Elliston]

>>>>> "Klaus" == Klaus Pedersen <klaus.kruse.pedersen@mail.tele.dk> writes:

  Klaus> The following patch fixes a number of problems I had when I
  Klaus> tried to compile the voice-pager application.

Thank you for your patch!  I will take a closer look at it today.

Ben

Re: Fix demo application

[Ben Elliston]

Hi Klaus,

>>>>> "Klaus" == Klaus Pedersen <klaus.kruse.pedersen@mail.tele.dk> writes:

  Klaus> There are two unrelated problems. The first problem seem to be general
  Klaus> "bit decay", in the configuration files. They refer to both cpu-mapper
  Klaus> and mapper which seem to be the same thing.

Thanks for the report.  I applied the .conf file changes verbatim.

  Klaus> The other problem fixes some namespace issues with gcc-3.1.
 
I didn't apply these verbatim, as we have a policy of not imprting
entire namespaces where possible.  In some cases, I added `using
std::' declarations and in others, I used fully qualified class names.
Nonetheless, the application now compiles using gcc 3.0 (and I presume
3.1).  Please let me know if this is not your finding also.

Cheers, Ben