Merge branch 'master' of git://github.com/chunkeey/carl9170fw

diff --git a/carlfw/usb/fifo.c b/carlfw/usb/fifo.c
index d5c2e120ed41a55a6296bfaf13c12cc8eaadfcc2..3d8e354df8186ffe7ca5eee19b5d7ec6f0871424 100644 (file)
--- a/carlfw/usb/fifo.c
+++ b/carlfw/usb/fifo.c
@@ -28,29 +28,29 @@
 
 /* TODO / TOTEST */
 #ifdef CONFIG_CARL9170FW_USB_MODESWITCH
-static inline void usb_ep_map(const uint8_t ep, const uint8_t map)
+static void usb_ep_map(const uint8_t ep, const uint8_t map)
 {
        setb(AR9170_USB_REG_EP_MAP + (ep - 1), map);
 }
 
-static inline void usb_fifo_map(const uint8_t fifo, const uint8_t map)
+static void usb_fifo_map(const uint8_t fifo, const uint8_t map)
 {
        setb(AR9170_USB_REG_FIFO_MAP + (fifo - 1), map);
 }
 
-static inline void usb_fifo_config(const uint8_t fifo, const uint8_t cfg)
+static void usb_fifo_config(const uint8_t fifo, const uint8_t cfg)
 {
        setb(AR9170_USB_REG_FIFO_CONFIG + (fifo - 1), cfg);
 }
 
-static inline void usb_ep_packet_size_hi(const uint8_t ep, const uint8_t dir,
+static void usb_ep_packet_size_hi(const uint8_t ep, const uint8_t dir,
                             const uint16_t size)
 {
        setb(AR9170_USB_REG_EP_IN_MAX_SIZE_HIGH + (((dir * 0x20) + ep) << 1),
             (size >> 8) & 0xf);
 }
 
-static inline void usb_ep_packet_size_lo(const uint8_t ep, const uint8_t dir,
+static void usb_ep_packet_size_lo(const uint8_t ep, const uint8_t dir,
                            const uint16_t size)
 {
        setb(AR9170_USB_REG_EP_IN_MAX_SIZE_LOW + (((dir * 0x20) + ep) << 1),

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 23843a7eefaeaeb61bdb4006dc9bcafa37c3b04c..3dd2b1c7a6c6d09f3d89523ef36b0c81a7c0582d 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -6,7 +6,7 @@ NEWLIB_VER=1.20.0
 NEWLIB_URL=ftp://sources.redhat.com/pub/newlib/newlib-$(NEWLIB_VER).tar.gz
 NEWLIB_TAR=newlib-$(NEWLIB_VER).tar.gz
 
-GCC_VER=4.7.1
+GCC_VER=4.7.2
 GCC_URL=http://mirrors.kernel.org/gnu/gcc/gcc-$(GCC_VER)/gcc-$(GCC_VER).tar.bz2
 GCC_TAR=gcc-$(GCC_VER).tar.bz2