Commit Graph

247 Commits (da4c0dbaa0a453af6b1903554ccff1df7b98825c)

Author SHA1 Message Date
gdisirio a94bfc5f71 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7461 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-11-02 15:24:30 +00:00
gdisirio 359413415a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7460 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-11-02 10:41:41 +00:00
gdisirio c4642d4164 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7459 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-11-02 10:33:19 +00:00
gdisirio a5454ca785 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7458 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-11-02 10:22:36 +00:00
barthess 6d74608aff RTCv2. Alarm numbering now uses more intuitive scheme (starting from 0).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7453 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-11-01 18:51:06 +00:00
barthess 220e3a4c5c RTCv1. Improved comments.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7444 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-11-01 15:50:19 +00:00
barthess d37f6cb1f3 RTCv1. Time converstion functions moved to rtc.c(h). Chrtclib deleted.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7443 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-11-01 15:44:30 +00:00
barthess 96f976382d RTCv1. Driver ported to ChibiOS-3.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7442 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-11-01 13:22:15 +00:00
gdisirio b665c20b66 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7435 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-10-30 14:24:38 +00:00
gdisirio 82e9c928eb Fixed bug #542.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7430 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-26 13:01:33 +00:00
gdisirio 6eab72aacf Fixed bug #541.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7428 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-26 12:28:22 +00:00
gdisirio d47ce46522 Fixed bug #540.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7426 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-26 11:50:09 +00:00
barthess be302132c7 FSMC. Files moved to
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7414 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-18 12:23:31 +00:00
gdisirio 7c0786cae1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7413 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-10-18 09:23:06 +00:00
gdisirio b2c261eeee git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7411 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-10-17 12:28:10 +00:00
gdisirio a708e083e1 Improvements to the ICU driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7409 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-17 07:31:40 +00:00
barthess 46c3999c09 FSMC. Fixed bank base definitions.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7402 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-15 19:29:35 +00:00
gdisirio de71c96d0c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7360 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-10-04 08:09:17 +00:00
gdisirio c74da79d45 Fixed bug #539.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7359 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-10-04 07:57:37 +00:00
gdisirio 00735a2a01 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7348 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-10-02 12:06:56 +00:00
gdisirio 130db5dfc5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7347 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-10-02 12:00:19 +00:00
gdisirio 0c3a229030 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7333 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-30 10:23:05 +00:00
gdisirio c822cd9ad1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7329 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-28 08:24:30 +00:00
gdisirio 9c182920f1 New STM32F3xx headers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7328 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-09-28 08:06:08 +00:00
gdisirio b5f1aa15ec git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7327 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-27 08:35:24 +00:00
gdisirio f15f3af02d git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7298 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-21 11:42:29 +00:00
gdisirio 7fa620e9fb git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7285 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-15 22:17:35 +00:00
gdisirio 5577312e9e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7283 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-15 22:07:11 +00:00
barthess a8e8a1bd6d Fixed typo (chSysLockFromIsr -> chSysLockFromISR)
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7279 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-09-15 07:00:37 +00:00
gdisirio a8042eea48 Fixed bug #531.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7273 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-09-14 08:07:49 +00:00
gdisirio 653a7e9ad0 Fixed bug #534.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7271 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-09-14 07:52:27 +00:00
gdisirio ee3a27ccf9 Fixed RTC on STM32F0xx.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7228 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-09-01 09:32:56 +00:00
gdisirio 051dd39583 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7224 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-09-01 08:27:52 +00:00
gdisirio 5f454cad47 Improved icuWaitCapture().
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7212 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-31 17:32:29 +00:00
gdisirio 6c97d4f6fb Enhanced ICU driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7211 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-31 17:21:02 +00:00
gdisirio 87e4b85755 Improvements to the ICU driver (not finished).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7210 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-31 14:24:12 +00:00
gdisirio e40ae97638 Enhanced PWM driver
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7208 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-30 13:54:04 +00:00
barthess 425bc3d030 [FSMC SRAM] Naming convention fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7201 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-26 18:38:24 +00:00
barthess 4c53f50dd3 [FSMC SRAM] Added driver code.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7195 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-26 08:21:43 +00:00
barthess d12b4ee252 [FSMC NAND] Low level driver cosmetical cleanup
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7194 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-26 08:18:49 +00:00
barthess 00c270af7a [STM32 FSMC NAND] Driver variant using dedicated FSMC interrupts finished and tested in hardware.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7176 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-14 15:29:19 +00:00
gdisirio 282f43823a Fixed bug #522.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7154 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-07 11:47:30 +00:00
barthess 683c4ac7af STM32 FSMC NAND. Polishing driver after hardware tests.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7152 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-07 08:53:41 +00:00
barthess 156ff76940 STM32 FSMC NAND. Change driver file layout and naming conventions.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7145 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-06 21:17:02 +00:00
barthess 70574490da STM32 FSMC NAND. Cleaned rest of v2.6 calls
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7130 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-05 14:37:04 +00:00
barthess f5063b9072 STM32 FSMC NAND. Fixed license notes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7125 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-05 08:17:43 +00:00
barthess 88a09ec741 Added FSMC NAND driver
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7123 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-08-05 08:00:56 +00:00
gdisirio da71f08558 Fixed bug #518.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7104 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-07-28 12:11:55 +00:00
gdisirio df18715f17 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7100 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-07-26 09:24:53 +00:00
gdisirio f7aebc96d5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7012 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-07-07 13:00:34 +00:00
gdisirio 04683ac245 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7011 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-07-06 21:12:50 +00:00
gdisirio 9b9e7833b1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7010 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-07-06 13:18:12 +00:00
gdisirio fb4739b12b lwIP code by Eddie, not fully "RT-free" in the HAL LLD.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7009 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-07-05 16:09:29 +00:00
gdisirio 852f75dabe Fixed bug #512.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6997 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-06-29 16:42:19 +00:00
gdisirio 6711ff45ea git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6987 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-06-13 12:08:53 +00:00
gdisirio 7b584490f3 Fixed the fix...
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6985 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-06-08 08:52:27 +00:00
gdisirio 8bcf3434a8 Fixed bug #511.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6983 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-06-08 07:06:10 +00:00
gdisirio 19abd0018b Fixed various errors.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6940 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-19 14:11:00 +00:00
gdisirio d2358743d7 Fixed bug #503.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6935 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-14 08:21:58 +00:00
gdisirio 9b11ca4993 Fixed bug #496.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6930 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-12 09:26:23 +00:00
gdisirio e0dbac1295 Fixed bug #495.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6928 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-12 09:06:49 +00:00
gdisirio 643b4167f4 Fixed bug #497.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6923 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-08 13:14:52 +00:00
gdisirio a9472ba1a1 Fixed bug #493.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6906 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-03 07:24:35 +00:00
gdisirio fbe16d0988 Fixed bug #373.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6905 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-05-02 10:05:33 +00:00
gdisirio 42b31676df git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6900 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-04-30 14:27:22 +00:00
gdisirio d54439d5fa Fixed bug #492.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6897 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-30 14:17:51 +00:00
gdisirio 2b0b55a4dd Fixed bug #489.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6890 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-27 16:56:34 +00:00
gdisirio 91216f2404 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6886 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-04-26 09:58:18 +00:00
gdisirio ce7758eb01 Fixed bug #486.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6876 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-22 08:53:25 +00:00
gdisirio 2f7fab8fb3 Fixed bug #485.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6873 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-22 08:38:11 +00:00
gdisirio d855e1cf6c Fixed bug #484.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6852 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-21 08:20:14 +00:00
gdisirio 610bc93341 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6844 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-04-16 15:14:32 +00:00
gdisirio b25d252f84 Fixed wrong I2S DMA settings.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6843 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-10 08:58:51 +00:00
gdisirio 4877499dfc Fixed bug #482.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6840 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-04-06 11:45:05 +00:00
gdisirio 297e4befc1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6838 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-04-04 07:20:40 +00:00
gdisirio e156a82f76 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6837 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-04-03 13:38:54 +00:00
gdisirio c90c328606 Fixed bug #477.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6794 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-19 15:13:24 +00:00
gdisirio 55475920fd Fixed bug #471 except USB change.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6774 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-16 09:53:11 +00:00
gdisirio c3f7c51a7d git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6763 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-09 19:25:49 +00:00
gdisirio 348784fdf2 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6762 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-09 11:55:46 +00:00
gdisirio aa5e4b5e81 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6761 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-08 17:48:23 +00:00
gdisirio 004c5bac06 GPT is usable without callbacks now (trigger, counter).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6760 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-08 17:41:14 +00:00
gdisirio 6bc9f636b5 More enhancements to the GPT driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6759 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-08 10:19:32 +00:00
gdisirio f40d33139e STM32 GPT enhancements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6758 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-07 18:01:52 +00:00
gdisirio a6224d1964 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6754 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-05 10:30:58 +00:00
gdisirio 590c1329a4 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6753 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-05 10:24:50 +00:00
gdisirio b3bb01c2d2 I2S starts doing something.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6750 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-04 10:43:55 +00:00
gdisirio b5650c0457 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6749 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-03 14:57:32 +00:00
gdisirio 8c4653a413 I2S driver (over SPIv1) finished but untested.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6748 35acf78f-673a-0410-8e92-d51de3d6d3f4
2014-03-03 13:19:56 +00:00
gdisirio 5599a0f0c3 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6747 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-03 10:47:00 +00:00
gdisirio 351ff9c8cc git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6744 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-03-02 15:15:21 +00:00
gdisirio 27261ab8a6 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6715 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-02-16 09:12:08 +00:00
gdisirio 58fd763110 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6673 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-02-08 15:50:16 +00:00
gdisirio 57d5ba67c5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6672 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-02-08 15:45:58 +00:00
gdisirio 23f759922d git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6667 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-02-05 19:55:42 +00:00
gdisirio 6cb1afbda0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6654 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-01-28 15:48:34 +00:00
gdisirio 156a9e9fa7 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6643 35acf78f-673a-0410-8e92-d51de3d6d3f4 2014-01-24 14:25:46 +00:00