View | Details | Raw Unified
Collapse All | Expand All

(-) slmodem-2.9.11-20080417/drivers/Makefile.orig (-20 / +24 lines)
 Lines 23-35    Link Here  
ARCH64:=$(shell uname -m | sed -e '/amd64/s//x86_64/' | grep -c x86_64)
ARCH64:=$(shell uname -m | sed -e '/amd64/s//x86_64/' | grep -c x86_64)

        
ifeq ($(ARCH64), 0)
ifeq ($(ARCH64), 0)

            

              
obj-m:= slamr.o slusb.o

              
obj-m:= slamr.o

            

            

              
else

              
#obj-m:= slamr.o slusb.o

            

            

              
obj-m:= slusb.o

              
#else

            

            

              

              
#obj-m:= slusb.o

            

        
endif
endif

        

        
slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o
slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o

            

              
slusb-objs:= st7554.o

              
#slusb-objs:= st7554.o

            

        

        
ifndef KERNELRELEASE
ifndef KERNELRELEASE

        
ifndef KERNEL_VER
ifndef KERNEL_VER

  

    

    

       Lines 52-69
       
    
  Link Here 
    

  

        
	mkdir -p ${DESTDIR}/dev
	mkdir -p ${DESTDIR}/dev

        
	$(foreach minor,0 1 2 3, \
	$(foreach minor,0 1 2 3, \

        
	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 242 $(minor) ; ) echo -n
	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 242 $(minor) ; ) echo -n

            

              
	$(foreach minor,0 1 2 3, \

              
#	$(foreach minor,0 1 2 3, \

            

            

              
	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 243 $(minor) ; ) echo -n

              
#	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 243 $(minor) ; ) echo -n

            

        
remove-devices:
remove-devices:

        
	$(foreach minor,0 1 2 3, \
	$(foreach minor,0 1 2 3, \

        
	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n
	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n

            

              
	$(foreach minor,0 1 2 3, \

              
#	$(foreach minor,0 1 2 3, \

            

            

              
	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n

              
#	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n

            

        

        
else
else

        
ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)
ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)

        

            

              
slusb-objs:= old_st7554.o

              
#slusb-objs:= old_st7554.o

            

        
obj:=.
obj:=.

        
module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc

        

  

    

    

       Lines 72-101
       
    
  Link Here 
    

  

        
all: $(obj-m)
all: $(obj-m)

        

        
slamr.o: $(slamr-objs)
slamr.o: $(slamr-objs)

            

              
slusb.o: $(slusb-objs)

              
#slusb.o: $(slusb-objs)

            

            

              
slamr.o slusb.o:

              
#slamr.o slusb.o:

            

            

              

              
slamr.o :

            

        
	$(LD) -r -o $@ $^
	$(LD) -r -o $@ $^

        

        
install: uninstall-old
install: uninstall-old

        
ifeq ($(ARCH64), 0)
ifeq ($(ARCH64), 0)

        
	install -D -m 644 slamr.o $(module-dir)/slamr.o
	install -D -m 644 slamr.o $(module-dir)/slamr.o

        
endif
endif

            

              
	install -D -m 644 slusb.o $(module-dir)/slusb.o

              
#	install -D -m 644 slusb.o $(module-dir)/slusb.o

            

        
	cp /etc/modules.conf /etc/modules.conf.slamr && \
	cp /etc/modules.conf /etc/modules.conf.slamr && \

        
	    echo 'alias char-major-242 slamr' >> /etc/modules.conf && \
	    echo 'alias char-major-242 slamr' >> /etc/modules.conf && \

            

              
	    echo 'alias char-major-243 slusb' >> /etc/modules.conf 

              
#	    echo 'alias char-major-243 slusb' >> /etc/modules.conf 

            

        
	/sbin/depmod -a
	/sbin/depmod -a

        
uninstall:
uninstall:

            

              
	/sbin/modprobe -r slamr slusb

              
#	/sbin/modprobe -r slamr slusb

            

            

              

              
	/sbin/modprobe -r slamr

            

        
	cp /etc/modules.conf /etc/modules.conf.slamr && \
	cp /etc/modules.conf /etc/modules.conf.slamr && \

            

              
	   egrep -ve 'alias char-major-242 slamr|alias char-major-243 slusb' /etc/modules.conf.slamr > /etc/modules.conf

              
          egrep -ve 'alias char-major-242 slamr' /etc/modules.conf.slamr > /etc/modules.conf

            

            

              

              
#	   egrep -ve 'alias char-major-242 slamr|alias char-major-243 slusb' /etc/modules.conf.slamr > /etc/modules.conf

            

        
	$(RM) $(module-dir)/slamr.o
	$(RM) $(module-dir)/slamr.o

            

              
	$(RM) $(module-dir)/slusb.o

              
#	$(RM) $(module-dir)/slusb.o

            

        
	/sbin/depmod -a
	/sbin/depmod -a

        
uninstall-old:
uninstall-old:

        
	$(RM) $(module-dir)/slmdm.o \
	$(RM) $(module-dir)/slmdm.o \

        
              $(module-dir)/slfax.o \
              $(module-dir)/slfax.o \

            

              
              $(module-dir)/slusb.o \

              
#              $(module-dir)/slusb.o \

            

        
              $(module-dir)/slamrmo.o \
              $(module-dir)/slamrmo.o \

        
              $(module-dir)/slmodem.o  # remove old 2.7,2.8 version
              $(module-dir)/slmodem.o  # remove old 2.7,2.8 version

        

  

    

    

       Lines 112-126
       
    
  Link Here 
    

  

        
ifeq ($(ARCH64), 0)
ifeq ($(ARCH64), 0)

        
	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
	install -D -m 644 slamr.ko $(module-dir)/slamr.ko

        
endif
endif

            

              
	install -D -m 644 slusb.ko $(module-dir)/slusb.ko

              
#	install -D -m 644 slusb.ko $(module-dir)/slusb.ko

            

        
	/sbin/depmod -a
	/sbin/depmod -a

        
uninstall:
uninstall:

        
ifeq ($(ARCH64), 0)
ifeq ($(ARCH64), 0)

        
	modprobe -r slamr ; echo -n
	modprobe -r slamr ; echo -n

        
endif
endif

            

              
	modprobe -r slusb ; echo -n

              
#	modprobe -r slusb ; echo -n

            

        
	$(RM) $(module-dir)/slamr.ko
	$(RM) $(module-dir)/slamr.ko

            

              
	$(RM) $(module-dir)/slusb.ko

              
#	$(RM) $(module-dir)/slusb.ko

            

        
	/sbin/depmod -a
	/sbin/depmod -a

        
endif
endif