diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-15 13:03:13 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-15 13:03:13 +0000 |
| commit | 89a9bbf48fe87a6d76226e80723930617380c369 (patch) | |
| tree | 06de81124d0ceebb8c3b6046a33bf37e608915c4 /os | |
| parent | b946702ef873964d0f9a2201f4069740a172a273 (diff) | |
| download | ChibiOS-89a9bbf48fe87a6d76226e80723930617380c369.tar.gz ChibiOS-89a9bbf48fe87a6d76226e80723930617380c369.tar.bz2 ChibiOS-89a9bbf48fe87a6d76226e80723930617380c369.zip | |
Fixed MMC driver states graph, changed version numbers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1306 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/io/io.dox | 21 | ||||
| -rw-r--r-- | os/kernel/include/ch.h | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/os/io/io.dox b/os/io/io.dox index 9f1b06d7f..d854ae828 100644 --- a/os/io/io.dox +++ b/os/io/io.dox @@ -276,28 +276,29 @@ wait [label="MMC_WAIT\nWaiting Card"];
inserted [label="MMC_INSERTED\nCard Inserted"];
ready [label="MMC_READY\nCard Ready"];
- reading [label="MMC_RUNNING\nReading"];
- writing [label="MMC_RUNNING\nWriting"];
+ reading [label="MMC_READING\nReading"];
+ writing [label="MMC_WRITING\nWriting"];
uninit -> stop [label="mmcObjectInit()"];
stop -> wait [label="mmcStart()", constraint=false];
- wait -> inserted [label="Insertion"];
- inserted -> ready [label="mmcConnect()"];
+ wait -> inserted [label="insertion (inserted event)"];
inserted -> inserted [label="mmcDisconnect()"];
+ inserted -> ready [label="mmcConnect()"];
+ ready -> ready [label="mmcConnect()"];
ready -> inserted [label="mmcDisconnect()"];
ready -> reading [label="mmcStartSequentialRead()"];
reading -> reading [label="mmcSequentialRead()"];
reading -> ready [label="mmcStopSequentialRead()"];
- reading -> ready [label="Error"];
+ reading -> ready [label="read error"];
ready -> writing [label="mmcStartSequentialWrite()"];
writing -> writing [label="mmcSequentialWrite()"];
writing -> ready [label="mmcStopSequentialWrite()"];
- writing -> ready [label="Error"];
+ writing -> ready [label="write error"];
- inserted -> wait [label="Removal"];
- ready -> wait [label="Removal"];
- reading -> wait [label="Removal"];
- writing -> wait [label="Removal"];
+ inserted -> wait [label="removal (removed event)"];
+ ready -> wait [label="removal (removed event)"];
+ reading -> wait [label="removal (removed event)"];
+ writing -> wait [label="removal (removed event)"];
any -> stop2 [label="mmcStop()"];
}
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 242f5e7a2..2596073ca 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -35,7 +35,7 @@ /**
* Kernel version string. */
-#define CH_KERNEL_VERSION "1.3.4unstable"
+#define CH_KERNEL_VERSION "1.3.5unstable"
/**
* Kernel version major number. @@ -50,7 +50,7 @@ /**
* Kernel version patch number. */
-#define CH_KERNEL_PATCH 4
+#define CH_KERNEL_PATCH 5
/*
* Common values.
|