Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/bktr Merge FreeBSD rev.1.122:



details:   https://anonhg.NetBSD.org/src/rev/3adc899e6e5e
branches:  trunk
changeset: 540815:3adc899e6e5e
user:      toshii <toshii%NetBSD.org@localhost>
date:      Wed Dec 25 06:16:58 2002 +0000

description:
Merge FreeBSD rev.1.122:
        Be consistent about "static" functions: if the function is marked
        static in its prototype, mark it static at the definition too.

diffstat:

 sys/dev/pci/bktr/bktr_core.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r e0feadc1b963 -r 3adc899e6e5e sys/dev/pci/bktr/bktr_core.c
--- a/sys/dev/pci/bktr/bktr_core.c      Wed Dec 25 02:41:03 2002 +0000
+++ b/sys/dev/pci/bktr/bktr_core.c      Wed Dec 25 06:16:58 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bktr_core.c,v 1.23 2002/11/26 18:49:44 christos Exp $  */
+/*     $NetBSD: bktr_core.c,v 1.24 2002/12/25 06:16:58 toshii Exp $    */
 
 /* FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp */
 
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.23 2002/11/26 18:49:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.24 2002/12/25 06:16:58 toshii Exp $");
 
 #include "opt_bktr.h"          /* Include any kernel config options */
 
@@ -2309,7 +2309,7 @@
 /*
  * common ioctls
  */
-int
+static int
 common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg )
 {
         int                           pixfmt;
@@ -2555,7 +2555,7 @@
 #define BKTR_TEST_RISC_STATUS_BIT2 (1 << 30)
 #define BKTR_TEST_RISC_STATUS_BIT3 (1 << 31)
 
-bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
+static bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
     int i;
     bktr_clip_t * clip_node;
     bktr->clip_start = -1;
@@ -2582,7 +2582,7 @@
     return TRUE;
 }      
 
-bool_t getline(bktr_reg_t *bktr, int x ) {
+static bool_t getline(bktr_reg_t *bktr, int x ) {
     int i, j;
     bktr_clip_t * clip_node ;
     



Home | Main Index | Thread Index | Old Index