diff --git a/bcm2708-rpi-b-plus.dtb b/bcm2708-rpi-b-plus.dtb index 517e99ad69a6..cb03bd43f862 100644 Binary files a/bcm2708-rpi-b-plus.dtb and b/bcm2708-rpi-b-plus.dtb differ diff --git a/bcm2708-rpi-b.dtb b/bcm2708-rpi-b.dtb index 49df766ebc4f..1593935d0eae 100644 Binary files a/bcm2708-rpi-b.dtb and b/bcm2708-rpi-b.dtb differ diff --git a/bcm2708-rpi-cm.dtb b/bcm2708-rpi-cm.dtb index cb02efddfb9b..e4039dfa25dc 100644 Binary files a/bcm2708-rpi-cm.dtb and b/bcm2708-rpi-cm.dtb differ diff --git a/bcm2709-rpi-2-b.dtb b/bcm2709-rpi-2-b.dtb index a20e3f2da689..252a349fdd07 100644 Binary files a/bcm2709-rpi-2-b.dtb and b/bcm2709-rpi-2-b.dtb differ diff --git a/fixup.dat b/fixup.dat index 1dd78fe50603..ed2c52d73b93 100644 Binary files a/fixup.dat and b/fixup.dat differ diff --git a/fixup_cd.dat b/fixup_cd.dat index 58a39cfd1d0e..bc261b72ae09 100644 Binary files a/fixup_cd.dat and b/fixup_cd.dat differ diff --git a/fixup_db.dat b/fixup_db.dat index 8ac03bad8af9..2396793644ee 100644 Binary files a/fixup_db.dat and b/fixup_db.dat differ diff --git a/fixup_x.dat b/fixup_x.dat index 142947028f3d..f971bad0f390 100644 Binary files a/fixup_x.dat and b/fixup_x.dat differ diff --git a/git_hash b/git_hash index ffb1c6cd9da9..31eadc45db65 100644 --- a/git_hash +++ b/git_hash @@ -1 +1 @@ -8d8e1baf06ada6b25e133a2704ddd6e2f5567dd8 +5d5a5ceb829329f490dd1c5cb634da66ef5d0f92 diff --git a/kernel.img b/kernel.img index 717c3213a519..a0823597fa85 100644 Binary files a/kernel.img and b/kernel.img differ diff --git a/kernel7.img b/kernel7.img index 1c0291a4bb5b..8ba479f9962f 100644 Binary files a/kernel7.img and b/kernel7.img differ diff --git a/overlays/README b/overlays/README index d81d41ac5a20..980d3583b2a3 100644 --- a/overlays/README +++ b/overlays/README @@ -441,7 +441,7 @@ Params: overclock_50 Clock (in MHz) to use when the MMC framework force_pio Disable DMA support (default off) pio_limit Number of blocks above which to use DMA - (default 2) + (default 1) debug Enable debug output (default off) diff --git a/start.elf b/start.elf index 974e2cb731c2..233a593d8be4 100644 Binary files a/start.elf and b/start.elf differ diff --git a/start_cd.elf b/start_cd.elf index b82d7c4bc15f..8ded8ed0009e 100644 Binary files a/start_cd.elf and b/start_cd.elf differ diff --git a/start_db.elf b/start_db.elf index ae6aff230646..cf2ab26aa765 100644 Binary files a/start_db.elf and b/start_db.elf differ diff --git a/start_x.elf b/start_x.elf index 73dcda0fe176..85779ca9109c 100644 Binary files a/start_x.elf and b/start_x.elf differ diff --git a/vc/hardfp/opt/vc/bin/containers_check_frame_int b/vc/hardfp/opt/vc/bin/containers_check_frame_int index 3e66fb9d514f..6fa42e3dada2 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_check_frame_int and b/vc/hardfp/opt/vc/bin/containers_check_frame_int differ diff --git a/vc/hardfp/opt/vc/bin/containers_datagram_receiver b/vc/hardfp/opt/vc/bin/containers_datagram_receiver index 96b2cc970e52..122f66aebef5 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_datagram_receiver and b/vc/hardfp/opt/vc/bin/containers_datagram_receiver differ diff --git a/vc/hardfp/opt/vc/bin/containers_datagram_sender b/vc/hardfp/opt/vc/bin/containers_datagram_sender index ab9592c55423..34c1b8d46b16 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_datagram_sender and b/vc/hardfp/opt/vc/bin/containers_datagram_sender differ diff --git a/vc/hardfp/opt/vc/bin/containers_dump_pktfile b/vc/hardfp/opt/vc/bin/containers_dump_pktfile index 5533bb8f45fa..c1e5a22a81f1 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_dump_pktfile and b/vc/hardfp/opt/vc/bin/containers_dump_pktfile differ diff --git a/vc/hardfp/opt/vc/bin/containers_rtp_decoder b/vc/hardfp/opt/vc/bin/containers_rtp_decoder index 7ae1464b9dac..c14b21050b97 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_rtp_decoder and b/vc/hardfp/opt/vc/bin/containers_rtp_decoder differ diff --git a/vc/hardfp/opt/vc/bin/containers_stream_client b/vc/hardfp/opt/vc/bin/containers_stream_client index d50695fade1c..c5d8609e03da 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_stream_client and b/vc/hardfp/opt/vc/bin/containers_stream_client differ diff --git a/vc/hardfp/opt/vc/bin/containers_stream_server b/vc/hardfp/opt/vc/bin/containers_stream_server index 1680490f4956..3a2d14d377b4 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_stream_server and b/vc/hardfp/opt/vc/bin/containers_stream_server differ diff --git a/vc/hardfp/opt/vc/bin/containers_test b/vc/hardfp/opt/vc/bin/containers_test index fbf52d83da34..8b2e741ed2b7 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_test and b/vc/hardfp/opt/vc/bin/containers_test differ diff --git a/vc/hardfp/opt/vc/bin/containers_test_bits b/vc/hardfp/opt/vc/bin/containers_test_bits index 7f7a38cd3910..82f8a905ce05 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_test_bits and b/vc/hardfp/opt/vc/bin/containers_test_bits differ diff --git a/vc/hardfp/opt/vc/bin/containers_test_uri b/vc/hardfp/opt/vc/bin/containers_test_uri index 5ed3de64e80e..78b70236ea25 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_test_uri and b/vc/hardfp/opt/vc/bin/containers_test_uri differ diff --git a/vc/hardfp/opt/vc/bin/containers_uri_pipe b/vc/hardfp/opt/vc/bin/containers_uri_pipe index 8959b028cb04..b02d41bf16f4 100755 Binary files a/vc/hardfp/opt/vc/bin/containers_uri_pipe and b/vc/hardfp/opt/vc/bin/containers_uri_pipe differ diff --git a/vc/hardfp/opt/vc/bin/raspistill b/vc/hardfp/opt/vc/bin/raspistill index dbfa7e8ad934..8144bbee19d8 100755 Binary files a/vc/hardfp/opt/vc/bin/raspistill and b/vc/hardfp/opt/vc/bin/raspistill differ diff --git a/vc/hardfp/opt/vc/bin/raspivid b/vc/hardfp/opt/vc/bin/raspivid index fc20cdfb64f4..eefb3659d98b 100755 Binary files a/vc/hardfp/opt/vc/bin/raspivid and b/vc/hardfp/opt/vc/bin/raspivid differ diff --git a/vc/hardfp/opt/vc/bin/raspividyuv b/vc/hardfp/opt/vc/bin/raspividyuv index 374239e128f4..55a91088b905 100755 Binary files a/vc/hardfp/opt/vc/bin/raspividyuv and b/vc/hardfp/opt/vc/bin/raspividyuv differ diff --git a/vc/hardfp/opt/vc/bin/raspiyuv b/vc/hardfp/opt/vc/bin/raspiyuv index b4970066722c..ef8b7de01c5a 100755 Binary files a/vc/hardfp/opt/vc/bin/raspiyuv and b/vc/hardfp/opt/vc/bin/raspiyuv differ diff --git a/vc/hardfp/opt/vc/bin/vchiq_test b/vc/hardfp/opt/vc/bin/vchiq_test index d380af37dd8b..313f04ce524c 100755 Binary files a/vc/hardfp/opt/vc/bin/vchiq_test and b/vc/hardfp/opt/vc/bin/vchiq_test differ diff --git a/vc/hardfp/opt/vc/lib/libEGL.so b/vc/hardfp/opt/vc/lib/libEGL.so index eb95e5787ad0..59b28b31bc83 100644 Binary files a/vc/hardfp/opt/vc/lib/libEGL.so and b/vc/hardfp/opt/vc/lib/libEGL.so differ diff --git a/vc/hardfp/opt/vc/lib/libEGL_static.a b/vc/hardfp/opt/vc/lib/libEGL_static.a index b9d85bd4614a..af8e9a2b0516 100644 Binary files a/vc/hardfp/opt/vc/lib/libEGL_static.a and b/vc/hardfp/opt/vc/lib/libEGL_static.a differ diff --git a/vc/hardfp/opt/vc/lib/libGLESv2.so b/vc/hardfp/opt/vc/lib/libGLESv2.so index 45c517da003a..f2f1256d7168 100644 Binary files a/vc/hardfp/opt/vc/lib/libGLESv2.so and b/vc/hardfp/opt/vc/lib/libGLESv2.so differ diff --git a/vc/hardfp/opt/vc/lib/libGLESv2_static.a b/vc/hardfp/opt/vc/lib/libGLESv2_static.a index 1248b803c64b..77efe1d6ec45 100644 Binary files a/vc/hardfp/opt/vc/lib/libGLESv2_static.a and b/vc/hardfp/opt/vc/lib/libGLESv2_static.a differ diff --git a/vc/hardfp/opt/vc/lib/libWFC.so b/vc/hardfp/opt/vc/lib/libWFC.so index cb437aa87089..23b6ac316ad6 100644 Binary files a/vc/hardfp/opt/vc/lib/libWFC.so and b/vc/hardfp/opt/vc/lib/libWFC.so differ diff --git a/vc/hardfp/opt/vc/lib/libcontainers.so b/vc/hardfp/opt/vc/lib/libcontainers.so index f55cda56ad98..d5eedc5c5cd1 100644 Binary files a/vc/hardfp/opt/vc/lib/libcontainers.so and b/vc/hardfp/opt/vc/lib/libcontainers.so differ diff --git a/vc/hardfp/opt/vc/lib/libdebug_sym_static.a b/vc/hardfp/opt/vc/lib/libdebug_sym_static.a index 33981aaa98f4..fedd44a01e51 100644 Binary files a/vc/hardfp/opt/vc/lib/libdebug_sym_static.a and b/vc/hardfp/opt/vc/lib/libdebug_sym_static.a differ diff --git a/vc/hardfp/opt/vc/lib/libkhrn_client.a b/vc/hardfp/opt/vc/lib/libkhrn_client.a index f027cad55c27..a8b020e014c2 100644 Binary files a/vc/hardfp/opt/vc/lib/libkhrn_client.a and b/vc/hardfp/opt/vc/lib/libkhrn_client.a differ diff --git a/vc/hardfp/opt/vc/lib/libkhrn_static.a b/vc/hardfp/opt/vc/lib/libkhrn_static.a index 7ae379f9f5ff..bf19d0cc9067 100644 Binary files a/vc/hardfp/opt/vc/lib/libkhrn_static.a and b/vc/hardfp/opt/vc/lib/libkhrn_static.a differ diff --git a/vc/hardfp/opt/vc/lib/libvcfiled_check.a b/vc/hardfp/opt/vc/lib/libvcfiled_check.a index 14e19fb76095..17c4e918003f 100644 Binary files a/vc/hardfp/opt/vc/lib/libvcfiled_check.a and b/vc/hardfp/opt/vc/lib/libvcfiled_check.a differ diff --git a/vc/hardfp/opt/vc/lib/libvchiq_arm.so b/vc/hardfp/opt/vc/lib/libvchiq_arm.so index 79ceeea8e9c9..7fc2a4b99557 100644 Binary files a/vc/hardfp/opt/vc/lib/libvchiq_arm.so and b/vc/hardfp/opt/vc/lib/libvchiq_arm.so differ diff --git a/vc/hardfp/opt/vc/lib/libvchostif.a b/vc/hardfp/opt/vc/lib/libvchostif.a index b53881b7d040..23a3493f1689 100644 Binary files a/vc/hardfp/opt/vc/lib/libvchostif.a and b/vc/hardfp/opt/vc/lib/libvchostif.a differ diff --git a/vc/hardfp/opt/vc/lib/libvcilcs.a b/vc/hardfp/opt/vc/lib/libvcilcs.a index aad9c6c5ec3f..084a0bbd8a66 100644 Binary files a/vc/hardfp/opt/vc/lib/libvcilcs.a and b/vc/hardfp/opt/vc/lib/libvcilcs.a differ diff --git a/vc/hardfp/opt/vc/lib/libvcos.so b/vc/hardfp/opt/vc/lib/libvcos.so index 2f0a9606fb04..f58d75c5af5a 100644 Binary files a/vc/hardfp/opt/vc/lib/libvcos.so and b/vc/hardfp/opt/vc/lib/libvcos.so differ diff --git a/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a index 3094289bd909..38d2b6a946e8 100644 Binary files a/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a and b/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_asf.so b/vc/hardfp/opt/vc/lib/plugins/reader_asf.so index 2861530a307f..1b9316e58b0b 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_asf.so and b/vc/hardfp/opt/vc/lib/plugins/reader_asf.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_avi.so b/vc/hardfp/opt/vc/lib/plugins/reader_avi.so index 81f49046a77e..02f982a7d22b 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_avi.so and b/vc/hardfp/opt/vc/lib/plugins/reader_avi.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_binary.so b/vc/hardfp/opt/vc/lib/plugins/reader_binary.so index 64b40b8b9427..66ccf043130c 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_binary.so and b/vc/hardfp/opt/vc/lib/plugins/reader_binary.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_flv.so b/vc/hardfp/opt/vc/lib/plugins/reader_flv.so index bf04bf006a50..412bd78dd1f9 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_flv.so and b/vc/hardfp/opt/vc/lib/plugins/reader_flv.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so b/vc/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so index b28ab0de5fe9..9b415a7167a0 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so and b/vc/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_mkv.so b/vc/hardfp/opt/vc/lib/plugins/reader_mkv.so index a3f2c4cdece4..6c1bfb64f2c0 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_mkv.so and b/vc/hardfp/opt/vc/lib/plugins/reader_mkv.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_mp4.so b/vc/hardfp/opt/vc/lib/plugins/reader_mp4.so index 92e152878be7..76da47f5dbe0 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_mp4.so and b/vc/hardfp/opt/vc/lib/plugins/reader_mp4.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_mpga.so b/vc/hardfp/opt/vc/lib/plugins/reader_mpga.so index 42b907a0a3d1..b31975206da0 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_mpga.so and b/vc/hardfp/opt/vc/lib/plugins/reader_mpga.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_ps.so b/vc/hardfp/opt/vc/lib/plugins/reader_ps.so index 4f4c35df8c96..dbd46ddaeaec 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_ps.so and b/vc/hardfp/opt/vc/lib/plugins/reader_ps.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_qsynth.so b/vc/hardfp/opt/vc/lib/plugins/reader_qsynth.so index 2ae43d2ab6a0..ae370f9abc37 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_qsynth.so and b/vc/hardfp/opt/vc/lib/plugins/reader_qsynth.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_raw_video.so b/vc/hardfp/opt/vc/lib/plugins/reader_raw_video.so index 00c2332c6716..8014160da30a 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_raw_video.so and b/vc/hardfp/opt/vc/lib/plugins/reader_raw_video.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_rcv.so b/vc/hardfp/opt/vc/lib/plugins/reader_rcv.so index 711b62600064..79e16bb26a95 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_rcv.so and b/vc/hardfp/opt/vc/lib/plugins/reader_rcv.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_rtp.so b/vc/hardfp/opt/vc/lib/plugins/reader_rtp.so index 0d86d03300ce..6f4f28383fa4 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_rtp.so and b/vc/hardfp/opt/vc/lib/plugins/reader_rtp.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_rtsp.so b/vc/hardfp/opt/vc/lib/plugins/reader_rtsp.so index f9ef62fdc092..c5887a6f13ad 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_rtsp.so and b/vc/hardfp/opt/vc/lib/plugins/reader_rtsp.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_rv9.so b/vc/hardfp/opt/vc/lib/plugins/reader_rv9.so index f23fe8618ec4..7c4ee33ff2f4 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_rv9.so and b/vc/hardfp/opt/vc/lib/plugins/reader_rv9.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_simple.so b/vc/hardfp/opt/vc/lib/plugins/reader_simple.so index 4125d4d18402..6804fec8e74b 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_simple.so and b/vc/hardfp/opt/vc/lib/plugins/reader_simple.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/reader_wav.so b/vc/hardfp/opt/vc/lib/plugins/reader_wav.so index b1e53ae5e009..c88e9ade4884 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/reader_wav.so and b/vc/hardfp/opt/vc/lib/plugins/reader_wav.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/writer_avi.so b/vc/hardfp/opt/vc/lib/plugins/writer_avi.so index 4749268d9941..607b7db316ad 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/writer_avi.so and b/vc/hardfp/opt/vc/lib/plugins/writer_avi.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/writer_binary.so b/vc/hardfp/opt/vc/lib/plugins/writer_binary.so index cd2598df6190..85e9a6acc597 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/writer_binary.so and b/vc/hardfp/opt/vc/lib/plugins/writer_binary.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/writer_dummy.so b/vc/hardfp/opt/vc/lib/plugins/writer_dummy.so index 7fd7801fbbc2..80fd20b838d3 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/writer_dummy.so and b/vc/hardfp/opt/vc/lib/plugins/writer_dummy.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/writer_mp4.so b/vc/hardfp/opt/vc/lib/plugins/writer_mp4.so index d965d751ec53..3a26d5c537a2 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/writer_mp4.so and b/vc/hardfp/opt/vc/lib/plugins/writer_mp4.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/writer_raw_video.so b/vc/hardfp/opt/vc/lib/plugins/writer_raw_video.so index 50abd7c19a6d..00b20cc54f94 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/writer_raw_video.so and b/vc/hardfp/opt/vc/lib/plugins/writer_raw_video.so differ diff --git a/vc/hardfp/opt/vc/lib/plugins/writer_simple.so b/vc/hardfp/opt/vc/lib/plugins/writer_simple.so index cce1b92ff8c1..e3044bb5e9a9 100644 Binary files a/vc/hardfp/opt/vc/lib/plugins/writer_simple.so and b/vc/hardfp/opt/vc/lib/plugins/writer_simple.so differ diff --git a/vc/sdk/opt/vc/include/KHR/khrplatform.h b/vc/sdk/opt/vc/include/KHR/khrplatform.h index 85ea03d054a1..ecb5199098c0 100644 --- a/vc/sdk/opt/vc/include/KHR/khrplatform.h +++ b/vc/sdk/opt/vc/include/KHR/khrplatform.h @@ -24,9 +24,10 @@ ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. */ -/* Platform-specific types and definitions. - * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $ - * +/* Khronos platform-specific types and definitions. + * + * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ + * * Adopters may modify this file to suit their platform. Adopters are * encouraged to submit platform specific modifications to the Khronos * group so that they can be included in future versions of this file. @@ -37,19 +38,19 @@ * A predefined template which fills in some of the bug fields can be * reached using http://tinyurl.com/khrplatform-h-bugreport, but you * must create a Bugzilla login first. - * + * * * See the Implementer's Guidelines for information about where this file - * should be located on your system. + * should be located on your system and for more details of its use: * http://www.khronos.org/registry/implementers_guide.pdf * - * * This file should be included as * #include - * by the Khronos API header file that uses its types and defines. + * by Khronos client API header files that use its types and defines. * - * The types in this file should only be used to define API-specific types. - * Types defined in this file: + * The types in khrplatform.h should only be used to define API-specific types. + * + * Types defined in khrplatform.h: * khronos_int8_t signed 8 bit * khronos_uint8_t unsigned 8 bit * khronos_int16_t signed 16 bit @@ -67,34 +68,42 @@ * khronos_utime_nanoseconds_t unsigned time interval or absolute time in * nanoseconds * khronos_stime_nanoseconds_t signed time interval in nanoseconds + * khronos_boolean_enum_t enumerated boolean type. This should + * only be used as a base type when a client API's boolean type is + * an enum. Client APIs which use an integer or other type for + * booleans cannot use this as the base type for their boolean. + * + * Tokens defined in khrplatform.h: + * + * KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. * - * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. - * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. - * + * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. + * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. * - * Macros defined in this file: + * Calling convention macros defined in this file: * KHRONOS_APICALL * KHRONOS_APIENTRY * KHRONOS_APIATTRIBUTES + * * These may be used in function prototypes as: + * * KHRONOS_APICALL void KHRONOS_APIENTRY funcname( * int arg1, * int arg2) KHRONOS_APIATTRIBUTES; */ -#if 0 -#include "interface/khronos/common/khrn_client_mangle.h" -#endif - /*------------------------------------------------------------------------- * Definition of KHRONOS_APICALL *------------------------------------------------------------------------- * This precedes the return type of the function in the function prototype. */ -#ifndef KHAPI -#define KHAPI extern +#if defined(_WIN32) && !defined(__SCITECH_SNAP__) +# define KHRONOS_APICALL __declspec(dllimport) +#elif defined (__SYMBIAN32__) +# define KHRONOS_APICALL IMPORT_C +#else +# define KHRONOS_APICALL #endif -#define KHRONOS_APICALL KHAPI /*------------------------------------------------------------------------- * Definition of KHRONOS_APIENTRY @@ -102,8 +111,11 @@ * This follows the return type of the function and precedes the function * name in the function prototype. */ -#ifndef KHRONOS_APIENTRY -#define KHRONOS_APIENTRY +#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) + /* Win32 but not WinCE */ +# define KHRONOS_APIENTRY __stdcall +#else +# define KHRONOS_APIENTRY #endif /*------------------------------------------------------------------------- @@ -222,10 +234,23 @@ typedef signed char khronos_int8_t; typedef unsigned char khronos_uint8_t; typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; + +/* + * Types that differ between LLP64 and LP64 architectures - in LLP64, + * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears + * to be the only LLP64 architecture in current use. + */ +#ifdef _WIN64 +typedef signed long long int khronos_intptr_t; +typedef unsigned long long int khronos_uintptr_t; +typedef signed long long int khronos_ssize_t; +typedef unsigned long long int khronos_usize_t; +#else typedef signed long int khronos_intptr_t; typedef unsigned long int khronos_uintptr_t; typedef signed long int khronos_ssize_t; typedef unsigned long int khronos_usize_t; +#endif #if KHRONOS_SUPPORT_FLOAT /* @@ -237,16 +262,34 @@ typedef float khronos_float_t; #if KHRONOS_SUPPORT_INT64 /* Time types * - * These types can be used to represent a time interval in nanoseconds or - * an absolute Unadjusted System Time. Unadjusted System Time is the number - * of nanoseconds since some arbitrary system event (e.g. since the last - * time the system booted). The Unadjusted System Time is an unsigned - * 64 bit value that wraps back to 0 every 584 years. Time intervals + * These types can be used to represent a time interval in nanoseconds or + * an absolute Unadjusted System Time. Unadjusted System Time is the number + * of nanoseconds since some arbitrary system event (e.g. since the last + * time the system booted). The Unadjusted System Time is an unsigned + * 64 bit value that wraps back to 0 every 584 years. Time intervals * may be either signed or unsigned. */ typedef khronos_uint64_t khronos_utime_nanoseconds_t; typedef khronos_int64_t khronos_stime_nanoseconds_t; #endif +/* + * Dummy value used to pad enum types to 32 bits. + */ +#ifndef KHRONOS_MAX_ENUM +#define KHRONOS_MAX_ENUM 0x7FFFFFFF +#endif + +/* + * Enumerated boolean type + * + * Values other than zero should be considered to be true. Therefore + * comparisons should not be made against KHRONOS_TRUE. + */ +typedef enum { + KHRONOS_FALSE = 0, + KHRONOS_TRUE = 1, + KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM +} khronos_boolean_enum_t; #endif /* __khrplatform_h_ */ diff --git a/vc/softfp/opt/vc/bin/raspistill b/vc/softfp/opt/vc/bin/raspistill index 07fba1b1e280..e11e5036f57a 100755 Binary files a/vc/softfp/opt/vc/bin/raspistill and b/vc/softfp/opt/vc/bin/raspistill differ diff --git a/vc/softfp/opt/vc/bin/raspivid b/vc/softfp/opt/vc/bin/raspivid index ab8645882ac4..acc2114906cd 100755 Binary files a/vc/softfp/opt/vc/bin/raspivid and b/vc/softfp/opt/vc/bin/raspivid differ diff --git a/vc/softfp/opt/vc/bin/raspividyuv b/vc/softfp/opt/vc/bin/raspividyuv index 733378df2df1..9a0cbca4e64d 100755 Binary files a/vc/softfp/opt/vc/bin/raspividyuv and b/vc/softfp/opt/vc/bin/raspividyuv differ diff --git a/vc/softfp/opt/vc/bin/raspiyuv b/vc/softfp/opt/vc/bin/raspiyuv index 344931cbb176..0e0089ea33bd 100755 Binary files a/vc/softfp/opt/vc/bin/raspiyuv and b/vc/softfp/opt/vc/bin/raspiyuv differ diff --git a/vc/softfp/opt/vc/bin/vchiq_test b/vc/softfp/opt/vc/bin/vchiq_test index 81c52aca6da8..6169045cea21 100755 Binary files a/vc/softfp/opt/vc/bin/vchiq_test and b/vc/softfp/opt/vc/bin/vchiq_test differ diff --git a/vc/softfp/opt/vc/lib/libEGL.so b/vc/softfp/opt/vc/lib/libEGL.so index 51da2f8cadee..58932236357e 100644 Binary files a/vc/softfp/opt/vc/lib/libEGL.so and b/vc/softfp/opt/vc/lib/libEGL.so differ diff --git a/vc/softfp/opt/vc/lib/libEGL_static.a b/vc/softfp/opt/vc/lib/libEGL_static.a index 213d64797b98..fc3caa15279c 100644 Binary files a/vc/softfp/opt/vc/lib/libEGL_static.a and b/vc/softfp/opt/vc/lib/libEGL_static.a differ diff --git a/vc/softfp/opt/vc/lib/libGLESv2.so b/vc/softfp/opt/vc/lib/libGLESv2.so index e1467f33893c..3b10bf8e3fba 100644 Binary files a/vc/softfp/opt/vc/lib/libGLESv2.so and b/vc/softfp/opt/vc/lib/libGLESv2.so differ diff --git a/vc/softfp/opt/vc/lib/libGLESv2_static.a b/vc/softfp/opt/vc/lib/libGLESv2_static.a index 5f494e9397de..a2198a552432 100644 Binary files a/vc/softfp/opt/vc/lib/libGLESv2_static.a and b/vc/softfp/opt/vc/lib/libGLESv2_static.a differ diff --git a/vc/softfp/opt/vc/lib/libWFC.so b/vc/softfp/opt/vc/lib/libWFC.so index eee2f1f5927c..cc6d1d81eb54 100644 Binary files a/vc/softfp/opt/vc/lib/libWFC.so and b/vc/softfp/opt/vc/lib/libWFC.so differ diff --git a/vc/softfp/opt/vc/lib/libdebug_sym_static.a b/vc/softfp/opt/vc/lib/libdebug_sym_static.a index 3679d2ee0e0e..09132d33211c 100644 Binary files a/vc/softfp/opt/vc/lib/libdebug_sym_static.a and b/vc/softfp/opt/vc/lib/libdebug_sym_static.a differ diff --git a/vc/softfp/opt/vc/lib/libkhrn_client.a b/vc/softfp/opt/vc/lib/libkhrn_client.a index 188e9995a4b2..73b71dd6885c 100644 Binary files a/vc/softfp/opt/vc/lib/libkhrn_client.a and b/vc/softfp/opt/vc/lib/libkhrn_client.a differ diff --git a/vc/softfp/opt/vc/lib/libkhrn_static.a b/vc/softfp/opt/vc/lib/libkhrn_static.a index 4d3e8395657f..898d82543ea8 100644 Binary files a/vc/softfp/opt/vc/lib/libkhrn_static.a and b/vc/softfp/opt/vc/lib/libkhrn_static.a differ diff --git a/vc/softfp/opt/vc/lib/libvcfiled_check.a b/vc/softfp/opt/vc/lib/libvcfiled_check.a index 80689e7cf7bf..96a18b303943 100644 Binary files a/vc/softfp/opt/vc/lib/libvcfiled_check.a and b/vc/softfp/opt/vc/lib/libvcfiled_check.a differ diff --git a/vc/softfp/opt/vc/lib/libvchiq_arm.so b/vc/softfp/opt/vc/lib/libvchiq_arm.so index 8e1bd15a2aae..bce3c9c3e856 100644 Binary files a/vc/softfp/opt/vc/lib/libvchiq_arm.so and b/vc/softfp/opt/vc/lib/libvchiq_arm.so differ diff --git a/vc/softfp/opt/vc/lib/libvchostif.a b/vc/softfp/opt/vc/lib/libvchostif.a index 417c4052ae6a..291e51388751 100644 Binary files a/vc/softfp/opt/vc/lib/libvchostif.a and b/vc/softfp/opt/vc/lib/libvchostif.a differ diff --git a/vc/softfp/opt/vc/lib/libvcilcs.a b/vc/softfp/opt/vc/lib/libvcilcs.a index 76f59670f81c..10cbbd163651 100644 Binary files a/vc/softfp/opt/vc/lib/libvcilcs.a and b/vc/softfp/opt/vc/lib/libvcilcs.a differ diff --git a/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a index 7c81e92ec031..449fb9882131 100644 Binary files a/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a and b/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a differ