Navigation

← Previous Changeset
Next Changeset →

Changeset 15

Timestamp:

11/27/98 01:26:51 (10 years ago)

Author:

frodo

Message:

Start of i2c-bus, a module for displaying i2c bus information in /proc

Nothing much here yet, except some code to create /proc/bus/i2c. Should work
for kernels 2.0 and 2.1 (please test).

Other notable things:

printk statements in all modules made to have to same 'look'.

Files:

lm-sensors/trunk/kernel/Module.mk (modified) (1 diff)
lm-sensors/trunk/kernel/busses/i2c-isa.c (modified) (7 diffs)
lm-sensors/trunk/kernel/busses/i2c-piix4.c (modified) (2 diffs)
lm-sensors/trunk/kernel/compat.h (added)
lm-sensors/trunk/kernel/include/compat.h (added)
lm-sensors/trunk/kernel/smbus.c (modified) (5 diffs)
lm-sensors/trunk/src/Module.mk (modified) (1 diff)
lm-sensors/trunk/src/compat.h (added)
lm-sensors/trunk/src/i2c-bus.c (added)
lm-sensors/trunk/src/isa.c (modified) (7 diffs)
lm-sensors/trunk/src/piix4.c (modified) (2 diffs)
lm-sensors/trunk/src/smbus.c (modified) (5 diffs)
lm-sensors/trunk/version.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

lm-sensors/trunk/kernel/Module.mk

r13	r15
24	24	# defined value verbatim into the command-list of rules...
25	25	SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o \
26		$(MODULE_DIR)/lm78.o
	26	$(MODULE_DIR)/lm78.o $(MODULE_DIR)/i2c-bus.o
27	27
28	28	# Include all dependency files

lm-sensors/trunk/kernel/busses/i2c-isa.c

r12	r15
76	76	int num)
77	77	{
78		printk("isa_master_xfer called for adapter `%s' "
	78	printk("isa.o: isa_master_xfer called for adapter `%s' "
79	79	"(no i2c level access possible!)\n",
80	80	adap->name);
…	…
85	85	int isa_slave_send (struct isa_adapter adap, char data, int len)
86	86	{
87		printk("isa_slave_send called for adapter `%s' "
	87	printk("isa.o: isa_slave_send called for adapter `%s' "
88	88	"(no i2c level access possible!)\n",
89	89	adap->name);
…	…
94	94	int isa_slave_recv (struct isa_adapter adap, char data, int len)
95	95	{
96		printk("isa_slave_recv called for adapter `%s' "
	96	printk("isa.o: isa_slave_recv called for adapter `%s' "
97	97	"(no i2c level access possible!)\n",
98	98	adap->name);
…	…
132	132	isa_initialized = 0;
133	133	if ((res = isa_add_algorithm(&isa_algorithm))) {
134		printk("isa.o: Algorithm registration failed, module ~~isa.o not inserted~~\n");
	134	printk("isa.o: Algorithm registration failed, module not inserted.\n");
135	135	isa_cleanup();
136	136	return res;
…	…
142	142	if ((res = isa_add_adapter(&isa_adapter))) {
143	143	printk("isa.o: Adapter registration failed, "
144		"module isa.o is not inserted\n");
	144	"module isa.o is not inserted\n.");
145	145	isa_cleanup();
146	146	return res;
147	147	}
148	148	isa_initialized++;
149		printk("isa.o: ISA bus access for i2c modules initialized\n");
	149	printk("isa.o: ISA bus access for i2c modules initialized.\n");
150	150	return 0;
151	151	}
…	…
157	157	{
158	158	if ((res = isa_del_adapter(&isa_adapter))) {
159		printk("isa.o: ~~isa_del_adapter failed, module not removed~~\n");
	159	printk("isa.o: Adapter deregistration failed, module not removed.\n");
160	160	return res;
161	161	} else
…	…
165	165	{
166	166	if ((res = isa_del_algorithm(&isa_algorithm))) {
167		printk("isa.o: ~~isa_del_algorithm failed, module not removed~~\n");
	167	printk("isa.o: Algorithm deregistration failed, module not removed.\n");
168	168	return res;
169	169	} else

lm-sensors/trunk/kernel/busses/i2c-piix4.c

r13	r15
66	66	piix4_initialized = 0;
67	67	if ((res = piix4_setup())) {
68		printk("piix4.o: PIIX4 not detected, module not inserted\n");
	68	printk("piix4.o: PIIX4 not detected, module not inserted.\n");
69	69	piix4_cleanup();
70	70	return res;
…	…
76	76	piix4_adapter.smbus_access = &piix4_access;
77	77	if ((res = smbus_add_adapter(&piix4_adapter))) {
78		printk("piix4.o: ~~smbus_add_adapter failed, module not inserted~~\n");
	78	printk("piix4.o: Adapter registration failed, module not inserted.\n");
79	79	piix4_cleanup();
80	80	return res;

lm-sensors/trunk/kernel/smbus.c

r13	r15
115	115	int num)
116	116	{
117		printk("smbus_master_xfer called for adapter `%s' "
	117	printk("smbus.o: smbus_master_xfer called for adapter `%s' "
118	118	"(no i2c level access possible!)\n",
119	119	adap->name);
…	…
124	124	int smbus_slave_send (struct smbus_adapter adap, char data, int len)
125	125	{
126		printk("smbus_slave_send called for adapter `%s' "
	126	printk("smbus.o: smbus_slave_send called for adapter `%s' "
127	127	"(no i2c level access possible!)\n",
128	128	adap->name);
…	…
133	133	int smbus_slave_recv (struct smbus_adapter adap, char data, int len)
134	134	{
135		printk("smbus_slave_recv called for adapter `%s' "
	135	printk("smbus.o: smbus_slave_recv called for adapter `%s' "
136	136	"(no i2c level access possible!)\n",
137	137	adap->name);
…	…
164	164	printk("smbus.o version %s (%s)\n",LM_VERSION,LM_DATE);
165	165	if ((res = smbus_add_algorithm(&smbus_algorithm)))
166		printk("~~Module smbus.o not inserted!~~\n");
	166	printk("smbus.o: Algorithm registration failed, module not inserted.\n");
167	167	else
168	168	printk("smbus.o initialized\n");
…	…
174	174	int res;
175	175	if ((res = smbus_del_algorithm(&smbus_algorithm)))
176		printk("~~Module smbus.o could not be removed cleanly!~~\n");
	176	printk("smbus.o: Algorithm deregistration failed, module not removed\n");
177	177	return res;
178	178	}

lm-sensors/trunk/src/Module.mk

r13	r15
24	24	# defined value verbatim into the command-list of rules...
25	25	SRCTARGETS := $(MODULE_DIR)/smbus.o $(MODULE_DIR)/piix4.o $(MODULE_DIR)/isa.o \
26		$(MODULE_DIR)/lm78.o
	26	$(MODULE_DIR)/lm78.o $(MODULE_DIR)/i2c-bus.o
27	27
28	28	# Include all dependency files

lm-sensors/trunk/src/isa.c

r12	r15
76	76	int num)
77	77	{
78		printk("isa_master_xfer called for adapter `%s' "
	78	printk("isa.o: isa_master_xfer called for adapter `%s' "
79	79	"(no i2c level access possible!)\n",
80	80	adap->name);
…	…
85	85	int isa_slave_send (struct isa_adapter adap, char data, int len)
86	86	{
87		printk("isa_slave_send called for adapter `%s' "
	87	printk("isa.o: isa_slave_send called for adapter `%s' "
88	88	"(no i2c level access possible!)\n",
89	89	adap->name);
…	…
94	94	int isa_slave_recv (struct isa_adapter adap, char data, int len)
95	95	{
96		printk("isa_slave_recv called for adapter `%s' "
	96	printk("isa.o: isa_slave_recv called for adapter `%s' "
97	97	"(no i2c level access possible!)\n",
98	98	adap->name);
…	…
132	132	isa_initialized = 0;
133	133	if ((res = isa_add_algorithm(&isa_algorithm))) {
134		printk("isa.o: Algorithm registration failed, module ~~isa.o not inserted~~\n");
	134	printk("isa.o: Algorithm registration failed, module not inserted.\n");
135	135	isa_cleanup();
136	136	return res;
…	…
142	142	if ((res = isa_add_adapter(&isa_adapter))) {
143	143	printk("isa.o: Adapter registration failed, "
144		"module isa.o is not inserted\n");
	144	"module isa.o is not inserted\n.");
145	145	isa_cleanup();
146	146	return res;
147	147	}
148	148	isa_initialized++;
149		printk("isa.o: ISA bus access for i2c modules initialized\n");
	149	printk("isa.o: ISA bus access for i2c modules initialized.\n");
150	150	return 0;
151	151	}
…	…
157	157	{
158	158	if ((res = isa_del_adapter(&isa_adapter))) {
159		printk("isa.o: ~~isa_del_adapter failed, module not removed~~\n");
	159	printk("isa.o: Adapter deregistration failed, module not removed.\n");
160	160	return res;
161	161	} else
…	…
165	165	{
166	166	if ((res = isa_del_algorithm(&isa_algorithm))) {
167		printk("isa.o: ~~isa_del_algorithm failed, module not removed~~\n");
	167	printk("isa.o: Algorithm deregistration failed, module not removed.\n");
168	168	return res;
169	169	} else

lm-sensors/trunk/src/piix4.c

r13	r15
66	66	piix4_initialized = 0;
67	67	if ((res = piix4_setup())) {
68		printk("piix4.o: PIIX4 not detected, module not inserted\n");
	68	printk("piix4.o: PIIX4 not detected, module not inserted.\n");
69	69	piix4_cleanup();
70	70	return res;
…	…
76	76	piix4_adapter.smbus_access = &piix4_access;
77	77	if ((res = smbus_add_adapter(&piix4_adapter))) {
78		printk("piix4.o: ~~smbus_add_adapter failed, module not inserted~~\n");
	78	printk("piix4.o: Adapter registration failed, module not inserted.\n");
79	79	piix4_cleanup();
80	80	return res;

lm-sensors/trunk/src/smbus.c

r13	r15
115	115	int num)
116	116	{
117		printk("smbus_master_xfer called for adapter `%s' "
	117	printk("smbus.o: smbus_master_xfer called for adapter `%s' "
118	118	"(no i2c level access possible!)\n",
119	119	adap->name);
…	…
124	124	int smbus_slave_send (struct smbus_adapter adap, char data, int len)
125	125	{
126		printk("smbus_slave_send called for adapter `%s' "
	126	printk("smbus.o: smbus_slave_send called for adapter `%s' "
127	127	"(no i2c level access possible!)\n",
128	128	adap->name);
…	…
133	133	int smbus_slave_recv (struct smbus_adapter adap, char data, int len)
134	134	{
135		printk("smbus_slave_recv called for adapter `%s' "
	135	printk("smbus.o: smbus_slave_recv called for adapter `%s' "
136	136	"(no i2c level access possible!)\n",
137	137	adap->name);
…	…
164	164	printk("smbus.o version %s (%s)\n",LM_VERSION,LM_DATE);
165	165	if ((res = smbus_add_algorithm(&smbus_algorithm)))
166		printk("~~Module smbus.o not inserted!~~\n");
	166	printk("smbus.o: Algorithm registration failed, module not inserted.\n");
167	167	else
168	168	printk("smbus.o initialized\n");
…	…
174	174	int res;
175	175	if ((res = smbus_del_algorithm(&smbus_algorithm)))
176		printk("~~Module smbus.o could not be removed cleanly!~~\n");
	176	printk("smbus.o: Algorithm deregistration failed, module not removed\n");
177	177	return res;
178	178	}

lm-sensors/trunk/version.h

r12 r15

1 #define LM_DATE "19981122"
2 #define LM_VERSION "2.0.0pre1"
1 #define LM_DATE "19981127"
2 #define LM_VERSION "2.0.0pre2"

r12	r15
1		#define LM_DATE "19981122"
2		#define LM_VERSION "2.0.0pre1"
	1	#define LM_DATE "19981127"
	2	#define LM_VERSION "2.0.0pre2"

Navigation

Changeset 15

Legend:

Download in other formats: