Menu
▾
▴
irda-cvs
|
From: claudiuc <ird...@li...> - 2004-01-17 16:34:57
|
CVS commit by claudiuc: Added improvements from Thomas Pinz Spelling corrections on README.Tom CCMAIL: dc...@db... A smcinit/README.Tom 1.1 A smcinit/tosh-smcinit.c 1.1 [GPL (v2+)] A smcinit/tosh-superio.h 1.1 [no copyright] M +5 -0 smcinit/ChangeLog 1.5 M +1 -1 smcinit/VERSION 1.2 M +9 -5 smcinit/smcinit.8 1.4 M +3 -1 smcinit/smcinit.sysconfig 1.3 M +1 -1 smcinit/smcinitredhat.spec.in 1.2 M +1 -1 smcinit/smcinitsuse.spec.in 1.3 R smcinit/tosh5100-smcinit.c 1.3 --- smcinit/ChangeLog #1.4:1.5 @@ -1,2 +1,7 @@ +2003-07-10 claudiuc + * doc: added README.Tom from Thomas Pinz + * improvement: added tosh-smcinit.c and tosh-superio.h from Thomas + Pinz which will replace the tosh5100-smcinit.c + 2003-07-10 claudiuc 0.3-1 release --- smcinit/VERSION #1.1.1.1:1.2 @@ -1 +1 @@ -0.3-1 +0.4-1 --- smcinit/smcinit.8 #1.3:1.4 @@ -5,5 +5,5 @@ .B tosh1800-smcinit or -.B tosh5100-smcinit +.B tosh-smcinit .SH DESCRIPTION .PP @@ -28,5 +28,6 @@ When system startup a script is run from \fI/etc/init.d\fR and which run appropriate SMC intialization utility. This is done before PCMCIA startup because on Tecra 9100 -the \fBorinoco_cs\fR wireless driver will block the I/O region used 47N227 SuperIO. +and other models the \fBorinoco_cs\fR wireless driver will block the I/O region +used 47N227 SuperIO. .PP The only configuration file is \fI/etc/sysconfig/smcinit\fR and the variable SMCCONFIG @@ -81,9 +82,12 @@ This document is made by Claudiu Costin <cla...@kd...> The utilities authors are -Daniele Peri, Rob Miller and Paul Hampson +Daniele Peri, Rob Miller and Paul Hampson. +Thomas Pinz made improvements to \fBtosh-smcinit\fR (the former +\fBtosh5100-smcinit\fR) to expand the number of Toshiba Satellite models +supported. .SH "SEE ALSO" -.BR tosh1800-smcinit (8), +.BR tosh-smcinit (8), .br -.BR tosh5100-smcinit (8), +.BR tosh1800-smcinit (8), .br .BR irattach (1), --- smcinit/smcinit.sysconfig #1.2:1.3 @@ -3,3 +3,5 @@ # See the smcinit(8) man page for more info # -SMCCONFIG="5100" +# use `1800' as value only you have Toshiba Satellite 1800, +# otherwise leave it empty +SMCCONFIG="" --- smcinit/smcinitredhat.spec.in #1.1:1.2 @@ -71,5 +71,5 @@ %doc README COPYING ChangeLog INSTALL VERSION smcinit.lsm %doc README.Rob RobMiller-irda.html -%doc CHANGELOG.Peri README.Peri +%doc CHANGELOG.Peri README.Peri README.Tom %defattr(0644, root, root) --- smcinit/smcinitsuse.spec.in #1.2:1.3 @@ -78,5 +78,5 @@ %doc README COPYING ChangeLog INSTALL VERSION smcinit.lsm %doc README.Rob RobMiller-irda.html -%doc CHANGELOG.Peri README.Peri +%doc CHANGELOG.Peri README.Peri README.Tom %defattr(0644, root, root) |
|
From: claudiuc <ird...@li...> - 2004-01-24 23:17:19
|
CVS commit by claudiuc: Added an updated REAMDE.Tom from Thomas Pinz M +4 -1 smcinit/AUTHORS 1.2 M +8 -1 smcinit/README.Tom 1.2 --- smcinit/AUTHORS #1.1.1.1:1.2 @@ -16,3 +16,6 @@ - +Thomas Pinz <to...@gm...> + - many improvements for making the program to work + with a lot Toshiba Satellite models + --- smcinit/README.Tom #1.1:1.2 @@ -52,5 +52,4 @@ with tosh-smcinit in his text. :) - If you use a PCMCIA or miniPCI Slot (also built-in WLAN), on some machines are conflicts at the IO-Ports between IrDA and some cards. Sometimes it @@ -61,4 +60,12 @@ in /etc/pcmcia/config.opts regulates it. +Also IRQ-conflicts with other built-in components are possible. For example, +my Atheros AR5212 miniPCI-Card got the IRQ 3 assigned from the ACPI-Bios. +If you computer have a "classic" Bios-Menu, look at the entry about the +PCI-IRQ Routing. If the computer is "legacy-free", there are good chances +to incluence the routing with the "acpi_irq_balance" and "acpi_irq_pci=n" +kernel-parameters. + + Thomas Pinz, Jan 2004 E-Mail: to...@gm... |
|
From: claudiuc <ird...@li...> - 2004-01-26 23:51:33
|
CVS commit by claudiuc: Changed the comment about the new chips M +7 -8 smcinit/README.Tom 1.3 --- smcinit/README.Tom #1.2:1.3 @@ -19,11 +19,10 @@ In many newer notebooks, Toshiba changed the SuperIO chip. They use no -longer the LPC47N227, instead other chips are used like LPC47N249. But -SMSC wont give me any information about the newer chips, so I see no -way to initialize them. Furthermore, for the newer chips there is also -no support in Linux kernel 2.4.x. I hope somebody find a way in the future. +longer the LPC47N227, instead other chips are used like LPC47N24x. But we +are working on modify the smc-ircc driver and smcinit so this Chips will +also work in the near future. I tested also the following notebooks, they have newer chips and will *NOT* -work at this moment: +work at this moment. I hope this will possible in the near future. Toshiba Satellite (Pro) M30 @@ -37,6 +36,6 @@ in the list and you have MS Windows installed, please send me your settings of the IrDA and I will include it. I need the IRQ, DMA and the -2 IO-Port settings. - +2 IO-Port settings. Please also attach a copy of your /proc/interrupts, +/proc/ioports and /proc/dma OK, to make it running, you have to do the following steps: @@ -68,4 +67,4 @@ -Thomas Pinz, Jan 2004 +Thomas Pinz, Jan 2004, V0.2 E-Mail: to...@gm... |
|
From: claudiuc <ird...@li...> - 2004-01-26 23:53:57
|
CVS commit by claudiuc: Thomas: Cleanups, a bugfix, added support for other chip-ids M +12 -37 smcinit/tosh-smcinit.c 1.2 |
|
From: claudiuc <ird...@li...> - 2004-01-26 23:55:11
|
CVS commit by claudiuc: Thomas: Added support for the Portege M200 M +11 -0 smcinit/tosh-superio.h 1.2 --- smcinit/tosh-superio.h #1.1:1.2 @@ -20,4 +20,5 @@ TOSH_SATP10 - Satellite P10 TOSH_SATP20 - Satellite P20 TOSH_SATA30 - Satellite A30 +TOSH_PM200 - Portege M200 */ @@ -31,4 +32,5 @@ TOSH_SATA30 - Satellite A30 // #define TOSH_SATP20 // #define TOSH_SATA30 +// #define TOSH_PM200 /* ---------------------------------------------------------------------*/ @@ -97,4 +99,13 @@ TOSH_SATA30 - Satellite A30 #endif +/* Settings for Portege M200 */ +#ifdef TOSH_PM200 +#define MACHINE "Portege M200" +#define SIR_IO 0x3f8 +#define FIR_IO 0x130 +#define FIR_IRQ 3 +#define FIR_DMA 3 +#endif + #endif |
|
From: claudiuc <ird...@li...> - 2004-03-04 11:50:32
|
CVS commit by claudiuc: - added command-line interface - read-back of the written values - support for more chips like 47N24x - improved documentation Updates from Thomas Pinz M +47 -29 smcinit/README.Tom 1.4 M +168 -69 smcinit/tosh-smcinit.c 1.3 |
|
From: claudiuc <ird...@li...> - 2004-03-04 22:59:02
|
CVS commit by claudiuc: Spelling fixes and removed TAB characters M +35 -35 smcinit/README.Tom 1.5 |
|
From: claudiuc <ird...@li...> - 2004-03-05 00:27:11
|
CVS commit by claudiuc:
* Made fir, sir variables unsigned int (just to be sure are non-negative)
* Checkings for strtoul() conversion
* Spelling fixes in help and also more friendly to end-user
* Fixed the short getopt string that made the program to coredump
CCMAIL: tho...@gm...
M +3 -3 smcinit/Makefile 1.4
M +39 -11 smcinit/tosh-smcinit.c 1.4
--- smcinit/Makefile #1.3:1.4
@@ -43,5 +43,5 @@
SOURCES1 = tosh1800-smcinit.c
-SOURCES2 = tosh5100-smcinit.c
+SOURCES2 = tosh-smcinit.c
SOURCES = $(SOURCES1) $(SOURCES2)
OBJECTS1 = $(SOURCES1:%.c=%.o)
@@ -49,5 +49,5 @@
OBJECTS = $(OBJECTS1) $(OBJECTS2)
TARGETS1 = tosh1800-smcinit
-TARGETS2 = tosh5100-smcinit
+TARGETS2 = tosh-smcinit
TARGETS = $(TARGETS1) $(TARGETS2)
--- smcinit/tosh-smcinit.c #1.3:1.4
@@ -112,12 +112,12 @@ static char *options_explications[] = {
"\t\t\tshow this help",
"\t\t\tbe verbose, show the compiled-in settings.",
- "\t\tset the sir-ioport",
- "\t\tset the fir-ioport",
- "\t\tset the fir-interrupt",
- "\t\tset the fir-dma",
+ "\t\tset the SIR I/O port",
+ "\t\tset the FIR I/O port",
+ "\t\tset the FIR IRQ line",
+ "\t\tset the FIR DMA channel",
NULL
};
-static char *short_options = "Vhvsfid";
+static char *short_options = "Vhvs:f:i:d:";
@@ -164,4 +164,10 @@ void print_settings()
}
+void die(const char *message)
+{
+ fprintf(stderr,"%s: %s\n",PROGNAME,message);
+ exit(1);
+}
+
int set_smc(int sir_io, int fir_io, int fir_irq, int fir_dma, int verbose) {
/* setpci.c */
@@ -315,8 +321,10 @@ int main(int argc, char **argv) {
/* set default values */
- int sir_io = SIR_IO;
- int fir_io = FIR_IO;
- int fir_irq = FIR_IRQ;
- int fir_dma = FIR_DMA;
+ unsigned int sir_io = SIR_IO;
+ unsigned int fir_io = FIR_IO;
+ unsigned int fir_irq = FIR_IRQ;
+ unsigned int fir_dma = FIR_DMA;
+ const char *nptr;
+ char *endptr;
@@ -340,17 +348,37 @@ int main(int argc, char **argv) {
}
case 's': {
+ nptr=optarg;
+ endptr=NULL;
sir_io=strtoul(optarg, NULL, 0);
break;
+ if (!nptr || !*nptr || !endptr || *endptr) {
+ die("Cannot convert SIR I/O to number");
+ }
}
case 'f': {
- fir_io=strtoul(optarg, NULL, 0);
+ nptr=optarg;
+ endptr=NULL;
+ fir_io=strtoul(nptr, &endptr, 0);
+ if (!nptr || !*nptr || !endptr || *endptr) {
+ die("Cannot convert FIR I/O to number");
+ }
break;
}
case 'i': {
+ nptr=optarg;
+ endptr=NULL;
fir_irq=strtoul(optarg, NULL, 0);
+ if (!nptr || !*nptr || !endptr || *endptr) {
+ die("Cannot convert FIR IRQ to number");
+ }
break;
}
case 'd': {
+ nptr=optarg;
+ endptr=NULL;
fir_dma=strtoul(optarg, NULL, 0);
+ if (!nptr || !*nptr || !endptr || *endptr) {
+ die("Cannot convert FIR DMA to number");
+ }
break;
}
|
|
From: claudiuc <ird...@li...> - 2004-04-13 21:51:11
|
CVS commit by claudiuc: * Renamed the smcinit * Reorderd man pages * Initial man page for Thomas P. new smcinit CCMAIL: dc...@gm... A smcinit/smcinit.7 1.1 A smcinit/smcinit.c 1.1 [GPL (v2+)] M +2 -0 smcinit/.cvsignore 1.2 M +6 -8 smcinit/AUTHORS 1.3 M +12 -1 smcinit/ChangeLog 1.6 M +5 -5 smcinit/Makefile 1.5 M +22 -22 smcinit/README 1.4 M +69 -95 smcinit/smcinit 1.2 M +32 -6 smcinit/smcinit.8 1.5 R smcinit/tosh-smcinit.c 1.4 R smcinit/tosh5100-smcinit.8 1.2 |
|
From: claudiuc <ird...@li...> - 2004-04-20 21:24:59
|
CVS commit by claudiuc:
* Added tosh2450-smcinit.c from Josanuel Mariari This is the 0.4-1 release
A smcinit/tosh2450-smcinit.c 1.1 [no copyright]
M +6 -1 smcinit/AUTHORS 1.4
M +10 -2 smcinit/ChangeLog 1.7
M +14 -5 smcinit/Makefile 1.6
M +1 -1 smcinit/smcinit 1.3
--- smcinit/AUTHORS #1.3:1.4
@@ -9,7 +9,11 @@
-Rob Miller <ro...@ja...>
+Rob Miller <jmarino at vodafone dot es>
- tosh5100-smcinit.c
+
+Josanuel Mar...@cs...>
+
+ - tosh2450-smcinit.c
@@ -18,2 +22,3 @@
- manual pages, various cleanups, RPM package and
Linux distros integration
+
--- smcinit/ChangeLog #1.6:1.7
@@ -1,2 +1,9 @@
+2003-07-10 claudiuc 0.4-1 release
+
+2004-04-20 claudiuc
+ * add: added tosh2450-smcinit.c from Josanuel Mariari It make Toshiba Satellite 2450-101 to work on IrDA. Probably
+ will be integrated in the general smcinit utility.
+
2004-04-13 claudiuc
* doc: Written man page for Thomas new smcinit, but still I need
@@ -9,5 +16,5 @@
used not only with Toshiba laptops, but at least with any
LPC 47Nxxx SMSC-based chipset
-
+
2003-07-10 claudiuc
* doc: added README.Tom from Thomas Pinz
@@ -29,5 +36,5 @@
* prog: added GPL notice in tosh5100-smcinit.c as Rob Miller pointed
* redhat: RH 9.0 support (init script + spec file)
-
+
2003-07-02 claudiuc
* build: SuSE spec improved to generated compatible SuSE RPM
@@ -35,4 +42,5 @@
options;
* doc: separated manual pages and some improvements
+
2003-07-01 claudiuc
* cosmetic: renamed toshsat1800-irdasetup to tosh1800-smcinit
--- smcinit/Makefile #1.5:1.6
@@ -32,4 +32,5 @@
LIBS1 =
LIBS2 =
+LIBS3 =
LINK = gcc
LFLAGS =
@@ -44,11 +45,14 @@
SOURCES1 = tosh1800-smcinit.c
SOURCES2 = smcinit.c
-SOURCES = $(SOURCES1) $(SOURCES2)
+SOURCES3 = tosh2450-smcinit.c
+SOURCES = $(SOURCES1) $(SOURCES2) $(SOURCES3)
OBJECTS1 = $(SOURCES1:%.c=%.o)
OBJECTS2 = $(SOURCES2:%.c=%.o)
-OBJECTS = $(OBJECTS1) $(OBJECTS2)
+OBJECTS3 = $(SOURCES3:%.c=%.o)
+OBJECTS = $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
TARGETS1 = tosh1800-smcinit
TARGETS2 = smcinit
-TARGETS = $(TARGETS1) $(TARGETS2)
+TARGETS3 = tosh2450-smcinit
+TARGETS = $(TARGETS1) $(TARGETS2) $(TARGETS3)
@@ -69,4 +73,5 @@
$(INSTALL_PROGRAM) $(TARGETS1) $(INSTALL_ROOT)$(PREFIX)/sbin/$(TARGETS1)
$(INSTALL_PROGRAM) $(TARGETS2) $(INSTALL_ROOT)$(PREFIX)/sbin/$(TARGETS2)
+ $(INSTALL_PROGRAM) $(TARGETS3) $(INSTALL_ROOT)$(PREFIX)/sbin/$(TARGETS3)
@@ -79,4 +84,5 @@
rm -f $(INSTALL_ROOT)$(PREFIX)/sbin/$(TARGETS1)
rm -f $(INSTALL_ROOT)$(PREFIX)/sbin/$(TARGETS2)
+ rm -f $(INSTALL_ROOT)$(PREFIX)/sbin/$(TARGETS3)
clean:
@@ -89,5 +95,5 @@
./configure
-$(SOURCES1) $(SOURCES2): config.h
+$(SOURCES1) $(SOURCES2) $(SOURCES3): config.h
$(TARGETS1): $(OBJECTS1)
@@ -97,2 +103,5 @@
$(LINK) $(LFLAGS) -o $(TARGETS2) $(OBJECTS2) $(LIBS2) $(LIBS)
+$(TARGETS3): $(OBJECTS3)
+ $(LINK) $(LFLAGS) -o $(TARGETS3) $(OBJECTS3) $(LIBS3) $(LIBS)
+
|
|
From: claudiuc <ird...@li...> - 2004-04-20 21:28:29
|
CVS commit by claudiuc: Removed the executable file from CVS R smcinit/smcinit 1.3 |
|
From: claudiuc <ird...@li...> - 2004-04-20 21:31:49
|
CVS commit by claudiuc: Updated the ignore file M +1 -0 smcinit/.cvsignore 1.3 --- smcinit/.cvsignore #1.2:1.3 @@ -10,2 +10,3 @@ config.h smcinit +tosh2450-smcinit |
|
From: claudiuc <ird...@li...> - 2004-04-24 20:37:28
|
CVS commit by claudiuc: Wrong release date. Corrected! M +1 -1 smcinit/ChangeLog 1.8 --- smcinit/ChangeLog #1.7:1.8 @@ -1,3 +1,3 @@ -2003-07-10 claudiuc 0.4-1 release +2003-04-20 claudiuc 0.4-1 release 2004-04-20 claudiuc |
|
From: jfenal <ird...@li...> - 2005-01-19 23:43:00
|
CVS commit by jfenal: First checkin of the autoconf stuff. A smcinit/Makefile.am 1.1 A smcinit/autogen.sh 1.1 A smcinit/configure.ac 1.1 |
|
From: jfenal <ird...@li...> - 2005-01-19 23:44:30
|
CVS commit by jfenal: New boot time script & conf for RH/Mdk distros. Tested only on Mdk10.1 A smcinit/boot.smcinit.rhmdk 1.1 M +5 -0 smcinit/smcinit.sysconfig 1.4 --- smcinit/smcinit.sysconfig #1.3:1.4 @@ -6,2 +6,7 @@ # otherwise leave it empty SMCCONFIG="" +SMC_TTY=ttyS2 +SMC_SIRIOPORT=0x3e8 +SMC_FIRIOPORT=0x130 +SMC_FIRIRQ=7 +SMC_FIRDMA=3 |
|
From: jfenal <ird...@li...> - 2005-01-19 23:54:34
|
CVS commit by jfenal: More autoconf stuff + TODO Removal of config.h.in which should be generated by autoheader. A smcinit/TODO 1.1 M +5336 -9 smcinit/configure 1.2 M +3 -3 smcinit/smcinit.lsm.in 1.4 R smcinit/config.h.in 1.1.1.1 |
|
From: jfenal <ird...@li...> - 2005-01-19 23:56:19
|
CVS commit by jfenal: - bug fixes in arguments handling (some args would not even be considered) - autodiscovery of SMSC chip base address (0x2e or 0x4e) M +360 -279 smcinit/smcinit.c 1.2 |
|
From: jfenal <ird...@li...> - 2005-01-20 00:01:30
|
CVS commit by jfenal:
Removal of Makefile since generated by Makefile.{am,in}
R smcinit/Makefile 1.6
|
|
From: jfenal <ird...@li...> - 2005-01-20 00:02:10
|
CVS commit by jfenal: Bump version + nkotb M +3 -0 smcinit/AUTHORS 1.5 M +1 -1 smcinit/VERSION 1.3 --- smcinit/VERSION #1.2:1.3 @@ -1 +1 @@ -0.4-1 +0.5-1 --- smcinit/AUTHORS #1.4:1.5 @@ -23,2 +23,5 @@ Linux distros integration +Jme Fenal <jf...@fr...> + + - autoconf/automake, code cleanup, auto-discovery of entry point |
|
From: jfenal <ird...@li...> - 2005-01-20 00:06:35
|
CVS commit by jfenal: config.h.in is back because it is generated by autogen.sh. Standard user should not have to run autogen/autoheader but straight configure. M +1 -0 smcinit/autogen.sh 1.2 M +64 -5 smcinit/config.h.in 1.3 --- smcinit/autogen.sh #1.1:1.2 @@ -3,4 +3,5 @@ Version=$(< VERSION) aclocal +autoheader autoconf automake -a -c |
|
From: jfenal <ird...@li...> - 2005-01-20 00:23:04
|
CVS commit by jfenal: Learned how to generate files from files.in Removed release part from VERSION which is really a pure RPM stuff. M +1 -1 smcinit/VERSION 1.4 M +14 -11 smcinit/configure 1.3 M +2 -2 smcinit/configure.ac 1.2 M +1 -1 smcinit/smcinitredhat.spec.in 1.3 M +1 -1 smcinit/smcinitsuse.spec.in 1.4 |
|
From: jfenal <ird...@li...> - 2005-01-20 00:29:48
|
CVS commit by jfenal:
Add a word about autogen.sh if checking out from CVS.
M +15 -3 smcinit/INSTALL 1.5
--- smcinit/INSTALL #1.4:1.5
@@ -22,11 +22,23 @@
-----------------
- Then run:
-
+ If you got the dist tarball, such as smcinit-0.5.tar.gz, untar it:
+
+ tar xvfj smcinit-0.5.tar.gz
+ cd smcinit-0.5
+
+ then:
+
./configure
make
make install (as root user)
-
+
+ If you brave just checked out from the irda CVS, one more step is needed first:
+
+ ./autogen.sh
+ ./configure
+ make
+ make install (as root user)
+
Notes
|
|
From: jfenal <ird...@li...> - 2005-01-22 08:05:37
|
CVS commit by jfenal: Added the ability to disable the UART from the specified device, in order to replace a call to setserial. M +2 -1 smcinit/configure.ac 1.3 M +9 -4 smcinit/smcinit.8 1.6 M +85 -2 smcinit/smcinit.c 1.3 |
|
From: jfenal <ird...@li...> - 2005-01-22 08:06:47
|
CVS commit by jfenal: Add a cvs tag to version M +1 -1 smcinit/VERSION 1.5 --- smcinit/VERSION #1.4:1.5 @@ -1 +1 @@ -0.5 +0.5cvs |
Thanks for helping keep SourceForge clean.
X