[bootlin/training-materials updates] master: Kernel slides: minor improvements (332be42d)

Michael Opdenacker michael.opdenacker at bootlin.com
Thu Sep 12 16:02:21 CEST 2019


Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/332be42d6ee7709db3e7db137ac1e9133f955de5

>---------------------------------------------------------------

commit 332be42d6ee7709db3e7db137ac1e9133f955de5
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Thu Sep 12 16:02:21 2019 +0200

    Kernel slides: minor improvements
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


>---------------------------------------------------------------

332be42d6ee7709db3e7db137ac1e9133f955de5
 slides/kernel-device-model/dt-inheritance.dia      | 121 ++++++++----
 .../kernel-driver-development-interrupts.tex       |   2 +-
 .../ioremap.dia                                    | 205 ++++++++++++++-------
 .../kernel-driver-development-io-memory.tex        |   2 +-
 slides/kernel-frameworks2/kernel-frameworks2.tex   |  14 +-
 slides/kernel-input/kernel-input.tex               |   2 +-
 6 files changed, 237 insertions(+), 109 deletions(-)

diff --git a/slides/kernel-device-model/dt-inheritance.dia b/slides/kernel-device-model/dt-inheritance.dia
index 8a3b6821..5492c94d 100644
--- a/slides/kernel-device-model/dt-inheritance.dia
+++ b/slides/kernel-device-model/dt-inheritance.dia
@@ -2,10 +2,10 @@
 <dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
   <dia:diagramdata>
     <dia:attribute name="background">
-      <dia:color val="#ffffff"/>
+      <dia:color val="#ffffffff"/>
     </dia:attribute>
     <dia:attribute name="pagebreak">
-      <dia:color val="#000099"/>
+      <dia:color val="#000099ff"/>
     </dia:attribute>
     <dia:attribute name="paper">
       <dia:composite type="paper">
@@ -37,6 +37,9 @@
     </dia:attribute>
     <dia:attribute name="grid">
       <dia:composite type="grid">
+        <dia:attribute name="dynamic">
+          <dia:boolean val="true"/>
+        </dia:attribute>
         <dia:attribute name="width_x">
           <dia:real val="1"/>
         </dia:attribute>
@@ -53,7 +56,7 @@
       </dia:composite>
     </dia:attribute>
     <dia:attribute name="color">
-      <dia:color val="#d8e5e5"/>
+      <dia:color val="#d8e5e5ff"/>
     </dia:attribute>
     <dia:attribute name="guides">
       <dia:composite type="guides">
@@ -61,8 +64,27 @@
         <dia:attribute name="vguides"/>
       </dia:composite>
     </dia:attribute>
+    <dia:attribute name="display">
+      <dia:composite type="display">
+        <dia:attribute name="antialiased">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="snap-to-grid">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="snap-to-object">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="show-grid">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="show-connection-points">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+      </dia:composite>
+    </dia:attribute>
   </dia:diagramdata>
-  <dia:layer name="Arrière-plan" visible="true" active="true">
+  <dia:layer name="Arrière-plan" visible="true" connectable="true" active="true">
     <dia:object type="Standard - Box" version="0" id="O0">
       <dia:attribute name="obj_pos">
         <dia:point val="5,5"/>
@@ -83,10 +105,10 @@
         <dia:real val="0.10000000149011612"/>
       </dia:attribute>
       <dia:attribute name="border_color">
-        <dia:color val="#868686"/>
+        <dia:color val="#868686ff"/>
       </dia:attribute>
       <dia:attribute name="inner_color">
-        <dia:color val="#e5e5e5"/>
+        <dia:color val="#e5e5e5ff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -112,10 +134,10 @@
         <dia:real val="0.10000000149011612"/>
       </dia:attribute>
       <dia:attribute name="border_color">
-        <dia:color val="#868686"/>
+        <dia:color val="#868686ff"/>
       </dia:attribute>
       <dia:attribute name="inner_color">
-        <dia:color val="#e5e5e5"/>
+        <dia:color val="#e5e5e5ff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -141,10 +163,10 @@
         <dia:real val="0.10000000149011612"/>
       </dia:attribute>
       <dia:attribute name="border_color">
-        <dia:color val="#868686"/>
+        <dia:color val="#868686ff"/>
       </dia:attribute>
       <dia:attribute name="inner_color">
-        <dia:color val="#e5e5e5"/>
+        <dia:color val="#e5e5e5ff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -186,7 +208,7 @@
             <dia:point val="5.71716,6.28284"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -202,7 +224,7 @@
         <dia:point val="25.8943,5.88"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.8943,5.32875;36.7905,10.0275"/>
+        <dia:rectangle val="25.8943,5.345;36.7743,9.995"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -224,7 +246,7 @@
             <dia:point val="25.8943,5.88"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -272,7 +294,7 @@
             <dia:point val="21.0672,21.9364"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -305,7 +327,7 @@
             <dia:point val="21,12"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -338,7 +360,7 @@
             <dia:point val="29,19"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -371,7 +393,7 @@
             <dia:point val="16.26,17.4343"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -404,7 +426,7 @@
             <dia:point val="5.11636,4.52416"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -437,7 +459,7 @@
             <dia:point val="29.8324,15.555"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -471,7 +493,7 @@ BeagleBone boards#</dia:string>
             <dia:point val="25.2595,3.16298"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -504,7 +526,7 @@ BeagleBone boards#</dia:string>
             <dia:point val="20.3462,19.9914"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -537,7 +559,7 @@ BeagleBone boards#</dia:string>
             <dia:point val="34.0136,33.8514"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -550,10 +572,10 @@ BeagleBone boards#</dia:string>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="41.1447,25.1812"/>
+        <dia:point val="41.4447,25.1812"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.1447,24.4412;51.8372,26.9812"/>
+        <dia:rectangle val="41.4447,24.0412;57.9597,27.9581"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -566,13 +588,13 @@ DTB contents;#</dia:string>
             <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
+            <dia:real val="1.2347221747040749"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="41.1447,25.1812"/>
+            <dia:point val="41.4447,25.1812"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -603,10 +625,10 @@ DTB contents;#</dia:string>
         <dia:real val="0.10000000149011612"/>
       </dia:attribute>
       <dia:attribute name="border_color">
-        <dia:color val="#868686"/>
+        <dia:color val="#868686ff"/>
       </dia:attribute>
       <dia:attribute name="inner_color">
-        <dia:color val="#e5e5e5"/>
+        <dia:color val="#e5e5e5ff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -643,7 +665,7 @@ DTB contents;#</dia:string>
             <dia:point val="42.9943,5.89902"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -676,7 +698,7 @@ DTB contents;#</dia:string>
             <dia:point val="38.1,12.019"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -709,7 +731,7 @@ DTB contents;#</dia:string>
             <dia:point val="46.9324,15.574"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -742,7 +764,40 @@ DTB contents;#</dia:string>
             <dia:point val="42.006,4.50783"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O20">
+      <dia:attribute name="obj_pos">
+        <dia:point val="43.45,25.1"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="43.45,24.505;43.45,25.2525"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="43.45,25.1"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
diff --git a/slides/kernel-driver-development-interrupts/kernel-driver-development-interrupts.tex b/slides/kernel-driver-development-interrupts/kernel-driver-development-interrupts.tex
index 175be1f8..749a6df9 100644
--- a/slides/kernel-driver-development-interrupts/kernel-driver-development-interrupts.tex
+++ b/slides/kernel-driver-development-interrupts/kernel-driver-development-interrupts.tex
@@ -208,7 +208,7 @@ int devm_request_threaded_irq(
     not directly used by drivers, but by complete kernel subsystems
     (network, etc.)
   \item The list of softirqs is defined in
-    \kfile{include/linux/interrupt.h}: \ksym{HI_SOFTIRQ}, \ksym{TIMER_SOFTIRQ}
+    \kfile{include/linux/interrupt.h}: \ksym{HI_SOFTIRQ}, \ksym{TIMER_SOFTIRQ},
     \ksym{NET_TX_SOFTIRQ}, \ksym{NET_RX_SOFTIRQ}, \ksym{BLOCK_SOFTIRQ},
     \ksym{IRQ_POLL_SOFTIRQ}, \ksym{TASKLET_SOFTIRQ},
     \ksym{SCHED_SOFTIRQ}, \ksym{HRTIMER_SOFTIRQ}, \ksym{RCU_SOFTIRQ}
diff --git a/slides/kernel-driver-development-io-memory/ioremap.dia b/slides/kernel-driver-development-io-memory/ioremap.dia
index 74ddd980..54b0434e 100644
--- a/slides/kernel-driver-development-io-memory/ioremap.dia
+++ b/slides/kernel-driver-development-io-memory/ioremap.dia
@@ -2,10 +2,10 @@
 <dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
   <dia:diagramdata>
     <dia:attribute name="background">
-      <dia:color val="#ffffff"/>
+      <dia:color val="#ffffffff"/>
     </dia:attribute>
     <dia:attribute name="pagebreak">
-      <dia:color val="#000099"/>
+      <dia:color val="#000099ff"/>
     </dia:attribute>
     <dia:attribute name="paper">
       <dia:composite type="paper">
@@ -37,6 +37,9 @@
     </dia:attribute>
     <dia:attribute name="grid">
       <dia:composite type="grid">
+        <dia:attribute name="dynamic">
+          <dia:boolean val="true"/>
+        </dia:attribute>
         <dia:attribute name="width_x">
           <dia:real val="1"/>
         </dia:attribute>
@@ -53,7 +56,7 @@
       </dia:composite>
     </dia:attribute>
     <dia:attribute name="color">
-      <dia:color val="#d8e5e5"/>
+      <dia:color val="#d8e5e5ff"/>
     </dia:attribute>
     <dia:attribute name="guides">
       <dia:composite type="guides">
@@ -61,14 +64,33 @@
         <dia:attribute name="vguides"/>
       </dia:composite>
     </dia:attribute>
+    <dia:attribute name="display">
+      <dia:composite type="display">
+        <dia:attribute name="antialiased">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="snap-to-grid">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+        <dia:attribute name="snap-to-object">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="show-grid">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="show-connection-points">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+      </dia:composite>
+    </dia:attribute>
   </dia:diagramdata>
-  <dia:layer name="Arrière-plan" visible="true" active="true">
+  <dia:layer name="Arrière-plan" visible="true" connectable="true" active="true">
     <dia:object type="Standard - Line" version="0" id="O0">
       <dia:attribute name="obj_pos">
         <dia:point val="16,10.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.935,4.38299;31.1038,10.565"/>
+        <dia:rectangle val="15.935,4.42451;31.065,10.565"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="16,10.5"/>
@@ -142,6 +164,10 @@
       </dia:connections>
     </dia:object>
     <dia:group>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
+      </dia:attribute>
+      <dia:attribute name="matrix"/>
       <dia:object type="Standard - Box" version="0" id="O3">
         <dia:attribute name="obj_pos">
           <dia:point val="9,5"/>
@@ -162,10 +188,10 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#5cacff"/>
+          <dia:color val="#5cacffff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#add8e6"/>
+          <dia:color val="#add8e6ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -191,10 +217,10 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#a34804"/>
+          <dia:color val="#a34804ff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#ffd192"/>
+          <dia:color val="#ffd192ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -220,14 +246,17 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#868686"/>
+          <dia:color val="#868686ff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#e5e5e5"/>
+          <dia:color val="#e5e5e5ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
         </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O4" connection="8"/>
+        </dia:connections>
       </dia:object>
       <dia:object type="Standard - Box" version="0" id="O6">
         <dia:attribute name="obj_pos">
@@ -249,21 +278,24 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#d9cb2f"/>
+          <dia:color val="#d9cb2fff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#fff8a8"/>
+          <dia:color val="#fff8a8ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
         </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O5" connection="8"/>
+        </dia:connections>
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O7">
         <dia:attribute name="obj_pos">
           <dia:point val="12.5,8.5"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="11.0725,7.9075;13.9275,9.0925"/>
+          <dia:rectangle val="11.095,7.75625;13.905,9.24375"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -277,10 +309,10 @@
               <dia:real val="1.2699999511241913"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="12.5,8.8525"/>
+              <dia:point val="12.5,8.92875"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000"/>
+              <dia:color val="#000000ff"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="1"/>
@@ -291,7 +323,7 @@
           <dia:enum val="2"/>
         </dia:attribute>
         <dia:connections>
-          <dia:connection handle="0" to="O4" connection="8"/>
+          <dia:connection handle="0" to="O6" connection="8"/>
         </dia:connections>
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O8">
@@ -299,7 +331,7 @@
           <dia:point val="12.5,12.5"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="10.2763,11.9075;14.7238,13.0925"/>
+          <dia:rectangle val="10.7538,11.7562;14.2462,13.2438"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -313,10 +345,10 @@
               <dia:real val="1.2699999511241913"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="12.5,12.8525"/>
+              <dia:point val="12.5,12.9287"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000"/>
+              <dia:color val="#000000ff"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="1"/>
@@ -326,16 +358,13 @@
         <dia:attribute name="valign">
           <dia:enum val="2"/>
         </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O5" connection="8"/>
-        </dia:connections>
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O9">
         <dia:attribute name="obj_pos">
           <dia:point val="12.5,17.5"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="11.3812,16.9075;13.6187,18.0925"/>
+          <dia:rectangle val="11.3875,16.7563;13.6125,18.2438"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -349,10 +378,10 @@
               <dia:real val="1.2699999511241913"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="12.5,17.8525"/>
+              <dia:point val="12.5,17.9288"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000"/>
+              <dia:color val="#000000ff"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="1"/>
@@ -362,9 +391,6 @@
         <dia:attribute name="valign">
           <dia:enum val="2"/>
         </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O6" connection="8"/>
-        </dia:connections>
       </dia:object>
       <dia:object type="Standard - Box" version="0" id="O10">
         <dia:attribute name="obj_pos">
@@ -386,10 +412,10 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#2f004a"/>
+          <dia:color val="#2f004aff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#efb9ff"/>
+          <dia:color val="#efb9ffff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -397,6 +423,10 @@
       </dia:object>
     </dia:group>
     <dia:group>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
+      </dia:attribute>
+      <dia:attribute name="matrix"/>
       <dia:object type="Standard - Box" version="0" id="O11">
         <dia:attribute name="obj_pos">
           <dia:point val="31,2"/>
@@ -417,10 +447,10 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#5cacff"/>
+          <dia:color val="#5cacffff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#add8e6"/>
+          <dia:color val="#add8e6ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -446,10 +476,10 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#2f004a"/>
+          <dia:color val="#2f004aff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#efb9ff"/>
+          <dia:color val="#efb9ffff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -475,10 +505,10 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#d9cb2f"/>
+          <dia:color val="#d9cb2fff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#fff8a8"/>
+          <dia:color val="#fff8a8ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
@@ -489,7 +519,7 @@
           <dia:point val="41,6"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="39.4025,5.4075;42.5975,6.5925"/>
+          <dia:rectangle val="39.64,5.25625;42.36,6.74375"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -503,10 +533,10 @@
               <dia:real val="1.2699999511241913"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="41,6.3525"/>
+              <dia:point val="41,6.42875"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000"/>
+              <dia:color val="#000000ff"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="1"/>
@@ -522,7 +552,7 @@
           <dia:point val="41,17"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="39.8425,16.3631;42.1871,17.6369"/>
+          <dia:rectangle val="40.0562,16.2563;41.9438,17.7438"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -536,10 +566,10 @@
               <dia:real val="1.2699999511241913"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="41,17.3377"/>
+              <dia:point val="41,17.4288"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000"/>
+              <dia:color val="#000000ff"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="1"/>
@@ -570,14 +600,17 @@
           <dia:real val="0.10000000149011612"/>
         </dia:attribute>
         <dia:attribute name="border_color">
-          <dia:color val="#6a8954"/>
+          <dia:color val="#6a8954ff"/>
         </dia:attribute>
         <dia:attribute name="inner_color">
-          <dia:color val="#c5e387"/>
+          <dia:color val="#c5e387ff"/>
         </dia:attribute>
         <dia:attribute name="show_background">
           <dia:boolean val="true"/>
         </dia:attribute>
+        <dia:connections>
+          <dia:connection handle="0" to="O13" connection="8"/>
+        </dia:connections>
       </dia:object>
       <dia:object type="Standard - Line" version="0" id="O17">
         <dia:attribute name="obj_pos">
@@ -594,7 +627,7 @@
           <dia:int val="1"/>
         </dia:attribute>
         <dia:attribute name="line_color">
-          <dia:color val="#cc1f1a"/>
+          <dia:color val="#cc1f1aff"/>
         </dia:attribute>
       </dia:object>
       <dia:object type="Standard - Text" version="1" id="O18">
@@ -602,7 +635,7 @@
           <dia:point val="34.5,8.5"/>
         </dia:attribute>
         <dia:attribute name="obj_bb">
-          <dia:rectangle val="33.3516,7.86306;35.6187,9.13694"/>
+          <dia:rectangle val="33.3875,7.75625;35.6125,9.24375"/>
         </dia:attribute>
         <dia:attribute name="text">
           <dia:composite type="text">
@@ -616,10 +649,10 @@
               <dia:real val="1.2699999511241913"/>
             </dia:attribute>
             <dia:attribute name="pos">
-              <dia:point val="34.5,8.83769"/>
+              <dia:point val="34.5,8.92875"/>
             </dia:attribute>
             <dia:attribute name="color">
-              <dia:color val="#000000"/>
+              <dia:color val="#000000ff"/>
             </dia:attribute>
             <dia:attribute name="alignment">
               <dia:enum val="1"/>
@@ -629,9 +662,6 @@
         <dia:attribute name="valign">
           <dia:enum val="2"/>
         </dia:attribute>
-        <dia:connections>
-          <dia:connection handle="0" to="O13" connection="8"/>
-        </dia:connections>
       </dia:object>
     </dia:group>
     <dia:object type="Standard - Text" version="1" id="O19">
@@ -639,12 +669,12 @@
         <dia:point val="18,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18,6.3175;22.1475,7.175"/>
+        <dia:rectangle val="18,6.12562;22.1894,7.28125"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#0xFFEBC00#</dia:string>
+            <dia:string>#0xAFFEBC00#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="Latin Modern Sans" style="0" name="Courier"/>
@@ -656,7 +686,7 @@
             <dia:point val="18,7"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -672,7 +702,7 @@
         <dia:point val="18,7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.9307,6.93178;18.0682,10.5971"/>
+        <dia:rectangle val="15.9318,6.93178;18.0682,10.5682"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="18,7"/>
@@ -699,7 +729,7 @@
         <dia:point val="24,3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.2975,2.3175;24,3.175"/>
+        <dia:rectangle val="19.9075,2.1525;24,3.2275"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -716,7 +746,7 @@
             <dia:point val="24,3"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="2"/>
@@ -732,7 +762,7 @@
         <dia:point val="24,3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.9406,2.94063;31.1093,4.72558"/>
+        <dia:rectangle val="23.9406,2.94063;31.0594,4.70216"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="24,3"/>
@@ -759,7 +789,7 @@
         <dia:point val="12.5,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.89906,21;16.0763,23.1199"/>
+        <dia:rectangle val="9.485,21;15.515,23.2983"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -774,10 +804,10 @@ Address Space#</dia:string>
             <dia:real val="1.0583332926034927"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="12.5,21.8122"/>
+            <dia:point val="12.5,21.9775"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="1"/>
@@ -796,7 +826,7 @@ Address Space#</dia:string>
         <dia:point val="34.5,25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.26,25;37.7647,27.1199"/>
+        <dia:rectangle val="31.72,25;37.28,27.2983"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -811,10 +841,10 @@ Address Space#</dia:string>
             <dia:real val="1.0583332926034927"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="34.5,25.8122"/>
+            <dia:point val="34.5,25.9775"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000"/>
+            <dia:color val="#000000ff"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="1"/>
@@ -828,5 +858,50 @@ Address Space#</dia:string>
         <dia:connection handle="0" to="O11" connection="6"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="Geometric - Five Point Star" version="1" id="O25">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1.45,15.9"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.17548,15.6289;3.72452,18.1921"/>
+      </dia:attribute>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="1.45,15.9"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="2"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="2"/>
+      </dia:attribute>
+      <dia:attribute name="line_width">
+        <dia:real val="0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000ff"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffffff"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_style">
+        <dia:enum val="0"/>
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="flip_horizontal">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="flip_vertical">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="subscale">
+        <dia:real val="1"/>
+      </dia:attribute>
+    </dia:object>
   </dia:layer>
 </dia:diagram>
diff --git a/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex b/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex
index 49407464..f245101b 100644
--- a/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex
+++ b/slides/kernel-driver-development-io-memory/kernel-driver-development-io-memory.tex
@@ -173,7 +173,7 @@ void iounmap(void __iomem *addr);
   \frametitle{ioremap()}
   \begin{center}
     \includegraphics[height=0.75\textheight]{slides/kernel-driver-development-io-memory/ioremap.pdf}\\
-    \code{ioremap(0xFFEBC00, 4096) = 0xCDEFA000}
+    \code{ioremap(0xAFFEBC00, 4096) = 0xCDEFA000}
   \end{center}
 \end{frame}
 
diff --git a/slides/kernel-frameworks2/kernel-frameworks2.tex b/slides/kernel-frameworks2/kernel-frameworks2.tex
index 6ff9385e..fea401b9 100644
--- a/slides/kernel-frameworks2/kernel-frameworks2.tex
+++ b/slides/kernel-frameworks2/kernel-frameworks2.tex
@@ -26,13 +26,9 @@
 
 \begin{frame}[fragile]
   \frametitle{File operations}
-  \begin{itemize}
-  \item Here are the most important operations for a character
-    driver. Many more exist. All of them are optional.
-  \end{itemize}
+  Here are the most important operations for a character
+  driver, from the definition of \kstruct{file_operations}:
 \begin{minted}[fontsize=\footnotesize]{c}
-#include <linux/fs.h>
-
 struct file_operations {
     struct module *owner;
     ssize_t (*read) (struct file *, char __user *,
@@ -44,8 +40,10 @@ struct file_operations {
     int (*mmap) (struct file *, struct vm_area_struct *);
     int (*open) (struct inode *, struct file *);
     int (*release) (struct inode *, struct file *);
+    ...
 };
 \end{minted}
+Many more operations exist. All of them are optional.
 \end{frame}
 
 \begin{frame}[fragile]
@@ -303,7 +301,7 @@ int main(void)
   \item Implemented in C files in \kdir{drivers/video/fbdev/core}
   \item Defines the user/kernel API
     \begin{itemize}
-    \item \kfile{include/uapi/linux/fb.h}
+    \item \kfile{include/uapi/linux/fb.h} (constants and structures)
     \end{itemize}
   \item Defines the set of operations a framebuffer driver must
     implement and helper functions for the drivers
@@ -480,7 +478,7 @@ void foo_remove(struct platform_device *pdev)
       devices, \kstruct{fb_info} for framebuffers, etc.
     \end{itemize}
   \item In addition to this structure, the driver usually needs to
-    store additional information about its device
+    store additional information about each device
   \item This is typically done
     \begin{itemize}
     \item By subclassing the appropriate framework structure
diff --git a/slides/kernel-input/kernel-input.tex b/slides/kernel-input/kernel-input.tex
index 81b29532..ac09bb8b 100644
--- a/slides/kernel-input/kernel-input.tex
+++ b/slides/kernel-input/kernel-input.tex
@@ -186,7 +186,7 @@ struct input_polled_dev {
     \code{poll()} method is mandatory, this function polls the device
     and posts input events.
   \item The fields \code{id}, \code{name}, \code{evbit} and \code{keybit} of
-    the \code{input} field must be initialized too.
+    the \kstruct{input} structure must be initialized too.
   \item If none of the \code{poll_interval} fields are filled then the
     default poll interval is 500ms.
   \item The device registration/unregistration is done with:




More information about the training-materials-updates mailing list