forked from Freetz/freetz
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* use (a more recent) open-source driver for all boxes & kernel-versions * all kernel-versions have been compile-tested, versions 2.6.28 & 2.6.32 have also been tested at run-time (thanks to [http://www.ip-phone-forum.de/showthread.php?t=265339 RomMon] for that) * refs #465 git-svn-id: file:///var/svn/freetz/trunk@11464 149334a1-2f27-0410-a3b9-fc62619ac1e6
- Loading branch information
er13
committed
Dec 25, 2013
1 parent
927f78d
commit fe02c9d
Showing
13 changed files
with
66 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
26 changes: 18 additions & 8 deletions
26
...patches/open_source/040-local_mutex.patch → ...hes/020-local_mutex.backport-2.6.42.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,49 @@ | ||
| --- 2.6.32/platform/linux/tarball-tag/sal/io.c | ||
| +++ 2.6.32/platform/linux/tarball-tag/sal/io.c | ||
| @@ -41,7 +41,8 @@ | ||
| @@ -41,7 +41,11 @@ | ||
| #include <linux/fs.h> | ||
| #include <asm/uaccess.h> | ||
| #include <linux/ide.h> | ||
| -#include <linux/smp_lock.h> | ||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)) | ||
| +#include <linux/mutex.h> | ||
| + | ||
| +#else | ||
| #include <linux/smp_lock.h> | ||
| +#endif | ||
| #include <linux/time.h> | ||
|
|
||
| #include "sal/sync.h" | ||
| @@ -54,6 +55,8 @@ | ||
| @@ -54,6 +58,10 @@ | ||
|
|
||
| #include "linux_ver.h" // SAL_HZ | ||
|
|
||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)) | ||
| +DEFINE_MUTEX(fs_mutex); | ||
| +#endif | ||
| + | ||
| NDAS_SAL_API sal_file sal_file_open(const char * filename, int flags, int mode) | ||
| { | ||
| int linux_flags = 0; | ||
| @@ -95,7 +98,7 @@ | ||
| @@ -95,7 +103,11 @@ | ||
| int size32; | ||
| #endif | ||
|
|
||
| - lock_kernel(); | ||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)) | ||
| + mutex_lock(&fs_mutex); | ||
| +#else | ||
| lock_kernel(); | ||
| +#endif | ||
|
|
||
| if (filp->f_dentry && | ||
| filp->f_dentry->d_inode && | ||
| @@ -158,7 +161,7 @@ | ||
| @@ -158,7 +170,11 @@ | ||
| } else { | ||
| ret = FALSE; | ||
| } | ||
| - unlock_kernel(); | ||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)) | ||
| + mutex_unlock(&fs_mutex); | ||
| +#else | ||
| unlock_kernel(); | ||
| +#endif | ||
| return ret; | ||
| } | ||
|
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| --- 2.6.32/platform/linux/tarball-tag/inc/linux_ver.h | ||
| +++ 2.6.32/platform/linux/tarball-tag/inc/linux_ver.h | ||
| @@ -199,6 +199,13 @@ | ||
| sock_create(family, type, protocol, res) | ||
| #endif | ||
|
|
||
| +/* In 2.6.13 and 2.6.14 kernels class_device_create() had different prototype. */ | ||
| +#if (KERNEL_VERSION(2,6,12) < LINUX_VERSION_CODE) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
| +#define ndas_class_device_create(cls, parent, devt, device, fmt) class_device_create(cls, devt, device, fmt) | ||
| +#else | ||
| +#define ndas_class_device_create(cls, parent, devt, device, fmt) class_device_create(cls, parent, devt, device, fmt) | ||
| +#endif | ||
| + | ||
| #if LINUX_VERSION_25_ABOVE | ||
| #define GENDISK_MAX_DISKNAME sizeof(((struct gendisk*)0)->disk_name) | ||
| #define GENDISK_MAX_DDEVFSNAME sizeof(((struct gendisk*)0)->devfs_name) | ||
| --- 2.6.32/platform/linux/tarball-tag/block/ctrldev.c | ||
| +++ 2.6.32/platform/linux/tarball-tag/block/ctrldev.c | ||
| @@ -1151,7 +1151,7 @@ | ||
| MKDEV(NDAS_CHR_DEV_MAJOR, NDAS_CHR_DEV_MINOR), | ||
| NULL, "ndas"); | ||
| #else | ||
| - class_device_create(ndas_ctrldev_class, NULL, | ||
| + ndas_class_device_create(ndas_ctrldev_class, NULL, | ||
| MKDEV(NDAS_CHR_DEV_MAJOR, NDAS_CHR_DEV_MINOR), | ||
| NULL, "ndas"); | ||
| #endif //#if LINUX_VERSION_HAS_DEVICE_CREATE | ||
| --- 2.6.32/platform/linux/tarball-tag/scsi/ctrldev.c | ||
| +++ 2.6.32/platform/linux/tarball-tag/scsi/ctrldev.c | ||
| @@ -1025,7 +1025,7 @@ | ||
| MKDEV(NDAS_CHR_DEV_MAJOR, NDAS_CHR_DEV_MINOR), | ||
| NULL, "ndas"); | ||
| #else | ||
| - class_device_create(ndas_ctrldev_class, NULL, | ||
| + ndas_class_device_create(ndas_ctrldev_class, NULL, | ||
| MKDEV(NDAS_CHR_DEV_MAJOR, NDAS_CHR_DEV_MINOR), | ||
| NULL, "ndas"); | ||
| #endif //#if LINUX_VERSION_HAS_DEVICE_CREATE |
30 changes: 0 additions & 30 deletions
30
make/ndas/patches/closed_source/010-class_device_create.patch
This file was deleted.
Oops, something went wrong.