From: David van Moolenbroek Date: Sat, 31 Oct 2009 14:11:50 +0000 (+0000) Subject: Kernel, servers: remove unused proto.h definitions X-Git-Tag: v3.1.6~228 X-Git-Url: http://zhaoyanbai.com/repos/doc/zlib_tech.html?a=commitdiff_plain;h=f89388c241a5c7edd1ebd94355074d7d5ad4a798;p=minix.git Kernel, servers: remove unused proto.h definitions --- diff --git a/kernel/arch/i386/proto.h b/kernel/arch/i386/proto.h index bb3390b92..3e641523d 100644 --- a/kernel/arch/i386/proto.h +++ b/kernel/arch/i386/proto.h @@ -45,14 +45,8 @@ _PROTOTYPE( void s_call, (void) ), _PROTOTYPE( p_s_call, (void) ); _PROTOTYPE( void level0_call, (void) ); /* memory.c */ -_PROTOTYPE( void vir_insb, (u16_t port, struct proc *proc, u32_t vir, size_t count)); -_PROTOTYPE( void vir_outsb, (u16_t port, struct proc *proc, u32_t vir, size_t count)); -_PROTOTYPE( void vir_insw, (u16_t port, struct proc *proc, u32_t vir, size_t count)); -_PROTOTYPE( void vir_outsw, (u16_t port, struct proc *proc, u32_t vir, size_t count)); -_PROTOTYPE( void i386_updatepde, (int pde, u32_t val)); _PROTOTYPE( void i386_freepde, (int pde)); _PROTOTYPE( void getcr3val, (void)); -_PROTOTYPE( void switchedcr3, (void)); _PROTOTYPE( void vm_set_cr3, (struct proc *)); @@ -76,8 +70,6 @@ _PROTOTYPE( void phys_insb, (U16_t port, phys_bytes buf, size_t count) ); _PROTOTYPE( void phys_insw, (U16_t port, phys_bytes buf, size_t count) ); _PROTOTYPE( void phys_outsb, (U16_t port, phys_bytes buf, size_t count) ); _PROTOTYPE( void phys_outsw, (U16_t port, phys_bytes buf, size_t count) ); -_PROTOTYPE( int _memcpy_k, (void *dst, void *src, size_t n) ); -_PROTOTYPE( int _memcpy_k_fault, (void) ); _PROTOTYPE( u32_t read_cr3, (void) ); _PROTOTYPE( void reload_cr3, (void) ); _PROTOTYPE( void phys_memset, (phys_bytes ph, u32_t c, phys_bytes bytes) ); @@ -92,9 +84,9 @@ _PROTOTYPE( void init_dataseg, (struct segdesc_s *segdp, phys_bytes base, _PROTOTYPE( void enable_iop, (struct proc *pp) ); _PROTOTYPE( int prot_set_kern_seg_limit, (vir_bytes limit) ); _PROTOTYPE( void printseg, (char *banner, int iscs, struct proc *pr, u32_t selector) ); -_PROTOTYPE( u32_t, read_cs(void)); -_PROTOTYPE( u32_t, read_ds(void)); -_PROTOTYPE( u32_t, read_ss(void)); +_PROTOTYPE( u32_t read_cs, (void)); +_PROTOTYPE( u32_t read_ds, (void)); +_PROTOTYPE( u32_t read_ss, (void)); /* prototype of an interrupt vector table entry */ struct gate_table_s { diff --git a/kernel/proto.h b/kernel/proto.h index cfdcdf87e..5223ad903 100755 --- a/kernel/proto.h +++ b/kernel/proto.h @@ -30,7 +30,6 @@ _PROTOTYPE( void minix_panic, (char *s, int n) ); /* proc.c */ _PROTOTYPE( int sys_call, (int call_nr, int src_dst, message *m_ptr, long bit_map) ); -_PROTOTYPE( void sys_call_restart, (struct proc *caller) ); _PROTOTYPE( int lock_notify, (int src, int dst) ); _PROTOTYPE( int mini_notify, (struct proc *src, endpoint_t dst) ); _PROTOTYPE( int lock_send, (int dst, message *m_ptr) ); @@ -63,8 +62,6 @@ _PROTOTYPE( void sys_task, (void) ); umap_local(proc_addr(proc_nr), D, (vir_addr), (bytes)) _PROTOTYPE( phys_bytes umap_grant, (struct proc *, cp_grant_id_t, vir_bytes)); -_PROTOTYPE( vir_bytes vir_verify_grant, (struct proc *, endpoint_t, - cp_grant_id_t, vir_bytes, vir_bytes, int, endpoint_t *)); _PROTOTYPE( void clear_endpoint, (struct proc *rc) ); _PROTOTYPE( phys_bytes umap_bios, (vir_bytes vir_addr, vir_bytes bytes)); _PROTOTYPE( phys_bytes umap_verify_grant, (struct proc *rp, endpoint_t grantee, cp_grant_id_t grant, vir_bytes offset, vir_bytes bytes, int access)); @@ -122,7 +119,6 @@ _PROTOTYPE( int data_copy_vmcheck, (endpoint_t from, vir_bytes from_addr, #define data_copy_from(d, p, v, n) data_copy((p), (v), SYSTEM, (d), (n)); _PROTOTYPE( void alloc_segments, (struct proc *rp) ); _PROTOTYPE( void vm_init, (struct proc *first) ); -_PROTOTYPE( void vm_map_range, (u32_t base, u32_t size, u32_t offset) ); _PROTOTYPE( int vm_copy, (vir_bytes src, struct proc *srcproc, vir_bytes dst, struct proc *dstproc, phys_bytes bytes)); _PROTOTYPE( phys_bytes umap_local, (register struct proc *rp, int seg, @@ -164,15 +160,11 @@ _PROTOTYPE( int arch_umap, (struct proc *pr, vir_bytes, vir_bytes, int, phys_bytes *)); _PROTOTYPE( int arch_do_vmctl, (message *m_ptr, struct proc *p)); _PROTOTYPE( int vm_contiguous, (struct proc *targetproc, u32_t vir_buf, size_t count)); -_PROTOTYPE( int vm_checkrange, (struct proc *caller, struct proc *target, - vir_bytes start, vir_bytes length, int writeflag, int checkonly)); _PROTOTYPE( void proc_stacktrace, (struct proc *proc) ); _PROTOTYPE( int vm_lookup, (struct proc *proc, vir_bytes virtual, vir_bytes *result, u32_t *ptent)); _PROTOTYPE( int vm_suspend, (struct proc *caller, struct proc *target, phys_bytes lin, phys_bytes size, int wrflag, int type)); _PROTOTYPE( int delivermsg, (struct proc *target)); -_PROTOTYPE( phys_bytes arch_switch_copymsg, (struct proc *rp, message *m, - phys_bytes lin)); _PROTOTYPE( void arch_do_syscall, (struct proc *proc) ); #endif /* PROTO_H */ diff --git a/servers/is/proto.h b/servers/is/proto.h index 617d9f27f..6d70aa34f 100644 --- a/servers/is/proto.h +++ b/servers/is/proto.h @@ -16,7 +16,6 @@ _PROTOTYPE( void privileges_dmp, (void) ); _PROTOTYPE( void image_dmp, (void) ); _PROTOTYPE( void irqtab_dmp, (void) ); _PROTOTYPE( void kmessages_dmp, (void) ); -_PROTOTYPE( void sched_dmp, (void) ); _PROTOTYPE( void monparams_dmp, (void) ); _PROTOTYPE( void kenv_dmp, (void) ); _PROTOTYPE( void timing_dmp, (void) ); @@ -24,7 +23,6 @@ _PROTOTYPE( void timing_dmp, (void) ); /* dmp_pm.c */ _PROTOTYPE( void mproc_dmp, (void) ); _PROTOTYPE( void sigaction_dmp, (void) ); -_PROTOTYPE( void holes_dmp, (void) ); /* dmp_fs.c */ _PROTOTYPE( void dtab_dmp, (void) ); diff --git a/servers/mfs/proto.h b/servers/mfs/proto.h index 3aaa98005..96549c492 100644 --- a/servers/mfs/proto.h +++ b/servers/mfs/proto.h @@ -78,33 +78,14 @@ int fs_unlink_s(void); _PROTOTYPE( int truncate_inode, (struct inode *rip, off_t len) ); _PROTOTYPE( int freesp_inode, (struct inode *rip, off_t st, off_t end) ); -/* lock.c */ -_PROTOTYPE( int lock_op, (struct filp *f, int req) ); -_PROTOTYPE( void lock_revive, (void) ); - /* main.c */ _PROTOTYPE( void reply, (int who, message *m_out) ); -/* misc.c */ -_PROTOTYPE( int do_dup, (void) ); -_PROTOTYPE( int do_exit, (void) ); -_PROTOTYPE( int do_fcntl, (void) ); -_PROTOTYPE( int do_exec, (void) ); -_PROTOTYPE( int do_revive, (void) ); -_PROTOTYPE( int do_set, (void) ); -_PROTOTYPE( int do_sync, (void) ); -_PROTOTYPE( int do_fsync, (void) ); -_PROTOTYPE( int do_reboot, (void) ); -_PROTOTYPE( int do_svrctl, (void) ); -_PROTOTYPE( int do_getsysinfo, (void) ); - /* mount.c */ int fs_mountpoint_o(void); int fs_mountpoint_s(void); int fs_readsuper_o(void); int fs_readsuper_s(void); -_PROTOTYPE( int do_mount, (void) ); -_PROTOTYPE( int do_umount, (void) ); _PROTOTYPE( int unmount, (Dev_t dev) ); /* open.c */ @@ -117,13 +98,6 @@ int fs_mknod_s(void); int fs_slink_o(void); int fs_slink_s(void); int fs_newnode(void); -_PROTOTYPE( int do_close, (void) ); -_PROTOTYPE( int do_creat, (void) ); -_PROTOTYPE( int do_lseek, (void) ); -_PROTOTYPE( int do_mknod, (void) ); -_PROTOTYPE( int do_mkdir, (void) ); -_PROTOTYPE( int do_open, (void) ); -_PROTOTYPE( int do_slink, (void) ); /* path.c */ int lookup_o(void); @@ -144,10 +118,6 @@ _PROTOTYPE( struct inode *parse_path_o, (char *path, /* protect.c */ int fs_access_o(void); -_PROTOTYPE( int do_access, (void) ); -_PROTOTYPE( int do_chmod, (void) ); -_PROTOTYPE( int do_chown, (void) ); -_PROTOTYPE( int do_umask, (void) ); _PROTOTYPE( int forbidden, (struct inode *rip, mode_t access_desired) ); _PROTOTYPE( int read_only, (struct inode *ip) ); @@ -156,7 +126,6 @@ int fs_breadwrite_o(void); int fs_breadwrite_s(void); int fs_readwrite_o(void); int fs_readwrite_s(void); -_PROTOTYPE( int do_read, (void) ); _PROTOTYPE( struct buf *rahead, (struct inode *rip, block_t baseblock, u64_t position, unsigned bytes_ahead) ); _PROTOTYPE( void read_ahead, (void) ); @@ -164,16 +133,6 @@ _PROTOTYPE( block_t read_map, (struct inode *rip, off_t pos) ); _PROTOTYPE( int read_write, (int rw_flag) ); _PROTOTYPE( zone_t rd_indir, (struct buf *bp, int index) ); -/* stadir.c */ -_PROTOTYPE( int do_chdir, (void) ); -_PROTOTYPE( int do_fchdir, (void) ); -_PROTOTYPE( int do_chroot, (void) ); -_PROTOTYPE( int do_fstat, (void) ); -_PROTOTYPE( int do_stat, (void) ); -_PROTOTYPE( int do_fstatfs, (void) ); -_PROTOTYPE( int do_rdlink, (void) ); -_PROTOTYPE( int do_lstat, (void) ); - /* super.c */ _PROTOTYPE( bit_t alloc_bit, (struct super_block *sp, int map, bit_t origin)); _PROTOTYPE( void free_bit, (struct super_block *sp, int map, @@ -183,26 +142,17 @@ _PROTOTYPE( int mounted, (struct inode *rip) ); _PROTOTYPE( int read_super, (struct super_block *sp) ); _PROTOTYPE( int get_block_size, (dev_t dev) ); -/* time.c */ -_PROTOTYPE( int do_stime, (void) ); -_PROTOTYPE( int do_utime, (void) ); - /* utility.c */ _PROTOTYPE( time_t clock_time, (void) ); _PROTOTYPE( unsigned conv2, (int norm, int w) ); _PROTOTYPE( long conv4, (int norm, long x) ); -_PROTOTYPE( int fetch_name, (char *path, int len, int flag) ); _PROTOTYPE( int no_sys, (void) ); -_PROTOTYPE( int isokendpt_f, (char *f, int l, int e, int *p, int ft)); _PROTOTYPE( void mfs_nul_f, (char *file, int line, char *str, int len, int maxlen)); _PROTOTYPE( int mfs_min_f, (char *file, int line, int len1, int len2) ); _PROTOTYPE( void sanitycheck, (char *file, int line) ); #define SANITYCHECK sanitycheck(__FILE__, __LINE__) -#define okendpt(e, p) isokendpt_f(__FILE__, __LINE__, (e), (p), 1) -#define isokendpt(e, p) isokendpt_f(__FILE__, __LINE__, (e), (p), 0) - /* write.c */ _PROTOTYPE( void clear_zone, (struct inode *rip, off_t pos, int flag) ); _PROTOTYPE( int do_write, (void) ); diff --git a/servers/pm/proto.h b/servers/pm/proto.h index f8795d3d1..e13d6719b 100644 --- a/servers/pm/proto.h +++ b/servers/pm/proto.h @@ -81,7 +81,6 @@ _PROTOTYPE( void vm_notify_sig_wrapper, (endpoint_t ep) ); _PROTOTYPE( int do_stime, (void) ); _PROTOTYPE( int do_time, (void) ); _PROTOTYPE( int do_times, (void) ); -_PROTOTYPE( int do_gettimeofday, (void) ); /* timers.c */ _PROTOTYPE( void pm_set_timer, (timer_t *tp, int delta, diff --git a/servers/rs/proto.h b/servers/rs/proto.h index 583df7b02..7ec33f0ca 100644 --- a/servers/rs/proto.h +++ b/servers/rs/proto.h @@ -12,7 +12,6 @@ _PROTOTYPE( int do_up, (message *m, int do_copy, int flags)); _PROTOTYPE( int do_start, (message *m)); _PROTOTYPE( int do_down, (message *m)); _PROTOTYPE( int do_refresh, (message *m)); -_PROTOTYPE( int do_rescue, (message *m)); _PROTOTYPE( int do_restart, (message *m)); _PROTOTYPE( int do_lookup, (message *m)); _PROTOTYPE( int do_shutdown, (message *m)); diff --git a/servers/vfs/proto.h b/servers/vfs/proto.h index 6719e55f0..ead5a86ac 100644 --- a/servers/vfs/proto.h +++ b/servers/vfs/proto.h @@ -59,9 +59,6 @@ _PROTOTYPE( int inval_filp, (struct filp *) ); /* fscall.c */ _PROTOTYPE( void nested_fs_call, (message *m) ); -/* kputc.c */ -_PROTOTYPE( void diag_repl, (void) ); - /* link.c */ _PROTOTYPE( int do_link, (void) ); _PROTOTYPE( int do_unlink, (void) ); @@ -136,7 +133,6 @@ _PROTOTYPE( void suspend, (int task) ); _PROTOTYPE( void pipe_suspend, (int rw_flag, int fd_nr, char *buf, size_t size) ); _PROTOTYPE( int select_request_pipe, (struct filp *f, int *ops, int bl) ); -_PROTOTYPE( int select_cancel_pipe, (struct filp *f) ); _PROTOTYPE( int select_match_pipe, (struct filp *f) ); _PROTOTYPE( void unsuspend_by_endpt, (endpoint_t) ); _PROTOTYPE( void select_reply1, (void) ); diff --git a/servers/vm/proto.h b/servers/vm/proto.h index 98c4abd7d..d1c86ec05 100644 --- a/servers/vm/proto.h +++ b/servers/vm/proto.h @@ -99,7 +99,6 @@ _PROTOTYPE( void pt_init, (void) ); _PROTOTYPE( void pt_check, (struct vmproc *vmp) ); _PROTOTYPE( int pt_new, (pt_t *pt) ); _PROTOTYPE( void pt_free, (pt_t *pt) ); -_PROTOTYPE( void pt_freerange, (pt_t *pt, vir_bytes lo, vir_bytes hi) ); _PROTOTYPE( int pt_writemap, (pt_t *pt, vir_bytes v, phys_bytes physaddr, size_t bytes, u32_t flags, u32_t writemapflags)); _PROTOTYPE( int pt_checkrange, (pt_t *pt, vir_bytes v, size_t bytes, int write)); @@ -162,7 +161,6 @@ _PROTOTYPE(void map_sanitycheck,(char *file, int line)); #endif /* $(ARCH)/vm.c */ -_PROTOTYPE( void arch_init_vm, (struct memory mem_chunks[NR_MEMS])); _PROTOTYPE( vir_bytes, arch_map2vir(struct vmproc *vmp, vir_bytes addr)); _PROTOTYPE( char *, arch_map2str(struct vmproc *vmp, vir_bytes addr)); _PROTOTYPE( vir_bytes, arch_vir2map(struct vmproc *vmp, vir_bytes addr));