usbd: codes clean

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c b/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
index bb5470b..1ab1679 100644 (file)
--- a/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
+++ b/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
@@ -31,11 +31,6 @@ static long rx_len = 64;
 
 struct usbd_ops *usbd_set_interface(struct usbd_ops *);
 
-void usb_init(void);
-int usb_receive_packet(void);
-
-void recv_setup(char *, int);
-
 extern int s5p_receive_done;
 extern int s5p_usb_connected;
 extern otg_dev_t otg;
@@ -47,52 +42,8 @@ static int __usb_board_init(void)
 
 int usb_board_init(void) __attribute__((weak, alias("__usb_board_init")));
 
-#ifdef CONFIG_GENERIC_MMC
-#include <mmc.h>
-
-void usbd_set_mmc_dev(struct usbd_ops *usbd)
-{
-       struct mmc *mmc;
-
-       usbd->mmc_dev = 0;
-       /* FIX 0x400 */
-       usbd->mmc_max = 0x400;
-       /* get from mmc->capacity?? */
-       usbd->mmc_total = 0xf50000;     /* 8GB / 0x200  */
-
-       mmc = find_mmc_device(usbd->mmc_dev);
-       mmc_init(mmc);
-
-       usbd->mmc_blk = mmc->read_bl_len;
-}
-#endif
-
-/*
- * This function is interfaced between
- * USB Device Controller and USB Downloader
- */
-struct usbd_ops *usbd_set_interface(struct usbd_ops *usbd)
-{
-       usbd->usb_init = usb_init;
-       usbd->usb_stop = s5p_usb_stop;
-       usbd->send_data = s5p_usb_tx;
-       usbd->recv_data = usb_receive_packet;
-       usbd->recv_setup = recv_setup;
-       usbd->tx_data = tx_data;
-       usbd->rx_data = rx_data;
-       usbd->tx_len = tx_len;
-       usbd->rx_len = rx_len;
-       usbd->ram_addr = CONFIG_SYS_DOWN_ADDR;
-
-#ifdef CONFIG_GENERIC_MMC
-       usbd_set_mmc_dev(usbd);
-#endif
-
-       return usbd;
-}
-
 /* clear download informations */
-void s5p_usb_clear_dnfile_info(void)
+static void s5p_usb_clear_dnfile_info(void)
 {
        otg.dn_addr = 0;
        otg.dn_filesize = 0;
@@ -100,7 +51,7 @@ void s5p_usb_clear_dnfile_info(void)
 }
 
 /* clear upload informations */
-void s5p_usb_clear_upfile_info(void)
+static void s5p_usb_clear_upfile_info(void)
 {
        otg.up_addr = 0;
        otg.up_size = 0;
@@ -108,7 +59,7 @@ void s5p_usb_clear_upfile_info(void)
 }
 
 /* start the usb controller */
-void usb_init(void)
+static void usb_init(void)
 {
        if (usb_board_init()) {
                printf("Failed to usb_board_init\n");
@@ -133,10 +84,11 @@ void usb_init(void)
        printf("Connected!!\n");
 }
 
-/* receive the packet from host PC
+/*
+ * receive the packet from host PC
  * return received size
  */
-int usb_receive_packet(void)
+static int usb_receive_packet(void)
 {
        while (1) {
                if (s5p_usb_detect_irq()) {
@@ -152,7 +104,7 @@ int usb_receive_packet(void)
 }
 
 /* setup the download informations */
-void recv_setup(char *addr, int len)
+static void recv_setup(char *addr, int len)
 {
        s5p_usb_clear_dnfile_info();
 
@@ -160,3 +112,48 @@ void recv_setup(char *addr, int len)
        otg.dn_ptr = (u8 *) addr;
        otg.dn_filesize = len;
 }
+
+#ifdef CONFIG_GENERIC_MMC
+#include <mmc.h>
+
+static void usbd_set_mmc_dev(struct usbd_ops *usbd)
+{
+       struct mmc *mmc;
+
+       usbd->mmc_dev = 0;
+       /* FIX 0x400 */
+       usbd->mmc_max = 0x400;
+       /* get from mmc->capacity?? */
+       usbd->mmc_total = 0xf50000;     /* 8GB / 0x200  */
+
+       mmc = find_mmc_device(usbd->mmc_dev);
+       mmc_init(mmc);
+
+       usbd->mmc_blk = mmc->read_bl_len;
+}
+#endif
+
+/*
+ * This function is interfaced between
+ * USB Device Controller and USB Downloader
+ */
+struct usbd_ops *usbd_set_interface(struct usbd_ops *usbd)
+{
+       usbd->usb_init = usb_init;
+       usbd->usb_stop = s5p_usb_stop;
+       usbd->send_data = s5p_usb_tx;
+       usbd->recv_data = usb_receive_packet;
+       usbd->recv_setup = recv_setup;
+       usbd->tx_data = tx_data;
+       usbd->rx_data = rx_data;
+       usbd->tx_len = tx_len;
+       usbd->rx_len = rx_len;
+       usbd->ram_addr = CONFIG_SYS_DOWN_ADDR;
+
+#ifdef CONFIG_GENERIC_MMC
+       usbd_set_mmc_dev(usbd);
+#endif
+
+       return usbd;
+}
+