shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

BT: add an selection of reading bd_addr from ID block or WIFI MAC+1

Browse Source
This commit is contained in:
陈智
2011-03-30 16:40:59 +08:00
parent 09c668ae08
commit e525ca90f8
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/bluetooth/Kconfig
View File

@@ -206,6 +206,16 @@ config BT_HCIBCM4325
Say Y here to compile support for HCI BCM4325 devices into the
kernel or say M to compile it as module (bcm4325).
if BT_HCIBCM432x
choice
prompt "BD_ADDR read from"
config IDBLOCK
bool "NAND ID block"
config WIFI_MAC
bool "WIFI MAC+1"
endchoice
endif
endmenu

31
drivers/bluetooth/vflash.c
View File

@@ -31,6 +31,7 @@ static struct miscdevice vflash_miscdev;
#define READ_BDADDR_FROM_FLASH 0x01
extern char GetSNSectorInfo(char * pbuf);
extern unsigned char wlan_mac_addr[6];
static int vflash_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
@@ -47,6 +48,35 @@ static int vflash_ioctl(struct inode *inode, struct file *file,
{
case READ_BDADDR_FROM_FLASH:
{
#if CONFIG_WIFI_MAC
unsigned char bd_addr[6] = {0};
int i;
printk("vflash: wlan_mac_addr:%X:%X:%X:%x:%X:%x\n", wlan_mac_addr[0],
wlan_mac_addr[1],
wlan_mac_addr[2],
wlan_mac_addr[3],
wlan_mac_addr[4],
wlan_mac_addr[5] );
for (i=1; i<6; i++) {
bd_addr[i] = wlan_mac_addr[5-i];
}
bd_addr[0] = wlan_mac_addr[5]+1;
printk("vflash: bd_addr:%X:%X:%X:%x:%X:%x\n", bd_addr[5],
bd_addr[4],
bd_addr[3],
bd_addr[2],
bd_addr[1],
bd_addr[0] );
if(copy_to_user(argp, bd_addr, 6)) {
printk("ERROR: copy_to_user---%s\n", __FUNCTION__);
return -EFAULT;
}
#else
char *tempBuf = (char *)kmalloc(512, GFP_KERNEL);
char bd_addr[6] = {0};
int i;
@@ -68,6 +98,7 @@ static int vflash_ioctl(struct inode *inode, struct file *file,
}
kfree(tempBuf);
#endif
}
break;
default: