Date: Sun, 6 Apr 2003 12:03:20 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28347 for review Message-ID: <200304061903.h36J3Kla061408@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28347 Change 28347 by peter@peter_overcee on 2003/04/06 12:02:44 IFC @28346 Affected files ... .. //depot/projects/hammer/share/termcap/termcap.src#5 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/mp_clock.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.s#6 integrate .. //depot/projects/hammer/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/md_var.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/pmap.h#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/libacu/courier.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/libacu/df.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/libacu/hayes.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/libacu/t3000.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/tip/cmds.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/tip/cmdtab.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/tip/tip.c#2 integrate .. //depot/projects/hammer/usr.bin/tip/tip/tip.h#2 integrate .. //depot/projects/hammer/usr.bin/tip/tip/value.c#2 integrate Differences ... ==== //depot/projects/hammer/share/termcap/termcap.src#5 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.134 2003/01/09 19:52:01 trhodes Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.135 2003/04/06 11:47:24 hosokawa Exp $ # Termcap source file # John Kunze, Berkeley @@ -4461,15 +4461,15 @@ :xn@:op=\E[39;49m:Km=\E[M:tc=linux: # Multilingual Sysinstall (kon2 console) # HOSOKAWA, Tatsumi (hosokawa@FreeBSD.org) -kons25jx|kon3jx|jkons3jx|kons24-jis1983-j:\ +kons25x|kons25-euc:\ :ac=q\207x\214m\205v\212j\202t\210n\206u\211l\204w\213k\203y\053z\053f\336~\245a\043h\043`^D.v-\136I^U0\215:\ :ve=\E[25h:vi=\E[25l:\ :k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:\ :k9=\E[U:k;=\E[V:F1=\E[W:F2=\E[X:K2=\E[E:\ :kN=\E[G:kP=\E[I:\ :tc=linux: -kons25jx-m|kon3jx-m|jkons3jx-mono|kons24-jis1983-j-mono:\ - :pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=kons25jx: +kons25x-m|kons25-euc-mono:\ + :pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=kons25x: # Termcap for Top Gun Telnet and SSH on the Palm Pilot. # http://www.ai/~iang/TGssh/ ==== //depot/projects/hammer/sys/boot/common/bootstrap.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.36 2002/03/10 22:33:04 sobomax Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.37 2003/04/06 06:28:08 peter Exp $ */ #include <sys/types.h> ==== //depot/projects/hammer/sys/dev/usb/usbdevs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.115 2003/03/11 01:41:33 njl Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.116 2003/04/06 17:32:12 scottl Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -468,6 +468,7 @@ product BELKIN2 F5U002 0x0002 F5U002 Parallel printer adapter product BELKIN USB2LAN 0x0121 USB to LAN Converter product BELKIN F5U103 0x0103 F5U103 Serial adapter +product BELKIN F5U109 0x0109 F5U109 Serial adapter product BELKIN F5U120 0x1203 F5U120-PC Hub /* Billionton products */ @@ -1044,6 +1045,7 @@ product SONY MSC 0x0032 MSC memory stick slot product SONY CLIE_40 0x0066 Sony Clie v4.0 product SONY CLIE_41 0x009a Sony Clie v4.1 +product SONY CLIE_50 0x00da Sony Clie v5.0 /* STMicroelectronics products */ product STMICRO COMMUNICATOR 0x7554 USB Communicator ==== //depot/projects/hammer/sys/dev/usb/usbdevs.h#5 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.124 2003/03/11 01:41:33 njl Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.125 2003/04/06 17:32:39 scottl Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.114 2003/02/13 12:55:17 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.116 2003/04/06 17:32:12 scottl Exp */ /* @@ -475,6 +475,7 @@ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ #define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ #define USB_PRODUCT_BELKIN_F5U103 0x0103 /* F5U103 Serial adapter */ +#define USB_PRODUCT_BELKIN_F5U109 0x0109 /* F5U109 Serial adapter */ #define USB_PRODUCT_BELKIN_F5U120 0x1203 /* F5U120-PC Hub */ /* Billionton products */ @@ -1051,6 +1052,7 @@ #define USB_PRODUCT_SONY_MSC 0x0032 /* MSC memory stick slot */ #define USB_PRODUCT_SONY_CLIE_40 0x0066 /* Sony Clie v4.0 */ #define USB_PRODUCT_SONY_CLIE_41 0x009a /* Sony Clie v4.1 */ +#define USB_PRODUCT_SONY_CLIE_50 0x00da /* Sony Clie v5.0 */ /* STMicroelectronics products */ #define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* USB Communicator */ ==== //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#5 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.124 2003/03/11 01:41:33 njl Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.125 2003/04/06 17:34:08 scottl Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.114 2003/02/13 12:55:17 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.116 2003/04/06 17:32:12 scottl Exp */ /* @@ -448,6 +448,12 @@ "F5U103 Serial adapter", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109, + 0, + "Belkin Components", + "F5U109 Serial adapter", + }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120, 0, "Belkin Components", @@ -2506,6 +2512,12 @@ "Sony Clie v4.1", }, { + USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_50, + 0, + "Sony", + "Sony Clie v5.0", + }, + { USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR, 0, "STMicroelectronics", ==== //depot/projects/hammer/sys/dev/usb/uvisor.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.11 2003/03/09 11:14:34 akiyama Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.12 2003/04/06 17:34:50 scottl Exp $ */ /* This version of uvisor is heavily based upon the version in NetBSD * but is missing the following patches: @@ -202,6 +202,7 @@ {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M125 }, PALM4 }, {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40 }, PALM4 }, {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41 }, 0 }, + {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_50 }, 0 }, /* {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25 }, PALM4 },*/ }; #define uvisor_lookup(v, p) ((const struct uvisor_type *)usb_lookup(uvisor_devs, v, p)) ==== //depot/projects/hammer/sys/i386/i386/mp_clock.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * not protected against the fact that the bits can be wrong in two * directions. If we only cared about monosity two reads would be enough. * - * $FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.11 2002/11/13 17:50:59 mux Exp $ + * $FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.12 2003/04/06 18:42:22 des Exp $ * */ @@ -101,12 +101,11 @@ switch (pci_get_devid(dev)) { case 0x71138086: d = pci_read_config(dev, 0x4, 2); - if (!(d & 1)) - return 0; /* IO space not mapped */ - d = pci_read_config(dev, 0x40, 4); - piix_timecounter_address = (d & 0xffc0) + 8; - piix_timecounter.tc_frequency = piix_freq; - tc_init(&piix_timecounter); + if (d & 1) + return (0); + printf("PIIX I/O space not mapped\n"); + return (ENXIO); + default: return (ENXIO); }; return (ENXIO); @@ -115,8 +114,13 @@ static int piix_attach (device_t dev) { - - return 0; + u_int32_t d; + + d = pci_read_config(dev, 0x40, 4); + piix_timecounter_address = (d & 0xffc0) + 8; + piix_timecounter.tc_frequency = piix_freq; + tc_init(&piix_timecounter); + return (0); } static device_method_t piix_methods[] = { ==== //depot/projects/hammer/sys/ia64/ia64/exception.s#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.39 2003/02/17 10:21:32 julian Exp $ + * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.40 2003/04/06 05:55:36 marcel Exp $ */ #include <machine/asm.h> @@ -336,9 +336,9 @@ (p1) br.cond.sptk.few 2f // if not, read next in chain ;; ld8 r21=[r20] // read pte - mov r22=PTE_D + mov r22=PTE_D|PTE_A ;; - or r21=r22,r21 // set dirty bit + or r21=r22,r21 // set dirty & access bit ;; st8 [r20]=r21 // store back ;; ==== //depot/projects/hammer/sys/sparc64/include/cpufunc.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.15 2003/04/03 18:43:40 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/cpufunc.h,v 1.16 2003/04/06 17:05:26 jake Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -196,9 +196,6 @@ void ascopyto(caddr_t src, u_long dasi, vm_offset_t dst, size_t len); void aszero(u_long asi, vm_offset_t dst, size_t len); -void spitfire_block_copy(void *src, void *dst, size_t len); -void spitfire_block_zero(void *dst, size_t len); - /* * Ultrasparc II doesn't implement popc in hardware. Suck. */ ==== //depot/projects/hammer/sys/sparc64/include/md_var.h#3 (text+ko) ==== @@ -27,12 +27,15 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/sparc64/include/md_var.h,v 1.12 2002/08/30 04:04:37 peter Exp $ + * $FreeBSD: src/sys/sparc64/include/md_var.h,v 1.13 2003/04/06 17:05:26 jake Exp $ */ #ifndef _MACHINE_MD_VAR_H_ #define _MACHINE_MD_VAR_H_ +typedef void cpu_block_copy_t(const void *src, void *dst, size_t len); +typedef void cpu_block_zero_t(void *dst, size_t len); + extern char tl0_base[]; extern char _end[]; @@ -41,10 +44,6 @@ extern vm_offset_t kstack0; extern vm_offset_t kstack0_phys; -struct dbreg; -struct fpreg; -struct thread; -struct reg; struct pcpu; void cpu_halt(void); @@ -54,4 +53,10 @@ int is_physical_memory(vm_offset_t addr); void swi_vm(void *v); +cpu_block_copy_t spitfire_block_copy; +cpu_block_zero_t spitfire_block_zero; + +extern cpu_block_copy_t *cpu_block_copy; +extern cpu_block_zero_t *cpu_block_zero; + #endif /* !_MACHINE_MD_VAR_H_ */ ==== //depot/projects/hammer/sys/sparc64/include/pmap.h#8 (text+ko) ==== @@ -37,7 +37,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 - * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.33 2003/03/19 06:55:37 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.34 2003/04/06 18:17:31 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -117,7 +117,7 @@ #define PMAP_STATS_VAR(name) \ static long name; \ - SYSCTL_LONG(_debug_pmap_stats, OID_AUTO, name, CTLFLAG_RD, \ + SYSCTL_LONG(_debug_pmap_stats, OID_AUTO, name, CTLFLAG_RW, \ &name, 0, "") #define PMAP_STATS_INC(var) \ ==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#10 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27 - * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.85 2003/04/03 18:28:03 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.86 2003/04/06 17:05:26 jake Exp $ */ #include "opt_compat.h" @@ -132,6 +132,11 @@ char sparc64_model[32]; +static int cpu_use_vis = 1; + +cpu_block_copy_t *cpu_block_copy; +cpu_block_zero_t *cpu_block_zero; + static timecounter_get_t tick_get_timecount; void sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec); @@ -280,6 +285,15 @@ cache_init(child); + getenv_int("machdep.use_vis", &cpu_use_vis); + if (cpu_use_vis) { + cpu_block_copy = spitfire_block_copy; + cpu_block_zero = spitfire_block_zero; + } else { + cpu_block_copy = bcopy; + cpu_block_zero = bzero; + } + #ifdef DDB kdb_init(); #endif ==== //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.104 2003/03/31 19:56:55 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.107 2003/04/06 18:18:17 jake Exp $ */ /* @@ -200,7 +200,6 @@ PMAP_STATS_VAR(pmap_ncache_remove_cc); PMAP_STATS_VAR(pmap_ncache_remove_coc); PMAP_STATS_VAR(pmap_ncache_remove_nc); -PMAP_STATS_VAR(pmap_niflush); PMAP_STATS_VAR(pmap_nzero_page); PMAP_STATS_VAR(pmap_nzero_page_c); PMAP_STATS_VAR(pmap_nzero_page_oc); @@ -892,6 +891,8 @@ tp = tsb_kvtotte(va); CTR3(KTR_PMAP, "pmap_kremove: va=%#lx tp=%p data=%#lx", va, tp, tp->tte_data); + if ((tp->tte_data & TD_V) == 0) + return; m = PHYS_TO_VM_PAGE(TTE_GET_PA(tp)); TAILQ_REMOVE(&m->md.tte_list, tp, tte_link); pmap_cache_remove(m, va); @@ -1497,7 +1498,6 @@ */ if ((prot & VM_PROT_EXECUTE) != 0) { if ((data & TD_EXEC) == 0) { - PMAP_STATS_INC(pmap_niflush); icache_page_inval(pa); } tp->tte_data |= TD_EXEC; @@ -1534,7 +1534,6 @@ data |= TD_SW; if (prot & VM_PROT_EXECUTE) { data |= TD_EXEC; - PMAP_STATS_INC(pmap_niflush); icache_page_inval(pa); } @@ -1643,14 +1642,14 @@ } else if (m->md.color == DCACHE_COLOR(pa)) { PMAP_STATS_INC(pmap_nzero_page_c); va = TLB_PHYS_TO_DIRECT(pa); - bzero((void *)va, PAGE_SIZE); + cpu_block_zero((void *)va, PAGE_SIZE); } else { PMAP_STATS_INC(pmap_nzero_page_oc); va = pmap_temp_map_1 + (m->md.color * PAGE_SIZE); tp = tsb_kvtotte(va); tp->tte_data = TD_V | TD_8K | TD_PA(pa) | TD_CP | TD_CV | TD_W; tp->tte_vpn = TV_VPN(va, TS_8K); - bzero((void *)va, PAGE_SIZE); + cpu_block_zero((void *)va, PAGE_SIZE); tlb_page_demap(kernel_pmap, va); } } @@ -1702,14 +1701,14 @@ } else if (m->md.color == DCACHE_COLOR(pa)) { PMAP_STATS_INC(pmap_nzero_page_idle_c); va = TLB_PHYS_TO_DIRECT(pa); - bzero((void *)va, PAGE_SIZE); + cpu_block_zero((void *)va, PAGE_SIZE); } else { PMAP_STATS_INC(pmap_nzero_page_idle_oc); va = pmap_idle_map + (m->md.color * PAGE_SIZE); tp = tsb_kvtotte(va); tp->tte_data = TD_V | TD_8K | TD_PA(pa) | TD_CP | TD_CV | TD_W; tp->tte_vpn = TV_VPN(va, TS_8K); - bzero((void *)va, PAGE_SIZE); + cpu_block_zero((void *)va, PAGE_SIZE); tlb_page_demap(kernel_pmap, va); } } @@ -1738,7 +1737,7 @@ PMAP_STATS_INC(pmap_ncopy_page_c); vdst = TLB_PHYS_TO_DIRECT(pdst); vsrc = TLB_PHYS_TO_DIRECT(psrc); - bcopy((void *)vsrc, (void *)vdst, PAGE_SIZE); + cpu_block_copy((void *)vsrc, (void *)vdst, PAGE_SIZE); } else if (msrc->md.color == -1) { if (mdst->md.color == DCACHE_COLOR(pdst)) { PMAP_STATS_INC(pmap_ncopy_page_dc); @@ -1785,7 +1784,7 @@ tp->tte_data = TD_V | TD_8K | TD_PA(psrc) | TD_CP | TD_CV | TD_W; tp->tte_vpn = TV_VPN(vsrc, TS_8K); - bcopy((void *)vsrc, (void *)vdst, PAGE_SIZE); + cpu_block_copy((void *)vsrc, (void *)vdst, PAGE_SIZE); tlb_page_demap(kernel_pmap, vdst); tlb_page_demap(kernel_pmap, vsrc); } ==== //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-printfloat.c,v 1.1 2003/04/05 22:13:01 das Exp $"); +__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-printfloat.c,v 1.2 2003/04/06 08:02:20 tjr Exp $"); #include <assert.h> #include <err.h> @@ -133,6 +133,9 @@ testfmt("314159", "%g", 3.14159e5); testfmt("314159.", "%#g", 3.14159e5); + testfmt(" 0.0", "%4.1f", 0.0); + testfmt(" 100", "%4.0f", 100.0); + printf("PASS printfloat\n"); return (0); ==== //depot/projects/hammer/usr.bin/tip/libacu/courier.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/courier.c,v 1.5 2002/03/22 01:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/courier.c,v 1.6 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -60,6 +60,7 @@ static jmp_buf timeoutbuf, intbuf; static int coursync(), cour_connect(), cour_swallow(); void cour_nap(); +static void cour_write(int fd, char *cp, int n); void cour_disconnect(void); ==== //depot/projects/hammer/usr.bin/tip/libacu/df.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/df.c,v 1.2 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/df.c,v 1.3 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -52,6 +52,7 @@ static jmp_buf Sjbuf; static void timeout(); +static void df_disconnect(void); int df02_dialer(num, acu) @@ -123,8 +124,8 @@ return (c == 'A'); } -void -df_disconnect() +static void +df_disconnect(void) { write(FD, "\001", 1); sleep(1); ==== //depot/projects/hammer/usr.bin/tip/libacu/hayes.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/hayes.c,v 1.3 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/hayes.c,v 1.4 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -74,6 +74,8 @@ #define min(a,b) ((a < b) ? a : b) +static void error_rep(char c); +static void goodbye(void); static void sigALRM(); static int timeout = 0; static jmp_buf timeoutbuf; @@ -252,8 +254,8 @@ /* * set modem back to normal verbose status codes. */ -void -goodbye() +static void +goodbye(void) { int len; char c; ==== //depot/projects/hammer/usr.bin/tip/libacu/t3000.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/t3000.c,v 1.4 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/libacu/t3000.c,v 1.5 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -61,6 +61,7 @@ static jmp_buf timeoutbuf, intbuf; static int t3000_sync(), t3000_connect(), t3000_swallow(); static void t3000_nap(); +static int t3000_write(int fd, char *cp, int n); int t3000_dialer(num, acu) ==== //depot/projects/hammer/usr.bin/tip/tip/cmds.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.15 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.16 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -95,6 +95,7 @@ return; } transfer(buf, sfd, value(EOFREAD)); + return; } /* @@ -202,7 +203,7 @@ * send remote input to local process via pipe */ void -pipefile() +pipefile(char c) { int cpid, pdes[2]; char buf[256]; @@ -473,7 +474,7 @@ * Identical to consh() except for where stdout goes. */ void -pipeout(c) +pipeout(char c) { char buf[256]; int cpid, status, p; @@ -525,7 +526,7 @@ * 2 <-> local tty out */ void -consh(c) +consh(char c) { char buf[256]; int cpid, status, p; @@ -575,7 +576,7 @@ * Escape to local shell */ void -shell() +shell(char c) { int shpid, status; char *cp; @@ -633,7 +634,7 @@ * local portion of tip */ void -chdirectory() +chdirectory(char c) { char dirname[PATH_MAX]; char *cp = dirname; @@ -665,7 +666,7 @@ } void -finish() +finish(char c) { char *dismsg; @@ -745,7 +746,7 @@ } void -variable() +variable(char c) { char buf[256]; @@ -789,7 +790,7 @@ } void -listvariables() +listvariables(char c) { value_t *p; char *buf; @@ -853,7 +854,7 @@ * Send a break. */ void -genbrk() +genbrk(char c) { ioctl(FD, TIOCSBRK, NULL); ==== //depot/projects/hammer/usr.bin/tip/tip/cmdtab.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmdtab.c,v 1.4 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cmdtab.c,v 1.5 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -46,10 +46,6 @@ #include "tip.h" -extern int shell(), getfl(), sendfile(), chdirectory(); -extern int finish(), help(), pipefile(), pipeout(), consh(), variable(); -extern int cu_take(), cu_put(), dollar(), genbrk(), suspend(), listvariables(); - esctable_t etable[] = { { '!', NORM, "shell", shell }, { '<', NORM, "receive file from remote host", getfl }, ==== //depot/projects/hammer/usr.bin/tip/tip/tip.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.15 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.16 2003/04/06 08:30:25 imp Exp $"); #ifndef lint static char copyright[] = @@ -81,6 +81,7 @@ char *system = NOSTR; int i; char *p; + const char *p2; char sbuf[12]; gid = getgid(); @@ -198,8 +199,8 @@ */ if (HW) ttysetup(i); - if ((p = connect())) { - printf("\07%s\n[EOT]\n", p); + if ((p2 = connect())) { + printf("\07%s\n[EOT]\n", p2); daemon_uid(); (void)uu_unlock(uucplock); exit(1); ==== //depot/projects/hammer/usr.bin/tip/tip/tip.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: tip.h,v 1.11 2001/09/09 19:30:49 millert Exp $ */ /* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */ -/* $FreeBSD: src/usr.bin/tip/tip/tip.h,v 1.8 2002/03/22 01:42:35 imp Exp $ */ +/* $FreeBSD: src/usr.bin/tip/tip/tip.h,v 1.9 2003/04/06 08:30:25 imp Exp $ */ /* * Copyright (c) 1989, 1993 @@ -173,7 +173,7 @@ char e_char; /* char to match on */ char e_flags; /* experimental, priviledged */ const char *e_help; /* help string */ - int (*e_func)(char); /* command */ + void (*e_func)(char); /* command */ } esctable_t; @@ -330,3 +330,8 @@ int v831_dialer(char *, char *); void v831_disconnect(void); void v831_abort(void); + +void shell(char c), getfl(char c), sendfile(char c), chdirectory(char c); +void finish(char c), help(char c), pipefile(char c), pipeout(char c); +void consh(char c), variable(char c), cu_take(char c), cu_put(char c); +void dollar(char c), genbrk(char c), suspend(char c), listvariables(char c); ==== //depot/projects/hammer/usr.bin/tip/tip/value.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/tip/tip/value.c,v 1.7 2001/12/20 14:25:46 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/tip/value.c,v 1.8 2003/04/06 08:30:25 imp Exp $"); #ifndef lint #if 0 @@ -218,7 +218,7 @@ value_t *p; { char *cp; - extern char *interp(), *ctrl(); + extern char *interp(); if (col > 0 && col < MIDDLE) while (col++ < MIDDLE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304061903.h36J3Kla061408>