From 2fbd4bf0189cf6d421000c7eea85fee3b9c79ed0 Mon Sep 17 00:00:00 2001 From: Rik Faith Date: Tue, 13 Jun 2000 14:34:13 +0000 Subject: Unify code with kernel: Change some spacing in comments Add #include to all *_drv.c files --- linux-core/drmP.h | 6 +----- linux-core/i810_drv.c | 1 + linux-core/mga_drv.c | 1 + linux-core/r128_drv.c | 1 + linux-core/tdfx_drv.c | 1 + linux/auth.c | 2 +- linux/drm.h | 6 +++--- linux/drmP.h | 6 +----- linux/fops.c | 2 +- linux/gamma_dma.c | 2 +- linux/gamma_drv.c | 1 + linux/gamma_drv.h | 3 +++ linux/i810_drv.c | 1 + linux/mga_drv.c | 1 + linux/r128_drv.c | 1 + linux/tdfx_drv.c | 1 + linux/tdfx_drv.h | 3 +++ shared-core/drm.h | 6 +++--- shared/drm.h | 6 +++--- 19 files changed, 29 insertions(+), 22 deletions(-) diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 350d1ef9..9ad83bde 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -33,6 +33,7 @@ #define _DRM_P_H_ #ifdef __KERNEL__ +#include #include #include #include @@ -129,7 +130,6 @@ typedef struct wait_queue *wait_queue_head_t; #endif /* Generic cmpxchg added in 2.3.x */ -#if CPU != 386 #ifndef __HAVE_ARCH_CMPXCHG /* Include this here so that driver can be used with older kernels. */ @@ -163,10 +163,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #define cmpxchg(ptr,o,n) \ ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o), \ (unsigned long)(n),sizeof(*(ptr)))) -#endif -#else - /* Compiling for a 386 proper... */ -#error DRI not supported on Intel 80386 #endif /* Macros to make printk easier */ diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c index b523db90..6f78fbc9 100644 --- a/linux-core/i810_drv.c +++ b/linux-core/i810_drv.c @@ -29,6 +29,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "i810_drv.h" diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c index 4b2c835f..e77d827b 100644 --- a/linux-core/mga_drv.c +++ b/linux-core/mga_drv.c @@ -30,6 +30,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "mga_drv.h" diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c index 0c1e6fe5..8b669888 100644 --- a/linux-core/r128_drv.c +++ b/linux-core/r128_drv.c @@ -29,6 +29,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "r128_drv.h" diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index d8fef953..582832b5 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -30,6 +30,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "tdfx_drv.h" diff --git a/linux/auth.c b/linux/auth.c index b133bc50..9f81c539 100644 --- a/linux/auth.c +++ b/linux/auth.c @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: * Rickard E. (Rik) Faith * diff --git a/linux/drm.h b/linux/drm.h index c71af2cc..381bdbc5 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -11,11 +11,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: * Rickard E. (Rik) Faith * diff --git a/linux/drmP.h b/linux/drmP.h index 350d1ef9..9ad83bde 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -33,6 +33,7 @@ #define _DRM_P_H_ #ifdef __KERNEL__ +#include #include #include #include @@ -129,7 +130,6 @@ typedef struct wait_queue *wait_queue_head_t; #endif /* Generic cmpxchg added in 2.3.x */ -#if CPU != 386 #ifndef __HAVE_ARCH_CMPXCHG /* Include this here so that driver can be used with older kernels. */ @@ -163,10 +163,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #define cmpxchg(ptr,o,n) \ ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o), \ (unsigned long)(n),sizeof(*(ptr)))) -#endif -#else - /* Compiling for a 386 proper... */ -#error DRI not supported on Intel 80386 #endif /* Macros to make printk easier */ diff --git a/linux/fops.c b/linux/fops.c index 1eb2bdac..4ade7aa1 100644 --- a/linux/fops.c +++ b/linux/fops.c @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: * Rickard E. (Rik) Faith * Daryll Strauss diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c index eb78c037..a99f24ca 100644 --- a/linux/gamma_dma.c +++ b/linux/gamma_dma.c @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: * Rickard E. (Rik) Faith * diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c index a90f09b7..987c903d 100644 --- a/linux/gamma_drv.c +++ b/linux/gamma_drv.c @@ -29,6 +29,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "gamma_drv.h" diff --git a/linux/gamma_drv.h b/linux/gamma_drv.h index 55dc26be..d7e70f7f 100644 --- a/linux/gamma_drv.h +++ b/linux/gamma_drv.h @@ -24,6 +24,9 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * + * Authors: + * Rickard E. (Rik) Faith + * */ #ifndef _GAMMA_DRV_H_ diff --git a/linux/i810_drv.c b/linux/i810_drv.c index b523db90..6f78fbc9 100644 --- a/linux/i810_drv.c +++ b/linux/i810_drv.c @@ -29,6 +29,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "i810_drv.h" diff --git a/linux/mga_drv.c b/linux/mga_drv.c index 4b2c835f..e77d827b 100644 --- a/linux/mga_drv.c +++ b/linux/mga_drv.c @@ -30,6 +30,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "mga_drv.h" diff --git a/linux/r128_drv.c b/linux/r128_drv.c index 0c1e6fe5..8b669888 100644 --- a/linux/r128_drv.c +++ b/linux/r128_drv.c @@ -29,6 +29,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "r128_drv.h" diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c index d8fef953..582832b5 100644 --- a/linux/tdfx_drv.c +++ b/linux/tdfx_drv.c @@ -30,6 +30,7 @@ * */ +#include #define EXPORT_SYMTAB #include "drmP.h" #include "tdfx_drv.h" diff --git a/linux/tdfx_drv.h b/linux/tdfx_drv.h index 6b1c208e..879e6d37 100644 --- a/linux/tdfx_drv.h +++ b/linux/tdfx_drv.h @@ -24,6 +24,9 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * + * Authors: + * Rickard E. (Rik) Faith + * Daryll Strauss * */ diff --git a/shared-core/drm.h b/shared-core/drm.h index c71af2cc..381bdbc5 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -11,11 +11,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: * Rickard E. (Rik) Faith * diff --git a/shared/drm.h b/shared/drm.h index c71af2cc..381bdbc5 100644 --- a/shared/drm.h +++ b/shared/drm.h @@ -11,11 +11,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: * Rickard E. (Rik) Faith * -- cgit v1.2.3