Commit 6e602e59 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Benjamin Herrenschmidt

[IRDA]: Move last of irsyms.c to irmod.c

Original patch from Stephen Hemminger

Move last bits of code out of irsyms and onto irmod.c where
initialization happens.

Move irda_debug parameter out of irsyms.c into irmod.c
and make it a new style module parameter.
parent 5f085d75
...@@ -61,7 +61,7 @@ typedef __u32 magic_t; ...@@ -61,7 +61,7 @@ typedef __u32 magic_t;
#ifdef CONFIG_IRDA_DEBUG #ifdef CONFIG_IRDA_DEBUG
extern __u32 irda_debug; extern unsigned int irda_debug;
/* use 0 for production, 1 for verification, >2 for debug */ /* use 0 for production, 1 for verification, >2 for debug */
#define IRDA_DEBUG_LEVEL 0 #define IRDA_DEBUG_LEVEL 0
......
...@@ -10,6 +10,6 @@ obj-$(CONFIG_IRCOMM) += ircomm/ ...@@ -10,6 +10,6 @@ obj-$(CONFIG_IRCOMM) += ircomm/
irda-y := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \ irda-y := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \ irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \
irttp.o irda_device.o irias_object.o crc.o wrapper.o af_irda.o \ irttp.o irda_device.o irias_object.o crc.o wrapper.o af_irda.o \
discovery.o parameters.o irsyms.o discovery.o parameters.o irmod.o
irda-$(CONFIG_PROC_FS) += irproc.o irda-$(CONFIG_PROC_FS) += irproc.o
irda-$(CONFIG_SYSCTL) += irsysctl.o irda-$(CONFIG_SYSCTL) += irsysctl.o
/********************************************************************* /*********************************************************************
* *
* Filename: irsyms.c * Filename: irmod.c
* Version: 0.9 * Version: 0.9
* Description: IrDA module symbols * Description: IrDA stack main entry points
* Status: Experimental. * Status: Experimental.
* Author: Dag Brattli <dagb@cs.uit.no> * Author: Dag Brattli <dagb@cs.uit.no>
* Created at: Mon Dec 15 13:55:39 1997 * Created at: Mon Dec 15 13:55:39 1997
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Modified by: Dag Brattli <dagb@cs.uit.no> * Modified by: Dag Brattli <dagb@cs.uit.no>
* *
* Copyright (c) 1997, 1999-2000 Dag Brattli, All Rights Reserved. * Copyright (c) 1997, 1999-2000 Dag Brattli, All Rights Reserved.
* Copyright (c) 2000-2001 Jean Tourrilhes <jt@hpl.hp.com> * Copyright (c) 2000-2004 Jean Tourrilhes <jt@hpl.hp.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
...@@ -23,63 +23,48 @@ ...@@ -23,63 +23,48 @@
* *
********************************************************************/ ********************************************************************/
/*
* This file contains the main entry points of the IrDA stack.
* They are in this file and not af_irda.c because some developpers
* are using the IrDA stack without the socket API (compiling out
* af_irda.c).
* Jean II
*/
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/poll.h>
#include <linux/proc_fs.h>
#include <linux/smp_lock.h>
#include <linux/if_arp.h> /* ARPHRD_IRDA */
#include <net/irda/irda.h> #include <net/irda/irda.h>
#include <net/irda/irlap.h> #include <net/irda/irmod.h> /* notify_t */
#include <net/irda/irlmp.h> #include <net/irda/irlap.h> /* irlap_init */
#include <net/irda/iriap.h> #include <net/irda/irlmp.h> /* irlmp_init */
#include <net/irda/irias_object.h> #include <net/irda/iriap.h> /* iriap_init */
#include <net/irda/irttp.h> #include <net/irda/irttp.h> /* irttp_init */
#include <net/irda/irda_device.h> #include <net/irda/irda_device.h> /* irda_device_init */
#include <net/irda/wrapper.h>
#include <net/irda/timer.h> /* irproc.c */
#include <net/irda/parameters.h>
#include <net/irda/crc.h>
extern struct proc_dir_entry *proc_irda;
extern void irda_proc_register(void); extern void irda_proc_register(void);
extern void irda_proc_unregister(void); extern void irda_proc_unregister(void);
/* irsysctl.c */
extern int irda_sysctl_register(void); extern int irda_sysctl_register(void);
extern void irda_sysctl_unregister(void); extern void irda_sysctl_unregister(void);
/* af_irda.c */
extern int irda_proto_init(void);
extern void irda_proto_cleanup(void);
extern int irda_device_init(void);
extern int irlan_init(void);
extern int irlan_client_init(void);
extern int irlan_server_init(void);
extern int ircomm_init(void);
extern int ircomm_tty_init(void);
extern int irlpt_client_init(void);
extern int irlpt_server_init(void);
extern int irsock_init(void); extern int irsock_init(void);
extern void irsock_cleanup(void); extern void irsock_cleanup(void);
/* irlap_frame.c */
extern int irlap_driver_rcv(struct sk_buff *, struct net_device *, extern int irlap_driver_rcv(struct sk_buff *, struct net_device *,
struct packet_type *); struct packet_type *);
/* Main IrDA module */ /*
* Module parameters
*/
#ifdef CONFIG_IRDA_DEBUG #ifdef CONFIG_IRDA_DEBUG
unsigned int irda_debug = IRDA_DEBUG_LEVEL;
module_param_named(debug, irda_debug, uint, 0);
MODULE_PARM_DESC(irda_debug, "IRDA debugging level");
EXPORT_SYMBOL(irda_debug); EXPORT_SYMBOL(irda_debug);
#endif #endif
EXPORT_SYMBOL(irda_notify_init);
/* IrLAP */
#ifdef CONFIG_IRDA_DEBUG
__u32 irda_debug = IRDA_DEBUG_LEVEL;
#endif
/* Packet type handler. /* Packet type handler.
* Tell the kernel how IrDA packets should be handled. * Tell the kernel how IrDA packets should be handled.
...@@ -107,6 +92,7 @@ void irda_notify_init(notify_t *notify) ...@@ -107,6 +92,7 @@ void irda_notify_init(notify_t *notify)
notify->instance = NULL; notify->instance = NULL;
strlcpy(notify->name, "Unknown", sizeof(notify->name)); strlcpy(notify->name, "Unknown", sizeof(notify->name));
} }
EXPORT_SYMBOL(irda_notify_init);
/* /*
* Function irda_init (void) * Function irda_init (void)
...@@ -196,7 +182,4 @@ module_exit(irda_cleanup); ...@@ -196,7 +182,4 @@ module_exit(irda_cleanup);
MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no> & Jean Tourrilhes <jt@hpl.hp.com>"); MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no> & Jean Tourrilhes <jt@hpl.hp.com>");
MODULE_DESCRIPTION("The Linux IrDA Protocol Stack"); MODULE_DESCRIPTION("The Linux IrDA Protocol Stack");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#ifdef CONFIG_IRDA_DEBUG
MODULE_PARM(irda_debug, "1l");
#endif
MODULE_ALIAS_NETPROTO(PF_IRDA); MODULE_ALIAS_NETPROTO(PF_IRDA);
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/init.h> #include <linux/init.h>
#include <net/irda/irda.h> #include <net/irda/irda.h> /* irda_debug */
#include <net/irda/irias_object.h> #include <net/irda/irias_object.h>
#define NET_IRDA 412 /* Random number */ #define NET_IRDA 412 /* Random number */
...@@ -53,10 +53,6 @@ extern int sysctl_max_noreply_time; ...@@ -53,10 +53,6 @@ extern int sysctl_max_noreply_time;
extern int sysctl_warn_noreply_time; extern int sysctl_warn_noreply_time;
extern int sysctl_lap_keepalive_time; extern int sysctl_lap_keepalive_time;
#ifdef CONFIG_IRDA_DEBUG
extern unsigned int irda_debug;
#endif
/* this is needed for the proc_dointvec_minmax - Jean II */ /* this is needed for the proc_dointvec_minmax - Jean II */
static int max_discovery_slots = 16; /* ??? */ static int max_discovery_slots = 16; /* ??? */
static int min_discovery_slots = 1; static int min_discovery_slots = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment