Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

retire _PROTOTYPE

Browse Source 
. only good for obsolete K&R support
	. also remove a stray ansi.h and the proto cmd
This commit is contained in:
Ben Gras
2012-03-25 16:17:10 +02:00
parent cf720a028a
commit 6a73e85ad1
475 changed files with 5256 additions and 6252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/dp8390/3c503.c
+3 -3
View File
@@ -26,9 +26,9 @@ extern u32_t system_hz;
#define MILLIS_TO_TICKS(m) (((m)*system_hz/1000)+1)
_PROTOTYPE(static void el2_init, (dpeth_t *dep));
_PROTOTYPE(static void el2_stop, (dpeth_t *dep));
_PROTOTYPE( static void milli_delay, (unsigned long millis) );
static void el2_init(dpeth_t *dep);
static void el2_stop(dpeth_t *dep);
static void milli_delay(unsigned long millis);
/*===========================================================================*
* el2_init *
drivers/dp8390/dp8390.c
+53 -57
View File
@@ -71,66 +71,62 @@ PRIVATE dp_conf_t dp_conf[DP_CONF_NR]= /* Card addresses */
#define CR_EXTRA CR_STA
#if ENABLE_PCI
_PROTOTYPE( static void pci_conf, (void) );
static void pci_conf(void);
#endif
_PROTOTYPE( static void do_vwrite_s, (message *mp, int from_int) );
_PROTOTYPE( static void do_vread_s, (message *mp) );
_PROTOTYPE( static void do_init, (message *mp) );
_PROTOTYPE( static void do_int, (dpeth_t *dep) );
_PROTOTYPE( static void do_getstat_s, (message *mp) );
_PROTOTYPE( static void dp_stop, (dpeth_t *dep) );
_PROTOTYPE( static void dp_init, (dpeth_t *dep) );
_PROTOTYPE( static void dp_confaddr, (dpeth_t *dep) );
_PROTOTYPE( static void dp_reinit, (dpeth_t *dep) );
_PROTOTYPE( static void dp_reset, (dpeth_t *dep) );
_PROTOTYPE( static void dp_check_ints, (dpeth_t *dep) );
_PROTOTYPE( static void dp_recv, (dpeth_t *dep) );
_PROTOTYPE( static void dp_send, (dpeth_t *dep) );
_PROTOTYPE( static void dp_getblock, (dpeth_t *dep, int page,
size_t offset, size_t size, void *dst) );
_PROTOTYPE( static void dp_pio8_getblock, (dpeth_t *dep, int page,
size_t offset, size_t size, void *dst) );
_PROTOTYPE( static void dp_pio16_getblock, (dpeth_t *dep, int page,
size_t offset, size_t size, void *dst) );
_PROTOTYPE( static int dp_pkt2user_s, (dpeth_t *dep, int page,
vir_bytes length) );
_PROTOTYPE( static void dp_user2nic_s, (dpeth_t *dep, iovec_dat_s_t *iovp,
vir_bytes offset, int nic_addr, vir_bytes count) );
_PROTOTYPE( static void dp_pio8_user2nic_s, (dpeth_t *dep,
iovec_dat_s_t *iovp, vir_bytes offset,
int nic_addr, vir_bytes count) );
_PROTOTYPE( static void dp_pio16_user2nic_s, (dpeth_t *dep,
iovec_dat_s_t *iovp, vir_bytes offset,
int nic_addr, vir_bytes count) );
_PROTOTYPE( static void dp_nic2user_s, (dpeth_t *dep, int nic_addr,
iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count) );
_PROTOTYPE( static void dp_pio8_nic2user_s, (dpeth_t *dep, int nic_addr,
iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count) );
_PROTOTYPE( static void dp_pio16_nic2user_s, (dpeth_t *dep, int nic_addr,
iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count) );
_PROTOTYPE( static void dp_next_iovec_s, (iovec_dat_s_t *iovp) );
_PROTOTYPE( static void conf_hw, (dpeth_t *dep) );
_PROTOTYPE( static void update_conf, (dpeth_t *dep, dp_conf_t *dcp) );
_PROTOTYPE( static void map_hw_buffer, (dpeth_t *dep) );
_PROTOTYPE( static int calc_iovec_size_s, (iovec_dat_s_t *iovp) );
_PROTOTYPE( static void reply, (dpeth_t *dep) );
_PROTOTYPE( static void mess_reply, (message *req, message *reply) );
_PROTOTYPE( static void get_userdata_s, (int user_proc,
cp_grant_id_t grant, vir_bytes offset, vir_bytes count,
void *loc_addr) );
_PROTOTYPE( static void put_userdata_s, (int user_proc,
cp_grant_id_t grant, size_t count, void *loc_addr) );
_PROTOTYPE( static void insb, (port_t port, void *buf, size_t size) );
_PROTOTYPE( static void insw, (port_t port, void *buf, size_t size) );
_PROTOTYPE( static void do_vir_insb, (port_t port, int proc,
vir_bytes buf, size_t size) );
_PROTOTYPE( static void do_vir_insw, (port_t port, int proc,
vir_bytes buf, size_t size) );
static void do_vwrite_s(message *mp, int from_int);
static void do_vread_s(message *mp);
static void do_init(message *mp);
static void do_int(dpeth_t *dep);
static void do_getstat_s(message *mp);
static void dp_stop(dpeth_t *dep);
static void dp_init(dpeth_t *dep);
static void dp_confaddr(dpeth_t *dep);
static void dp_reinit(dpeth_t *dep);
static void dp_reset(dpeth_t *dep);
static void dp_check_ints(dpeth_t *dep);
static void dp_recv(dpeth_t *dep);
static void dp_send(dpeth_t *dep);
static void dp_getblock(dpeth_t *dep, int page, size_t offset, size_t
size, void *dst);
static void dp_pio8_getblock(dpeth_t *dep, int page, size_t offset,
size_t size, void *dst);
static void dp_pio16_getblock(dpeth_t *dep, int page, size_t offset,
size_t size, void *dst);
static int dp_pkt2user_s(dpeth_t *dep, int page, vir_bytes length);
static void dp_user2nic_s(dpeth_t *dep, iovec_dat_s_t *iovp, vir_bytes
offset, int nic_addr, vir_bytes count);
static void dp_pio8_user2nic_s(dpeth_t *dep, iovec_dat_s_t *iovp,
vir_bytes offset, int nic_addr, vir_bytes count);
static void dp_pio16_user2nic_s(dpeth_t *dep, iovec_dat_s_t *iovp,
vir_bytes offset, int nic_addr, vir_bytes count);
static void dp_nic2user_s(dpeth_t *dep, int nic_addr, iovec_dat_s_t
*iovp, vir_bytes offset, vir_bytes count);
static void dp_pio8_nic2user_s(dpeth_t *dep, int nic_addr, iovec_dat_s_t
*iovp, vir_bytes offset, vir_bytes count);
static void dp_pio16_nic2user_s(dpeth_t *dep, int nic_addr,
iovec_dat_s_t *iovp, vir_bytes offset, vir_bytes count);
static void dp_next_iovec_s(iovec_dat_s_t *iovp);
static void conf_hw(dpeth_t *dep);
static void update_conf(dpeth_t *dep, dp_conf_t *dcp);
static void map_hw_buffer(dpeth_t *dep);
static int calc_iovec_size_s(iovec_dat_s_t *iovp);
static void reply(dpeth_t *dep);
static void mess_reply(message *req, message *reply);
static void get_userdata_s(int user_proc, cp_grant_id_t grant, vir_bytes
offset, vir_bytes count, void *loc_addr);
static void put_userdata_s(int user_proc, cp_grant_id_t grant, size_t
count, void *loc_addr);
static void insb(port_t port, void *buf, size_t size);
static void insw(port_t port, void *buf, size_t size);
static void do_vir_insb(port_t port, int proc, vir_bytes buf, size_t
size);
static void do_vir_insw(port_t port, int proc, vir_bytes buf, size_t
size);
/* SEF functions and variables. */
FORWARD _PROTOTYPE( void sef_local_startup, (void) );
FORWARD _PROTOTYPE( int sef_cb_init_fresh, (int type, sef_init_info_t *info) );
FORWARD _PROTOTYPE( void sef_cb_signal_handler, (int signo) );
FORWARD void sef_local_startup(void);
FORWARD int sef_cb_init_fresh(int type, sef_init_info_t *info);
FORWARD void sef_cb_signal_handler(int signo);
PRIVATE void handle_hw_intr(void)
{
drivers/dp8390/dp8390.h
+14 -18
View File
@@ -173,26 +173,22 @@ typedef struct dp_rcvhdr
struct dpeth;
struct iovec_dat;
struct iovec_dat_s;
_PROTOTYPE( typedef void (*dp_initf_t), (struct dpeth *dep) );
_PROTOTYPE( typedef void (*dp_stopf_t), (struct dpeth *dep) );
_PROTOTYPE( typedef void (*dp_user2nicf_t), (struct dpeth *dep,
struct iovec_dat *iovp, vir_bytes offset,
int nic_addr, vir_bytes count) );
_PROTOTYPE( typedef void (*dp_user2nicf_s_t), (struct dpeth *dep,
struct iovec_dat_s *iovp, vir_bytes offset,
int nic_addr, vir_bytes count) );
_PROTOTYPE( typedef void (*dp_nic2userf_t), (struct dpeth *dep,
int nic_addr, struct iovec_dat *iovp,
vir_bytes offset, vir_bytes count) );
_PROTOTYPE( typedef void (*dp_nic2userf_s_t), (struct dpeth *dep,
int nic_addr, struct iovec_dat_s *iovp,
vir_bytes offset, vir_bytes count) );
typedef void(*dp_initf_t) (struct dpeth *dep);
typedef void(*dp_stopf_t) (struct dpeth *dep);
typedef void(*dp_user2nicf_t) (struct dpeth *dep, struct iovec_dat
*iovp, vir_bytes offset, int nic_addr, vir_bytes count);
typedef void(*dp_user2nicf_s_t) (struct dpeth *dep, struct iovec_dat_s
*iovp, vir_bytes offset, int nic_addr, vir_bytes count);
typedef void(*dp_nic2userf_t) (struct dpeth *dep, int nic_addr, struct
iovec_dat *iovp, vir_bytes offset, vir_bytes count);
typedef void(*dp_nic2userf_s_t) (struct dpeth *dep, int nic_addr, struct
iovec_dat_s *iovp, vir_bytes offset, vir_bytes count);
#if 0
_PROTOTYPE( typedef void (*dp_getheaderf_t), (struct dpeth *dep,
int page, struct dp_rcvhdr *h, u16_t *eth_type) );
typedef void(*dp_getheaderf_t) (struct dpeth *dep, int page, struct
dp_rcvhdr *h, u16_t *eth_type);
#endif
_PROTOTYPE( typedef void (*dp_getblock_t), (struct dpeth *dep,
int page, size_t offset, size_t size, void *dst) );
typedef void(*dp_getblock_t) (struct dpeth *dep, int page, size_t
offset, size_t size, void *dst);
/* iovectors are handled IOVEC_NR entries at a time. */
#define IOVEC_NR 16
drivers/dp8390/local.h
+9 -9
View File
@@ -10,21 +10,21 @@ local.h
struct dpeth;
/* 3c503.c */
_PROTOTYPE( int el2_probe, (struct dpeth* dep) );
int el2_probe(struct dpeth* dep);
/* dp8390.c */
_PROTOTYPE( u8_t inb, (port_t port) );
_PROTOTYPE( u16_t inw, (port_t port) );
_PROTOTYPE( void outb, (port_t port, u8_t v) );
_PROTOTYPE( void outw, (port_t port, u16_t v) );
u8_t inb(port_t port);
u16_t inw(port_t port);
void outb(port_t port, u8_t v);
void outw(port_t port, u16_t v);
/* ne2000.c */
_PROTOTYPE( int ne_probe, (struct dpeth *dep) );
_PROTOTYPE( void ne_init, (struct dpeth *dep) );
int ne_probe(struct dpeth *dep);
void ne_init(struct dpeth *dep);
/* rtl8029.c */
_PROTOTYPE( int rtl_probe, (struct dpeth *dep, int skip) );
int rtl_probe(struct dpeth *dep, int skip);
/* wdeth.c */
_PROTOTYPE( int wdeth_probe, (struct dpeth* dep) );
int wdeth_probe(struct dpeth* dep);
drivers/dp8390/ne2000.c
+5 -5
View File
@@ -27,17 +27,17 @@ extern u32_t system_hz;
#define MILLIS_TO_TICKS(m) (((m)*system_hz/1000)+1)
_PROTOTYPE( typedef int (*testf_t), (dpeth_t *dep, int pos, u8_t *pat) );
typedef int(*testf_t) (dpeth_t *dep, int pos, u8_t *pat);
PRIVATE u8_t pat0[]= { 0x00, 0x00, 0x00, 0x00 };
PRIVATE u8_t pat1[]= { 0xFF, 0xFF, 0xFF, 0xFF };
PRIVATE u8_t pat2[]= { 0xA5, 0x5A, 0x69, 0x96 };
PRIVATE u8_t pat3[]= { 0x96, 0x69, 0x5A, 0xA5 };
_PROTOTYPE( static int test_8, (dpeth_t *dep, int pos, u8_t *pat) );
_PROTOTYPE( static int test_16, (dpeth_t *dep, int pos, u8_t *pat) );
_PROTOTYPE( static void ne_stop, (dpeth_t *dep) );
_PROTOTYPE( static void milli_delay, (unsigned long millis) );
static int test_8(dpeth_t *dep, int pos, u8_t *pat);
static int test_16(dpeth_t *dep, int pos, u8_t *pat);
static void ne_stop(dpeth_t *dep);
static void milli_delay(unsigned long millis);
/*===========================================================================*
* ne_probe *
drivers/dp8390/rtl8029.c
+5 -5
View File
@@ -22,12 +22,12 @@ Created: April 2000 by Philip Homburg <philip@f-mnx.phicoh.com>
#if ENABLE_PCI
_PROTOTYPE( static void rtl_init, (struct dpeth *dep) );
static void rtl_init(struct dpeth *dep);
#if 0
_PROTOTYPE( static u16_t get_ee_word, (dpeth_t *dep, int a) );
_PROTOTYPE( static void ee_wen, (dpeth_t *dep) );
_PROTOTYPE( static void set_ee_word, (dpeth_t *dep, int a, u16_t w) );
_PROTOTYPE( static void ee_wds, (dpeth_t *dep) );
static u16_t get_ee_word(dpeth_t *dep, int a);
static void ee_wen(dpeth_t *dep);
static void set_ee_word(dpeth_t *dep, int a, u16_t w);
static void ee_wds(dpeth_t *dep);
#endif
PUBLIC int rtl_probe(dep, skip)
drivers/dp8390/wdeth.c
+7 -7
View File
@@ -26,13 +26,13 @@ Created: March 14, 1994 by Philip Homburg
static int we_int_table[8]= { 9, 3, 5, 7, 10, 11, 15, 4 };
static int we_790int_table[8]= { 0, 9, 3, 5, 7, 10, 11, 15 };
_PROTOTYPE( static void we_init, (dpeth_t *dep) );
_PROTOTYPE( static void we_stop, (dpeth_t *dep) );
_PROTOTYPE( static int we_aliasing, (dpeth_t *dep) );
_PROTOTYPE( static int we_interface_chip, (dpeth_t *dep) );
_PROTOTYPE( static int we_16bitboard, (dpeth_t *dep) );
_PROTOTYPE( static int we_16bitslot, (dpeth_t *dep) );
_PROTOTYPE( static int we_ultra, (dpeth_t *dep) );
static void we_init(dpeth_t *dep);
static void we_stop(dpeth_t *dep);
static int we_aliasing(dpeth_t *dep);
static int we_interface_chip(dpeth_t *dep);
static int we_16bitboard(dpeth_t *dep);
static int we_16bitslot(dpeth_t *dep);
static int we_ultra(dpeth_t *dep);
/*===========================================================================*
* wdeth_probe *