[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-323-g9a8fafb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-323-g9a8fafb
|
From: Julien B a. A. <ar...@us...> - 2010-04-28 15:52:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9a8fafb0679025cb5c15f93339022d0c5504d7db (commit)
via 129357017255ed7b5092f047d2c3bd8c0d67ba8e (commit)
from 16aed16c6fe21ec3655d09173fe050df36c4b71a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9a8fafb0679025cb5c15f93339022d0c5504d7db
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 28 17:47:36 2010 +0200
[BUILDROOT] Add an infrastructure to install closed source linux-firmwares
commit 129357017255ed7b5092f047d2c3bd8c0d67ba8e
Author: Julien Boibessot <jul...@ar...>
Date: Tue Apr 27 11:18:11 2010 +0200
[LINUX] gpio: correct bug in armadeus_gpio_dev_read() (thanks to CimCim) and apply Linux coding rules on some function names
-----------------------------------------------------------------------
Summary of changes:
...e-add_infrastructure_to_install_firmwares.patch | 147 ++++++++++++++++++++
...e-add_infrastructure_to_install_firmwares.patch | 147 ++++++++++++++++++++
patches/buildroot/2010.02/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 1 +
target/linux/modules/gpio/core.c | 66 ++++-----
5 files changed, 327 insertions(+), 35 deletions(-)
create mode 100644 patches/buildroot/106-firmware-add_infrastructure_to_install_firmwares.patch
create mode 100644 patches/buildroot/2010.02/106-firmware-add_infrastructure_to_install_firmwares.patch
diff --git a/patches/buildroot/106-firmware-add_infrastructure_to_install_firmwares.patch b/patches/buildroot/106-firmware-add_infrastructure_to_install_firmwares.patch
new file mode 100644
index 0000000..e2a2f0c
--- /dev/null
+++ b/patches/buildroot/106-firmware-add_infrastructure_to_install_firmwares.patch
@@ -0,0 +1,147 @@
+Add infrastructure to download linux-firmwares.
+Currently only libertas 88W8686 firmwares are handled.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-04-27 14:52:04.000000000 +0200
++++ buildroot/package/Config.in 2010-04-27 14:54:12.000000000 +0200
+@@ -256,6 +256,7 @@
+ source "package/e2fsprogs/Config.in"
+ source "package/eeprog/Config.in"
+ source "package/fconfig/Config.in"
++source "package/firmware/Config.in"
+ source "package/fis/Config.in"
+ source "package/fuse/Config.in"
+ source "package/gadgetfs-test/Config.in"
+Index: buildroot/package/firmware/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/firmware/Config.in 2010-04-28 14:57:55.000000000 +0200
+@@ -0,0 +1,49 @@
++menuconfig BR2_PACKAGE_FIRMWARE
++ bool "linux-firmware"
++ help
++ Install selected firmware from linux-firmware.git repository.
++
++ This repository was setup by David Woodhouse in order to:
++ "include firmware files from vendors who have chosen not to
++ contribute their firmware to be distributed as part of the GPL'd
++ kernel source tree, but would still like their firmware to be readily
++ available to Linux users."
++
++
++if BR2_PACKAGE_FIRMWARE
++
++comment "Video"
++
++comment "WiFi chipsets"
++
++config BR2_PACKAGE_FIRMWARE_88W8686
++ bool "Marvell's 88W8686 (Libertas)"
++
++config BR2_PACKAGE_FIRMWARE_88W8686_SDIO
++ bool "SDIO"
++ default y
++ depends on BR2_PACKAGE_FIRMWARE_88W8686
++
++choice
++ prompt "Firmware version"
++ default BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9
++ depends on BR2_PACKAGE_FIRMWARE_88W8686_SDIO
++ help
++ SDIO firmware is available in v8 or v9 version.
++
++config BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8
++ bool "v8"
++
++config BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9
++ bool "v9"
++
++endchoice
++
++config BR2_PACKAGE_FIRMWARE_88W8686_GSPI
++ bool "GSPI"
++ depends on BR2_PACKAGE_FIRMWARE_88W8686
++
++comment "Others"
++
++endif
++
+Index: buildroot/package/firmware/firmware.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/firmware/firmware.mk 2010-04-28 17:28:13.000000000 +0200
+@@ -0,0 +1,71 @@
++#############################################################
++#
++# Get and install some linux-firmware
++#
++#############################################################
++FIRMWARE_VERSION:=af5222c5ded5d944267acfbd001571409bea7eeb
++FIRMWARE_SOURCE:=firmware-$(FIRMWARE_VERSION).tar.gz
++FIRMWARE_GIT:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
++FIRMWARE_DIR:=$(BUILD_DIR)/firmware-$(FIRMWARE_VERSION)
++FIRMWARE_TARGET_DIR:=$(TARGET_DIR)/lib/firmware
++FIRMWARE_CAT:=$(ZCAT)
++FIRMWARE_NAME:=firmware-$(FIRMWARE_VERSION)
++
++
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
++FIRMWARE_BINARIES+=sd8686_helper.bin sd8686.bin
++endif
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_GSPI)),y)
++FIRMWARE_BINARIES+=gspi8686_helper.bin gspi8686.bin
++endif
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8)),y)
++FIRMWARE_88W8686_SDIO_VERSION:=_v8
++else
++FIRMWARE_88W8686_SDIO_VERSION:=_v9
++endif
++
++$(DL_DIR)/$(FIRMWARE_SOURCE):
++ git clone $(FIRMWARE_GIT) $(FIRMWARE_DIR)
++ (cd $(FIRMWARE_DIR); \
++ git archive --prefix=$(FIRMWARE_NAME)/ $(FIRMWARE_VERSION) | \
++ gzip > $(DL_DIR)/$(FIRMWARE_SOURCE) )
++ rm -rf $(FIRMWARE_DIR)
++# $(WGET) -O $(DL_DIR)/$(FIRMWARE_SOURCE) "$(FIRMWARE_URL)"
++
++$(FIRMWARE_DIR)/.unpacked: $(DL_DIR)/$(FIRMWARE_SOURCE)
++ $(FIRMWARE_CAT) $(DL_DIR)/$(FIRMWARE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(FIRMWARE_DIR)/.installed: $(FIRMWARE_DIR)/.unpacked
++ mkdir -p $(FIRMWARE_TARGET_DIR)
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_v9_helper.bin $(FIRMWARE_TARGET_DIR)/sd8686_helper.bin
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_v9.bin $(FIRMWARE_TARGET_DIR)/sd8686.bin
++endif
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_GSPI)),y)
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_v9_helper.bin $(FIRMWARE_TARGET_DIR)/gspi8686_helper.bin
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_v9.bin $(FIRMWARE_TARGET_DIR)/gspi8686.bin
++endif
++ touch $@
++
++firmware: $(FIRMWARE_DIR)/.installed
++
++firmware-source: $(DL_DIR)/$(FIRMWARE_SOURCE)
++
++firmware-clean:
++ rm -f $(FIRMWARE_DIR)/.installed
++ (for file in $(FIRMWARE_BINARIES); do \
++ rm -f "$(FIRMWARE_TARGET_DIR)/$$file"; \
++ done)
++
++firmware-dirclean:
++ rm -rf $(FIRMWARE_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE)),y)
++TARGETS+=firmware
++endif
diff --git a/patches/buildroot/2010.02/106-firmware-add_infrastructure_to_install_firmwares.patch b/patches/buildroot/2010.02/106-firmware-add_infrastructure_to_install_firmwares.patch
new file mode 100644
index 0000000..e2a2f0c
--- /dev/null
+++ b/patches/buildroot/2010.02/106-firmware-add_infrastructure_to_install_firmwares.patch
@@ -0,0 +1,147 @@
+Add infrastructure to download linux-firmwares.
+Currently only libertas 88W8686 firmwares are handled.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-04-27 14:52:04.000000000 +0200
++++ buildroot/package/Config.in 2010-04-27 14:54:12.000000000 +0200
+@@ -256,6 +256,7 @@
+ source "package/e2fsprogs/Config.in"
+ source "package/eeprog/Config.in"
+ source "package/fconfig/Config.in"
++source "package/firmware/Config.in"
+ source "package/fis/Config.in"
+ source "package/fuse/Config.in"
+ source "package/gadgetfs-test/Config.in"
+Index: buildroot/package/firmware/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/firmware/Config.in 2010-04-28 14:57:55.000000000 +0200
+@@ -0,0 +1,49 @@
++menuconfig BR2_PACKAGE_FIRMWARE
++ bool "linux-firmware"
++ help
++ Install selected firmware from linux-firmware.git repository.
++
++ This repository was setup by David Woodhouse in order to:
++ "include firmware files from vendors who have chosen not to
++ contribute their firmware to be distributed as part of the GPL'd
++ kernel source tree, but would still like their firmware to be readily
++ available to Linux users."
++
++
++if BR2_PACKAGE_FIRMWARE
++
++comment "Video"
++
++comment "WiFi chipsets"
++
++config BR2_PACKAGE_FIRMWARE_88W8686
++ bool "Marvell's 88W8686 (Libertas)"
++
++config BR2_PACKAGE_FIRMWARE_88W8686_SDIO
++ bool "SDIO"
++ default y
++ depends on BR2_PACKAGE_FIRMWARE_88W8686
++
++choice
++ prompt "Firmware version"
++ default BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9
++ depends on BR2_PACKAGE_FIRMWARE_88W8686_SDIO
++ help
++ SDIO firmware is available in v8 or v9 version.
++
++config BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8
++ bool "v8"
++
++config BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9
++ bool "v9"
++
++endchoice
++
++config BR2_PACKAGE_FIRMWARE_88W8686_GSPI
++ bool "GSPI"
++ depends on BR2_PACKAGE_FIRMWARE_88W8686
++
++comment "Others"
++
++endif
++
+Index: buildroot/package/firmware/firmware.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/firmware/firmware.mk 2010-04-28 17:28:13.000000000 +0200
+@@ -0,0 +1,71 @@
++#############################################################
++#
++# Get and install some linux-firmware
++#
++#############################################################
++FIRMWARE_VERSION:=af5222c5ded5d944267acfbd001571409bea7eeb
++FIRMWARE_SOURCE:=firmware-$(FIRMWARE_VERSION).tar.gz
++FIRMWARE_GIT:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
++FIRMWARE_DIR:=$(BUILD_DIR)/firmware-$(FIRMWARE_VERSION)
++FIRMWARE_TARGET_DIR:=$(TARGET_DIR)/lib/firmware
++FIRMWARE_CAT:=$(ZCAT)
++FIRMWARE_NAME:=firmware-$(FIRMWARE_VERSION)
++
++
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
++FIRMWARE_BINARIES+=sd8686_helper.bin sd8686.bin
++endif
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_GSPI)),y)
++FIRMWARE_BINARIES+=gspi8686_helper.bin gspi8686.bin
++endif
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8)),y)
++FIRMWARE_88W8686_SDIO_VERSION:=_v8
++else
++FIRMWARE_88W8686_SDIO_VERSION:=_v9
++endif
++
++$(DL_DIR)/$(FIRMWARE_SOURCE):
++ git clone $(FIRMWARE_GIT) $(FIRMWARE_DIR)
++ (cd $(FIRMWARE_DIR); \
++ git archive --prefix=$(FIRMWARE_NAME)/ $(FIRMWARE_VERSION) | \
++ gzip > $(DL_DIR)/$(FIRMWARE_SOURCE) )
++ rm -rf $(FIRMWARE_DIR)
++# $(WGET) -O $(DL_DIR)/$(FIRMWARE_SOURCE) "$(FIRMWARE_URL)"
++
++$(FIRMWARE_DIR)/.unpacked: $(DL_DIR)/$(FIRMWARE_SOURCE)
++ $(FIRMWARE_CAT) $(DL_DIR)/$(FIRMWARE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(FIRMWARE_DIR)/.installed: $(FIRMWARE_DIR)/.unpacked
++ mkdir -p $(FIRMWARE_TARGET_DIR)
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_v9_helper.bin $(FIRMWARE_TARGET_DIR)/sd8686_helper.bin
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_v9.bin $(FIRMWARE_TARGET_DIR)/sd8686.bin
++endif
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_GSPI)),y)
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_v9_helper.bin $(FIRMWARE_TARGET_DIR)/gspi8686_helper.bin
++ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_v9.bin $(FIRMWARE_TARGET_DIR)/gspi8686.bin
++endif
++ touch $@
++
++firmware: $(FIRMWARE_DIR)/.installed
++
++firmware-source: $(DL_DIR)/$(FIRMWARE_SOURCE)
++
++firmware-clean:
++ rm -f $(FIRMWARE_DIR)/.installed
++ (for file in $(FIRMWARE_BINARIES); do \
++ rm -f "$(FIRMWARE_TARGET_DIR)/$$file"; \
++ done)
++
++firmware-dirclean:
++ rm -rf $(FIRMWARE_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FIRMWARE)),y)
++TARGETS+=firmware
++endif
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index 2bb4304..42fa09f 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -16,3 +16,4 @@ rm -rf buildroot/package/libcurl/
rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
rm -f buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
rm -f buildroot/package/busybox/busybox-1.15.3-speed_table-B921600.patch
+rm -rf buildroot/package/firmware/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 1c9f4a6..12117e8 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -16,3 +16,4 @@ rm -rf buildroot/package/libcurl/
rm -f buildroot/package/audio/madplay/madplay-audio-alsa.patch
rm -f buildroot/package/mplayer/mplayer-1.0rc1-add_pld_asm_inst_for_non_armv5_arch.patch
rm -f buildroot/package/busybox/busybox-1.12.1-speed_table-B921600.patch
+rm -rf buildroot/package/firmware/
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 97f6f58..b07c7ef 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -328,12 +328,12 @@ static void initialize_all_ports(void)
}
-static void writeOnPort(unsigned int aPort, unsigned int aValue)
+static void write_on_port(unsigned int aPort, unsigned int aValue)
{
__raw_writel(aValue, VA_GPIO_BASE + MXC_DR(aPort));
}
-static unsigned int readFromPort(unsigned int aPort)
+static unsigned int read_from_port(unsigned int aPort)
{
unsigned int port_value = 0;
@@ -343,7 +343,7 @@ static unsigned int readFromPort(unsigned int aPort)
return port_value;
}
-static void setPortMode(unsigned int aPort, unsigned int aModeMask)
+static void set_port_mode(unsigned int aPort, unsigned int aModeMask)
{
int i;
int ocr1, ocr2, gius;
@@ -367,7 +367,7 @@ static void setPortMode(unsigned int aPort, unsigned int aModeMask)
__raw_writel(gius, VA_GPIO_BASE + MXC_GIUS(aPort));
}
-static unsigned int getPortMode(unsigned int aPort)
+static unsigned int get_port_mode(unsigned int aPort)
{
int i;
int ocr1, ocr2, gius, value = 0;
@@ -390,23 +390,23 @@ static unsigned int getPortMode(unsigned int aPort)
return value;
}
-static unsigned int getPortPullUp(unsigned int aPort)
+static unsigned int get_port_pull_up(unsigned int aPort)
{
return __raw_readl(VA_GPIO_BASE + MXC_PUEN(aPort));
}
-static void setPortPullUp(unsigned int aPort, unsigned int aPullMask)
+static void set_port_pullup(unsigned int aPort, unsigned int aPullMask)
{
__raw_writel(aPullMask & 0xffffffff, VA_GPIO_BASE + MXC_PUEN(aPort));
}
-static void setPortDir(unsigned int aPort, unsigned int aDirMask)
+static void set_port_dir(unsigned int aPort, unsigned int aDirMask)
{
__raw_writel(aDirMask & 0xffffffff, VA_GPIO_BASE + MXC_DDIR(aPort));
}
-static unsigned int getPortDir(unsigned int aPort)
+static unsigned int get_port_dir(unsigned int aPort)
{
unsigned int port_value = 0;
@@ -449,7 +449,7 @@ static ssize_t armadeus_gpio_dev_write(struct file *file, const char *data, size
if (gpio->nb_pins != 1) {
pr_debug("Full port write: 0x%x\n", value);
- writeOnPort(gpio->port, value);
+ write_on_port(gpio->port, value);
} else {
value = value ? 1 : 0;
pr_debug("Single pin write: %d\n", value);
@@ -467,9 +467,8 @@ static ssize_t armadeus_gpio_dev_read(struct file *file, char *buf,
size_t count, loff_t *ppos)
{
unsigned minor = MINOR(file->f_dentry->d_inode->i_rdev);
- u32 value=0;
+ u32 value = 0;
ssize_t ret = 0;
- u32 port_status;
struct gpio_item *gpio = file->private_data;
if (count == 0)
@@ -494,16 +493,13 @@ static ssize_t armadeus_gpio_dev_read(struct file *file, char *buf,
gpio->changed = 0;
if (gpio->nb_pins != 1) {
- value = readFromPort(gpio->port);
+ value = read_from_port(gpio->port);
pr_debug("Full port read: 0x%x\n", value);
} else {
value = gpio_get_value(minor);
pr_debug("Single pin read: %d\n", value);
}
- value = readFromPort(minor);
- port_status = (char)(value & 0xFF);
-
count = min(count, (size_t)sizeof(u32));
if (copy_to_user(buf, &value, count)) {
ret = -EFAULT;
@@ -591,7 +587,7 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
gpio->number = minor & GPIO_PIN_MASK;
gpio->pin_state = 0;
- if (getPortDir(gpio->port) & (1 << gpio->number)) {
+ if (get_port_dir(gpio->port) & (1 << gpio->number)) {
gpio_direction_output(minor, 0);
} else {
gpio_direction_input(minor);
@@ -697,38 +693,38 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
switch (cmd) {
case GPIORDDIRECTION:
- value = getPortDir(MAX_MINOR - minor);
+ value = get_port_dir(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
case GPIOWRDIRECTION:
ret = __get_user(value, (unsigned int *)arg);
if (ret == 0) {
- setPortDir(MAX_MINOR - minor, value);
+ set_port_dir(MAX_MINOR - minor, value);
}
break;
case GPIORDDATA:
- value = readFromPort(MAX_MINOR - minor);
+ value = read_from_port(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
case GPIOWRDATA:
ret = __get_user(value, (unsigned int *)arg);
if (ret == 0) {
- writeOnPort(MAX_MINOR - minor, value);
+ write_on_port(MAX_MINOR - minor, value);
}
break;
case GPIORDMODE:
- value = getPortMode(MAX_MINOR - minor);
+ value = get_port_mode(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
case GPIOWRMODE:
ret = __get_user(value, (unsigned int *)arg);
if (ret == 0) {
- setPortMode(MAX_MINOR - minor, value);
+ set_port_mode(MAX_MINOR - minor, value);
}
break;
@@ -757,14 +753,14 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
break;
case GPIORDPULLUP:
- value = getPortPullUp(MAX_MINOR - minor);
+ value = get_port_pull_up(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
break;
case GPIOWRPULLUP:
ret = __get_user(value, (unsigned int *)arg);
if (ret == 0) {
- setPortPullUp(MAX_MINOR - minor, value);
+ set_port_pullup(MAX_MINOR - minor, value);
}
break;
@@ -829,15 +825,15 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
switch (settings->type) {
case MODE:
- port_status = getPortMode(port_ID);
+ port_status = get_port_mode(port_ID);
break;
case VALUE:
- port_status = readFromPort(port_ID);
+ port_status = read_from_port(port_ID);
break;
case DIRECTION:
- port_status = getPortDir(port_ID);
+ port_status = get_port_dir(port_ID);
break;
case PULL_UP:
@@ -922,19 +918,19 @@ static int armadeus_gpio_proc_write(__attribute__ ((unused)) struct file *file,
switch (settings->type)
{
case MODE:
- setPortMode(port_ID, gpio_state);
+ set_port_mode(port_ID, gpio_state);
break;
case VALUE:
- writeOnPort(port_ID, gpio_state);
+ write_on_port(port_ID, gpio_state);
break;
case DIRECTION:
- setPortDir(port_ID, gpio_state);
+ set_port_dir(port_ID, gpio_state);
break;
case PULL_UP:
- setPortPullUp(port_ID, gpio_state);
+ set_port_pullup(port_ID, gpio_state);
break;
case INTERRUPT:
@@ -1176,7 +1172,7 @@ void gpioWriteOnPort(unsigned int aPort, unsigned int aValue)
printk(DRIVER_NAME "port unknown !\n");
return;
}
- writeOnPort(aPort, aValue);
+ write_on_port(aPort, aValue);
}
unsigned int gpioReadFromPort(unsigned int aPort)
@@ -1185,18 +1181,18 @@ unsigned int gpioReadFromPort(unsigned int aPort)
printk(DRIVER_NAME "port unknown !\n");
return 0;
} else {
- return readFromPort(aPort);
+ return read_from_port(aPort);
}
}
void gpioSetPortDir(unsigned int aPort, unsigned int aDirMask)
{
- setPortDir(aPort, aDirMask);
+ set_port_dir(aPort, aDirMask);
}
unsigned int gpioGetPortDir(unsigned int aPort)
{
- return getPortDir(aPort);
+ return get_port_dir(aPort);
}
EXPORT_SYMBOL(gpioWriteOnPort);
hooks/post-receive
--
armadeus
|
