From 7e2a9480386b598282aee7c5135a545da0b839d9 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 17 Oct 2011 17:52:55 +0000 Subject: Fix PIC32 ramfunc logic; add rectangle graphic functions git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4050 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/mips/src/pic32mx/pic32mx-head.S | 7 ++- nuttx/configs/pcblogic-pic32mx/ostest/defconfig | 5 ++ nuttx/configs/pcblogic-pic32mx/ostest/ld.script | 4 +- nuttx/configs/pic32-starterkit/ostest/defconfig | 5 ++ nuttx/configs/pic32-starterkit/ostest/ld.script | 4 +- nuttx/configs/sure-pic32mx/ostest/defconfig | 5 ++ nuttx/configs/sure-pic32mx/ostest/ld.script | 4 +- nuttx/graphics/nxglib/Make.defs | 6 +- nuttx/graphics/nxglib/nxglib_intersecting.c | 83 ++++++++++++++++++++++++ nuttx/graphics/nxglib/nxglib_rectadd.c | 84 +++++++++++++++++++++++++ nuttx/include/nuttx/nx/nxglib.h | 23 +++++++ 11 files changed, 218 insertions(+), 12 deletions(-) create mode 100644 nuttx/graphics/nxglib/nxglib_intersecting.c create mode 100644 nuttx/graphics/nxglib/nxglib_rectadd.c diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S index dedc84558..065598ec6 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S @@ -43,6 +43,7 @@ #include #include "pic32mx-config.h" +#include "pic32mx-bmx.h" #include "excptmacros.h" /**************************************************************************** @@ -333,13 +334,13 @@ __start: */ la t1, _bmxdkpba_address - la t2, BMXDKPBA + la t2, PIC32MX_BMX_DKPBA sw t1, 0(t2) la t1, _bmxdudba_address - la t2, BMXDUDBA + la t2, PIC32MX_BMX_DUDBA sw t1, 0(t2) la t1, _bmxdupba_address - la t2, BMXDUPBA + la t2, PIC32MX_BMX_DUPBA sw t1, 0(t2) .Lnoramfuncs: #endif diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig index c6057e875..4c796fa2e 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig @@ -90,6 +90,11 @@ CONFIG_ARCH_BUTTONS=n CONFIG_ARCH_CALIBRATION=n CONFIG_ARCH_DMA=n +# +# Enable support for RAM-based functions +# +CONFIG_PIC32MX_RAMFUNCS=y + # # Identify toolchain and linker options # diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/ld.script b/nuttx/configs/pcblogic-pic32mx/ostest/ld.script index 4e856ac25..139803c58 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/ld.script +++ b/nuttx/configs/pcblogic-pic32mx/ostest/ld.script @@ -189,7 +189,7 @@ SECTIONS /* RAM functions are positioned at the beginning of RAM so that * they can be guaranteed to satisfy the 2Kb alignment requirement. */ -/* + .ramfunc ALIGN(2K) : { _sramfunc = ABSOLUTE(.); @@ -202,7 +202,7 @@ SECTIONS _bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ; _bmxdudba_address = LENGTH(kseg1_datamem) ; _bmxdupba_address = LENGTH(kseg1_datamem) ; -*/ + .dbg_data (NOLOAD) : { . += (DEFINED (_DEBUGGER) ? 0x200 : 0x0); diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index 7ba611559..33e0d703d 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -90,6 +90,11 @@ CONFIG_ARCH_BUTTONS=n CONFIG_ARCH_CALIBRATION=n CONFIG_ARCH_DMA=n +# +# Enable support for RAM-based functions +# +CONFIG_PIC32MX_RAMFUNCS=y + # # Identify toolchain and linker options # diff --git a/nuttx/configs/pic32-starterkit/ostest/ld.script b/nuttx/configs/pic32-starterkit/ostest/ld.script index 35131d9d7..c9e85d059 100644 --- a/nuttx/configs/pic32-starterkit/ostest/ld.script +++ b/nuttx/configs/pic32-starterkit/ostest/ld.script @@ -189,7 +189,7 @@ SECTIONS /* RAM functions are positioned at the beginning of RAM so that * they can be guaranteed to satisfy the 2Kb alignment requirement. */ -/* + .ramfunc ALIGN(2K) : { _sramfunc = ABSOLUTE(.); @@ -202,7 +202,7 @@ SECTIONS _bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ; _bmxdudba_address = LENGTH(kseg1_datamem) ; _bmxdupba_address = LENGTH(kseg1_datamem) ; -*/ + .dbg_data (NOLOAD) : { . += (DEFINED (_DEBUGGER) ? 0x200 : 0x0); diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig index 88e4649ba..ed37cc352 100644 --- a/nuttx/configs/sure-pic32mx/ostest/defconfig +++ b/nuttx/configs/sure-pic32mx/ostest/defconfig @@ -90,6 +90,11 @@ CONFIG_ARCH_BUTTONS=n CONFIG_ARCH_CALIBRATION=n CONFIG_ARCH_DMA=n +# +# Enable support for RAM-based functions +# +CONFIG_PIC32MX_RAMFUNCS=y + # # Identify toolchain and linker options # diff --git a/nuttx/configs/sure-pic32mx/ostest/ld.script b/nuttx/configs/sure-pic32mx/ostest/ld.script index fa6eeada1..e1e5cc258 100644 --- a/nuttx/configs/sure-pic32mx/ostest/ld.script +++ b/nuttx/configs/sure-pic32mx/ostest/ld.script @@ -189,7 +189,7 @@ SECTIONS /* RAM functions are positioned at the beginning of RAM so that * they can be guaranteed to satisfy the 2Kb alignment requirement. */ -/* + .ramfunc ALIGN(2K) : { _sramfunc = ABSOLUTE(.); @@ -202,7 +202,7 @@ SECTIONS _bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ; _bmxdudba_address = LENGTH(kseg1_datamem) ; _bmxdupba_address = LENGTH(kseg1_datamem) ; -*/ + .dbg_data (NOLOAD) : { . += (DEFINED (_DEBUGGER) ? 0x200 : 0x0); diff --git a/nuttx/graphics/nxglib/Make.defs b/nuttx/graphics/nxglib/Make.defs index 89eb3704b..9dd4c83f7 100644 --- a/nuttx/graphics/nxglib/Make.defs +++ b/nuttx/graphics/nxglib/Make.defs @@ -66,9 +66,9 @@ RCOPY2_CSRCS = nxglib_copyrectangle_8bpp.c nxglib_copyrectangle_16bpp.c \ nxglib_copyrectangle_24bpp.c nxglib_copyrectangle_32bpp.c RECT_CSRCS = nxglib_rectcopy.c nxglib_rectoffset.c nxglib_vectoradd.c \ - nxglib_vectsubtract.c nxglib_rectintersect.c \ - nxglib_nonintersecting.c nxglib_rectunion.c nxglib_rectinside.c \ - nxglib_rectoverlap.c nxglib_rectsize.c nxglib_nullrect.c + nxglib_vectsubtract.c nxglib_rectadd.c nxglib_rectintersect.c \ + nxglib_intersecting.c nxglib_nonintersecting.c nxglib_rectunion.c \ + nxglib_rectinside.c nxglib_rectoverlap.c nxglib_rectsize.c nxglib_nullrect.c TRAP_CSRCS = nxglib_runoffset.c nxglib_runcopy.c \ nxglib_trapoffset.c nxglib_trapcopy.c diff --git a/nuttx/graphics/nxglib/nxglib_intersecting.c b/nuttx/graphics/nxglib/nxglib_intersecting.c new file mode 100644 index 000000000..c495a9e3d --- /dev/null +++ b/nuttx/graphics/nxglib/nxglib_intersecting.c @@ -0,0 +1,83 @@ +/**************************************************************************** + * graphics/nxglib/nxsglib_intersecting.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name NuttX 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxgl_intersecting + * + * Description: + * Return true if the rectangles intersect. + * + ****************************************************************************/ + +bool nxgl_intersecting(FAR const struct nxgl_rect_s *rect1, + FAR const struct nxgl_rect_s *rect2) +{ + return ((rect1->pt2.x > rect2->pt1.x) && (rect1->pt2.y > rect2->pt1.y) && + (rect1->pt1.x < rect2->pt2.x) && (rect1->pt1.y < rect2->pt1.y)); +} diff --git a/nuttx/graphics/nxglib/nxglib_rectadd.c b/nuttx/graphics/nxglib/nxglib_rectadd.c new file mode 100644 index 000000000..b53e6b04c --- /dev/null +++ b/nuttx/graphics/nxglib/nxglib_rectadd.c @@ -0,0 +1,84 @@ +/**************************************************************************** + * graphics/nxglib/nxsglib_rectadd.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name NuttX 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxgl_rectadd + * + * Description: + * Return the rectangle that contains exactly two other rectanges. + * + ****************************************************************************/ + +void nxgl_rectadd(FAR struct nxgl_rect_s *dest, + FAR const struct nxgl_rect_s *src1, + FAR const struct nxgl_rect_s *src2) +{ + dest->pt1.x = ngl_min(src1->pt1.x, src2->pt1.x); + dest->pt1.y = ngl_min(src1->pt1.y, src2->pt1.y); + dest->pt2.x = ngl_max(src1->pt2.x, src2->pt2.x); + dest->pt2.y = ngl_max(src1->pt2.y, src2->pt2.y); +} diff --git a/nuttx/include/nuttx/nx/nxglib.h b/nuttx/include/nuttx/nx/nxglib.h index 22aa51ef4..bf54b9029 100644 --- a/nuttx/include/nuttx/nx/nxglib.h +++ b/nuttx/include/nuttx/nx/nxglib.h @@ -457,6 +457,29 @@ EXTERN void nxgl_rectintersect(FAR struct nxgl_rect_s *dest, FAR const struct nxgl_rect_s *src1, FAR const struct nxgl_rect_s *src2); +/**************************************************************************** + * Name: nxgl_intersecting + * + * Description: + * Return true if the rectangles intersect. + * + ****************************************************************************/ + +EXTERN bool nxgl_intersecting(FAR const struct nxgl_rect_s *rect1, + FAR const struct nxgl_rect_s *rect2); + +/**************************************************************************** + * Name: nxgl_rectadd + * + * Description: + * Return the rectangle that contains exactly two other rectanges. + * + ****************************************************************************/ + +EXTERN void nxgl_rectadd(FAR struct nxgl_rect_s *dest, + FAR const struct nxgl_rect_s *src1, + FAR const struct nxgl_rect_s *src2); + /**************************************************************************** * Name: nxgl_rectunion * -- cgit v1.2.3