From 05b58eba3916f52e66e9c3550f1cf32468ca6828 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Fri, 22 Jun 2012 13:06:22 +0800 Subject: [PATCH] xburst: ben-wpan: fix atusb cannot build as module --- .../patches-3.3/800-WPAN-new-files.patch | 17 ++++++------- ...N-patches.patch => 810-WPAN-patches.patch} | 24 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) rename target/linux/xburst/patches-3.3/{800-WPAN-patches.patch => 810-WPAN-patches.patch} (96%) diff --git a/target/linux/xburst/patches-3.3/800-WPAN-new-files.patch b/target/linux/xburst/patches-3.3/800-WPAN-new-files.patch index 5972519b8..0db5b3329 100644 --- a/target/linux/xburst/patches-3.3/800-WPAN-new-files.patch +++ b/target/linux/xburst/patches-3.3/800-WPAN-new-files.patch @@ -1,4 +1,4 @@ -From 6d184ce0928a5a30e88e3e4b7be4200aa103abc3 Mon Sep 17 00:00:00 2001 +From 942f9ce3dd8dde01c501f7d7840700637eb2d285 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Tue, 5 Jun 2012 11:32:52 +0800 Subject: [PATCH 2/3] 001 @@ -11,7 +11,7 @@ Subject: [PATCH 2/3] 001 drivers/ieee802154/fakelb.c | 311 ++++++++++++ drivers/ieee802154/serial.c | 1047 ++++++++++++++++++++++++++++++++++++++++ drivers/ieee802154/spi_atben.c | 421 ++++++++++++++++ - drivers/ieee802154/spi_atusb.c | 750 ++++++++++++++++++++++++++++ + drivers/ieee802154/spi_atusb.c | 751 ++++++++++++++++++++++++++++ include/linux/if_ieee802154.h | 6 + include/linux/spi/at86rf230.h | 34 ++ include/net/mac802154.h | 156 ++++++ @@ -35,7 +35,7 @@ Subject: [PATCH 2/3] 001 net/zigbee/Makefile | 5 + net/zigbee/af_zigbee.c | 285 +++++++++++ net/zigbee/dgram.c | 401 +++++++++++++++ - 31 files changed, 9221 insertions(+), 0 deletions(-) + 31 files changed, 9222 insertions(+) create mode 100644 drivers/ieee802154/adf7242.c create mode 100644 drivers/ieee802154/at86rf230.c create mode 100644 drivers/ieee802154/at86rf230.h @@ -4867,10 +4867,10 @@ index 0000000..431bfe0 +MODULE_LICENSE("GPL"); diff --git a/drivers/ieee802154/spi_atusb.c b/drivers/ieee802154/spi_atusb.c new file mode 100644 -index 0000000..44a9d03 +index 0000000..b16f5be --- /dev/null +++ b/drivers/ieee802154/spi_atusb.c -@@ -0,0 +1,750 @@ +@@ -0,0 +1,751 @@ +/* + * spi_atusb - SPI host look-alike for ATUSB + * @@ -4901,6 +4901,7 @@ index 0000000..44a9d03 +#include +#include +#include ++#include +#include +#include +#include @@ -5493,8 +5494,8 @@ index 0000000..44a9d03 + } + + irq_set_chip_data(atusb->slave_irq, atusb); -+ irq_set_chip_and_handler(atusb->slave_irq, &atusb_irq_chip, -+ handle_level_irq); ++ irq_set_chip(atusb->slave_irq, &atusb_irq_chip); ++ __irq_set_handler(atusb->slave_irq, handle_level_irq, 0, NULL); + + /* FIXME prepare USB IRQ */ + @@ -9476,5 +9477,5 @@ index 0000000..4d9b682 +}; + -- -1.7.5.4 +1.7.9.5 diff --git a/target/linux/xburst/patches-3.3/800-WPAN-patches.patch b/target/linux/xburst/patches-3.3/810-WPAN-patches.patch similarity index 96% rename from target/linux/xburst/patches-3.3/800-WPAN-patches.patch rename to target/linux/xburst/patches-3.3/810-WPAN-patches.patch index f75d92a02..4bcc5c885 100644 --- a/target/linux/xburst/patches-3.3/800-WPAN-patches.patch +++ b/target/linux/xburst/patches-3.3/810-WPAN-patches.patch @@ -4,22 +4,22 @@ Date: Tue, 5 Jun 2012 11:32:43 +0800 Subject: [PATCH 1/3] 002 --- - drivers/ieee802154/Kconfig | 55 +++++++++++++++++++++++++++++++++++++- + drivers/ieee802154/Kconfig | 55 +++++++++++++++++++++++++++++++++++++-- drivers/ieee802154/Makefile | 11 ++++++++ drivers/ieee802154/fakehard.c | 12 ++++++++- - include/linux/if.h | 2 + - include/linux/if_arp.h | 2 + - include/linux/nl802154.h | 10 +++++- - include/net/ieee802154_netdev.h | 17 ++++++++++-- - include/net/wpan-phy.h | 8 +++-- - net/Kconfig | 2 + + include/linux/if.h | 2 ++ + include/linux/if_arp.h | 2 ++ + include/linux/nl802154.h | 10 +++++-- + include/net/ieee802154_netdev.h | 17 +++++++++--- + include/net/wpan-phy.h | 8 +++--- + net/Kconfig | 2 ++ net/Makefile | 1 + - net/ieee802154/Kconfig | 8 +++++ - net/ieee802154/Makefile | 3 ++ - net/ieee802154/dgram.c | 3 +- + net/ieee802154/Kconfig | 8 ++++++ + net/ieee802154/Makefile | 3 +++ + net/ieee802154/dgram.c | 3 +-- net/ieee802154/ieee802154.h | 4 +++ net/ieee802154/nl-mac.c | 2 +- - net/ieee802154/nl-phy.c | 20 ++++++++++++-- + net/ieee802154/nl-phy.c | 20 +++++++++++--- net/ieee802154/nl_policy.c | 1 + net/ieee802154/wpan-class.c | 2 +- 18 files changed, 145 insertions(+), 18 deletions(-) @@ -469,5 +469,5 @@ index 1627ef2..380fe1a 100644 "%#09x\n", phy->channels_supported[i]); if (ret < 0) -- -1.7.5.4 +1.7.9.5