From 1fac2f5107e94102ca643ab9b031030bbcb1daa1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 20 Jul 2008 17:05:43 +0000 Subject: 2008-07-20 Samuel Thibault * linux/pcmcia-cs/glue/wireless_glue.h (schedule_task): Add parameter to Debugger() call. * kern/lock_mon.c (retry_simple_lock, retry_bit_lock): Likewise. * kern/machine.c (Debugger): Remove declaration. 2008-07-19 Barry deFreese * device/dev_hdr.h (dev_name_lookup, dev_set_indirection): Add prototypes. * device/dev_pager.c: Include . * device/ds_routines.c: Likewise. * device/subrs.c: Likewise. * device/device_init.c: Include . * device/ds_routines.h (iowait): Add prototype. * device/net_io.h (net_kmsg_collect): Add prototype. * device/net_io.c (hash_ent_remove, net_free_dead_infp, net_free_dead_entp, bpf_validate, bpf_eq, net_add_q_info, bpf_match): Add forward declarations. * device/subrs.h: New header. * i386/i386/fpu.h: Include . Change include to . (fp_save, fp_load, fp_free, fpu_module_init, fpu_set_state, fpu_get_state, fpnoextflt, fpextovrflt, fpexterrflt, init_fpu): Add prototypes. * i386/i386/gdt.h (gdt_init): Add prototype. * i386/i386/io_map.c: Include . * vm/vm_kern.c: Likewise. * i386/i386/ktss.h (ktss_init): Add prototype. * i386/i386/ldt.h (ldt_init): Add prototype. * i386/i386/loose_ends.h: New header. * i386/i386/loose_ends.c (delay): Complete prototype. * i386/i386/model_dep.h (startrtclock): Add prototype. * i386/i386/pcb.h (load_context, stack_attach, stack_detach, switch_ktss): Add prototypes. * i386/i386/pic.h (form_pic_mask, picinit): Add prototypes. * i386/i386/pit.c: Include . * i386/i386at/kd_mouse.c: Likewise. * i386/i386/pit.h (clkstart): Add prototype. * i386/i386/trap.c: Include , , . * i386/i386/trap.h (interrupted_pc): Add prototype. * i386/i386/user_ldt.c: Include . * i386/i386at/autoconf.h: New header. * i386/i386at/com.h: New header. * i386/i386at/com.c: Include , . * i386/i386at/idt.h (idt_init): Add prototype. * i386/i386at/int_init.h: New header. * i386/i386at/kd.c: Include . * kern/debug.c: Likewise. * i386/i386at/kd_event.c: Include . * i386/i386at/kd_mouse.c: Likewise. * i386/i386at/kd_mouse.c: Include , . * i386/i386at/lpr.c: Include * i386/i386at/model_dep.c: Include: , , , , , , , , , , . * i386/i386at/rtc.h (readtodc, writetodc): Add prototypes. * i386/intel/pmap.h: Include . (pmap_bootstrap, pmap_unmap_page_zero, pmap_zero_page, pmap_copy_page, kvtophys): Add prototypes. * i386/intel/read_fault.h: New header. * kern/ast.h (ast_init, ast_check): Add prototypes. * kern/debug.c (Debugger): Move prototype to... * kern/debug.h (Debugger): ... here. * kern/eventcount.h (evc_notify_abort): Add prototype. * kern/ipc_mig.c: Include , , * kern/ipc_mig.h: New header. * kern/ipc_tt.h (mach_reply_port): Add prototype. * kern/machine.h: New header. * kern/processor.h (pset_sys_bootstrap): Move prototype outside of MACH_HOST check. * kern/sched_prim.h (thread_bind, compute_priority, thread_timeout_setup): Add prototypes. * kern/startup.c: Include , . * kern/syscall_subr.c: Include . (thread_depress_abort): Remove prototype. * kern/syscall_subr.h: Include , (thread_depress_abort): Add prototype. * kern/syscall_sw.c: Include: . * kern/task.h (consider_task_collect): Add prototype. * kern/thread.c: Include , , . * kern/thread.h (stack_collect): Add prototype. * linux/pcmcia-cs/glue/pcmcia_glue.h (Debugger): Remove prototype. * util/putchar.c: Include . * util/putchar.h: New header. * util/puts.c: Include , . * vm/memory_object.c: Include . (memory_object_data_provided): Move function below memory_object_data_supply definition. * vm/vm_init.c: Include . * vm/vm_kern.h (projected_buffer_in_range): Add prototype. * vm/vm_map.c: Include , . (vm_map_delete, vm_map_copyout_page_list, vm_map_copy_page_discard): Add forward declaration. * vm/vm_map.h (vm_map_copyin_object, vm_map_submap, _vm_map_clip_start, _vm_map_clip_end): Add prototypes. * vm/vm_pageout.c: Include , , . * vm/vm_resident.h: New header. * vm/vm_user.c: Include . * vm/pmap.h (pmap_pageable, pmap_map_bd): Add prototype. --- device/dev_hdr.h | 16 ++++++++++++++++ device/dev_pager.c | 1 + device/device_init.c | 2 +- device/ds_routines.c | 1 + device/ds_routines.h | 2 ++ device/net_io.c | 30 ++++++++++++++++++++++++++++++ device/net_io.h | 2 ++ device/subrs.c | 1 + device/subrs.h | 34 ++++++++++++++++++++++++++++++++++ 9 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 device/subrs.h (limited to 'device') diff --git a/device/dev_hdr.h b/device/dev_hdr.h index d5b87705..340a2db1 100644 --- a/device/dev_hdr.h +++ b/device/dev_hdr.h @@ -130,4 +130,20 @@ boolean_t dev_map(boolean_t (*)(), mach_port_t); #define device_lock(device) simple_lock(&(device)->lock) #define device_unlock(device) simple_unlock(&(device)->lock) +/* + * device name lookup + */ +extern boolean_t dev_name_lookup( + char * name, + dev_ops_t *ops, /* out */ + int *unit); /* out */ + +/* + * Change an entry in the indirection list. + */ +extern void dev_set_indirection( + char *name, + dev_ops_t ops, + int unit); + #endif /* _DEVICE_DEV_HDR_H_ */ diff --git a/device/dev_pager.c b/device/dev_pager.c index 68c978cd..224be850 100644 --- a/device/dev_pager.c +++ b/device/dev_pager.c @@ -49,6 +49,7 @@ #include #include +#include #include #include diff --git a/device/device_init.c b/device/device_init.c index a2e49679..1da2a6fe 100644 --- a/device/device_init.c +++ b/device/device_init.c @@ -36,7 +36,7 @@ #include #include - +#include extern void mach_device_init(); diff --git a/device/ds_routines.c b/device/ds_routines.c index 61eec99a..943185eb 100644 --- a/device/ds_routines.c +++ b/device/ds_routines.c @@ -81,6 +81,7 @@ #include #include #include +#include #include #include diff --git a/device/ds_routines.h b/device/ds_routines.h index f7943030..24668b45 100644 --- a/device/ds_routines.h +++ b/device/ds_routines.h @@ -52,4 +52,6 @@ boolean_t ds_open_done(io_req_t); boolean_t ds_read_done(io_req_t); boolean_t ds_write_done(io_req_t); +void iowait (io_req_t ior); + #endif /* DS_ROUTINES_H */ diff --git a/device/net_io.c b/device/net_io.c index b565aa3f..5f287cb6 100644 --- a/device/net_io.c +++ b/device/net_io.c @@ -367,6 +367,36 @@ decl_simple_lock_data(,net_hash_header_lock) extern boolean_t net_do_filter(); /* CSPF */ extern int bpf_do_filter(); /* BPF */ +int hash_ent_remove ( + struct ifnet *ifp, + net_hash_header_t hp, + int used, + net_hash_entry_t *head, + net_hash_entry_t entp, + queue_entry_t *dead_p); + +void net_free_dead_infp (queue_entry_t dead_infp); +void net_free_dead_entp (queue_entry_t dead_entp); + +int bpf_validate( + bpf_insn_t f, + int bytes, + bpf_insn_t *match); + +int bpf_eq ( + bpf_insn_t f1, + bpf_insn_t f2, + register int bytes); + +int net_add_q_info (ipc_port_t rcv_port); + +int bpf_match ( + net_hash_header_t hash, + int n_keys, + unsigned int *keys, + net_hash_entry_t **hash_headpp, + net_hash_entry_t *entpp); + /* * ethernet_priority: diff --git a/device/net_io.h b/device/net_io.h index ce18182e..073bdca7 100644 --- a/device/net_io.h +++ b/device/net_io.h @@ -78,6 +78,8 @@ extern io_return_t net_write(struct ifnet *, int (*)(), io_req_t); extern vm_size_t net_kmsg_size; +extern void net_kmsg_collect (void); + #define net_kmsg_alloc() ((ipc_kmsg_t) kalloc(net_kmsg_size)) #define net_kmsg_free(kmsg) kfree((vm_offset_t) (kmsg), net_kmsg_size) diff --git a/device/subrs.c b/device/subrs.c index ea63a5c6..9b2b9ade 100644 --- a/device/subrs.c +++ b/device/subrs.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/device/subrs.h b/device/subrs.h new file mode 100644 index 00000000..680aaa6f --- /dev/null +++ b/device/subrs.h @@ -0,0 +1,34 @@ +/* + * Random device functions + * Copyright (C) 2008 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Author: Barry deFreese. + */ +/* + * Random device functions. + * + */ + +#ifndef _SUBRS_H_ +#define _SUBRS_H_ + +#include + +extern void sleep (vm_offset_t channel, int priority); +extern void wakeup (vm_offset_t channel); + +#endif /* _SUBRS_H_ */ -- cgit v1.2.3