A few more AVR32 fixes

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4078 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 13 insertions, 8 deletions

diff --git a/nuttx/arch/mips/include/mips32/cp0.h b/nuttx/arch/mips/include/mips32/cp0.h
index b2886be32..91f6d2d0e 100755
--- a/nuttx/arch/mips/include/mips32/cp0.h
+++ b/nuttx/arch/mips/include/mips32/cp0.h
@@ -278,7 +278,7 @@
 #  define CP0_CAUSE_IP5             (0x13 << CP0_CAUSE_IP_SHIFT) /*  Hardware interrupt 3 */
 #  define CP0_CAUSE_IP6             (0x14 << CP0_CAUSE_IP_SHIFT) /*  Hardware interrupt 4 */
 #  define CP0_CAUSE_IP7             (0x15 << CP0_CAUSE_IP_SHIFT) /*  Hardware interrupt 5, timer or performance counter interrupt */
-#define CP0_CAUSE_WP                (1 << 22) /* Watch exception was deferred
+#define CP0_CAUSE_WP                (1 << 22) /* Watch exception was deferred */
 #define CP0_CAUSE_IV                (1 << 23) /* Bit 23:  Interrupt exception uses special interrupt vector */
 #define CP0_CAUSE_CE_SHIFT          (28)      /* Bits 28-29: Coprocessor unit number fo Coprocessor Unusable exception */
 #define CP0_CAUSE_CE_MASK           (3 << CP0_CAUSE_CE_SHIFT)
diff --git a/nuttx/arch/mips/include/mips32/registers.h b/nuttx/arch/mips/include/mips32/registers.h
index 997bc51d6..e541a8e53 100755
--- a/nuttx/arch/mips/include/mips32/registers.h
+++ b/nuttx/arch/mips/include/mips32/registers.h
@@ -93,11 +93,6 @@
 #define s6                 $22
 #define s7                 $23
 
-/* Register 30 may be either an additional static register or a frame pointer */
-
-#define s8                 $30
-#define fp                 $30
-
 /* Reserved for use by interrupt/trap handling logic */
 
 #define k0                 $26
@@ -111,6 +106,11 @@
 
 #define sp                 $29
 
+/* Register 30 may be either an additional static register or a frame pointer */
+
+#define s8                 $30
+#define fp                 $30
+
 /* Return address register:  Contains the function return address */
 
 #define ra                 $31
diff --git a/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c
index 9ba5e6f12..587d4092c 100644
--- a/nuttx/configs/stm3210e-eval/src/up_lcd.c
+++ b/nuttx/configs/stm3210e-eval/src/up_lcd.c
@@ -346,7 +346,9 @@ static uint16_t stm3210e_readreg(uint8_t regaddr);
 static inline void stm3210e_gramselect(void);
 static inline void stm3210e_writegram(uint16_t rgbval);
 static void stm3210e_readsetup(FAR uint16_t *accum);
+#ifndef CONFIG_STM32_AM240320_DISABLE
 static void stm3210e_readnosetup(FAR uint16_t *accum);
+#endif
 static uint16_t stm3210e_readshift(FAR uint16_t *accum);
 static uint16_t stm3210e_readnoshift(FAR uint16_t *accum);
 static void stm3210e_setcursor(uint16_t col, uint16_t row);
diff --git a/nuttx/graphics/nxbe/nxbe_getrectangle.c b/nuttx/graphics/nxbe/nxbe_getrectangle.c
index 1b3941bbb..84f010cd5 100644
--- a/nuttx/graphics/nxbe/nxbe_getrectangle.c
+++ b/nuttx/graphics/nxbe/nxbe_getrectangle.c
@@ -130,6 +130,9 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
    * to this window.
    */
 
-  FAR struct nxbe_plane_s *pplane = &wnd->be->plane[plane];
-  pplane->getrectangle(&pplane->pinfo, rect, dest, deststride);
+  if (!nxgl_nullrect(&remaining))
+    {
+      FAR struct nxbe_plane_s *pplane = &wnd->be->plane[plane];
+      pplane->getrectangle(&pplane->pinfo, &remaining, dest, deststride);
+    }
 }