X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1d0772319e1c5d3c83aa10bc7f60387c4db194a5..85b05f67d96aa51b87efcb5794e59ea18ee9df79:/package/kernel/modules/w1.mk?ds=sidebyside

diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk
index aa1de2551..c2bdd7099 100644
--- a/package/kernel/modules/w1.mk
+++ b/package/kernel/modules/w1.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,9 +12,8 @@ W1_SLAVES_DIR:=$(LINUX_DIR)/drivers/w1/slaves
 define KernelPackage/w1
   SUBMENU:=$(W1_MENU)
   TITLE:=Dallas's 1-wire support
-  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_W1
-  FILES:=$(LINUX_DIR)/drivers/w1/wire.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/w1/wire.ko
   AUTOLOAD:=$(call AutoLoad,50,wire)
 endef
 
@@ -24,9 +23,10 @@ endef
 
 $(eval $(call KernelPackage,w1))
 
-define w1dep
+
+define AddDepends/w1
   SUBMENU:=$(W1_MENU)
-  DEPENDS:=kmod-w1 $(1)
+  DEPENDS+=kmod-w1 $(1)
 endef
 
 
@@ -34,11 +34,12 @@ endef
 # 1-wire masters
 #
 define KernelPackage/w1-master-gpio
-  $(call w1dep,@GPIO_SUPPORT)
   TITLE:=GPIO 1-wire bus master driver
+  DEPENDS:=@GPIO_SUPPORT
   KCONFIG:=CONFIG_W1_MASTER_GPIO
-  FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(W1_MASTERS_DIR)/w1-gpio.ko
   AUTOLOAD:=$(call AutoLoad,60,w1-gpio)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-master-gpio/description
@@ -47,16 +48,47 @@ endef
 
 $(eval $(call KernelPackage,w1-master-gpio))
 
+define KernelPackage/w1-master-ds2482
+  TITLE:=DS2482 1-wire i2c bus master driver
+  KCONFIG:=CONFIG_W1_MASTER_DS2482
+  FILES:=$(W1_MASTERS_DIR)/ds2482.ko
+  AUTOLOAD:=$(call AutoLoad,60,ds2482)
+  $(call AddDepends/w1,+kmod-i2c-core)
+endef
+
+define KernelPackage/w1-master-ds2482/description
+  Kernel module for the DS2482 i2c 1-wire bus master driver
+  NOTE: Init with: echo ds2482 0x18 > /sys/bus/i2c/devices/i2c-0/new_device
+  or use owfs
+endef
+
+$(eval $(call KernelPackage,w1-master-ds2482))
+
+
+define KernelPackage/w1-master-ds2490
+  TITLE:=DS2490 1-wire usb bus master driver
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  KCONFIG:=CONFIG_W1_MASTER_DS2490
+  FILES:=$(W1_MASTERS_DIR)/ds2490.ko
+  AUTOLOAD:=$(call AutoLoad,60,ds2490)
+  $(call AddDepends/w1)
+endef
+ 
+define KernelPackage/w1-master-ds2490/description
+  Kernel module for the DS2490 usb 1-wire bus master driver
+endef
+
+$(eval $(call KernelPackage,w1-master-ds2490))
 
 #
 # 1-wire slaves
 #
 define KernelPackage/w1-slave-therm
-  $(call w1dep,)
   TITLE:=Thermal family implementation
   KCONFIG:=CONFIG_W1_SLAVE_THERM
-  FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(W1_SLAVES_DIR)/w1_therm.ko
   AUTOLOAD:=$(call AutoLoad,70,w1_therm)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-therm/description
@@ -67,11 +99,11 @@ $(eval $(call KernelPackage,w1-slave-therm))
 
 
 define KernelPackage/w1-slave-smem
-  $(call w1dep,)
   TITLE:=Simple 64bit memory family implementation
   KCONFIG:=CONFIG_W1_SLAVE_SMEM
-  FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(W1_SLAVES_DIR)/w1_smem.ko
   AUTOLOAD:=$(call AutoLoad,70,w1_smem)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-smem/description
@@ -80,14 +112,15 @@ endef
 
 $(eval $(call KernelPackage,w1-slave-smem))
 
+
 define KernelPackage/w1-slave-ds2433
-  $(call w1dep,)
   TITLE:=Simple 64bit memory family implementation
   KCONFIG:= \
 	CONFIG_W1_SLAVE_DS2433 \
 	CONFIG_W1_SLAVE_DS2433_CRC=n
-  FILES:=$(W1_SLAVES_DIR)/w1_ds2433.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(W1_SLAVES_DIR)/w1_ds2433.ko
   AUTOLOAD:=$(call AutoLoad,70,w1_ds2433)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2433/description
@@ -98,13 +131,13 @@ $(eval $(call KernelPackage,w1-slave-ds2433))
 
 
 define KernelPackage/w1-slave-ds2760
-  $(call w1dep,)
   TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others)
   KCONFIG:= \
 	CONFIG_W1_SLAVE_DS2760 \
 	CONFIG_W1_SLAVE_DS2433_CRC=n
-  FILES:=$(W1_SLAVES_DIR)/w1_ds2760.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(W1_SLAVES_DIR)/w1_ds2760.ko
   AUTOLOAD:=$(call AutoLoad,70,w1_ds2760)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2760/description