Rename LM3S files, variables, and types from lm3s_ to lm_; Rename configuration variables from CONFIG_LM3S_ to CONFIG_LM_

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

6 files changed, 43 insertions, 43 deletions

diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index 4cd2eddc7..c2fc50df1 100644
--- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@@ -123,14 +123,14 @@
 #ifndef __ASSEMBLY__
 
 /************************************************************************************
- * Name: lm3s_ssiinitialize
+ * Name: lm_ssiinitialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.
  *
  ************************************************************************************/
 
-extern void weak_function lm3s_ssiinitialize(void);
+extern void weak_function lm_ssiinitialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_LM3S6965_EK_SRC_LM3S6965EK_INTERNAL_H */
diff --git a/nuttx/configs/lm3s6965-ek/src/up_boot.c b/nuttx/configs/lm3s6965-ek/src/up_boot.c
index 7f887be62..7ffd37f17 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_boot.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_boot.c
@@ -61,7 +61,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm3s_boardinitialize
+ * Name: lm_boardinitialize
  *
  * Description:
  *   All LM3S architectures must provide the following entry point.  This entry point
@@ -69,18 +69,18 @@
  *   and mapped but before any devices have been initialized.
  ************************************************************************************/
 
-void lm3s_boardinitialize(void)
+void lm_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
-   * lm3s_ssiinitialize() has been brought into the link.
+   * lm_ssiinitialize() has been brought into the link.
    */
 
   /* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
 
 #if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
-  if (lm3s_ssiinitialize)
+  if (lm_ssiinitialize)
     {
-      lm3s_ssiinitialize();
+      lm_ssiinitialize();
     }
 #endif
 
diff --git a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c b/nuttx/configs/lm3s6965-ek/src/up_ethernet.c
index 4f402cae7..2d114baaa 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_ethernet.c
@@ -63,17 +63,17 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm3s_ethernetmac
+ * Name: lm_ethernetmac
  *
  * Description:
  *   For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile
- *   USER0 and USER1 registers.  If CONFIG_LM3S_BOARDMAC is defined, this function
+ *   USER0 and USER1 registers.  If CONFIG_LM_BOARDMAC is defined, this function
  *   will obtain the MAC address from these registers.
  *
  ************************************************************************************/
 
-#ifdef CONFIG_LM3S_BOARDMAC
-void lm3s_ethernetmac(struct ether_addr *ethaddr)
+#ifdef CONFIG_LM_BOARDMAC
+void lm_ethernetmac(struct ether_addr *ethaddr)
 {
   uint32_t user0;
   uint32_t user1;
diff --git a/nuttx/configs/lm3s6965-ek/src/up_leds.c b/nuttx/configs/lm3s6965-ek/src/up_leds.c
index efa1eb738..0e6c5e50f 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_leds.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_leds.c
@@ -72,7 +72,7 @@
 /* Dump GPIO registers */
 
 #ifdef LED_DEBUG
-#  define led_dumpgpio(m) lm3s_dumpgpio(LED_GPIO, m)
+#  define led_dumpgpio(m) lm_dumpgpio(LED_GPIO, m)
 #else
 #  define led_dumpgpio(m)
 #endif
@@ -102,9 +102,9 @@ void up_ledinit(void)
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
-  led_dumpgpio("up_ledinit before lm3s_configgpio()");
-  lm3s_configgpio(LED_GPIO);
-  led_dumpgpio("up_ledinit after lm3s_configgpio()");
+  led_dumpgpio("up_ledinit before lm_configgpio()");
+  lm_configgpio(LED_GPIO);
+  led_dumpgpio("up_ledinit after lm_configgpio()");
   g_nest = 0;
 }
 
@@ -128,9 +128,9 @@ void up_ledon(int led)
         g_nest++;
       case LED_IRQSENABLED:
       case LED_STACKCREATED:
-        led_dumpgpio("up_ledon: before lm3s_gpiowrite()");
-        lm3s_gpiowrite(LED_GPIO, false);
-        led_dumpgpio("up_ledon: after lm3s_gpiowrite()");
+        led_dumpgpio("up_ledon: before lm_gpiowrite()");
+        lm_gpiowrite(LED_GPIO, false);
+        led_dumpgpio("up_ledon: after lm_gpiowrite()");
         break;
     }
 }
@@ -156,9 +156,9 @@ void up_ledoff(int led)
       case LED_PANIC:
         if (--g_nest <= 0)
           {
-            led_dumpgpio("up_ledoff: before lm3s_gpiowrite()");
-            lm3s_gpiowrite(LED_GPIO, true);
-            led_dumpgpio("up_ledoff: after lm3s_gpiowrite()");
+            led_dumpgpio("up_ledoff: before lm_gpiowrite()");
+            lm_gpiowrite(LED_GPIO, true);
+            led_dumpgpio("up_ledoff: after lm_gpiowrite()");
           }
         break;
     }
diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c
index 23ce7e036..07e7859b4 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_oled.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_oled.c
@@ -72,8 +72,8 @@
 
 #ifdef CONFIG_LCD_RITDEBUG
 #  define ritdbg(format, arg...)  vdbg(format, ##arg)
-#  define oleddc_dumpgpio(m) lm3s_dumpgpio(OLEDDC_GPIO, m)
-#  define oledcs_dumpgpio(m) lm3s_dumpgpio(OLEDCS_GPIO, m)
+#  define oleddc_dumpgpio(m) lm_dumpgpio(OLEDDC_GPIO, m)
+#  define oledcs_dumpgpio(m) lm_dumpgpio(OLEDCS_GPIO, m)
 #else
 #  define ritdbg(x...)
 #  define oleddc_dumpgpio(m)
@@ -102,8 +102,8 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
   oledcs_dumpgpio("up_nxdrvinit: After OLEDCS setup");
   oleddc_dumpgpio("up_nxdrvinit: On entry");
 
-  lm3s_configgpio(OLEDDC_GPIO); /* PC7: OLED display data/control select (D/Cn) */
-  lm3s_configgpio(OLEDEN_GPIO); /* PC6: Enable +15V needed by OLED (EN+15V) */
+  lm_configgpio(OLEDDC_GPIO); /* PC7: OLED display data/control select (D/Cn) */
+  lm_configgpio(OLEDEN_GPIO); /* PC6: Enable +15V needed by OLED (EN+15V) */
 
   oleddc_dumpgpio("up_nxdrvinit: After OLEDDC/EN setup");
 
@@ -137,7 +137,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
 }
 
 /******************************************************************************
- * Name:  lm3s_spicmddata
+ * Name:  lm_spicmddata
  *
  * Description:
  *   Set or clear the SD1329 D/Cn bit to select data (true) or command
@@ -159,13 +159,13 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
  *
  ******************************************************************************/
 
-int lm3s_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+int lm_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
   if (devid == SPIDEV_DISPLAY)
     {
       /* Set GPIO to 1 for data, 0 for command */
 
-      lm3s_gpiowrite(OLEDDC_GPIO, !cmd);
+      lm_gpiowrite(OLEDDC_GPIO, !cmd);
       return OK;
     }
   return -ENODEV;
diff --git a/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c
index b52116f14..92138f3a6 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_ssi.c
@@ -81,7 +81,7 @@
 /* Dump GPIO registers */
 
 #ifdef SSI_VERBOSE
-#  define ssi_dumpgpio(m) lm3s_dumpgpio(SDCCS_GPIO, m)
+#  define ssi_dumpgpio(m) lm_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssi_dumpgpio(m)
 #endif
@@ -95,33 +95,33 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: lm3s_ssiinitialize
+ * Name: lm_ssiinitialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.
  *
  ************************************************************************************/
 
-void weak_function lm3s_ssiinitialize(void)
+void weak_function lm_ssiinitialize(void)
 {
   /* Configure the SPI-based microSD CS GPIO */
 
-  ssi_dumpgpio("lm3s_ssiinitialize() Entry)");
-  lm3s_configgpio(SDCCS_GPIO);
+  ssi_dumpgpio("lm_ssiinitialize() Entry)");
+  lm_configgpio(SDCCS_GPIO);
 #ifdef CONFIG_NX_LCDDRIVER
-  lm3s_configgpio(OLEDCS_GPIO);
+  lm_configgpio(OLEDCS_GPIO);
 #endif
-  ssi_dumpgpio("lm3s_ssiinitialize() Exit");
+  ssi_dumpgpio("lm_ssiinitialize() Exit");
 }
 
 /****************************************************************************
- * The external functions, lm3s_spiselect and lm3s_spistatus must be provided
+ * The external functions, lm_spiselect and lm_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
  * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi.h).
  * All othermethods (including up_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
- *   1. Provide lm3s_spiselect() and lm3s_spistatus() functions in your
+ *   1. Provide lm_spiselect() and lm_spistatus() functions in your
  *      board-specific logic.  This function will perform chip selection and
  *      status operations using GPIOs in the way your board is configured.
  *   2. Add a call to up_spiinitialize() in your low level initialization
@@ -133,29 +133,29 @@ void weak_function lm3s_ssiinitialize(void)
  *
  ****************************************************************************/
 
-void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
+void lm_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  ssi_dumpgpio("lm3s_spiselect() Entry");
+  ssi_dumpgpio("lm_spiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
     {
       /* Assert the CS pin to the card */
 
-      lm3s_gpiowrite(SDCCS_GPIO, !selected);
+      lm_gpiowrite(SDCCS_GPIO, !selected);
     }
 #ifdef CONFIG_NX_LCDDRIVER
   else if (devid == SPIDEV_DISPLAY)
     {
       /* Assert the CS pin to the display */
 
-      lm3s_gpiowrite(OLEDCS_GPIO, !selected);
+      lm_gpiowrite(OLEDCS_GPIO, !selected);
     }
 #endif
-  ssi_dumpgpio("lm3s_spiselect() Exit");
+  ssi_dumpgpio("lm_spiselect() Exit");
 }
 
-uint8_t lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t lm_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   ssidbg("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;