* import from public tree.

        * voice-pager-demo.conf.in: Load libtclapi.la.  `mapper' has been
	renamed to `cpu-mapper' in bsp-generated configuration files;
	update accordingly.
	* voice-pager-demo.conf.pport: Likewise.

diff --git a/sid/demos/voice-pager/ChangeLog b/sid/demos/voice-pager/ChangeLog
index a050300..c73f082 100644 (file)
--- a/sid/demos/voice-pager/ChangeLog
+++ b/sid/demos/voice-pager/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-31  Klaus Pedersen <klaus.kruse.pedersen@mail.tele.dk>
+
+       * voice-pager-demo.conf.in: Load libtclapi.la.  `mapper' has been
+       renamed to `cpu-mapper' in bsp-generated configuration files;
+       update accordingly.
+       * voice-pager-demo.conf.pport: Likewise.
+
 2002-01-03  Ben Elliston  <bje@redhat.com>
 
        * voice-pager.tcl: Update window title.

diff --git a/sid/demos/voice-pager/voice-pager-demo.conf.in b/sid/demos/voice-pager/voice-pager-demo.conf.in
index 44f7b37..860e691 100644 (file)
--- a/sid/demos/voice-pager/voice-pager-demo.conf.in
+++ b/sid/demos/voice-pager/voice-pager-demo.conf.in
@@ -5,6 +5,7 @@ connect-bus rtc_1742 memory-bus rtcmem read-write-port
 #
 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 +35,5 @@ set host-sched 9-regular? 1
 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 --git a/sid/demos/voice-pager/voice-pager-demo.conf.pport b/sid/demos/voice-pager/voice-pager-demo.conf.pport
index b250d6f..79487f2 100644 (file)
--- a/sid/demos/voice-pager/voice-pager-demo.conf.pport
+++ b/sid/demos/voice-pager/voice-pager-demo.conf.pport
@@ -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