diff --git a/c_user/overview.rst b/c_user/overview.rst index 8165b67..19f994d 100644 --- a/c_user/overview.rst +++ b/c_user/overview.rst @@ -120,7 +120,7 @@ serves as a buffer between the project dependent application code and the target hardware. Most hardware dependencies for real-time applications can be localized to the low level device drivers. -.. figure:: rtemsarc.png +.. figure:: ../images/c_user/rtemsarc.png :width: 488 :height: 100px :align: center @@ -146,7 +146,7 @@ routines. Together these components provide a powerful run time environment that promotes the development of efficient real-time application systems. The following figure illustrates this organization: -.. figure:: rtemspie.png +.. figure:: ../images/c_user/rtemspie.png :width: 70% :align: center :alt: RTEMS Internal Architecture diff --git a/c_user/scheduling_concepts.rst b/c_user/scheduling_concepts.rst index 6425ab3..64acf69 100644 --- a/c_user/scheduling_concepts.rst +++ b/c_user/scheduling_concepts.rst @@ -327,7 +327,7 @@ It will remain in the dormant state until it is started via the task is now permitted to be scheduled for the processor and to compete for other system resources. -.. figure:: states.png +.. figure:: ../images/c_user/states.png :width: 70% :align: center :alt: Task State Transitions diff --git a/c_user/semaphore_manager.rst b/c_user/semaphore_manager.rst index 86a9a29..f60d395 100644 --- a/c_user/semaphore_manager.rst +++ b/c_user/semaphore_manager.rst @@ -241,7 +241,7 @@ ordered blocking discipline must be applied to a binary semaphore in order to use either the priority inheritance or priority ceiling functionality. The following tree figure illustrates the valid combinations. -.. figure:: semaphore_attributes.png +.. figure:: ../images/c_user/semaphore_attributes.png :width: 90% :align: center :alt: Semaphore Attributes diff --git a/common/waf.py b/common/waf.py index ba63409..6512253 100644 --- a/common/waf.py +++ b/common/waf.py @@ -119,17 +119,29 @@ def doc_singlehtml(ctx, source_dir, conf_dir): def html_resources(ctx): - for dir in ["_static", "_templates"]: - files = ctx.path.parent.find_node("common").ant_glob("%s/*" % dir) - ctx.path.get_bld().make_node(dir).mkdir() # dirs + for dir_name in ["_static", "_templates"]: + files = ctx.path.parent.find_node("common").ant_glob("%s/*" % dir_name) + ctx.path.get_bld().make_node(dir_name).mkdir() # dirs ctx( features = "subst", is_copy = True, source = files, - target = [ctx.bldnode.find_node(dir).get_bld().make_node(x.name) for x in files] + target = [ctx.bldnode.find_node(dir_name).get_bld().make_node(x.name) for x in files] ) + # copy images +# ctx.path.get_bld().make_node("images").mkdir() +# files = ctx.path.parent.ant_glob("images/**") +# ctx( +# features = "subst", +# is_copy = True, +# source = files, +# target = [x.srcpath().replace("../", "") for x in files] +# ) + + + def cmd_build(ctx, conf_dir=".", source_dir="."): srcnode = ctx.srcnode.abspath() diff --git a/c_user/rtemsarc.png b/images/c_user/rtemsarc.png similarity index 100% rename from c_user/rtemsarc.png rename to images/c_user/rtemsarc.png diff --git a/c_user/rtemspie.png b/images/c_user/rtemspie.png similarity index 100% rename from c_user/rtemspie.png rename to images/c_user/rtemspie.png diff --git a/c_user/semaphore_attributes.png b/images/c_user/semaphore_attributes.png similarity index 100% rename from c_user/semaphore_attributes.png rename to images/c_user/semaphore_attributes.png diff --git a/c_user/states.png b/images/c_user/states.png similarity index 100% rename from c_user/states.png rename to images/c_user/states.png diff --git a/user/start/msys2-minw64-start-menu.png b/images/msys2-minw64-start-menu.png similarity index 100% rename from user/start/msys2-minw64-start-menu.png rename to images/msys2-minw64-start-menu.png diff --git a/networking/images/PCIreg.jpg b/images/networking/PCIreg.jpg similarity index 100% rename from networking/images/PCIreg.jpg rename to images/networking/PCIreg.jpg diff --git a/networking/images/networkflow.jpg b/images/networking/networkflow.jpg similarity index 100% rename from networking/images/networkflow.jpg rename to images/networking/networkflow.jpg diff --git a/networking/images/recvbd.jpg b/images/networking/recvbd.jpg similarity index 100% rename from networking/images/recvbd.jpg rename to images/networking/recvbd.jpg diff --git a/networking/dec_21140.rst b/networking/dec_21140.rst index 03133d8..615839d 100644 --- a/networking/dec_21140.rst +++ b/networking/dec_21140.rst @@ -59,7 +59,7 @@ PowerPC target. .. COMMENT: PCI Device's Configuration Header Space Format -.. image:: images/PCIreg.jpg +.. image:: ../images/networking/PCIreg.jpg .. COMMENT: XXX add crossreference to PCI Register Figure @@ -123,7 +123,7 @@ to the DEC21140 Hardware Manual. .. COMMENT: Buffer Descriptor -.. image:: images/recvbd.jpg +.. image:: images/networking/recvbd.jpg Receiver Thread diff --git a/networking/network_task_structure.rst b/networking/network_task_structure.rst index c6f7dfc..664098a 100644 --- a/networking/network_task_structure.rst +++ b/networking/network_task_structure.rst @@ -9,7 +9,7 @@ Network Task Structure and Data Flow A schematic diagram of the tasks and message *mbuf* queues in a simple RTEMS networking application is shown in the following figure: -.. image:: images/networkflow.jpg +.. image:: ../images/networking/networkflow.jpg The transmit task for each network interface is normally blocked waiting for a diff --git a/user/start/depend.rst b/user/start/depend.rst index 028bf41..5f52471 100644 --- a/user/start/depend.rst +++ b/user/start/depend.rst @@ -243,7 +243,7 @@ examples of what you can do. Open a 64bit MSYS shell from the Start Menu: -.. figure:: msys2-minw64-start-menu.png +.. figure:: ../../images/msys2-minw64-start-menu.png :width: 50% :align: center :alt: MSYS2 64bit Shell Start Menu