diff --git a/docs/Doxyfile b/docs/Doxyfile index 00c357794..d46f442fd 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.4 +PROJECT_NUMBER = 1.3.5 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. 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. diff --git a/readme.txt b/readme.txt index 3f60fb448..f4e150977 100644 --- a/readme.txt +++ b/readme.txt @@ -2,6 +2,8 @@ *** Releases *** ***************************************************************************** +*** 1.3.5 *** + *** 1.3.4 *** - FIX: Fixed bug in STM32 PAL port driver (bug 2897636). - FIX: Fixed problem with ARM-CM3 context switch when compiled at level