docs: Bump version to 1.4.4.

In raw REPL ">" indicates the prompt.  We originally read this character
upon entering the raw REPL, and after reading the last bit of the
output.  This patch changes the logic so the ">" is read only just
before trying to send the next command.  To make this work (and as an
added feature) the input buffer is now flushed upon entering raw REPL.

The main reason for this change is so that pyboard.py recognises the EOF
when sys.exit() is called on the pyboard.  Ie, if you run pyboard.py
with a script that calls sys.exit(), then pyboard.py will exit after
the sys.exit() is called.

.gitattributes

@@ -0,0 +1,31 @@
+# Per default everything gets normalized and gets LF line endings on checkout.
+* text eol=lf
+
+# These will always have CRLF line endings on checkout.
+*.vcxproj text eol=crlf
+*.props text eol=crlf
+*.bat text eol=crlf
+
+# These are binary so should never be modified by git.
+*.png binary
+*.jpg binary
+*.dxf binary
+
+# These should also not be modified by git.
+tests/basics/string_cr_conversion.py -text
+tests/basics/string_crlf_conversion.py -text
+stmhal/startup_stm32f40xx.s -text
+stmhal/pybcdc.inf_template -text
+stmhal/usbd_* -text
+stmhal/boards/*/stm32f4xx_hal_conf.h -text
+stmhal/cmsis/** -text
+stmhal/hal/** -text
+stmhal/usbdev/** -text
+stmhal/usbhost/** -text
+cc3200/hal/aes.c -text
+cc3200/hal/aes.h -text
+cc3200/hal/des.c -text
+cc3200/hal/i2s.c -text
+cc3200/hal/i2s.h -text
+cc3200/version.h -text
+lib/fatfs/** -text

.gitignore

@@ -33,5 +33,7 @@ tests/*.out
 ######################
 __pycache__/
 
-# Customized Makefile overrides
+# Customized Makefile/project overrides
+######################
 GNUmakefile
+user.props

.travis.yml

@@ -7,9 +7,11 @@ before_script:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
   - sudo apt-get update -qq
-  - sudo apt-get install -y python3.3 python3 gcc-4.7 gcc-multilib gcc-arm-none-eabi qemu-system mingw32
+  - sudo apt-get install -y python3.4 python3 gcc-4.7 gcc-multilib gcc-arm-none-eabi qemu-system mingw32
   # For teensy build
   - sudo apt-get install realpath
+  # For coverage testing
+  - sudo pip install cpp-coveralls
 
 script:
   - make -C minimal test
@@ -25,8 +27,17 @@ script:
   - make -C cc3200 BTARGET=bootloader  BTYPE=release
   - make -C windows CROSS_COMPILE=i586-mingw32msvc-
 
-  - (cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests)
-  - (cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests --emit native)
+  # run tests without coverage info
+  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests)
+  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native)
+
+  # run tests with coverage info
+  - make -C unix CC=gcc-4.7 coverage
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests)
+  - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native)
+
+after_success:
+  - (cd unix && coveralls --root .. --build-root . --gcov $(which gcov-4.7) --gcov-options '\-o build-coverage/' --include py --include extmod)
 
 after_failure:
   - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)

ACKNOWLEDGEMENTS

@@ -0,0 +1,914 @@
+The Micro Python project was proudly and successfully crowdfunded
+via a Kickstarter campaign which ended on 13th December 2013.  The
+project was supported by 1923 very generous backers, who pledged
+for a total of 2320 pyboards.
+
+Damien George, the project creator, is grateful to the people
+listed below (and others who asked not to be named), whose support
+of the project help make the code in this repository what it is
+today.  The names appear in order of pledging.
+
+    3 Cliff Senkbeil
+    4 MacDefender (http://www.macdefender.org)
+   11 Shaun Walker - http://theshaun.com
+   12 Robert Joscelyne
+   17 Peter Simon, Germany
+   18 theNetImp
+   21 Eamonn Maguire
+   22 Rob Knegjens
+   27 Greg, https://www.logre.eu
+   28 Rick S
+   30 Norman Jaffe (OpenDragon)
+   34 UltraBob was here.
+   35 Geoffrey R. Thompson
+   36 MrAtoni
+   40 Proud to be a backer of Micro Python, Phil C. United Kingdom.
+   42 www.babybadger.co.uk
+   45 Mert
+   46 Miles Cederman-Haysom
+   47 unixarmy.com
+   52 Proud to be here! Tonton Pommes
+   54 Espen Sae-Tang Ottersen
+   56 howang.hk
+   58 Innovatology
+   59 Marzsman
+   63 Tristan A. Hearn
+   64 Patrick Clarke
+   65 Bryan Lyon
+   70 Craig Burkhead
+   72 Dr Igor Vizir
+   73 Steve Iltis, @steven_iltis
+   79 www.giacomo.inches.ch
+   80 Alexander Gordeyev
+   81 Steve Conklin www.ai4qr.com
+   83 n1c0la5
+   84 Matthew R. Johnson
+   86 Jeppe Rishede
+   87 Kirill Zakharenko - Russian Federation
+   88 beltwaybureau.com
+   93 felix svoboda
+   95 Smart
+   96 Stephen Goudge
+   97 Dr Richard Whitaker, www.drrich.co.uk, UK
+   99 Tim Robertson
+  101 Rudy De Volder, www.devolder.be,  Belgium
+  104 August H., Wien
+  107 Jason Hsu
+  109 dstensnes
+  110 Joe Reynolds (professorlamp)
+  112 Michael Davies (AU) - @butterparty @spaceduststudio
+  113 Jim Kirk, Westborough, MA, USA
+  114 yfnt
+  117 Even when it looks like someone is reaching for blue sky. Some days you just have to blindly support that dreamer.
+  118 G. Todd Vaules - todd.vaules.net
+  122 Gunnar Wehrhahn
+  124 Eric Masser
+  126 Vaibhav Sagar
+  128 Eric Wallstedt
+  129 Richard G Wiater
+  130 Toby Nance
+  132 Michael Fogleman
+  133 Snepo Research www.snepo.com Gary says Hi!
+  137 nic gihl
+  138 Felix Yuan
+  139 mmhanif
+  141 James Snyder
+  144 roddyr2
+  146 Richard Jones <http://mechanicalcat.net/richard>
+  147 Jon-Eric Simmons
+  148 Craig "The Coder" Dunn
+  150 Jesse S (USA)
+  151 Matt I. - github.com/pengii23
+  153 Seth Borders - sethborders.com
+  155 David Zemon (http://david.zemon.name)
+  156 Garry DuBose
+  157 Apeiron Systems
+  158 BAR
+  160 Jakob Hedman
+  163 Bryan Moffatt
+  165 Moises Lorenzo, Tenerife Isl.
+  166 Erik H.
+  170 Peter George
+  171 Nikolas Akerblom
+  174 Chris (@chassing)
+  176 Wei-Ning Huang
+  178 Edd Barrett, UK
+  179 Alec Langford
+  180 Shunya Sato
+  181 Serge GUILLAUME
+  183 Dr. Ross A Lumley
+  184 Dorian Pula
+  189 Tendayi Mawushe
+  190 SDanziger
+  191 Sean O'Donnell
+  192 Kevin McLaughlin
+  193 Tommy Allen
+  194 Beedlebub
+  195 Brad Howes
+  196 Mike B
+  200 Aleš Bublík
+  202 David Dever
+  206 Danilo Bargen, https://dbrgn.ch/
+  209 Brendan Curran-Johnson
+  210 Piotr Maliński http://www.rkblog.rk.edu.pl
+  211 SEE Co. - Science, Engineering and Education Co. - www.seeco.us
+  215 Richard Lancaster
+  218 Bilbo Baggins from Middle Zealand
+  219 Ollie Guy
+  221 Shlomo Zippel
+  222 Andy Kenny
+  223 Double-O-ren
+  226 For the pleasure of @tinproject
+  229 mfr
+  230 Eric Floehr
+  232 Matt from Adp.EU.Com
+  234 Joanna Tustanowska & Wojciech Bederski
+  235 Eric LeBlanc
+  236 Siggy , Belgium
+  238 Mauro De Giorgi
+  239 Belug http://belug.ca/
+  241 Arik Baratz - @arikb
+  242 Zvika Palkovich
+  243 Yves Dorfsman - yves at zioup dot com
+  244 Asad Ansari, Canada
+  245 Brandon Bennett
+  246 Christoph Bluoss
+  248 Konstantin Renner
+  249 Abtin Afshar
+  250 A. Soltani
+  251 Jon Mills
+  256 NoisyGecko
+  258 Lothilius
+  262 Jay Deiman
+  263 flo at twigs dot de
+  265 _Mark_ eichin at thok dot org
+  267 Adrian Astley
+  268 aknerats[::-1]
+  271 @robberwick
+  272 Daniele Lacamera
+  273 Thanks to M. Derome
+  275 Paul Paradigm, Australia
+  276 lyuden
+  277 www.SamuelJohn.de
+  279 John Pinner, funthyme at gmail dot com
+  280 Michael and Vicky Twomey-Lee
+  281 Kenneth Ljungqvist
+  292 Karin Beitins, Australia
+  295 Nick Johnson
+  297 Chris Cole  U.K.
+  298 The planet Andete is famous for its killer edible poets.
+  302 Patrick B (aged 11)
+  304 Chris Mason, Australia
+  306 Steven Foster
+  308 Pat Fleury, Andrew Hodgson
+  311 @moneywithwings
+  313 Neil Stephen
+  314 Cory A. Johannsen
+  315 Massimo Di Stefano - geofemengineering.it - Italy
+  317 James Luscher, Madison, Wisconsin, USA
+  319 Lindsay Watt
+  320 Nils Fischbeck
+  324 Peter J. Farrell - Maestro Publishing, LLC - Minneapolis, MN, USA
+  325 Alex Willmer (@moreati)
+  328 T.R. Renicker
+  329 William B. Phelps
+  330 David Goodger
+  331 Viktoriya Skoryk
+  334 JR Rickerson
+  336 Keven Webb
+  338 www.hcfengineering.com
+  341 Larry Lab Rat, Shalford.
+  342 Rob Hetland
+  343 Brush Technology (NZ)
+  346 Jason Fehr
+  347 Olivier Vigneresse
+  348 Nano Gennari, me at nngn dot net, Brasilia, Brazil
+  352 Petr Viktorin (http://encukou.cz)
+  355 Karijn Wessing (IN2TECH)
+  356 Arsham Hatambeiki
+  358 Alvaro Rivera-Rei
+  360 Nolan & Theo Baldwin
+  362 Tyler Baker, USA
+  363 Russell Warren (Canada)
+  365 Aaron Peterson
+  366 Al Billings
+  367 Jeremy Herbert
+  372 Dimitrios Bogiatzoules, www.bogiatzoules.de, Germany
+  375 Paul Nicholls
+  376 Robert F. Brost
+  378 Aideen (Cambridge, UK) - Very happy backer and follower of this great project
+  379 Caelan Borowiec
+  380 Caroline, Canada - carolinesimpson.ca
+  382 Rikard Anglerud
+  383 Scott Will
+  384 Jussi Ylanen
+  385 @joshbapiste
+  387 spongefile
+  389 Keith Baston
+  392 Holger Steinlechner
+  394 sent by State mail service
+  398 N.Pearce, Wells UK - @t #ashtag UK
+  399 Paid up & stood back;;
+  401 Mike M. Tempe, AZ, USA
+  406 Brandon Jasper
+  407 Dan Mahoney
+  411 George Bushnell, for use in CPSS
+  412 Per Konradsson
+  413 Supported by afinzel
+  417 Tom Igoe
+  418 Jonathan Saggau
+  419 Chris Allick http://chrisallick.com
+  420 joshuaalbers.com
+  423 B. Adryan
+  432 Tim Fuchs
+  433 steven antalics
+  434 BezouwenR
+  435 Andrew Addison
+  436 Hubert de L'arrêtdubus - France
+  437 Salim Fadhley
+  438 Ben Hockley
+  439 Geoffrey Webb
+  441 Vladimir Mikulik
+  442 7 Elements & Troy Benjegerdes - hozer at hozed dot org
+  443 Pashakun
+  444 Craig Barnes, UK
+  445 Andres Ayala
+  446 Stonly Baptiste (urban.us)
+  448 Brian Conner
+  452 Jeremy Blum (jeremyblum.com)
+  454 Pebble Technology
+  455 Andrew
+  456 Jeffrey Allen Randorf, PE PhD
+  457 J.A.Zaratiegui a.k.a. Zara
+  459 simon.vc and hack.rs
+  462 La vida es para vivirla y ser feliz, de esa forma damos gracias por tan gran regalo!
+  463 Alistair Walsh
+  469 fun, Ireland
+  474 martijnthe.nl
+  479 Andreas Kobara
+  486 Armanda
+  487 Richard Myhill
+  488 Ash Gibbons
+  489 Glenn Franxman HackerMojo.com
+  492 Russell Durrett
+  494 Pieter Ennes
+  495 Tom Gross, Washington D.C.
+  496 Mark Schafer
+  497 Sandro Dutra, Brazil
+  500 Can Bulbul
+  501 Chih-Chun Chen, http://abmcet.net/Chih-Chun_Chen/home.html
+  502 Lost Property Bureau Ltd
+  503 skakz
+  504 Chad Cooper
+  505 Makhan Virdi, mlvirdi.com, InfinityXLabs.com, USA
+  506 Glenn Ruben Bakke, Norway
+  507 Alasdair Allan
+  509 dlbrandon
+  511 Dr J Garcia, Sweden
+  513 Tiago Vieira
+  518 Team ME
+  519 OBD Solutions (http://www.obdsol.com)
+  520 @pors
+  521 Joo Chew Ang
+  523 garbas
+  526 http://epoz.org/
+  527 J. Sabater
+  530 José-María Súnico
+  537 Erfundnix
+  538 Tontonisback Belgium
+  539 Greg Benson, Professor, University of San Francisco
+  542 Thomas Sarlandie aka @sarfata
+  545 JanTheMan kickstarter at embedded-systems dot craftx dot biz
+  546 Chuhan Frank Qin
+  549 Peb R Aryan, Indonesia
+  553 Johan Deimert, http://www.ldchome.org
+  555 Conny Sjöblom / Finland
+  558 AndyboyH, UK
+  559 Anthony Lupinetti
+  561 Travis Travelstead
+  566 Siegfried Boyd Isidro-Cloudas
+  567 G. Schroeer
+  568 mmths, http://randomaccessmemory.at/
+  570 Andy Miller - NZ..
+  571 Rodolfo Lara from México
+  572 Gary Patton Wolfe
+  574 Vend-lab Russia
+  578 Super Job! FXF
+  579 Oliver Heggelbacher, www.kickdrive.de
+  581 James Husum
+  585 David Lodge
+  587 Tess
+  592 PR Taylor
+  593 6306665119
+  598 Jorg Bliesener, Brazil - www.bliesener.com
+  602 Rodrigo, Germany
+  605 Tanja Kaiser, www.mrsminirobot.de, Germany
+  606 Franco Ponticelli - www.weblob.net
+  608 Piet Hoffman
+  609 Paul Cunnane
+  610 Balazs Kinszler
+  611 Nathan Ramella (synthesizerpatel)
+  612 Tyler Jones (squirly)
+  613 James Saffery
+  614 Christoffer Sjowall
+  615 Iman Shames
+  616 Thomas Dejanovic, Australia.
+  618 Tom Alker
+  619 Matt Davis, UK
+  621 Design for the real world! @UXnightingale
+  622 Budd Van Lines
+  624 __Gio__
+  628 Chew Kok Hoor
+  630 Santiago Alarcon, Thanks Damien for Micro Python
+  632 hardtoneselector
+  633 supported by Chris Bunker
+  634 Sebus - France
+  635 Mechanical Men Sweden
+  638 A Fellow Electronics Enthusiast
+  639 Stan Seibert
+  642 Dave Curtis
+  652 Sebastian Ross - www.ross.sx
+  653 Julien Goodwin
+  654 Reinoud de Lange, the Netherlands
+  655 carl beck
+  659 John Gaidimas
+  660 Tyler Eckwright
+  661 Keith Rome (Wintellect - http://www.wintellect.com/blogs/krome)
+  662 Kashev Dalmia - kashevdalmia.com
+  666 Alberto Martín de la Torre
+  667 Niels Kjøller Hansen
+  668 pmst - Italy
+  671 Sergio Conde Gómez (skgsergio)
+  672 Micromint, www.micromint.com
+  673 Xie Yanbo, China
+  675 Thank you
+  677 Kacem Ben Dhiab
+  679 CornishSteve
+  680 Daniel Wood, Warrington, UK.
+  682 Greg "GothAck" Miell
+  688 Matt Williams & Sam Carter
+  691 Frédéric Lasnier
+  694 Tim K
+  697 Joshua Clarke, Guernsey!
+  700 daynewaterlow.com
+  703 Scott Winder
+  704 @DepletionMode
+  707 Maria Yablonina
+  710 Roger Hausermann
+  713 Crazy_Owl
+  714 mike hardin usa
+  717 C. Towne Springer
+  719 ursm gruesst euch
+  720 madnis
+  727 http://itay.bazoo.org
+  729 @0atman
+  730 Jerry Gagnon
+  732 Emmanuel Boyer
+  738 suspenders
+  739 Roland Frédéric - http://www.creativeconvergence.be/
+  742 @herchu
+  745 Riley Lundquist
+  746 Go LOBOS
+  749 João Alves, http://jpralves.net, Portugal
+  751 Nick Porcino
+  753 Jack E. Wilkinson, Texas, USA
+  754 @rcarmo on Twitter/Github
+  758 Matt Manuel, www.mattmanuel.com
+  759 Padraic D. Hallinan
+  760 Rob Fairbairn
+  763 Zac Luzader
+  768 Sam Shams
+  773 terje nagel, dk
+  775 Luc LEGER
+  782 Luis M. Morales S.
+  785 Charles Edward Pax
+  786 Daryl Cumbo
+  787 Zephyris13
+  788 Wonderful project.
+  792 Sylvain Maziere
+  794 Milen
+  795 Robert Mai, Germany, hsapps.com
+  797 Angelo Compagnucci angelo.compagnucci at gmail dot com
+  801 Long Live Micro Python, airtripper.com
+  804 António M P Mendes
+  805 Marc Z.
+  809 Anoyomouse
+  810 in memory of Dan J. Schlacks III
+  817 Peter Froehlich - http://werk-schau.blogspot.com
+  818 Ahmad Albaqsami
+  821 Peter Lavelle (http://solderintheveins.co.uk)
+  822 Manuel Sagra de Diego http://manuelsagra.com/
+  823 Sam Wilson
+  824 Khalis
+  825 c't Hacks
+  828 Georg Bremer
+  830 Ward en Sanne (WenS)
+  832 javacasm http://www.elcacharreo.com Spain
+  833 mctouch
+  835 Bruce Schreiner @ www.stevenscollege.edu/electronics
+  836 Jonas
+  839 Nick Ludlam
+  840 Patrick_Law, UK
+  843 Alex Crouzen, UK
+  848 Ben Banfield-Zanin
+  850 Wouter Slegers, Your Creative Solutions <http://www.yourcreativesolutions.nl/>
+  851 Fred Zyda
+  853 Gianfranco Risaliti
+  854 Ron Hochsprung
+  858 Vianney Tran
+  862 Aaron Mahler - http://halfpress.com
+  868 Stephan Schulte, Germany
+  869 Kenneth Henderick
+  872 DaveP (www.davepeake.com)
+  873 Markus Schuss, Austria
+  876 Kyle Gordon, http://lodge.glasgownet.com
+  877 Joseph Gerard Campbell
+  881 Thanks for the board. Good luck to you. --Jason Doege
+  883 Garet McKinley
+  884 www.magtouchelectronics.co.za
+  889 Ben Johnson
+  896 Ruairi Newman
+  897 Gemma Hentsch
+  902 Alexander Steppke
+  906 Stephen Paulger
+  907 Martin Buhr, http://lonelycode.com, UK
+  912 Dale Drummond
+  913 Go Utah State
+  918 Jarturomartinez, Mexico
+  921 Barry Bourne Micro Python Supporter
+  923 Andreas Bolka
+  927 Thanks Susan, Tom, Paul, and Mark!
+  935 http://wall-y.fr
+  937 Eero af Heurlin, Finland, https://github.com/rambo/
+  938 Guillaume DAVY
+  941 Alexander Steffen
+  942 Janne "Lietu" Enberg
+  945 Luca 'loop' de Marinis - https://github.com/loop23
+  946 Andras Veres-Szentkiralyi http://techblog.vsza.hu/
+  948 Florian flowolf Klien (http://blog.flo.cx)
+  949 nickyb
+  951 Mark Walland, England
+  952 Ian Barfield
+  953 Andrew Murray, UK - eat my code - http://links.bloater.org/micropython
+  955 Kyle Howells
+  956 Chris Cadonic
+  957 LCS, USA: scripting___/||\===/||\___embedded
+  958 Sven Wegener
+  963 Kean Electronics http://www.kean.com.au/
+  964 Beandob
+  965 Don't feed the troll.
+  966 Alexis Polti (http://rose.eu.org)
+  969 Scottyler
+  971 The Dead's Own Jones
+  974 Evseev Alexey
+  976 Arnaud
+  978 Jannis Rosenbaum
+  980 paul at fontenworks dot com
+  981 John Griessen ecosensory.com USA
+  982 Tobias Ammann
+  983 Simon V.
+  984 JaWi
+  987 Ergun Kucukkose
+  989 Jonathan Piat France
+  990 Steve Pemberton
+  993 Aaron Robson
+  994 Antoine Authier
+  995 Thomas Winkler, Austria
+  997 Jannes mit dem dicken Pannes
+ 1001 Joe Baker
+ 1002 Jon Hylands, Canada (blog.huv.com)
+ 1004 Mike Asker (aka mpymike)
+ 1007 Charles V Bock - Charles at CharlesBock dot com
+ 1010 Remember June 4th, 1989
+ 1012 Stuart Marsden
+ 1013 Herbert Graef, Stuttgart
+ 1014 Arthur P, USA
+ 1015 John Hall & Jeremy Armijo
+ 1017 Luciano Ramalho, Python.pro.br
+ 1018 Quentin Stafford-Fraser
+ 1019 Marcin Walendzik Ratingpedia.eu
+ 1020 Wincent Balin
+ 1022 rbp
+ 1024 Frank Carver ( www.frankcarver.me )
+ 1026 Peter Farmer, http://geekytronics.com/
+ 1029 Rubens Altimari
+ 1033 Sebastian
+ 1035 Gerli, Estonia
+ 1036 Maurin, Switzerland
+ 1037 Kevin Houlihan (http://crimsoncookie.com)
+ 1039 Jon Green of Adeptium Consulting (www.adeptium.com)
+ 1040 Eirik S. Mikkelsen
+ 1042 Jogy Sam
+ 1043 GGG
+ 1045 Sean E Palmer, epimetheon.com
+ 1049 Greg O'Drobinak, USA
+ 1050 RaptorBird Robotics Inc
+ 1051 Desmond Larsen-Rosner
+ 1056 Crusty
+ 1057 ArthurGuy.co.uk
+ 1059 Melissa-Ivan, 14/04/2013
+ 1064 Enrico Spinielli, https://github.com/espinielli
+ 1066 Dave Snowdon
+ 1067 Martin P. Hellwig
+ 1070 Carl Clement
+ 1074 Paul Taylor
+ 1076 Pandemon
+ 1082 Thrilled to support Damien's effort to put this together: there will no doubt be many applications for this effort and many enhancements and ports..
+ 1083 Oddvar Lovaas
+ 1090 BenScarb
+ 1093 Www.qualnetics.com
+ 1094 Manny Muro - Now Python can RULE from below as it does from above! PYTHON RULES!!! :)
+ 1095 Michael Grazebrook
+ 1098 Mark Shuttleworth, UK
+ 1106 wyzzar
+ 1110 Luca Zanetti
+ 1112 Carl A Fagg
+ 1115 Adam Klotblixt
+ 1118 Breawn
+ 1122 pippyisatruck
+ 1124 Andrew "ClothBot" Plumb
+ 1126 Realise the projects your heart beats for! Sven Wiebus (http://wiebus.tumblr.com)
+ 1128 Citius Systems
+ 1130 Benjamin & Reuben Fuller
+ 1131 aglimme
+ 1133 John Becker
+ 1135 Mark Drummond
+ 1138 JHProuty
+ 1141 Lars Olsson Sweden
+ 1144 daisuke, http://dkpyn.com
+ 1145 Chris Pawley - http://www.pawley.co.uk/honey/
+ 1147 Daniel from EzSBC.com
+ 1149 New York Mortgage Exchange NYME.COM
+ 1150 Herb Winters,USA,www.ecs87.com
+ 1151 renttu
+ 1159 Joe Rickerby
+ 1160 john guthrie
+ 1161 PUBLIC
+ 1163 dobra-dobra
+ 1164 Neil Reynolds, Staffordshire
+ 1165 GEHoward
+ 1166 Frank Delporte
+ 1167 Bauer Brauner Enterprise
+ 1168 Francisco Mardones
+ 1169 Ryan Kirkpatrick, @rkirkpatnet, http://rkirkpat.net/
+ 1170 Krister Svanlund
+ 1174 Derek Patton Pearcy
+ 1177 Roger Olsson, Sweden
+ 1179 Jan-Niklas Braak
+ 1180 Pete boy
+ 1181 MilenX
+ 1182 Ubbe Larsson
+ 1183 Simon Freethy
+ 1184 Daniel Andersson
+ 1187 Daniele Procida
+ 1190 Adrian Duke
+ 1191 Pauline Middelink
+ 1193 Ted Gueniche
+ 1197 Craig Knott, University of Queensland, Australia
+ 1198 Jamie Mackenzie - Australia
+ 1199 ravenoak
+ 1200 LucaP Luni Italy
+ 1203 jacanterbury
+ 1205 Bleachin, www.rhyspowell.com
+ 1207 Supported by Andrew Maier via Kickstarter
+ 1208 Rob, http://robjstanley.me.uk
+ 1210 George Gingell
+ 1213 Chris Elleman
+ 1215 Jack Barham - @jackbarham - http://jackbarham.com
+ 1221 Kyle Dausin
+ 1222 Ben Lucker
+ 1225 Gareth cheesewhisk Evans
+ 1226 Jacob Forsyth
+ 1227 Olof S - Germany
+ 1231 Brasil
+ 1233 glaslos
+ 1234 Will Cooke - http://www.whizzy.org
+ 1236 Andrew Wright - Canada
+ 1239 Resourceful Robin
+ 1240 Jay O'Neill @jayoneilluk
+ 1241 Dennis G Daniels
+ 1244 J. Peterson (www.saccade.com)
+ 1245 Chipaca
+ 1246 Nicko van Someren
+ 1247 C. Cumbaa, Canada
+ 1248 Gyro Gearloose was here
+ 1249 Magnus Ericmats, Sweden
+ 1253 Steve Wilson
+ 1256 Adrian Bullock
+ 1258 Sarevian & Longwall
+ 1261 Skipp Savage
+ 1265 Eric Nahon
+ 1267 Stuart Dallas / 3ft9 Ltd
+ 1270 USA
+ 1271 Oliver
+ 1277 jeffmcneill.com
+ 1278 alnjxn
+ 1283 Marc Liyanage
+ 1285 Christian Lange
+ 1286 Bryant Paul Umali from the Philippines
+ 1290 W.B.Hill, Norwich, UK
+ 1292 Michael Karliner
+ 1293 Oli Larkin
+ 1303 A. Pockberger
+ 1304 dc - bagel
+ 1305 Thadeus Arnel
+ 1308 technoweenie
+ 1309 Liam Welsh
+ 1313 Per Thorell, Sweden
+ 1314 peterlee
+ 1316 Dustin Mierau
+ 1317 tech-zen.tv
+ 1320 Cheers from IDF :)
+ 1322 www.a-d-k.de
+ 1323 rixx
+ 1324 @jlev
+ 1325 e2e4
+ 1328 Thomas J. Quinlan, London UK
+ 1329 Don Bone
+ 1331 Narayanamurthi
+ 1333 PGS_Astra-ProjeX_Wilts
+ 1337 Mark Schulz & Phillip Long, CEIT, The University of Queensland
+ 1340 Tiegeng (Tim) Ren
+ 1344 EMR_1344, DE
+ 1348 Matt Ward, Nottingham
+ 1351 Rupert
+ 1352 Cory Li - http://cory.li
+ 1354 Jim Davies, Brighton, UK
+ 1355 Jon Watkins, UK
+ 1356 Thomas, www.bitmix.de
+ 1359 Markus Gritsch
+ 1362 Carl H. Blomqvist
+ 1371 Brian Green
+ 1374 Ben Merryman
+ 1375 O'Dea
+ 1376 Josh Trujillo
+ 1378 Daniel Halloran
+ 1379 another_martin
+ 1383 Thanks for innovating!
+ 1385 CoderDojo Malahide
+ 1397 Jacob Z
+ 1398 Staffan Hillberg
+ 1399 http://kim.ht
+ 1402 Can't wait to plug it in!
+ 1403 Márton Szinovszki
+ 1405 sellorm says 'Hi!'
+ 1406 Thomas Provoost
+ 1411 Clive Freeman
+ 1412 Norman Thomas
+ 1415 Javier Llopis
+ 1417 Ho Man Fai
+ 1418 Anders Helland
+ 1421 Richard lavanture
+ 1425 Alan Churley, UK
+ 1426 Robert'); DROP TABLE Students;--unicode is fun!
+ 1427 Go Illini!
+ 1430 MicroPy FTW
+ 1431 Bryan Morrissey, www.browninnovations.com
+ 1436 Krzysztof Chomski, Poland
+ 1437 WellAware (USA)
+ 1441 Tomas Hau
+ 1443 Paul Way
+ 1444 Benjamin Anderson
+ 1445 Andrew Bates
+ 1446 Davide Di Blasi
+ 1451 Mathias Fischer
+ 1453 Drexore, NL
+ 1454 Marek Mroz
+ 1455 Mark Easley Jr. - USA
+ 1457 Joshua Warren
+ 1459 Rohan Menon
+ 1460 Paul Sokolovsky
+ 1461 Chris Foresman, @foresmac
+ 1475 USI
+ 1478 Chris Emerson
+ 1479 Ph. Truillet, France, http://www.irit.fr/~Philippe.Truillet
+ 1480 WAB3
+ 1481 Lucidologia.pl
+ 1482 Ed Hardebeck | www.hardebeck.us
+ 1484 Ludovic Léau-Mercier, www.coriolys.org, France
+ 1487 BLUEBOBO
+ 1488 Berno Kneer, Germany
+ 1491 Julian Eccli
+ 1494 Batman
+ 1495 Manuel Núñez Sánchez
+ 1496 Millie and Sadie Smith
+ 1499 Ronald Eddy
+ 1500 SynShop Las Vegas
+ 1503 This is really cool.  - Jack Conway
+ 1505 Victor Suarez, Argentina
+ 1507 Renesas Electronics America
+ 1509 Team
+ 1513 A. Lamborn KD0ZFY
+ 1514 olifink
+ 1520 mike at sustainable-opportunities dot com
+ 1521 luis almeida, Teresina - Brazil
+ 1523 Muhammad Jamaludin
+ 1524 Sdlion
+ 1525 Charles Rogers
+ 1526 Diego M. Aires, Brazil
+ 1529 muwatt.com
+ 1532 Proud supporter of microPython
+ 1535 Jesus J. de Felipe
+ 1536 slminneman.com -- Wow, an acknowledgement?  ...really?
+ 1538 Mike (Meski) Smith
+ 1541 Piero Steinger
+ 1545 Alex Rembish (https://rembish.org)
+ 1551 Sergey [BuG2BuG] Sobko, Russia
+ 1553 Serge Krier
+ 1556 Luuk Derksen
+ 1561 Jimmy Caille (CH)
+ 1562 Jesús Leganés Combarro "piranna"
+ 1564 Viacheslav Olegovich Savitskiy
+ 1565 Jamie Whitehorn
+ 1567 Bagge Carlson
+ 1568 Milan Cermak
+ 1569 Matthias Lemp
+ 1570 BOFG
+ 1571 Johan Elmerfjord, Sweden
+ 1573 Matt Finch • fnch.io
+ 1574 Jean-Francois Paris
+ 1575 Florian Franzen, Germany
+ 1576 doganowscy.com
+ 1579 Stan Yamane
+ 1580 William Cirillo
+ 1583 David Dibben
+ 1584 Nicolás, Amelia, Luli y alecu
+ 1586 Alex W
+ 1591 Livia Maria Dias Tavares
+ 1593 d freymann chicago il & his australian shepherd jaldi
+ 1594 Barnstorm Studio, LLC
+ 1595 Sashi Penta
+ 1597 tflhyl
+ 1598 clacktronics
+ 1599 j3hyde
+ 1600 Rik Williams
+ 1602 Valeriy Van, Ukraine, w7software.com
+ 1603 Louis Taylor - https://github.com/kragniz
+ 1606 What's the derivative of (6.022 x 10^23)x? That's A(n)mol
+ 1611 Bailey & Brayden Yoong Policarpio
+ 1613 William Bettridge-Radford
+ 1617 Urbane Jackson
+ 1618 Henius
+ 1622 Alister Galpin, New Zealand
+ 1623 Marco Bertoldi
+ 1627 Julian Pistorius
+ 1628 www.neotral.com
+ 1632 ChrisB
+ 1633 Norbini
+ 1634 Eric Rand at Brownhatsecurity.com
+ 1636 Benjamin Eberle
+ 1637 MG Projects bvba, Geert Maertens, Belgium
+ 1640 Robson dos Santos França (Brasil)
+ 1642 Udine
+ 1643 Simon Critchley
+ 1644 Sven Haiges, Germany
+ 1645 Yi Qing Sim
+ 1646 "silicium" ("silicium_one", if "silicium" is busy)
+ 1648 Andy O'Malia, @andyomalia
+ 1650 RedCamelApps.com
+ 1652 Christoph Heer
+ 1653 AlisonW
+ 1654 Yannick Allard (Belgium) supported this project.
+ 1655 Andy Pointon, UK
+ 1660 Diego Cantalapiedra
+ 1664 Pepillou
+ 1670 Sonny Cannon
+ 1671 Rick W
+ 1672 David Chan, USA
+ 1674 Philip Rowlands
+ 1675 dieresys
+ 1676 T.R. Fullhart
+ 1683 Oleg Sidorkin
+ 1686 Tatsuro Yasukawa
+ 1687 Brad Smith, Somerville MA, USA
+ 1688 kristoffervikhansen.com
+ 1690 Nice Project de W6AKB Alan Biocca
+ 1691 Hiss Hisss Hissss Hiss Hiss Hissssssss
+ 1692 Alan Kennedy
+ 1698 ElChessu
+ 1701 Flower Craswell
+ 1702 David Fontenot
+ 1707 To innovation & creativity. Tony J Winter
+ 1708 Joakim Hentula
+ 1711 Michael Schaefer
+ 1713 Brody Radford ~ www.brodyradford.com
+ 1714 Charles Durrant
+ 1715 Rodrigo S.
+ 1718 Dima Shylo
+ 1719 Jiahao James Jian
+ 1722 Helen Wilson, Christ's Hospital
+ 1726 Martin Aule, http://hackest.org/
+ 1727 İsmail Etem Tezcan, Rasteda
+ 1728 Charlie "Blackfrog" Sizer
+ 1729 Matloob Qureshi
+ 1730 Travis Saul http://travissaul.com
+ 1731 Michael Cavins
+ 1733 Peter Köllensperger, Norway
+ 1734 Anne Harrison
+ 1736 Peter Bradeen
+ 1739 Fredrik Luthander
+ 1740 Nick LaRosa
+ 1744 Aladuino
+ 1745 dgrebb
+ 1746 Truls Unstad
+ 1748 Jesus Saves
+ 1750 Andy Stannard (@rockmonkey)
+ 1751 Daniel Atkinson
+ 1755 John Potter
+ 1758 Ian V
+ 1760 David Leinbach
+ 1761 nemec-automation.com
+ 1765 Supported by JoW with Hardwired TCP/IP from www.WIZnet.eu
+ 1767 misskniss, Boise Idaho. It is our responsibility to code the freedom we want to see in the world.
+ 1768 Jeff Vahue - Knowlogic Software Corp.
+ 1769 Pat Molloy
+ 1770 Greg Maxwell  gregmaxwell-at-mac-dot-com
+ 1771 Rich Robinson
+ 1773 Ken Corey @ flippinbits.com
+ 1782 Acknowledged
+ 1785 Optimized Tomfoolery
+ 1791 Nontakan Nuntachit, Thailand
+ 1794 Rasit Eskicioglu - Canada
+ 1795 Simon Elliston Ball
+ 1796 pfh
+ 1798 John W. C. McNabb
+ 1799 Frank Sanborn
+ 1803 Morgan Hough
+ 1804 Sorcha Bowler
+ 1805 http://www.WayneKeenan.info
+ 1806 HBEE, hbee.eu
+ 1807 Deadlight
+ 1809 www.danenet.org
+ 1811 Sergey Nebolsin
+ 1813 Threv
+ 1817 dynsne
+ 1818 David Wright
+ 1819 John Warren
+ 1821 I wanted Erlang! (╯°□°)╯︵ ┻━┻
+ 1825 Howard R Hansen
+ 1828 Kevin Schumacher
+ 1833 Matthias Erll, Sweden
+ 1836 Matt Graham
+ 1837 thedawn
+ 1838 Ruby Feinstein
+ 1839 Gustavo Muñoz (timbergus)
+ 1840 Ian Paczek
+ 1841 Köteles Károly, Hungary
+ 1843 Tobias Sette Ferreira
+ 1846 x4FF3 <3 microPython
+ 1847 Enrico Faulhaber (Germany)
+ 1850 jolan00
+ 1854 Red Harbinger Inc
+ 1855 Noman
+ 1858 @DerLinkshaender
+ 1863 Jon Woodcock
+ 1864 Elmo, hakkerikartano.fi
+ 1865 Imaginals
+ 1866 Sam Hathaway and Rachel Stevens
+ 1874 Remo Sanges, SZN, Italy
+ 1875 Devraj Mukherjee
+ 1876 an Embedded fan
+ 1877 Peter Huisers
+ 1878 Kin-Wai Lee (Malaysia)
+ 1879 Samuel Hawksby-Robinson
+ 1881 R. Stock
+ 1886 Randy of Capistrano street backed Damien's MicroPython!
+ 1887 Rogério Bulha Siqueira - www.esd-talk.com - Brazil
+ 1889 NickE is happy to support such a worthy project!
+ 1892 John Boudreaux
+ 1894 Riverfreeloader
+ 1895 Jose Marcelino http://metavurt.net
+ 1896 T Britto-Borges
+ 1899 DannyWhitsonUSA
+ 1904 José Iván Ferrer Ruiz.
+ 1905 Tom Loredo
+ 1906 Gregory Perry USA
+ 1908 josephoberholtzer.com
+ 1910 Michael Klos, USA
+ 1912 Adam Mildenberger
+ 1913 R Anderson
+ 1914 Nikesh, USA
+ 1915 Bogdan Chivoiu, Romania
+ 1916 Scott C. Lemon, USA
+ 1918 Konstantin Ufimtsev (@KestL)
+ 1919 Benny Khoo
+ 1922 Nicci Tofts
+ 1925 Joshua Coxwell
+ 1926 Franklin Hamilton
+ 1928 Peter Korcz
+ 1929 Leroy Douglas
+ 1930 A ナルと fan from Nigeria who likes smileys, here's one for good measure  :)
+ 1931 Kimmo Lahtinen, Finland
+ 1932 http://staybles.co.uk
+ 1937 The Olivetti's: Emanuele Laura Nausicaa Sibilla Ettore
+ 1940 Pascal Hirsch
+ 1942 cbernander, Sweden
+ 1944 Enrico M.
+ 1947 Dinis Cruz
+ 1949 Jonathan Greig, http://embroidermodder.github.io
+ 1950 Andy Bower
+ 1952 Gerard Hickey
+ 1953 Fabrice BARRAL was here ...
+ 1955 Pieter Röhling
+ 1957 uomorando, Italy
+ 1959 Acacio Cruz

CONTRIBUTING.md

@@ -0,0 +1,8 @@
+When reporting an issue and especially submitting a pull request, please
+make sure that you are acquainted with Contributor Guidelines:
+
+https://github.com/micropython/micropython/wiki/ContributorGuidelines
+
+and Code Conventions:
+
+https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md

README.md

@@ -1,6 +1,12 @@
-[![Build Status][travis-img]][travis-repo]
+[![Build Status][travis-img]][travis-repo] [![Coverage Status][coveralls-img]][coveralls-repo] [![Issue Stats][istats-pr-img]][istats-pr-repo] [![Issue Stats][istats-issue-img]][istats-issue-repo]
 [travis-img]:  https://travis-ci.org/micropython/micropython.png?branch=master
 [travis-repo]: https://travis-ci.org/micropython/micropython
+[coveralls-img]:  https://coveralls.io/repos/micropython/micropython/badge.png?branch=master
+[coveralls-repo]: https://coveralls.io/r/micropython/micropython?branch=master
+[istats-pr-img]: http://issuestats.com/github/micropython/micropython/badge/pr
+[istats-pr-repo]: http://issuestats.com/github/micropython/micropython
+[istats-issue-img]: http://issuestats.com/github/micropython/micropython/badge/issue
+[istats-issue-repo]: http://issuestats.com/github/micropython/micropython
 
 The Micro Python project
 ========================
@@ -9,37 +15,42 @@ The Micro Python project
 </p>
 
 This is the Micro Python project, which aims to put an implementation
-of Python 3.x on a microcontroller.
+of Python 3.x on microcontrollers and small embedded systems.
 
-WARNING: this project is in early beta stage and is subject to large
-changes of the code-base, including project-wide name changes and API
-changes.
+WARNING: this project is in beta stage and is subject to changes of the
+code-base, including project-wide name changes and API changes.
 
 Micro Python implements the entire Python 3.4 syntax (including exceptions,
 "with", "yield from", etc.).  The following core datatypes are provided:
-str (no Unicode support yet), bytes, bytearray, tuple, list, dict, set,
-array.array, collections.namedtuple, classes and instances.  Builtin
-modules include sys, time, and struct.  Note that only subset of
+str (including basic Unicode support), bytes, bytearray, tuple, list, dict,
+set, frozenset, array.array, collections.namedtuple, classes and instances.
+Builtin modules include sys, time, and struct.  Note that only subset of
 Python 3.4 functionality implemented for the data types and modules.
 
 See the repository www.github.com/micropython/pyboard for the Micro
 Python board, the officially supported reference electronic circuit board.
 
 Major components in this repository:
-- py/ -- the core Python implementation, including compiler and runtime.
+- py/ -- the core Python implementation, including compiler, runtime, and
+  core library.
 - unix/ -- a version of Micro Python that runs on Unix.
 - stmhal/ -- a version of Micro Python that runs on the Micro Python board
   with an STM32F405RG (using ST's Cube HAL drivers).
-- teensy/ -- a version of Micro Python that runs on the Teensy 3.1
-  (preliminary but functional).
+- minimal/ -- a minimal Micro Python port. Start with this if you want
+  to port Micro Python to another microcontroller.
 
 Additional components:
-- bare-arm/ -- a bare minimum version of Micro Python for ARM MCUs.  Start
-  with this if you want to port Micro Python to another microcontroller.
+- bare-arm/ -- a bare minimum version of Micro Python for ARM MCUs. Used
+  mostly to control code size.
+- teensy/ -- a version of Micro Python that runs on the Teensy 3.1
+  (preliminary but functional).
+- pic16bit/ -- a version of Micro Python for 16-bit PIC microcontrollers.
+- cc3200/ -- a version of Micro Python that runs on the CC3200 from TI.
 - unix-cpy/ -- a version of Micro Python that outputs bytecode (for testing).
 - tests/ -- test framework and test scripts.
 - tools/ -- various tools, including the pyboard.py module.
 - examples/ -- a few example Python scripts.
+- docs/ -- official documentation in RST format.
 
 "make" is used to build the components, or "gmake" on BSD-based systems.
 You will also need bash and Python (at least 2.7 or 3.3).
@@ -110,6 +121,8 @@ preferably in a virtualenv:
 
 In `micropython/docs`, build the docs:
 
-    make html
+    make MICROPY_PORT=<port_name> BUILDDIR=<port_name>/build html
 
-You'll find the index page at `micropython/docs/build/html/index.html`.
+Where `<port_name>` can be `unix`, `pyboard`, `wipy` or `esp8266`.
+
+You'll find the index page at `micropython/docs/<port_name>/build/html/index.html`.

bare-arm/main.c

@@ -6,7 +6,6 @@
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
-#include "py/pfenv.h"
 
 void do_str(const char *src) {
     mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
@@ -23,7 +22,7 @@ void do_str(const char *src) {
         nlr_pop();
     } else {
         // uncaught exception
-        mp_obj_print_exception(printf_wrapper, NULL, (mp_obj_t)nlr.ret_val);
+        mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
     }
 }
 

bare-arm/mpconfigport.h

@@ -8,6 +8,8 @@
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_COMP_MODULE_CONST   (0)
 #define MICROPY_COMP_CONST          (0)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_MEM_STATS           (0)
 #define MICROPY_DEBUG_PRINTERS      (0)
 #define MICROPY_ENABLE_GC           (0)
@@ -25,6 +27,7 @@
 #define MICROPY_PY___FILE__         (0)
 #define MICROPY_PY_GC               (0)
 #define MICROPY_PY_ARRAY            (0)
+#define MICROPY_PY_ATTRTUPLE        (0)
 #define MICROPY_PY_COLLECTIONS      (0)
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_CMATH            (0)

cc3200/CC3200.ccxml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<configurations XML_version="1.2" id="configurations_0">
-    <configuration XML_version="1.2" id="Stellaris In-Circuit Debug Interface_0">
-        <instance XML_version="1.2" desc="Stellaris In-Circuit Debug Interface_0" href="connections/Stellaris_ICDI_Connection.xml" id="Stellaris In-Circuit Debug Interface_0" xml="Stellaris_ICDI_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Stellaris In-Circuit Debug Interface_0">
-            <instance XML_version="1.2" href="drivers/stellaris_cs_icepick.xml" id="drivers" xml="stellaris_cs_icepick.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/stellaris_cs_dap.xml" id="drivers" xml="stellaris_cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/stellaris_cortex_m4.xml" id="drivers" xml="stellaris_cortex_m4.xml" xmlpath="drivers"/>
-            <platform XML_version="1.2" id="platform_0">
-                <instance XML_version="1.2" desc="CC3200_0" href="devices/CC3200.xml" id="CC3200_0" xml="CC3200.xml" xmlpath="devices"/>
-            </platform>
-        </connection>
-    </configuration>
-</configurations>

cc3200/FreeRTOS/FreeRTOSConfig.h

@@ -85,12 +85,12 @@
 #define configTICK_RATE_HZ				        ( ( TickType_t ) 1000 )
 #define configMINIMAL_STACK_SIZE		        ( ( unsigned short ) 64 )
 #define configTOTAL_HEAP_SIZE			        ( ( size_t ) ( 16384 ) )
-#define configMAX_TASK_NAME_LEN			        ( 12 )
+#define configMAX_TASK_NAME_LEN			        ( 8 )
 #define configUSE_TRACE_FACILITY		        0
 #define configUSE_16_BIT_TICKS			        0
 #define configIDLE_SHOULD_YIELD			        1
 #define configUSE_CO_ROUTINES 			        0
-#define configUSE_MUTEXES				        1
+#define configUSE_MUTEXES				        0
 #define configUSE_RECURSIVE_MUTEXES		        0
 #ifdef DEBUG
 #define configCHECK_FOR_STACK_OVERFLOW	        1
@@ -151,9 +151,4 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
 version. */
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 
-#ifdef DEBUG
-#include "debug.h"
-#define configASSERT( x )                       ASSERT( x )
-#endif
-
 #endif /* FREERTOS_CONFIG_H */

cc3200/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c

@@ -202,6 +202,7 @@ static void prvTaskExitError( void );
 /*
  * See header file for description.
  */
+__attribute__ ((section (".boot")))
 StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
 {
 	/* Simulate the stack frame as it would be created by a context switch
@@ -220,6 +221,7 @@ StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t px
 }
 /*-----------------------------------------------------------*/
 
+__attribute__ ((section (".boot")))
 static void prvTaskExitError( void )
 {
 	/* A function that implements a task must not exit or attempt to return to
@@ -254,6 +256,7 @@ void vPortSVCHandler( void )
 }
 /*-----------------------------------------------------------*/
 
+__attribute__ ((section (".boot")))
 static void prvPortStartFirstTask( void )
 {
 	__asm volatile(
@@ -274,6 +277,7 @@ static void prvPortStartFirstTask( void )
 /*
  * See header file for description.
  */
+__attribute__ ((section (".boot")))
 BaseType_t xPortStartScheduler( void )
 {
 	/* configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to 0.
@@ -643,6 +647,7 @@ void xPortSysTickHandler( void )
  * Setup the systick timer to generate the tick interrupts at the required
  * frequency.
  */
+__attribute__ ((section (".boot")))
 __attribute__(( weak )) void vPortSetupTimerInterrupt( void )
 {
 	/* Calculate the constants required to configure the tick interrupt. */

cc3200/FreeRTOS/Source/tasks.c

@@ -515,6 +515,7 @@ static void prvResetNextTaskUnblockTime( void );
 
 /*-----------------------------------------------------------*/
 
+__attribute__ ((section (".boot")))
 BaseType_t xTaskGenericCreate( TaskFunction_t pxTaskCode, const char * const pcName, const uint16_t usStackDepth, void * const pvParameters, UBaseType_t uxPriority, TaskHandle_t * const pxCreatedTask, StackType_t * const puxStackBuffer, const MemoryRegion_t * const xRegions ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */
 {
 BaseType_t xReturn;
@@ -1454,6 +1455,7 @@ TCB_t * pxNewTCB;
 #endif /* ( ( INCLUDE_xTaskResumeFromISR == 1 ) && ( INCLUDE_vTaskSuspend == 1 ) ) */
 /*-----------------------------------------------------------*/
 
+__attribute__ ((section (".boot")))
 void vTaskStartScheduler( void )
 {
 BaseType_t xReturn;
@@ -2700,7 +2702,7 @@ static portTASK_FUNCTION( prvIdleTask, pvParameters )
 	}
 #endif /* configUSE_TICKLESS_IDLE */
 /*-----------------------------------------------------------*/
-
+__attribute__ ((section (".boot")))
 static void prvInitialiseTCBVariables( TCB_t * const pxTCB, const char * const pcName, UBaseType_t uxPriority, const MemoryRegion_t * const xRegions, const uint16_t usStackDepth ) /*lint !e971 Unqualified char types are allowed for strings and single characters only. */
 {
 UBaseType_t x;
@@ -2809,7 +2811,7 @@ UBaseType_t x;
 
 #endif /* portUSING_MPU_WRAPPERS */
 /*-----------------------------------------------------------*/
-
+__attribute__ ((section (".boot")))
 static void prvInitialiseTaskLists( void )
 {
 UBaseType_t uxPriority;
@@ -2912,7 +2914,7 @@ static void prvAddCurrentTaskToDelayedList( const TickType_t xTimeToWake )
 	}
 }
 /*-----------------------------------------------------------*/
-
+__attribute__ ((section (".boot")))
 static TCB_t *prvAllocateTCBAndStack( const uint16_t usStackDepth, StackType_t * const puxStackBuffer )
 {
 TCB_t *pxNewTCB;

cc3200/Makefile

@@ -1,20 +1,21 @@
 # Select the board to build for: if not given on the command line,
-# then default to LAUNCHXL
-BOARD ?= LAUNCHXL
+# then default to WIPY
+BOARD ?= WIPY
 ifeq ($(wildcard boards/$(BOARD)/.),)
 $(error Invalid BOARD specified)
 endif
 
+# Make 'release' the default build type
+BTYPE ?= release
+
 # If the build directory is not given, make it reflect the board name.
-BUILD ?= build/$(BOARD)
+BUILD ?= build/$(BOARD)/$(BTYPE)
 
 include ../py/mkenv.mk
 -include ../../localconfig.mk
 
 CROSS_COMPILE ?= arm-none-eabi-
 
-BTYPE ?= release
-
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -march=armv7e-m -mabi=aapcs -mcpu=cortex-m4 -msoft-float -mfloat-abi=soft -fsingle-precision-constant -Wdouble-promotion
 CFLAGS = -Wall -Wpointer-arith -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4)
 CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-unaligned-access

cc3200/README.md

@@ -1,6 +1,6 @@
 # Build Instructions for the CC3200
 
-Currently the CC3200 port of Micro Python builds under Linux and OSX and not under Windows.
+Currently the CC3200 port of Micro Python builds under Linux and OSX **but not under Windows**.
 
 The tool chain required for the build can be found at <https://launchpad.net/gcc-arm-embedded>.
 
@@ -13,25 +13,31 @@ In order to debug the port specific code, optimizations need to be disabled on t
 port file (check the Makefile for specific details). You can use CCS from TI.
 Use the CC3200.ccxml file supplied with this distribution for the debuuger configuration. 
 ```bash
-make BTARGET=application BTYPE=debug
+make BTARGET=application BTYPE=debug BOARD=LAUNCHXL
 ```
 ## To build an image suitable to be flashed to the device:
 ```bash
-make BTARGET=application BTYPE=release
+make BTARGET=application BTYPE=release BOARD=LAUNCHXL
 ```
 ## Building the bootloader
 ```bash
-make BTARGET=bootloader BTYPE=release
+make BTARGET=bootloader BTYPE=release BOARD=LAUNCHXL
 ```
 
+## Regarding old revisions of the CC3200-LAUNCHXL
+First silicon (pre-release) revisions of the CC3200 had issues with the ram blocks, and Micro Python cannot run
+there. Make sure to use a **v4.1 (or higer) LAUNCHXL board** when trying this port, otherwise it won't work.
+
 ## Flashing the CC3200
+- Make sure that you have built both the *bootloader* and the *application* in **release** mode.
 - Make sure the SOP2 jumper is in position.
 - Open CCS_Uniflash and connect to the board (by default on port 22). 
-- Format the serial flash (select 1MB size in case of the CC3200-LAUNCHXL, leave the rest unchecked).
-- Mark the following files for erasing: `/cert/ca.pem`, `/cert/client.pm`, `/cert/private.key` and `/tmp/pac.bin`.
-- Add a new file with the name of /sys/factimg.bin, and select the correct URL to point to cc3200\build\<BOARD_NAME>\MCUIMG.BIN.
+- Format the serial flash (select 1MB size in case of the CC3200-LAUNCHXL, 2MB in case of the WiPy, leave the rest unchecked).
+- Mark the following files for erasing: `/cert/ca.pem`, `/cert/client.pem`, `/cert/private.key` and `/tmp/pac.bin`.
+- Add a new file with the name of /sys/mcuimg.bin, and select the URL to point to cc3200\bootmgr\build\<BOARD_NAME>\bootloader.bin.
+- Add another file with the name of /sys/factimg.bin, and select the URL to point to cc3200\build\<BOARD_NAME>\mcuimg.bin.
 - Click "Program" to apply all changes.
-- Flash the latest service pack (servicepack_1.0.0.1.2.bin) using the "Service Pack Update" button.
+- Flash the latest service pack (servicepack_1.0.0.10.0.bin) using the "Service Pack Update" button.
 - Close CCS_Uniflash, remove the SOP2 jumper and reset the board.
 
 ## Playing with MicroPython and the CC3200:
@@ -41,15 +47,14 @@ Once the software is running, you have two options to access the MicroPython REP
 - Through the UART. 
   **Connect to PORT 22, baud rate = 115200, parity = none, stop bits = 1**
 - Through telnet. 
-  * Connect to the network created by the board (as boots up in AP mode), **ssid = "micropy-wlan", key = "micropython"**
+  * Connect to the network created by the board (as boots up in AP mode), **ssid = "wipy-wlan", key = "www.wipy.io"**.
     * You can also reinitialize the WLAN in station mode and connect to another AP, or in AP mode but with a
       different ssid and/or key.
   * Use your favourite telnet client with the following settings: **host = 192.168.1.1, port = 23.**
   * Log in with **user = "micro" and password = "python"**
 
-The board has a small file system of 64K located in the serial flash connected to the CC3200. SD cards are also supported, but
-since the CC3200 LaunchXL doesn't come with an SD card socket installed, you will need to add one yourself. Any SD card breakout
-board will do, as long as you connect it as described here: <http://processors.wiki.ti.com/index.php/CC32xx_SDHost_FatFS>
+The board has a small file system of 192K (WiPy) or 64K (Launchpad) located in the serial flash connected to the CC3200. 
+SD cards are also supported, you can connect any SD card and configure the pinout using the SD class API.
 
 ## Uploading scripts:
 
@@ -62,14 +67,14 @@ not 100% sure of it.
 ## Upgrading the firmware Over The Air:
 
 OTA software updates can be performed through the FTP server. After building a new MCUIMG.BIN in release mode, upload it to:
-`/SFLASH/SYS/MCUIMG.BIN` it will take around 8s (The TI simplelink file system is quite slow because every file is mirrored for
-safety). You won't see the file being stored inside `/SFLASH/SYS/` because it's actually saved bypassing FatFS, but rest assured that
+`/flash/sys/mcuimg.bin` it will take around 6s (The TI simplelink file system is quite slow because every file is mirrored for
+safety). You won't see the file being stored inside `/flash/sys/` because it's actually saved bypassing FatFS, but rest assured that
 the file was successfully transferred, and it has been signed with a MD5 checksum to verify its integrity. 
 Now, reset the MCU by pressing the switch on the board, or by typing:
 
 ```python
 import pyb
-pyb.hard_reset()
+pyb.reset()
 ```
 
 ### Note regarding FileZilla:
@@ -79,4 +84,3 @@ sure that encryption is set to: "Only use plain FTP (insecure)". In the Transfer
 to one, otherwise FileZilla will try to open a second command connection when retrieving and saving files, and for simplicity and 
 to reduce code size, only one command and one data connections are possible.
 
-  

cc3200/application.lds

@@ -1,41 +1,3 @@
-/*****************************************************************************
-* cc3200.lds
-*
-* GCC Linker script for the CC3200
-*
-* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
-* 
-* 
-*  Redistribution and use in source and binary forms, with or without 
-*  modification, are permitted provided that the following conditions 
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright 
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the 
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************/
-
 /*
  * This file is part of the Micro Python project, http://micropython.org/
  *
@@ -62,9 +24,8 @@
  * THE SOFTWARE.
  */
 
-__stack_size__    = 1024;       /* interrupts are handled using this stack */
-__min_heap_size__ = 4K;
-__rtos_heap_size  = 16K;
+__stack_size__    = 2K;       /* interrupts are handled within this stack */
+__min_heap_size__ = 8K;
 
 MEMORY
 {
@@ -84,8 +45,6 @@ SECTIONS
         . = ALIGN(8);
     } > SRAMB
 
-    _ertos_heap = ORIGIN(SRAMB) + LENGTH(SRAMB);
-
     .text :
     {
         _text = .;
@@ -103,13 +62,8 @@ SECTIONS
         __exidx_end = .;
         _etext = .;
     } > SRAM
-    
-    __init_data = .;
-    
-    /* used by the start-up to initialize data */
-    _sidata = LOADADDR(.data);
 
-    .data : AT(__init_data)
+    .data :
     {
         . = ALIGN(8);
         _data = .;
@@ -127,6 +81,17 @@ SECTIONS
         . = ALIGN(8);
         _ebss = .;
     } > SRAM
+
+    /* place here functions that are only called during boot up, */
+    /* that way, we can re-use this area for the micropython heap */
+    .boot :
+    {
+        . = ALIGN(8);
+        _boot = .;
+        *(.boot*)
+        . = ALIGN(8);
+        _eboot = .;
+    } > SRAM
      
     /* allocate the micropython heap */
     .heap :

cc3200/application.mk

@@ -10,16 +10,18 @@ APP_INC += -Ihal
 APP_INC += -Ihal/inc
 APP_INC += -Imisc
 APP_INC += -Imods
+APP_INC += -I../drivers/cc3100/inc
 APP_INC += -Isimplelink
-APP_INC += -Isimplelink/include
 APP_INC += -Isimplelink/oslib
 APP_INC += -Itelnet
 APP_INC += -Iutil
 APP_INC += -Ibootmgr
-APP_INC += -I$(PY_SRC)
 APP_INC += -I$(BUILD)
+APP_INC += -I$(BUILD)/genhdr
 APP_INC += -I../lib/fatfs
 APP_INC += -I../lib/mp-readline
+APP_INC += -I../lib/netutils
+APP_INC += -I../lib/timeutils
 APP_INC += -I../stmhal
 
 APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS
@@ -73,38 +75,49 @@ APP_HAL_SRC_C = $(addprefix hal/,\
 	)
 
 APP_MISC_SRC_C = $(addprefix misc/,\
+	antenna.c \
 	FreeRTOSHooks.c \
 	pin_named_pins.c \
 	help.c \
+	mpcallback.c \
 	mperror.c \
 	mpexception.c \
-	pin_defs_cc3200.c \
+	mpsystick.c \
 	)
 
 APP_MODS_SRC_C = $(addprefix mods/,\
 	modnetwork.c \
+	moduhashlib.c \
+	modubinascii.c \
 	modpyb.c \
 	moduos.c \
 	modusocket.c \
 	modutime.c \
 	modwlan.c \
-	pybextint.c \
+	pybadc.c \
 	pybpin.c \
+	pybi2c.c \
 	pybrtc.c \
-	pybstdio.c \
-	pybsystick.c \
+	pybsd.c \
+	pybsleep.c \
+	pybspi.c \
+	pybtimer.c \
 	pybuart.c \
+	pybwdt.c \
+	)
+
+APP_CC3100_SRC_C = $(addprefix drivers/cc3100/src/,\
+	device.c \
+	driver.c \
+	flowcont.c \
+	fs.c \
+	netapp.c \
+	netcfg.c \
+	socket.c \
+	wlan.c \
 	)
 
 APP_SL_SRC_C = $(addprefix simplelink/,\
-	source/device.c \
-	source/driver.c \
-	source/flowcont.c \
-	source/fs.c \
-	source/netapp.c \
-	source/netcfg.c \
-	source/socket.c \
-	source/wlan.c \
 	oslib/osi_freertos.c \
 	cc_pal.c \
 	) 
@@ -114,6 +127,7 @@ APP_TELNET_SRC_C = $(addprefix telnet/,\
 	)
 	
 APP_UTIL_SRC_C = $(addprefix util/,\
+	cryptohash.c \
 	fifo.c \
 	gccollect.c \
 	random.c \
@@ -122,6 +136,7 @@ APP_UTIL_SRC_C = $(addprefix util/,\
 	
 APP_UTIL_SRC_S = $(addprefix util/,\
 	gchelper.s \
+	sleeprestore.s \
 	)
 	
 APP_MAIN_SRC_C = \
@@ -131,7 +146,11 @@ APP_MAIN_SRC_C = \
 	
 APP_LIB_SRC_C = $(addprefix lib/,\
 	fatfs/ff.c \
+	fatfs/option/ccsbcs.c \
+	libc/string0.c \
 	mp-readline/readline.c \
+	netutils/netutils.c \
+	timeutils/timeutils.c \
 	)
 	
 APP_STM_SRC_C = $(addprefix stmhal/,\
@@ -144,11 +163,11 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
 	moduselect.c \
 	printf.c \
 	pyexec.c \
-	string0.c \
+	pybstdio.c \
 	)
 
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
+OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_CC3100_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
 OBJ += $(BUILD)/pins.o
 
@@ -160,7 +179,7 @@ LDFLAGS += -T $(LINKER_SCRIPT)
 CFLAGS += $(APP_CPPDEFINES) $(APP_INC)
 
 # Disable strict aliasing for the simplelink driver
-$(BUILD)/simplelink/source/driver.o: CFLAGS += -fno-strict-aliasing
+$(BUILD)/drivers/cc3100/src/driver.o: CFLAGS += -fno-strict-aliasing
 
 # Check if we would like to debug the port code
 ifeq ($(BTYPE), release)
@@ -178,12 +197,17 @@ $(BUILD)/FreeRTOS/Source/%.o: CFLAGS += -Os
 $(BUILD)/ftp/%.o: CFLAGS += -Os
 $(BUILD)/hal/%.o: CFLAGS += -Os
 $(BUILD)/misc/%.o: CFLAGS += -Os
+$(BUILD)/mods/%.o: CFLAGS += -Os
 $(BUILD)/py/%.o: CFLAGS += -Os
 $(BUILD)/simplelink/%.o: CFLAGS += -Os
+$(BUILD)/drivers/cc3100/%.o: CFLAGS += -Os
 $(BUILD)/stmhal/%.o: CFLAGS += -Os
 $(BUILD)/telnet/%.o: CFLAGS += -Os
 $(BUILD)/util/%.o: CFLAGS += -Os
 $(BUILD)/pins.o: CFLAGS += -Os
+$(BUILD)/main.o: CFLAGS += -Os
+$(BUILD)/mptask.o: CFLAGS += -Os
+$(BUILD)/servertask.o: CFLAGS += -Os
 else
 $(error Invalid BTYPE specified)
 endif
@@ -192,7 +216,7 @@ endif
 SHELL = bash
 APP_SIGN = appsign.sh
 
-all: $(BUILD)/MCUIMG.BIN
+all: $(BUILD)/mcuimg.bin
 
 $(BUILD)/application.axf: $(OBJ) $(LINKER_SCRIPT)
 	$(ECHO) "LINK $@"
@@ -203,9 +227,9 @@ $(BUILD)/application.bin: $(BUILD)/application.axf
 	$(ECHO) "Create $@"
 	$(Q)$(OBJCOPY) -O binary $< $@
 
-$(BUILD)/MCUIMG.BIN: $(BUILD)/application.bin
+$(BUILD)/mcuimg.bin: $(BUILD)/application.bin
 	$(ECHO) "Create $@"
-	$(Q)$(SHELL) $(APP_SIGN) $(BOARD)
+	$(Q)$(SHELL) $(APP_SIGN) $(BOARD) $(BTYPE)
 
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = boards/$(BOARD)/pins.csv
@@ -214,7 +238,7 @@ PREFIX_FILE = boards/cc3200_prefix.c
 GEN_PINS_SRC = $(BUILD)/pins.c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
-    
+
 # Making OBJ use an order-only dependency on the generated pins.h file
 # has the side effect of making the pins.h file before we actually compile
 # any of the objects. The normal dependency generation will deal with the

cc3200/appsign.sh

@@ -1,17 +1,28 @@
 #!/bin/bash
 
+if [ "$#" -ne 2 ]; then
+    echo "Usage: appsign.sh *board type* *build type*"
+    exit 1
+fi
+
+BOARD=$1
+BTYPE=$2
+
 # Build location
-# First parameter passed is the board type
-BUILD=build/$1
+# Based on build type and board type
+BUILD=build/${BOARD}/${BTYPE}
 
 # Generate the MD5 hash
-echo -n md5sum --binary $BUILD/application.bin | awk '{ print $1 }' > __md5hash.bin
+echo -n `md5sum --binary $BUILD/application.bin | awk '{ print $1 }'` > __md5hash.bin
 
 # Concatenate it with the application binary
-cat $BUILD/application.bin __md5hash.bin > $BUILD/MCUIMG.BIN
+cat $BUILD/application.bin __md5hash.bin > $BUILD/mcuimg.bin
+RET=$?
 
 # Remove the tmp files
 rm -f __md5hash.bin
 
-# Remove hte unsigned binary
+# Remove the unsigned binary
 rm -f $BUILD/application.bin
+
+exit $RET

cc3200/boards/LAUNCHXL/mpconfigboard.h

@@ -30,9 +30,28 @@
 #define MICROPY_HW_BOARD_NAME                       "LaunchPad"
 #define MICROPY_HW_MCU_NAME                         "CC3200"
 
-#define MICROPY_HW_HAS_SDCARD                       (1)
+#define MICROPY_HW_HAS_SDCARD                       (0)
 #define MICROPY_HW_ENABLE_RNG                       (1)
 #define MICROPY_HW_ENABLE_RTC                       (1)
+#define MICROPY_HW_ANTENNA_DIVERSITY                (0)
 
-#define MICROPY_STDIO_UART                          PYB_UART_1
+#define MICROPY_STDIO_UART                          1
 #define MICROPY_STDIO_UART_BAUD                     115200
+#define MICROPY_STDIO_UART_RX_BUF_SIZE              128
+#define MICROPY_STDIO_UART_TX_PIN                   (pin_GPIO1)
+#define MICROPY_STDIO_UART_RX_PIN                   (pin_GPIO2)
+#define MICROPY_STDIO_UART_TX_PIN_AF                PIN_MODE_3
+#define MICROPY_STDIO_UART_RX_PIN_AF                PIN_MODE_3
+
+#define MICROPY_SYS_LED_PRCM                        PRCM_GPIOA1
+#define MICROPY_SAFE_BOOT_PRCM                      PRCM_GPIOA2
+#define MICROPY_SYS_LED_PORT                        GPIOA1_BASE
+#define MICROPY_SAFE_BOOT_PORT                      GPIOA2_BASE
+#define MICROPY_SYS_LED_GPIO                        pin_GPIO9
+#define MICROPY_SYS_LED_PIN_NUM                     PIN_64      // GPIO9
+#define MICROPY_SAFE_BOOT_PIN_NUM                   PIN_15      // GPIO22
+#define MICROPY_SYS_LED_PORT_PIN                    GPIO_PIN_1
+#define MICROPY_SAFE_BOOT_PORT_PIN                  GPIO_PIN_6
+
+#define MICROPY_PORT_SFLASH_BLOCK_COUNT             32
+

cc3200/boards/WIPY/mpconfigboard.h

@@ -0,0 +1,48 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define WIPY
+
+#define MICROPY_HW_BOARD_NAME                       "WiPy"
+#define MICROPY_HW_MCU_NAME                         "CC3200"
+
+#define MICROPY_HW_HAS_SDCARD                       (1)
+#define MICROPY_HW_ENABLE_RNG                       (1)
+#define MICROPY_HW_ENABLE_RTC                       (1)
+#define MICROPY_HW_ANTENNA_DIVERSITY                (1)
+
+#define MICROPY_SYS_LED_PRCM                        PRCM_GPIOA3
+#define MICROPY_SAFE_BOOT_PRCM                      PRCM_GPIOA3
+#define MICROPY_SYS_LED_PORT                        GPIOA3_BASE
+#define MICROPY_SAFE_BOOT_PORT                      GPIOA3_BASE
+#define MICROPY_SYS_LED_GPIO                        pin_GPIO25
+#define MICROPY_SYS_LED_PIN_NUM                     PIN_21      // GPIO25   (SOP2)
+#define MICROPY_SAFE_BOOT_PIN_NUM                   PIN_18      // GPIO28
+#define MICROPY_SYS_LED_PORT_PIN                    GPIO_PIN_1
+#define MICROPY_SAFE_BOOT_PORT_PIN                  GPIO_PIN_4
+
+#define MICROPY_PORT_SFLASH_BLOCK_COUNT             96

cc3200/boards/WIPY/pins.csv

@@ -0,0 +1,25 @@
+L2,GPIO2
+L3,GPIO1
+L4,GPIO23
+L5,GPIO24
+L6,GPIO11
+L7,GPIO12
+L8,GPIO13
+L9,GPIO14
+L10,GPIO15
+L11,GPIO16
+L12,GPIO17
+L13,GPIO22
+L14,GPIO28
+R4,GPIO10
+R5,GPIO9
+R6,GPIO8
+R7,GPIO7
+R8,GPIO6
+R9,GPIO30
+R10,GPIO31
+R11,GPIO3
+R12,GPIO0
+R13,GPIO4
+R14,GPIO5
+HBL,GPIO25

cc3200/boards/cc3200_prefix.c

@@ -30,20 +30,25 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 #include "inc/hw_types.h"
 #include "inc/hw_memmap.h"
+#include "pin.h"
+#include "gpio.h"
 #include "pybpin.h"
 
 
 #define PIN(p_pin_name, p_port, p_bit, p_pin_num) \
 { \
     { &pin_type }, \
-    .name    = MP_QSTR_ ## p_pin_name, \
-    .port    = PORT_A ## p_port, \
-    .bit     = (p_bit), \
-    .pin_num = (p_pin_num) \
+    .name     = MP_QSTR_ ## p_pin_name, \
+    .port     = PORT_A ## p_port, \
+    .type     = PIN_TYPE_STD, \
+    .bit      = (p_bit), \
+    .pin_num  = (p_pin_num), \
+    .af       = PIN_MODE_0, \
+    .strength = PIN_STRENGTH_4MA, \
+    .mode     = GPIO_DIR_MODE_IN, \
+    .isused   = false, \
 }

cc3200/boards/make-pins.py

@@ -38,14 +38,13 @@ class Pin(object):
 
     def set_is_board_pin(self):
         self.board_pin = True
-        
+
     def print(self):
-        print('const pin_obj_t pin_{:6s} = PIN({:6s}, {:1d}, {:3d}, {:2d});'.format(
+        print('pin_obj_t pin_{:6s} = PIN({:6s}, {:1d}, {:3d}, {:2d});'.format(
                self.name, self.name, self.port, self.gpio_bit, self.pin_num))
 
     def print_header(self, hdr_file):
-        hdr_file.write('extern const pin_obj_t pin_{:s};\n'.
-                       format(self.name))
+        hdr_file.write('extern pin_obj_t pin_{:s};\n'.format(self.name))
 
 
 class Pins(object):
@@ -57,12 +56,17 @@ class Pins(object):
         for pin in self.cpu_pins:
             if pin.port == port and pin.gpio_bit == gpio_bit:
                 return pin
-                
+
     def find_pin_by_num(self, pin_num):
         for pin in self.cpu_pins:
             if pin.pin_num == pin_num:
                 return pin
 
+    def find_pin_by_name(self, name):
+        for pin in self.cpu_pins:
+            if pin.name == name:
+                return pin
+
     def parse_af_file(self, filename, pin_col, pinname_col):
         with open(filename, 'r') as csvfile:
             rows = csv.reader(csvfile)
@@ -77,13 +81,16 @@ class Pins(object):
                 pin_num = int(row[pin_col]) - 1;        
                 pin = Pin(row[pinname_col], port_num, gpio_bit, pin_num)
                 self.cpu_pins.append(pin)
-                
-    def parse_board_file(self, filename, cpu_pin_num_col):
+
+    def parse_board_file(self, filename, cpu_pin_col):
         with open(filename, 'r') as csvfile:
             rows = csv.reader(csvfile)
             for row in rows:
                 # Pin numbers must start from 0 when used with the TI API
-                pin = self.find_pin_by_num(int(row[cpu_pin_num_col]) - 1)
+                if row[cpu_pin_col].isdigit():
+                    pin = self.find_pin_by_num(int(row[cpu_pin_col]) - 1)
+                else:
+                    pin = self.find_pin_by_name(row[cpu_pin_col])
                 if pin:
                     pin.set_is_board_pin()
 

cc3200/bootmgr/bootgen.sh

@@ -1,17 +1,25 @@
 #!/bin/bash
 
+if [ "$#" -ne 2 ]; then
+    echo "Usage: bootgen.sh *board type* *build type*"
+    exit 1
+fi
+
+BOARD=$1
+BTYPE=$2
+
 # Re-locator Path
 RELOCATOR=bootmgr/relocator
 
 # Boot Manager Path
 # First parameter passed is the board type
-BOOTMGR=bootmgr/build/$1
+BOOTMGR=bootmgr/build/${BOARD}/${BTYPE}
 
 # Check for re-locator binary
 if [ ! -f $RELOCATOR/relocator.bin ]; then
 
 	echo "Error : Relocator Not found!"
-	exit
+	exit 1
 else
 	echo "Relocator found..."
 fi
@@ -20,7 +28,7 @@ fi
 if [ ! -f $BOOTMGR/bootmgr.bin ]; then
 
 	echo "Error : Boot Manager Not found!"
-	exit
+	exit 1
 else
 	echo "Boot Manager found..."
 fi
@@ -31,10 +39,10 @@ echo "Generating bootloader..."
 # Generate an all 0 bin file
 dd if=/dev/zero of=__tmp.bin ibs=1 count=256 conv=notrunc >/dev/null 2>&1
 
-# Generate 0 a padded version of relocator 
+# Generate a 0 padded version of the relocator 
 dd if=$RELOCATOR/relocator.bin of=__tmp.bin ibs=1 conv=notrunc >/dev/null 2>&1
 
-# Concatenate re-locator and boot-manager
+# Concatenate the re-locator and the boot-manager
 cat __tmp.bin $BOOTMGR/bootmgr.bin > $BOOTMGR/bootloader.bin
 
 # Remove the tmp files

cc3200/bootmgr/bootloader.mk

@@ -1,16 +1,17 @@
-BUILD = bootmgr/build/$(BOARD)
+BUILD = bootmgr/build/$(BOARD)/$(BTYPE)
 
 BOOT_INC  = -Ibootmgr
 BOOT_INC += -Ibootmgr/sl
 BOOT_INC += -Ihal
 BOOT_INC += -Ihal/inc
+BOOT_INC += -I../drivers/cc3100/inc
+BOOT_INC += -Imisc
+BOOT_INC += -Imods
 BOOT_INC += -Isimplelink
-BOOT_INC += -Isimplelink/include
 BOOT_INC += -Isimplelink/oslib
 BOOT_INC += -Iutil
 BOOT_INC += -I..
 BOOT_INC += -I.
-BOOT_INC += -I$(PY_SRC)
 BOOT_INC += -I$(BUILD)
 
 BOOT_CPPDEFINES = -Dgcc -DBOOTLOADER -DTARGET_IS_CC3200 -DSL_TINY
@@ -18,6 +19,7 @@ BOOT_CPPDEFINES = -Dgcc -DBOOTLOADER -DTARGET_IS_CC3200 -DSL_TINY
 BOOT_HAL_SRC_C = $(addprefix hal/,\
 	cpu.c \
 	interrupt.c \
+	pin.c \
 	prcm.c \
 	shamd5.c \
 	spi.c \
@@ -26,22 +28,30 @@ BOOT_HAL_SRC_C = $(addprefix hal/,\
 	utils.c \
 	)
 
+BOOT_CC3100_SRC_C = $(addprefix drivers/cc3100/,\
+	src/device.c \
+	src/driver.c \
+	src/flowcont.c \
+	src/fs.c \
+	src/netapp.c \
+	src/netcfg.c \
+	src/nonos.c \
+	src/socket.c \
+	src/spawn.c \
+	src/wlan.c \
+	)
+
+BOOT_MISC_SRC_C = $(addprefix misc/,\
+	antenna.c \
+	mperror.c \
+	)
+
 BOOT_SL_SRC_C = $(addprefix simplelink/,\
-	source/device.c \
-	source/driver.c \
-	source/flowcont.c \
-	source/fs.c \
-	source/netapp.c \
-	source/netcfg.c \
-	source/nonos.c \
-	source/socket.c \
-	source/spawn.c \
-	source/wlan.c \
 	cc_pal.c \
 	)
 
 BOOT_UTIL_SRC_C = $(addprefix util/,\
-	hash.c \
+	cryptohash.c \
 	) 
 
 BOOT_MAIN_SRC_C = \
@@ -51,17 +61,20 @@ BOOT_MAIN_SRC_S = \
 	bootmgr/runapp.s
 
 BOOT_PY_SRC_C = $(addprefix py/,\
-	pfenv.c \
-	pfenv_printf.c \
+	mpprint.c \
 	)
 
 BOOT_STM_SRC_C = $(addprefix stmhal/,\
 	printf.c \
-	string0.c \
 	)
-	
-OBJ  = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o)  $(BOOT_SL_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MAIN_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o) $(BOOT_STM_SRC_C:.c=.o))
+
+BOOT_LIB_SRC_C = $(addprefix lib/,\
+	libc/string0.c \
+	)
+
+OBJ  = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MISC_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o) $(BOOT_STM_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
 
 # Add the linker script
 LINKER_SCRIPT = bootmgr/bootmgr.lds
@@ -70,11 +83,8 @@ LDFLAGS += -T $(LINKER_SCRIPT)
 # Add the bootloader specific CFLAGS
 CFLAGS += $(BOOT_CPPDEFINES) $(BOOT_INC)
 
-# Optimize for size all sources except for main
-
-
 # Disable strict aliasing for the simplelink driver
-$(BUILD)/simplelink/source/driver.o: CFLAGS += -fno-strict-aliasing
+$(BUILD)/drivers/cc3100/src/driver.o: CFLAGS += -fno-strict-aliasing
 
 # Check if we would like to debug the port code
 ifeq ($(BTYPE), release)
@@ -86,7 +96,9 @@ ifeq ($(BTYPE), debug)
 CFLAGS += -DDEBUG=DEBUG
 # Optimize the stable sources only
 $(BUILD)/hal/%.o: CFLAGS += -Os
+$(BUILD)/misc/%.o: CFLAGS += -Os
 $(BUILD)/simplelink/%.o: CFLAGS += -Os
+$(BUILD)/drivers/cc3100/%.o: CFLAGS += -Os
 $(BUILD)/py/%.o: CFLAGS += -Os
 $(BUILD)/stmhal/%.o: CFLAGS += -Os
 else
@@ -111,13 +123,12 @@ $(BUILD)/bootmgr.bin: $(BUILD)/bootmgr.axf
 
 $(BUILD)/bootloader.bin: $(BUILD)/bootmgr.bin
 	$(ECHO) "Create $@"
-	$(Q)$(SHELL) $(BOOT_GEN) $(BOARD)
+	$(Q)$(SHELL) $(BOOT_GEN) $(BOARD) $(BTYPE)
 
 # Create an empty "qstrdefs.generated.h" needed by py/mkrules.mk
 $(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD)
 	touch $@
 
-# Create an empty "py-version.h" needed by py/mkrules.mk
-$(HEADER_BUILD)/py-version.h: | $(HEADER_BUILD)
+# Create an empty "mpversion.h" needed by py/mkrules.mk
+$(HEADER_BUILD)/mpversion.h: | $(HEADER_BUILD)
 	touch $@
-	

cc3200/bootmgr/bootmgr.lds

@@ -1,42 +1,30 @@
-/*****************************************************************************
-* bootmgr.lds
-*
-* GCC Linker script for get_time application.
-*
-* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
-* 
-* 
-*  Redistribution and use in source and binary forms, with or without 
-*  modification, are permitted provided that the following conditions 
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright 
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the 
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************/
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
-__stack_size__ = 1024;
+__stack_size__  = 1024;
 
 MEMORY
 {
@@ -51,6 +39,7 @@ SECTIONS
     {
         _text = .;
         KEEP(*(.intvecs))
+        *(.boot*)
         *(.text*)
         *(.rodata*)
         *(.ARM.extab* .gnu.linkonce.armextab.*)
@@ -65,9 +54,7 @@ SECTIONS
         _etext = .;
     } > SRAM
 
-    __init_data = .;
-
-    .data : AT(__init_data)
+    .data :
     {
         _data = .;
         *(.data*)

cc3200/bootmgr/main.c

@@ -27,7 +27,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <std.h>
+#include "std.h"
+
+#include "py/mpconfig.h"
+#include MICROPY_HAL_H
 #include "hw_ints.h"
 #include "hw_types.h"
 #include "hw_gpio.h"
@@ -45,32 +48,27 @@
 #include "flc.h"
 #include "bootmgr.h"
 #include "shamd5.h"
-#include "hash.h"
+#include "cryptohash.h"
 #include "utils.h"
 #include "cc3200_hal.h"
+#include "debug.h"
+#include "mperror.h"
+#include "antenna.h"
 
 
 //*****************************************************************************
 // Local Constants
 //*****************************************************************************
-#define SL_STOP_TIMEOUT                     500
+#define SL_STOP_TIMEOUT                     35
 #define BOOTMGR_HASH_ALGO                   SHAMD5_ALGO_MD5
 #define BOOTMGR_HASH_SIZE                   32
 #define BOOTMGR_BUFF_SIZE                   512
 
-#define BOOTMGR_WAIT_SAFE_MODE_MS           2000
-#define BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS    250
-
-#define BOOTMGR_SAFE_MODE_ENTER_MS          1000
-#define BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS   100
-
-#define BOOTMGR_PINS_PRCM                   PRCM_GPIOA3
-#define BOOTMGR_PINS_PORT                   GPIOA3_BASE
-#define BOOTMGR_LED_PIN_NUM                 PIN_21
-#define BOOTMGR_SFE_PIN_NUM                 PIN_45
-#define BOOTMGR_LED_PORT_PIN                GPIO_PIN_1      // GPIO25
-#define BOOTMGR_SFE_PORT_PIN                GPIO_PIN_7      // GPIO31
+#define BOOTMGR_WAIT_SAFE_MODE_MS           1200
+#define BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS    200
 
+#define BOOTMGR_SAFE_MODE_ENTER_MS          800
+#define BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS   80
 
 //*****************************************************************************
 // Exported functions declarations
@@ -152,21 +150,21 @@ static void bootmgr_board_init(void) {
     // Mandatory MCU Initialization
     PRCMCC3200MCUInit();
 
+    mperror_bootloader_check_reset_cause();
+
+#if MICROPY_HW_ANTENNA_DIVERSITY
+    // configure the antenna selection pins
+    antenna_init0();
+#endif
+
     // Enable the Data Hashing Engine
-    HASH_Init();
+    CRYPTOHASH_Init();
 
-    // Enable GPIOA3 Peripheral Clock
-    MAP_PRCMPeripheralClkEnable(BOOTMGR_PINS_PRCM, PRCM_RUN_MODE_CLK);
+    // Init the system led and the system switch
+    mperror_init0();
 
-    // Configure the bld
-    MAP_PinTypeGPIO(BOOTMGR_LED_PIN_NUM, PIN_MODE_0, false);
-    MAP_PinConfigSet(BOOTMGR_LED_PIN_NUM, PIN_STRENGTH_6MA, PIN_TYPE_STD);
-    MAP_GPIODirModeSet(BOOTMGR_PINS_PORT, BOOTMGR_LED_PORT_PIN, GPIO_DIR_MODE_OUT);
-
-    // Configure the safe mode pin
-    MAP_PinTypeGPIO(BOOTMGR_SFE_PIN_NUM, PIN_MODE_0, false);
-    MAP_PinConfigSet(BOOTMGR_SFE_PIN_NUM, PIN_STRENGTH_6MA, PIN_TYPE_STD_PU);
-    MAP_GPIODirModeSet(BOOTMGR_PINS_PORT, BOOTMGR_SFE_PORT_PIN, GPIO_DIR_MODE_IN);
+    // clear the safe boot flag, since we can't trust its content after reset
+    PRCMClearSafeBootRequest();
 }
 
 //*****************************************************************************
@@ -184,7 +182,7 @@ static bool bootmgr_verify (void) {
 
         if (FsFileInfo.FileLen > BOOTMGR_HASH_SIZE) {
             FsFileInfo.FileLen -= BOOTMGR_HASH_SIZE;
-            HASH_SHAMD5Start(BOOTMGR_HASH_ALGO, FsFileInfo.FileLen);
+            CRYPTOHASH_SHAMD5Start(BOOTMGR_HASH_ALGO, FsFileInfo.FileLen);
             do {
                 if ((FsFileInfo.FileLen - offset) > BOOTMGR_BUFF_SIZE) {
                     reqlen = BOOTMGR_BUFF_SIZE;
@@ -194,10 +192,10 @@ static bool bootmgr_verify (void) {
                 }
 
                 offset += sl_FsRead(fHandle, offset, bootmgr_file_buf, reqlen);
-                HASH_SHAMD5Update(bootmgr_file_buf, reqlen);
+                CRYPTOHASH_SHAMD5Update(bootmgr_file_buf, reqlen);
             } while (offset < FsFileInfo.FileLen);
 
-            HASH_SHAMD5Read (bootmgr_file_buf);
+            CRYPTOHASH_SHAMD5Read (bootmgr_file_buf);
 
             // convert the resulting hash to hex
             for (_u32 i = 0; i < (BOOTMGR_HASH_SIZE / 2); i++) {
@@ -205,7 +203,7 @@ static bool bootmgr_verify (void) {
             }
 
             // read the hash from the file and close it
-            ASSERT (BOOTMGR_HASH_SIZE == sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE));
+            sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE);
             sl_FsClose (fHandle, NULL, NULL, 0);
             bootmgr_file_buf[BOOTMGR_HASH_SIZE] = '\0';
             // compare both hashes
@@ -248,13 +246,14 @@ static void bootmgr_load_and_execute (_u8 *image) {
 //*****************************************************************************
 static bool safe_mode_boot (void) {
     _u32 count = 0;
-    while (!MAP_GPIOPinRead(BOOTMGR_PINS_PORT, BOOTMGR_SFE_PORT_PIN) &&
-            ((BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS * count++) < BOOTMGR_WAIT_SAFE_MODE_MS)) {
+    while (MAP_GPIOPinRead(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN) &&
+           ((BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS * count++) < BOOTMGR_WAIT_SAFE_MODE_MS)) {
         // toogle the led
-        MAP_GPIOPinWrite(BOOTMGR_PINS_PORT, BOOTMGR_LED_PORT_PIN, ~MAP_GPIOPinRead(GPIOA3_BASE, BOOTMGR_LED_PORT_PIN));
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, ~MAP_GPIOPinRead(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN));
         UtilsDelay(UTILS_DELAY_US_TO_COUNT(BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS * 1000));
     }
-    return MAP_GPIOPinRead(BOOTMGR_PINS_PORT, BOOTMGR_SFE_PORT_PIN) ? false : true;
+    mperror_deinit_sfe_pin();
+    return MAP_GPIOPinRead(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN) ? true : false;
 }
 
 //*****************************************************************************
@@ -264,14 +263,16 @@ static void bootmgr_image_loader(sBootInfo_t *psBootInfo) {
     _i32 fhandle;
     if (safe_mode_boot()) {
          _u32 count = 0;
-         while ((BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS * count++) > BOOTMGR_SAFE_MODE_ENTER_MS) {
+         while ((BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS * count++) < BOOTMGR_SAFE_MODE_ENTER_MS) {
              // toogle the led
-             MAP_GPIOPinWrite(BOOTMGR_PINS_PORT, BOOTMGR_LED_PORT_PIN, ~MAP_GPIOPinRead(GPIOA3_BASE, BOOTMGR_LED_PORT_PIN));
+             MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, ~MAP_GPIOPinRead(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN));
              UtilsDelay(UTILS_DELAY_US_TO_COUNT(BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS * 1000));
          }
          psBootInfo->ActiveImg = IMG_ACT_FACTORY;
          // turn the led off
-         MAP_GPIOPinWrite(BOOTMGR_PINS_PORT, BOOTMGR_LED_PORT_PIN, 0);
+         MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, 0);
+         // request a safe boot to the application
+         PRCMRequestSafeBoot();
     }
     // do we have a new update image that needs to be verified?
     else if ((psBootInfo->ActiveImg == IMG_ACT_UPDATE) && (psBootInfo->Status == IMG_STATUS_CHECK)) {
@@ -312,7 +313,7 @@ int main (void) {
     bootmgr_board_init();
 
     // start simplelink since we need it to access the sflash
-    sl_Start(NULL, NULL, NULL);
+    sl_Start(0, 0, 0);
 
     // if a boot info file is found, load it, else, create a new one with the default boot info
     if (!sl_FsOpen((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_READ, NULL, &fhandle)) {
@@ -346,10 +347,19 @@ int main (void) {
     // could not be loaded, so, loop forever and signal the crash to the user
     while (true) {
         // keep the bld on
-        MAP_GPIOPinWrite(BOOTMGR_PINS_PORT, BOOTMGR_LED_PORT_PIN, BOOTMGR_LED_PORT_PIN);
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, MICROPY_SYS_LED_PORT_PIN);
         __asm volatile("    dsb      \n"
                        "    isb      \n"
                        "    wfi      \n");
     }
 }
 
+//*****************************************************************************
+//! The following stub function is needed to link mp_vprintf
+//*****************************************************************************
+#include "py/qstr.h"
+
+const byte *qstr_data(qstr q, mp_uint_t *len) {
+    *len = 0;
+    return NULL;
+}

cc3200/bootmgr/sl/user.h

@@ -348,7 +348,11 @@ extern "C" {
     \note       belongs to \ref ported_sec
 
 */
-#define sl_DeviceEnablePreamble()		NwpPowerOnPreamble()
+#ifdef DEBUG
+#define sl_DeviceEnablePreamble()       NwpPowerOnPreamble()
+#else
+#define sl_DeviceEnablePreamble()
+#endif
 
 /*!
     \brief		Enable the Network Processor

cc3200/fatfs/src/diskio.c

@@ -9,18 +9,18 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include "diskio.h"		        /* FatFs lower layer API */
 #include "sflash_diskio.h"      /* Serial flash disk IO API */
 #if MICROPY_HW_HAS_SDCARD
 #include "sd_diskio.h"		    /* SDCARD disk IO API */
 #endif
-#include "modutime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "rom_map.h"
 #include "prcm.h"
+#include "timeutils.h"
 
 /* Definitions of physical drive number for each drive */
 #define SFLASH		0	/* Map SFLASH drive to drive number 0 */
@@ -192,13 +192,13 @@ DWORD get_fattime (
     void
 )
 {
-    mod_struct_time tm;
+    timeutils_struct_time_t tm;
     uint32_t seconds;
     uint16_t mseconds;
 
     // Get the time from the on-chip RTC and convert it to struct_time
     MAP_PRCMRTCGet(&seconds, &mseconds);
-    mod_time_seconds_since_2000_to_struct_time(seconds, &tm);
+    timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
 
     return ((tm.tm_year - 1980) << 25) | ((tm.tm_mon) << 21)  |
             ((tm.tm_mday) << 16)       | ((tm.tm_hour) << 11) |

cc3200/fatfs/src/drivers/sd_diskio.c

@@ -37,15 +37,8 @@
 //*****************************************************************************
 #include <stdbool.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
 #include "hw_types.h"
 #include "hw_memmap.h"
 #include "hw_ints.h"
@@ -95,7 +88,7 @@ DiskInfo_t sd_disk_info =  {CARD_TYPE_UNKNOWN, CARD_VERSION_1, CARD_CAP_CLASS_SD
 static unsigned int CardSendCmd (unsigned int ulCmd, unsigned int ulArg) {
     unsigned long ulStatus;
 
-    // Clear interrupt status
+    // Clear the interrupt status
     MAP_SDHostIntClear(SDHOST_BASE,0xFFFFFFFF);
 
     // Send command
@@ -293,6 +286,22 @@ DSTATUS sd_disk_init (void) {
     return sd_disk_info.bStatus;
 }
 
+//*****************************************************************************
+//
+//! De-initializes the physical drive
+//!
+//! This function de-initializes the physical drive
+//*****************************************************************************
+void sd_disk_deinit (void) {
+    sd_disk_info.ucCardType = CARD_TYPE_UNKNOWN;
+    sd_disk_info.ulVersion = CARD_VERSION_1;
+    sd_disk_info.ulCapClass = CARD_CAP_CLASS_SDSC;
+    sd_disk_info.ulNofBlock = 0;
+    sd_disk_info.ulBlockSize = 0;
+    sd_disk_info.bStatus = STA_NOINIT;
+    sd_disk_info.usRCA = 0;
+}
+
 //*****************************************************************************
 //
 //! Gets the disk status.

cc3200/fatfs/src/drivers/sd_diskio.h

@@ -20,6 +20,7 @@ typedef struct
 extern DiskInfo_t sd_disk_info;
 
 DSTATUS sd_disk_init (void);
+void sd_disk_deinit (void);
 DSTATUS sd_disk_status (void);
 bool sd_disk_ready (void);
 DRESULT sd_disk_read (BYTE* pBuffer, DWORD ulSectorNumber, UINT bSectorCount);

cc3200/fatfs/src/drivers/sflash_diskio.c

@@ -2,20 +2,16 @@
 #include <stdbool.h>
 #include "std.h"
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
+#include "py/obj.h"
 #include "simplelink.h"
 #include "diskio.h"
 #include "sflash_diskio.h"
 #include "debug.h"
+#include "modnetwork.h"
 #include "modwlan.h"
 
-#ifdef USE_FREERTOS
-#include "FreeRTOS.h"
-#include "task.h"
-#include "semphr.h"
-#endif
-
 #define SFLASH_TIMEOUT_MAX_MS               5500
 #define SFLASH_WAIT_TIME_MS                 5
 
@@ -38,18 +34,15 @@ static bool sflash_access (_u32 mode, _i32 (* sl_FsFunction)(_i32 FileHdl, _u32
     bool retval = false;
 
     // wlan must be enabled in order to access the serial flash
-#ifdef USE_FREERTOS
-    xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
-#endif
+    sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);
+
     if (0 == sl_FsOpen(sflash_block_name, mode, NULL, &fileHandle)) {
         if (SFLASH_BLOCK_SIZE == sl_FsFunction (fileHandle, 0, sflash_block_cache, SFLASH_BLOCK_SIZE)) {
             retval = true;
         }
         sl_FsClose (fileHandle, NULL, NULL, 0);
     }
-#ifdef USE_FREERTOS
-    xSemaphoreGive (xWlanSemaphore);
-#endif
+    sl_LockObjUnlock (&wlan_LockObj);
     return retval;
 }
 
@@ -60,20 +53,17 @@ DRESULT sflash_disk_init (void) {
     if (!sflash_init_done) {
         // Allocate space for the block cache
         ASSERT ((sflash_block_cache = mem_Malloc(SFLASH_BLOCK_SIZE)) != NULL);
+        sflash_init_done = true;
 
         // Proceed to format the memory if not done yet
         for (int i = 0; i < SFLASH_BLOCK_COUNT; i++) {
             print_block_name (i);
-        #ifdef USE_FREERTOS
-            xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
-        #endif
+            sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);
             // Create the block file if it doesn't exist
             if (sl_FsGetInfo(sflash_block_name, 0, &FsFileInfo) < 0) {
                 if (!sl_FsOpen(sflash_block_name, FS_MODE_OPEN_CREATE(SFLASH_BLOCK_SIZE, 0), NULL, &fileHandle)) {
                     sl_FsClose(fileHandle, NULL, NULL, 0);
-                #ifdef USE_FREERTOS
-                    xSemaphoreGive (xWlanSemaphore);
-                #endif
+                    sl_LockObjUnlock (&wlan_LockObj);
                     memset(sflash_block_cache, 0xFF, SFLASH_BLOCK_SIZE);
                     if (!sflash_access(FS_MODE_OPEN_WRITE, sl_FsWrite)) {
                         return RES_ERROR;
@@ -81,17 +71,12 @@ DRESULT sflash_disk_init (void) {
                 }
                 else {
                     // Unexpected failure while creating the file
-                #ifdef USE_FREERTOS
-                    xSemaphoreGive (xWlanSemaphore);
-                #endif
+                    sl_LockObjUnlock (&wlan_LockObj);
                     return RES_ERROR;
                 }
             }
-        #ifdef USE_FREERTOS
-            xSemaphoreGive (xWlanSemaphore);
-        #endif
+            sl_LockObjUnlock (&wlan_LockObj);
         }
-        sflash_init_done = true;
         sflash_prblock = UINT32_MAX;
         sflash_cache_is_dirty = false;
     }
@@ -112,7 +97,7 @@ DRESULT sflash_disk_read(BYTE *buff, DWORD sector, UINT count) {
         return STA_NOINIT;
     }
 
-    if (sector + count > SFLASH_SECTOR_COUNT || count == 0) {
+    if ((sector + count > SFLASH_SECTOR_COUNT) || (count == 0)) {
         return RES_PARERR;
     }
 
@@ -145,7 +130,8 @@ DRESULT sflash_disk_write(const BYTE *buff, DWORD sector, UINT count) {
         return STA_NOINIT;
     }
 
-    if (sector + count > SFLASH_SECTOR_COUNT || count == 0) {
+    if ((sector + count > SFLASH_SECTOR_COUNT) || (count == 0)) {
+        sflash_disk_flush();
         return RES_PARERR;
     }
 

cc3200/fatfs/src/drivers/sflash_diskio.h

@@ -2,7 +2,7 @@
 #define SFLASH_DISKIO_H_
 
 #define SFLASH_BLOCK_SIZE           2048
-#define SFLASH_BLOCK_COUNT          32          // makes for 64KB of space
+#define SFLASH_BLOCK_COUNT          MICROPY_PORT_SFLASH_BLOCK_COUNT
 #define SFLASH_SECTOR_SIZE          512
 #define SFLASH_SECTOR_COUNT         ((SFLASH_BLOCK_SIZE * SFLASH_BLOCK_COUNT) / SFLASH_SECTOR_SIZE)
 #define SFLASH_SECTORS_PER_BLOCK    (SFLASH_BLOCK_SIZE / SFLASH_SECTOR_SIZE)

cc3200/fatfs/src/ffconf.c

@@ -25,12 +25,9 @@
  */
 
 #include <string.h>
-#include <std.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/misc.h"
 #include "ff.h"
 #include "ffconf.h"
 #include "diskio.h"
@@ -40,7 +37,6 @@ extern BYTE ff_CurrVol;
 #endif
 
 STATIC bool check_path(const TCHAR **path, const char *mount_point_str, mp_uint_t mount_point_len) {
-    stoupper ((char *)(*path));
     if (strncmp(*path, mount_point_str, mount_point_len) == 0) {
         if ((*path)[mount_point_len] == '/') {
             *path += mount_point_len;
@@ -61,18 +57,18 @@ int ff_get_ldnumber (const TCHAR **path) {
     }
 
     if (**path != '/') {
-        #if _FS_RPATH
+    #if _FS_RPATH
         return ff_CurrVol;
-        #else
+    #else
         return -1;
-        #endif
+    #endif
     }
 
-    if (check_path(path, "/SFLASH", 7)) {
+    if (check_path(path, "/flash", 6)) {
         return 0;
     }
 #if MICROPY_HW_HAS_SDCARD
-    else if (check_path(path, "/SD", 3)) {
+    else if (check_path(path, "/sd", 3)) {
         return 1;
     }
 #endif
@@ -86,13 +82,13 @@ void ff_get_volname(BYTE vol, TCHAR **dest) {
     if (vol == 0)
 #endif
     {
-        memcpy(*dest, "/SFLASH", 7);
+        memcpy(*dest, "/flash", 6);
         *dest += 7;
     }
 #if MICROPY_HW_HAS_SDCARD
     else
     {
-        memcpy(*dest, "/SD", 3);
+        memcpy(*dest, "/sd", 3);
         *dest += 3;
     }
 #endif

cc3200/fatfs/src/ffconf.h

@@ -1,15 +1,42 @@
-/*---------------------------------------------------------------------------/
-/  FatFs - FAT file system module configuration file  R0.10c (C)ChaN, 2014
-/---------------------------------------------------------------------------*/
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * Original file from:
+ * FatFs - FAT file system module configuration file R0.10c (C)ChaN, 2014
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef _FFCONF
+#define _FFCONF 32020	/* Revision ID */
 
 #include <stdint.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "semphr.h"
 
-#define _FFCONF 80376	/* Revision ID */
-
 /*---------------------------------------------------------------------------/
 / Functions and Buffer Configurations
 /---------------------------------------------------------------------------*/
@@ -24,9 +51,9 @@
 
 #define _FS_READONLY	0
 /* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
-/  Read-only configuration removes basic writing API functions, f_write(),
-/  f_sync(), f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(),
-/  f_getfree() and optional writing functions as well. */
+/  Read-only configuration removes writing API functions, f_write(), f_sync(),
+/  f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
+/  and optional writing functions as well. */
 
 
 #define _FS_MINIMIZE	0
@@ -48,9 +75,13 @@
 /  2: Enable with LF-CRLF conversion. */
 
 
+#define _USE_FIND		0
+/* This option switches filtered directory read feature and related functions,
+/  f_findfirst() and f_findnext(). (0:Disable or 1:Enable) */
+
+
 #define	_USE_MKFS		1
-/* This option switches f_mkfs() function. (0:Disable or 1:Enable)
-/  To enable it, also _FS_READONLY need to be set to 0. */
+/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
 
 
 #define	_USE_FASTSEEK	0
@@ -63,8 +94,8 @@
 
 
 #define	_USE_FORWARD	0
-/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-/* To enable it, also _FS_TINY need to be set to 1. */
+/* This option switches f_forward() function. (0:Disable or 1:Enable)
+/  To enable it, also _FS_TINY need to be set to 1. */
 
 
 /*---------------------------------------------------------------------------/
@@ -75,32 +106,24 @@
 /* This option specifies the OEM code page to be used on the target system.
 /  Incorrect setting of the code page can cause a file open failure.
 /
-/   932  - Japanese Shift_JIS (DBCS, OEM, Windows)
-/   936  - Simplified Chinese GBK (DBCS, OEM, Windows)
-/   949  - Korean (DBCS, OEM, Windows)
-/   950  - Traditional Chinese Big5 (DBCS, OEM, Windows)
-/   1250 - Central Europe (Windows)
-/   1251 - Cyrillic (Windows)
-/   1252 - Latin 1 (Windows)
-/   1253 - Greek (Windows)
-/   1254 - Turkish (Windows)
-/   1255 - Hebrew (Windows)
-/   1256 - Arabic (Windows)
-/   1257 - Baltic (Windows)
-/   1258 - Vietnam (OEM, Windows)
-/   437  - U.S. (OEM)
-/   720  - Arabic (OEM)
-/   737  - Greek (OEM)
-/   775  - Baltic (OEM)
-/   850  - Multilingual Latin 1 (OEM)
-/   858  - Multilingual Latin 1 + Euro (OEM)
-/   852  - Latin 2 (OEM)
-/   855  - Cyrillic (OEM)
-/   866  - Russian (OEM)
-/   857  - Turkish (OEM)
-/   862  - Hebrew (OEM)
-/   874  - Thai (OEM, Windows)
-/   1    - ASCII (No extended character. Valid for only non-LFN configuration.) */
+/   1    - ASCII (No extended character. Non-LFN cfg. only)
+/   437  - U.S.
+/   720  - Arabic
+/   737  - Greek
+/   775  - Baltic
+/   850  - Multilingual Latin 1
+/   852  - Latin 2
+/   855  - Cyrillic
+/   857  - Turkish
+/   858  - Multilingual Latin 1 + Euro
+/   862  - Hebrew
+/   866  - Russian
+/   874  - Thai
+/   932  - Japanese Shift_JIS (DBCS)
+/   936  - Simplified Chinese GBK (DBCS)
+/   949  - Korean (DBCS)
+/   950  - Traditional Chinese Big5 (DBCS)
+*/
 
 
 #define	_USE_LFN	(MICROPY_ENABLE_LFN)
@@ -155,8 +178,8 @@
 /* Number of volumes (logical drives) to be used. */
 
 
-#define _STR_VOLUME_ID  0
-#define _VOLUME_STRS    "RAM","NAND","CF","SD1","SD2","USB1","USB2","USB3"
+#define _STR_VOLUME_ID	0
+#define _VOLUME_STRS	"RAM","NAND","CF","SD1","SD2","USB1","USB2","USB3"
 /* _STR_VOLUME_ID option switches string volume ID feature.
 /  When _STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive
 /  number in the path name. _VOLUME_STRS defines the drive ID strings for each
@@ -169,7 +192,7 @@
 /  number is bound to the same physical drive number and only an FAT volume found on
 /  the physical drive will be mounted. When multi-partition feature is enabled (1),
 /  each logical drive number is bound to arbitrary physical drive and partition
-/  listed in the VolToPart[]. Also f_fdisk() funciton will be enabled. */
+/  listed in the VolToPart[]. Also f_fdisk() funciton will be available. */
 
 
 #define	_MIN_SS		512
@@ -206,9 +229,9 @@
 /---------------------------------------------------------------------------*/
 
 #define _FS_NORTC	0
-#define _NORTC_MON	11
-#define _NORTC_MDAY	9
-#define _NORTC_YEAR	2014
+#define _NORTC_MON	2
+#define _NORTC_MDAY	1
+#define _NORTC_YEAR	2015
 /* The _FS_NORTC option switches timestamp feature. If the system does not have
 /  an RTC function or valid timestamp is not needed, set _FS_NORTC to 1 to disable
 /  the timestamp feature. All objects modified by FatFs will have a fixed timestamp
@@ -232,7 +255,7 @@
 
 
 #define _FS_REENTRANT	1
-#define _FS_TIMEOUT		2000
+#define _FS_TIMEOUT		2500    // milliseconds
 #define	_SYNC_t			SemaphoreHandle_t
 /* The _FS_REENTRANT option switches the re-entrancy (thread safe) of the FatFs
 /  module itself. Note that regardless of this option, file access to different
@@ -274,3 +297,4 @@
 /   PIC32       0           H8/300H     0           8051        0/1
 */
 
+#endif // _FFCONF

cc3200/fatfs/src/option/syscall.c

@@ -3,12 +3,6 @@
 /* (C)ChaN, 2014                                                          */
 /*------------------------------------------------------------------------*/
 
-#include "mpconfig.h"
-#include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
 #include "ff.h"
 
 
@@ -38,7 +32,7 @@ int ff_cre_syncobj (	/* !=0:Function succeeded, ==0:Could not create due to any
 //	*sobj = OSMutexCreate(0, &err);		/* uC/OS-II */
 //	ret = (int)(err == OS_NO_ERR);
 
-	*sobj = xSemaphoreCreateMutex();	/* FreeRTOS */
+	vSemaphoreCreateBinary( (*sobj) );	/* FreeRTOS */
 	ret = (int)(*sobj != NULL);
 
 	return ret;
@@ -138,7 +132,7 @@ void* ff_memalloc ( /* Returns pointer to the allocated memory block */
     UINT msize      /* Number of bytes to allocate */
 )
 {
-    return malloc(msize);   /* Allocate a new memory block with POSIX API */
+    return pvPortMalloc(msize);   /* Allocate a new memory block with POSIX API */
 }
 
 
@@ -150,7 +144,7 @@ void ff_memfree (
     void* mblock    /* Pointer to the memory block to free */
 )
 {
-    free(mblock);   /* Discard the memory block with POSIX API */
+    vPortFree(mblock);   /* Discard the memory block with POSIX API */
 }
 
 #endif

cc3200/ftp/ftp.c

@@ -26,15 +26,11 @@
 
 #include <stdint.h>
 #include <ctype.h>
-#include <std.h>
+#include "std.h"
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "osi.h"
+#include "py/obj.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
@@ -43,8 +39,9 @@
 #include "pybrtc.h"
 #include "ftp.h"
 #include "simplelink.h"
+#include "modnetwork.h"
 #include "modwlan.h"
-#include "modutime.h"
+#include "modusocket.h"
 #include "debug.h"
 #include "serverstask.h"
 #include "ff.h"
@@ -53,7 +50,7 @@
 #include "diskio.h"
 #include "sd_diskio.h"
 #include "updater.h"
-
+#include "timeutils.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
@@ -70,8 +67,7 @@
 #define FTP_UNIX_TIME_20000101              946684800
 #define FTP_UNIX_TIME_20150101              1420070400
 #define FTP_UNIX_SECONDS_180_DAYS           15552000
-#define FTP_DATA_TIMEOUT_MS                 5000        // 5 seconds
-#define FTP_CMD_TIMEOUT_MS                  120000      // 2 minutes
+#define FTP_DATA_TIMEOUT_MS                 5000            // 5 seconds
 #define FTP_SOCKETFIFO_ELEMENTS_MAX         4
 #define FTP_CYCLE_TIME_MS                   (SERVERS_CYCLE_TIME_MS * 2)
 
@@ -123,6 +119,7 @@ typedef enum {
 
 typedef struct {
     uint8_t             *dBuffer;
+    uint32_t            ctimeout;
     union {
         DIR             dp;
         FIL             fp;
@@ -130,7 +127,6 @@ typedef struct {
     int16_t             lc_sd;
     int16_t             ld_sd;
     int16_t             c_sd;
-    int16_t             ctimeout;
     int16_t             d_sd;
     int16_t             dtimeout;
     ftp_state_t         state;
@@ -216,7 +212,6 @@ static void ftp_process_cmd (void);
 static void ftp_close_files (void);
 static void ftp_close_filesystem_on_error (void);
 static void ftp_close_cmd_data (void);
-static void ftp_reset (void);
 static ftp_cmd_index_t ftp_pop_command (char **str);
 static void ftp_pop_param (char **str, char *param);
 static int ftp_print_eplf_item (char *dest, uint32_t destsize, FILINFO *fno);
@@ -257,7 +252,7 @@ void ftp_run (void) {
             ftp_wait_for_enabled();
             break;
         case E_FTP_STE_START:
-            if (ftp_create_listening_socket(&ftp_data.lc_sd, FTP_CMD_PORT, FTP_CMD_CLIENTS_MAX )) {
+            if (wlan_is_connected() && ftp_create_listening_socket(&ftp_data.lc_sd, FTP_CMD_PORT, FTP_CMD_CLIENTS_MAX)) {
                 ftp_data.state = E_FTP_STE_READY;
             }
             break;
@@ -305,19 +300,21 @@ void ftp_run (void) {
             if (SOCKETFIFO_IsEmpty()) {
                 uint32_t readsize;
                 ftp_result_t result;
+                ftp_data.ctimeout = 0;
                 result = ftp_read_file ((char *)ftp_data.dBuffer, FTP_BUFFER_SIZE, &readsize);
-                if (readsize > 0 && result != E_FTP_RESULT_FAILED) {
-                    ftp_send_data(readsize);
-                    ftp_data.ctimeout = 0;
+                if (result == E_FTP_RESULT_FAILED) {
+                    ftp_send_reply(451, NULL);
+                    ftp_data.state = E_FTP_STE_END_TRANSFER;
+                }
+                else {
+                    if (readsize > 0) {
+                        ftp_send_data(readsize);
+                    }
                     if (result == E_FTP_RESULT_OK) {
                         ftp_send_reply(226, NULL);
                         ftp_data.state = E_FTP_STE_END_TRANSFER;
                     }
                 }
-                else {
-                    ftp_send_reply(451, NULL);
-                    ftp_data.state = E_FTP_STE_END_TRANSFER;
-                }
             }
             break;
         case E_FTP_STE_CONTINUE_FILE_RX:
@@ -410,6 +407,16 @@ void ftp_disable (void) {
     ftp_data.state = E_FTP_STE_DISABLED;
 }
 
+void ftp_reset (void) {
+    // close all connections and start all over again
+    servers_close_socket(&ftp_data.lc_sd);
+    servers_close_socket(&ftp_data.ld_sd);
+    ftp_close_cmd_data();
+    ftp_data.state = E_FTP_STE_START;
+    ftp_data.substate.data = E_FTP_STE_SUB_DISCONNECTED;
+    SOCKETFIFO_Flush();
+}
+
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
@@ -431,21 +438,27 @@ static bool ftp_create_listening_socket (_i16 *sd, _u16 port, _u8 backlog) {
     _sd = *sd;
 
     if (_sd > 0) {
+        // add the new socket to the network administration
+        modusocket_socket_add(_sd, false);
+
         // Enable non-blocking mode
         nonBlockingOption.NonblockingEnabled = 1;
-        ASSERT (sl_SetSockOpt(_sd, SOL_SOCKET, SL_SO_NONBLOCKING, &nonBlockingOption, sizeof(nonBlockingOption)) == SL_SOC_OK);
+        ASSERT ((result = sl_SetSockOpt(_sd, SOL_SOCKET, SL_SO_NONBLOCKING, &nonBlockingOption, sizeof(nonBlockingOption))) == SL_SOC_OK);
 
         // Bind the socket to a port number
         sServerAddress.sin_family = AF_INET;
-        sServerAddress.sin_addr.s_addr = htonl(INADDR_ANY);
+        sServerAddress.sin_addr.s_addr = INADDR_ANY;
         sServerAddress.sin_port = htons(port);
 
-        ASSERT (sl_Bind(_sd, (const SlSockAddr_t *)&sServerAddress, sizeof(sServerAddress)) == SL_SOC_OK);
+        ASSERT ((result |= sl_Bind(_sd, (const SlSockAddr_t *)&sServerAddress, sizeof(sServerAddress))) == SL_SOC_OK);
 
         // Start listening
-        ASSERT ((result = sl_Listen (_sd, backlog)) == SL_SOC_OK);
+        ASSERT ((result |= sl_Listen (_sd, backlog)) == SL_SOC_OK);
 
-        return (result == SL_SOC_OK) ? true : false;
+        if (result == SL_SOC_OK) {
+            return true;
+        }
+        servers_close_socket(sd);
     }
     return false;
 }
@@ -466,6 +479,9 @@ static ftp_result_t ftp_wait_for_connection (_i16 l_sd, _i16 *n_sd) {
         return E_FTP_RESULT_FAILED;
     }
 
+    // add the new socket to the network administration
+    modusocket_socket_add(_sd, false);
+
     // client connected, so go on
     return E_FTP_RESULT_OK;
 }
@@ -592,8 +608,12 @@ static void ftp_process_cmd (void) {
     char *bufptr = (char *)ftp_cmd_buffer;
     ftp_result_t result;
     uint32_t listsize;
-    FILINFO fno;
     FRESULT fres;
+    FILINFO fno;
+#if _USE_LFN
+    fno.lfname = NULL;
+    fno.lfsize = 0;
+#endif
 
     ftp_data.closechild = false;
     // also use the reply buffer to receive new commands
@@ -669,7 +689,7 @@ static void ftp_process_cmd (void) {
         case E_FTP_CMD_USER:
             ftp_pop_param (&bufptr, ftp_scratch_buffer);
             if (!memcmp(ftp_scratch_buffer, servers_user, MAX(strlen(ftp_scratch_buffer), strlen(servers_user)))) {
-                ftp_data.loggin.uservalid = true;
+                ftp_data.loggin.uservalid = true && (strlen(servers_user) == strlen(ftp_scratch_buffer));
             }
             ftp_send_reply(331, NULL);
             break;
@@ -677,12 +697,13 @@ static void ftp_process_cmd (void) {
             ftp_pop_param (&bufptr, ftp_scratch_buffer);
             if (!memcmp(ftp_scratch_buffer, servers_pass, MAX(strlen(ftp_scratch_buffer), strlen(servers_pass))) &&
                     ftp_data.loggin.uservalid) {
-                ftp_data.loggin.passvalid = true;
-                ftp_send_reply(230, NULL);
-            }
-            else {
-                ftp_send_reply(530, NULL);
+                ftp_data.loggin.passvalid = true && (strlen(servers_pass) == strlen(ftp_scratch_buffer));
+                if (ftp_data.loggin.passvalid) {
+                    ftp_send_reply(230, NULL);
+                    break;
+                }
             }
+            ftp_send_reply(530, NULL);
             break;
         case E_FTP_CMD_PASV:
             {
@@ -699,7 +720,7 @@ static void ftp_process_cmd (void) {
                     ftp_data.dtimeout = 0;
                     wlan_get_ip(&ip);
                     snprintf((char *)ftp_data.dBuffer, FTP_BUFFER_SIZE, "(%u,%u,%u,%u,%u,%u)",
-                             pip[0], pip[1], pip[2], pip[3], (FTP_PASIVE_DATA_PORT >> 8), (FTP_PASIVE_DATA_PORT & 0xFF));
+                             pip[3], pip[2], pip[1], pip[0], (FTP_PASIVE_DATA_PORT >> 8), (FTP_PASIVE_DATA_PORT & 0xFF));
                     ftp_data.substate.data = E_FTP_STE_SUB_LISTEN_FOR_DATA;
                     ftp_send_reply(227, (char *)ftp_data.dBuffer);
                 }
@@ -819,7 +840,7 @@ static void ftp_process_cmd (void) {
         }
     }
     else if (result == E_FTP_RESULT_CONTINUE) {
-        if (ftp_data.ctimeout++ > (FTP_CMD_TIMEOUT_MS / FTP_CYCLE_TIME_MS)) {
+        if (ftp_data.ctimeout++ > (servers_get_timeout() / FTP_CYCLE_TIME_MS)) {
             ftp_send_reply(221, NULL);
         }
     }
@@ -852,16 +873,6 @@ static void ftp_close_cmd_data (void) {
     ftp_close_filesystem_on_error ();
 }
 
-static void ftp_reset (void) {
-    // close all connections and start all over again
-    servers_close_socket(&ftp_data.lc_sd);
-    servers_close_socket(&ftp_data.ld_sd);
-    ftp_close_cmd_data();
-    ftp_data.state = E_FTP_STE_START;
-    ftp_data.substate.data = E_FTP_STE_SUB_DISCONNECTED;
-    SOCKETFIFO_Flush();
-}
-
 static ftp_cmd_index_t ftp_pop_command (char **str) {
     char _cmd[FTP_CMD_SIZE_MAX];
     ftp_pop_param (str, _cmd);
@@ -891,7 +902,7 @@ static int ftp_print_eplf_item (char *dest, uint32_t destsize, FILINFO *fno) {
     uint16_t mseconds;
     uint mindex = (((fno->fdate >> 5) & 0x0f) > 0) ? (((fno->fdate >> 5) & 0x0f) - 1) : 0;
     uint day = ((fno->fdate & 0x1f) > 0) ? (fno->fdate & 0x1f) : 1;
-    uint fseconds = mod_time_seconds_since_2000(1980 + ((fno->fdate >> 9) & 0x7f),
+    uint fseconds = timeutils_seconds_since_2000(1980 + ((fno->fdate >> 9) & 0x7f),
                                                         (fno->fdate >> 5) & 0x0f,
                                                         fno->fdate & 0x1f,
                                                         (fno->ftime >> 11) & 0x1f,
@@ -901,22 +912,30 @@ static int ftp_print_eplf_item (char *dest, uint32_t destsize, FILINFO *fno) {
     if (FTP_UNIX_SECONDS_180_DAYS < tseconds - fseconds) {
         return snprintf(dest, destsize, "%srw-rw-r--   1 root  root %9u %s %2u %5u %s\r\n",
                         type, (_u32)fno->fsize, ftp_month[mindex].month, day,
+                    #if _USE_LFN
+                        1980 + ((fno->fdate >> 9) & 0x7f), *fno->lfname ? fno->lfname : fno->fname);
+                    #else
                         1980 + ((fno->fdate >> 9) & 0x7f), fno->fname);
+                    #endif
     }
     else {
         return snprintf(dest, destsize, "%srw-rw-r--   1 root  root %9u %s %2u %02u:%02u %s\r\n",
                         type, (_u32)fno->fsize, ftp_month[mindex].month, day,
+                    #if _USE_LFN
+                        (fno->ftime >> 11) & 0x1f, (fno->ftime >> 5) & 0x3f, *fno->lfname ? fno->lfname : fno->fname);
+                    #else
                         (fno->ftime >> 11) & 0x1f, (fno->ftime >> 5) & 0x3f, fno->fname);
+                    #endif
     }
 }
 
 static int ftp_print_eplf_drive (char *dest, uint32_t destsize, char *name) {
-    mod_struct_time tm;
+    timeutils_struct_time_t tm;
     uint32_t tseconds;
     uint16_t mseconds;
     char *type = "d";
 
-    mod_time_seconds_since_2000_to_struct_time((FTP_UNIX_TIME_20150101 - FTP_UNIX_TIME_20000101), &tm);
+    timeutils_seconds_since_2000_to_struct_time((FTP_UNIX_TIME_20150101 - FTP_UNIX_TIME_20000101), &tm);
 
     MAP_PRCMRTCGet(&tseconds, &mseconds);
     if (FTP_UNIX_SECONDS_180_DAYS < tseconds - (FTP_UNIX_TIME_20150101 - FTP_UNIX_TIME_20000101)) {
@@ -970,10 +989,10 @@ static ftp_result_t ftp_open_dir_for_listing (const char *path, char *list, uint
     uint next = 0;
     // "hack" to list root directory
     if (path[0] == '/' && path[1] == '\0') {
-        next += ftp_print_eplf_drive((list + next), (maxlistsize - next), "SFLASH");
+        next += ftp_print_eplf_drive((list + next), (maxlistsize - next), "flash");
 #if MICROPY_HW_HAS_SDCARD
         if (sd_disk_ready()) {
-            next += ftp_print_eplf_drive((list + next), (maxlistsize - next), "SD");
+            next += ftp_print_eplf_drive((list + next), (maxlistsize - next), "sd");
         }
 #endif
         *listsize = next;
@@ -993,11 +1012,18 @@ static ftp_result_t ftp_list_dir (char *list, uint32_t maxlistsize, uint32_t *li
     uint next = 0;
     uint count = 0;
     FRESULT res;
-    FILINFO fno;
     ftp_result_t result = E_FTP_RESULT_CONTINUE;
+    FILINFO fno;
+#if _USE_LFN
+    fno.lfname = mem_Malloc(_MAX_LFN);
+    fno.lfsize = _MAX_LFN;
 
-    /* read up to 4 directory items */
-    while (count++ < 4) {
+    // read up to 2 directory items
+    while (count < 2) {
+#else
+    // read up to 4 directory items
+    while (count < 4) {
+#endif
         res = f_readdir(&ftp_data.dp, &fno);                                                       /* Read a directory item */
         if (res != FR_OK || fno.fname[0] == 0) {
             result = E_FTP_RESULT_OK;
@@ -1006,13 +1032,17 @@ static ftp_result_t ftp_list_dir (char *list, uint32_t maxlistsize, uint32_t *li
         if (fno.fname[0] == '.' && fno.fname[1] == 0) continue;                                    /* Ignore . entry */
         if (fno.fname[0] == '.' && fno.fname[1] == '.' && fno.fname[2] == 0) continue;             /* Ignore .. entry */
 
-        // Add the entry to the list
+        // add the entry to the list
         next += ftp_print_eplf_item((list + next), (maxlistsize - next), &fno);
+        count++;
     }
     if (result == E_FTP_RESULT_OK) {
         ftp_close_files();
     }
     *listsize = next;
+#if _USE_LFN
+    mem_Free(fno.lfname);
+#endif
     return result;
 }
 
@@ -1060,3 +1090,4 @@ static void ftp_return_to_previous_path (char *pwd, char *dir) {
         }
     }
 }
+

cc3200/ftp/ftp.h

@@ -34,4 +34,6 @@ extern void ftp_init (void);
 extern void ftp_run (void);
 extern void ftp_enable (void);
 extern void ftp_disable (void);
+extern void ftp_reset (void);
+
 #endif /* FTP_H_ */

cc3200/ftp/updater.c

@@ -1,22 +1,23 @@
 #include <stdint.h>
 #include <stdbool.h>
-#include "std.h"
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
+#include "py/obj.h"
 #include "simplelink.h"
 #include "flc.h"
 #include "updater.h"
 #include "shamd5.h"
+#include "modnetwork.h"
 #include "modwlan.h"
 #include "debug.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
  ******************************************************************************/
-#define UPDATER_IMG_PATH            "/SFLASH/SYS/MCUIMG.BIN"
-#define UPDATER_SRVPACK_PATH        "/SFLASH/SYS/SRVPCK.UCF"
-#define UPDATER_SIGN_PATH           "/SFLASH/SYS/SRVPCK.SIG"
+#define UPDATER_IMG_PATH            "/flash/sys/mcuimg.bin"
+#define UPDATER_SRVPACK_PATH        "/flash/sys/servicepack.ucf"
+#define UPDATER_SIGN_PATH           "/flash/sys/servicepack.sig"
 
 /******************************************************************************
  DEFINE TYPES
@@ -37,8 +38,6 @@ static updater_data_t updater_data;
  DEFINE PUBLIC FUNCTIONS
  ******************************************************************************/
 bool updater_check_path (void *path) {
-    // conert the path supplied to upper case
-    stoupper (path);
     if (!strcmp(UPDATER_IMG_PATH, path)) {
         updater_data.path = IMG_UPDATE;
         updater_data.fsize = IMG_SIZE;
@@ -60,9 +59,7 @@ bool updater_check_path (void *path) {
 bool updater_start (void) {
     _u32 AccessModeAndMaxSize = FS_MODE_OPEN_WRITE;
     SlFsFileInfo_t FsFileInfo;
-#ifdef USE_FREERTOS
-    xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
-#endif
+    sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);
     if (0 != sl_FsGetInfo((_u8 *)updater_data.path, 0, &FsFileInfo)) {
         // file doesn't exist, create it
         AccessModeAndMaxSize = FS_MODE_OPEN_CREATE(updater_data.fsize, 0);
@@ -71,9 +68,7 @@ bool updater_start (void) {
         updater_data.foffset = 0;
         return true;
     }
-#ifdef USE_FREERTOS
-    xSemaphoreGive (xWlanSemaphore);
-#endif
+    sl_LockObjUnlock (&wlan_LockObj);
     return false;
 }
 
@@ -115,7 +110,5 @@ void updater_finnish (void) {
         }
     }
     updater_data.fhandle = -1;
-#ifdef USE_FREERTOS
-    xSemaphoreGive (xWlanSemaphore);
-#endif
+    sl_LockObjUnlock (&wlan_LockObj);
 }

cc3200/hal/adc.h

@@ -48,7 +48,7 @@
 //*****************************************************************************
 #ifdef __cplusplus
 extern "C"
-//{
+{
 #endif
 
 //*****************************************************************************

cc3200/hal/aes.h

@@ -1,217 +1,218 @@
-//*****************************************************************************
-//
-//  aes.h
-//
-//  Defines and Macros for the AES module.
-//
-//  Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
-//
-//
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted provided that the following conditions
-//  are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the
-//    distribution.
-//
-//    Neither the name of Texas Instruments Incorporated nor the names of
-//    its contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-//  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-//  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-//  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-//  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-//  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-//  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-//  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#ifndef __DRIVERLIB_AES_H__
-#define __DRIVERLIB_AES_H__
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-//*****************************************************************************
-//
-// The following defines are used to specify the operation direction in the
-// ui32Config argument in the AESConfig function.  Only one is permitted.
-//
-//*****************************************************************************
-#define AES_CFG_DIR_ENCRYPT     0x00000004
-#define AES_CFG_DIR_DECRYPT     0x00000000
-
-//*****************************************************************************
-//
-// The following defines are used to specify the key size in the ui32Config
-// argument in the AESConfig function.  Only one is permitted.
-//
-//*****************************************************************************
-#define AES_CFG_KEY_SIZE_128BIT 0x00000008
-#define AES_CFG_KEY_SIZE_192BIT 0x00000010
-#define AES_CFG_KEY_SIZE_256BIT 0x00000018
-
-//*****************************************************************************
-//
-// The following defines are used to specify the mode of operation in the
-// ui32Config argument in the AESConfig function.  Only one is permitted.
-//
-//*****************************************************************************
-#define AES_CFG_MODE_M          0x2007fe60
-#define AES_CFG_MODE_ECB        0x00000000
-#define AES_CFG_MODE_CBC        0x00000020
-#define AES_CFG_MODE_CTR        0x00000040
-#define AES_CFG_MODE_ICM        0x00000200
-#define AES_CFG_MODE_CFB        0x00000400
-#define AES_CFG_MODE_XTS_TWEAKJL \
-                                0x00000800
-#define AES_CFG_MODE_XTS_K2IJL \
-                                0x00001000
-#define AES_CFG_MODE_XTS_K2ILJ0 \
-                                0x00001800
-#define AES_CFG_MODE_F8         0x00002000
-#define AES_CFG_MODE_F9         0x20004000
-#define AES_CFG_MODE_CBCMAC     0x20008000
-#define AES_CFG_MODE_GCM_HLY0ZERO \
-                                0x20010040
-#define AES_CFG_MODE_GCM_HLY0CALC \
-                                0x20020040
-#define AES_CFG_MODE_GCM_HY0CALC \
-                                0x20030040
-#define AES_CFG_MODE_CCM        0x20040040
-
-//*****************************************************************************
-//
-// The following defines are used to specify the counter width in the
-// ui32Config argument in the AESConfig function.  It is only required to
-// be defined when using CTR, CCM, or GCM modes. Only one length is permitted.
-//
-//*****************************************************************************
-#define AES_CFG_CTR_WIDTH_32    0x00000000
-#define AES_CFG_CTR_WIDTH_64    0x00000080
-#define AES_CFG_CTR_WIDTH_96    0x00000100
-#define AES_CFG_CTR_WIDTH_128   0x00000180
-
-//*****************************************************************************
-//
-// The following defines are used to define the width of the length field for
-// CCM operation through the ui32Config argument in the AESConfig function.
-// This value is also known as L.  Only one is permitted.
-//
-//*****************************************************************************
-#define AES_CFG_CCM_L_2         0x00080000
-#define AES_CFG_CCM_L_4         0x00180000
-#define AES_CFG_CCM_L_8         0x00380000
-
-//*****************************************************************************
-//
-// The following defines are used to define the length of the authentication
-// field for CCM operations through the ui32Config argument in the AESConfig
-// function.  This value is also known as M.  Only one is permitted.
-//
-//*****************************************************************************
-#define AES_CFG_CCM_M_4         0x00400000
-#define AES_CFG_CCM_M_6         0x00800000
-#define AES_CFG_CCM_M_8         0x00c00000
-#define AES_CFG_CCM_M_10        0x01000000
-#define AES_CFG_CCM_M_12        0x01400000
-#define AES_CFG_CCM_M_14        0x01800000
-#define AES_CFG_CCM_M_16        0x01c00000
-
-//*****************************************************************************
-//
-// Interrupt flags for use with the AESIntEnable, AESIntDisable, and
-// AESIntStatus functions.
-//
-//*****************************************************************************
-#define AES_INT_CONTEXT_IN      0x00000001
-#define AES_INT_CONTEXT_OUT     0x00000008
-#define AES_INT_DATA_IN         0x00000002
-#define AES_INT_DATA_OUT        0x00000004
-#define AES_INT_DMA_CONTEXT_IN  0x00010000
-#define AES_INT_DMA_CONTEXT_OUT 0x00020000
-#define AES_INT_DMA_DATA_IN     0x00040000
-#define AES_INT_DMA_DATA_OUT    0x00080000
-
-//*****************************************************************************
-//
-// Defines used when enabling and disabling DMA requests in the
-// AESEnableDMA and AESDisableDMA functions.
-//
-//*****************************************************************************
-#define AES_DMA_DATA_IN         0x00000040
-#define AES_DMA_DATA_OUT        0x00000020
-#define AES_DMA_CONTEXT_IN      0x00000080
-#define AES_DMA_CONTEXT_OUT     0x00000100
-
-//*****************************************************************************
-//
-// Function prototypes.
-//
-//*****************************************************************************
-extern void AESConfigSet(uint32_t ui32Base, uint32_t ui32Config);
-extern void AESKey1Set(uint32_t ui32Base, uint8_t *pui8Key,
-                       uint32_t ui32Keysize);
-extern void AESKey2Set(uint32_t ui32Base, uint8_t *pui8Key,
-                       uint32_t ui32Keysize);
-extern void AESKey3Set(uint32_t ui32Base, uint8_t *pui8Key);
-extern void AESIVSet(uint32_t ui32Base, uint8_t *pui8IVdata);
-extern void AESTagRead(uint32_t ui32Base, uint8_t *pui8TagData);
-extern void AESDataLengthSet(uint32_t ui32Base, uint64_t ui64Length);
-extern void AESAuthDataLengthSet(uint32_t ui32Base, uint32_t ui32Length);
-extern bool AESDataReadNonBlocking(uint32_t ui32Base, uint8_t *pui8Dest,
-                                   uint8_t ui8Length);
-extern void AESDataRead(uint32_t ui32Base, uint8_t *pui8Dest,
-                        uint8_t ui8Length);
-extern bool AESDataWriteNonBlocking(uint32_t ui32Base, uint8_t *pui8Src,
-                                    uint8_t ui8Length);
-extern void AESDataWrite(uint32_t ui32Base, uint8_t *pui8Src,
-                         uint8_t ui8Length);
-extern bool AESDataProcess(uint32_t ui32Base, uint8_t *pui8Src,
-                           uint8_t *pui8Dest,
-               uint32_t ui32Length);
-extern bool AESDataMAC(uint32_t ui32Base, uint8_t *pui8Src,
-                       uint32_t ui32Length,
-            uint8_t *pui8Tag);
-extern bool AESDataProcessAE(uint32_t ui32Base, uint8_t *pui8Src,
-                             uint8_t *pui8Dest, uint32_t ui32Length,
-                             uint8_t *pui8AuthSrc, uint32_t ui32AuthLength,
-                             uint8_t *pui8Tag);
-extern uint32_t AESIntStatus(uint32_t ui32Base, bool bMasked);
-extern void AESIntEnable(uint32_t ui32Base, uint32_t ui32IntFlags);
-extern void AESIntDisable(uint32_t ui32Base, uint32_t ui32IntFlags);
-extern void AESIntClear(uint32_t ui32Base, uint32_t ui32IntFlags);
-extern void AESIntRegister(uint32_t ui32Base, void(*pfnHandler)(void));
-extern void AESIntUnregister(uint32_t ui32Base);
-extern void AESDMAEnable(uint32_t ui32Base, uint32_t ui32Flags);
-extern void AESDMADisable(uint32_t ui32Base, uint32_t ui32Flags);
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef __cplusplus
-}
-#endif
-
-#endif //  __DRIVERLIB_AES_H__
+//*****************************************************************************
+//
+//  aes.h
+//
+//  Defines and Macros for the AES module.
+//
+//  Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+//
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions
+//  are met:
+//
+//    Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//
+//    Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the
+//    distribution.
+//
+//    Neither the name of Texas Instruments Incorporated nor the names of
+//    its contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+//  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+//  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+//  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+//  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+//  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+//  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//*****************************************************************************
+
+#ifndef __DRIVERLIB_AES_H__
+#define __DRIVERLIB_AES_H__
+
+//*****************************************************************************
+//
+// If building with a C++ compiler, make all of the definitions in this header
+// have a C binding.
+//
+//*****************************************************************************
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+//*****************************************************************************
+//
+// The following defines are used to specify the operation direction in the
+// ui32Config argument in the AESConfig function.  Only one is permitted.
+//
+//*****************************************************************************
+#define AES_CFG_DIR_ENCRYPT     0x00000004
+#define AES_CFG_DIR_DECRYPT     0x00000000
+
+//*****************************************************************************
+//
+// The following defines are used to specify the key size in the ui32Config
+// argument in the AESConfig function.  Only one is permitted.
+//
+//*****************************************************************************
+#define AES_CFG_KEY_SIZE_128BIT 0x00000008
+#define AES_CFG_KEY_SIZE_192BIT 0x00000010
+#define AES_CFG_KEY_SIZE_256BIT 0x00000018
+
+//*****************************************************************************
+//
+// The following defines are used to specify the mode of operation in the
+// ui32Config argument in the AESConfig function.  Only one is permitted.
+//
+//*****************************************************************************
+#define AES_CFG_MODE_M          0x2007fe60
+#define AES_CFG_MODE_ECB        0x00000000
+#define AES_CFG_MODE_CBC        0x00000020
+#define AES_CFG_MODE_CTR        0x00000040
+#define AES_CFG_MODE_ICM        0x00000200
+#define AES_CFG_MODE_CFB        0x00000400
+#define AES_CFG_MODE_XTS_TWEAKJL \
+                                0x00000800
+#define AES_CFG_MODE_XTS_K2IJL \
+                                0x00001000
+#define AES_CFG_MODE_XTS_K2ILJ0 \
+                                0x00001800
+#define AES_CFG_MODE_F8         0x00002000
+#define AES_CFG_MODE_F9         0x20004000
+#define AES_CFG_MODE_CBCMAC     0x20008000
+#define AES_CFG_MODE_GCM_HLY0ZERO \
+                                0x20010040
+#define AES_CFG_MODE_GCM_HLY0CALC \
+                                0x20020040
+#define AES_CFG_MODE_GCM_HY0CALC \
+                                0x20030040
+#define AES_CFG_MODE_CCM        0x20040040
+
+//*****************************************************************************
+//
+// The following defines are used to specify the counter width in the
+// ui32Config argument in the AESConfig function.  It is only required to
+// be defined when using CTR, CCM, or GCM modes. Only one length is permitted.
+//
+//*****************************************************************************
+#define AES_CFG_CTR_WIDTH_32    0x00000000
+#define AES_CFG_CTR_WIDTH_64    0x00000080
+#define AES_CFG_CTR_WIDTH_96    0x00000100
+#define AES_CFG_CTR_WIDTH_128   0x00000180
+
+//*****************************************************************************
+//
+// The following defines are used to define the width of the length field for
+// CCM operation through the ui32Config argument in the AESConfig function.
+// This value is also known as L.  Only one is permitted.
+//
+//*****************************************************************************
+#define AES_CFG_CCM_L_2         0x00080000
+#define AES_CFG_CCM_L_4         0x00180000
+#define AES_CFG_CCM_L_8         0x00380000
+
+//*****************************************************************************
+//
+// The following defines are used to define the length of the authentication
+// field for CCM operations through the ui32Config argument in the AESConfig
+// function.  This value is also known as M.  Only one is permitted.
+//
+//*****************************************************************************
+#define AES_CFG_CCM_M_4         0x00400000
+#define AES_CFG_CCM_M_6         0x00800000
+#define AES_CFG_CCM_M_8         0x00c00000
+#define AES_CFG_CCM_M_10        0x01000000
+#define AES_CFG_CCM_M_12        0x01400000
+#define AES_CFG_CCM_M_14        0x01800000
+#define AES_CFG_CCM_M_16        0x01c00000
+
+//*****************************************************************************
+//
+// Interrupt flags for use with the AESIntEnable, AESIntDisable, and
+// AESIntStatus functions.
+//
+//*****************************************************************************
+#define AES_INT_CONTEXT_IN      0x00000001
+#define AES_INT_CONTEXT_OUT     0x00000008
+#define AES_INT_DATA_IN         0x00000002
+#define AES_INT_DATA_OUT        0x00000004
+#define AES_INT_DMA_CONTEXT_IN  0x00010000
+#define AES_INT_DMA_CONTEXT_OUT 0x00020000
+#define AES_INT_DMA_DATA_IN     0x00040000
+#define AES_INT_DMA_DATA_OUT    0x00080000
+
+//*****************************************************************************
+//
+// Defines used when enabling and disabling DMA requests in the
+// AESEnableDMA and AESDisableDMA functions.
+//
+//*****************************************************************************
+#define AES_DMA_DATA_IN         0x00000040
+#define AES_DMA_DATA_OUT        0x00000020
+#define AES_DMA_CONTEXT_IN      0x00000080
+#define AES_DMA_CONTEXT_OUT     0x00000100
+
+//*****************************************************************************
+//
+// Function prototypes.
+//
+//*****************************************************************************
+extern void AESConfigSet(uint32_t ui32Base, uint32_t ui32Config);
+extern void AESKey1Set(uint32_t ui32Base, uint8_t *pui8Key,
+                       uint32_t ui32Keysize);
+extern void AESKey2Set(uint32_t ui32Base, uint8_t *pui8Key,
+                       uint32_t ui32Keysize);
+extern void AESKey3Set(uint32_t ui32Base, uint8_t *pui8Key);
+extern void AESIVSet(uint32_t ui32Base, uint8_t *pui8IVdata);
+extern void AESIVGet(uint32_t ui32Base, uint8_t *pui8IVdata);
+extern void AESTagRead(uint32_t ui32Base, uint8_t *pui8TagData);
+extern void AESDataLengthSet(uint32_t ui32Base, uint64_t ui64Length);
+extern void AESAuthDataLengthSet(uint32_t ui32Base, uint32_t ui32Length);
+extern bool AESDataReadNonBlocking(uint32_t ui32Base, uint8_t *pui8Dest,
+                                   uint8_t ui8Length);
+extern void AESDataRead(uint32_t ui32Base, uint8_t *pui8Dest,
+                        uint8_t ui8Length);
+extern bool AESDataWriteNonBlocking(uint32_t ui32Base, uint8_t *pui8Src,
+                                    uint8_t ui8Length);
+extern void AESDataWrite(uint32_t ui32Base, uint8_t *pui8Src,
+                         uint8_t ui8Length);
+extern bool AESDataProcess(uint32_t ui32Base, uint8_t *pui8Src,
+                           uint8_t *pui8Dest,
+               uint32_t ui32Length);
+extern bool AESDataMAC(uint32_t ui32Base, uint8_t *pui8Src,
+                       uint32_t ui32Length,
+            uint8_t *pui8Tag);
+extern bool AESDataProcessAE(uint32_t ui32Base, uint8_t *pui8Src,
+                             uint8_t *pui8Dest, uint32_t ui32Length,
+                             uint8_t *pui8AuthSrc, uint32_t ui32AuthLength,
+                             uint8_t *pui8Tag);
+extern uint32_t AESIntStatus(uint32_t ui32Base, bool bMasked);
+extern void AESIntEnable(uint32_t ui32Base, uint32_t ui32IntFlags);
+extern void AESIntDisable(uint32_t ui32Base, uint32_t ui32IntFlags);
+extern void AESIntClear(uint32_t ui32Base, uint32_t ui32IntFlags);
+extern void AESIntRegister(uint32_t ui32Base, void(*pfnHandler)(void));
+extern void AESIntUnregister(uint32_t ui32Base);
+extern void AESDMAEnable(uint32_t ui32Base, uint32_t ui32Flags);
+extern void AESDMADisable(uint32_t ui32Base, uint32_t ui32Flags);
+
+//*****************************************************************************
+//
+// Mark the end of the C bindings section for C++ compilers.
+//
+//*****************************************************************************
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  __DRIVERLIB_AES_H__

cc3200/hal/cc3200_hal.c

@@ -30,19 +30,21 @@
  ******************************************************************************/
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_nvic.h"
 #include "hw_memmap.h"
-#include "mpconfig.h"
+#include "py/mpstate.h"
 #include MICROPY_HAL_H
 #include "rom_map.h"
 #include "interrupt.h"
 #include "systick.h"
 #include "prcm.h"
-#include "sdhost.h"
 #include "pin.h"
 #include "mpexception.h"
+#include "telnet.h"
+#include "pybuart.h"
 
 #ifdef USE_FREERTOS
 #include "FreeRTOS.h"
@@ -51,26 +53,23 @@
 #endif
 
 
-/******************************************************************************
- DECLARE CONSTANTS
- ******************************************************************************/
-#define HAL_SDCARD_FREQUENCY_HZ             15000000        // 15MHz
-
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
 #ifndef USE_FREERTOS
 static void hal_TickInit (void);
 #endif
-#if MICROPY_HW_HAS_SDCARD
-static void hal_EnableSdCard (void);
-#endif
 
 /******************************************************************************
- DECLARE LOCAL VARIABLES
+ DECLARE LOCAL DATA
  ******************************************************************************/
 static volatile uint32_t HAL_tickCount;
 
+/******************************************************************************
+ DECLARE PUBLIC DATA
+ ******************************************************************************/
+struct _pyb_uart_obj_t *pyb_stdio_uart;
+
 /******************************************************************************
  DECLARE IMPORTED DATA
  ******************************************************************************/
@@ -79,13 +78,14 @@ extern void (* const g_pfnVectors[256])(void);
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
  ******************************************************************************/
- 
+
+__attribute__ ((section (".boot")))
 void HAL_SystemInit (void) {
     MAP_IntVTableBaseSet((unsigned long)&g_pfnVectors[0]);
 
     // in the case of a release image, these steps are already performed by
     // the bootloader so we can skip it and gain some code space
-#ifndef NDEBUG
+#ifdef DEBUG
     MAP_IntMasterEnable();
     PRCMCC3200MCUInit();
 #endif
@@ -93,9 +93,6 @@ void HAL_SystemInit (void) {
 #ifndef USE_FREERTOS
     hal_TickInit();
 #endif
-#if MICROPY_HW_HAS_SDCARD
-    hal_EnableSdCard();
-#endif
 }
 
 void HAL_SystemDeInit (void) {
@@ -126,6 +123,44 @@ void mp_hal_set_interrupt_char (int c) {
     mpexception_set_interrupt_char (c);
 }
 
+void mp_hal_stdout_tx_str(const char *str) {
+    mp_hal_stdout_tx_strn(str, strlen(str));
+}
+
+void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
+    // send stdout to UART
+    if (pyb_stdio_uart != NULL) {
+        uart_tx_strn(pyb_stdio_uart, str, len);
+    }
+    // and also to telnet
+    if (telnet_is_active()) {
+        telnet_tx_strn(str, len);
+    }
+}
+
+void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
+    // send stdout to UART
+    if (pyb_stdio_uart != NULL) {
+        uart_tx_strn_cooked(pyb_stdio_uart, str, len);
+    }
+    // and also to telnet
+    if (telnet_is_active()) {
+        telnet_tx_strn_cooked(str, len);
+    }
+}
+
+int mp_hal_stdin_rx_chr(void) {
+    for ( ;; ) {
+        if (telnet_rx_any()) {
+            return telnet_rx_char();
+        }
+        else if (pyb_stdio_uart != NULL && uart_rx_any(pyb_stdio_uart)) {
+            return uart_rx_char(pyb_stdio_uart);
+        }
+        HAL_Delay(1);
+    }
+}
+
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
@@ -143,23 +178,3 @@ static void hal_TickInit (void) {
 }
 #endif
 
-#if MICROPY_HW_HAS_SDCARD
-static void hal_EnableSdCard (void) {
-    // Configure PIN_06 for SDHOST0 SDHost_D0
-    MAP_PinTypeSDHost(PIN_06, PIN_MODE_8);
-    // Configure PIN_07 for SDHOST0 SDHost_CLK
-    MAP_PinTypeSDHost(PIN_07, PIN_MODE_8);
-    // Configure PIN_08 for SDHOST0 SDHost_CMD
-    MAP_PinTypeSDHost(PIN_08, PIN_MODE_8);
-    // Set the SD card clock as an output pin
-    MAP_PinDirModeSet(PIN_07, PIN_DIR_MODE_OUT);
-    // Enable SD peripheral clock
-    MAP_PRCMPeripheralClkEnable(PRCM_SDHOST, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-    // Reset MMCHS
-    MAP_PRCMPeripheralReset(PRCM_SDHOST);
-    // Configure MMCHS
-    MAP_SDHostInit(SDHOST_BASE);
-    // Configure the card clock
-    MAP_SDHostSetExpClk(SDHOST_BASE, MAP_PRCMPeripheralClockGet(PRCM_SDHOST), HAL_SDCARD_FREQUENCY_HZ);
-}
-#endif

cc3200/hal/cc3200_hal.h

@@ -39,6 +39,9 @@
 #define HAL_SYSTICK_PERIOD_US               1000U
 #define UTILS_DELAY_US_TO_COUNT(us)         (((us) * HAL_FCPU_MHZ) / 3)
 
+#define HAL_NVIC_INT_CTRL_REG               (*((volatile uint32_t *) 0xE000ED04 ) )
+#define HAL_VECTACTIVE_MASK                 (0x1FUL)
+
 /******************************************************************************
  DEFINE TYPES
  ******************************************************************************/
@@ -52,6 +55,11 @@
                                               " isb \n");   \
                                      }
 
+/******************************************************************************
+ DECLARE PUBLIC DATA
+ ******************************************************************************/
+extern struct _pyb_uart_obj_t *pyb_stdio_uart;
+
 /******************************************************************************
  DECLARE PUBLIC FUNCTIONS
  ******************************************************************************/
@@ -63,4 +71,9 @@ extern uint32_t HAL_GetTick(void);
 extern void HAL_Delay(uint32_t delay);
 extern void mp_hal_set_interrupt_char (int c);
 
+int mp_hal_stdin_rx_chr(void);
+void mp_hal_stdout_tx_str(const char *str);
+void mp_hal_stdout_tx_strn(const char *str, uint32_t len);
+void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len);
+
 #endif /* CC3200_LAUNCHXL_HAL_CC3200_HAL_H_ */

cc3200/hal/cc_types.h

@@ -1,58 +0,0 @@
-//*****************************************************************************
-//
-// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
-// 
-// 
-//  Redistribution and use in source and binary forms, with or without 
-//  modification, are permitted provided that the following conditions 
-//  are met:
-//
-//    Redistributions of source code must retain the above copyright 
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the 
-//    documentation and/or other materials provided with the   
-//    distribution.
-//
-//    Neither the name of Texas Instruments Incorporated nor the names of
-//    its contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-//  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-//  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-//  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-//  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-//  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-//  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-//  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#ifndef __CC_TYPES_H__
-#define __CC_TYPES_H__
-
-typedef unsigned long long   u64;
-typedef unsigned long  u32;
-typedef int            i32;
-typedef unsigned short u16;
-typedef short          i16;
-typedef unsigned char  u8;
-typedef char    		i8;
-
-typedef void * cc_hndl;
-
-typedef u32 (*sys_irq_dsbl)();
-typedef void (*sys_irq_enbl)(u32 mask);
-#define UNUSED(x) ((x) = (x))
-
-#define INTRODUCE_SYNC_BARRIER() {          \
-    __asm(" dsb \n"                         \
-          " isb \n");                       \
-         }
-
-#endif //__CC_TYPES_H__

cc3200/hal/i2c.c

@@ -169,10 +169,8 @@ _I2CIntNumberGet(uint32_t ui32Base)
 //
 //*****************************************************************************
 void
-I2CMasterInitExpClk(uint32_t ui32Base, uint32_t ui32I2CClk,
-                    bool bFast)
+I2CMasterInitExpClk(uint32_t ui32Base, uint32_t ui32SCLFreq)
 {
-    uint32_t ui32SCLFreq;
     uint32_t ui32TPR;
 
     //
@@ -185,25 +183,13 @@ I2CMasterInitExpClk(uint32_t ui32Base, uint32_t ui32I2CClk,
     //
     I2CMasterEnable(ui32Base);
 
-    //
-    // Get the desired SCL speed.
-    //
-    if(bFast == true)
-    {
-        ui32SCLFreq = 400000;
-    }
-    else
-    {
-        ui32SCLFreq = 100000;
-    }
-
     //
     // Compute the clock divider that achieves the fastest speed less than or
     // equal to the desired speed.  The numerator is biased to favor a larger
     // clock divider so that the resulting clock is always less than or equal
     // to the desired clock, never greater.
     //
-    ui32TPR = ((ui32I2CClk + (2 * 10 * ui32SCLFreq) - 1) /
+    ui32TPR = ((80000000 + (2 * 10 * ui32SCLFreq) - 1) /
                (2 * 10 * ui32SCLFreq)) - 1;
     HWREG(ui32Base + I2C_O_MTPR) = ui32TPR;
 
@@ -213,7 +199,7 @@ I2CMasterInitExpClk(uint32_t ui32Base, uint32_t ui32I2CClk,
     //
     if(HWREG(ui32Base + I2C_O_PP) & I2C_PP_HS)
     {
-        ui32TPR = ((ui32I2CClk + (2 * 3 * 3400000) - 1) /
+        ui32TPR = ((80000000 + (2 * 3 * 3400000) - 1) /
                    (2 * 3 * 3400000)) - 1;
         HWREG(ui32Base + I2C_O_MTPR) = I2C_MTPR_HS | ui32TPR;
     }

cc3200/hal/i2c.h

@@ -309,8 +309,7 @@ extern void I2CMasterDataPut(uint32_t ui32Base, uint8_t ui8Data);
 extern void I2CMasterDisable(uint32_t ui32Base);
 extern void I2CMasterEnable(uint32_t ui32Base);
 extern uint32_t I2CMasterErr(uint32_t ui32Base);
-extern void I2CMasterInitExpClk(uint32_t ui32Base, uint32_t ui32I2CClk,
-                                bool bFast);
+extern void I2CMasterInitExpClk(uint32_t ui32Base, uint32_t ui32SCLFreq);
 extern void I2CMasterIntClear(uint32_t ui32Base);
 extern void I2CMasterIntDisable(uint32_t ui32Base);
 extern void I2CMasterIntEnable(uint32_t ui32Base);

cc3200/hal/i2s.h

@@ -1,202 +1,218 @@
-//*****************************************************************************
-//
-//  i2s.h
-//
-//  Defines and Macros for the I2S.
-//
-//  Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
-//
-//
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted provided that the following conditions
-//  are met:
-//
-//    Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//
-//    Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the
-//    distribution.
-//
-//    Neither the name of Texas Instruments Incorporated nor the names of
-//    its contributors may be used to endorse or promote products derived
-//    from this software without specific prior written permission.
-//
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-//  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-//  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-//  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-//  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-//  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-//  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-//  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#ifndef __I2S_H__
-#define __I2S_H__
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-//*****************************************************************************
-//
-// I2S DMA ports.
-//
-//*****************************************************************************
-#define I2S_TX_DMA_PORT      0x4401E200
-#define I2S_RX_DMA_PORT      0x4401E280
-
-//*****************************************************************************
-//
-// Values that can be passed to I2SConfigSetExpClk() as the ulConfig parameter.
-//
-//*****************************************************************************
-#define I2S_SLOT_SIZE_24      0x00B200B4
-#define I2S_SLOT_SIZE_16      0x00700074
-
-#define I2S_PORT_CPU          0x00000008
-#define I2S_PORT_DMA          0x00000000
-
-//*****************************************************************************
-//
-// Values that can be passed as ulDataLine parameter.
-//
-//*****************************************************************************
-#define I2S_DATA_LINE_0       0x00000001
-#define I2S_DATA_LINE_1       0x00000002
-
-//*****************************************************************************
-//
-// Values that can be passed to I2SSerializerConfig() as the ulSerMode
-// parameter.
-//
-//*****************************************************************************
-#define I2S_SER_MODE_TX       0x00000001
-#define I2S_SER_MODE_RX       0x00000002
-#define I2S_SER_MODE_DISABLE  0x00000000
-
-//*****************************************************************************
-//
-// Values that can be passed to I2SSerializerConfig() as the ulInActState
-// parameter.
-//
-//*****************************************************************************
-#define I2S_INACT_TRI_STATE   0x00000000
-#define I2S_INACT_LOW_LEVEL   0x00000008
-#define I2S_INACT_HIGH_LEVEL  0x0000000C
-
-//*****************************************************************************
-//
-// Values that can be passed to I2SIntEnable() and I2SIntDisable() as the
-// ulIntFlags parameter.
-//
-//*****************************************************************************
-#define I2S_INT_XUNDRN	      0x00000001
-#define I2S_INT_XSYNCERR      0x00000002
-#define I2S_INT_XLAST         0x00000010
-#define I2S_INT_XDATA         0x00000020
-#define I2S_INT_XSTAFRM       0x00000080
-#define I2S_INT_XDMA	      0x80000000
-#define I2S_INT_ROVRN         0x00010000
-#define I2S_INT_RSYNCERR      0x00020000
-#define I2S_INT_RLAST         0x00100000
-#define I2S_INT_RDATA         0x00200000
-#define I2S_INT_RSTAFRM       0x00800000
-#define I2S_INT_RDMA          0x40000000
-
-//*****************************************************************************
-//
-// Values that can be passed to I2SIntClear() as the
-// ulIntFlags parameter and returned from I2SIntStatus().
-//
-//*****************************************************************************
-#define I2S_STS_XERR          0x00000100
-#define I2S_STS_XDMAERR	      0x00000080
-#define I2S_STS_XSTAFRM	      0x00000040
-#define I2S_STS_XDATA	      0x00000020
-#define I2S_STS_XLAST	      0x00000010
-#define I2S_STS_XSYNCERR      0x00000002
-#define I2S_STS_XUNDRN	      0x00000001
-#define I2S_STS_XDMA	      0x80000000
-#define I2S_STS_RERR          0x01000000
-#define I2S_STS_RDMAERR       0x00800000
-#define I2S_STS_RSTAFRM       0x00400000
-#define I2S_STS_RDATA         0x00200000
-#define I2S_STS_RLAST         0x00100000
-#define I2S_STS_RSYNCERR      0x00020000
-#define I2S_STS_ROVERN	      0x00010000
-#define I2S_STS_RDMA          0x40000000
-
-//*****************************************************************************
-//
-// Values that can be passed to I2SEnable() as the ulMode parameter.
-//
-//*****************************************************************************
-#define I2S_MODE_TX_ONLY      0x00000001
-#define I2S_MODE_TX_RX_SYNC   0x00000003
-
-
-//*****************************************************************************
-//
-// API Function prototypes
-//
-//*****************************************************************************
-extern void I2SEnable(unsigned long ulBase, unsigned long ulMode);
-extern void I2SDisable(unsigned long ulBase);
-
-extern void I2SDataPut(unsigned long ulBase, unsigned long ulDataLine,
-                unsigned long ulData);
-extern long I2SDataPutNonBlocking(unsigned long ulBase,
-                               unsigned long ulDataLine, unsigned long ulData);
-
-extern void I2SDataGet(unsigned long ulBase, unsigned long ulDataLine,
-                unsigned long *pulData);
-extern long I2SDataGetNonBlocking(unsigned long ulBase,
-                unsigned long ulDataLine, unsigned long *pulData);
-
-extern void I2SConfigSetExpClk(unsigned long ulBase, unsigned long ulI2SClk,
-                               unsigned long ulBitClk, unsigned long ulConfig);
-
-extern void I2STxFIFOEnable(unsigned long ulBase, unsigned long ulTxLevel,
-                     unsigned long ulWordsPerTransfer);
-extern void I2STxFIFODisable(unsigned long ulBase);
-extern void I2SRxFIFOEnable(unsigned long ulBase, unsigned long ulRxLevel,
-                     unsigned long ulWordsPerTransfer);
-extern void I2SRxFIFODisable(unsigned long ulBase);
-extern unsigned long I2STxFIFOStatusGet(unsigned long ulBase);
-extern unsigned long I2SRxFIFOStatusGet(unsigned long ulBase);
-
-extern void I2SSerializerConfig(unsigned long ulBase, unsigned long ulDataLine,
-                         unsigned long ulSerMode, unsigned long ulInActState);
-
-extern void I2SIntEnable(unsigned long ulBase, unsigned long ulIntFlags);
-extern void I2SIntDisable(unsigned long ulBase, unsigned long ulIntFlags);
-extern unsigned long I2SIntStatus(unsigned long ulBase);
-extern void I2SIntClear(unsigned long ulBase, unsigned long ulIntFlags);
-extern void I2SIntRegister(unsigned long ulBase, void (*pfnHandler)(void));
-extern void I2SIntUnregister(unsigned long ulBase);
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef __cplusplus
-}
-#endif
-
-#endif //__I2S_H__
-
+//*****************************************************************************
+//
+//  i2s.h
+//
+//  Defines and Macros for the I2S.
+//
+//  Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+//
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions
+//  are met:
+//
+//    Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//
+//    Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the
+//    distribution.
+//
+//    Neither the name of Texas Instruments Incorporated nor the names of
+//    its contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+//  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+//  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+//  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+//  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+//  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+//  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+//  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//*****************************************************************************
+
+#ifndef __I2S_H__
+#define __I2S_H__
+
+//*****************************************************************************
+//
+// If building with a C++ compiler, make all of the definitions in this header
+// have a C binding.
+//
+//*****************************************************************************
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+//*****************************************************************************
+//
+// I2S DMA ports.
+//
+//*****************************************************************************
+#define I2S_TX_DMA_PORT      0x4401E200
+#define I2S_RX_DMA_PORT      0x4401E280
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SConfigSetExpClk() as the ulConfig parameter.
+//
+//*****************************************************************************
+#define I2S_SLOT_SIZE_8       0x00300032
+#define I2S_SLOT_SIZE_16      0x00700074
+#define I2S_SLOT_SIZE_24      0x00B000B6
+
+
+#define I2S_PORT_CPU          0x00080008
+#define I2S_PORT_DMA          0x00000000
+
+#define I2S_MODE_MASTER       0x00000000
+#define I2S_MODE_SLAVE        0x00008000
+
+//*****************************************************************************
+//
+// Values that can be passed as ulDataLine parameter.
+//
+//*****************************************************************************
+#define I2S_DATA_LINE_0       0x00000001
+#define I2S_DATA_LINE_1       0x00000002
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SSerializerConfig() as the ulSerMode
+// parameter.
+//
+//*****************************************************************************
+#define I2S_SER_MODE_TX       0x00000001
+#define I2S_SER_MODE_RX       0x00000002
+#define I2S_SER_MODE_DISABLE  0x00000000
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SSerializerConfig() as the ulInActState
+// parameter.
+//
+//*****************************************************************************
+#define I2S_INACT_TRI_STATE   0x00000000
+#define I2S_INACT_LOW_LEVEL   0x00000008
+#define I2S_INACT_HIGH_LEVEL  0x0000000C
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SIntEnable() and I2SIntDisable() as the
+// ulIntFlags parameter.
+//
+//*****************************************************************************
+#define I2S_INT_XUNDRN	      0x00000001
+#define I2S_INT_XSYNCERR      0x00000002
+#define I2S_INT_XLAST         0x00000010
+#define I2S_INT_XDATA         0x00000020
+#define I2S_INT_XSTAFRM       0x00000080
+#define I2S_INT_XDMA	      0x80000000
+#define I2S_INT_ROVRN         0x00010000
+#define I2S_INT_RSYNCERR      0x00020000
+#define I2S_INT_RLAST         0x00100000
+#define I2S_INT_RDATA         0x00200000
+#define I2S_INT_RSTAFRM       0x00800000
+#define I2S_INT_RDMA          0x40000000
+
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SRxActiveSlotSet() and I2STxActiveSlotSet
+//
+//*****************************************************************************
+#define I2S_ACT_SLOT_EVEN     0x00000001
+#define I2S_ACT_SLOT_ODD      0x00000002
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SIntClear() as the
+// ulIntFlags parameter and returned from I2SIntStatus().
+//
+//*****************************************************************************
+#define I2S_STS_XERR          0x00000100
+#define I2S_STS_XDMAERR	      0x00000080
+#define I2S_STS_XSTAFRM	      0x00000040
+#define I2S_STS_XDATA	      0x00000020
+#define I2S_STS_XLAST	      0x00000010
+#define I2S_STS_XSYNCERR      0x00000002
+#define I2S_STS_XUNDRN	      0x00000001
+#define I2S_STS_XDMA	      0x80000000
+#define I2S_STS_RERR          0x01000000
+#define I2S_STS_RDMAERR       0x00800000
+#define I2S_STS_RSTAFRM       0x00400000
+#define I2S_STS_RDATA         0x00200000
+#define I2S_STS_RLAST         0x00100000
+#define I2S_STS_RSYNCERR      0x00020000
+#define I2S_STS_ROVERN	      0x00010000
+#define I2S_STS_RDMA          0x40000000
+
+//*****************************************************************************
+//
+// Values that can be passed to I2SEnable() as the ulMode parameter.
+//
+//*****************************************************************************
+#define I2S_MODE_TX_ONLY      0x00000001
+#define I2S_MODE_TX_RX_SYNC   0x00000003
+
+
+//*****************************************************************************
+//
+// API Function prototypes
+//
+//*****************************************************************************
+extern void I2SEnable(unsigned long ulBase, unsigned long ulMode);
+extern void I2SDisable(unsigned long ulBase);
+
+extern void I2SDataPut(unsigned long ulBase, unsigned long ulDataLine,
+                unsigned long ulData);
+extern long I2SDataPutNonBlocking(unsigned long ulBase,
+                               unsigned long ulDataLine, unsigned long ulData);
+
+extern void I2SDataGet(unsigned long ulBase, unsigned long ulDataLine,
+                unsigned long *pulData);
+extern long I2SDataGetNonBlocking(unsigned long ulBase,
+                unsigned long ulDataLine, unsigned long *pulData);
+
+extern void I2SConfigSetExpClk(unsigned long ulBase, unsigned long ulI2SClk,
+                               unsigned long ulBitClk, unsigned long ulConfig);
+
+extern void I2STxFIFOEnable(unsigned long ulBase, unsigned long ulTxLevel,
+                     unsigned long ulWordsPerTransfer);
+extern void I2STxFIFODisable(unsigned long ulBase);
+extern void I2SRxFIFOEnable(unsigned long ulBase, unsigned long ulRxLevel,
+                     unsigned long ulWordsPerTransfer);
+extern void I2SRxFIFODisable(unsigned long ulBase);
+extern unsigned long I2STxFIFOStatusGet(unsigned long ulBase);
+extern unsigned long I2SRxFIFOStatusGet(unsigned long ulBase);
+
+extern void I2SSerializerConfig(unsigned long ulBase, unsigned long ulDataLine,
+                         unsigned long ulSerMode, unsigned long ulInActState);
+
+extern void I2SIntEnable(unsigned long ulBase, unsigned long ulIntFlags);
+extern void I2SIntDisable(unsigned long ulBase, unsigned long ulIntFlags);
+extern unsigned long I2SIntStatus(unsigned long ulBase);
+extern void I2SIntClear(unsigned long ulBase, unsigned long ulIntFlags);
+extern void I2SIntRegister(unsigned long ulBase, void (*pfnHandler)(void));
+extern void I2SIntUnregister(unsigned long ulBase);
+extern void I2STxActiveSlotSet(unsigned long ulBase, unsigned long ulActSlot);
+extern void I2SRxActiveSlotSet(unsigned long ulBase, unsigned long ulActSlot);
+
+//*****************************************************************************
+//
+// Mark the end of the C bindings section for C++ compilers.
+//
+//*****************************************************************************
+#ifdef __cplusplus
+}
+#endif
+
+#endif //__I2S_H__
+

cc3200/hal/pin.c

@@ -49,15 +49,6 @@
 #include "inc/hw_ocp_shared.h"
 #include "pin.h"
 
-//*****************************************************************************
-// Macros
-//*****************************************************************************
-#define PAD_MODE_MASK		0x0000000F
-#define PAD_STRENGTH_MASK	0x000000E0
-#define PAD_TYPE_MASK		0x00000310
-#define PAD_CONFIG_BASE		((OCP_SHARED_BASE + \
-                                  OCP_SHARED_O_GPIO_PAD_CONFIG_0))
-
 //*****************************************************************************
 // PIN to PAD matrix
 //*****************************************************************************
@@ -334,7 +325,7 @@ void PinConfigSet(unsigned long ulPin,unsigned long  ulPinStrength,
     //
     // Isolate the output
     //
-    HWREG(ulPad) |= 0xC00;
+    HWREG(ulPad) = 0xC00;
 
   }
   else

cc3200/hal/pin.h

@@ -143,6 +143,13 @@ extern "C"
 #define PIN_TYPE_OD_PD    0x00000210
 #define PIN_TYPE_ANALOG   0x10000000
 
+//*****************************************************************************
+// Macros for mode and type
+//*****************************************************************************
+#define PAD_MODE_MASK       0x0000000F
+#define PAD_STRENGTH_MASK   0x000000E0
+#define PAD_TYPE_MASK       0x00000310
+#define PAD_CONFIG_BASE     ((OCP_SHARED_BASE + OCP_SHARED_O_GPIO_PAD_CONFIG_0))
 
 //*****************************************************************************
 //

cc3200/hal/prcm.c

@@ -98,26 +98,40 @@
 #define RTC_SECS_IN_U64MSEC(u64Msec)     ((unsigned long)(u64Msec  >>   10))
 #define RTC_MSEC_IN_U64MSEC(u64Msec)     ((unsigned short)(u64Msec & 0x3FF))
 
+#define RTC_MSEC_U32_REG_ADDR            (HIB3P3_BASE + HIB3P3_O_MEM_HIB_REG2)
 #define RTC_SECS_U32_REG_ADDR            (HIB3P3_BASE + HIB3P3_O_MEM_HIB_REG3)
-#define RTC_MSEC_U16_REG_ADDR            (HIB3P3_BASE + HIB3P3_O_MEM_HIB_REG2+2)
-
-#define RTC_U32SECS_REG                 (HWREG(RTC_SECS_U32_REG_ADDR))
-#define RTC_U16MSEC_REG                 (*(unsigned short*)RTC_MSEC_U16_REG_ADDR)
 
 //*****************************************************************************
 // Register Access and Updates
 //
-// Tick of SCC has a resolution of 32768Hz. Therefore, scaling SCC value by 32
-// yields ~1 msec resolution. All operations of SCC in RTC context use ms unit.
-//*****************************************************************************
-#define SCC_U64MSEC_GET()                (PRCMSlowClkCtrGet() >> 5)
-#define SCC_U64MSEC_MATCH_SET(u64Msec)   (PRCMSlowClkCtrMatchSet(u64Msec << 5))
-#define SCC_U64MSEC_MATCH_GET()          (PRCMSlowClkCtrMatchGet() >> 5)
+// Tick of SCC has a resolution of 32768Hz, meaning 1 sec is equal to 32768
+// clock ticks. Ideal way of getting time in millisecond will involve floating
+// point arithmetic (division by 32.768). To avoid this, we simply divide it by
+// 32, which will give a range from 0 -1023(instead of 0-999). To use this
+// output correctly we have to take care of this inaccuracy externally.
+// following wrapper can be used to convert the value from cycles to
+// millisecond:
+//
+// CYCLES_U16MS(cycles) ((cycles *1000)/ 1024),
+//
+// Similarly, before setting the value, it must be first converted (from ms to
+// cycles).
+//
+// U16MS_CYCLES(msec)   ((msec *1024)/1000)
+//
+// Note: There is a precision loss of 1 ms with the above scheme.
+//
+//
+#define SCC_U64MSEC_GET()                (MAP_PRCMSlowClkCtrGet() >> 5)
+#define SCC_U64MSEC_MATCH_SET(u64Msec)   (MAP_PRCMSlowClkCtrMatchSet(u64Msec << 5))
+#define SCC_U64MSEC_MATCH_GET()          (MAP_PRCMSlowClkCtrMatchGet() >> 5)
 
 //*****************************************************************************
 //
 // Bit:  31 is used to indicate use of RTC. If set as '1', RTC feature is used.
-// Bits: 30 to 26 are reserved, available to software for use
+// Bit:  30 is used to indicate that a safe boot should be performed
+// bit:  29 is used to indicate that the last reset was caused by the WDT
+// Bits: 28 to 26 are unused
 // Bits: 25 to 16 are used to save millisecond part of RTC reference.
 // Bits: 15 to 0 are being used for HW Changes / ECO
 //
@@ -128,13 +142,23 @@
 //*****************************************************************************
 static void RTCUseSet(void)
 {
-  unsigned short usRegValue;
+  unsigned int uiRegValue;
 
-  usRegValue = RTC_U16MSEC_REG |  (1 << 15);
+  uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) | (1 << 31);
 
-  UtilsDelay((80*200)/3);
+  PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue);
+}
 
-  RTC_U16MSEC_REG = usRegValue;
+//*****************************************************************************
+// Clear RTC USE Bit
+//*****************************************************************************
+static void RTCUseClear(void)
+{
+  unsigned int uiRegValue;
+
+  uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (~(1 << 31));
+
+  PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue);
 }
 
 //*****************************************************************************
@@ -142,41 +166,29 @@ static void RTCUseSet(void)
 //*****************************************************************************
 static tBoolean IsRTCUsed(void)
 {
-  unsigned short usRegValue;
-
-  usRegValue = RTC_U16MSEC_REG;
-
-  UtilsDelay((80*200)/3);
-
-  return ((usRegValue & (1 << 15))? true : false);
+  return (MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (1 << 31)) ? true : false;
 }
 
 //*****************************************************************************
 // Read 16-bit mSecs
 //*****************************************************************************
-static unsigned short RTCU16MSecRegRead(void)
+static unsigned short RTCU32MSecRegRead(void)
 {
-  unsigned short usRegValue;
-
-  usRegValue = RTC_U16MSEC_REG;
-
-  UtilsDelay((80*200)/3);
-
-  return (usRegValue & 0x3FF);
+  return ((MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) >> 16) & 0x03FF);
 }
 
 //*****************************************************************************
 // Write 16-bit mSecs
 //*****************************************************************************
-static void RTCU16MSecRegWrite(unsigned short u16Msec)
+static void RTCU32MSecRegWrite(unsigned int u32Msec)
 {
-   unsigned short usRegValue;
+   unsigned int uiRegValue;
 
-   usRegValue = RTC_U16MSEC_REG;
+   // read the whole register and clear the msec bits
+   uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (~(0x03FF << 16));
 
-   UtilsDelay((80*200)/3);
-
-   RTC_U16MSEC_REG = ((usRegValue & ~0x3FF) |u16Msec);
+   // write the msec bits only
+   MAP_PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue | ((u32Msec & 0x03FF) << 16));
 }
 
 //*****************************************************************************
@@ -184,7 +196,7 @@ static void RTCU16MSecRegWrite(unsigned short u16Msec)
 //*****************************************************************************
 static unsigned long RTCU32SecRegRead(void)
 {
-  return (PRCMHIBRegRead(RTC_SECS_U32_REG_ADDR));
+  return (MAP_PRCMHIBRegRead(RTC_SECS_U32_REG_ADDR));
 }
 
 //*****************************************************************************
@@ -192,7 +204,7 @@ static unsigned long RTCU32SecRegRead(void)
 //*****************************************************************************
 static void RTCU32SecRegWrite(unsigned long u32Msec)
 {
-   PRCMHIBRegWrite(RTC_SECS_U32_REG_ADDR, u32Msec);
+  MAP_PRCMHIBRegWrite(RTC_SECS_U32_REG_ADDR, u32Msec);
 }
 
 //*****************************************************************************
@@ -200,9 +212,10 @@ static void RTCU32SecRegWrite(unsigned long u32Msec)
 //*****************************************************************************
 #define IS_RTC_USED()                   IsRTCUsed()
 #define RTC_USE_SET()                   RTCUseSet()
+#define RTC_USE_CLR()                   RTCUseClear()
 
-#define RTC_U16MSEC_REG_RD()            RTCU16MSecRegRead()
-#define RTC_U16MSEC_REG_WR(u16Msec)     RTCU16MSecRegWrite(u16Msec)
+#define RTC_U32MSEC_REG_RD()            RTCU32MSecRegRead()
+#define RTC_U32MSEC_REG_WR(u32Msec)     RTCU32MSecRegWrite(u32Msec)
 
 #define RTC_U32SECS_REG_RD()            RTCU32SecRegRead()
 #define RTC_U32SECS_REG_WR(u32Secs)     RTCU32SecRegWrite(u32Secs)
@@ -239,6 +252,98 @@ static const PRCM_PeriphRegs_t PRCM_PeriphRegsList[] =
 
 };
 
+//*****************************************************************************
+//
+//! Requests a safe boot
+//!
+//! \return None.
+//
+//*****************************************************************************
+void PRCMRequestSafeBoot(void)
+{
+    unsigned int uiRegValue;
+
+    uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) | (1 << 30);
+
+    PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue);
+}
+
+//*****************************************************************************
+//
+//! Clear the safe boot request
+//!
+//! \return None.
+//
+//*****************************************************************************
+void PRCMClearSafeBootRequest(void)
+{
+    unsigned int uiRegValue;
+
+    uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (~(1 << 30));
+
+    PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue);
+}
+
+//*****************************************************************************
+//
+//! Read the safe boot request bit. This bit is cleared after reading.
+//!
+//! \return Value of the safe boot bit
+//
+//*****************************************************************************
+tBoolean PRCMIsSafeBootRequested(void)
+{
+    tBoolean safeboot = (MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (1 << 30)) ? true : false;
+
+    PRCMClearSafeBootRequest();
+
+    return safeboot;
+}
+
+//*****************************************************************************
+//
+//! Signals that a WDT reset has occurred
+//!
+//! \return None.
+//
+//*****************************************************************************
+void PRCMSignalWDTReset(void)
+{
+    unsigned int uiRegValue;
+
+    uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) | (1 << 29);
+
+    PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue);
+}
+
+//*****************************************************************************
+//
+//! Clear the WDT reset signal
+//!
+//! \return None.
+//
+//*****************************************************************************
+void PRCMClearWDTResetSignal(void)
+{
+    unsigned int uiRegValue;
+
+    uiRegValue = MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (~(1 << 29));
+
+    PRCMHIBRegWrite(RTC_MSEC_U32_REG_ADDR, uiRegValue);
+}
+
+//*****************************************************************************
+//
+//! Read the WDT reset signal bit
+//!
+//! \return Value of the WDT reset signal bit
+//
+//*****************************************************************************
+tBoolean PRCMWasResetBecauseOfWDT(void)
+{
+    return (MAP_PRCMHIBRegRead(RTC_MSEC_U32_REG_ADDR) & (1 << 29)) ? true : false;
+}
+
 //*****************************************************************************
 //
 //! Performs a software reset of a SOC
@@ -304,7 +409,7 @@ void PRCMMCUReset(tBoolean bIncludeSubsystem)
 //! \return Returns one of the cause defined above.
 //
 //*****************************************************************************
-unsigned long PRCMSysResetCauseGet()
+unsigned long PRCMSysResetCauseGet(void)
 {
   unsigned long ulWakeupStatus;
 
@@ -318,7 +423,7 @@ unsigned long PRCMSysResetCauseGet()
   //
   if(ulWakeupStatus == PRCM_POWER_ON)
   {
-    if(PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_WAKE_STATUS) & 0x1)
+    if(MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_WAKE_STATUS) & 0x1)
     {
       ulWakeupStatus = PRCM_HIB_EXIT;
     }
@@ -349,8 +454,7 @@ unsigned long PRCMSysResetCauseGet()
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMPeripheralClkEnable(unsigned long ulPeripheral, unsigned long ulClkFlags)
+void PRCMPeripheralClkEnable(unsigned long ulPeripheral, unsigned long ulClkFlags)
 {
   //
   // Enable the specified peripheral clocks, Nothing to be done for PRCM_ADC
@@ -386,8 +490,7 @@ PRCMPeripheralClkEnable(unsigned long ulPeripheral, unsigned long ulClkFlags)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMPeripheralClkDisable(unsigned long ulPeripheral, unsigned long ulClkFlags)
+void PRCMPeripheralClkDisable(unsigned long ulPeripheral, unsigned long ulClkFlags)
 {
   //
   // Disable the specified peripheral clocks
@@ -409,8 +512,7 @@ PRCMPeripheralClkDisable(unsigned long ulPeripheral, unsigned long ulClkFlags)
 //! \return Returns input clock frequency for specified peripheral.
 //
 //*****************************************************************************
-unsigned long
-PRCMPeripheralClockGet(unsigned long ulPeripheral)
+unsigned long PRCMPeripheralClockGet(unsigned long ulPeripheral)
 {
   unsigned long ulClockFreq;
   unsigned long ulHiPulseDiv;
@@ -462,8 +564,7 @@ PRCMPeripheralClockGet(unsigned long ulPeripheral)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMPeripheralReset(unsigned long ulPeripheral)
+void PRCMPeripheralReset(unsigned long ulPeripheral)
 {
   volatile unsigned long ulDelay;
 
@@ -503,8 +604,7 @@ PRCMPeripheralReset(unsigned long ulPeripheral)
 //! \return Returns \b true if the  peripheral is ready, \b false otherwise.
 //
 //*****************************************************************************
-tBoolean
-PRCMPeripheralStatusGet(unsigned long ulPeripheral)
+tBoolean PRCMPeripheralStatusGet(unsigned long ulPeripheral)
 {
   unsigned long ReadyBit;
 
@@ -546,8 +646,7 @@ PRCMPeripheralStatusGet(unsigned long ulPeripheral)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMI2SClockFreqSet(unsigned long ulI2CClkFreq)
+void PRCMI2SClockFreqSet(unsigned long ulI2CClkFreq)
 {
  unsigned long long ullDiv;
   unsigned short usInteger;
@@ -577,8 +676,7 @@ PRCMI2SClockFreqSet(unsigned long ulI2CClkFreq)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMLPDSRestoreInfoSet(unsigned long ulStackPtr, unsigned long ulProgCntr)
+void PRCMLPDSRestoreInfoSet(unsigned long ulStackPtr, unsigned long ulProgCntr)
 {
   //
   // Set The SP Value
@@ -600,15 +698,24 @@ PRCMLPDSRestoreInfoSet(unsigned long ulStackPtr, unsigned long ulProgCntr)
 //! \sa PRCMLPDSRestoreInfoSet().
 //!
 //! \return None.
+//!
+//! \note The Test Power Domain is shutdown whenever the system
+//!  enters LPDS (by default). In order to avoid this and allow for
+//!  connecting back the debugger after waking up from LPDS,
+//!  the macro KEEP_TESTPD_ALIVE has to be defined while building the library.
+//!  This is recommended for development purposes only as it adds to
+//!  the current consumption of the system.
+//!
 //
 //*****************************************************************************
-void
-PRCMLPDSEnter()
+void PRCMLPDSEnter(void)
 {
+#ifndef DEBUG
   //
   // Disable TestPD
   //
   HWREG(0x4402E168) |= (1<<9);
+#endif
 
   //
   // Set bandgap duty cycle to 1
@@ -618,8 +725,7 @@ PRCMLPDSEnter()
   //
   // Request LPDS
   //
-  HWREG(ARCM_BASE + APPS_RCM_O_APPS_LPDS_REQ)
-          = APPS_RCM_APPS_LPDS_REQ_APPS_LPDS_REQ;
+  HWREG(ARCM_BASE + APPS_RCM_O_APPS_LPDS_REQ) = APPS_RCM_APPS_LPDS_REQ_APPS_LPDS_REQ;
 
   __asm("    nop\n"
         "    nop\n"
@@ -642,8 +748,7 @@ PRCMLPDSEnter()
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMLPDSWakeupSourceEnable(unsigned long ulLpdsWakeupSrc)
+void PRCMLPDSWakeupSourceEnable(unsigned long ulLpdsWakeupSrc)
 {
   unsigned long ulRegVal;
 
@@ -678,8 +783,7 @@ PRCMLPDSWakeupSourceEnable(unsigned long ulLpdsWakeupSrc)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMLPDSWakeupSourceDisable(unsigned long ulLpdsWakeupSrc)
+void PRCMLPDSWakeupSourceDisable(unsigned long ulLpdsWakeupSrc)
 {
   HWREG(GPRCM_BASE+ GPRCM_O_APPS_LPDS_WAKEUP_CFG) &= ~ulLpdsWakeupSrc;
 }
@@ -695,8 +799,7 @@ PRCMLPDSWakeupSourceDisable(unsigned long ulLpdsWakeupSrc)
 //! PRCMLPDSWakeupSourceEnable().
 //
 //*****************************************************************************
-unsigned long
-PRCMLPDSWakeupCauseGet()
+unsigned long PRCMLPDSWakeupCauseGet(void)
 {
   return (HWREG(GPRCM_BASE+ GPRCM_O_APPS_LPDS_WAKEUP_SRC));
 }
@@ -714,8 +817,7 @@ PRCMLPDSWakeupCauseGet()
 //! \return Returns \b true on success, \b false otherwise.
 //
 //*****************************************************************************
-void
-PRCMLPDSIntervalSet(unsigned long ulTicks)
+void PRCMLPDSIntervalSet(unsigned long ulTicks)
 {
   //
   // Check sleep is atleast for 21 cycles
@@ -759,13 +861,12 @@ PRCMLPDSIntervalSet(unsigned long ulTicks)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMLPDSWakeUpGPIOSelect(unsigned long ulGPIOPin, unsigned long ulType)
+void PRCMLPDSWakeUpGPIOSelect(unsigned long ulGPIOPin, unsigned long ulType)
 {
   //
   // Set the wakeup GPIO
   //
-  PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_LPDS_GPIO_SEL, ulGPIOPin);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_LPDS_GPIO_SEL, ulGPIOPin);
 
   //
   // Set the trigger type.
@@ -785,8 +886,7 @@ PRCMLPDSWakeUpGPIOSelect(unsigned long ulGPIOPin, unsigned long ulType)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMSleepEnter()
+void PRCMSleepEnter(void)
 {
   //
   // Request Sleep
@@ -806,8 +906,7 @@ PRCMSleepEnter()
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMDeepSleepEnter()
+void PRCMDeepSleepEnter(void)
 {
   //
   // Set bandgap duty cycle to 1
@@ -857,8 +956,7 @@ PRCMDeepSleepEnter()
 //! \return None.
 //
 //****************************************************************************
-void
-PRCMSRAMRetentionEnable(unsigned long ulSramColSel, unsigned long ulModeFlags)
+void PRCMSRAMRetentionEnable(unsigned long ulSramColSel, unsigned long ulModeFlags)
 {
   if(ulModeFlags & PRCM_SRAM_DSLP_RET)
   {
@@ -902,8 +1000,7 @@ PRCMSRAMRetentionEnable(unsigned long ulSramColSel, unsigned long ulModeFlags)
 //! \return None.
 //
 //****************************************************************************
-void
-PRCMSRAMRetentionDisable(unsigned long ulSramColSel, unsigned long ulFlags)
+void PRCMSRAMRetentionDisable(unsigned long ulSramColSel, unsigned long ulFlags)
 {
   if(ulFlags & PRCM_SRAM_DSLP_RET)
   {
@@ -944,15 +1041,14 @@ PRCMSRAMRetentionDisable(unsigned long ulSramColSel, unsigned long ulFlags)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMHibernateWakeupSourceEnable(unsigned long ulHIBWakupSrc)
+void PRCMHibernateWakeupSourceEnable(unsigned long ulHIBWakupSrc)
 {
   unsigned long ulRegValue;
 
   //
   // Read the RTC register
   //
-  ulRegValue = PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN);
+  ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN);
 
   //
   // Enable the RTC as wakeup source if specified
@@ -962,12 +1058,12 @@ PRCMHibernateWakeupSourceEnable(unsigned long ulHIBWakupSrc)
   //
   // Enable HIB wakeup sources
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN,ulRegValue);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN,ulRegValue);
 
   //
   // REad the GPIO wakeup configuration register
   //
-  ulRegValue = PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN);
+  ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN);
 
   //
   // Enable the specified GPIOs a wakeup sources
@@ -977,7 +1073,7 @@ PRCMHibernateWakeupSourceEnable(unsigned long ulHIBWakupSrc)
   //
   // Write the new register configuration
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN,ulRegValue);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN,ulRegValue);
 }
 
 //*****************************************************************************
@@ -993,15 +1089,14 @@ PRCMHibernateWakeupSourceEnable(unsigned long ulHIBWakupSrc)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMHibernateWakeupSourceDisable(unsigned long ulHIBWakupSrc)
+void PRCMHibernateWakeupSourceDisable(unsigned long ulHIBWakupSrc)
 {
   unsigned long ulRegValue;
 
   //
   // Read the RTC register
   //
-  ulRegValue = PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN);
+  ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN);
 
   //
   // Disable the RTC as wakeup source if specified
@@ -1011,12 +1106,12 @@ PRCMHibernateWakeupSourceDisable(unsigned long ulHIBWakupSrc)
   //
   // Disable HIB wakeup sources
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN,ulRegValue);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_EN,ulRegValue);
 
   //
   // Read the GPIO wakeup configuration register
   //
-  ulRegValue = PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN);
+  ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN);
 
   //
   // Enable the specified GPIOs a wakeup sources
@@ -1026,7 +1121,7 @@ PRCMHibernateWakeupSourceDisable(unsigned long ulHIBWakupSrc)
   //
   // Write the new register configuration
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN,ulRegValue);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_EN,ulRegValue);
 }
 
 
@@ -1040,10 +1135,9 @@ PRCMHibernateWakeupSourceDisable(unsigned long ulHIBWakupSrc)
 //! \b PRCM_HIB_WAKEUP_CAUSE_GPIO
 //
 //*****************************************************************************
-unsigned long
-PRCMHibernateWakeupCauseGet()
+unsigned long PRCMHibernateWakeupCauseGet(void)
 {
-  return ((PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_WAKE_STATUS)>>1)&0xF);
+  return ((MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_WAKE_STATUS)>>1)&0xF);
 }
 
 //*****************************************************************************
@@ -1057,22 +1151,21 @@ PRCMHibernateWakeupCauseGet()
 //! \return Returns \b true on success, \b false otherwise.
 //
 //*****************************************************************************
-void
-PRCMHibernateIntervalSet(unsigned long long ullTicks)
+void PRCMHibernateIntervalSet(unsigned long long ullTicks)
 {
   unsigned long long ullRTCVal;
 
   //
   // Latch the RTC vlaue
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_READ ,0x1);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_READ ,0x1);
 
   //
   // Read latched values as 2 32-bit vlaues
   //
-  ullRTCVal  = PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_TIMER_MSW);
+  ullRTCVal  = MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_TIMER_MSW);
   ullRTCVal  = ullRTCVal << 32;
-  ullRTCVal |= PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_LSW);
+  ullRTCVal |= MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_LSW);
 
   //
   // Add the interval
@@ -1082,9 +1175,9 @@ PRCMHibernateIntervalSet(unsigned long long ullTicks)
   //
   // Set RTC match value
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_LSW_CONF,
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_LSW_CONF,
                                             (unsigned long)(ullRTCVal));
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_MSW_CONF,
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_WAKE_MSW_CONF,
                                            (unsigned long)(ullRTCVal>>32));
 }
 
@@ -1119,8 +1212,7 @@ PRCMHibernateIntervalSet(unsigned long long ullTicks)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMHibernateWakeUpGPIOSelect(unsigned long ulGPIOBitMap, unsigned long ulType)
+void PRCMHibernateWakeUpGPIOSelect(unsigned long ulGPIOBitMap, unsigned long ulType)
 {
   unsigned char ucLoop;
   unsigned long ulRegValue;
@@ -1137,9 +1229,9 @@ PRCMHibernateWakeUpGPIOSelect(unsigned long ulGPIOBitMap, unsigned long ulType)
   {
     if(ulGPIOBitMap & (1<<ucLoop))
     {
-      ulRegValue  = PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_CONF);
+      ulRegValue  = MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_CONF);
       ulRegValue |= (ulType << (ucLoop*2));
-      PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_CONF, ulRegValue);
+      MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_GPIO_WAKE_CONF, ulRegValue);
     }
   }
 }
@@ -1155,14 +1247,13 @@ PRCMHibernateWakeUpGPIOSelect(unsigned long ulGPIOBitMap, unsigned long ulType)
 //! \return None.
 //
 //*****************************************************************************
-void
-PRCMHibernateEnter()
+void PRCMHibernateEnter(void)
 {
 
   //
   // Request hibernate.
   //
-  PRCMHIBRegWrite((HIB3P3_BASE+HIB3P3_O_MEM_HIB_REQ),0x1);
+  MAP_PRCMHIBRegWrite((HIB3P3_BASE+HIB3P3_O_MEM_HIB_REQ),0x1);
 
   __asm("    nop\n"
         "    nop\n"
@@ -1179,22 +1270,21 @@ PRCMHibernateEnter()
 //! \return 64-bit current counter vlaue.
 //
 //*****************************************************************************
-unsigned long long
-PRCMSlowClkCtrGet()
+unsigned long long PRCMSlowClkCtrGet(void)
 {
   unsigned long long ullRTCVal;
 
   //
   // Latch the RTC vlaue
   //
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_READ, 0x1);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_READ, 0x1);
 
   //
   // Read latched values as 2 32-bit vlaues
   //
-  ullRTCVal  = PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_TIMER_MSW);
+  ullRTCVal  = MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_TIMER_MSW);
   ullRTCVal  = ullRTCVal << 32;
-  ullRTCVal |= PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_LSW);
+  ullRTCVal |= MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_RTC_TIMER_LSW);
 
   return ullRTCVal;
 }
@@ -1217,9 +1307,9 @@ void PRCMSlowClkCtrMatchSet(unsigned long long ullValue)
   //
   // Set RTC match value
   //
-  PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_LSW_CONF,
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_LSW_CONF,
                                            (unsigned long)(ullValue));
-  PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_MSW_CONF,
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_MSW_CONF,
                                            (unsigned long)(ullValue>>32));
 }
 
@@ -1233,16 +1323,16 @@ void PRCMSlowClkCtrMatchSet(unsigned long long ullValue)
 //! \return None.
 //
 //*****************************************************************************
-unsigned long long PRCMSlowClkCtrMatchGet()
+unsigned long long PRCMSlowClkCtrMatchGet(void)
 {
   unsigned long long ullValue;
 
   //
   // Get RTC match value
   //
-  ullValue = PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_MSW_CONF);
+  ullValue = MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_MSW_CONF);
   ullValue = ullValue<<32;
-  ullValue |= PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_LSW_CONF);
+  ullValue |= MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_LSW_CONF);
 
   //
   // Return the value
@@ -1265,7 +1355,7 @@ unsigned long long PRCMSlowClkCtrMatchGet()
 //*****************************************************************************
 void PRCMOCRRegisterWrite(unsigned char ucIndex, unsigned long ulRegValue)
 {
-  PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_REG2+(ucIndex << 2),ulRegValue);
+  MAP_PRCMHIBRegWrite(HIB3P3_BASE+HIB3P3_O_MEM_HIB_REG2+(ucIndex << 2),ulRegValue);
 }
 
 //*****************************************************************************
@@ -1285,7 +1375,7 @@ unsigned long PRCMOCRRegisterRead(unsigned char ucIndex)
   //
   // Return the read value.
   //
-  return PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_REG2 + (ucIndex << 2));
+  return MAP_PRCMHIBRegRead(HIB3P3_BASE+HIB3P3_O_MEM_HIB_REG2 + (ucIndex << 2));
 }
 
 //*****************************************************************************
@@ -1326,7 +1416,7 @@ void PRCMIntRegister(void (*pfnHandler)(void))
 //! \return None.
 //
 //*****************************************************************************
-void PRCMIntUnregister()
+void PRCMIntUnregister(void)
 {
   //
   // Enable the UART interrupt.
@@ -1368,9 +1458,9 @@ void PRCMIntEnable(unsigned long ulIntFlags)
     //
     // Enable RTC interrupt
     //
-    ulRegValue = PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE);
+    ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE);
     ulRegValue |= 0x1;
-    PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE, ulRegValue);
+    MAP_PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE, ulRegValue);
   }
 }
 
@@ -1404,9 +1494,9 @@ void PRCMIntDisable(unsigned long ulIntFlags)
     //
     // Disable RTC interrupt
     //
-    ulRegValue = PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE);
+    ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE);
     ulRegValue &= ~0x1;
-    PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE, ulRegValue);
+    MAP_PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_RTC_IRQ_ENABLE, ulRegValue);
   }
 }
 
@@ -1420,7 +1510,7 @@ void PRCMIntDisable(unsigned long ulIntFlags)
 //! \return Returns the current interrupt status.
 //
 //*****************************************************************************
-unsigned long PRCMIntStatus()
+unsigned long PRCMIntStatus(void)
 {
     return HWREG(ARCM_BASE + APPS_RCM_O_APPS_RCM_INTERRUPT_STATUS);
 }
@@ -1437,15 +1527,25 @@ unsigned long PRCMIntStatus()
 //! register is not available to user. Also, users must not excercise the Slow
 //! Clock Counter API(s), if RTC has been set for use.
 //!
-//! The RTC feature, if set or marked, can be only reset either through reboot
-//! or power cycle.
+//! \return None.
+//
+//*****************************************************************************
+void PRCMRTCInUseSet(void)
+{
+        RTC_USE_SET();
+        return;
+}
+
+//*****************************************************************************
+//
+//! Clear the function of RTC as being used
 //!
 //! \return None.
 //
 //*****************************************************************************
-void PRCMRTCInUseSet()
+void PRCMRTCInUseClear(void)
 {
-        RTC_USE_SET();
+        RTC_USE_CLR();
         return;
 }
 
@@ -1466,7 +1566,7 @@ void PRCMRTCInUseSet()
 //! \return None.
 //
 //*****************************************************************************
-tBoolean PRCMRTCInUseGet()
+tBoolean PRCMRTCInUseGet(void)
 {
         return IS_RTC_USED()? true : false;
 }
@@ -1498,7 +1598,7 @@ void PRCMRTCSet(unsigned long ulSecs, unsigned short usMsec)
                 ullMsec = RTC_U64MSEC_MK(ulSecs, usMsec) - SCC_U64MSEC_GET();
 
                  RTC_U32SECS_REG_WR(RTC_SECS_IN_U64MSEC(ullMsec));
-                 RTC_U16MSEC_REG_WR(RTC_MSEC_IN_U64MSEC(ullMsec));
+                 RTC_U32MSEC_REG_WR(RTC_MSEC_IN_U64MSEC(ullMsec));
         }
 
         return;
@@ -1529,7 +1629,7 @@ void PRCMRTCGet(unsigned long *ulSecs, unsigned short *usMsec)
 
         if(IS_RTC_USED()) {
                 ullMsec  = RTC_U64MSEC_MK(RTC_U32SECS_REG_RD(),
-                                          RTC_U16MSEC_REG_RD());
+                                          RTC_U32MSEC_REG_RD());
                 ullMsec += SCC_U64MSEC_GET();
         }
 
@@ -1565,7 +1665,7 @@ void PRCMRTCMatchSet(unsigned long ulSecs, unsigned short usMsec)
         if(IS_RTC_USED()) {
                 ullMsec  = RTC_U64MSEC_MK(ulSecs, usMsec);
                 ullMsec -= RTC_U64MSEC_MK(RTC_U32SECS_REG_RD(),
-                                          RTC_U16MSEC_REG_RD());
+                                          RTC_U32MSEC_REG_RD());
                 SCC_U64MSEC_MATCH_SET(SELECT_SCC_U42BITS(ullMsec));
         }
 
@@ -1598,7 +1698,7 @@ void PRCMRTCMatchGet(unsigned long *ulSecs, unsigned short *usMsec)
         if(IS_RTC_USED()) {
                 ullMsec  = SCC_U64MSEC_MATCH_GET();
                 ullMsec += RTC_U64MSEC_MK(RTC_U32SECS_REG_RD(),
-                                          RTC_U16MSEC_REG_RD());
+                                          RTC_U32MSEC_REG_RD());
         }
 
         *ulSecs = RTC_SECS_IN_U64MSEC(ullMsec);
@@ -1616,7 +1716,7 @@ void PRCMRTCMatchGet(unsigned long *ulSecs, unsigned short *usMsec)
 //! \return None
 //
 //*****************************************************************************
-void PRCMCC3200MCUInit()
+void PRCMCC3200MCUInit(void)
 {
     unsigned long ulRegValue;
 
@@ -1627,11 +1727,11 @@ void PRCMCC3200MCUInit()
 
     //
     // Enable hibernate ECO for PG 1.32 devices only. With this ECO enabled,
-    // any hibernate wakeup source will be kept maked until the device enters
+    // any hibernate wakeup source will be kept masked until the device enters
     // hibernate completely (analog + digital)
     //
-    ulRegValue = PRCMHIBRegRead(HIB3P3_BASE  + HIB3P3_O_MEM_HIB_REG0);
-    PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_REG0, ulRegValue | (1<<4));
+    ulRegValue = MAP_PRCMHIBRegRead(HIB3P3_BASE  + HIB3P3_O_MEM_HIB_REG0);
+    MAP_PRCMHIBRegWrite(HIB3P3_BASE + HIB3P3_O_MEM_HIB_REG0, ulRegValue | (1<<4));
 
     //
     // Handling the clock switching (for 1.32 only)
@@ -1770,6 +1870,63 @@ void PRCMHIBRegWrite(unsigned long ulRegAddr, unsigned long ulValue)
   UtilsDelay((80*200)/3);
 }
 
+//*****************************************************************************
+//
+//! \param ulDivider is clock frequency divider value
+//! \param ulWidth is the width of the high pulse
+//!
+//! This function sets the input frequency for camera module.
+//!
+//! The frequency is calculated as follows:
+//!
+//!        f_out = 240MHz/ulDivider;
+//!
+//! The parameter \e ulWidth sets the width of the high pulse.
+//!
+//! For e.g.:
+//!
+//!     ulDivider = 4;
+//!     ulWidth   = 2;
+//!
+//!     f_out = 30 MHz and 50% duty cycle
+//!
+//! And,
+//!
+//!     ulDivider = 4;
+//!     ulWidth   = 1;
+//!
+//!     f_out = 30 MHz and 25% duty cycle
+//!
+//! \return 0 on success, 1 on error
+//
+//*****************************************************************************
+unsigned long PRCMCameraFreqSet(unsigned char ulDivider, unsigned char ulWidth)
+{
+    if(ulDivider > ulWidth && ulWidth != 0 )
+    {
+      //
+      // Set  the hifh pulse width
+      //
+      HWREG(ARCM_BASE +
+            APPS_RCM_O_CAMERA_CLK_GEN) = (((ulWidth & 0x07) -1) << 8);
+
+      //
+      // Set the low pulse width
+      //
+      HWREG(ARCM_BASE +
+            APPS_RCM_O_CAMERA_CLK_GEN) = ((ulDivider - ulWidth - 1) & 0x07);
+      //
+      // Return success
+      //
+      return 0;
+    }
+
+    //
+    // Success;
+    //
+    return 1;
+}
+
 //*****************************************************************************
 //
 // Close the Doxygen group.

cc3200/hal/prcm.h

@@ -59,8 +59,8 @@ extern "C"
 typedef struct _PRCM_PeripheralRegs_
 {
 
-unsigned long ulClkReg;
-unsigned long ulRstReg;
+unsigned char ulClkReg;
+unsigned char ulRstReg;
 
 }PRCM_PeriphRegs_t;
 
@@ -159,7 +159,7 @@ unsigned long ulRstReg;
 #define PRCM_HIB_WAKEUP_CAUSE_GPIO        0x00000004
 
 //*****************************************************************************
-// Values that can be passed to PRCMSEnableInterrupt
+// Values that can be passed to PRCMIntEnable
 //*****************************************************************************
 #define PRCM_INT_SLOW_CLK_CTR     0x00004000
 
@@ -197,6 +197,12 @@ unsigned long ulRstReg;
 // API Function prototypes
 //
 //*****************************************************************************
+extern void PRCMRequestSafeBoot(void);
+extern void PRCMClearSafeBootRequest(void);
+extern tBoolean PRCMIsSafeBootRequested(void);
+extern void PRCMSignalWDTReset(void);
+extern void PRCMClearWDTResetSignal(void);
+extern tBoolean PRCMWasResetBecauseOfWDT(void);
 extern void PRCMSOCReset(void);
 extern void PRCMMCUReset(tBoolean bIncludeSubsystem);
 extern unsigned long PRCMSysResetCauseGet(void);
@@ -250,6 +256,7 @@ extern void PRCMIntEnable(unsigned long ulIntFlags);
 extern void PRCMIntDisable(unsigned long ulIntFlags);
 extern unsigned long PRCMIntStatus(void);
 extern void PRCMRTCInUseSet(void);
+extern void PRCMRTCInUseClear(void);
 extern tBoolean PRCMRTCInUseGet(void);
 extern void PRCMRTCSet(unsigned long ulSecs, unsigned short usMsec);
 extern void PRCMRTCGet(unsigned long *ulSecs, unsigned short *usMsec);
@@ -258,6 +265,7 @@ extern void PRCMRTCMatchGet(unsigned long *ulSecs, unsigned short *usMsec);
 extern void PRCMCC3200MCUInit(void);
 extern unsigned long PRCMHIBRegRead(unsigned long ulRegAddr);
 extern void PRCMHIBRegWrite(unsigned long ulRegAddr, unsigned long ulValue);
+extern unsigned long PRCMCameraFreqSet(unsigned char ulDivider, unsigned char ulWidth);
 
 
 //*****************************************************************************

cc3200/hal/rom_patch.h

@@ -46,7 +46,6 @@
 #undef ROM_IntEnable
 #undef ROM_IntDisable
 #undef ROM_IntPendSet
-#undef ROM_PRCMHibernateWakeUpGPIOSelect
 #undef ROM_SDHostCardErrorMaskSet
 #undef ROM_SDHostCardErrorMaskGet
 #undef ROM_TimerConfigure
@@ -84,4 +83,16 @@
 #undef ROM_SPIConfigSetExpClk
 #undef ROM_GPIODirModeGet
 #undef ROM_GPIOIntTypeGet
+#undef ROM_I2CMasterInitExpClk
+#undef ROM_AESDataProcess
+#undef ROM_DESDataProcess
+#undef ROM_I2SEnable
+#undef ROM_I2SConfigSetExpClk
+#undef ROM_PinConfigSet
+#undef ROM_PRCMLPDSEnter
+#undef ROM_PRCMCC3200MCUInit
+#undef ROM_SDHostIntStatus
+#undef ROM_SDHostBlockCountSet
+#undef ROM_UARTModemControlSet
+#undef ROM_UARTModemControlClear
 

cc3200/hal/sdhost.c

@@ -512,7 +512,7 @@ SDHostIntStatus(unsigned long ulBase)
   //
   // Get DMA done interrupt status
   //
-  ulIntStatus = HWREG(APPS_CONFIG_BASE + APPS_CONFIG_O_DMA_DONE_INT_MASK_SET);
+  ulIntStatus = HWREG(APPS_CONFIG_BASE + APPS_CONFIG_O_DMA_DONE_INT_STS_RAW);
   ulIntStatus = (ulIntStatus << 30);
 
   //
@@ -562,7 +562,7 @@ SDHostIntClear(unsigned long ulBase,unsigned long ulIntFlags)
 //! \param ulErrMask is the bit mask of card status errors to be enabled
 //!
 //! This function sets the card status error mask for response type R1, R1b,
-//! R5, R5b and R6 response. The parameter \ulErrMask is the bit mask of card
+//! R5, R5b and R6 response. The parameter \e ulErrMask is the bit mask of card
 //! status errors to be enabled, if the corresponding bits in the 'card status'
 //! field of a respose are set then the host controller indicates a card error
 //! interrupt status. Only bits referenced as type E (error) in status field in
@@ -732,7 +732,7 @@ SDHostBlockCountSet(unsigned long ulBase, unsigned short ulBlkCount)
   //
   // Set the number of blocks
   //
-  HWREG(ulBase + MMCHS_O_BLK) |= ((ulRegVal & 0x0000FFFF)|
+  HWREG(ulBase + MMCHS_O_BLK) = ((ulRegVal & 0x0000FFFF)|
                                   (ulBlkCount << 16));
 }
 

cc3200/hal/sdhost.h

@@ -75,7 +75,7 @@ extern "C"
 #define SDHOST_INT_CEB   0x00040000
 #define SDHOST_INT_DTO   0x00100000
 #define SDHOST_INT_DCRC  0x00200000
-#define SDHOST_INT_DEB   0x00300000
+#define SDHOST_INT_DEB   0x00400000
 #define SDHOST_INT_CERR  0x10000000
 #define SDHOST_INT_BADA  0x20000000
 #define SDHOST_INT_DMARD 0x40000000

cc3200/hal/spi.c

@@ -718,7 +718,7 @@ SPIReset(unsigned long ulBase)
 //! - \b SPI_WL_16
 //! - \b SPI_WL_32
 //!
-//! Active state of Chip[ Selece can be defined by:-
+//! Active state of Chip Select can be defined by:-
 //! - \b SPI_CS_ACTIVELOW
 //! - \b SPI_CS_ACTIVEHIGH
 //!

cc3200/hal/startup_gcc.c

@@ -53,19 +53,23 @@ extern uint32_t _edata;
 extern uint32_t _bss;
 extern uint32_t _ebss;
 extern uint32_t _estack;
-extern uint32_t __init_data;
 
 //*****************************************************************************
 //
 // Forward declaration of the default fault handlers.
 //
 //*****************************************************************************
+#ifndef BOOTLOADER
+__attribute__ ((section (".boot")))
+#endif
 void ResetISR(void);
+#ifdef DEBUG
 static void NmiSR(void) __attribute__( ( naked ) );
 static void FaultISR( void ) __attribute__( ( naked ) );
-static void IntDefaultHandler(void) __attribute__( ( naked ) );
+void HardFault_HandlerC(uint32_t *pulFaultStackAddress);
 static void BusFaultHandler(void) __attribute__( ( naked ) );
-void HardFault_HandlerC(unsigned long *hardfault_args);
+#endif
+static void IntDefaultHandler(void) __attribute__( ( naked ) );
 
 //*****************************************************************************
 //
@@ -96,10 +100,19 @@ void (* const g_pfnVectors[256])(void) =
 {
     (void (*)(void))((uint32_t)&_estack),   // The initial stack pointer
     ResetISR,                               // The reset handler
+#ifdef DEBUG
     NmiSR,                                  // The NMI handler
     FaultISR,                               // The hard fault handler
+#else
+    IntDefaultHandler,                      // The NMI handler
+    IntDefaultHandler,                      // The hard fault handler
+#endif
     IntDefaultHandler,                      // The MPU fault handler
+#ifdef DEBUG
     BusFaultHandler,                        // The bus fault handler
+#else
+    IntDefaultHandler,                      // The bus fault handler
+#endif
     IntDefaultHandler,                      // The usage fault handler
     0,                                      // Reserved
     0,                                      // Reserved
@@ -201,45 +214,38 @@ void (* const g_pfnVectors[256])(void) =
 void ResetISR(void)
 {
 #if defined(DEBUG) && !defined(BOOTLOADER)
-    //
-    // Fill the main stack with a known value so that
-    // we can measure the main stack high water mark
-    //
-    __asm volatile
-    (
-            "ldr     r0, =_stack        \n"
-            "ldr     r1, =_estack       \n"
-            "mov     r2, #0x55555555    \n"
-    ".thumb_func                        \n"
-    "fill_loop:                         \n"
-            "cmp     r0, r1             \n"
-            "it      lt                 \n"
-            "strlt   r2, [r0], #4       \n"
-            "blt     fill_loop          \n"
-    );
+    {
+        //
+        // Fill the main stack with a known value so that
+        // we can measure the main stack high water mark
+        //
+        __asm volatile
+        (
+                "ldr     r0, =_stack        \n"
+                "ldr     r1, =_estack       \n"
+                "mov     r2, #0x55555555    \n"
+        ".thumb_func                        \n"
+        "fill_loop:                         \n"
+                "cmp     r0, r1             \n"
+                "it      lt                 \n"
+                "strlt   r2, [r0], #4       \n"
+                "blt     fill_loop          \n"
+        );
+    }
 #endif
 
-    // Get the initial stack pointer location from the vector table
-    // and write this value to the msp register
-    __asm volatile
-    (
-            "ldr r0, =_text             \n"
-            "ldr r0, [r0]               \n"
-            "msr msp, r0                \n"
-    );
+    {
+        // Get the initial stack pointer location from the vector table
+        // and write this value to the msp register
+        __asm volatile
+        (
+                "ldr r0, =_text             \n"
+                "ldr r0, [r0]               \n"
+                "msr msp, r0                \n"
+        );
+    }
 
     {
-        uint32_t *pui32Src, *pui32Dest;
-
-        //
-        // Copy the data segment initializers
-        //
-        pui32Src = &__init_data;
-        for(pui32Dest = &_data; pui32Dest < &_edata; )
-        {
-            *pui32Dest++ = *pui32Src++;
-        }
-
         //
         // Zero fill the bss segment.
         //
@@ -257,12 +263,15 @@ void ResetISR(void)
         );
     }
 
-    //
-    // Call the application's entry point.
-    //
-    main();
+    {
+        //
+        // Call the application's entry point.
+        //
+        main();
+    }
 }
 
+#ifdef DEBUG
 //*****************************************************************************
 //
 // This is the code that gets called when the processor receives a NMI.  This
@@ -273,10 +282,8 @@ void ResetISR(void)
 
 static void NmiSR(void)
 {
-#ifdef DEBUG
     // Break into the debugger
     __asm volatile ("bkpt #0  \n");
-#endif
 
     //
     // Enter an infinite loop.
@@ -316,55 +323,9 @@ static void FaultISR(void)
         ) ;
 }
 
-//*****************************************************************************
-//
-// This is the code that gets called when the processor receives an unexpected
-// interrupt.  This simply enters an infinite loop, preserving the system state
-// for examination by a debugger.
-//
-//*****************************************************************************
-
-static void BusFaultHandler(void)
-{
-#ifdef DEBUG
-    // Break into the debugger
-    __asm volatile ("bkpt #0  \n");
-#endif
-
-    //
-    // Enter an infinite loop.
-    //
-    for ( ; ; )
-    {
-    }
-}
-
-//*****************************************************************************
-//
-// This is the code that gets called when the processor receives an unexpected
-// interrupt.  This simply enters an infinite loop, preserving the system state
-// for examination by a debugger.
-//
-//*****************************************************************************
-static void IntDefaultHandler(void)
-{
-#ifdef DEBUG
-    // Break into the debugger
-    __asm volatile ("bkpt #0  \n");
-#endif
-
-    //
-    // Enter an infinite loop.
-    //
-    for ( ; ; )
-    {
-    }
-}
-
-
 //***********************************************************************************
 // HardFaultHandler_C:
-// This is called from the HardFault_HandlerAsm with a pointer the Fault stack
+// This is called from the FaultISR with a pointer the Fault stack
 // as the parameter. We can then read the values from the stack and place them
 // into local variables for ease of reading.
 // We then read the various Fault Status and Address Registers to help decode
@@ -403,10 +364,8 @@ void HardFault_HandlerC(uint32_t *pulFaultStackAddress)
     // Bus Fault Address Register
     _BFAR = (*((volatile uint32_t *)(0xE000ED38)));
 
-#ifdef DEBUG
     // Break into the debugger
     __asm volatile ("bkpt #0  \n");
-#endif
 
     for ( ; ; )
     {
@@ -416,3 +375,47 @@ void HardFault_HandlerC(uint32_t *pulFaultStackAddress)
     }
 }
 
+//*****************************************************************************
+//
+// This is the code that gets called when the processor receives an unexpected
+// interrupt.  This simply enters an infinite loop, preserving the system state
+// for examination by a debugger.
+//
+//*****************************************************************************
+
+static void BusFaultHandler(void)
+{
+    // Break into the debugger
+    __asm volatile ("bkpt #0  \n");
+
+    //
+    // Enter an infinite loop.
+    //
+    for ( ; ; )
+    {
+    }
+}
+#endif
+
+//*****************************************************************************
+//
+// This is the code that gets called when the processor receives an unexpected
+// interrupt.  This simply enters an infinite loop, preserving the system state
+// for examination by a debugger.
+//
+//*****************************************************************************
+static void IntDefaultHandler(void)
+{
+#ifdef DEBUG
+    // Break into the debugger
+    __asm volatile ("bkpt #0  \n");
+#endif
+
+    //
+    // Enter an infinite loop.
+    //
+    for ( ; ; )
+    {
+    }
+}
+

cc3200/hal/timer.c

@@ -617,6 +617,45 @@ TimerValueGet(unsigned long ulBase, unsigned long ulTimer)
            HWREG(ulBase + TIMER_O_TBR));
 }
 
+//*****************************************************************************
+//
+//! Sets the current timer value.
+//!
+//! \param ulBase is the base address of the timer module.
+//! \param ulTimer specifies the timer; must be one of \b TIMER_A or
+//! \b TIMER_B.  Only \b TIMER_A should be used when the timer is configured
+//! for 32-bit operation.
+//! \param ulValue is the new value of the timer to be set.
+//!
+//! This function sets the current value of the specified timer.
+//!
+//! \return None.
+//
+//*****************************************************************************
+void
+TimerValueSet(unsigned long ulBase, unsigned long ulTimer,
+              unsigned long ulValue)
+{
+    //
+    // Check the arguments.
+    //
+    ASSERT(TimerBaseValid(ulBase));
+    ASSERT((ulTimer == TIMER_A) || (ulTimer == TIMER_B));
+
+    //
+    // Set the appropriate timer value.
+    //
+    if( (ulTimer == TIMER_A) )
+    {
+      HWREG(ulBase + TIMER_O_TAV) = ulValue;
+    }
+    else
+    {
+      HWREG(ulBase + TIMER_O_TBV) = ulValue;
+    }
+}
+
+
 //*****************************************************************************
 //
 //! Sets the timer match value.
@@ -979,8 +1018,8 @@ TimerIntClear(unsigned long ulBase, unsigned long ulIntFlags)
 //
 //! Enables the events that can trigger a DMA request.
 //!
-//! \param ui32Base is the base address of the timer module.
-//! \param ui32DMAEvent is a bit mask of the events that can trigger DMA.
+//! \param ulBase is the base address of the timer module.
+//! \param ulDMAEvent is a bit mask of the events that can trigger DMA.
 //!
 //! This function enables the timer events that can trigger the start of a DMA
 //! sequence.  The DMA trigger events are specified in the \e ui32DMAEvent
@@ -1022,7 +1061,7 @@ TimerDMAEventSet(unsigned long ulBase, unsigned long ulDMAEvent)
 //
 //! Returns the events that can trigger a DMA request.
 //!
-//! \param ui32Base is the base address of the timer module.
+//! \param ulBase is the base address of the timer module.
 //!
 //! This function returns the timer events that can trigger the start of a DMA
 //! sequence.  The DMA trigger events are the logical OR of the following

cc3200/hal/timer.h

@@ -180,6 +180,8 @@ extern unsigned long TimerLoadGet(unsigned long ulBase, unsigned long ulTimer);
 
 extern unsigned long TimerValueGet(unsigned long ulBase,
                                    unsigned long ulTimer);
+extern void TimerValueSet(unsigned long ulBase, unsigned long ulTimer,
+              unsigned long ulValue);
 
 extern void TimerMatchSet(unsigned long ulBase, unsigned long ulTimer,
                           unsigned long ulValue);

cc3200/hal/uart.c

@@ -1167,13 +1167,8 @@ UARTIntRegister(unsigned long ulBase, void (*pfnHandler)(void))
     //
     // Determine the interrupt number based on the UART port.
     //
-#if 1
-    ulInt = UARTIntNumberGet(ulBase);
-#else
 
-    ulInt = ((ulBase == UART0_BASE) ? INT_UART0 :
-             ((ulBase == UART1_BASE) ? INT_UART1 : INT_UART2));
-#endif
+    ulInt = UARTIntNumberGet(ulBase);
 
     //
     // Register the interrupt handler.
@@ -1216,12 +1211,7 @@ UARTIntUnregister(unsigned long ulBase)
     //
     // Determine the interrupt number based on the UART port.
     //
-#if 1
     ulInt = UARTIntNumberGet(ulBase);
-#else
-    ulInt = ((ulBase == UART0_BASE) ? INT_UART0 :
-             ((ulBase == UART1_BASE) ? INT_UART1 : INT_UART2));
-#endif
 
     //
     // Disable the interrupt.

cc3200/main.c

@@ -28,15 +28,14 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
 #include "mptask.h"
 #include "simplelink.h"
-#include "osi.h"
+#include "pybwdt.h"
 #include "debug.h"
+#include "antenna.h"
+#include "mperror.h"
 
 /******************************************************************************
  DECLARE PRIVATE CONSTANTS
@@ -61,11 +60,20 @@ OsiTaskHandle   mpTaskHandle;
  DEFINE PUBLIC FUNCTIONS
  ******************************************************************************/
 
+__attribute__ ((section (".boot")))
 int main (void) {
 
     // Initialize the clocks and the interrupt system
     HAL_SystemInit();
 
+#if MICROPY_HW_ANTENNA_DIVERSITY
+    // configure the antenna selection pins
+    antenna_init0();
+#endif
+
+    // Init the watchdog
+    pybwdt_init0();
+
 #ifdef DEBUG
     ASSERT (OSI_OK == osi_TaskCreate(TASK_Micropython,
                                      (const signed char *)"MicroPy",
@@ -81,7 +89,6 @@ int main (void) {
     for ( ; ; );
 }
 
-
 void stoupper (char *str) {
     while (str && *str != '\0') {
         *str = (char)toupper((int)(*str));

cc3200/misc/FreeRTOSHooks.c

@@ -28,19 +28,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "inc/hw_memmap.h"
 #include "pybuart.h"
-#include "pybstdio.h"
 #include "osi.h"
+#include "mperror.h"
 
 
-#ifdef USE_FREERTOS
-
 //*****************************************************************************
 //
 //! \brief Application defined idle task hook
@@ -50,10 +46,11 @@
 //! \return none
 //!
 //*****************************************************************************
-void
-vApplicationIdleHook( void)
+void vApplicationIdleHook (void)
 {
-    //Handle Idle Hook for Profiling, Power Management etc
+    // signal that we are alive and kicking
+    mperror_heartbeat_signal();
+    // gate the processor's clock to save power
     __WFI();
 }
 
@@ -66,18 +63,16 @@ vApplicationIdleHook( void)
 //! \return none
 //!
 //*****************************************************************************
-void vApplicationMallocFailedHook()
+void vApplicationMallocFailedHook (void)
 {
 #ifdef DEBUG
-    // Break into the debugger
+    // break into the debugger
     __asm volatile ("bkpt #0  \n");
-
-    printf("\nFATAL ERROR: FreeRTOS malloc failed!\n");
 #endif
 
-    //Handle Memory Allocation Errors
-    while(1)
+    for ( ; ; )
     {
+        __fatal_error("FreeRTOS malloc failed!");
     }
 }
 
@@ -90,18 +85,16 @@ void vApplicationMallocFailedHook()
 //! \return none
 //!
 //*****************************************************************************
-void vApplicationStackOverflowHook( OsiTaskHandle *pxTask, signed char *pcTaskName)
+void vApplicationStackOverflowHook (OsiTaskHandle *pxTask, signed char *pcTaskName)
 {
 #ifdef DEBUG
     // Break into the debugger
     __asm volatile ("bkpt #0  \n");
-
-    printf("\nFATAL ERROR: Application: %s stack overflow!\n", pcTaskName);
 #endif
 
-    //Handle FreeRTOS Stack Overflow
-    while(1)
+    for ( ; ; )
     {
+        __fatal_error("Stack overflow!");
     }
 }
 
@@ -114,9 +107,7 @@ void vApplicationStackOverflowHook( OsiTaskHandle *pxTask, signed char *pcTaskNa
 //! \return none
 //!
 //*****************************************************************************
-void vApplicationTickHook( void )
+void vApplicationTickHook (void)
 {
     HAL_IncrementTick();
 }
-
-#endif //USE_FREERTOS

cc3200/misc/antenna.c

@@ -0,0 +1,97 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+
+#include "mpconfigboard.h"
+#include "inc/hw_types.h"
+#include "inc/hw_gpio.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_memmap.h"
+#include "rom_map.h"
+#include "pin.h"
+#include "prcm.h"
+#include "gpio.h"
+#include "antenna.h"
+
+
+#if MICROPY_HW_ANTENNA_DIVERSITY
+
+/******************************************************************************
+DEFINE CONSTANTS
+******************************************************************************/
+#define REG_PAD_CONFIG_26           (0x4402E108)
+#define REG_PAD_CONFIG_27           (0x4402E10C)
+
+/******************************************************************************
+DEFINE PRIVATE DATA
+******************************************************************************/
+static antenna_type_t antenna_type_selected = ANTENNA_TYPE_INTERNAL;
+
+/******************************************************************************
+DEFINE PUBLIC FUNCTIONS
+******************************************************************************/
+void antenna_init0(void) {
+    // enable the peripheral clock and set the gpio direction for
+    // both antenna 1 and antenna 2 pins
+    MAP_PRCMPeripheralClkEnable(PRCM_GPIOA3, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    MAP_GPIODirModeSet(GPIOA3_BASE, 0x0C, GPIO_DIR_MODE_OUT);
+
+    // configure antenna 1 pin type and strength
+    HWREG(REG_PAD_CONFIG_26) = ((HWREG(REG_PAD_CONFIG_26) & ~(PAD_STRENGTH_MASK | PAD_TYPE_MASK)) | (0x00000020 | 0x00000000));
+    // set the mode
+    HWREG(REG_PAD_CONFIG_26) = ((HWREG(REG_PAD_CONFIG_26) & ~PAD_MODE_MASK) | 0x00000000) & ~(3 << 10);
+    // set the direction
+    HWREG(REG_PAD_CONFIG_26) = ((HWREG(REG_PAD_CONFIG_26) & ~0xC00) | 0x00000800);
+
+    // configure antenna 2 pin type and strength
+    HWREG(REG_PAD_CONFIG_27) = ((HWREG(REG_PAD_CONFIG_27) & ~(PAD_STRENGTH_MASK | PAD_TYPE_MASK)) | (0x00000020 | 0x00000000));
+    // set the mode
+    HWREG(REG_PAD_CONFIG_27) = ((HWREG(REG_PAD_CONFIG_27) & ~PAD_MODE_MASK) | 0x00000000) & ~(3 << 10);
+    // set the direction
+    HWREG(REG_PAD_CONFIG_27) = ((HWREG(REG_PAD_CONFIG_27) & ~0xC00) | 0x00000800);
+
+    // select the currently active antenna
+    antenna_select(antenna_type_selected);
+}
+
+void antenna_select (antenna_type_t _antenna) {
+    if (_antenna == ANTENNA_TYPE_INTERNAL) {
+        MAP_GPIOPinWrite(GPIOA3_BASE, 0x0C, 0x04);
+        // also configure the pull-up and pull-down accordingly
+        HWREG(REG_PAD_CONFIG_26) = ((HWREG(REG_PAD_CONFIG_26) & ~PAD_TYPE_MASK)) | PIN_TYPE_STD_PU;
+        HWREG(REG_PAD_CONFIG_27) = ((HWREG(REG_PAD_CONFIG_27) & ~PAD_TYPE_MASK)) | PIN_TYPE_STD_PD;
+    } else {
+        MAP_GPIOPinWrite(GPIOA3_BASE, 0x0C, 0x08);
+        // also configure the pull-up and pull-down accordingly
+        HWREG(REG_PAD_CONFIG_26) = ((HWREG(REG_PAD_CONFIG_26) & ~PAD_TYPE_MASK)) | PIN_TYPE_STD_PD;
+        HWREG(REG_PAD_CONFIG_27) = ((HWREG(REG_PAD_CONFIG_27) & ~PAD_TYPE_MASK)) | PIN_TYPE_STD_PU;
+    }
+    antenna_type_selected = _antenna;
+}
+
+#endif
+

cc3200/misc/antenna.h

@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef _ANTENNA_H_
+#define _ANTENNA_H_
+
+typedef enum {
+    ANTENNA_TYPE_INTERNAL = 0,
+    ANTENNA_TYPE_EXTERNAL
+} antenna_type_t;
+
+extern void antenna_init0 (void);
+extern void antenna_select (antenna_type_t antenna_type);
+
+#endif /* _ANTENNA_H_ */

cc3200/misc/help.c

@@ -27,11 +27,8 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 
 STATIC const char help_text[] = "Welcome to Micro Python!\n"
                                 "For online help please visit http://micropython.org/help/.\n"
@@ -49,10 +46,9 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // print a general help message
         printf("%s", help_text);
-
-    } else {
+    }
+    else {
         // try to print something sensible about the given object
-
         printf("object ");
         mp_obj_print(args[0], PRINT_STR);
         printf(" is of type %s\n", mp_obj_get_type_str(args[0]));
@@ -79,7 +75,6 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
             }
         }
     }
-
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help);

cc3200/misc/mpcallback.c

@@ -0,0 +1,209 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpconfig.h"
+#include MICROPY_HAL_H
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "inc/hw_types.h"
+#include "interrupt.h"
+#include "pybsleep.h"
+#include "mpcallback.h"
+#include "mpexception.h"
+#include "mperror.h"
+
+
+/******************************************************************************
+ DEFINE PUBLIC DATA
+ ******************************************************************************/
+const mp_arg_t mpcallback_init_args[] = {
+    { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    { MP_QSTR_handler,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+    { MP_QSTR_priority,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
+    { MP_QSTR_value,        MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    { MP_QSTR_wakes,        MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PYB_PWR_MODE_ACTIVE} },
+};
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
+void mpcallback_init0 (void) {
+    // initialize the callback objects list
+    mp_obj_list_init(&MP_STATE_PORT(mpcallback_obj_list), 0);
+}
+
+mp_obj_t mpcallback_new (mp_obj_t parent, mp_obj_t handler, const mp_cb_methods_t *methods) {
+    mpcallback_obj_t *self = m_new_obj(mpcallback_obj_t);
+    self->base.type = &pyb_callback_type;
+    self->handler = handler;
+    self->parent = parent;
+    self->methods = (mp_cb_methods_t *)methods;
+    self->isenabled = true;
+    // remove any old callback if present
+    mpcallback_remove(self->parent);
+    mp_obj_list_append(&MP_STATE_PORT(mpcallback_obj_list), self);
+    return self;
+}
+
+mpcallback_obj_t *mpcallback_find (mp_obj_t parent) {
+    for (mp_uint_t i = 0; i < MP_STATE_PORT(mpcallback_obj_list).len; i++) {
+        mpcallback_obj_t *callback_obj = ((mpcallback_obj_t *)(MP_STATE_PORT(mpcallback_obj_list).items[i]));
+        if (callback_obj->parent == parent) {
+            return callback_obj;
+        }
+    }
+    return NULL;
+}
+
+void mpcallback_wake_all (void) {
+    // re-enable all active callback objects one by one
+    for (mp_uint_t i = 0; i < MP_STATE_PORT(mpcallback_obj_list).len; i++) {
+        mpcallback_obj_t *callback_obj = ((mpcallback_obj_t *)(MP_STATE_PORT(mpcallback_obj_list).items[i]));
+        if (callback_obj->isenabled) {
+            callback_obj->methods->enable(callback_obj->parent);
+        }
+    }
+}
+
+void mpcallback_remove (const mp_obj_t parent) {
+    mpcallback_obj_t *callback_obj;
+    if ((callback_obj = mpcallback_find(parent))) {
+        mp_obj_list_remove(&MP_STATE_PORT(mpcallback_obj_list), callback_obj);
+    }
+}
+
+uint mpcallback_translate_priority (uint priority) {
+    if (priority < 1 || priority > 7) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
+    }
+
+   switch (priority) {
+   case 1:
+       return INT_PRIORITY_LVL_7;
+   case 2:
+       return INT_PRIORITY_LVL_6;
+   case 3:
+       return INT_PRIORITY_LVL_5;
+   case 4:
+       return INT_PRIORITY_LVL_4;
+   case 5:
+       return INT_PRIORITY_LVL_3;
+   case 6:
+       return INT_PRIORITY_LVL_2;
+   case 7:
+       return INT_PRIORITY_LVL_1;
+   default:
+       return INT_PRIORITY_LVL_7;
+   }
+}
+
+void mpcallback_handler (mp_obj_t self_in) {
+    mpcallback_obj_t *self = self_in;
+    if (self && self->handler != mp_const_none) {
+        // disable interrupts to avoid nesting
+        uint primsk = disable_irq();
+        // when executing code within a handler we must lock the GC to prevent
+        // any memory allocations.  We must also catch any exceptions.
+        gc_lock();
+        nlr_buf_t nlr;
+        if (nlr_push(&nlr) == 0) {
+            mp_call_function_1(self->handler, self->parent);
+            nlr_pop();
+        }
+        else {
+            // uncaught exception; disable the callback so that it doesn't run again
+            self->methods->disable (self->parent);
+            self->handler = mp_const_none;
+            // printing an exception here will cause a stack overflow that will end up in
+            // a hard fault, so is better to signal the uncaught (probably non-recoverable)
+            // exception by blinking the system led instead.
+            mperror_signal_error();
+        }
+        gc_unlock();
+        enable_irq(primsk);
+    }
+}
+
+/******************************************************************************/
+// Micro Python bindings
+
+/// \method init()
+/// Initializes the interrupt callback. With no parameters passed, everything will default
+/// to the values assigned to mpcallback_init_args[].
+STATIC mp_obj_t callback_init(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mpcallback_obj_t *self = pos_args[0];
+    // this is a bit of a hack, but it let us reuse the callback_create method from our parent
+    ((mp_obj_t *)pos_args)[0] = self->parent;
+    self->methods->init (n_args, pos_args, kw_args);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(callback_init_obj, 1, callback_init);
+
+/// \method enable()
+/// Enables the interrupt callback
+STATIC mp_obj_t callback_enable (mp_obj_t self_in) {
+    mpcallback_obj_t *self = self_in;
+    self->methods->enable(self->parent);
+    self->isenabled = true;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(callback_enable_obj, callback_enable);
+
+/// \method disable()
+/// Disables the interrupt callback
+STATIC mp_obj_t callback_disable (mp_obj_t self_in) {
+    mpcallback_obj_t *self = self_in;
+    self->methods->disable(self->parent);
+    self->isenabled = false;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(callback_disable_obj, callback_disable);
+
+/// \method \call()
+/// Triggers the interrupt callback
+STATIC mp_obj_t callback_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    mpcallback_handler (self_in);
+    return mp_const_none;
+}
+
+STATIC const mp_map_elem_t callback_locals_dict_table[] = {
+    // instance methods
+    { MP_OBJ_NEW_QSTR(MP_QSTR_init),                (mp_obj_t)&callback_init_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_enable),              (mp_obj_t)&callback_enable_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_disable),             (mp_obj_t)&callback_disable_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(callback_locals_dict, callback_locals_dict_table);
+
+const mp_obj_type_t pyb_callback_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_callback,
+    .call = callback_call,
+    .locals_dict = (mp_obj_t)&callback_locals_dict,
+};
+

cc3200/misc/mpcallback.h

@@ -0,0 +1,73 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MPCALLBACK_H_
+#define MPCALLBACK_H_
+
+/******************************************************************************
+ DEFINE CONSTANTS
+ ******************************************************************************/
+#define mpcallback_INIT_NUM_ARGS                  5
+
+/******************************************************************************
+ DEFINE TYPES
+ ******************************************************************************/
+typedef void (*mp_cb_method_t) (mp_obj_t self);
+typedef mp_obj_t (*mp_cb_init_t) (mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+
+typedef struct {
+    mp_cb_init_t init;
+    mp_cb_method_t enable;
+    mp_cb_method_t disable;
+} mp_cb_methods_t;
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t parent;
+    mp_obj_t handler;
+    mp_cb_methods_t *methods;
+    bool isenabled;
+} mpcallback_obj_t;
+
+/******************************************************************************
+ DECLARE EXPORTED DATA
+ ******************************************************************************/
+extern const mp_arg_t mpcallback_init_args[];
+extern const mp_obj_type_t pyb_callback_type;
+
+/******************************************************************************
+ DECLARE PUBLIC FUNCTIONS
+ ******************************************************************************/
+void mpcallback_init0 (void);
+mp_obj_t mpcallback_new (mp_obj_t parent, mp_obj_t handler, const mp_cb_methods_t *methods);
+mpcallback_obj_t *mpcallback_find (mp_obj_t parent);
+void mpcallback_wake_all (void);
+void mpcallback_remove (const mp_obj_t parent);
+void mpcallback_handler (mp_obj_t self_in);
+uint mpcallback_translate_priority (uint priority);
+mp_obj_t mpcallback_new (mp_obj_t parent, mp_obj_t handler, const mp_cb_methods_t *methods);
+
+#endif /* MPCALLBACK_H_ */

cc3200/misc/mperror.c

@@ -25,30 +25,161 @@
  * THE SOFTWARE.
  */
 
-#include <std.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "inc/hw_memmap.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "hw_ints.h"
+#include "hw_types.h"
+#include "hw_gpio.h"
+#include "hw_memmap.h"
+#include "hw_gprcm.h"
+#include "hw_common_reg.h"
+#include "pin.h"
+#include "gpio.h"
+#ifndef BOOTLOADER
+#include "pybpin.h"
+#include "pins.h"
+#endif
+#include "rom.h"
+#include "rom_map.h"
+#include "prcm.h"
 #include "pybuart.h"
-#include "pybstdio.h"
 #include "utils.h"
+#include "mperror.h"
 
 
+/******************************************************************************
+ DEFINE CONSTANTS
+ ******************************************************************************/
+#define MPERROR_TOOGLE_MS                           (40)
+#define MPERROR_SIGNAL_ERROR_MS                     (1000)
+#define MPERROR_HEARTBEAT_ON_MS                     (80)
+#define MPERROR_HEARTBEAT_OFF_MS                    (4920)
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+#ifndef BOOTLOADER
+STATIC const mp_obj_base_t pyb_heartbeat_obj = {&pyb_heartbeat_type};
+#endif
+
+struct mperror_heart_beat {
+    uint32_t off_time;
+    uint32_t on_time;
+    bool beating;
+    bool enabled;
+    bool do_disable;
+} mperror_heart_beat = {.off_time = 0, .on_time = 0, .beating = false, .enabled = false, .do_disable = false};
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
+void mperror_init0 (void) {
+#ifdef BOOTLOADER
+    // enable the system led and the safe boot pin peripheral clocks
+    MAP_PRCMPeripheralClkEnable(MICROPY_SYS_LED_PRCM, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    MAP_PRCMPeripheralClkEnable(MICROPY_SAFE_BOOT_PRCM, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    // configure the safe boot pin
+    MAP_PinTypeGPIO(MICROPY_SAFE_BOOT_PIN_NUM, PIN_MODE_0, false);
+    MAP_PinConfigSet(MICROPY_SAFE_BOOT_PIN_NUM, PIN_STRENGTH_4MA, PIN_TYPE_STD_PD);
+    MAP_GPIODirModeSet(MICROPY_SAFE_BOOT_PORT, MICROPY_SAFE_BOOT_PORT_PIN, GPIO_DIR_MODE_IN);
+    // configure the bld
+    MAP_PinTypeGPIO(MICROPY_SYS_LED_PIN_NUM, PIN_MODE_0, false);
+    MAP_PinConfigSet(MICROPY_SYS_LED_PIN_NUM, PIN_STRENGTH_6MA, PIN_TYPE_STD);
+    MAP_GPIODirModeSet(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, GPIO_DIR_MODE_OUT);
+#else
+    // configure the system led
+    pin_config ((pin_obj_t *)&MICROPY_SYS_LED_GPIO, PIN_MODE_0, GPIO_DIR_MODE_OUT, PIN_TYPE_STD, PIN_STRENGTH_6MA);
+#endif
+    mperror_heart_beat.enabled = true;
+    mperror_heartbeat_switch_off();
+}
+
+void mperror_bootloader_check_reset_cause (void) {
+    // if we are recovering from a WDT reset, trigger
+    // a hibernate cycle for a clean boot
+    if (MAP_PRCMSysResetCauseGet() == PRCM_WDT_RESET) {
+        HWREG(0x400F70B8) = 1;
+        UtilsDelay(800000/5);
+        HWREG(0x400F70B0) = 1;
+        UtilsDelay(800000/5);
+
+        HWREG(0x4402E16C) |= 0x2;
+        UtilsDelay(800);
+        HWREG(0x4402F024) &= 0xF7FFFFFF;
+
+        // since the reset cause will be changed, we must store the right reason
+        // so that the application knows it when booting for the next time
+        PRCMSignalWDTReset();
+
+        MAP_PRCMHibernateWakeupSourceEnable(PRCM_HIB_SLOW_CLK_CTR);
+        // set the sleep interval to 10ms
+        MAP_PRCMHibernateIntervalSet(330);
+        MAP_PRCMHibernateEnter();
+    }
+}
+
+void mperror_deinit_sfe_pin (void) {
+    // disable the pull-down
+    MAP_PinConfigSet(MICROPY_SAFE_BOOT_PIN_NUM, PIN_STRENGTH_4MA, PIN_TYPE_STD);
+}
+
+void mperror_signal_error (void) {
+    uint32_t count = 0;
+    while ((MPERROR_TOOGLE_MS * count++) < MPERROR_SIGNAL_ERROR_MS) {
+        // toogle the led
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, ~MAP_GPIOPinRead(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN));
+        UtilsDelay(UTILS_DELAY_US_TO_COUNT(MPERROR_TOOGLE_MS * 1000));
+    }
+}
+
+void mperror_heartbeat_switch_off (void) {
+    if (mperror_heart_beat.enabled) {
+        mperror_heart_beat.on_time = 0;
+        mperror_heart_beat.off_time = 0;
+        MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, 0);
+    }
+}
+
+void mperror_heartbeat_signal (void) {
+    if (mperror_heart_beat.do_disable) {
+        mperror_heart_beat.do_disable = false;
+        mperror_heartbeat_switch_off();
+        mperror_heart_beat.enabled = false;
+    }
+    else if (mperror_heart_beat.enabled) {
+        if (!mperror_heart_beat.beating) {
+            if ((mperror_heart_beat.on_time = HAL_GetTick()) - mperror_heart_beat.off_time > MPERROR_HEARTBEAT_OFF_MS) {
+                MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, MICROPY_SYS_LED_PORT_PIN);
+                mperror_heart_beat.beating = true;
+            }
+        }
+        else {
+            if ((mperror_heart_beat.off_time = HAL_GetTick()) - mperror_heart_beat.on_time > MPERROR_HEARTBEAT_ON_MS) {
+                MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, 0);
+                mperror_heart_beat.beating = false;
+            }
+        }
+    }
+}
+
 void NORETURN __fatal_error(const char *msg) {
+#ifdef DEBUG
     if (msg != NULL) {
         // wait for 20ms
         UtilsDelay(UTILS_DELAY_US_TO_COUNT(20000));
-        stdout_tx_str("\r\nFATAL ERROR:");
-        stdout_tx_str(msg);
-        stdout_tx_str("\r\n");
+        mp_hal_stdout_tx_str("\r\nFATAL ERROR:");
+        mp_hal_stdout_tx_str(msg);
+        mp_hal_stdout_tx_str("\r\n");
     }
+#endif
+    // signal the crash with the system led
+    MAP_GPIOPinWrite(MICROPY_SYS_LED_PORT, MICROPY_SYS_LED_PORT_PIN, MICROPY_SYS_LED_PORT_PIN);
     for ( ;; ) {__WFI();}
 }
 
@@ -68,3 +199,48 @@ void nlr_jump_fail(void *val) {
 #endif
 }
 
+#ifndef BOOTLOADER
+/******************************************************************************/
+// Micro Python bindings
+
+/// \classmethod \constructor()
+///
+/// Return the heart beat object
+STATIC mp_obj_t pyb_heartbeat_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // return constant object
+    return (mp_obj_t)&pyb_heartbeat_obj;
+}
+
+/// \function enable()
+/// Enables the heartbeat signal
+STATIC mp_obj_t pyb_enable_heartbeat(mp_obj_t self) {
+    mperror_heart_beat.enabled = true;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_enable_heartbeat_obj, pyb_enable_heartbeat);
+
+/// \function disable()
+/// Disables the heartbeat signal
+STATIC mp_obj_t pyb_disable_heartbeat(mp_obj_t self) {
+    mperror_heart_beat.do_disable = true;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_disable_heartbeat_obj, pyb_disable_heartbeat);
+
+STATIC const mp_map_elem_t pyb_heartbeat_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_enable),    (mp_obj_t)&pyb_enable_heartbeat_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_disable),   (mp_obj_t)&pyb_disable_heartbeat_obj },
+};
+STATIC MP_DEFINE_CONST_DICT(pyb_heartbeat_locals_dict, pyb_heartbeat_locals_dict_table);
+
+const mp_obj_type_t pyb_heartbeat_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_HeartBeat,
+    .make_new = pyb_heartbeat_make_new,
+    .locals_dict = (mp_obj_t)&pyb_heartbeat_locals_dict,
+};
+
+#endif

cc3200/misc/mperror.h

@@ -25,8 +25,20 @@
  * THE SOFTWARE.
  */
 
-#ifdef DEBUG
-extern void NORETURN __fatal_error(const char *msg);
-#else
-#define __fatal_error(...)     for ( ;; ) {__WFI();}
+#ifndef MPERROR_H_
+#define MPERROR_H_
+
+#ifndef BOOTLOADER
+extern const mp_obj_type_t pyb_heartbeat_type;
 #endif
+
+extern void NORETURN __fatal_error(const char *msg);
+
+void mperror_init0 (void);
+void mperror_bootloader_check_reset_cause (void);
+void mperror_deinit_sfe_pin (void);
+void mperror_signal_error (void);
+void mperror_heartbeat_switch_off (void);
+void mperror_heartbeat_signal (void);
+
+#endif // MPERROR_H_

cc3200/misc/mpexception.c

@@ -27,14 +27,8 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <std.h>
 
 #include "py/mpstate.h"
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
 #include "mpexception.h"
 
 

cc3200/misc/mpsystick.c

@@ -25,14 +25,11 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "irq.h"
-#include "pybsystick.h"
+#include "mpsystick.h"
 #include "systick.h"
 #include "inc/hw_types.h"
 #include "inc/hw_nvic.h"

cc3200/misc/mpsystick.h

@@ -25,6 +25,11 @@
  * THE SOFTWARE.
  */
 
+#ifndef MPSYSTICK_H
+#define MPSYSTICK_H
+
 void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms);
 bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms);
 uint32_t sys_tick_get_microseconds(void);
+
+#endif  // MPSYSTICK_H

cc3200/misc/pin_named_pins.c

@@ -29,30 +29,16 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "pybpin.h"
-#include "runtime.h"
 #include MICROPY_HAL_H
 
-STATIC void pin_named_pins_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
-    pin_named_pins_obj_t *self = self_in;
-    print(env, "<Pin.%s>", qstr_str(self->name));
-}
 
-const mp_obj_type_t pin_cpu_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cpu,
-    .print = pin_named_pins_obj_print,
-    .locals_dict = (mp_obj_t)&pin_cpu_pins_locals_dict,
-};
-
-const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
     mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
     mp_map_elem_t *named_elem = mp_map_lookup(named_map, name, MP_MAP_LOOKUP);
     if (named_elem != NULL && named_elem->value != NULL) {
@@ -60,3 +46,14 @@ const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t na
     }
     return NULL;
 }
+
+pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit) {
+    mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
+    for (uint i = 0; i < named_map->used; i++) {
+        if ((((pin_obj_t *)named_map->table[i].value)->port == port) &&
+                (((pin_obj_t *)named_map->table[i].value)->bit == bit)) {
+            return named_map->table[i].value;
+        }
+    }
+    return NULL;
+}

cc3200/mods/modnetwork.c

@@ -26,59 +26,76 @@
  */
 
 #include <std.h>
-#include <stdint.h>
-#include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpstate.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "runtime.h"
 #include "modnetwork.h"
 #include "mpexception.h"
-#include "mpstate.h"
+#include "serverstask.h"
+#include "simplelink.h"
+
 
 /// \module network - network configuration
 ///
-/// This module provides network drivers and routing configuration.
+/// This module provides network drivers and server configuration.
 
-void mod_network_init(void) {
-    mp_obj_list_init(&MP_STATE_PORT(mod_network_nic_list), 0);
+void mod_network_init0(void) {
 }
 
-void mod_network_register_nic(mp_obj_t nic) {
-    for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
-        if (MP_STATE_PORT(mod_network_nic_list).items[i] == nic) {
-            // nic already registered
-            return;
+#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
+STATIC mp_obj_t network_server_running(mp_uint_t n_args, const mp_obj_t *args) {
+    if (n_args > 0) {
+        // set
+        if (mp_obj_is_true(args[0])) {
+            servers_start();
+        } else {
+            servers_stop();
         }
+        return mp_const_none;
+    } else {
+        // get
+        return MP_BOOL(servers_are_enabled());
     }
-    // nic not registered so add to list
-    mp_obj_list_append(&MP_STATE_PORT(mod_network_nic_list), nic);
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_server_running_obj, 0, 1, network_server_running);
 
-mp_obj_t mod_network_find_nic(const uint8_t *ip) {
-    // find a NIC that is suited to given IP address
-    for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
-        mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
-        return nic;
+STATIC mp_obj_t network_server_login(mp_obj_t user, mp_obj_t pass) {
+    const char *_user = mp_obj_str_get_str(user);
+    const char *_pass = mp_obj_str_get_str(pass);
+    if (strlen(user) > SERVERS_USER_PASS_LEN_MAX || strlen(pass) > SERVERS_USER_PASS_LEN_MAX) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
     }
-
-    nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_resource_not_avaliable));
+    servers_set_login ((char *)_user, (char *)_pass);
+    return mp_const_none;
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(network_server_login_obj, network_server_login);
 
-STATIC mp_obj_t network_route(void) {
-    return &MP_STATE_PORT(mod_network_nic_list);
+// timeout value given in seconds
+STATIC mp_obj_t network_server_timeout(mp_uint_t n_args, const mp_obj_t *args) {
+    if (n_args > 0) {
+        uint32_t _timeout = mp_obj_get_int(args[0]);
+        if (!servers_set_timeout(_timeout * 1000)) {
+            // timeout is too low
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
+        }
+        return mp_const_none;
+    } else {
+        // get
+        return mp_obj_new_int(servers_get_timeout() / 1000);
+    }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_route_obj, network_route);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_server_timeout_obj, 0, 1, network_server_timeout);
+#endif
 
 STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__),    MP_OBJ_NEW_QSTR(MP_QSTR_network) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_WLAN),        (mp_obj_t)&mod_network_nic_type_wlan },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_route),       (mp_obj_t)&network_route_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__),            MP_OBJ_NEW_QSTR(MP_QSTR_network) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_WLAN),                (mp_obj_t)&mod_network_nic_type_wlan },
+
+#if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
+    { MP_OBJ_NEW_QSTR(MP_QSTR_server_running),      (mp_obj_t)&network_server_running_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_server_login),        (mp_obj_t)&network_server_login_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_server_timeout),      (mp_obj_t)&network_server_timeout_obj },
+#endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
@@ -88,65 +105,3 @@ const mp_obj_module_t mp_module_network = {
     .name = MP_QSTR_network,
     .globals = (mp_obj_dict_t*)&mp_module_network_globals,
 };
-
-/******************************************************************************/
-// Miscellaneous helpers
-
-void mod_network_convert_ipv4_endianness(uint8_t *ip) {
-    uint8_t ip0 = ip[0]; ip[0] = ip[3]; ip[3] = ip0;
-    uint8_t ip1 = ip[1]; ip[1] = ip[2]; ip[2] = ip1;
-}
-
-// Takes an address of the form '192.168.0.1' and converts it to network format
-// in out_ip (big endian, so the 192 is the first byte).
-void mod_network_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip) {
-    mp_uint_t addr_len;
-    const char *addr_str = mp_obj_str_get_data(addr_in, &addr_len);
-    if (addr_len == 0) {
-        // special case of no address given
-        memset(out_ip, 0, MOD_NETWORK_IPV4ADDR_BUF_SIZE);
-        return;
-    }
-    const char *s = addr_str;
-    const char *s_top = addr_str + addr_len;
-    for (mp_uint_t i = 0;; i++) {
-        mp_uint_t val = 0;
-        for (; s < s_top && *s != '.'; s++) {
-            val = val * 10 + *s - '0';
-        }
-        out_ip[i] = val;
-        if (i == 3 && s == s_top) {
-            return;
-        } else if (i < 3 && s < s_top && *s == '.') {
-            s++;
-        } else {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
-        }
-    }
-}
-
-// Takes an address of the form ('192.168.0.1', 8080), returns the port and
-// puts IP in out_ip (which must take at least IPADDR_BUF_SIZE bytes).
-mp_uint_t mod_network_parse_inet_addr(mp_obj_t addr_in, uint8_t *out_ip) {
-    mp_obj_t *addr_items;
-    mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
-    mod_network_parse_ipv4_addr(addr_items[0], out_ip);
-    return mp_obj_get_int(addr_items[1]);
-}
-
-// Takes an array with a raw IPv4 address and returns something like '192.168.0.1'.
-mp_obj_t mod_network_format_ipv4_addr(uint8_t *ip) {
-    char ip_str[16];
-    mp_uint_t ip_len = snprintf(ip_str, 16, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
-    return mp_obj_new_str(ip_str, ip_len, false);
-}
-
-// Takes an array with a raw IP address, and a port, and returns a net-address
-// tuple such as ('192.168.0.1', 8080).
-mp_obj_t mod_network_format_inet_addr(uint8_t *ip, mp_uint_t port) {
-    mp_obj_t tuple[2] = {
-        tuple[0] = mod_network_format_ipv4_addr(ip),
-        tuple[1] = mp_obj_new_int(port),
-    };
-    return mp_obj_new_tuple(2, tuple);
-}

cc3200/mods/modnetwork.h

@@ -25,37 +25,23 @@
  * THE SOFTWARE.
  */
 
+#ifndef MODNETWORK_H_
+#define MODNETWORK_H_
+
+/******************************************************************************
+ DEFINE CONSTANTS
+ ******************************************************************************/
 #define MOD_NETWORK_IPV4ADDR_BUF_SIZE             (4)
 
-// Forward declaration
-struct _mod_network_socket_obj_t;
-
+/******************************************************************************
+ DEFINE TYPES
+ ******************************************************************************/
 typedef struct _mod_network_nic_type_t {
     mp_obj_type_t base;
-
-    // API for non-socket operations
-    int (*gethostbyname)(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *ip_out, uint8_t family);
-
-    // API for socket operations; return -1 on error
-    int (*socket)(struct _mod_network_socket_obj_t *s, int *_errno);
-    void (*close)(struct _mod_network_socket_obj_t *socket);
-    int (*bind)(struct _mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno);
-    int (*listen)(struct _mod_network_socket_obj_t *s, mp_int_t backlog, int *_errno);
-    int (*accept)(struct _mod_network_socket_obj_t *s, struct _mod_network_socket_obj_t *s2, byte *ip, mp_uint_t *port, int *_errno);
-    int (*connect)(struct _mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno);
-    int (*send)(struct _mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, int *_errno);
-    int (*recv)(struct _mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, int *_errno);
-    int (*sendto)(struct _mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno);
-    int (*recvfrom)(struct _mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno);
-    int (*setsockopt)(struct _mod_network_socket_obj_t *s, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno);
-    int (*settimeout)(struct _mod_network_socket_obj_t *s, mp_uint_t timeout_ms, int *_errno);
-    int (*ioctl)(struct _mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t arg, int *_errno);
 } mod_network_nic_type_t;
 
 typedef struct _mod_network_socket_obj_t {
     mp_obj_base_t base;
-    mp_obj_t nic;
-    mod_network_nic_type_t *nic_type;
     union {
         struct {
             uint8_t domain;
@@ -64,18 +50,18 @@ typedef struct _mod_network_socket_obj_t {
             int8_t fileno;
         } u_param;
         int16_t sd;
-        bool    closed;
     };
+    bool  closed;
 } mod_network_socket_obj_t;
 
+/******************************************************************************
+ EXPORTED DATA
+ ******************************************************************************/
 extern const mod_network_nic_type_t mod_network_nic_type_wlan;
 
-void mod_network_init(void);
-void mod_network_register_nic(mp_obj_t nic);
-mp_obj_t mod_network_find_nic(const uint8_t *ip);
+/******************************************************************************
+ DECLARE FUNCTIONS
+ ******************************************************************************/
+void mod_network_init0(void);
 
-void mod_network_convert_ipv4_endianness(uint8_t *ip);
-void mod_network_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip);
-mp_uint_t mod_network_parse_inet_addr(mp_obj_t addr_in, uint8_t *out_ip);
-mp_obj_t mod_network_format_ipv4_addr(uint8_t *ip);
-mp_obj_t mod_network_format_inet_addr(uint8_t *ip, mp_uint_t port);
+#endif  // MODNETWORK_H_

cc3200/mods/modpyb.c

@@ -25,34 +25,29 @@
  * THE SOFTWARE.
  */
 
-
-#include <std.h>
 #include <stdint.h>
+#include "std.h"
 
 #include "py/mpstate.h"
-#include "mpconfig.h"
+#include "py/runtime.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
-#include "gccollect.h"
 #include "irq.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "inc/hw_uart.h"
+#include "rom_map.h"
 #include "prcm.h"
 #include "pyexec.h"
 #include "pybuart.h"
 #include "pybpin.h"
-#include "pybstdio.h"
 #include "pybrtc.h"
-#include "pybsystick.h"
+#include "mpsystick.h"
 #include "simplelink.h"
+#include "modnetwork.h"
 #include "modwlan.h"
+#include "moduos.h"
 #include "telnet.h"
 #include "ff.h"
 #include "diskio.h"
@@ -61,32 +56,43 @@
 #include "portable.h"
 #include "task.h"
 #include "mpexception.h"
+#include "mpcallback.h"
 #include "random.h"
-#include "pybextint.h"
+#include "pybadc.h"
+#include "pybi2c.h"
+#include "pybsd.h"
+#include "pybwdt.h"
+#include "pybsleep.h"
+#include "pybspi.h"
+#include "pybtimer.h"
+#include "utils.h"
+#include "gccollect.h"
+#include "mperror.h"
+#include "genhdr/mpversion.h"
 
 
 #ifdef DEBUG
 extern OsiTaskHandle    mpTaskHandle;
 extern OsiTaskHandle    svTaskHandle;
-extern TaskHandle_t     xSimpleLinkSpawnTaskHndl;
+extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 #endif
 
+
 /// \module pyb - functions related to the pyboard
 ///
 /// The `pyb` module contains specific functions related to the pyboard.
 
-/// \function hard_reset()
-/// Resets the pyboard in a manner similar to pushing the external RESET
-/// button.
-STATIC mp_obj_t pyb_hard_reset(void) {
-    // disable wlan services
-    wlan_servers_stop();
-    wlan_sl_disable();
-    // perform a SoC reset
-    PRCMSOCReset();
+/// \function reset()
+/// Resets the pyboard in a manner similar to pushing the external
+/// reset button.
+STATIC mp_obj_t pyb_reset(void) {
+    // disable wlan
+    wlan_stop(SL_STOP_TIMEOUT_LONG);
+    // reset the cpu and it's peripherals
+    MAP_PRCMMCUReset(true);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_hard_reset_obj, pyb_hard_reset);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_reset_obj, pyb_reset);
 
 #ifdef DEBUG
 /// \function info([dump_alloc_table])
@@ -117,29 +123,24 @@ STATIC mp_obj_t pyb_info(uint n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj, 0, 1, pyb_info);
 #endif
 
-/// \function unique_id()
-/// Returns a string of 6 bytes (48 bits), which is the unique MAC address of the SoC
-STATIC mp_obj_t pyb_mac(void) {
-    uint8_t mac[6];
-    wlan_get_mac (mac);
-    return mp_obj_new_bytes(mac, 6);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_mac_obj, pyb_mac);
-
 /// \function freq()
 /// Returns the CPU frequency: (F_CPU).
 STATIC mp_obj_t pyb_freq(void) {
-    return mp_obj_new_int(HAL_FCPU_HZ);
+    mp_obj_t tuple[1] = {
+       mp_obj_new_int(HAL_FCPU_HZ),
+    };
+    return mp_obj_new_tuple(1, tuple);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_freq_obj, pyb_freq);
 
-/// \function sync()
-/// Sync all file systems.
-STATIC mp_obj_t pyb_sync(void) {
-    sflash_disk_flush();
-    return mp_const_none;
+/// \function unique_id()
+/// Returns a string of 6 bytes (48 bits), which is the unique ID for the MCU.
+STATIC mp_obj_t pyb_unique_id(void) {
+    uint8_t mac[SL_BSSID_LENGTH];
+    wlan_get_mac (mac);
+    return mp_obj_new_bytes(mac, SL_BSSID_LENGTH);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_sync_obj, pyb_sync);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_unique_id_obj, pyb_unique_id);
 
 /// \function millis()
 /// Returns the number of milliseconds since the board was last reset.
@@ -219,43 +220,28 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_delay_obj, pyb_delay);
 STATIC mp_obj_t pyb_udelay(mp_obj_t usec_in) {
     mp_int_t usec = mp_obj_get_int(usec_in);
     if (usec > 0) {
-        uint32_t count = 0;
-        const uint32_t utime = ((HAL_FCPU_HZ / 1000000) * (usec / 4));
-        while (++count <= utime) {
-        }
+        UtilsDelay(UTILS_DELAY_US_TO_COUNT(usec));
     }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_udelay_obj, pyb_udelay);
 
-STATIC mp_obj_t pyb_stop(void) {
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_0(pyb_stop_obj, pyb_stop);
-
-STATIC mp_obj_t pyb_standby(void) {
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_0(pyb_standby_obj, pyb_standby);
-
 /// \function repl_uart(uart)
 /// Get or set the UART object that the REPL is repeated on.
 STATIC mp_obj_t pyb_repl_uart(uint n_args, const mp_obj_t *args) {
     if (n_args == 0) {
-        if (MP_STATE_PORT(pyb_stdio_uart) == NULL) {
+        if (pyb_stdio_uart == NULL) {
             return mp_const_none;
         } else {
-            return MP_STATE_PORT(pyb_stdio_uart);
+            return pyb_stdio_uart;
         }
     } else {
         if (args[0] == mp_const_none) {
-            MP_STATE_PORT(pyb_stdio_uart) = NULL;
+            pyb_stdio_uart = NULL;
         } else if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
-            MP_STATE_PORT(pyb_stdio_uart) = args[0];
+            pyb_stdio_uart = args[0];
         } else {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_num_type_invalid_arguments));
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments));
         }
         return mp_const_none;
     }
@@ -267,33 +253,26 @@ MP_DECLARE_CONST_FUN_OBJ(pyb_main_obj); // defined in main.c
 STATIC const mp_map_elem_t pyb_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__),            MP_OBJ_NEW_QSTR(MP_QSTR_pyb) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_hard_reset),          (mp_obj_t)&pyb_hard_reset_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_reset),               (mp_obj_t)&pyb_reset_obj },
 #ifdef DEBUG
     { MP_OBJ_NEW_QSTR(MP_QSTR_info),                (mp_obj_t)&pyb_info_obj },
 #endif
-    { MP_OBJ_NEW_QSTR(MP_QSTR_mac),                 (mp_obj_t)&pyb_mac_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_freq),                (mp_obj_t)&pyb_freq_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_unique_id),           (mp_obj_t)&pyb_unique_id_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_repl_info),           (mp_obj_t)&pyb_set_repl_info_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_repl_uart),           (mp_obj_t)&pyb_repl_uart_obj },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_wfi),                 (mp_obj_t)&pyb_wfi_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_disable_irq),         (mp_obj_t)&pyb_disable_irq_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_enable_irq),          (mp_obj_t)&pyb_enable_irq_obj },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_stop),                (mp_obj_t)&pyb_stop_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_standby),             (mp_obj_t)&pyb_standby_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_main),                (mp_obj_t)&pyb_main_obj },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_repl_uart),           (mp_obj_t)&pyb_repl_uart_obj },
-
     { MP_OBJ_NEW_QSTR(MP_QSTR_millis),              (mp_obj_t)&pyb_millis_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_elapsed_millis),      (mp_obj_t)&pyb_elapsed_millis_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_micros),              (mp_obj_t)&pyb_micros_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_elapsed_micros),      (mp_obj_t)&pyb_elapsed_micros_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_delay),               (mp_obj_t)&pyb_delay_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_udelay),              (mp_obj_t)&pyb_udelay_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sync),                (mp_obj_t)&pyb_sync_obj },
-
-    //{ MP_OBJ_NEW_QSTR(MP_QSTR_Timer), (mp_obj_t)&pyb_timer_type },
 
 #if MICROPY_HW_ENABLE_RNG
     { MP_OBJ_NEW_QSTR(MP_QSTR_rng),                 (mp_obj_t)&pyb_rng_get_obj },
@@ -304,9 +283,18 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
 #endif
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_Pin),                 (mp_obj_t)&pin_type },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_ExtInt),              (mp_obj_t)&extint_type },
-
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ADC),                 (mp_obj_t)&pyb_adc_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_I2C),                 (mp_obj_t)&pyb_i2c_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SPI),                 (mp_obj_t)&pyb_spi_type },
     { MP_OBJ_NEW_QSTR(MP_QSTR_UART),                (mp_obj_t)&pyb_uart_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Timer),               (mp_obj_t)&pyb_timer_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_WDT),                 (mp_obj_t)&pyb_wdt_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Sleep),               (mp_obj_t)&pyb_sleep_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_HeartBeat),           (mp_obj_t)&pyb_heartbeat_type },
+
+#if MICROPY_HW_HAS_SDCARD
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SD),                  (mp_obj_t)&pyb_sd_type },
+#endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);

cc3200/mods/modubinascii.c

@@ -0,0 +1,62 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Paul Sokolovsky
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpconfig.h"
+#include MICROPY_HAL_H
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+#include "extmod/modubinascii.h"
+#include "modubinascii.h"
+#include "inc/hw_types.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_nvic.h"
+#include "inc/hw_dthe.h"
+#include "hw_memmap.h"
+#include "rom_map.h"
+#include "prcm.h"
+#include "crc.h"
+#include "cryptohash.h"
+#include "mpexception.h"
+
+
+/******************************************************************************/
+// Micro Python bindings
+
+STATIC const mp_map_elem_t mp_module_binascii_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__),        MP_OBJ_NEW_QSTR(MP_QSTR_ubinascii) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_hexlify),         (mp_obj_t)&mod_binascii_hexlify_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_unhexlify),       (mp_obj_t)&mod_binascii_unhexlify_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table);
+
+const mp_obj_module_t mp_module_ubinascii = {
+    .base = { &mp_type_module },
+    .name = MP_QSTR_ubinascii,
+    .globals = (mp_obj_dict_t*)&mp_module_binascii_globals,
+};

cc3200/mods/modubinascii.h

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2014 Damien P. George
+ * Copyright (c) 2014 Paul Sokolovsky
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,8 @@
  * THE SOFTWARE.
  */
 
-void stdout_tx_str(const char *str);
-void stdout_tx_strn(const char *str, mp_uint_t len);
-void stdout_tx_strn_cooked(const char *str, mp_uint_t len);
-int stdin_rx_chr(void);
+#ifndef MODUBINASCII_H_
+#define MODUBINASCII_H_
+
+
+#endif /* MODUBINASCII_H_ */

cc3200/mods/moduhashlib.c

@@ -0,0 +1,210 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Paul Sokolovsky
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "py/mpconfig.h"
+#include MICROPY_HAL_H
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "inc/hw_types.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_nvic.h"
+#include "inc/hw_shamd5.h"
+#include "inc/hw_dthe.h"
+#include "hw_memmap.h"
+#include "rom_map.h"
+#include "prcm.h"
+#include "shamd5.h"
+#include "cryptohash.h"
+#include "mpexception.h"
+
+
+/******************************************************************************
+ DEFINE PRIVATE TYPES
+ ******************************************************************************/
+typedef struct _mp_obj_hash_t {
+    mp_obj_base_t base;
+    uint8_t *buffer;
+    uint32_t b_size;
+    uint32_t c_size;
+    uint8_t  algo;
+    uint8_t  h_size;
+    bool  fixedlen;
+    bool  digested;
+    uint8_t hash[32];
+} mp_obj_hash_t;
+
+/******************************************************************************
+ DECLARE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest);
+STATIC mp_obj_t hash_read (mp_obj_t self_in);
+
+/******************************************************************************
+ DEFINE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest) {
+    mp_obj_hash_t *self = self_in;
+    mp_buffer_info_t bufinfo;
+
+    if (data) {
+        mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
+    }
+
+    if (digest) {
+        CRYPTOHASH_SHAMD5Start (self->algo, self->b_size);
+    }
+
+    if (self->c_size < self->b_size || !data || !self->fixedlen) {
+        if (digest || self->fixedlen) {
+            // no data means we want to process our internal buffer
+            CRYPTOHASH_SHAMD5Update (data ? bufinfo.buf : self->buffer, data ? bufinfo.len : self->b_size);
+            self->c_size += data ? bufinfo.len : 0;
+        } else {
+            self->buffer = m_renew(byte, self->buffer, self->b_size, self->b_size + bufinfo.len);
+            mp_seq_copy((byte*)self->buffer + self->b_size, bufinfo.buf, bufinfo.len, byte);
+            self->b_size += bufinfo.len;
+            self->digested = false;
+        }
+    } else {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
+    }
+}
+
+STATIC mp_obj_t hash_read (mp_obj_t self_in) {
+    mp_obj_hash_t *self = self_in;
+
+    if (!self->fixedlen) {
+        if (!self->digested) {
+            hash_update_internal(self, MP_OBJ_NULL, true);
+        }
+    } else if (self->c_size < self->b_size) {
+        // it's a fixed len block which is still incomplete
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
+    }
+
+    if (!self->digested) {
+        CRYPTOHASH_SHAMD5Read ((uint8_t *)self->hash);
+        self->digested = true;
+    }
+    return mp_obj_new_bytes(self->hash, self->h_size);
+}
+
+/******************************************************************************/
+// Micro Python bindings
+
+/// \classmethod \constructor([data[, block_size]])
+/// initial data must be given if block_size wants to be passed
+STATIC mp_obj_t hash_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 2, false);
+    mp_obj_hash_t *self = m_new0(mp_obj_hash_t, 1);
+    self->base.type = type_in;
+    if (self->base.type->name == MP_QSTR_sha1) {
+        self->algo = SHAMD5_ALGO_SHA1;
+        self->h_size = 20;
+    } else /* if (self->base.type->name == MP_QSTR_sha256) */ {
+        self->algo = SHAMD5_ALGO_SHA256;
+        self->h_size = 32;
+    } /* else {
+        self->algo = SHAMD5_ALGO_MD5;
+        self->h_size = 32;
+    } */
+
+    if (n_args) {
+        // CPython extension to avoid buffering the data before digesting it
+        // Note: care must be taken to provide all intermediate blocks as multiple
+        //       of four bytes, otherwise the resulting hash will be incorrect.
+        //       the final block can be of any length
+        if (n_args > 1) {
+            // block size given, we will feed the data directly into the hash engine
+            self->fixedlen = true;
+            self->b_size = mp_obj_get_int(args[1]);
+            hash_update_internal(self, args[0], true);
+        } else {
+            hash_update_internal(self, args[0], false);
+        }
+    }
+    return self;
+}
+
+STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg) {
+    mp_obj_hash_t *self = self_in;
+    hash_update_internal(self, arg, false);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(hash_update_obj, hash_update);
+
+STATIC mp_obj_t hash_digest(mp_obj_t self_in) {
+    return hash_read(self_in);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest);
+
+STATIC const mp_map_elem_t hash_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_update),    (mp_obj_t) &hash_update_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_digest),    (mp_obj_t) &hash_digest_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table);
+
+//STATIC const mp_obj_type_t md5_type = {
+//    { &mp_type_type },
+//    .name = MP_QSTR_md5,
+//    .make_new = hash_make_new,
+//    .locals_dict = (mp_obj_t)&hash_locals_dict,
+//};
+
+STATIC const mp_obj_type_t sha1_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_sha1,
+    .make_new = hash_make_new,
+    .locals_dict = (mp_obj_t)&hash_locals_dict,
+};
+
+STATIC const mp_obj_type_t sha256_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_sha256,
+    .make_new = hash_make_new,
+    .locals_dict = (mp_obj_t)&hash_locals_dict,
+};
+
+STATIC const mp_map_elem_t mp_module_hashlib_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__),    MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib) },
+//    { MP_OBJ_NEW_QSTR(MP_QSTR_md5),         (mp_obj_t)&md5_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sha1),        (mp_obj_t)&sha1_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sha256),      (mp_obj_t)&sha256_type },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
+
+const mp_obj_module_t mp_module_uhashlib = {
+    .base = { &mp_type_module },
+    .name = MP_QSTR_uhashlib,
+    .globals = (mp_obj_dict_t*)&mp_module_hashlib_globals,
+};
+

cc3200/mods/moduhashlib.h

@@ -0,0 +1,32 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Paul Sokolovsky
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MODUHASHLIB_H_
+#define MODUHASHLIB_H_
+
+extern const mp_obj_module_t mp_module_uhashlib;
+
+#endif // MODUHASHLIB_H_

cc3200/mods/moduos.c

@@ -27,21 +27,22 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "std.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
+#include "py/mpconfig.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/objtuple.h"
+#include "py/objstr.h"
+#include "genhdr/mpversion.h"
 #include "ff.h"
 #include "diskio.h"
 #include "sflash_diskio.h"
 #include "file.h"
-#include "modutime.h"
 #include "random.h"
 #include "sd_diskio.h"
+#include "mpexception.h"
+#include "version.h"
+#include "timeutils.h"
 
 /// \module os - basic "operating system" services
 ///
@@ -50,12 +51,15 @@
 /// The filesystem has `/` as the root directory, and the available physical
 /// drives are accessible from here.  They are currently:
 ///
-///     /SFLASH     -- the serial flash filesystem
-///     /SD         -- the SD card (if it exists)
+///     /flash      -- the serial flash filesystem
+///     /sd         -- the SD card (if it exists)
 ///
-/// On boot up, the current directory is `/SFLASH` if no SD card is inserted,
-/// otherwise it is `/SD`.
+/// On boot up, the current directory is `/flash` if no SD card is inserted,
+/// otherwise it is `/sd`.
 
+/******************************************************************************
+ DEFINE PRIVATE FUNCTIONS
+ ******************************************************************************/
 STATIC bool sd_in_root(void) {
 #if MICROPY_HW_HAS_SDCARD
     return sd_disk_ready();
@@ -64,6 +68,35 @@ STATIC bool sd_in_root(void) {
 #endif
 }
 
+/******************************************************************************/
+// Micro Python bindings
+//
+
+STATIC const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, WIPY_SW_VERSION_NUMBER);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+STATIC MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+);
+
+STATIC mp_obj_t os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
+
 /// \function chdir(path)
 /// Change current directory.
 STATIC mp_obj_t os_chdir(mp_obj_t path_in) {
@@ -75,10 +108,9 @@ STATIC mp_obj_t os_chdir(mp_obj_t path_in) {
     if (res == FR_OK) {
         res = f_chdir(path);
     }
-    // TODO: Warn if too many open files...
+
     if (res != FR_OK) {
-        // TODO should be mp_type_FileNotFoundError
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "No such file or directory: '%s'", path));
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
     }
 
     return mp_const_none;
@@ -104,6 +136,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd);
 STATIC mp_obj_t os_listdir(mp_uint_t n_args, const mp_obj_t *args) {
     bool is_str_type = true;
     const char *path;
+
     if (n_args == 1) {
         if (mp_obj_get_type(args[0]) == &mp_type_bytes) {
             is_str_type = false;
@@ -116,21 +149,27 @@ STATIC mp_obj_t os_listdir(mp_uint_t n_args, const mp_obj_t *args) {
     // "hack" to list root directory
     if (path[0] == '/' && path[1] == '\0') {
         mp_obj_t dir_list = mp_obj_new_list(0, NULL);
-        mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_SFLASH));
+        mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_flash));
+#if MICROPY_HW_HAS_SDCARD
         if (sd_in_root()) {
-            mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_SD));
+            mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_sd));
         }
+#endif
         return dir_list;
     }
 
     FRESULT res;
-    FILINFO fno;
     DIR dir;
+    FILINFO fno;
+#if _USE_LFN
+    char lfn_buf[_MAX_LFN + 1];
+    fno.lfname = lfn_buf;
+    fno.lfsize = sizeof(lfn_buf);
+#endif
 
     res = f_opendir(&dir, path);                       /* Open the directory */
     if (res != FR_OK) {
-        // TODO should be mp_type_FileNotFoundError
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "No such file or directory: '%s'", path));
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
     }
 
     mp_obj_t dir_list = mp_obj_new_list(0, NULL);
@@ -141,7 +180,11 @@ STATIC mp_obj_t os_listdir(mp_uint_t n_args, const mp_obj_t *args) {
         if (fno.fname[0] == '.' && fno.fname[1] == 0) continue;             /* Ignore . entry */
         if (fno.fname[0] == '.' && fno.fname[1] == '.' && fno.fname[2] == 0) continue;             /* Ignore .. entry */
 
+#if _USE_LFN
+        char *fn = *fno.lfname ? fno.lfname : fno.fname;
+#else
         char *fn = fno.fname;
+#endif
 
         // make a string object for this entry
         mp_obj_t entry_o;
@@ -170,44 +213,44 @@ STATIC mp_obj_t os_mkdir(mp_obj_t path_o) {
         case FR_OK:
             return mp_const_none;
         case FR_EXIST:
-            // TODO should be FileExistsError
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "File exists: '%s'", path));
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
+            break;
         default:
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error creating directory '%s'", path));
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mkdir_obj, os_mkdir);
 
+/// \function rename(old_path, new_path)
+/// Rename a file
+STATIC mp_obj_t os_rename(mp_obj_t path_in, mp_obj_t path_out) {
+    const char *old_path = mp_obj_str_get_str(path_in);
+    const char *new_path = mp_obj_str_get_str(path_out);
+    FRESULT res = f_rename(old_path, new_path);
+    switch (res) {
+        case FR_OK:
+            return mp_const_none;
+        default:
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+    }
+
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(os_rename_obj, os_rename);
+
 /// \function remove(path)
-/// Remove a file.
+/// Remove a file or a directory
 STATIC mp_obj_t os_remove(mp_obj_t path_o) {
     const char *path = mp_obj_str_get_str(path_o);
-    // TODO check that path is actually a file before trying to unlink it
     FRESULT res = f_unlink(path);
     switch (res) {
         case FR_OK:
             return mp_const_none;
         default:
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error removing file '%s'", path));
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_remove_obj, os_remove);
 
-/// \function rmdir(path)
-/// Remove a directory.
-STATIC mp_obj_t os_rmdir(mp_obj_t path_o) {
-    const char *path = mp_obj_str_get_str(path_o);
-    // TODO check that path is actually a directory before trying to unlink it
-    FRESULT res = f_unlink(path);
-    switch (res) {
-        case FR_OK:
-            return mp_const_none;
-        default:
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error removing directory '%s'", path));
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir);
-
 // Checks for path equality, ignoring trailing slashes:
 //   path_equal(/, /) -> true
 //   path_equal(/flash//, /flash) -> true
@@ -227,14 +270,18 @@ STATIC bool path_equal(const char *path, const char *path_canonical) {
 /// Get the status of a file or directory.
 STATIC mp_obj_t os_stat(mp_obj_t path_in) {
     const char *path = mp_obj_str_get_str(path_in);
-    stoupper((char *)path);
 
-    FILINFO fno;
     FRESULT res;
-    if (path_equal(path, "/") || path_equal(path, "/SFLASH") || path_equal(path, "/SD")) {
+    FILINFO fno;
+#if _USE_LFN
+    fno.lfname = NULL;
+    fno.lfsize = 0;
+#endif
+
+    if (path_equal(path, "/") || path_equal(path, "/flash") || path_equal(path, "/sd")) {
         // stat built-in directory
-        if (path[1] == 'S' && !sd_in_root()) {
-            // no /SD directory
+        if (path[1] == 's' && !sd_in_root()) {
+            // no /sd directory
             res = FR_NO_PATH;
             goto error;
         }
@@ -256,7 +303,7 @@ STATIC mp_obj_t os_stat(mp_obj_t path_in) {
     } else {
         mode |= 0x8000; // stat.S_IFREG
     }
-    mp_int_t seconds = mod_time_seconds_since_2000(
+    mp_int_t seconds = timeutils_seconds_since_2000(
         1980 + ((fno.fdate >> 9) & 0x7f),
         (fno.fdate >> 5) & 0x0f,
         fno.fdate & 0x1f,
@@ -306,26 +353,38 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 #endif
 
+/// \function mkfs('path')
+/// Formats the selected drive, useful when the filesystem has been damaged beyond repair
+STATIC mp_obj_t os_mkfs(mp_obj_t path_o) {
+    const char *path = mp_obj_str_get_str(path_o);
+    if (FR_OK != f_mkfs(path, 1, 0)) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mkfs_obj, os_mkfs);
+
 STATIC const mp_map_elem_t os_module_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_uos) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__),        MP_OBJ_NEW_QSTR(MP_QSTR_uos) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_chdir), (mp_obj_t)&os_chdir_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_getcwd), (mp_obj_t)&os_getcwd_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_listdir), (mp_obj_t)&os_listdir_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_mkdir), (mp_obj_t)&os_mkdir_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&os_remove_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_rmdir), (mp_obj_t)&os_rmdir_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_stat), (mp_obj_t)&os_stat_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_unlink), (mp_obj_t)&os_remove_obj }, // unlink aliases to remove
-
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sync), (mp_obj_t)&os_sync_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_uname),           (mp_obj_t)&os_uname_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_chdir),           (mp_obj_t)&os_chdir_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_getcwd),          (mp_obj_t)&os_getcwd_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_listdir),         (mp_obj_t)&os_listdir_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_mkdir),           (mp_obj_t)&os_mkdir_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_rename),          (mp_obj_t)&os_rename_obj},
+    { MP_OBJ_NEW_QSTR(MP_QSTR_remove),          (mp_obj_t)&os_remove_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_rmdir),           (mp_obj_t)&os_remove_obj },  // rmdir aliases to remove
+    { MP_OBJ_NEW_QSTR(MP_QSTR_stat),            (mp_obj_t)&os_stat_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_unlink),          (mp_obj_t)&os_remove_obj },  // unlink aliases to remove
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sync),            (mp_obj_t)&os_sync_obj },
+#if MICROPY_HW_ENABLE_RNG
+    { MP_OBJ_NEW_QSTR(MP_QSTR_urandom),         (mp_obj_t)&os_urandom_obj },
+#endif
+    { MP_OBJ_NEW_QSTR(MP_QSTR_mkfs),            (mp_obj_t)&os_mkfs_obj },
 
     /// \constant sep - separation character used in paths
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sep), MP_OBJ_NEW_QSTR(MP_QSTR__slash_) },
-
-#if MICROPY_HW_ENABLE_RNG
-    { MP_OBJ_NEW_QSTR(MP_QSTR_urandom), (mp_obj_t)&os_urandom_obj },
-#endif
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sep),             MP_OBJ_NEW_QSTR(MP_QSTR__slash_) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);

cc3200/mods/moduos.h

@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,4 +25,8 @@
  * THE SOFTWARE.
  */
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename);
+#ifndef MODUOS_H_
+#define MODUOS_H_
+
+
+#endif // MODUOS_H_

cc3200/mods/modusocket.c

@@ -25,23 +25,98 @@
  * THE SOFTWARE.
  */
 
-#include <std.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "simplelink.h"
-#include "mpconfig.h"
+#include "py/mpstate.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/runtime.h"
+#include "netutils.h"
 #include "modnetwork.h"
+#include "modwlan.h"
+#include "modusocket.h"
 #include "mpexception.h"
-#include "mpstate.h"
+
+/******************************************************************************
+ DEFINE PRIVATE CONSTANTS
+ ******************************************************************************/
+#define MOD_NETWORK_MAX_SOCKETS                 10
+
+/******************************************************************************
+ DEFINE PRIVATE TYPES
+ ******************************************************************************/
+typedef struct {
+    int16_t sd;
+    bool    user;
+} modusocket_sock_t;
+
+/******************************************************************************
+ DEFINE PRIVATE DATA
+ ******************************************************************************/
+STATIC OsiLockObj_t modusocket_LockObj;
+STATIC modusocket_sock_t modusocket_sockets[MOD_NETWORK_MAX_SOCKETS] = {{.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1},
+                                                                        {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}, {.sd = -1}};
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
+__attribute__ ((section (".boot")))
+void modusocket_pre_init (void) {
+    // create the wlan lock
+    ASSERT(OSI_OK == sl_LockObjCreate(&modusocket_LockObj, "SockLock"));
+    sl_LockObjUnlock (&modusocket_LockObj);
+}
+
+void modusocket_socket_add (int16_t sd, bool user) {
+    sl_LockObjLock (&modusocket_LockObj, SL_OS_WAIT_FOREVER);
+    for (int i = 0; i < MOD_NETWORK_MAX_SOCKETS; i++) {
+        if (modusocket_sockets[i].sd < 0) {
+            modusocket_sockets[i].sd = sd;
+            modusocket_sockets[i].user = user;
+            break;
+        }
+    }
+    sl_LockObjUnlock (&modusocket_LockObj);
+}
+
+void modusocket_socket_delete (int16_t sd) {
+    sl_LockObjLock (&modusocket_LockObj, SL_OS_WAIT_FOREVER);
+    for (int i = 0; i < MOD_NETWORK_MAX_SOCKETS; i++) {
+        if (modusocket_sockets[i].sd == sd) {
+            modusocket_sockets[i].sd = -1;
+            break;
+        }
+    }
+    sl_LockObjUnlock (&modusocket_LockObj);
+}
+
+void modusocket_enter_sleep (void) {
+    fd_set socketset;
+    int16_t maxfd = 0;
+
+    for (int i = 0; i < MOD_NETWORK_MAX_SOCKETS; i++) {
+        int16_t sd;
+        if ((sd = modusocket_sockets[i].sd) >= 0) {
+            FD_SET(sd, &socketset);
+            maxfd = (maxfd > sd) ? maxfd : sd;
+        }
+    }
+
+    // wait for any of the sockets to become ready...
+    sl_Select(maxfd + 1, &socketset, NULL, NULL, NULL);
+}
+
+void modusocket_close_all_user_sockets (void) {
+    sl_LockObjLock (&modusocket_LockObj, SL_OS_WAIT_FOREVER);
+    for (int i = 0; i < MOD_NETWORK_MAX_SOCKETS; i++) {
+        if (modusocket_sockets[i].sd >= 0 && modusocket_sockets[i].user) {
+            sl_Close(modusocket_sockets[i].sd);
+            modusocket_sockets[i].sd = -1;
+        }
+    }
+    sl_LockObjUnlock (&modusocket_LockObj);
+}
 
 /******************************************************************************/
 // socket class
@@ -52,49 +127,40 @@ STATIC const mp_obj_type_t socket_type;
 STATIC mp_obj_t socket_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 4, false);
 
-    // create socket object (not bound to any NIC yet)
+    // create socket object
     mod_network_socket_obj_t *s = m_new_obj_with_finaliser(mod_network_socket_obj_t);
     s->base.type = (mp_obj_t)&socket_type;
-    s->nic = MP_OBJ_NULL;
-    s->nic_type = NULL;
     s->u_param.domain = AF_INET;
     s->u_param.type = SOCK_STREAM;
     s->u_param.proto = IPPROTO_TCP;
     s->u_param.fileno = -1;
-    if (n_args >= 1) {
+    if (n_args > 0) {
         s->u_param.domain = mp_obj_get_int(args[0]);
-        if (n_args >= 2) {
+        if (n_args > 1) {
             s->u_param.type = mp_obj_get_int(args[1]);
-            if (n_args >= 3) {
+            if (n_args > 2) {
                 s->u_param.proto = mp_obj_get_int(args[2]);
-                if (n_args == 4) {
+                if (n_args > 3) {
                     s->u_param.fileno = mp_obj_get_int(args[3]);
                 }
             }
         }
     }
+
+    // create the socket
+    int _errno;
+    if (wlan_socket_socket(s, &_errno) != 0) {
+        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
+    }
+
+    modusocket_socket_add(s->sd, true);
     return s;
 }
 
-STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
-    if (self->nic == MP_OBJ_NULL) {
-        // select NIC based on IP
-        self->nic = mod_network_find_nic(ip);
-        self->nic_type = (mod_network_nic_type_t*)mp_obj_get_type(self->nic);
-
-        // call the NIC to open the socket
-        int _errno;
-        if (self->nic_type->socket(self, &_errno) != 0) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
-        }
-    }
-}
 // method socket.close()
 STATIC mp_obj_t socket_close(mp_obj_t self_in) {
     mod_network_socket_obj_t *self = self_in;
-    if (self->nic != MP_OBJ_NULL) {
-        self->nic_type->close(self);
-    }
+    wlan_socket_close(self);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, socket_close);
@@ -105,17 +171,13 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 
     // get address
     uint8_t ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
-    mp_uint_t port = mod_network_parse_inet_addr(addr_in, ip);
-
-    // check if we need to select a NIC
-    socket_select_nic(self, ip);
+    mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_LITTLE);
 
     // call the NIC to bind the socket
     int _errno;
-    if (self->nic_type->bind(self, ip, port, &_errno) != 0) {
+    if (wlan_socket_bind(self, ip, port, &_errno) != 0) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
@@ -124,16 +186,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog) {
     mod_network_socket_obj_t *self = self_in;
 
-    if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOTCONN)));
-    }
-
     int _errno;
-    if (self->nic_type->listen(self, mp_obj_get_int(backlog), &_errno) != 0) {
+    if (wlan_socket_listen(self, mp_obj_get_int(backlog), &_errno) != 0) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
@@ -143,29 +199,24 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     mod_network_socket_obj_t *self = self_in;
 
     // create new socket object
-    // starts with empty NIC so that finaliser doesn't run close() method if accept() fails
     mod_network_socket_obj_t *socket2 = m_new_obj_with_finaliser(mod_network_socket_obj_t);
     socket2->base.type = (mp_obj_t)&socket_type;
-    socket2->nic = MP_OBJ_NULL;
-    socket2->nic_type = NULL;
 
     // accept incoming connection
     uint8_t ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
     mp_uint_t port;
     int _errno;
-    if (self->nic_type->accept(self, socket2, ip, &port, &_errno) != 0) {
+    if (wlan_socket_accept(self, socket2, ip, &port, &_errno) != 0) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
 
-    // new socket has valid state, so set the NIC to the same as parent
-    socket2->nic = self->nic;
-    socket2->nic_type = self->nic_type;
+    // add the socket to the list
+    modusocket_socket_add(socket2->sd, true);
 
     // make the return value
     mp_obj_tuple_t *client = mp_obj_new_tuple(2, NULL);
     client->items[0] = socket2;
-    client->items[1] = mod_network_format_inet_addr(ip, port);
-
+    client->items[1] = netutils_format_inet_addr(ip, port, NETUTILS_LITTLE);
     return client;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, socket_accept);
@@ -176,17 +227,13 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 
     // get address
     uint8_t ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
-    mp_uint_t port = mod_network_parse_inet_addr(addr_in, ip);
-
-    // check if we need to select a NIC
-    socket_select_nic(self, ip);
+    mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_LITTLE);
 
     // call the NIC to connect the socket
     int _errno;
-    if (self->nic_type->connect(self, ip, port, &_errno) != 0) {
+    if (wlan_socket_connect(self, ip, port, &_errno) != 0) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
@@ -194,14 +241,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 // method socket.send(bytes)
 STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     mod_network_socket_obj_t *self = self_in;
-    if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EBADF)));
-    }
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
     int _errno;
-    mp_uint_t ret = self->nic_type->send(self, bufinfo.buf, bufinfo.len, &_errno);
+    mp_uint_t ret = wlan_socket_send(self, bufinfo.buf, bufinfo.len, &_errno);
     if (ret == -1) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
@@ -212,15 +255,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
 // method socket.recv(bufsize)
 STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     mod_network_socket_obj_t *self = self_in;
-    if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOTCONN)));
-    }
     mp_int_t len = mp_obj_get_int(len_in);
     vstr_t vstr;
     vstr_init_len(&vstr, len);
     int _errno;
-    mp_uint_t ret = self->nic_type->recv(self, (byte*)vstr.buf, len, &_errno);
+    mp_uint_t ret = wlan_socket_recv(self, (byte*)vstr.buf, len, &_errno);
     if (ret == -1) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
@@ -243,18 +282,14 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_
 
     // get address
     uint8_t ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
-    mp_uint_t port = mod_network_parse_inet_addr(addr_in, ip);
+    mp_uint_t port = netutils_parse_inet_addr(addr_in, ip, NETUTILS_LITTLE);
 
-    // check if we need to select a NIC
-    socket_select_nic(self, ip);
-
-    // call the NIC to sendto
+    // call the nic to sendto
     int _errno;
-    mp_int_t ret = self->nic_type->sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
+    mp_int_t ret = wlan_socket_sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
     if (ret == -1) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
-
     return mp_obj_new_int(ret);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
@@ -262,16 +297,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, socket_sendto);
 // method socket.recvfrom(bufsize)
 STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     mod_network_socket_obj_t *self = self_in;
-    if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOTCONN)));
-    }
     vstr_t vstr;
     vstr_init_len(&vstr, mp_obj_get_int(len_in));
     byte ip[4];
     mp_uint_t port;
     int _errno;
-    mp_int_t ret = self->nic_type->recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
+    mp_int_t ret = wlan_socket_recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
     if (ret == -1) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
@@ -283,7 +314,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
         vstr.buf[vstr.len] = '\0';
         tuple[0] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
     }
-    tuple[1] = mod_network_format_inet_addr(ip, port);
+    tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_LITTLE);
     return mp_obj_new_tuple(2, tuple);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
@@ -299,7 +330,7 @@ STATIC mp_obj_t socket_setsockopt(mp_uint_t n_args, const mp_obj_t *args) {
     mp_uint_t optlen;
     mp_int_t val;
     if (mp_obj_is_integer(args[3])) {
-        val = mp_obj_int_get_truncated(args[3]);
+        val = mp_obj_get_int_truncated(args[3]);
         optval = &val;
         optlen = sizeof(val);
     } else {
@@ -310,10 +341,9 @@ STATIC mp_obj_t socket_setsockopt(mp_uint_t n_args, const mp_obj_t *args) {
     }
 
     int _errno;
-    if (self->nic_type->setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
+    if (wlan_socket_setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
@@ -324,10 +354,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_s
 // otherwise, timeout is in seconds
 STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     mod_network_socket_obj_t *self = self_in;
-    if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(ENOTCONN)));
-    }
     mp_uint_t timeout;
     if (timeout_in == mp_const_none) {
         timeout = -1;
@@ -335,7 +361,7 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
         timeout = 1000 * mp_obj_get_int(timeout_in);
     }
     int _errno;
-    if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {
+    if (wlan_socket_settimeout(self, timeout, &_errno) != 0) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
     }
     return mp_const_none;
@@ -372,7 +398,7 @@ STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
 mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
     mod_network_socket_obj_t *self = self_in;
-    return self->nic_type->ioctl(self, request, arg, errcode);
+    return wlan_socket_ioctl(self, request, arg, errcode);
 }
 
 STATIC const mp_stream_p_t socket_stream_p = {
@@ -398,28 +424,19 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
     const char *host = mp_obj_str_get_data(host_in, &hlen);
     mp_int_t port = mp_obj_get_int(port_in);
 
-    // find a NIC that can do a name lookup
-    for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
-        mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
-        mod_network_nic_type_t *nic_type = (mod_network_nic_type_t*)mp_obj_get_type(nic);
-        if (nic_type->gethostbyname != NULL) {
-            // Only IPv4 is supported
-            uint8_t out_ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
-            int32_t result = nic_type->gethostbyname(nic, host, hlen, out_ip, AF_INET);
-            if (result != 0) {
-                nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(result)));
-            }
-            mp_obj_tuple_t *tuple = mp_obj_new_tuple(5, NULL);
-            tuple->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET);
-            tuple->items[1] = MP_OBJ_NEW_SMALL_INT(SOCK_STREAM);
-            tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
-            tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
-            tuple->items[4] = mod_network_format_inet_addr(out_ip, port);
-            return mp_obj_new_list(1, (mp_obj_t*)&tuple);
-        }
+    // ipv4 only
+    uint8_t out_ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
+    int32_t result = wlan_gethostbyname(host, hlen, out_ip, AF_INET);
+    if (result != 0) {
+        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(result)));
     }
-
-    nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_resource_not_avaliable));
+    mp_obj_tuple_t *tuple = mp_obj_new_tuple(5, NULL);
+    tuple->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET);
+    tuple->items[1] = MP_OBJ_NEW_SMALL_INT(SOCK_STREAM);
+    tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
+    tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
+    tuple->items[4] = netutils_format_inet_addr(out_ip, port, NETUTILS_LITTLE);
+    return mp_obj_new_list(1, (mp_obj_t*)&tuple);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_usocket_getaddrinfo_obj, mod_usocket_getaddrinfo);
 
@@ -437,6 +454,7 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_DGRAM),      MP_OBJ_NEW_SMALL_INT(SOCK_DGRAM) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_RAW),        MP_OBJ_NEW_SMALL_INT(SOCK_RAW) },
 
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_SEC),     MP_OBJ_NEW_SMALL_INT(SL_SEC_SOCKET) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_TCP),     MP_OBJ_NEW_SMALL_INT(IPPROTO_TCP) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_UDP),     MP_OBJ_NEW_SMALL_INT(IPPROTO_UDP) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_RAW),     MP_OBJ_NEW_SMALL_INT(IPPROTO_RAW) },

cc3200/mods/modusocket.h

@@ -0,0 +1,36 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MODUSOCKET_H_
+#define MODUSOCKET_H_
+
+extern void modusocket_pre_init (void);
+extern void modusocket_socket_add (int16_t sd, bool user);
+extern void modusocket_socket_delete (int16_t sd);
+extern void modusocket_enter_sleep (void);
+extern void modusocket_close_all_user_sockets (void);
+
+#endif /* MODUSOCKET_H_ */

cc3200/mods/modutime.c

@@ -28,13 +28,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "modutime.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "timeutils.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
@@ -43,126 +41,11 @@
 #include "pybrtc.h"
 #include "mpexception.h"
 
-
-// LEAPOCH corresponds to 2000-03-01, which is a mod-400 year, immediately
-// after Feb 29. We calculate seconds as a signed integer relative to that.
-//
-// Our timebase is relative to 2000-01-01.
-
-#define LEAPOCH ((31 + 29) * 86400)
-
-#define DAYS_PER_400Y (365*400 + 97)
-#define DAYS_PER_100Y (365*100 + 24)
-#define DAYS_PER_4Y   (365*4   + 1)
-
-
 /// \module time - time related functions
 ///
 /// The `time` module provides functions for getting the current time and date,
 /// and for sleeping.
 
-STATIC const uint16_t days_since_jan1[]= { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
-
-STATIC bool is_leap_year(mp_uint_t year) {
-    return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0;
-}
-
-// Month is one based
-STATIC mp_uint_t mod_time_days_in_month(mp_uint_t year, mp_uint_t month) {
-    mp_uint_t mdays = days_since_jan1[month] - days_since_jan1[month - 1];
-    if (month == 2 && is_leap_year(year)) {
-        mdays++;
-    }
-    return mdays;
-}
-
-// compute the day of the year, between 1 and 366
-// month should be between 1 and 12, date should start at 1
-STATIC mp_uint_t mod_time_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) {
-    mp_uint_t yday = days_since_jan1[month - 1] + date;
-    if (month >= 3 && is_leap_year(year)) {
-        yday += 1;
-    }
-    return yday;
-}
-
-// returns the number of seconds, as an integer, since 2000-01-01
-mp_uint_t mod_time_seconds_since_2000(mp_uint_t year, mp_uint_t month, mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second) {
-    return
-        second
-        + minute * 60
-        + hour * 3600
-        + (mod_time_year_day(year, month, date) - 1
-            + ((year - 2000 + 3) / 4) // add a day each 4 years starting with 2001
-            - ((year - 2000 + 99) / 100) // subtract a day each 100 years starting with 2001
-            + ((year - 2000 + 399) / 400) // add a day each 400 years starting with 2001
-            ) * 86400
-        + (year - 2000) * 31536000;
-}
-
-void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm) {
-    // The following algorithm was adapted from musl's __secs_to_tm and adapted
-    // for differences in Micro Python's timebase.
-
-    mp_int_t seconds = t - LEAPOCH;
-
-    mp_int_t days = seconds / 86400;
-    seconds %= 86400;
-    tm->tm_hour = seconds / 3600;
-    tm->tm_min = seconds / 60 % 60;
-    tm->tm_sec = seconds % 60;
-
-    mp_int_t wday = (days + 2) % 7;   // Mar 1, 2000 was a Wednesday (2)
-    if (wday < 0) {
-        wday += 7;
-    }
-    tm->tm_wday = wday;
-
-    mp_int_t qc_cycles = days / DAYS_PER_400Y;
-    days %= DAYS_PER_400Y;
-    if (days < 0) {
-        days += DAYS_PER_400Y;
-        qc_cycles--;
-    }
-    mp_int_t c_cycles = days / DAYS_PER_100Y;
-    if (c_cycles == 4) {
-        c_cycles--;
-    }
-    days -= (c_cycles * DAYS_PER_100Y);
-
-    mp_int_t q_cycles = days / DAYS_PER_4Y;
-    if (q_cycles == 25) {
-        q_cycles--;
-    }
-    days -= q_cycles * DAYS_PER_4Y;
-
-    mp_int_t years = days / 365;
-    if (years == 4) {
-        years--;
-    }
-    days -= (years * 365);
-
-    tm->tm_year = 2000 + years + 4 * q_cycles + 100 * c_cycles + 400 * qc_cycles;
-
-    // Note: days_in_month[0] corresponds to March
-    STATIC const int8_t days_in_month[] = {31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 31, 29};
-
-    mp_int_t month;
-    for (month = 0; days_in_month[month] <= days; month++) {
-        days -= days_in_month[month];
-    }
-
-    tm->tm_mon = month + 2;
-    if (tm->tm_mon >= 12) {
-        tm->tm_mon -= 12;
-        tm->tm_year++;
-    }
-    tm->tm_mday = days + 1; // Make one based
-    tm->tm_mon++;   // Make one based
-
-    tm->tm_yday = mod_time_year_day(tm->tm_year, tm->tm_mon, tm->tm_mday);
-}
-
 /// \function localtime([secs])
 /// Convert a time expressed in seconds since Jan 1, 2000 into an 8-tuple which
 /// contains: (year, month, mday, hour, minute, second, weekday, yearday)
@@ -177,30 +60,30 @@ void mod_time_seconds_since_2000_to_struct_time(mp_uint_t t, mod_struct_time *tm
 /// yearday is 1-366
 STATIC mp_obj_t time_localtime(mp_uint_t n_args, const mp_obj_t *args) {
     if (n_args == 0 || args[0] == mp_const_none) {
-        mod_struct_time tm;
+        timeutils_struct_time_t tm;
         uint32_t seconds;
         uint16_t mseconds;
 
         // get the seconds and the milliseconds from the RTC
         MAP_PRCMRTCGet(&seconds, &mseconds);
         mseconds = RTC_CYCLES_U16MS(mseconds);
-        mod_time_seconds_since_2000_to_struct_time(seconds, &tm);
+        timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
 
         mp_obj_t tuple[8] = {
                 mp_obj_new_int(tm.tm_year),
                 mp_obj_new_int(tm.tm_mon),
                 mp_obj_new_int(tm.tm_mday),
-                mp_obj_new_int(tm.tm_wday),
                 mp_obj_new_int(tm.tm_hour),
                 mp_obj_new_int(tm.tm_min),
                 mp_obj_new_int(tm.tm_sec),
-                mp_obj_new_int(mseconds)
+                mp_obj_new_int(tm.tm_wday),
+                mp_obj_new_int(tm.tm_yday)
         };
         return mp_obj_new_tuple(8, tuple);
     } else {
         mp_int_t seconds = mp_obj_get_int(args[0]);
-        mod_struct_time tm;
-        mod_time_seconds_since_2000_to_struct_time(seconds, &tm);
+        timeutils_struct_time_t tm;
+        timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
         mp_obj_t tuple[8] = {
             tuple[0] = mp_obj_new_int(tm.tm_year),
             tuple[1] = mp_obj_new_int(tm.tm_mon),
@@ -222,7 +105,6 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
 /// which expresses a time as per localtime. It returns an integer which is
 /// the number of seconds since Jan 1, 2000.
 STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
-
     mp_uint_t len;
     mp_obj_t *elem;
 
@@ -233,64 +115,9 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
         nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments));
     }
 
-    mp_int_t year    = mp_obj_get_int(elem[0]);
-    mp_int_t month   = mp_obj_get_int(elem[1]);
-    mp_int_t mday    = mp_obj_get_int(elem[2]);
-    mp_int_t hours   = mp_obj_get_int(elem[3]);
-    mp_int_t minutes = mp_obj_get_int(elem[4]);
-    mp_int_t seconds = mp_obj_get_int(elem[5]);
-
-    // Normalize the tuple. This allows things like:
-    //
-    // tm_tomorrow = list(time.localtime())
-    // tm_tomorrow[2] += 1 # Adds 1 to mday
-    // tomorrow = time.mktime(tm_tommorrow)
-    //
-    // And not have to worry about all the weird overflows.
-    //
-    // You can subtract dates/times this way as well.
-
-    minutes += seconds / 60;
-    if ((seconds = seconds % 60) < 0) {
-        seconds += 60;
-        minutes--;
-    }
-
-    hours += minutes / 60;
-    if ((minutes = minutes % 60) < 0) {
-        minutes += 60;
-        hours--;
-    }
-
-    mday += hours / 24;
-    if ((hours = hours % 24) < 0) {
-        hours += 24;
-        mday--;
-    }
-
-    month--; // make month zero based
-    year += month / 12;
-    if ((month = month % 12) < 0) {
-        month += 12;
-        year--;
-    }
-    month++; // back to one based
-
-    while (mday < 1) {
-        if (--month == 0) {
-            month = 12;
-            year--;
-        }
-        mday += mod_time_days_in_month(year, month);
-    }
-    while (mday > mod_time_days_in_month(year, month)) {
-        mday -= mod_time_days_in_month(year, month);
-        if (++month == 13) {
-            month = 1;
-            year++;
-        }
-    }
-    return mp_obj_new_int_from_uint(mod_time_seconds_since_2000(year, month, mday, hours, minutes, seconds));
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+            mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+            mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
 

cc3200/mods/modwlan.h

@@ -24,48 +24,59 @@
  * THE SOFTWARE.
  */
 
-#ifndef SIMPLELINKTASK_H_
-#define SIMPLELINKTASK_H_
+#ifndef MODWLAN_H_
+#define MODWLAN_H_
 
 /******************************************************************************
  DEFINE CONSTANTS
  ******************************************************************************/
 #define SIMPLELINK_SPAWN_TASK_PRIORITY              3
 #define SIMPLELINK_TASK_STACK_SIZE                  2048
+#define SL_STOP_TIMEOUT                             35
+#define SL_STOP_TIMEOUT_LONG                        575
 
 /******************************************************************************
  DEFINE TYPES
  ******************************************************************************/
-typedef enum
-{
+typedef enum {
     MODWLAN_OK = 0,
     MODWLAN_ERROR_INVALID_PARAMS = -1,
     MODWLAN_ERROR_TIMEOUT = -2,
-    MODWLAN_ERROR_UNKNOWN = -3
-
+    MODWLAN_ERROR_UNKNOWN = -3,
 }modwlan_Status_t;
 
 /******************************************************************************
  DECLARE PUBLIC DATA
  ******************************************************************************/
-#ifdef USE_FREERTOS
-#include "FreeRTOS.h"
-#include "task.h"
-#include "semphr.h"
-extern SemaphoreHandle_t xWlanSemaphore;
-#endif
+extern _SlLockObj_t wlan_LockObj;
 
 /******************************************************************************
  DECLARE PUBLIC FUNCTIONS
  ******************************************************************************/
-extern void wlan_init0 (void);
+extern void wlan_pre_init (void);
 extern modwlan_Status_t wlan_sl_enable (SlWlanMode_t mode, const char *ssid, uint8_t ssid_len, uint8_t sec,
                                         const char *key, uint8_t key_len, uint8_t channel);
-extern void wlan_sl_disable (void);
-extern SlWlanMode_t wlan_get_mode (void);
+extern void wlan_first_start (void);
+extern void wlan_update(void);
+extern void wlan_stop (uint32_t timeout);
+extern void wlan_start (void);
 extern void wlan_get_mac (uint8_t *macAddress);
 extern void wlan_get_ip (uint32_t *ip);
-extern void wlan_set_pm_policy (uint8_t policy);
-extern void wlan_servers_stop (void);
+extern bool wlan_is_connected (void);
 
-#endif /* SIMPLELINKTASK_H_ */
+extern int wlan_gethostbyname(const char *name, mp_uint_t len, uint8_t *out_ip, uint8_t family);
+extern int wlan_socket_socket(mod_network_socket_obj_t *s, int *_errno);
+extern void wlan_socket_close(mod_network_socket_obj_t *s);
+extern int wlan_socket_bind(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno);
+extern int wlan_socket_listen(mod_network_socket_obj_t *s, mp_int_t backlog, int *_errno);
+extern int wlan_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_obj_t *s2, byte *ip, mp_uint_t *port, int *_errno);
+extern int wlan_socket_connect(mod_network_socket_obj_t *s, byte *ip, mp_uint_t port, int *_errno);
+extern int wlan_socket_send(mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, int *_errno);
+extern int wlan_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, int *_errno);
+extern int wlan_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno);
+extern int wlan_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno);
+extern int wlan_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno);
+extern int wlan_socket_settimeout(mod_network_socket_obj_t *s, mp_uint_t timeout_ms, int *_errno);
+extern int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t arg, int *_errno);
+
+#endif /* MODWLAN_H_ */

cc3200/mods/pybadc.c

@@ -0,0 +1,212 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/mpconfig.h"
+#include MICROPY_HAL_H
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+#include "py/gc.h"
+#include "bufhelper.h"
+#include "inc/hw_types.h"
+#include "inc/hw_adc.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_memmap.h"
+#include "rom_map.h"
+#include "interrupt.h"
+#include "pin.h"
+#include "gpio.h"
+#include "prcm.h"
+#include "adc.h"
+#include "pybadc.h"
+#include "pybpin.h"
+#include "pybsleep.h"
+#include "pins.h"
+#include "mpexception.h"
+
+
+/// \moduleref pyb
+/// \class ADC - analog to digital conversion: read analog values on a pin
+///
+/// Usage:
+///
+///     adc = pyb.ADC(channel)                # create an adc object on the given channel (1 to 4)
+///                                             this automatically configures the pin associated to
+///                                             that analog channel.
+///     adc.read()                            # read channel value
+///
+///     The sample rate is fixed to 62.5KHz and the resolution to 12 bits.
+
+
+/******************************************************************************
+ DECLARE CONSTANTS
+ ******************************************************************************/
+#define PYB_ADC_NUM_CHANNELS                4
+
+/******************************************************************************
+ DEFINE TYPES
+ ******************************************************************************/
+typedef struct {
+    mp_obj_base_t base;
+    byte channel;
+    byte idx;
+} pyb_adc_obj_t;
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
+STATIC void pybadc_init (pyb_adc_obj_t *self) {
+    // enable the ADC channel
+    MAP_ADCChannelEnable(ADC_BASE, self->channel);
+    // enable and configure the timer
+    MAP_ADCTimerConfig(ADC_BASE, (1 << 17) - 1);
+    MAP_ADCTimerEnable(ADC_BASE);
+    // enable the ADC peripheral
+    MAP_ADCEnable(ADC_BASE);
+}
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+STATIC pyb_adc_obj_t pyb_adc_obj[PYB_ADC_NUM_CHANNELS];
+
+/******************************************************************************/
+/* Micro Python bindings : adc object                                         */
+
+STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_adc_obj_t *self = self_in;
+    mp_printf(print, "<ADC, channel=%u>", (self->idx + 1));
+}
+
+/// \classmethod \constructor(channel)
+/// Create an ADC object associated with the given channel.
+/// This allows you to then read analog values on that pin.
+STATIC mp_obj_t adc_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    // check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // the first argument is the channel number
+    int32_t idx = mp_obj_get_int(args[0]) - 1;
+    const pin_obj_t *pin;
+    uint channel;
+    switch (idx) {
+    case 0:
+        channel = ADC_CH_0;
+        pin = &pin_GPIO2;
+        break;
+    case 1:
+        channel = ADC_CH_1;
+        pin = &pin_GPIO3;
+        break;
+    case 2:
+        channel = ADC_CH_2;
+        pin = &pin_GPIO4;
+        break;
+    case 3:
+        channel = ADC_CH_3;
+        pin = &pin_GPIO5;
+        break;
+    default:
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
+        break;
+    }
+
+    // disable the callback before re-configuring
+    pyb_adc_obj_t *self = &pyb_adc_obj[idx];
+    self->base.type = &pyb_adc_type;
+    self->channel = channel;
+    self->idx = idx;
+
+    // configure the pin in analog mode
+    pin_config ((pin_obj_t *)pin, PIN_MODE_0, GPIO_DIR_MODE_IN, PYBPIN_ANALOG_TYPE, PIN_STRENGTH_2MA);
+
+    // initialize it
+    pybadc_init (self);
+
+    // register it with the sleep module
+    pybsleep_add ((const mp_obj_t)self, (WakeUpCB_t)pybadc_init);
+
+    return self;
+}
+
+/// \method read()
+/// Read the value on the analog pin and return it.  The returned value
+/// will be between 0 and 4095.
+STATIC mp_obj_t adc_read(mp_obj_t self_in) {
+    pyb_adc_obj_t *self = self_in;
+    uint32_t sample;
+
+    // wait until a new value is available
+    while (!MAP_ADCFIFOLvlGet(ADC_BASE, self->channel));
+    // read the sample
+    sample = MAP_ADCFIFORead(ADC_BASE, self->channel);
+    // the 12 bit sampled value is stored in bits [13:2]
+    return MP_OBJ_NEW_SMALL_INT((sample & 0x3FFF) >> 2);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
+
+/// \method enable()
+/// Enable the adc channel
+STATIC mp_obj_t adc_enable(mp_obj_t self_in) {
+    pyb_adc_obj_t *self = self_in;
+
+    pybadc_init(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_enable_obj, adc_enable);
+
+/// \method disable()
+/// Disable the adc channel
+STATIC mp_obj_t adc_disable(mp_obj_t self_in) {
+    pyb_adc_obj_t *self = self_in;
+
+    MAP_ADCChannelDisable(ADC_BASE, self->channel);
+    // unregister it with the sleep module
+    pybsleep_remove ((const mp_obj_t)self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_disable_obj, adc_disable);
+
+STATIC const mp_map_elem_t adc_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_read),                (mp_obj_t)&adc_read_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_enable),              (mp_obj_t)&adc_enable_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_disable),             (mp_obj_t)&adc_disable_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+
+const mp_obj_type_t pyb_adc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = adc_print,
+    .make_new = adc_make_new,
+    .locals_dict = (mp_obj_t)&adc_locals_dict,
+};
+

cc3200/mods/pybadc.h

@@ -25,7 +25,9 @@
  * THE SOFTWARE.
  */
 
-void stdout_tx_str(const char *str);
-void stdout_tx_strn(const char *str, mp_uint_t len);
-void stdout_tx_strn_cooked(const char *str, mp_uint_t len);
-int stdin_rx_chr(void);
+#ifndef PYBADC_H_
+#define PYBADC_H_
+
+extern const mp_obj_type_t pyb_adc_type;
+
+#endif /* PYBADC_H_ */

cc3200/mods/pybextint.c

@@ -1,357 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2015 Daniel Campora
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-
-#include "mpconfig.h"
-#include MICROPY_HAL_H
-#include "py/nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "py/runtime.h"
-#include "py/gc.h"
-#include "py/pfenv.h"
-#include "py/objlist.h"
-#include "inc/hw_types.h"
-#include "inc/hw_gpio.h"
-#include "inc/hw_ints.h"
-#include "inc/hw_memmap.h"
-#include "rom_map.h"
-#include "pin.h"
-#include "gpio.h"
-#include "pybpin.h"
-#include "pybextint.h"
-#include "mpexception.h"
-#include "interrupt.h"
-#include "mpstate.h"
-#include "cc3200_asm.h"
-
-/// \moduleref pyb
-/// \class ExtInt - configure I/O pins to interrupt on external events
-///
-/// There are a maximum of 25 gpio interrupt lines.
-///
-/// Example callback:
-///
-///     def callback(line):
-///         print(line.pin())
-///
-/// Note: ExtInt will automatically configure the gpio line as an input.
-///
-///     extint = pyb.ExtInt('GPIO10', pyb.ExtInt.IRQ_FALLING, pyb.GPIO.STD_PU, callback)
-///
-/// Now every time a falling edge is seen on the gpio pin, the callback will be
-/// called. Caution: mechanical pushbuttons have "bounce" and pushing or
-/// releasing a switch will often generate multiple edges.
-/// See: http://www.eng.utah.edu/~cs5780/debouncing.pdf for a detailed
-/// explanation, along with various techniques for debouncing.
-///
-/// All pin objects go through the pin mapper to come up with one of the
-/// gpio pins.
-///
-///     extint = pyb.ExtInt(pin, mode, pull, callback)
-///
-/// There is also a C API, so that drivers which require EXTI interrupt lines
-/// can also use this code. See pybextint.h for the available functions.
-
-STATIC void ExecuteIntCallback (extint_obj_t *self);
-STATIC void GPIOA0IntHandler (void);
-STATIC void GPIOA1IntHandler (void);
-STATIC void GPIOA2IntHandler (void);
-STATIC void GPIOA3IntHandler (void);
-STATIC void EXTI_Handler(uint port);
-
-STATIC extint_obj_t* extint_add (uint pin_num, uint port, uint bit) {
-    extint_obj_t *self = m_new_obj(extint_obj_t);
-
-    self->port = port;
-    self->bit = bit;
-    self->callback = NULL;
-    self->pin_num = pin_num;
-    // add it to the list
-    mp_obj_list_append(&MP_STATE_PORT(pyb_extint_list), self);
-
-    return self;
-}
-
-STATIC extint_obj_t* extint_find (uint port, uint8_t bit) {
-    for (mp_uint_t i = 0; i < MP_STATE_PORT(pyb_extint_list).len; i++) {
-        extint_obj_t *self = (extint_obj_t *)MP_STATE_PORT(pyb_extint_list).items[i];
-        if (self->port == port && self->bit == bit) {
-            return self;
-        }
-    }
-    return NULL;
-}
-
-/// \method line()
-/// Return the pin number to which this external interrupt is mapped to.
-STATIC mp_obj_t extint_obj_pin(mp_obj_t self_in) {
-    extint_obj_t *self = self_in;
-    return MP_OBJ_NEW_SMALL_INT(self->pin_num);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_pin_obj, extint_obj_pin);
-
-/// \method enable()
-/// Enable a disabled interrupt.
-STATIC mp_obj_t extint_obj_enable(mp_obj_t self_in) {
-    extint_obj_t *self = self_in;
-    extint_enable(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_enable_obj, extint_obj_enable);
-
-/// \method disable()
-/// Disable the interrupt associated with the ExtInt object.
-/// This could be useful for debouncing.
-STATIC mp_obj_t extint_obj_disable(mp_obj_t self_in) {
-    extint_obj_t *self = self_in;
-    extint_disable(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_disable_obj, extint_obj_disable);
-
-/// \method swint()
-/// Trigger the callback from software.
-STATIC mp_obj_t extint_obj_swint(mp_obj_t self_in) {
-    extint_obj_t *self = self_in;
-    extint_swint(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
-
-/// \classmethod \constructor(pin, mode, pull, callback)
-/// Create an ExtInt object:
-///
-///   - `pin` is the pin on which to enable the interrupt (can be a pin object or any valid pin name).
-///   - `mode` can be one of:
-///     - `ExtInt.IRQ_RISING` - trigger on a rising edge;
-///     - `ExtInt.IRQ_FALLING` - trigger on a falling edge;
-///     - `ExtInt.IRQ_RISING_FALLING` - trigger on a rising or falling edge.
-///   - `pull` can be one of:
-///     - `pyb.Pin.PULL_NONE` - no pull up or down resistors;
-///     - `pyb.Pin.PULL_UP` - enable the pull-up resistor;
-///     - `pyb.Pin.PULL_DOWN` - enable the pull-down resistor.
-///   - `callback` is the function to call when the interrupt triggers.  The
-///   callback function must accept exactly 1 argument, which is the line that
-///   triggered the interrupt.
-STATIC const mp_arg_t pyb_extint_make_new_args[] = {
-    { MP_QSTR_pin,      MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-    { MP_QSTR_mode,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
-    { MP_QSTR_pull,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
-    { MP_QSTR_callback, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-};
-#define PYB_EXTINT_MAKE_NEW_NUM_ARGS MP_ARRAY_SIZE(pyb_extint_make_new_args)
-
-STATIC mp_obj_t extint_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
-    // parse args
-    mp_arg_val_t vals[PYB_EXTINT_MAKE_NEW_NUM_ARGS];
-    mp_arg_parse_all_kw_array(n_args, n_kw, args, PYB_EXTINT_MAKE_NEW_NUM_ARGS, pyb_extint_make_new_args, vals);
-
-    extint_obj_t *self = extint_register(vals[0].u_obj, vals[1].u_int, vals[2].u_int, vals[3].u_obj);
-    self->base.type = type_in;
-
-    return self;
-}
-
-STATIC void extint_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
-    extint_obj_t *self = self_in;
-    print(env, "<ExtInt pin=%u>", self->pin_num);
-}
-
-STATIC const mp_map_elem_t extint_locals_dict_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR_pin),                 (mp_obj_t)&extint_obj_pin_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_enable),              (mp_obj_t)&extint_obj_enable_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_disable),             (mp_obj_t)&extint_obj_disable_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_swint),               (mp_obj_t)&extint_obj_swint_obj },
-
-    // class constants
-    /// \constant IRQ_RISING            - interrupt on a rising edge
-    /// \constant IRQ_FALLING           - interrupt on a falling edge
-    /// \constant IRQ_RISING_FALLING    - interrupt on a rising or falling edge
-    /// \constant IRQ_LOW_LEVEL         - interrupt on a low level
-    /// \constant IRQ_HIGH_LEVEL        - interrupt on a high level
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_FALLING),         MP_OBJ_NEW_SMALL_INT(GPIO_FALLING_EDGE) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_RISING),          MP_OBJ_NEW_SMALL_INT(GPIO_RISING_EDGE) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_RISING_FALLING),  MP_OBJ_NEW_SMALL_INT(GPIO_BOTH_EDGES) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_LOW_LEVEL),       MP_OBJ_NEW_SMALL_INT(GPIO_LOW_LEVEL) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_HIGH_LEVEL),      MP_OBJ_NEW_SMALL_INT(GPIO_HIGH_LEVEL) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
-
-STATIC void ExecuteIntCallback (extint_obj_t *self) {
-    if (self->callback != mp_const_none) {
-        // disable interrupts to avoid nesting
-        uint primsk = disable_irq();
-        // when executing code within a handler we must lock the GC to prevent
-        // any memory allocations.  We must also catch any exceptions.
-        gc_lock();
-        nlr_buf_t nlr;
-        if (nlr_push(&nlr) == 0) {
-            mp_call_function_1(self->callback, self);
-            nlr_pop();
-        } else {
-            // uncaught exception; disable the callback so it doesn't run again
-            self->callback = mp_const_none;
-            extint_disable(self);
-            // printing an exception here will cause a stack overflow that ends up in a
-            // hard fault so, is better to signal the uncaught (probably non-recoverable)
-            // exception by blinkg the BLD
-            // TODO: Blink the BLD
-        }
-        gc_unlock();
-        enable_irq(primsk);
-    }
-}
-
-STATIC void GPIOA0IntHandler (void) {
-    EXTI_Handler(GPIOA0_BASE);
-}
-
-STATIC void GPIOA1IntHandler (void) {
-    EXTI_Handler(GPIOA1_BASE);
-}
-
-STATIC void GPIOA2IntHandler (void) {
-    EXTI_Handler(GPIOA2_BASE);
-}
-
-STATIC void GPIOA3IntHandler (void) {
-    EXTI_Handler(GPIOA3_BASE);
-}
-
-// common interrupt handler
-STATIC void EXTI_Handler(uint port) {
-    extint_obj_t *self;
-    uint32_t bit = MAP_GPIOIntStatus(port, true);
-
-    MAP_GPIOIntClear(port, bit);
-    if (NULL != (self = extint_find(port, bit))) {
-        ExecuteIntCallback(self);
-    }
-}
-
-const mp_obj_type_t extint_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ExtInt,
-    .print = extint_obj_print,
-    .make_new = extint_make_new,
-    .locals_dict = (mp_obj_t)&extint_locals_dict,
-};
-
-void extint_init0(void) {
-    mp_obj_list_init(&MP_STATE_PORT(pyb_extint_list), 0);
-}
-
-extint_obj_t* extint_register(mp_obj_t pin_obj, uint32_t intmode, uint32_t pull, mp_obj_t callback) {
-    const pin_obj_t *pin = NULL;
-    extint_obj_t* self;
-    void *handler;
-    uint32_t intnum;
-
-    pin = pin_find(pin_obj);
-
-    if (intmode != GPIO_FALLING_EDGE &&
-        intmode != GPIO_RISING_EDGE &&
-        intmode != GPIO_BOTH_EDGES &&
-        intmode != GPIO_LOW_LEVEL &&
-        intmode != GPIO_HIGH_LEVEL) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_value_invalid_arguments));
-    }
-    if (pull != PIN_TYPE_STD &&
-        pull != PIN_TYPE_STD_PU &&
-        pull != PIN_TYPE_STD_PD &&
-        pull != PIN_TYPE_OD &&
-        pull != PIN_TYPE_OD_PU &&
-        pull != PIN_TYPE_OD_PD) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_value_invalid_arguments));
-    }
-
-    if (NULL == (self = extint_find(pin->port, pin->bit))) {
-        self = extint_add(pin->pin_num, pin->port, pin->bit);
-    }
-    else {
-        // we need to update the callback atomically, so we disable the line
-        // before we update anything.
-        extint_disable(self);
-    }
-
-    // invalidate the callback
-    self->callback = NULL;
-
-    // before enabling the interrupt, configure the gpio pin
-    pin_config(pin, PIN_MODE_0, GPIO_DIR_MODE_IN, pull, PIN_STRENGTH_4MA);
-
-    MAP_GPIOIntTypeSet(pin->port, pin->bit, intmode);
-    switch (pin->port) {
-    case GPIOA0_BASE:
-        handler = GPIOA0IntHandler;
-        intnum = INT_GPIOA0;
-        break;
-    case GPIOA1_BASE:
-        handler = GPIOA1IntHandler;
-        intnum = INT_GPIOA1;
-        break;
-    case GPIOA2_BASE:
-        handler = GPIOA2IntHandler;
-        intnum = INT_GPIOA2;
-        break;
-    case GPIOA3_BASE:
-    default:
-        handler = GPIOA3IntHandler;
-        intnum = INT_GPIOA3;
-        break;
-    }
-
-    MAP_GPIOIntRegister(pin->port, handler);
-    // set the interrupt to the lowest priority, to make sure that no ther
-    // isr will be preemted by this one
-    MAP_IntPrioritySet(intnum, INT_PRIORITY_LVL_7);
-
-    // set the new callback
-    self->callback = callback;
-    // enable the interrupt just before leaving
-    extint_enable(self);
-
-    return self;
-}
-
-void extint_enable(extint_obj_t *self) {
-    MAP_GPIOIntClear(self->port, self->bit);
-    MAP_GPIOIntEnable(self->port, self->bit);
-}
-
-void extint_disable(extint_obj_t *self) {
-    MAP_GPIOIntDisable(self->port, self->bit);
-}
-
-void extint_swint(extint_obj_t *self) {
-    ExecuteIntCallback(self);
-}

cc3200/mods/pybi2c.c

@@ -0,0 +1,563 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/mpstate.h"
+#include MICROPY_HAL_H
+#include "py/runtime.h"
+#include "bufhelper.h"
+#include "inc/hw_types.h"
+#include "inc/hw_i2c.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_memmap.h"
+#include "rom_map.h"
+#include "pin.h"
+#include "prcm.h"
+#include "i2c.h"
+#include "pybi2c.h"
+#include "mpexception.h"
+#include "pybsleep.h"
+#include "utils.h"
+
+/// \moduleref pyb
+/// \class I2C - a two-wire serial protocol
+///
+/// I2C is a two-wire protocol for communicating between devices.  At the physical
+/// level it consists of 2 wires: SCL and SDA, the clock and data lines respectively.
+///
+/// I2C objects are created attached to a specific bus.  They can be initialised
+/// when created, or initialised later on:
+///
+///     from pyb import I2C
+///
+///     i2c = I2C(1)                               # create
+///     i2c = I2C(1, I2C.MASTER, baudrate=50000)   # create and init with a 50KHz baudrate
+///     i2c.init(I2C.MASTER, baudrate=100000)      # init with a 100KHz baudrate
+///     i2c.deinit()                               # turn off the peripheral
+///
+/// Printing the i2c object gives you information about its configuration.
+///
+/// Basic methods for slave are send and recv:
+///
+///     i2c.send('abc')      # send 3 bytes
+///     i2c.send(0x42)       # send a single byte, given by the number
+///     data = i2c.recv(3)   # receive 3 bytes
+///
+/// To receive inplace, first create a bytearray:
+///
+///     data = bytearray(3)  # create a buffer
+///     i2c.recv(data)       # receive 3 bytes, writing them into data
+///
+/// A master must specify the recipient's address:
+///
+///     i2c.send('123', 0x42)        # send 3 bytes to slave with address 0x42
+///     i2c.send(b'456', addr=0x42)  # keyword for address
+///
+/// Master also has other methods:
+///
+///     i2c.is_ready(0x42)              # check if slave 0x42 is ready
+///     i2c.scan()                      # scan for slaves on the bus, returning
+///                                     #   a list of valid addresses
+///     i2c.mem_read(3, 0x42, 2)        # read 3 bytes from memory of slave 0x42,
+///                                     #   starting at address 2 in the slave
+///     i2c.mem_write('abc', 0x42, 2)   # write 3 bytes to memory of slave 0x42,
+///                                     #   starting at address 2 in the slave
+
+typedef struct _pyb_i2c_obj_t {
+    mp_obj_base_t base;
+    uint baudrate;
+} pyb_i2c_obj_t;
+
+/******************************************************************************
+ DEFINE CONSTANTS
+ ******************************************************************************/
+#define PYBI2C_MASTER                          (0)
+
+#define PYBI2C_MIN_BAUD_RATE_HZ                (50000)
+#define PYBI2C_MAX_BAUD_RATE_HZ                (400000)
+
+#define PYBI2C_TRANSC_TIMEOUT_MS               (10)
+#define PYBI2C_TRANSAC_WAIT_DELAY_US           (10)
+
+#define PYBI2C_TIMEOUT_TO_COUNT(to_us, baud)   (((baud) * to_us) / 16000000)
+
+#define RET_IF_ERR(Func)                        {                           \
+                                                    if (!Func) {            \
+                                                        return  false;      \
+                                                    }                       \
+                                                }
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+STATIC pyb_i2c_obj_t pyb_i2c_obj = {.baudrate = 0};
+
+/******************************************************************************
+ DEFINE PRIVATE FUNCTIONS
+ ******************************************************************************/
+// only master mode is available for the moment
+STATIC void i2c_init (pyb_i2c_obj_t *self) {
+    // Enable the I2C Peripheral
+    MAP_PRCMPeripheralClkEnable(PRCM_I2CA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    MAP_PRCMPeripheralReset(PRCM_I2CA0);
+    // Configure I2C module with the specified baudrate
+    MAP_I2CMasterInitExpClk(I2CA0_BASE, self->baudrate);
+}
+
+STATIC bool pyb_i2c_transaction(uint cmd) {
+    // Convert the timeout to microseconds
+    int32_t timeout = PYBI2C_TRANSC_TIMEOUT_MS * 1000;
+    // Sanity check, t_timeout must be between 1 and 255
+    uint t_timeout = MIN(PYBI2C_TIMEOUT_TO_COUNT(timeout, pyb_i2c_obj.baudrate), 255);
+    // Clear all interrupts
+    MAP_I2CMasterIntClearEx(I2CA0_BASE, MAP_I2CMasterIntStatusEx(I2CA0_BASE, false));
+    // Set the time-out in terms of clock cycles. Not to be used with breakpoints.
+    MAP_I2CMasterTimeoutSet(I2CA0_BASE, t_timeout);
+    // Initiate the transfer.
+    MAP_I2CMasterControl(I2CA0_BASE, cmd);
+    // Wait until the current byte has been transferred.
+    // Poll on the raw interrupt status.
+    while ((MAP_I2CMasterIntStatusEx(I2CA0_BASE, false) & (I2C_MASTER_INT_DATA | I2C_MASTER_INT_TIMEOUT)) == 0) {
+        // wait for a few microseconds
+        UtilsDelay(UTILS_DELAY_US_TO_COUNT(PYBI2C_TRANSAC_WAIT_DELAY_US));
+        timeout -= PYBI2C_TRANSAC_WAIT_DELAY_US;
+        if (timeout < 0) {
+            // the peripheral is not responding, so stop
+            return false;
+        }
+    }
+
+    // Check for any errors in the transfer
+    if (MAP_I2CMasterErr(I2CA0_BASE) != I2C_MASTER_ERR_NONE) {
+        switch(cmd) {
+        case I2C_MASTER_CMD_BURST_SEND_START:
+        case I2C_MASTER_CMD_BURST_SEND_CONT:
+        case I2C_MASTER_CMD_BURST_SEND_STOP:
+            MAP_I2CMasterControl(I2CA0_BASE, I2C_MASTER_CMD_BURST_SEND_ERROR_STOP);
+            break;
+        case I2C_MASTER_CMD_BURST_RECEIVE_START:
+        case I2C_MASTER_CMD_BURST_RECEIVE_CONT:
+        case I2C_MASTER_CMD_BURST_RECEIVE_FINISH:
+            MAP_I2CMasterControl(I2CA0_BASE, I2C_MASTER_CMD_BURST_RECEIVE_ERROR_STOP);
+            break;
+        default:
+            break;
+        }
+        return false;
+    }
+    return true;
+}
+
+STATIC bool pyb_i2c_write(byte devAddr, byte *data, uint len, bool stop) {
+    // Set I2C codec slave address
+    MAP_I2CMasterSlaveAddrSet(I2CA0_BASE, devAddr, false);
+    // Write the first byte to the controller.
+    MAP_I2CMasterDataPut(I2CA0_BASE, *data++);
+    // Initiate the transfer.
+    RET_IF_ERR(pyb_i2c_transaction(I2C_MASTER_CMD_BURST_SEND_START));
+
+    // Loop until the completion of transfer or error
+    while (--len) {
+        // Write the next byte of data
+        MAP_I2CMasterDataPut(I2CA0_BASE, *data++);
+        // Transact over I2C to send the byte
+        RET_IF_ERR(pyb_i2c_transaction(I2C_MASTER_CMD_BURST_SEND_CONT));
+    }
+
+    // If a stop bit is to be sent, send it.
+    if (stop) {
+        RET_IF_ERR(pyb_i2c_transaction(I2C_MASTER_CMD_BURST_SEND_STOP));
+    }
+
+    return true;
+}
+
+STATIC bool pyb_i2c_read(byte devAddr, byte *data, uint len) {
+    uint cmd;
+
+    // Set I2C codec slave address
+    MAP_I2CMasterSlaveAddrSet(I2CA0_BASE, devAddr, true);
+
+    // Check if its a single receive or burst receive
+    if (len > 1) {
+        // Initiate a burst receive sequence
+        cmd = I2C_MASTER_CMD_BURST_RECEIVE_START;
+    }
+    else {
+        // Configure for a single receive
+        cmd = I2C_MASTER_CMD_SINGLE_RECEIVE;
+    }
+
+    // Initiate the transfer.
+    RET_IF_ERR(pyb_i2c_transaction(cmd));
+    // Decrement the count
+    len--;
+    // Loop until the completion of reception or error
+    while (len) {
+        // Receive the byte over I2C
+        *data++ = MAP_I2CMasterDataGet(I2CA0_BASE);
+        if (--len) {
+            // Continue with reception
+            RET_IF_ERR(pyb_i2c_transaction(I2C_MASTER_CMD_BURST_RECEIVE_CONT));
+        }
+        else {
+            // Complete the last reception
+            RET_IF_ERR(pyb_i2c_transaction(I2C_MASTER_CMD_BURST_RECEIVE_FINISH));
+        }
+    }
+
+    // Receive the last byte over I2C
+    *data = MAP_I2CMasterDataGet(I2CA0_BASE);
+
+    return true;
+}
+
+STATIC bool pyb_i2c_scan_device(byte devAddr) {
+    // Set I2C codec slave address
+    MAP_I2CMasterSlaveAddrSet(I2CA0_BASE, devAddr, true);
+    // Initiate the transfer.
+    RET_IF_ERR(pyb_i2c_transaction(I2C_MASTER_CMD_SINGLE_RECEIVE));
+    // Since this is a hack, send the stop bit anyway
+    MAP_I2CMasterControl(I2CA0_BASE, I2C_MASTER_CMD_BURST_SEND_ERROR_STOP);
+
+    return true;
+}
+
+/******************************************************************************/
+/* Micro Python bindings                                                      */
+/******************************************************************************/
+STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_i2c_obj_t *self = self_in;
+    if (self->baudrate > 0) {
+        mp_printf(print, "<I2C1, I2C.MASTER, baudrate=%u>)", self->baudrate);
+    }
+    else {
+        mp_print_str(print, "<I2C1>");
+    }
+}
+
+/// \method init(mode, *, baudrate=100000)
+///
+/// Initialise the I2C bus with the given parameters:
+///
+///   - `mode` must be either `I2C.MASTER` or `I2C.SLAVE`
+///   - `baudrate` is the SCL clock rate (only sensible for a master)
+STATIC const mp_arg_t pyb_i2c_init_args[] = {
+    { MP_QSTR_mode,     MP_ARG_REQUIRED  | MP_ARG_INT, },
+    { MP_QSTR_baudrate, MP_ARG_KW_ONLY   | MP_ARG_INT, {.u_int = 100000} },
+};
+#define PYB_I2C_INIT_NUM_ARGS   MP_ARRAY_SIZE(pyb_i2c_init_args)
+
+STATIC mp_obj_t pyb_i2c_init_helper(pyb_i2c_obj_t *self, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // parse args
+    mp_arg_val_t vals[PYB_I2C_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args, args, kw_args, PYB_I2C_INIT_NUM_ARGS, pyb_i2c_init_args, vals);
+
+    // verify that mode is master
+    if (vals[0].u_int != PYBI2C_MASTER) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
+    }
+
+    // make sure the baudrate is between the valid range
+    self->baudrate = MIN(MAX(vals[1].u_int, PYBI2C_MIN_BAUD_RATE_HZ), PYBI2C_MAX_BAUD_RATE_HZ);
+
+    // init the I2C bus
+    i2c_init(self);
+
+    // register it with the sleep module
+    pybsleep_add ((const mp_obj_t)self, (WakeUpCB_t)i2c_init);
+
+    return mp_const_none;
+}
+
+/// \classmethod \constructor(bus, ...)
+///
+/// Construct an I2C object on the given bus.  `bus` can only be 1.
+/// With no additional parameters, the I2C object is created but not
+/// initialised (it has the settings from the last initialisation of
+/// the bus, if any).  If extra arguments are given, the bus is initialised.
+/// See `init` for parameters of initialisation.
+STATIC mp_obj_t pyb_i2c_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // setup the object
+    pyb_i2c_obj_t *self = &pyb_i2c_obj;
+    self->base.type = &pyb_i2c_type;
+
+    if (n_args > 1 || n_kw > 0) {
+        // start the peripheral
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        pyb_i2c_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
+
+    return (mp_obj_t)self;
+}
+
+STATIC mp_obj_t pyb_i2c_init(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return pyb_i2c_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_init_obj, 1, pyb_i2c_init);
+
+/// \method deinit()
+/// Turn off the I2C bus.
+STATIC mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
+    // disable the peripheral
+    MAP_I2CMasterDisable(I2CA0_BASE);
+    MAP_PRCMPeripheralClkDisable(PRCM_I2CA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    // invalidate the baudrate
+    pyb_i2c_obj.baudrate = 0;
+    // unregister it with the sleep module
+    pybsleep_remove ((const mp_obj_t)self_in);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_deinit_obj, pyb_i2c_deinit);
+
+/// \method is_ready(addr)
+/// Check if an I2C device responds to the given address.  Only valid when in master mode.
+STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) {
+    mp_uint_t i2c_addr = mp_obj_get_int(i2c_addr_o);
+    for (int i = 0; i < 7; i++) {
+        if (pyb_i2c_scan_device(i2c_addr)) {
+            return mp_const_true;
+        }
+    }
+    return mp_const_false;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_i2c_is_ready_obj, pyb_i2c_is_ready);
+
+/// \method scan()
+/// Scan all I2C addresses from 0x01 to 0x7f and return a list of those that respond.
+/// Only valid when in master mode.
+STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
+    mp_obj_t list = mp_obj_new_list(0, NULL);
+    for (uint addr = 1; addr <= 127; addr++) {
+        for (int i = 0; i < 7; i++) {
+            if (pyb_i2c_scan_device(addr)) {
+                mp_obj_list_append(list, mp_obj_new_int(addr));
+                break;
+            }
+        }
+    }
+
+    return list;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
+
+/// \method send(send, addr=0x00)
+/// Send data on the bus:
+///
+///   - `send` is the data to send (an integer to send, or a buffer object)
+///   - `addr` is the address to send to (only required in master mode)
+/// Return value: `None`.
+STATIC const mp_arg_t pyb_i2c_send_args[] = {
+    { MP_QSTR_send,    MP_ARG_REQUIRED | MP_ARG_OBJ, },
+    { MP_QSTR_addr,                      MP_ARG_INT, {.u_int = 0} },
+};
+#define PYB_I2C_SEND_NUM_ARGS MP_ARRAY_SIZE(pyb_i2c_send_args)
+
+STATIC mp_obj_t pyb_i2c_send(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // parse args
+    mp_arg_val_t vals[PYB_I2C_SEND_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_SEND_NUM_ARGS, pyb_i2c_send_args, vals);
+
+    // get the buffer to send from
+    mp_buffer_info_t bufinfo;
+    uint8_t data[1];
+    pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data);
+
+    // send the data
+    if (!pyb_i2c_write(vals[1].u_int, bufinfo.buf, bufinfo.len, true)) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_send_obj, 1, pyb_i2c_send);
+
+/// \method recv(recv, addr=0x00)
+///
+/// Receive data on the bus:
+///
+///   - `recv` can be an integer, which is the number of bytes to receive,
+///     or a mutable buffer, which will be filled with received bytes
+///   - `addr` is the address to receive from (only required in master mode)
+///
+/// Return value: if `recv` is an integer then a new buffer of the bytes received,
+/// otherwise the same buffer that was passed in to `recv`.
+STATIC const mp_arg_t pyb_i2c_recv_args[] = {
+    { MP_QSTR_recv,    MP_ARG_REQUIRED | MP_ARG_OBJ, },
+    { MP_QSTR_addr,                      MP_ARG_INT, {.u_int = 0} },
+};
+#define PYB_I2C_RECV_NUM_ARGS MP_ARRAY_SIZE(pyb_i2c_recv_args)
+
+STATIC mp_obj_t pyb_i2c_recv(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // parse args
+    mp_arg_val_t vals[PYB_I2C_RECV_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_RECV_NUM_ARGS, pyb_i2c_recv_args, vals);
+
+    // get the buffer to receive into
+    vstr_t vstr;
+    mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &vstr);
+
+    // receive the data
+    if (!pyb_i2c_read(vals[1].u_int, (byte *)vstr.buf, vstr.len)) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+    }
+
+    // return the received data
+    if (o_ret != MP_OBJ_NULL) {
+        return o_ret;
+    }
+    else {
+        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
+
+/// \method mem_read(data, addr, memaddr, addr_size=8)
+///
+/// Read from the memory of an I2C device:
+///
+///   - `data` can be an integer or a buffer to read into
+///   - `addr` is the I2C device address
+///   - `memaddr` is the memory location within the I2C device
+///   - `addr_size` selects the width of memaddr: 8 or 16 bits
+///
+/// Returns the read data.
+/// This is only valid in master mode.
+STATIC const mp_arg_t pyb_i2c_mem_read_args[] = {
+    { MP_QSTR_data,      MP_ARG_REQUIRED  | MP_ARG_OBJ, },
+    { MP_QSTR_addr,      MP_ARG_REQUIRED  | MP_ARG_INT, {.u_int = 0} },
+    { MP_QSTR_memaddr,   MP_ARG_REQUIRED  | MP_ARG_INT, {.u_int = 0} },
+    { MP_QSTR_addr_size, MP_ARG_KW_ONLY   | MP_ARG_INT, {.u_int = 8} },
+};
+#define PYB_I2C_MEM_READ_NUM_ARGS MP_ARRAY_SIZE(pyb_i2c_mem_read_args)
+
+STATIC mp_obj_t pyb_i2c_mem_read(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // parse args
+    mp_arg_val_t vals[PYB_I2C_MEM_READ_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_MEM_READ_NUM_ARGS, pyb_i2c_mem_read_args, vals);
+
+    // get the buffer to read into
+    vstr_t vstr;
+    mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &vstr);
+
+    // get the addresses
+    mp_uint_t i2c_addr = vals[1].u_int;
+    mp_uint_t mem_addr = vals[2].u_int;
+    // determine the width of mem_addr (1 or 2 bytes)
+    mp_uint_t mem_addr_size = vals[3].u_int >> 3;
+
+    // Write the register address to be read from.
+    if (pyb_i2c_write (i2c_addr, (byte *)&mem_addr, mem_addr_size, false)) {
+        // Read the specified length of data
+        if (pyb_i2c_read (i2c_addr, (byte *)vstr.buf, vstr.len)) {
+            // return the read data
+            if (o_ret != MP_OBJ_NULL) {
+                return o_ret;
+            } else {
+                return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+            }
+        }
+    }
+
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
+
+/// \method mem_write(data, addr, memaddr, addr_size=8)
+///
+/// Write to the memory of an I2C device:
+///
+///   - `data` can be an integer or a buffer to write from
+///   - `addr` is the I2C device address
+///   - `memaddr` is the memory location within the I2C device
+///   - `addr_size` selects the width of memaddr: 8 or 16 bits
+///
+/// Returns `None`.
+/// This is only valid in master mode.
+STATIC mp_obj_t pyb_i2c_mem_write(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // parse args (same as mem_read)
+    mp_arg_val_t vals[PYB_I2C_MEM_READ_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_I2C_MEM_READ_NUM_ARGS, pyb_i2c_mem_read_args, vals);
+
+    // get the buffer to write from
+    mp_buffer_info_t bufinfo;
+    uint8_t data[1];
+    pyb_buf_get_for_send(vals[0].u_obj, &bufinfo, data);
+
+    // get the addresses
+    mp_uint_t i2c_addr = vals[1].u_int;
+    mp_uint_t mem_addr = vals[2].u_int;
+    // determine the width of mem_addr (1 or 2 bytes)
+    mp_uint_t mem_addr_size = vals[3].u_int >> 3;
+
+    // Write the register address to write to.
+    if (pyb_i2c_write (i2c_addr, (byte *)&mem_addr, mem_addr_size, false)) {
+        // Write the specified length of data
+        if (pyb_i2c_write (i2c_addr, bufinfo.buf, bufinfo.len, true)) {
+            return mp_const_none;
+        }
+    }
+
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_write_obj, 1, pyb_i2c_mem_write);
+
+STATIC const mp_map_elem_t pyb_i2c_locals_dict_table[] = {
+    // instance methods
+    { MP_OBJ_NEW_QSTR(MP_QSTR_init),            (mp_obj_t)&pyb_i2c_init_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_deinit),          (mp_obj_t)&pyb_i2c_deinit_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_ready),        (mp_obj_t)&pyb_i2c_is_ready_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_scan),            (mp_obj_t)&pyb_i2c_scan_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_send),            (mp_obj_t)&pyb_i2c_send_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_recv),            (mp_obj_t)&pyb_i2c_recv_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_mem_read),        (mp_obj_t)&pyb_i2c_mem_read_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_mem_write),       (mp_obj_t)&pyb_i2c_mem_write_obj },
+
+    // class constants
+    /// \constant MASTER - for initialising the bus to master mode
+    { MP_OBJ_NEW_QSTR(MP_QSTR_MASTER),          MP_OBJ_NEW_SMALL_INT(PYBI2C_MASTER) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
+
+const mp_obj_type_t pyb_i2c_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2C,
+    .print = pyb_i2c_print,
+    .make_new = pyb_i2c_make_new,
+    .locals_dict = (mp_obj_t)&pyb_i2c_locals_dict,
+};

cc3200/mods/pybi2c.h

@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2015 Daniel Campora
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,9 +25,9 @@
  * THE SOFTWARE.
  */
 
-extern struct _pyb_uart_obj_t *pyb_stdio_uart;
+#ifndef PYBI2C_H_
+#define PYBI2C_H_
 
-void stdout_tx_str(const char *str);
-void stdout_tx_strn(const char *str, mp_uint_t len);
-void stdout_tx_strn_cooked(const char *str, mp_uint_t len);
-int stdin_rx_chr(void);
+extern const mp_obj_type_t pyb_i2c_type;
+
+#endif  // PYBI2C_H_

cc3200/mods/pybpin.c

@@ -29,14 +29,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mpstate.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
@@ -45,8 +43,13 @@
 #include "pin.h"
 #include "prcm.h"
 #include "gpio.h"
+#include "interrupt.h"
 #include "pybpin.h"
+#include "pins.h"
+#include "pybsleep.h"
+#include "mpcallback.h"
 #include "mpexception.h"
+#include "mperror.h"
 
 
 /// \moduleref pyb
@@ -58,39 +61,96 @@
 ///
 /// Usage Model:
 ///
-/// All CPU Pins are predefined as pyb.Pin.cpu.Name
+///     g = pyb.Pin('GPIO9', af=0, mode=pyb.Pin.IN, type=pyb.Pin.STD, strength=pyb.Pin.S2MA)
 ///
-///     GPIO9_pin = pyb.Pin.cpu.GPIO9
+/// \Interrupts:
+//// You can also configure the Pin to generate interrupts
 ///
-///     g = pyb.Pin(pyb.Pin.cpu.GPIO9, 0, pyb.Pin.IN)
+/// Example callback:
 ///
-/// CPU pins which correspond to the board pins are available
-/// as `pyb.cpu.Name`.
+///     def pincb(pin):
+///         print(pin.get_config().name)
 ///
-/// You can also use strings:
+///     extint = pyb.Pin('GPIO10', 0, pyb.Pin.INT_RISING, pyb.GPIO.STD_PD, pyb.S2MA)
+///     extint.callback (mode=pyb.Pin.INT_RISING, handler=pincb)
+///     # the callback can be triggered manually
+///     extint.callback()()
+///     # to disable the callback
+///     extint.callback().disable()
 ///
-///     g = pyb.Pin('GPIO9', 0)
+/// Now every time a falling edge is seen on the gpio pin, the callback will be
+/// called. Caution: mechanical pushbuttons have "bounce" and pushing or
+/// releasing a switch will often generate multiple edges.
+/// See: http://www.eng.utah.edu/~cs5780/debouncing.pdf for a detailed
+/// explanation, along with various techniques for debouncing.
 ///
-/// To summarise, the following order determines how things get mapped into
-/// an ordinal pin number:
+/// All pin objects go through the pin mapper to come up with one of the
+/// gpio pins.
 ///
-/// 1. Directly specify a Pin object
-/// 2. Supply a string which matches a CPU port/pin
+/// There is also a C API, so that drivers which require Pin interrupts
+/// can also use this code. See pybextint.h for the available functions.
+/******************************************************************************
+DECLARE PRIVATE FUNCTIONS
+******************************************************************************/
+STATIC void GPIOA0IntHandler (void);
+STATIC void GPIOA1IntHandler (void);
+STATIC void GPIOA2IntHandler (void);
+STATIC void GPIOA3IntHandler (void);
+STATIC void EXTI_Handler(uint port);
+STATIC void pin_obj_configure (const pin_obj_t *self);
+STATIC void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *wake_pin, uint *idx);
+STATIC void pin_extint_enable (mp_obj_t self_in);
+STATIC void pin_extint_disable (mp_obj_t self_in);
 
+/******************************************************************************
+DEFINE CONSTANTS
+******************************************************************************/
+#define PYBPIN_NUM_WAKE_PINS            (6)
+#define PYBPIN_WAKES_NOT                (-1)
+
+/******************************************************************************
+DEFINE TYPES
+******************************************************************************/
+typedef struct {
+    bool       active;
+    int8_t     lpds;
+    int8_t     hib;
+} pybpin_wake_pin_t;
+
+/******************************************************************************
+DECLARE PRIVATE DATA
+******************************************************************************/
+STATIC const mp_cb_methods_t pin_cb_methods;
+STATIC pybpin_wake_pin_t pybpin_wake_pin[PYBPIN_NUM_WAKE_PINS] =
+                                    { {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
+                                      {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
+                                      {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
+                                      {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
+                                      {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT},
+                                      {.active = false, .lpds = PYBPIN_WAKES_NOT, .hib = PYBPIN_WAKES_NOT} } ;
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
 void pin_init0(void) {
+    // assign GPIO10 and GPIO11 to the GPIO peripheral (the default is I2C), so that the I2C bus can
+    // be assigned safely to any other pins (as recomended by the SDK release notes). Make them
+    // inputs with pull-downs enabled to ensure they are not floating during LDPS and hibernate.
+    pin_config ((pin_obj_t *)&pin_GPIO10, PIN_MODE_0, GPIO_DIR_MODE_IN, PIN_TYPE_STD_PD, PIN_STRENGTH_2MA);
+    pin_config ((pin_obj_t *)&pin_GPIO11, PIN_MODE_0, GPIO_DIR_MODE_IN, PIN_TYPE_STD_PD, PIN_STRENGTH_2MA);
 }
 
 // C API used to convert a user-supplied pin name into an ordinal pin number.
-const pin_obj_t *pin_find(mp_obj_t user_obj) {
-    const pin_obj_t *pin_obj;
+pin_obj_t *pin_find(mp_obj_t user_obj) {
+    pin_obj_t *pin_obj;
 
-    // If a pin was provided, then use it
+    // if a pin was provided, use it
     if (MP_OBJ_IS_TYPE(user_obj, &pin_type)) {
         pin_obj = user_obj;
         return pin_obj;
     }
 
-    // See if the pin name matches a cpu pin
+    // otherwise see if the pin name matches a cpu pin
     pin_obj = pin_find_named_pin(&pin_cpu_pins_locals_dict, user_obj);
     if (pin_obj) {
         return pin_obj;
@@ -99,56 +159,266 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
     nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
 }
 
-void pin_config(const pin_obj_t *self, uint af, uint mode, uint type, uint strength) {
-    // PIN_MODE_0 means it stays as a Pin, else, another peripheral will take control of it
-    if (af == PIN_MODE_0) {
-        // enable the peripheral clock for the GPIO port of this pin
-        switch (self->port) {
-        case PORT_A0:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        case PORT_A1:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA1, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        case PORT_A2:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA2, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        case PORT_A3:
-            MAP_PRCMPeripheralClkEnable(PRCM_GPIOA3, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
-            break;
-        default:
-            break;
+void pin_verify_af (uint af) {
+    if (af > PIN_MODE_15) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
+    }
+}
+
+void pin_config (pin_obj_t *self, uint af, uint mode, uint type, uint strength) {
+    // configure the pin in analog mode
+    self->af = af, self->mode = mode, self->type = type, self->strength = strength;
+    pin_obj_configure ((const pin_obj_t *)self);
+    // mark the pin as used
+    self->isused = true;
+    // register it with the sleep module
+    pybsleep_add ((const mp_obj_t)self, (WakeUpCB_t)pin_obj_configure);
+}
+
+void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t priority) {
+    void *handler;
+    uint32_t intnum;
+
+    // configure the interrupt type
+    MAP_GPIOIntTypeSet(self->port, self->bit, intmode);
+    switch (self->port) {
+    case GPIOA0_BASE:
+        handler = GPIOA0IntHandler;
+        intnum = INT_GPIOA0;
+        break;
+    case GPIOA1_BASE:
+        handler = GPIOA1IntHandler;
+        intnum = INT_GPIOA1;
+        break;
+    case GPIOA2_BASE:
+        handler = GPIOA2IntHandler;
+        intnum = INT_GPIOA2;
+        break;
+    case GPIOA3_BASE:
+    default:
+        handler = GPIOA3IntHandler;
+        intnum = INT_GPIOA3;
+        break;
+    }
+    MAP_GPIOIntRegister(self->port, handler);
+    // set the interrupt to the lowest priority, to make sure that
+    // no other ISRs will be preemted by this one
+    MAP_IntPrioritySet(intnum, priority);
+}
+
+/******************************************************************************
+DEFINE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC void pin_obj_configure (const pin_obj_t *self) {
+    // Skip all this if the pin is to be used in analog mode
+    if (self->type != PYBPIN_ANALOG_TYPE) {
+        // verify the alternate function
+        pin_verify_af (self->af);
+        // PIN_MODE_0 means it stays as a pin, else, another peripheral will take control of it
+        if (self->af == PIN_MODE_0) {
+            // enable the peripheral clock for the GPIO port of this pin
+            switch (self->port) {
+            case PORT_A0:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA0, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            case PORT_A1:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA1, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            case PORT_A2:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA2, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            case PORT_A3:
+                MAP_PRCMPeripheralClkEnable(PRCM_GPIOA3, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+                break;
+            default:
+                break;
+            }
+            // configure the direction
+            MAP_GPIODirModeSet(self->port, self->bit, self->mode);
         }
-        // configure the direction
-        MAP_GPIODirModeSet(self->port, self->bit, mode);
+        // now set the alternate function, strenght and type
+        MAP_PinModeSet (self->pin_num, self->af);
+    }
+    MAP_PinConfigSet(self->pin_num, self->strength, self->type);
+}
+
+STATIC void pin_get_hibernate_pin_and_idx (const pin_obj_t *self, uint *hib_pin, uint *idx) {
+    // pin_num is actually : (package_pin - 1)
+    switch (self->pin_num) {
+    case 56:    // GPIO2
+        *hib_pin = PRCM_HIB_GPIO2;
+        *idx = 0;
+        break;
+    case 58:    // GPIO4
+        *hib_pin = PRCM_HIB_GPIO4;
+        *idx = 1;
+        break;
+    case 3:     // GPIO13
+        *hib_pin = PRCM_HIB_GPIO13;
+        *idx = 2;
+        break;
+    case 7:     // GPIO17
+        *hib_pin = PRCM_HIB_GPIO17;
+        *idx = 3;
+        break;
+    case 1:     // GPIO11
+        *hib_pin = PRCM_HIB_GPIO11;
+        *idx = 4;
+        break;
+    case 16:    // GPIO24
+        *hib_pin = PRCM_HIB_GPIO24;
+        *idx = 5;
+        break;
+    default:
+        *idx = 0xFF;
+        break;
+    }
+}
+
+STATIC void pin_extint_enable (mp_obj_t self_in) {
+    const pin_obj_t *self = self_in;
+    uint hib_pin, idx;
+
+    pin_get_hibernate_pin_and_idx (self, &hib_pin, &idx);
+    if (idx < PYBPIN_NUM_WAKE_PINS) {
+        if (pybpin_wake_pin[idx].lpds != PYBPIN_WAKES_NOT) {
+            // enable GPIO as a wake source during LPDS
+            MAP_PRCMLPDSWakeUpGPIOSelect(idx, pybpin_wake_pin[idx].lpds);
+            MAP_PRCMLPDSWakeupSourceEnable(PRCM_LPDS_GPIO);
+        }
+
+        if (pybpin_wake_pin[idx].hib != PYBPIN_WAKES_NOT) {
+            // enable GPIO as a wake source during hibernate
+            MAP_PRCMHibernateWakeUpGPIOSelect(hib_pin, pybpin_wake_pin[idx].hib);
+            MAP_PRCMHibernateWakeupSourceEnable(hib_pin);
+        }
+        else {
+            MAP_PRCMHibernateWakeupSourceDisable(hib_pin);
+        }
+    }
+    // if idx is invalid, the pin supports active interrupts for sure
+    if (idx >= PYBPIN_NUM_WAKE_PINS || pybpin_wake_pin[idx].active) {
+        MAP_GPIOIntClear(self->port, self->bit);
+        MAP_GPIOIntEnable(self->port, self->bit);
+    }
+    // in case it was enabled before
+    else if (idx < PYBPIN_NUM_WAKE_PINS && !pybpin_wake_pin[idx].active) {
+        MAP_GPIOIntDisable(self->port, self->bit);
+    }
+}
+
+STATIC void pin_extint_disable (mp_obj_t self_in) {
+    const pin_obj_t *self = self_in;
+    uint hib_pin, idx;
+
+    pin_get_hibernate_pin_and_idx (self, &hib_pin, &idx);
+    if (idx < PYBPIN_NUM_WAKE_PINS) {
+        if (pybpin_wake_pin[idx].lpds != PYBPIN_WAKES_NOT) {
+            // disable GPIO as a wake source during LPDS
+            MAP_PRCMLPDSWakeupSourceDisable(PRCM_LPDS_GPIO);
+        }
+        if (pybpin_wake_pin[idx].hib != PYBPIN_WAKES_NOT) {
+            // disable GPIO as a wake source during hibernate
+            MAP_PRCMHibernateWakeupSourceDisable(hib_pin);
+        }
+    }
+    // not need to check for the active flag, it's safe to disable it anyway
+    MAP_GPIOIntDisable(self->port, self->bit);
+}
+
+/******************************************************************************/
+// Micro Python bindings
+
+/// \method init(mode, pull=Pin.PULL_NONE, af=-1)
+/// Initialise the pin:
+///
+///   - `af` can be in range 0-15, please check the CC3200 datasheet
+///          for the details on the AFs availables on each pin (af=0 keeps it as a gpio pin).
+///   - `mode` can be one of:
+///     - `Pin.IN`     - configure the pin for input;
+///     - `Pin.OUT`    - configure the pin for output;
+///   - `type` can be one of:
+///     - `Pin.STD`    - standard without pull-up or pull-down;
+///     - `Pin.STD_PU` - standard with pull-up resistor;
+///     - `Pin.STD_PD` - standard with pull-down resistor.
+///     - `Pin.OD`     - standard without pull up or pull down;
+///     - `Pin.OD_PU`  - open drain with pull-up resistor;
+///     - `Pin.OD_PD`  - open drain with pull-down resistor.
+///   - `strength` can be one of:
+///     - `Pin.S2MA`    - 2ma drive strength;
+///     - `Pin.S4MA`    - 4ma drive strength;
+///     - `Pin.S6MA`    - 6ma drive strength;
+///
+/// Returns: `None`.
+STATIC const mp_arg_t pin_init_args[] = {
+    { MP_QSTR_af,       MP_ARG_REQUIRED | MP_ARG_INT  },
+    { MP_QSTR_mode,                       MP_ARG_INT, {.u_int = GPIO_DIR_MODE_OUT} },
+    { MP_QSTR_type,                       MP_ARG_INT, {.u_int = PIN_TYPE_STD} },
+    { MP_QSTR_strength,                   MP_ARG_INT, {.u_int = PIN_STRENGTH_4MA} },
+};
+#define pin_INIT_NUM_ARGS MP_ARRAY_SIZE(pin_init_args)
+
+STATIC mp_obj_t pin_obj_init_helper(pin_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // parse args
+    mp_arg_val_t args[pin_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args, pos_args, kw_args, pin_INIT_NUM_ARGS, pin_init_args, args);
+
+    // get the af
+    uint af = args[0].u_int;
+    if (af < PIN_MODE_0 || af > PIN_MODE_15) {
+        goto invalid_args;
+    }
+    // get the io mode
+    uint mode = args[1].u_int;
+    // checking the mode only makes sense if af == GPIO
+    if (af == PIN_MODE_0) {
+        if (mode != GPIO_DIR_MODE_IN && mode != GPIO_DIR_MODE_OUT) {
+            goto invalid_args;
+        }
+    }
+    // get the type
+    uint type = args[2].u_int;
+    if (type != PIN_TYPE_STD && type != PIN_TYPE_STD_PU && type != PIN_TYPE_STD_PD &&
+            type != PIN_TYPE_OD && type != PIN_TYPE_OD_PU && type != PIN_TYPE_OD_PD) {
+        goto invalid_args;
+    }
+    // get the strenght
+    uint strength = args[3].u_int;
+    if (strength != PIN_STRENGTH_2MA && strength != PIN_STRENGTH_4MA && strength != PIN_STRENGTH_6MA) {
+        goto invalid_args;
     }
 
-    // now set the alternate function, strenght and type
-    MAP_PinModeSet (self->pin_num, af);
-    MAP_PinConfigSet(self->pin_num, strength, type);
+    // configure the pin as requested
+    pin_config (self, af, mode, type, strength);
+
+    return mp_const_none;
+
+invalid_args:
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
 }
 
 /// \method print()
 /// Return a string describing the pin object.
-STATIC void pin_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pin_obj_t *self = self_in;
-    uint32_t af = MAP_PinModeGet(self->pin_num);
-    uint32_t type = pin_get_type(self);
-    uint32_t strength = pin_get_strenght(self);
+    uint32_t af = self->af;
+    uint32_t type = self->type;
+    uint32_t strength = self->strength;
 
     // pin name
-    print(env, "Pin(Pin.cpu.%s, af=%u", qstr_str(self->name), af);
+    mp_printf(print, "<Pin.cpu.%q, af=%u", self->name, af);
 
+    // pin mode
     if (af == PIN_MODE_0) {
         // IO mode
         qstr mode_qst;
-        uint32_t mode = pin_get_mode(self);
+        uint32_t mode = self->mode;
         if (mode == GPIO_DIR_MODE_IN) {
             mode_qst = MP_QSTR_IN;
         } else {
             mode_qst = MP_QSTR_OUT;
         }
-        print(env, ", mode=Pin.%s", qstr_str(mode_qst)); // safe because mode_qst has no formatting chars
+        mp_printf(print, ", mode=Pin.%q", mode_qst);
     }
 
     // pin type
@@ -166,9 +436,9 @@ STATIC void pin_print(void (*print)(void *env, const char *fmt, ...), void *env,
     } else {
         type_qst = MP_QSTR_OD_PD;
     }
-    print(env, ", pull=Pin.%s", qstr_str(type_qst));
+    mp_printf(print, ", type=Pin.%q", type_qst);
 
-    // Strength
+    // pin strength
     qstr str_qst;
     if (strength == PIN_STRENGTH_2MA) {
         str_qst = MP_QSTR_S2MA;
@@ -177,11 +447,9 @@ STATIC void pin_print(void (*print)(void *env, const char *fmt, ...), void *env,
     } else {
         str_qst = MP_QSTR_S6MA;
     }
-    print(env, ", strength=Pin.%s)", qstr_str(str_qst));
+    mp_printf(print, ", strength=Pin.%q>", str_qst);
 }
 
-STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
-
 /// \classmethod \constructor(id, ...)
 /// Create a new Pin object associated with the id.  If additional arguments are given,
 /// they are used to initialise the pin.  See `init`.
@@ -189,9 +457,9 @@ STATIC mp_obj_t pin_make_new(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw,
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // Run an argument through the mapper and return the result.
-    const pin_obj_t *pin = pin_find(args[0]);
+    pin_obj_t *pin = (pin_obj_t *)pin_find(args[0]);
 
-    if (n_args > 1) {
+    if (n_args > 1 || n_kw > 0) {
         // pin af given, so configure it
         mp_map_t kw_args;
         mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
@@ -201,69 +469,6 @@ STATIC mp_obj_t pin_make_new(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw,
     return (mp_obj_t)pin;
 }
 
-/// \method init(mode, pull=Pin.PULL_NONE, af=-1)
-/// Initialise the pin:
-///
-///   - `af` can be in range 0-15, please check the CC3200 datasheet
-///     for the details on the AFs availables on each pin (af=0, keeps it as a gpio pin).
-///   - `mode` can be one of:
-///     - `Pin.IN`     - configure the pin for input;
-///     - `Pin.OUT`    - configure the pin for output;
-///   - `type` can be one of:
-///     - `Pin.STD`    - standard without pull-up or pull-down;
-///     - `Pin.STD_PU` - standard with pull-up resistor;
-///     - `Pin.STD_PD` - standard with pull-down resistor.
-///     - `Pin.OD`     - standard without pull up or pull down;
-///     - `Pin.OD_PU`  - open drain with pull-up resistor;
-///     - `Pin.OD_PD`  - open drain with pull-down resistor.
-///     - `Pin.ANALOG` - configured in analog (adc) mode
-///   - `strength` can be one of:
-///     - `Pin.2MA`    - 2ma drive strength;
-///     - `Pin.4MA`    - 4ma drive strength;
-///     - `Pin.6MA`    - 6ma drive strength;
-///
-/// Returns: `None`.
-STATIC const mp_arg_t pin_init_args[] = {
-    { MP_QSTR_af,   MP_ARG_REQUIRED | MP_ARG_INT  },
-    { MP_QSTR_mode,                   MP_ARG_INT, {.u_int = GPIO_DIR_MODE_OUT} },
-    { MP_QSTR_type,                   MP_ARG_INT, {.u_int = PIN_TYPE_STD} },
-    { MP_QSTR_str,                    MP_ARG_INT, {.u_int = PIN_STRENGTH_4MA} },
-};
-#define pin_INIT_NUM_ARGS MP_ARRAY_SIZE(pin_init_args)
-
-STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *self, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    // parse args
-    mp_arg_val_t vals[pin_INIT_NUM_ARGS];
-    mp_arg_parse_all(n_args, args, kw_args, pin_INIT_NUM_ARGS, pin_init_args, vals);
-
-    // get the af
-    uint af = vals[0].u_int;
-    if (af < PIN_MODE_0 || af > PIN_MODE_15) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
-    }
-    // get the io mode
-    uint mode = vals[1].u_int;
-    if (mode != GPIO_DIR_MODE_IN && mode != GPIO_DIR_MODE_OUT) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
-    }
-    // get the type
-    uint type = vals[2].u_int;
-    if (type != PIN_TYPE_STD && type != PIN_TYPE_STD_PU && type != PIN_TYPE_STD_PD &&
-        type != PIN_TYPE_OD  && type != PIN_TYPE_OD_PU  && type != PIN_TYPE_OD_PD) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
-    }
-    // get the strenght
-    uint strength = vals[3].u_int;
-    if (strength != PIN_STRENGTH_2MA && strength != PIN_STRENGTH_4MA && strength != PIN_STRENGTH_6MA) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
-    }
-
-    // configure the pin as requested
-    pin_config (self, af, mode, type, strength);
-
-    return mp_const_none;
-}
-
 STATIC mp_obj_t pin_obj_init(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
@@ -272,7 +477,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pin_init_obj, 1, pin_obj_init);
 /// \method value([value])
 /// Get or set the digital logic level of the pin:
 ///
-///   - With no argument, return 0 or 1 depending on the logic level of the pin.
+///   - With no arguments, return 0 or 1 depending on the logic level of the pin.
 ///   - With `value` given, set the logic level of the pin.  `value` can be
 ///   anything that converts to a boolean.  If it converts to `True`, the pin
 ///   is set high, otherwise it is set low.
@@ -320,108 +525,198 @@ STATIC mp_obj_t pin_toggle(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_toggle_obj, pin_toggle);
 
-/// \method name()
-/// Get the pin name.
-STATIC mp_obj_t pin_name(mp_obj_t self_in) {
+/// \method info()
+/// Returns a named tupple with the current configuration of the gpio pin
+STATIC mp_obj_t pin_info(mp_obj_t self_in) {
+    STATIC const qstr pin_info_fields[] = {
+        MP_QSTR_name, MP_QSTR_af, MP_QSTR_mode,
+        MP_QSTR_type, MP_QSTR_strength
+    };
+
     pin_obj_t *self = self_in;
-    return MP_OBJ_NEW_QSTR(self->name);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_name_obj, pin_name);
+    mp_obj_t pin_config[5];
+    pin_config[0] = MP_OBJ_NEW_QSTR(self->name);
+    pin_config[1] = mp_obj_new_int(self->af);
+    pin_config[2] = mp_obj_new_int(self->mode);
+    pin_config[3] = mp_obj_new_int(self->type);
+    pin_config[4] = mp_obj_new_int(self->strength);
 
-/// \method port()
-/// Get the pin port.
-STATIC mp_obj_t pin_port(mp_obj_t self_in) {
-    pin_obj_t *self = self_in;
-    return mp_obj_new_int(self->port);
+    return mp_obj_new_attrtuple(pin_info_fields, 5, pin_config);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_port_obj, pin_port);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_info_obj, pin_info);
 
-/// \method pin()
-/// Get the pin number.
-STATIC mp_obj_t pin_pin(mp_obj_t self_in) {
-    pin_obj_t *self = self_in;
-    return MP_OBJ_NEW_SMALL_INT(self->pin_num);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_pin_obj, pin_pin);
+/// \method callback(method, mode, priority, pwrmode)
+/// Creates a callback object associated to a pin
+/// min num of arguments is 1 (mode)
+STATIC mp_obj_t pin_callback (mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_arg_val_t args[mpcallback_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mpcallback_INIT_NUM_ARGS, mpcallback_init_args, args);
 
-/// \method mode()
-/// Returns the currently configured mode of the gpio pin. The integer returned
-/// will match one of the allowed constants for the mode argument to the init
-/// function.
-STATIC mp_obj_t pin_mode(mp_obj_t self_in) {
-    return MP_OBJ_NEW_SMALL_INT(pin_get_mode(self_in));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_mode_obj, pin_mode);
+    pin_obj_t *self = pos_args[0];
+    // check if any parameters were passed
+    mp_obj_t _callback = mpcallback_find(self);
+    if (kw_args->used > 0 || !_callback) {
+        // convert the priority to the correct value
+        uint priority = mpcallback_translate_priority (args[2].u_int);
+        // verify the interrupt mode
+        uint intmode = args[0].u_int;
+        if (intmode != GPIO_FALLING_EDGE && intmode != GPIO_RISING_EDGE && intmode != GPIO_BOTH_EDGES &&
+            intmode != GPIO_LOW_LEVEL && intmode != GPIO_HIGH_LEVEL) {
+            goto invalid_args;
+        }
 
-/// \method type()
-/// Returns the currently configured type of the pin. The integer returned
-/// will match one of the allowed constants for the type argument to the init
-/// function.
-STATIC mp_obj_t pin_type_get(mp_obj_t self_in) {
-    return MP_OBJ_NEW_SMALL_INT(pin_get_type(self_in));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_type_obj, pin_type_get);
+        uint pwrmode = args[4].u_int;
+        if (pwrmode > (PYB_PWR_MODE_ACTIVE | PYB_PWR_MODE_LPDS | PYB_PWR_MODE_HIBERNATE)) {
+            goto invalid_args;
+        }
 
-/// \method strength()
-/// Returns the currently configured drive strength of the pin. The integer returned
-/// will match one of the allowed constants for the strength argument to the init
-/// function.
-STATIC mp_obj_t pin_strength(mp_obj_t self_in) {
-    return MP_OBJ_NEW_SMALL_INT(pin_get_strenght(self_in));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_strenght_obj, pin_strength);
+        // get the wake info from this pin
+        uint hib_pin, idx;
+        pin_get_hibernate_pin_and_idx ((const pin_obj_t *)self, &hib_pin, &idx);
+        if (pwrmode & PYB_PWR_MODE_LPDS) {
+            if (idx >= PYBPIN_NUM_WAKE_PINS) {
+                goto invalid_args;
+            }
+            // wake modes are different in LDPS
+            uint wake_mode;
+            switch (intmode) {
+            case GPIO_FALLING_EDGE:
+                wake_mode = PRCM_LPDS_FALL_EDGE;
+                break;
+            case GPIO_RISING_EDGE:
+                wake_mode = PRCM_LPDS_RISE_EDGE;
+                break;
+            case GPIO_LOW_LEVEL:
+                wake_mode = PRCM_LPDS_LOW_LEVEL;
+                break;
+            case GPIO_HIGH_LEVEL:
+                wake_mode = PRCM_LPDS_HIGH_LEVEL;
+                break;
+            default:
+                goto invalid_args;
+                break;
+            }
 
-/// \method af()
-/// Returns the currently configured alternate function of the gpio pin. The integer returned
-/// will match one of the allowed constants for the af argument to the init function.
-STATIC mp_obj_t pin_af(mp_obj_t self_in) {
-    pin_obj_t *self = self_in;
-    return MP_OBJ_NEW_SMALL_INT(MAP_PinModeGet(self->pin_num));
+            // first clear the lpds value from all wake-able pins
+            for (uint i = 0; i < PYBPIN_NUM_WAKE_PINS; i++) {
+                pybpin_wake_pin[i].lpds = PYBPIN_WAKES_NOT;
+            }
+
+            // enable this pin as a wake-up source during LPDS
+            pybpin_wake_pin[idx].lpds = wake_mode;
+        }
+        else {
+            // this pin was the previous LPDS wake source, so disable it completely
+            if (pybpin_wake_pin[idx].lpds != PYBPIN_WAKES_NOT) {
+                MAP_PRCMLPDSWakeupSourceDisable(PRCM_LPDS_GPIO);
+            }
+            pybpin_wake_pin[idx].lpds = PYBPIN_WAKES_NOT;
+        }
+
+        if (pwrmode & PYB_PWR_MODE_HIBERNATE) {
+            if (idx >= PYBPIN_NUM_WAKE_PINS) {
+                goto invalid_args;
+            }
+            // wake modes are different in hibernate
+            uint wake_mode;
+            switch (intmode) {
+            case GPIO_FALLING_EDGE:
+                wake_mode = PRCM_HIB_FALL_EDGE;
+                break;
+            case GPIO_RISING_EDGE:
+                wake_mode = PRCM_HIB_RISE_EDGE;
+                break;
+            case GPIO_LOW_LEVEL:
+                wake_mode = PRCM_HIB_LOW_LEVEL;
+                break;
+            case GPIO_HIGH_LEVEL:
+                wake_mode = PRCM_HIB_HIGH_LEVEL;
+                break;
+            default:
+                goto invalid_args;
+                break;
+            }
+
+            // enable this pin as wake-up source during hibernate
+            pybpin_wake_pin[idx].hib = wake_mode;
+        }
+        else {
+            pybpin_wake_pin[idx].hib = PYBPIN_WAKES_NOT;
+        }
+
+        // we need to update the callback atomically, so we disable the
+        // interrupt before we update anything.
+        pin_extint_disable(self);
+        if (pwrmode & PYB_PWR_MODE_ACTIVE) {
+            // register the interrupt
+            pin_extint_register((pin_obj_t *)self, intmode, priority);
+            if (idx < PYBPIN_NUM_WAKE_PINS) {
+                pybpin_wake_pin[idx].active = true;
+            }
+        }
+        else if (idx < PYBPIN_NUM_WAKE_PINS) {
+            pybpin_wake_pin[idx].active = false;
+        }
+
+        // all checks have passed, now we can create the callback
+        _callback = mpcallback_new (self, args[1].u_obj, &pin_cb_methods);
+        if (pwrmode & PYB_PWR_MODE_LPDS) {
+            pybsleep_set_gpio_lpds_callback (_callback);
+        }
+
+        // enable the interrupt just before leaving
+        pin_extint_enable(self);
+    }
+    return _callback;
+
+invalid_args:
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_obj, pin_af);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pin_callback_obj, 1, pin_callback);
 
 STATIC const mp_map_elem_t pin_locals_dict_table[] = {
     // instance methods
-    { MP_OBJ_NEW_QSTR(MP_QSTR_init),        (mp_obj_t)&pin_init_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_value),       (mp_obj_t)&pin_value_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_low),         (mp_obj_t)&pin_low_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_high),        (mp_obj_t)&pin_high_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_toggle),      (mp_obj_t)&pin_toggle_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_name),        (mp_obj_t)&pin_name_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_port),        (mp_obj_t)&pin_port_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_pin),         (mp_obj_t)&pin_pin_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_mode),        (mp_obj_t)&pin_mode_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_type),        (mp_obj_t)&pin_type_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_strength),    (mp_obj_t)&pin_strenght_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_af),          (mp_obj_t)&pin_af_obj },
-
-    // class attributes
-    { MP_OBJ_NEW_QSTR(MP_QSTR_cpu),         (mp_obj_t)&pin_cpu_pins_obj_type },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_init),                    (mp_obj_t)&pin_init_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_value),                   (mp_obj_t)&pin_value_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_low),                     (mp_obj_t)&pin_low_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_high),                    (mp_obj_t)&pin_high_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_toggle),                  (mp_obj_t)&pin_toggle_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_info),                    (mp_obj_t)&pin_info_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_callback),                (mp_obj_t)&pin_callback_obj },
 
     // class constants
-    /// \constant IN        - set the pin to input mode
-    /// \constant OUT       - set the pin to output mode
-    /// \constant STD       - set the pin to standard mode without pull-up or pull-down
-    /// \constant STD_PU    - set the pin to standard mode with pull-up
-    /// \constant STD_PD    - set the pin to standard mode with pull-down
-    /// \constant OD        - set the pin to open drain mode without pull-up or pull-down
-    /// \constant OD_PU     - set the pin to open drain mode with pull-up
-    /// \constant OD_PD     - set the pin to open drain mode with pull-down
-    /// \constant 2MA       - set the drive strength to 2ma
-    /// \constant 4MA       - set the drive strength to 4ma
-    /// \constant 6MA       - set the drive strength to 6ma
-    { MP_OBJ_NEW_QSTR(MP_QSTR_IN),          MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_IN) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_OUT),         MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_OUT) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_STD),         MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_STD_PU),      MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PU) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_STD_PD),      MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PD) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_OD),          MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_OD_PU),       MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD_PU) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_OD_PD),       MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD_PD) },
-    
-    { MP_OBJ_NEW_QSTR(MP_QSTR_S2MA),        MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_2MA) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_S4MA),        MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_4MA) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_S6MA),        MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_6MA) },
+    /// \constant IN                                    - set the pin to input mode
+    /// \constant OUT                                   - set the pin to output mode
+    /// \constant STD                                   - set the pin to standard mode without pull-up or pull-down
+    /// \constant STD_PU                                - set the pin to standard mode with pull-up
+    /// \constant STD_PD                                - set the pin to standard mode with pull-down
+    /// \constant OD                                    - set the pin to open drain mode without pull-up or pull-down
+    /// \constant OD_PU                                 - set the pin to open drain mode with pull-up
+    /// \constant OD_PD                                 - set the pin to open drain mode with pull-down
+    /// \constant IRQ_RISING                            - interrupt on a rising edge
+    /// \constant IRQ_FALLING                           - interrupt on a falling edge
+    /// \constant IRQ_RISING_FALLING                    - interrupt on a rising or falling edge
+    /// \constant IRQ_LOW_LEVEL                         - interrupt on a low level
+    /// \constant IRQ_HIGH_LEVEL                        - interrupt on a high level
+    /// \constant 2MA                                   - set the drive strength to 2ma
+    /// \constant 4MA                                   - set the drive strength to 4ma
+    /// \constant 6MA                                   - set the drive strength to 6ma
+    { MP_OBJ_NEW_QSTR(MP_QSTR_IN),                      MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_IN) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_OUT),                     MP_OBJ_NEW_SMALL_INT(GPIO_DIR_MODE_OUT) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_STD),                     MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_STD_PU),                  MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PU) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_STD_PD),                  MP_OBJ_NEW_SMALL_INT(PIN_TYPE_STD_PD) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_OD),                      MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_OD_PU),                   MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD_PU) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_OD_PD),                   MP_OBJ_NEW_SMALL_INT(PIN_TYPE_OD_PD) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_INT_FALLING),             MP_OBJ_NEW_SMALL_INT(GPIO_FALLING_EDGE) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_INT_RISING),              MP_OBJ_NEW_SMALL_INT(GPIO_RISING_EDGE) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_INT_RISING_FALLING),      MP_OBJ_NEW_SMALL_INT(GPIO_BOTH_EDGES) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_INT_LOW_LEVEL),           MP_OBJ_NEW_SMALL_INT(GPIO_LOW_LEVEL) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_INT_HIGH_LEVEL),          MP_OBJ_NEW_SMALL_INT(GPIO_HIGH_LEVEL) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_S2MA),                    MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_2MA) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_S4MA),                    MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_4MA) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_S6MA),                    MP_OBJ_NEW_SMALL_INT(PIN_STRENGTH_6MA) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
@@ -433,3 +728,43 @@ const mp_obj_type_t pin_type = {
     .make_new = pin_make_new,
     .locals_dict = (mp_obj_t)&pin_locals_dict,
 };
+
+STATIC const mp_cb_methods_t pin_cb_methods = {
+    .init = pin_callback,
+    .enable = pin_extint_enable,
+    .disable = pin_extint_disable,
+};
+
+STATIC void GPIOA0IntHandler (void) {
+    EXTI_Handler(GPIOA0_BASE);
+}
+
+STATIC void GPIOA1IntHandler (void) {
+    EXTI_Handler(GPIOA1_BASE);
+}
+
+STATIC void GPIOA2IntHandler (void) {
+    EXTI_Handler(GPIOA2_BASE);
+}
+
+STATIC void GPIOA3IntHandler (void) {
+    EXTI_Handler(GPIOA3_BASE);
+}
+
+// common interrupt handler
+STATIC void EXTI_Handler(uint port) {
+    uint32_t bits = MAP_GPIOIntStatus(port, true);
+    MAP_GPIOIntClear(port, bits);
+
+    // might be that we have more than one Pin interrupt pending
+    // therefore we must loop through all of the 8 possible bits
+    for (int i = 0; i < 8; i++) {
+        uint32_t bit = (1 << i);
+        if (bit & bits) {
+            pin_obj_t *self = (pin_obj_t *)pin_find_pin_by_port_bit(&pin_cpu_pins_locals_dict, port, bit);
+            mp_obj_t _callback = mpcallback_find(self);
+            mpcallback_handler(_callback);
+        }
+    }
+}
+

cc3200/mods/pybpin.h

@@ -25,24 +25,36 @@
  * THE SOFTWARE.
  */
 
-// This file requires pin_defs_xxx.h (which has port specific enums and
-// defines, so we include it here. It should never be included directly
+#ifndef PYBPIN_H_
+#define PYBPIN_H_
 
-#include MICROPY_PIN_DEFS_PORT_H
+#define PYBPIN_ANALOG_TYPE          0xFF
+
+enum {
+  PORT_A0 = GPIOA0_BASE,
+  PORT_A1 = GPIOA1_BASE,
+  PORT_A2 = GPIOA2_BASE,
+  PORT_A3 = GPIOA3_BASE
+};
 
 typedef struct {
-  mp_obj_base_t base;
-  qstr name;
-  uint32_t port;
-  uint32_t bit           : 8;
-  uint32_t pin_num       : 7;
+    const mp_obj_base_t base;
+    const qstr          name;
+    const uint32_t      port;
+    uint16_t            type;
+    const uint8_t       bit;
+    const uint8_t       pin_num;
+    uint8_t             af;
+    uint8_t             strength;
+    uint8_t             mode;
+    bool                isused;
 } pin_obj_t;
 
 extern const mp_obj_type_t pin_type;
 
 typedef struct {
-  const char *name;
-  const pin_obj_t *pin;
+    const char *name;
+    const pin_obj_t *pin;
 } pin_named_pin_t;
 
 typedef struct {
@@ -54,13 +66,15 @@ typedef struct {
 extern const mp_obj_type_t pin_cpu_pins_obj_type;
 extern const mp_obj_dict_t pin_cpu_pins_locals_dict;
 
-MP_DECLARE_CONST_FUN_OBJ(pin_init_obj);
-
 void pin_init0(void);
-void pin_config(const pin_obj_t *self, uint af, uint mode, uint type, uint strength);
-const pin_obj_t *pin_find(mp_obj_t user_obj);
-const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
+void pin_verify_af (uint af);
+void pin_config(pin_obj_t *self, uint af, uint mode, uint type, uint strength);
+void pin_extint_register(pin_obj_t *self, uint32_t intmode, uint32_t priority);
+pin_obj_t *pin_find(mp_obj_t user_obj);
+pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
+pin_obj_t *pin_find_pin_by_port_bit (const mp_obj_dict_t *named_pins, uint port, uint bit);
 uint32_t pin_get_mode(const pin_obj_t *self);
 uint32_t pin_get_type(const pin_obj_t *self);
 uint32_t pin_get_strenght(const pin_obj_t *self);
 
+#endif  // PYBPIN_H_

cc3200/mods/pybrtc.c

@@ -27,19 +27,19 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "modutime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "rom_map.h"
 #include "prcm.h"
 #include "pybrtc.h"
+#include "pybsleep.h"
+#include "mpcallback.h"
+#include "timeutils.h"
 
 /// \moduleref pyb
 /// \class RTC - real time clock
@@ -53,30 +53,77 @@
 ///     rtc.datetime((2014, 5, 1, 4, 13, 0, 0, 0))
 ///     print(rtc.datetime())
 
+/******************************************************************************
+ DECLARE CONSTANTS
+ ******************************************************************************/
+#define PYBRTC_CLOCK_FREQUENCY_HZ                   32768
+#define PYBRTC_MIN_INTERVAL_VALUE                   25
+
+/******************************************************************************
+ DEFINE TYPES
+ ******************************************************************************/
+typedef struct {
+    byte prwmode;
+} pybrtc_data_t;
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+STATIC pybrtc_data_t pybrtc_data;
+STATIC const mp_cb_methods_t pybrtc_cb_methods;
+STATIC const mp_obj_base_t pyb_rtc_obj = {&pyb_rtc_type};
+
+/******************************************************************************
+ DECLARE PUBLIC FUNCTIONS
+ ******************************************************************************/
+__attribute__ ((section (".boot")))
 void pybrtc_init(void) {
-    // if RTC was previously set leave it alone
+    // if the RTC was previously set, leave it alone
     if (MAP_PRCMSysResetCauseGet() == PRCM_POWER_ON) {
-        // fresh reset; configure RTC Calendar
+        // fresh reset; configure the RTC Calendar
         // set the date to 1st Jan 2015
         // set the time to 00:00:00
-        uint32_t seconds = mod_time_seconds_since_2000(2015, 1, 1, 0, 0, 0);
+        uint32_t seconds = timeutils_seconds_since_2000(2015, 1, 1, 0, 0, 0);
 
-        MAP_PRCMRTCSet(seconds, 0);
-
-        // Mark that the RTC is in use
+        // Mark the RTC in use first
         MAP_PRCMRTCInUseSet();
+
+        // Now set the RTC calendar seconds
+        MAP_PRCMRTCSet(seconds, 0);
     }
 }
 
+void pyb_rtc_callback_disable (mp_obj_t self_in) {
+    // check the wake from param
+    if (pybrtc_data.prwmode & PYB_PWR_MODE_ACTIVE) {
+        // disable the slow clock interrupt
+        MAP_PRCMIntDisable(PRCM_INT_SLOW_CLK_CTR);
+    }
+    // disable wake from ldps and hibernate
+    pybsleep_configure_timer_wakeup (PYB_PWR_MODE_ACTIVE);
+    // read the interrupt status to clear any pending interrupt
+    (void)MAP_PRCMIntStatus();
+}
+
+/******************************************************************************
+ DECLARE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC void pyb_rtc_callback_enable (mp_obj_t self_in) {
+    // check the wake from param
+    if (pybrtc_data.prwmode & PYB_PWR_MODE_ACTIVE) {
+        // enable the slow clock interrupt
+        MAP_PRCMIntEnable(PRCM_INT_SLOW_CLK_CTR);
+    }
+    else {
+        // just in case it was already enabled before
+        MAP_PRCMIntDisable(PRCM_INT_SLOW_CLK_CTR);
+    }
+    pybsleep_configure_timer_wakeup (pybrtc_data.prwmode);
+}
+
 /******************************************************************************/
 // Micro Python bindings
 
-typedef struct _pyb_rtc_obj_t {
-    mp_obj_base_t base;
-} pyb_rtc_obj_t;
-
-STATIC const pyb_rtc_obj_t pyb_rtc_obj = {{&pyb_rtc_type}};
-
 /// \classmethod \constructor()
 /// Create an RTC object.
 STATIC mp_obj_t pyb_rtc_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
@@ -91,17 +138,17 @@ STATIC mp_obj_t pyb_rtc_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n
 /// Get or set the date and time of the RTC.
 ///
 /// With no arguments, this method returns an 8-tuple with the current
-/// date and time.  With 1 argument (being an 8-tuple) it sets the date
+/// date and time. With 1 argument (being an 8-tuple) it sets the date
 /// and time.
 ///
 /// The 8-tuple has the following format:
 ///
 ///     (year, month, day, weekday, hours, minutes, seconds, milliseconds)
 ///
-/// `weekday` is 1-7 for Monday through Sunday.
+/// `weekday` is 0-6 for Monday through Sunday.
 ///
 mp_obj_t pyb_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
-    mod_struct_time tm;
+    timeutils_struct_time_t tm;
     uint32_t seconds;
     uint16_t mseconds;
 
@@ -109,7 +156,7 @@ mp_obj_t pyb_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
         // get the seconds and the milliseconds from the RTC
         MAP_PRCMRTCGet(&seconds, &mseconds);
         mseconds = RTC_CYCLES_U16MS(mseconds);
-        mod_time_seconds_since_2000_to_struct_time(seconds, &tm);
+        timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
 
         mp_obj_t tuple[8] = {
             mp_obj_new_int(tm.tm_year),
@@ -136,17 +183,66 @@ mp_obj_t pyb_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
         tm.tm_sec = mp_obj_get_int(items[6]);
         mseconds = mp_obj_get_int(items[7]);
 
-        seconds = mod_time_seconds_since_2000(tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+        seconds = timeutils_seconds_since_2000(tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
         mseconds = RTC_U16MS_CYCLES(mseconds);
         MAP_PRCMRTCSet(seconds, mseconds);
 
         return mp_const_none;
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
+
+/// \method callback(handler, value, pwrmode)
+/// Creates a callback object associated with the real time clock
+/// min num of arguments is 1 (value). The value is the alarm time
+/// in the future, in msec
+STATIC mp_obj_t pyb_rtc_callback (mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_arg_val_t args[mpcallback_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, mpcallback_INIT_NUM_ARGS, mpcallback_init_args, args);
+
+    // check if any parameters were passed
+    mp_obj_t _callback = mpcallback_find((mp_obj_t)&pyb_rtc_obj);
+    if (kw_args->used > 0 || !_callback) {
+        uint32_t f_mseconds = MAX(1, args[3].u_int);
+        uint32_t seconds;
+        uint16_t mseconds;
+        // get the seconds and the milliseconds from the RTC
+        MAP_PRCMRTCGet(&seconds, &mseconds);
+        mseconds = RTC_CYCLES_U16MS(mseconds);
+
+        // configure the rtc alarm accordingly
+        seconds += f_mseconds / 1000;
+        mseconds += f_mseconds - ((f_mseconds / 1000) * 1000);
+
+        // disable the interrupt before updating anything
+        // (the object is not relevant here, the function already knows it)
+        pyb_rtc_callback_disable(NULL);
+
+        // set the match value
+        MAP_PRCMRTCMatchSet(seconds, mseconds);
+
+        // save the power mode data for later
+        pybrtc_data.prwmode = args[4].u_int;
+
+        // create the callback
+        _callback = mpcallback_new ((mp_obj_t)&pyb_rtc_obj, args[1].u_obj, &pybrtc_cb_methods);
+
+        // set the lpds callback
+        pybsleep_set_timer_lpds_callback(_callback);
+
+        // the interrupt priority is ignored since it's already set to to highest level by the sleep module
+        // to make sure that the wakeup callbacks are always called first when resuming from sleep
+
+        // enable the interrupt (the object is not relevant here, the function already knows it)
+        pyb_rtc_callback_enable(NULL);
+    }
+    return _callback;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_callback_obj, 1, pyb_rtc_callback);
 
 STATIC const mp_map_elem_t pyb_rtc_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_datetime), (mp_obj_t)&pyb_rtc_datetime_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_callback), (mp_obj_t)&pyb_rtc_callback_obj },
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
@@ -156,3 +252,9 @@ const mp_obj_type_t pyb_rtc_type = {
     .make_new = pyb_rtc_make_new,
     .locals_dict = (mp_obj_t)&pyb_rtc_locals_dict,
 };
+
+STATIC const mp_cb_methods_t pybrtc_cb_methods = {
+    .init = pyb_rtc_callback,
+    .enable = pyb_rtc_callback_enable,
+    .disable = pyb_rtc_callback_disable,
+};

cc3200/mods/pybrtc.h

@@ -25,9 +25,15 @@
  * THE SOFTWARE.
  */
 
+#ifndef PYBRTC_H_
+#define PYBRTC_H_
+
 #define RTC_U16MS_CYCLES(msec)      ((msec * 1024) / 1000)
 #define RTC_CYCLES_U16MS(cycles)    ((cycles * 1000) / 1024)
 
 extern const mp_obj_type_t pyb_rtc_type;
 
 void pybrtc_init(void);
+void pyb_rtc_callback_disable (mp_obj_t self_in);
+
+#endif  // PYBRTC_H_

cc3200/mods/pybsd.c

@@ -0,0 +1,209 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpconfig.h"
+#include MICROPY_HAL_H
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "inc/hw_types.h"
+#include "inc/hw_gpio.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_memmap.h"
+#include "rom_map.h"
+#include "pin.h"
+#include "prcm.h"
+#include "gpio.h"
+#include "sdhost.h"
+#include "pybpin.h"
+#include "pybsd.h"
+#include "ff.h"
+#include "diskio.h"
+#include "sd_diskio.h"
+#include "simplelink.h"
+#include "debug.h"
+#include "mpexception.h"
+#include "pybsleep.h"
+
+
+#if MICROPY_HW_HAS_SDCARD
+
+#define PYBSD_FREQUENCY_HZ              15000000    // 15MHz
+
+typedef struct {
+    mp_obj_base_t base;
+    FATFS        *fatfs;
+    pin_obj_t    *pin_clk;
+    bool         pinsset;
+    bool         enabled;
+} pybsd_obj_t;
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+STATIC pybsd_obj_t pybsd_obj;
+
+/******************************************************************************
+ DECLARE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC mp_obj_t pybsd_make_new (mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args);
+STATIC mp_obj_t pybsd_disable (mp_obj_t self_in);
+STATIC mp_obj_t pybsd_enable (mp_obj_t self_in);
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
+__attribute__ ((section (".boot")))
+void pybsd_init0 (void) {
+    // allocate memory for the sd file system
+    ASSERT ((pybsd_obj.fatfs = mem_Malloc(sizeof(FATFS))) != NULL);
+}
+
+void pybsd_deinit (void) {
+    pybsd_disable ((mp_obj_t)&pybsd_obj);
+}
+
+/******************************************************************************
+ DEFINE PRIVATE FUNCTIONS
+ ******************************************************************************/
+/// Initalizes the sd card driver
+STATIC void pybsd_init (pybsd_obj_t *self) {
+    // Configure the clock pin as output only
+    MAP_PinDirModeSet(self->pin_clk->pin_num, PIN_DIR_MODE_OUT);
+    // Enable SD peripheral clock
+    MAP_PRCMPeripheralClkEnable(PRCM_SDHOST, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    // Reset MMCHS
+    MAP_PRCMPeripheralReset(PRCM_SDHOST);
+    // Initialize MMCHS
+    MAP_SDHostInit(SDHOST_BASE);
+    // Configure the card clock
+    MAP_SDHostSetExpClk(SDHOST_BASE, MAP_PRCMPeripheralClockGet(PRCM_SDHOST), PYBSD_FREQUENCY_HZ);
+}
+
+/******************************************************************************/
+// Micro Python bindings
+//
+
+/// \classmethod \constructor()
+/// Configure the pins used for the sd card.
+///   May receive 0, or 6 arguments.
+///
+/// Usage:
+///    sd = pyb.SD()
+////
+///    sd = pyb.SD(d0_pin, d0_af, clk_pin, clk_af, cmd_pin, cmd_af)
+///
+STATIC mp_obj_t pybsd_make_new (mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 6, false);
+
+    if (n_args == 6) {
+        // save the clock pin for later use
+        pybsd_obj.pin_clk = (pin_obj_t *)pin_find(args[2]);
+
+        // configure the data pin with pull-up enabled
+        pin_config ((pin_obj_t *)pin_find(args[0]), mp_obj_get_int(args[1]), 0, PIN_TYPE_STD_PU, PIN_STRENGTH_4MA);
+        // configure the clock pin
+        pin_config (pybsd_obj.pin_clk, mp_obj_get_int(args[3]), 0, PIN_TYPE_STD, PIN_STRENGTH_4MA);
+        // configure the command pin with pull-up enabled
+        pin_config ((pin_obj_t *)pin_find(args[4]), mp_obj_get_int(args[5]), 0, PIN_TYPE_STD_PU, PIN_STRENGTH_4MA);
+
+        pybsd_obj.pinsset = true;
+        pybsd_obj.base.type = &pyb_sd_type;
+    }
+    else if (!pybsd_obj.pinsset) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments));
+    }
+
+    return &pybsd_obj;
+}
+
+/// \method enable()
+/// Enables the sd card and mounts the file system
+STATIC mp_obj_t pybsd_enable (mp_obj_t self_in) {
+    pybsd_obj_t *self = self_in;
+
+    if (!self->enabled) {
+        // do the init first
+        pybsd_init (self);
+
+        // try to mount the sd card on /sd
+        if (FR_OK != f_mount(self->fatfs, "/sd", 1)) {
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
+        }
+
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sd));
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sd_slash_lib));
+
+        // register it with the sleep module
+        pybsleep_add ((const mp_obj_t)&pybsd_obj, (WakeUpCB_t)pybsd_init);
+        self->enabled = true;
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pybsd_enable_obj, pybsd_enable);
+
+/// \method disable()
+/// Disables the sd card and unmounts the file system
+STATIC mp_obj_t pybsd_disable (mp_obj_t self_in) {
+    pybsd_obj_t *self = self_in;
+    if (self->enabled) {
+        self->enabled = false;
+        // unmount the sd card
+        f_mount (NULL, "/sd", 1);
+        // remove sd paths from mp_sys_path
+        mp_obj_list_remove(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sd));
+        mp_obj_list_remove(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_sd_slash_lib));
+
+        // disable the peripheral
+        MAP_PRCMPeripheralClkDisable(PRCM_SDHOST, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+
+        // de-initialze de sd card at diskio level
+        sd_disk_deinit();
+
+        // unregister it with the sleep module
+        pybsleep_remove (self);
+
+        // change the drive in case it was /sd
+        f_chdrive("/flash");
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pybsd_disable_obj, pybsd_disable);
+
+STATIC const mp_map_elem_t pybsd_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_enable),          (mp_obj_t)&pybsd_enable_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_disable),         (mp_obj_t)&pybsd_disable_obj },
+};
+STATIC MP_DEFINE_CONST_DICT(pybsd_locals_dict, pybsd_locals_dict_table);
+
+const mp_obj_type_t pyb_sd_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SD,
+    .make_new = pybsd_make_new,
+    .locals_dict = (mp_obj_t)&pybsd_locals_dict,
+};
+
+#endif // MICROPY_HW_HAS_SDCARD

cc3200/mods/pybsd.h

@@ -0,0 +1,36 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef PYBSD_H_
+#define PYBSD_H_
+
+#if MICROPY_HW_HAS_SDCARD
+extern const mp_obj_type_t pyb_sd_type;
+
+void pybsd_init0 (void);
+void pybsd_deinit (void);
+#endif
+
+#endif // PYBSD_H_

cc3200/mods/pybsleep.c

@@ -0,0 +1,705 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "py/mpstate.h"
+#include MICROPY_HAL_H
+#include "py/runtime.h"
+#include "inc/hw_types.h"
+#include "inc/hw_ints.h"
+#include "inc/hw_nvic.h"
+#include "inc/hw_common_reg.h"
+#include "inc/hw_memmap.h"
+#include "cc3200_asm.h"
+#include "rom_map.h"
+#include "interrupt.h"
+#include "systick.h"
+#include "prcm.h"
+#include "spi.h"
+#include "pin.h"
+#include "pybsleep.h"
+#include "pybpin.h"
+#include "simplelink.h"
+#include "modnetwork.h"
+#include "modwlan.h"
+#include "osi.h"
+#include "debug.h"
+#include "mpexception.h"
+#include "mpcallback.h"
+#include "mperror.h"
+#include "sleeprestore.h"
+#include "serverstask.h"
+#include "antenna.h"
+
+/******************************************************************************
+ DECLARE PRIVATE CONSTANTS
+ ******************************************************************************/
+#define SPIFLASH_INSTR_READ_STATUS              (0x05)
+#define SPIFLASH_INSTR_DEEP_POWER_DOWN          (0xB9)
+#define SPIFLASH_STATUS_BUSY                    (0x01)
+
+#define LPDS_UP_TIME                            (425)         // 13 msec
+#define LPDS_DOWN_TIME                          (98)          // 3 msec
+#define USER_OFFSET                             (131)         // 4 smec
+#define WAKEUP_TIME_LPDS                        (LPDS_UP_TIME + LPDS_DOWN_TIME + USER_OFFSET)   // 20 msec
+#define WAKEUP_TIME_HIB                         (32768)       // 1 s
+
+#define FORCED_TIMER_INTERRUPT_MS               (1)
+#define FAILED_SLEEP_DELAY_MS                   (FORCED_TIMER_INTERRUPT_MS * 3)
+
+/******************************************************************************
+ DECLARE PRIVATE TYPES
+ ******************************************************************************/
+// storage memory for Cortex M4 registers
+typedef struct {
+    uint32_t     msp;
+    uint32_t     psp;
+    uint32_t     psr;
+    uint32_t     primask;
+    uint32_t     faultmask;
+    uint32_t     basepri;
+    uint32_t     control;
+} arm_cm4_core_regs_t;
+
+// storage memory for the NVIC registers
+typedef struct {
+    uint32_t vector_table;      // Vector Table Offset
+    uint32_t aux_ctrl;          // Auxiliary control register
+    uint32_t int_ctrl_state;    // Interrupt Control and State
+    uint32_t app_int;           // Application Interrupt Reset control
+    uint32_t sys_ctrl;          // System control
+    uint32_t config_ctrl;       // Configuration control
+    uint32_t sys_pri_1;         // System Handler Priority 1
+    uint32_t sys_pri_2;         // System Handler Priority 2
+    uint32_t sys_pri_3;         // System Handler Priority 3
+    uint32_t sys_hcrs;          // System Handler control and state register
+    uint32_t systick_ctrl;      // SysTick Control Status
+    uint32_t systick_reload;    // SysTick Reload
+    uint32_t systick_calib;     // SysTick Calibration
+    uint32_t int_en[6];         // Interrupt set enable
+    uint32_t int_priority[49];  // Interrupt priority
+} nvic_reg_store_t;
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_obj_t      obj;
+    WakeUpCB_t    wakeup;
+} pybsleep_obj_t;
+
+typedef struct {
+    mp_obj_t    wlan_lpds_wake_cb;
+    mp_obj_t    timer_lpds_wake_cb;
+    mp_obj_t    gpio_lpds_wake_cb;
+    uint        timer_wake_pwrmode;
+} pybsleep_data_t;
+
+/******************************************************************************
+ DECLARE PRIVATE DATA
+ ******************************************************************************/
+STATIC const mp_obj_type_t pybsleep_type;
+STATIC nvic_reg_store_t    *nvic_reg_store;
+STATIC pybsleep_data_t   pybsleep_data = {NULL, NULL, NULL, 0};
+volatile arm_cm4_core_regs_t vault_arm_registers;
+STATIC pybsleep_reset_cause_t pybsleep_reset_cause = PYB_SLP_PWRON_RESET;
+STATIC pybsleep_wake_reason_t pybsleep_wake_reason = PYB_SLP_WAKED_PWRON;
+
+/******************************************************************************
+ DECLARE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC pybsleep_obj_t *pybsleep_find (mp_obj_t obj);
+STATIC void pybsleep_flash_powerdown (void);
+STATIC NORETURN void pybsleep_suspend_enter (void);
+void pybsleep_suspend_exit (void);
+STATIC void pybsleep_obj_wakeup (void);
+STATIC void PRCMInterruptHandler (void);
+STATIC void pybsleep_iopark (bool hibernate);
+STATIC bool setup_timer_lpds_wake (void);
+STATIC bool setup_timer_hibernate_wake (void);
+
+/******************************************************************************
+ DEFINE PUBLIC FUNCTIONS
+ ******************************************************************************/
+__attribute__ ((section (".boot")))
+void pybsleep_pre_init (void) {
+    // allocate memory for nvic registers vault
+    ASSERT ((nvic_reg_store = mem_Malloc(sizeof(nvic_reg_store_t))) != NULL);
+}
+
+void pybsleep_init0 (void) {
+    // initialize the sleep objects list
+    mp_obj_list_init(&MP_STATE_PORT(pybsleep_obj_list), 0);
+
+    // register and enable the PRCM interrupt
+    osi_InterruptRegister(INT_PRCM, (P_OSI_INTR_ENTRY)PRCMInterruptHandler, INT_PRIORITY_LVL_1);
+
+    // disable all LPDS and hibernate wake up sources (WLAN is disabed/enabled before entering LDPS mode)
+    MAP_PRCMLPDSWakeupSourceDisable(PRCM_LPDS_GPIO);
+    MAP_PRCMLPDSWakeupSourceDisable(PRCM_LPDS_TIMER);
+    MAP_PRCMHibernateWakeupSourceDisable(PRCM_HIB_SLOW_CLK_CTR | PRCM_HIB_GPIO2  | PRCM_HIB_GPIO4  | PRCM_HIB_GPIO13 |
+                                         PRCM_HIB_GPIO17       | PRCM_HIB_GPIO11 | PRCM_HIB_GPIO24 | PRCM_HIB_GPIO26);
+
+    // store the reset casue (if it's soft reset, leave it as it is)
+    if (pybsleep_reset_cause != PYB_SLP_SOFT_RESET) {
+        switch (MAP_PRCMSysResetCauseGet()) {
+        case PRCM_POWER_ON:
+            pybsleep_reset_cause = PYB_SLP_PWRON_RESET;
+            break;
+        case PRCM_CORE_RESET:
+        case PRCM_MCU_RESET:
+        case PRCM_SOC_RESET:
+            pybsleep_reset_cause = PYB_SLP_HARD_RESET;
+            break;
+        case PRCM_WDT_RESET:
+            pybsleep_reset_cause = PYB_SLP_WDT_RESET;
+            break;
+        case PRCM_HIB_EXIT:
+            if (PRCMWasResetBecauseOfWDT()) {
+                pybsleep_reset_cause = PYB_SLP_WDT_RESET;
+            }
+            else {
+                pybsleep_reset_cause = PYB_SLP_HIB_RESET;
+                // set the correct wake reason
+                switch (MAP_PRCMHibernateWakeupCauseGet()) {
+                case PRCM_HIB_WAKEUP_CAUSE_SLOW_CLOCK:
+                    pybsleep_wake_reason = PYB_SLP_WAKED_BY_RTC;
+                    break;
+                case PRCM_HIB_WAKEUP_CAUSE_GPIO:
+                    pybsleep_wake_reason = PYB_SLP_WAKED_BY_GPIO;
+                    break;
+                default:
+                    break;
+                }
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+void pybsleep_signal_soft_reset (void) {
+    pybsleep_reset_cause = PYB_SLP_SOFT_RESET;
+}
+
+void pybsleep_add (const mp_obj_t obj, WakeUpCB_t wakeup) {
+    pybsleep_obj_t * sleep_obj = m_new_obj(pybsleep_obj_t);
+    sleep_obj->base.type = &pybsleep_type;
+    sleep_obj->obj = obj;
+    sleep_obj->wakeup = wakeup;
+    // only add objects once
+    if (!pybsleep_find(sleep_obj)) {
+        mp_obj_list_append(&MP_STATE_PORT(pybsleep_obj_list), sleep_obj);
+    }
+}
+
+void pybsleep_remove (const mp_obj_t obj) {
+    pybsleep_obj_t *sleep_obj;
+    if ((sleep_obj = pybsleep_find(obj))) {
+        mp_obj_list_remove(&MP_STATE_PORT(pybsleep_obj_list), sleep_obj);
+    }
+}
+
+void pybsleep_set_wlan_lpds_callback (mp_obj_t cb_obj) {
+    pybsleep_data.wlan_lpds_wake_cb = cb_obj;
+}
+
+void pybsleep_set_gpio_lpds_callback (mp_obj_t cb_obj) {
+    pybsleep_data.gpio_lpds_wake_cb = cb_obj;
+}
+
+void pybsleep_set_timer_lpds_callback (mp_obj_t cb_obj) {
+    pybsleep_data.timer_lpds_wake_cb = cb_obj;
+}
+
+void pybsleep_configure_timer_wakeup (uint pwrmode) {
+    pybsleep_data.timer_wake_pwrmode = pwrmode;
+}
+
+pybsleep_reset_cause_t pybsleep_get_reset_cause (void) {
+    return pybsleep_reset_cause;
+}
+
+/******************************************************************************
+ DEFINE PRIVATE FUNCTIONS
+ ******************************************************************************/
+STATIC pybsleep_obj_t *pybsleep_find (mp_obj_t obj) {
+    for (mp_uint_t i = 0; i < MP_STATE_PORT(pybsleep_obj_list).len; i++) {
+        // search for the object and then remove it
+        pybsleep_obj_t *sleep_obj = ((pybsleep_obj_t *)(MP_STATE_PORT(pybsleep_obj_list).items[i]));
+        if (sleep_obj->obj == obj) {
+            return sleep_obj;
+        }
+    }
+    return NULL;
+}
+
+STATIC void pybsleep_flash_powerdown (void) {
+    uint32_t status;
+
+    // Enable clock for SSPI module
+    MAP_PRCMPeripheralClkEnable(PRCM_SSPI, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+    // Reset SSPI at PRCM level and wait for reset to complete
+    MAP_PRCMPeripheralReset(PRCM_SSPI);
+    while(!MAP_PRCMPeripheralStatusGet(PRCM_SSPI));
+
+    // Reset SSPI at module level
+    MAP_SPIReset(SSPI_BASE);
+    // Configure SSPI module
+    MAP_SPIConfigSetExpClk (SSPI_BASE, PRCMPeripheralClockGet(PRCM_SSPI),
+                            20000000, SPI_MODE_MASTER,SPI_SUB_MODE_0,
+                            (SPI_SW_CTRL_CS   |
+                             SPI_4PIN_MODE    |
+                             SPI_TURBO_OFF    |
+                             SPI_CS_ACTIVELOW |
+                             SPI_WL_8));
+
+    // Enable SSPI module
+    MAP_SPIEnable(SSPI_BASE);
+    // Enable chip select for the spi flash.
+    MAP_SPICSEnable(SSPI_BASE);
+    // Wait for the spi flash
+    do {
+        // Send the status register read instruction and read back a dummy byte.
+        MAP_SPIDataPut(SSPI_BASE, SPIFLASH_INSTR_READ_STATUS);
+        MAP_SPIDataGet(SSPI_BASE, &status);
+
+        // Write a dummy byte then read back the actual status.
+        MAP_SPIDataPut(SSPI_BASE, 0xFF);
+        MAP_SPIDataGet(SSPI_BASE, &status);
+    } while ((status & 0xFF) == SPIFLASH_STATUS_BUSY);
+
+    // Disable chip select for the spi flash.
+    MAP_SPICSDisable(SSPI_BASE);
+    // Start another CS enable sequence for Power down command.
+    MAP_SPICSEnable(SSPI_BASE);
+    // Send Deep Power Down command to spi flash
+    MAP_SPIDataPut(SSPI_BASE, SPIFLASH_INSTR_DEEP_POWER_DOWN);
+    // Disable chip select for the spi flash.
+    MAP_SPICSDisable(SSPI_BASE);
+}
+
+STATIC NORETURN void pybsleep_suspend_enter (void) {
+    // enable full RAM retention
+    MAP_PRCMSRAMRetentionEnable(PRCM_SRAM_COL_1 | PRCM_SRAM_COL_2 | PRCM_SRAM_COL_3 | PRCM_SRAM_COL_4, PRCM_SRAM_LPDS_RET);
+
+    // save the NVIC control registers
+    nvic_reg_store->vector_table = HWREG(NVIC_VTABLE);
+    nvic_reg_store->aux_ctrl = HWREG(NVIC_ACTLR);
+    nvic_reg_store->int_ctrl_state = HWREG(NVIC_INT_CTRL);
+    nvic_reg_store->app_int = HWREG(NVIC_APINT);
+    nvic_reg_store->sys_ctrl = HWREG(NVIC_SYS_CTRL);
+    nvic_reg_store->config_ctrl = HWREG(NVIC_CFG_CTRL);
+    nvic_reg_store->sys_pri_1 = HWREG(NVIC_SYS_PRI1);
+    nvic_reg_store->sys_pri_2 = HWREG(NVIC_SYS_PRI2);
+    nvic_reg_store->sys_pri_3 = HWREG(NVIC_SYS_PRI3);
+    nvic_reg_store->sys_hcrs = HWREG(NVIC_SYS_HND_CTRL);
+
+    // save the systick registers
+    nvic_reg_store->systick_ctrl = HWREG(NVIC_ST_CTRL);
+    nvic_reg_store->systick_reload = HWREG(NVIC_ST_RELOAD);
+    nvic_reg_store->systick_calib = HWREG(NVIC_ST_CAL);
+
+    // save the interrupt enable registers
+    uint32_t *base_reg_addr = (uint32_t *)NVIC_EN0;
+    for(int32_t i = 0; i < (sizeof(nvic_reg_store->int_en) / 4); i++) {
+        nvic_reg_store->int_en[i] = base_reg_addr[i];
+    }
+
+    // save the interrupt priority registers
+    base_reg_addr = (uint32_t *)NVIC_PRI0;
+    for(int32_t i = 0; i < (sizeof(nvic_reg_store->int_priority) / 4); i++) {
+        nvic_reg_store->int_priority[i] = base_reg_addr[i];
+    }
+
+    // switch off the heartbeat led (this makes sure it will blink as soon as we wake up)
+    mperror_heartbeat_switch_off();
+
+    // park the gpio pins
+    pybsleep_iopark(false);
+
+    // store the cpu registers
+    sleep_store();
+
+    // save the restore info and enter LPDS
+    MAP_PRCMLPDSRestoreInfoSet(vault_arm_registers.psp, (uint32_t)sleep_restore);
+    MAP_PRCMLPDSEnter();
+
+    // let the cpu fade away...
+    for ( ; ; );
+}
+
+void pybsleep_suspend_exit (void) {
+    // take the I2C semaphore
+    uint32_t reg = HWREG(COMMON_REG_BASE + COMMON_REG_O_I2C_Properties_Register);
+    reg = (reg & ~0x3) | 0x1;
+    HWREG(COMMON_REG_BASE + COMMON_REG_O_I2C_Properties_Register) = reg;
+
+    // take the GPIO semaphore
+    reg = HWREG(COMMON_REG_BASE + COMMON_REG_O_GPIO_properties_register);
+    reg = (reg & ~0x3FF) | 0x155;
+    HWREG(COMMON_REG_BASE + COMMON_REG_O_GPIO_properties_register) = reg;
+
+    // restore de NVIC control registers
+    HWREG(NVIC_VTABLE) = nvic_reg_store->vector_table;
+    HWREG(NVIC_ACTLR) = nvic_reg_store->aux_ctrl;
+    HWREG(NVIC_INT_CTRL) = nvic_reg_store->int_ctrl_state;
+    HWREG(NVIC_APINT) = nvic_reg_store->app_int;
+    HWREG(NVIC_SYS_CTRL) = nvic_reg_store->sys_ctrl;
+    HWREG(NVIC_CFG_CTRL) = nvic_reg_store->config_ctrl;
+    HWREG(NVIC_SYS_PRI1) = nvic_reg_store->sys_pri_1;
+    HWREG(NVIC_SYS_PRI2) = nvic_reg_store->sys_pri_2;
+    HWREG(NVIC_SYS_PRI3) = nvic_reg_store->sys_pri_3;
+    HWREG(NVIC_SYS_HND_CTRL) = nvic_reg_store->sys_hcrs;
+
+    // restore the systick register
+    HWREG(NVIC_ST_CTRL) = nvic_reg_store->systick_ctrl;
+    HWREG(NVIC_ST_RELOAD) = nvic_reg_store->systick_reload;
+    HWREG(NVIC_ST_CAL) = nvic_reg_store->systick_calib;
+
+    // restore the interrupt priority registers
+    uint32_t *base_reg_addr = (uint32_t *)NVIC_PRI0;
+    for (uint32_t i = 0; i < (sizeof(nvic_reg_store->int_priority) / 4); i++) {
+        base_reg_addr[i] = nvic_reg_store->int_priority[i];
+    }
+
+    // restore the interrupt enable registers
+    base_reg_addr = (uint32_t *)NVIC_EN0;
+    for(uint32_t i = 0; i < (sizeof(nvic_reg_store->int_en) / 4); i++) {
+        base_reg_addr[i] = nvic_reg_store->int_en[i];
+    }
+
+    HAL_INTRODUCE_SYNC_BARRIER();
+
+    // ungate the clock to the shared spi bus
+    MAP_PRCMPeripheralClkEnable(PRCM_SSPI, PRCM_RUN_MODE_CLK | PRCM_SLP_MODE_CLK);
+
+#if MICROPY_HW_ANTENNA_DIVERSITY
+    // re-configure the antenna selection pins
+    antenna_init0();
+#endif
+
+    // reinitialize simplelink's interface
+    sl_IfOpen (NULL, 0);
+
+    // restore the configuration of all active peripherals
+    pybsleep_obj_wakeup();
+
+    // reconfigure all the previously enabled interrupts
+    mpcallback_wake_all();
+
+    // trigger a sw interrupt
+    MAP_IntPendSet(INT_PRCM);
+
+    // force an exception to go back to the point where suspend mode was entered
+    nlr_raise(mp_obj_new_exception(&mp_type_SystemExit));
+}
+
+STATIC void PRCMInterruptHandler (void) {
+    // reading the interrupt status automatically clears the interrupt
+    if (PRCM_INT_SLOW_CLK_CTR == MAP_PRCMIntStatus()) {
+        // this interrupt is triggered during active mode
+        mpcallback_handler(pybsleep_data.timer_lpds_wake_cb);
+    }
+    else {
+        // interrupt has been triggered while waking up from LPDS
+        switch (MAP_PRCMLPDSWakeupCauseGet()) {
+        case PRCM_LPDS_HOST_IRQ:
+            mpcallback_handler(pybsleep_data.wlan_lpds_wake_cb);
+            pybsleep_wake_reason = PYB_SLP_WAKED_BY_WLAN;
+            break;
+        case PRCM_LPDS_GPIO:
+            mpcallback_handler(pybsleep_data.gpio_lpds_wake_cb);
+            pybsleep_wake_reason = PYB_SLP_WAKED_BY_GPIO;
+            break;
+        case PRCM_LPDS_TIMER:
+            // disable the timer as wake-up source
+            pybsleep_data.timer_wake_pwrmode &= ~PYB_PWR_MODE_LPDS;
+            MAP_PRCMLPDSWakeupSourceDisable(PRCM_LPDS_TIMER);
+            mpcallback_handler(pybsleep_data.timer_lpds_wake_cb);
+            pybsleep_wake_reason = PYB_SLP_WAKED_BY_RTC;
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+STATIC void pybsleep_obj_wakeup (void) {
+    for (mp_uint_t i = 0; i < MP_STATE_PORT(pybsleep_obj_list).len; i++) {
+        pybsleep_obj_t *sleep_obj = ((pybsleep_obj_t *)MP_STATE_PORT(pybsleep_obj_list).items[i]);
+        sleep_obj->wakeup(sleep_obj->obj);
+    }
+}
+
+STATIC void pybsleep_iopark (bool hibernate) {
+    mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)&pin_cpu_pins_locals_dict);
+    for (uint i = 0; i < named_map->used; i++) {
+        pin_obj_t * pin = (pin_obj_t *)named_map->table[i].value;
+        // skip the sflash pins since these are shared with the network processor
+        switch (pin->pin_num) {
+#ifdef DEBUG
+        // skip the JTAG pins
+        case PIN_16:
+        case PIN_17:
+        case PIN_19:
+        case PIN_20:
+            break;
+#endif
+        default:
+            // enable a weak pull-down if the pin is unused
+            if (!pin->isused) {
+                MAP_PinConfigSet(pin->pin_num, pin->strength, PIN_TYPE_STD_PD);
+            }
+            if (hibernate) {
+                // make it an input
+                MAP_PinDirModeSet(pin->pin_num, PIN_DIR_MODE_IN);
+            }
+            break;
+        }
+    }
+
+    // park the sflash pins
+    HWREG(0x4402E0E8) &= ~(0x3 << 8);
+    HWREG(0x4402E0E8) |= (0x2 << 8);
+    HWREG(0x4402E0EC) &= ~(0x3 << 8);
+    HWREG(0x4402E0EC) |= (0x2 << 8);
+    HWREG(0x4402E0F0) &= ~(0x3 << 8);
+    HWREG(0x4402E0F0) |= (0x2 << 8);
+    HWREG(0x4402E0F4) &= ~(0x3 << 8);
+    HWREG(0x4402E0F4) |= (0x1 << 8);
+
+    // if the board has antenna diversity, only park the antenna
+    // selection pins when going into hibernation
+#if MICROPY_HW_ANTENNA_DIVERSITY
+    if (hibernate) {
+#endif
+        // park the antenna selection pins
+        // (tri-stated with pull down enabled)
+        HWREG(0x4402E108) = 0x00000E61;
+        HWREG(0x4402E10C) = 0x00000E61;
+#if MICROPY_HW_ANTENNA_DIVERSITY
+    } else {
+        // park the antenna selection pins
+        // (tri-stated without changing the pull up/down resistors)
+        HWREG(0x4402E108) &= ~0x000000FF;
+        HWREG(0x4402E108) |=  0x00000C61;
+        HWREG(0x4402E10C) &= ~0x000000FF;
+        HWREG(0x4402E10C) |=  0x00000C61;
+    }
+#endif
+}
+
+STATIC bool setup_timer_lpds_wake (void) {
+    uint64_t t_match, t_curr, t_remaining;
+
+    // get the time remaining for the RTC timer to expire
+    t_match = MAP_PRCMSlowClkCtrMatchGet();
+    t_curr  = MAP_PRCMSlowClkCtrGet();
+
+    if (t_match > t_curr) {
+        // get the time remaining in terms of slow clocks
+        t_remaining = (t_match - t_curr);
+        if (t_remaining > WAKEUP_TIME_LPDS) {
+            // subtract the time it takes for wakeup from lpds
+            t_remaining -= WAKEUP_TIME_LPDS;
+            t_remaining = (t_remaining > 0xFFFFFFFF) ? 0xFFFFFFFF: t_remaining;
+            // setup the LPDS wake time
+            MAP_PRCMLPDSIntervalSet((uint32_t)t_remaining);
+            // enable the wake source
+            MAP_PRCMLPDSWakeupSourceEnable(PRCM_LPDS_TIMER);
+            return true;
+        }
+    }
+    else {
+        // setup a timer interrupt immediately
+        MAP_PRCMRTCMatchSet(0, FORCED_TIMER_INTERRUPT_MS);
+    }
+
+    // disable the timer as wake source
+    MAP_PRCMLPDSWakeupSourceDisable(PRCM_LPDS_TIMER);
+
+    // LPDS wake by timer was not possible, force
+    // an interrupt in active mode instead
+    MAP_PRCMIntEnable(PRCM_INT_SLOW_CLK_CTR);
+
+    return false;
+}
+
+STATIC bool setup_timer_hibernate_wake (void) {
+    uint64_t t_match, t_curr, t_remaining;
+
+    // get the time remaining for the RTC timer to expire
+    t_match = MAP_PRCMSlowClkCtrMatchGet();
+    t_curr  = MAP_PRCMSlowClkCtrGet();
+
+    if (t_match > t_curr) {
+        // get the time remaining in terms of slow clocks
+        t_remaining = (t_match - t_curr);
+        if (t_remaining > WAKEUP_TIME_HIB) {
+            // subtract the time it takes for wakeup from hibernate
+            t_remaining -= WAKEUP_TIME_HIB;
+            // setup the LPDS wake time
+            MAP_PRCMHibernateIntervalSet((uint32_t)t_remaining);
+            // enable the wake source
+            MAP_PRCMHibernateWakeupSourceEnable(PRCM_HIB_SLOW_CLK_CTR);
+            return true;
+        }
+    }
+    else {
+        // setup a timer interrupt immediately
+        MAP_PRCMRTCMatchSet(0, FORCED_TIMER_INTERRUPT_MS);
+    }
+
+    // disable the timer as wake source
+    MAP_PRCMLPDSWakeupSourceDisable(PRCM_HIB_SLOW_CLK_CTR);
+
+    // hibernate wake by timer was not possible, force
+    // an interrupt in active mode instead
+    MAP_PRCMIntEnable(PRCM_INT_SLOW_CLK_CTR);
+
+    return false;
+}
+
+/******************************************************************************/
+// Micro Python bindings; Sleep class
+
+/// \function idle()
+/// Gates the processor clock until an interrupt is triggered
+STATIC mp_obj_t pyb_sleep_idle (mp_obj_t self_in) {
+    __WFI();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_sleep_idle_obj, pyb_sleep_idle);
+
+/// \function suspend(wlan)
+/// Enters suspended mode. Wake up sources should have been enable prior to
+/// calling this method.
+STATIC mp_obj_t pyb_sleep_suspend (mp_obj_t self_in) {
+    nlr_buf_t nlr;
+
+    // check if we should enable timer wake-up
+    if (pybsleep_data.timer_wake_pwrmode & PYB_PWR_MODE_LPDS) {
+        if (!setup_timer_lpds_wake()) {
+            // lpds entering is not possible, wait for the forced interrupt and return
+            pybsleep_data.timer_wake_pwrmode &= ~PYB_PWR_MODE_LPDS;
+            HAL_Delay (FAILED_SLEEP_DELAY_MS);
+            return mp_const_none;
+        }
+    }
+
+    // do we need network wake-up?
+    if (pybsleep_data.wlan_lpds_wake_cb) {
+        MAP_PRCMLPDSWakeupSourceEnable (PRCM_LPDS_HOST_IRQ);
+        server_sleep_sockets();
+    }
+    else {
+        MAP_PRCMLPDSWakeupSourceDisable (PRCM_LPDS_HOST_IRQ);
+    }
+
+    // entering and exiting suspended mode must be an atomic operation
+    // therefore interrupts need to be disabled
+    uint primsk = disable_irq();
+    if (nlr_push(&nlr) == 0) {
+        pybsleep_suspend_enter();
+        nlr_pop();
+    }
+
+    // an exception is always raised when exiting suspend mode
+    enable_irq(primsk);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_sleep_suspend_obj, pyb_sleep_suspend);
+
+/// \function hibernate()
+/// Enters hibernate mode. Wake up sources should have been enable prior to
+/// calling this method.
+STATIC mp_obj_t pyb_sleep_hibernate (mp_obj_t self_in) {
+    // check if we should enable timer wake-up
+    if (pybsleep_data.timer_wake_pwrmode & PYB_PWR_MODE_HIBERNATE) {
+        if (!setup_timer_hibernate_wake()) {
+            // hibernating is not possible, wait for the forced interrupt and return
+            pybsleep_data.timer_wake_pwrmode &= ~PYB_PWR_MODE_HIBERNATE;
+            HAL_Delay (FAILED_SLEEP_DELAY_MS);
+            return mp_const_none;
+        }
+    }
+    wlan_stop(SL_STOP_TIMEOUT);
+    pybsleep_flash_powerdown();
+    // must be done just before entering hibernate mode
+    pybsleep_iopark(true);
+    MAP_PRCMHibernateEnter();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_sleep_hibernate_obj, pyb_sleep_hibernate);
+
+/// \function reset_cause()
+/// Returns the last reset casue
+STATIC mp_obj_t pyb_sleep_reset_cause (mp_obj_t self_in) {
+    return MP_OBJ_NEW_SMALL_INT(pybsleep_reset_cause);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_sleep_reset_cause_obj, pyb_sleep_reset_cause);
+
+/// \function wake_reason()
+/// Returns the wake up reson from ldps or hibernate
+STATIC mp_obj_t pyb_sleep_wake_reason (mp_obj_t self_in) {
+    return MP_OBJ_NEW_SMALL_INT(pybsleep_wake_reason);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_sleep_wake_reason_obj, pyb_sleep_wake_reason);
+
+STATIC const mp_map_elem_t pybsleep_locals_dict_table[] = {
+    // instance methods
+    { MP_OBJ_NEW_QSTR(MP_QSTR_idle),                    (mp_obj_t)&pyb_sleep_idle_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_suspend),                 (mp_obj_t)&pyb_sleep_suspend_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_hibernate),               (mp_obj_t)&pyb_sleep_hibernate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_reset_cause),             (mp_obj_t)&pyb_sleep_reset_cause_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_wake_reason),             (mp_obj_t)&pyb_sleep_wake_reason_obj },
+
+    // class constants
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ACTIVE),                  MP_OBJ_NEW_SMALL_INT(PYB_PWR_MODE_ACTIVE) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SUSPENDED),               MP_OBJ_NEW_SMALL_INT(PYB_PWR_MODE_LPDS) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_HIBERNATING),             MP_OBJ_NEW_SMALL_INT(PYB_PWR_MODE_HIBERNATE) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_POWER_ON),                MP_OBJ_NEW_SMALL_INT(PYB_SLP_PWRON_RESET) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_HARD_RESET),              MP_OBJ_NEW_SMALL_INT(PYB_SLP_HARD_RESET) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_WDT_RESET),               MP_OBJ_NEW_SMALL_INT(PYB_SLP_WDT_RESET) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_HIB_RESET),               MP_OBJ_NEW_SMALL_INT(PYB_SLP_HIB_RESET) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SOFT_RESET),              MP_OBJ_NEW_SMALL_INT(PYB_SLP_SOFT_RESET) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_WLAN_WAKE),               MP_OBJ_NEW_SMALL_INT(PYB_SLP_WAKED_BY_WLAN) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_PIN_WAKE),                MP_OBJ_NEW_SMALL_INT(PYB_SLP_WAKED_BY_GPIO) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_RTC_WAKE),                MP_OBJ_NEW_SMALL_INT(PYB_SLP_WAKED_BY_RTC) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pybsleep_locals_dict, pybsleep_locals_dict_table);
+
+STATIC const mp_obj_type_t pybsleep_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Sleep,
+    .locals_dict = (mp_obj_t)&pybsleep_locals_dict,
+};
+
+const mp_obj_base_t pyb_sleep_obj = {&pybsleep_type};