Timing Chapter is now shared and menu structure generated.

Cpumodel.texi is now generated.

4 files changed, 47 insertions, 32 deletions

diff --git a/doc/supplements/hppa1_1/Makefile b/doc/supplements/hppa1_1/Makefile
index 9b61fd64d8..9c570b8570 100644
--- a/doc/supplements/hppa1_1/Makefile
+++ b/doc/supplements/hppa1_1/Makefile
@@ -18,14 +18,13 @@ all: html info ps
 dirs:
 	$(make-dirs)
 
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi \
-  ../../common/timing.texi
+COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
 
 GENERATED_FILES= \
-  wksheets.texi
+  cpumodel.texi timing.texi wksheets.texi
 
 FILES= $(PROJECT).texi \
-  bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
+  bsp.texi callconv.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi \
   $(GENERATED_FILES)
 
@@ -51,21 +50,25 @@ replace: timedata.texi
 #  Chapters which get automatic processing
 #
 
+cpumodel.texi: cpumodel.t Makefile
+	$(BMENU) -p "Preface" \
+            -u "Top" \
+            -n "Calling Conventions" ${*}.t
+
+# Calling Conventions
+# Memory Model
+
+# Interrupt Chapter:
+#  1.  Replace Times and Sizes
+#  2.  Build Node Structure
+
 intr.texi: intr.t TIMES
 	${REPLACE} -p TIMES intr.t
 	mv intr.t.fixed intr.texi
 
-timetbl.t: ../../common/timetbl.t
-	sed -e 's/TIMETABLE_NEXT_LINK/Command and Variable Index/' \
-            <../../common/timetbl.t >timetbl.t
-
-timetbl.texi: timetbl.t TIMES
-	${REPLACE} -p TIMES timetbl.t
-	mv timetbl.t.fixed timetbl.texi
-
-timedata.texi: timedata.t TIMES
-	${REPLACE} -p TIMES timedata.t
-	mv timedata.t.fixed timedata.texi
+# Fatal Error
+# BSP
+# CPU Table
 
 # Worksheets Chapter:
 #  1.  Obtain the Shared File
@@ -82,8 +85,34 @@ wksheets.t: wksheets_NOTIMES.t TIMES
 wksheets.texi: wksheets.t Makefile
 	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
 	    -u "Top" \
+	    -n "Timing Specification" ${*}.t
+
+# Timing Specification Chapter:
+#  1.  Copy the Shared File
+#  3.  Build Node Structure
+
+timing.t: ../../common/timing.t
+	cp ../../common/timing.t timing.t
+
+timing.texi: timing.t Makefile
+	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+	    -u "Top" \
 	    -n "HP-7100 Timing Data" ${*}.t
 
+# Timing Chapter
+
+timetbl.t: ../../common/timetbl.t
+	sed -e 's/TIMETABLE_NEXT_LINK/Command and Variable Index/' \
+            <../../common/timetbl.t >timetbl.t
+
+timetbl.texi: timetbl.t TIMES
+	${REPLACE} -p TIMES timetbl.t
+	mv timetbl.t.fixed timetbl.texi
+
+timedata.texi: timedata.t TIMES
+	${REPLACE} -p TIMES timedata.t
+	mv timedata.t.fixed timedata.texi
+
 html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
@@ -95,6 +124,7 @@ clean:
 	rm -f $(PROJECT) $(PROJECT)-*
 	rm -f c_hppa1_1 c_hppa1_1-*
 	rm -f timedata.texi timetbl.texi timetbl.t intr.texi
+	rm -f timing.t timing.texi
 	rm -f wksheets.t wksheets_NOTIMES.t $(GENERATED_FILES)
 	rm -f *.fixed _*
 
diff --git a/doc/supplements/hppa1_1/cpumodel.t b/doc/supplements/hppa1_1/cpumodel.t
index 1a4d357697..834892ee75 100644
--- a/doc/supplements/hppa1_1/cpumodel.t
+++ b/doc/supplements/hppa1_1/cpumodel.t
@@ -6,20 +6,8 @@
 @c  $Id$
 @c
 
-@ifinfo
-@node CPU Model Dependent Features, CPU Model Dependent Features Introduction, Preface, Top
-@end ifinfo
 @chapter CPU Model Dependent Features
-@ifinfo
-@menu
-* CPU Model Dependent Features Introduction::
-* CPU Model Dependent Features CPU Model Name::
-@end menu
-@end ifinfo
 
-@ifinfo
-@node CPU Model Dependent Features Introduction, CPU Model Dependent Features CPU Model Name, CPU Model Dependent Features, CPU Model Dependent Features
-@end ifinfo
 @section Introduction
 
 Microprocessors are generally classified into
@@ -61,9 +49,6 @@ The set of CPU model feature macros are defined in the file
 c/src/exec/score/cpu/hppa1_1/hppa.h based upon the particular CPU
 model defined on the compilation command line.
 
-@ifinfo
-@node CPU Model Dependent Features CPU Model Name, Calling Conventions, CPU Model Dependent Features Introduction, CPU Model Dependent Features
-@end ifinfo
 @section CPU Model Name
 
 The macro CPU_MODEL_NAME is a string which designates
diff --git a/doc/supplements/hppa1_1/hppa1_1.texi b/doc/supplements/hppa1_1/hppa1_1.texi
index c9154b1850..dfa20f5db5 100644
--- a/doc/supplements/hppa1_1/hppa1_1.texi
+++ b/doc/supplements/hppa1_1/hppa1_1.texi
@@ -71,7 +71,7 @@ END-INFO-DIR-ENTRY
 @include bsp.texi
 @include cputable.texi
 @include wksheets.texi
-@include ../../common/timing.texi
+@include timing.texi
 @include timedata.texi
 @ifinfo
 @node Top, Preface, (dir), (dir)
diff --git a/doc/supplements/hppa1_1/timedata.t b/doc/supplements/hppa1_1/timedata.t
index 1df9b4abea..0168d4f3b5 100644
--- a/doc/supplements/hppa1_1/timedata.t
+++ b/doc/supplements/hppa1_1/timedata.t
@@ -7,7 +7,7 @@
 @c
 
 @ifinfo
-@node HP-7100 Timing Data, HP-7100 Timing Data Introduction, Memory Requirements RTEMS RAM Workspace Worksheet, Top
+@node HP-7100 Timing Data, HP-7100 Timing Data Introduction, Timing Specification Terminology, Top
 @end ifinfo
 @chapter HP-7100 Timing Data
 @ifinfo