WebSVN – svnkaklik – Path Comparison – / – /programy/C Rev 496 and /programy/C Rev 497

Ignore whitespace Rev 496 → Rev 497

 /programy/C/avr/Blik/avrm8ledtest.hex
 ,10 → 1,11
-:1000000012C02BC02AC029C028C027C026C025C0C6
-:1000100024C023C022C021C020C01FC01EC01DC0DC
-:100020001CC01BC01AC011241FBECFE5D4E0DEBF28
-:10003000CDBF10E0A0E6B0E0E0E9F0E002C005903E
+:1000000012C02CC02BC02AC029C028C027C026C0BF
+:1000100025C024C023C022C021C020C01FC01EC0D4
+:100020001DC01CC01BC011241FBECFE5D4E0DEBF25
+:10003000CDBF10E0A0E6B0E0E4E9F0E002C005903A
 :100040000D92A036B107D9F710E0A0E6B0E001C0EC
-:100050001D92A036B107E1F70DC0D2CF9C0106C0BA
-:1000600080EF90E00197F1F72150304021153105E4
-:10007000B9F70895CFE5D4E0DEBFCDBFA59AAD981E
-:1000800084EF91E0EBDFAD9A84EF91E0E7DFF7CF0B
+:100050001D92A036B107E1F70ED01BC0D1CF9C0195
+:1000600006C080EF90E00197F1F721503040211554
+:100070003105B9F70895CFE5D4E0DEBFCDBFA59A2D
+:10008000AD9884EF91E0EBDFAD9A84EF91E0E7DF8C
+:04009000F7CFFFCFD8
 :00000001FF

 /programy/C/avr/Blik/avrm8ledtest.map
 ,15 → 1,12
 Archive member included because of file (symbol)
-/usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_copy_data.o)
+/usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
+                              /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o (exit)
+/usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_copy_data.o)
                               avrm8ledtest.o (__do_copy_data)
-/usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_clear_bss.o)
+/usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_clear_bss.o)
                               avrm8ledtest.o (__do_clear_bss)
-Discarded input sections
- .stabstr       0x00000000        0x0 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
- .stabstr       0x00000000        0x0 avrm8ledtest.o
 Memory Configuration
 Name             Origin             Length             Attributes
 ,15 → 13,18
 text             0x00000000         0x00002000         xr
 data             0x00800060         0x0000ffa0         rw !x
 eeprom           0x00810000         0x00010000         rw !x
+fuse             0x00820000         0x00000400         rw !x
+lock             0x00830000         0x00000400         rw !x
+signature        0x00840000         0x00000400         rw !x
 *default*        0x00000000         0xffffffff
 Linker script and memory map
-LOAD /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+LOAD /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
 LOAD avrm8ledtest.o
-LOAD /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a
-LOAD /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/libc.a
-LOAD /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a
+LOAD /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a
+LOAD /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/libc.a
+LOAD /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a
 .hash
  *(.hash)
 ,12 → 116,24
 .rela.plt
  *(.rela.plt)
-.text           0x00000000       0x90
+.text           0x00000000       0x94
  *(.vectors)
- .vectors       0x00000000       0x26 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .vectors       0x00000000       0x26 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
 x00000000                __vectors
 x00000000                __vector_default
  *(.vectors)
+ *(.progmem.gcc*)
+ *(.progmem*)
+x00000026                . = ALIGN (0x2)
+x00000026                __trampolines_start = .
+ *(.trampolines)
+ .trampolines   0x00000026        0x0 linker stubs
+ *(.trampolines*)
+x00000026                __trampolines_end = .
+ *(.jumptables)
+ *(.jumptables*)
+ *(.lowtext)
+ *(.lowtext*)
 x00000026                __ctors_start = .
  *(.ctors)
 x00000026                __ctors_end = .
 ,28 → 142,21
 x00000026                __dtors_end = .
  SORT(*)(.ctors)
  SORT(*)(.dtors)
- *(.progmem.gcc*)
- *(.progmem*)
-x00000026                . = ALIGN (0x2)
- *(.jumptables)
- *(.jumptables*)
- *(.lowtext)
- *(.lowtext*)
  *(.init0)
- .init0         0x00000026        0x0 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .init0         0x00000026        0x0 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
 x00000026                __init
  *(.init0)
  *(.init1)
  *(.init1)
  *(.init2)
- .init2         0x00000026        0xc /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .init2         0x00000026        0xc /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
  *(.init2)
  *(.init3)
  *(.init3)
  *(.init4)
- .init4         0x00000032       0x16 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_copy_data.o)
+ .init4         0x00000032       0x16 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_copy_data.o)
 x00000032                __do_copy_data
- .init4         0x00000048       0x10 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_clear_bss.o)
+ .init4         0x00000048       0x10 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_clear_bss.o)
 x00000048                __do_clear_bss
  *(.init4)
  *(.init5)
 ,40 → 168,45
  *(.init8)
  *(.init8)
  *(.init9)
- .init9         0x00000058        0x2 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .init9         0x00000058        0x4 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
  *(.init9)
  *(.text)
- .text          0x0000005a        0x2 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
-x0000005a                __vector_1
-x0000005a                __vector_12
-x0000005a                __bad_interrupt
-x0000005a                __vector_6
-x0000005a                __vector_3
-x0000005a                __vector_11
-x0000005a                __vector_13
-x0000005a                __vector_17
-x0000005a                __vector_7
-x0000005a                __vector_5
-x0000005a                __vector_4
-x0000005a                __vector_9
-x0000005a                __vector_2
-x0000005a                __vector_15
-x0000005a                __vector_8
-x0000005a                __vector_14
-x0000005a                __vector_10
-x0000005a                __vector_16
-x0000005a                __vector_18
- .text          0x0000005c       0x34 avrm8ledtest.o
-x00000074                main
-x0000005c                delay_ms
- .text          0x00000090        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_copy_data.o)
- .text          0x00000090        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_clear_bss.o)
-x00000090                . = ALIGN (0x2)
+ .text          0x0000005c        0x2 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
+x0000005c                __vector_1
+x0000005c                __vector_12
+x0000005c                __bad_interrupt
+x0000005c                __vector_6
+x0000005c                __vector_3
+x0000005c                __vector_11
+x0000005c                __vector_13
+x0000005c                __vector_17
+x0000005c                __vector_7
+x0000005c                __vector_5
+x0000005c                __vector_4
+x0000005c                __vector_9
+x0000005c                __vector_2
+x0000005c                __vector_15
+x0000005c                __vector_8
+x0000005c                __vector_14
+x0000005c                __vector_10
+x0000005c                __vector_16
+x0000005c                __vector_18
+ .text          0x0000005e       0x34 avrm8ledtest.o
+x00000076                main
+x0000005e                delay_ms
+ .text          0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
+ .text          0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_copy_data.o)
+ .text          0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_clear_bss.o)
+x00000092                . = ALIGN (0x2)
  *(.text.*)
- .text.libgcc   0x00000090        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_copy_data.o)
- .text.libgcc   0x00000090        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_clear_bss.o)
-x00000090                . = ALIGN (0x2)
+ .text.libgcc   0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
+ .text.libgcc   0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_copy_data.o)
+ .text.libgcc   0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_clear_bss.o)
+x00000092                . = ALIGN (0x2)
  *(.fini9)
+ .fini9         0x00000092        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
+x00000092                exit
+x00000092                _exit
  *(.fini9)
  *(.fini8)
  *(.fini8)
 ,16 → 225,18
  *(.fini1)
  *(.fini1)
  *(.fini0)
+ .fini0         0x00000092        0x2 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
  *(.fini0)
-x00000090                _etext = .
+x00000094                _etext = .
-.data           0x00800060        0x0 load address 0x00000090
+.data           0x00800060        0x0 load address 0x00000094
 x00800060                PROVIDE (__data_start, .)
  *(.data)
- .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
  .data          0x00800060        0x0 avrm8ledtest.o
- .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_copy_data.o)
- .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_clear_bss.o)
+ .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
+ .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_copy_data.o)
+ .data          0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_clear_bss.o)
  *(.data*)
  *(.rodata)
  *(.rodata*)
 ,18 → 245,19
 x00800060                _edata = .
 x00800060                PROVIDE (__data_end, .)
-.bss            0x00800060        0x0
+.bss            0x00800060        0x0 load address 0x00000094
 x00800060                PROVIDE (__bss_start, .)
  *(.bss)
- .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
  .bss           0x00800060        0x0 avrm8ledtest.o
- .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_copy_data.o)
- .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.1/avr4/libgcc.a(_clear_bss.o)
+ .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_exit.o)
+ .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_copy_data.o)
+ .bss           0x00800060        0x0 /usr/lib/gcc/avr/4.2.2/avr4/libgcc.a(_clear_bss.o)
  *(.bss*)
  *(COMMON)
 x00800060                PROVIDE (__bss_end, .)
-x00000090                __data_load_start = LOADADDR (.data)
-x00000090                __data_load_end = (__data_load_start + SIZEOF (.data))
+x00000094                __data_load_start = LOADADDR (.data)
+x00000094                __data_load_end = (__data_load_start + SIZEOF (.data))
 .noinit         0x00800060        0x0
 x00800060                PROVIDE (__noinit_start, .)
 ,15 → 270,27
  *(.eeprom*)
 x00810000                __eeprom_end = .
-.stab           0x00000000      0x738
+.fuse
+ *(.fuse)
+ *(.lfuse)
+ *(.hfuse)
+ *(.efuse)
+.lock
+ *(.lock*)
+.signature
+ *(.signature*)
+.stab           0x00000000      0x744
  *(.stab)
- .stab          0x00000000      0x36c /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
- .stab          0x0000036c      0x3cc avrm8ledtest.o
+ .stab          0x00000000      0x378 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
+ .stab          0x00000378      0x3cc avrm8ledtest.o
 x3d8 (size before relaxing)
-.stabstr        0x00000000      0x761
+.stabstr        0x00000000      0x767
  *(.stabstr)
- .stabstr       0x00000000      0x761 /usr/lib/gcc/avr/4.2.1/../../../../avr/lib/avr4/crtm8.o
+ .stabstr       0x00000000      0x767 /usr/lib/gcc/avr/4.2.2/../../../../avr/lib/avr4/crtm8.o
 .stab.excl
  *(.stab.excl)
 ,3 → 347,4
 .debug_macinfo
  *(.debug_macinfo)
 OUTPUT(avrm8ledtest.out elf32-avr)
+LOAD linker stubs

/programy/C/avr/Blik/avrm8ledtest.out
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/programy/C/mips/indi/Config.in
File deleted

/programy/C/mips/indi/ipkg/indiserver.control
File deleted

 /programy/C/mips/indi/Makefile
 ,60 → 1,54
-# $Id: Makefile 1146 2005-06-05 13:32:28Z nbd $
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# This Makefile is a skeleton
+#
+# $Id: $
 include $(TOPDIR)/rules.mk
 PKG_NAME:=indiserver
 PKG_VERSION:=0.5
-PKG_RELEASE:=1
-PKG_MD5SUM:=
+PKG_SOURCE:=indilib-0.5.tar.gz
 PKG_SOURCE_URL:=http://download.sourceforge.net/indi
-PKG_SOURCE:=indilib-0.5.tar.gz
-PKG_CAT:=zcat
+PKG_MD5SUM:=
 PKG_BUILD_DIR:=$(BUILD_DIR)/indi
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
-$(eval $(call PKG_template,INDISERVER,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/indiserver
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Instrument Neutral Distributed Interface server
+  URL:=http://indi.sourceforge.net/
+  DEPENDS:=+libusb +zlib +libstdcpp
+endef
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-        (cd $(PKG_BUILD_DIR); \
-                $(TARGET_CONFIGURE_OPTS) \
-                CFLAGS="$(TARGET_CFLAGS)" \
-                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-                ./configure \
-                        CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
-                        CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-                        LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-                        LIBS="-luClibc++ -lc -lm -lgcc" \
-                        --target=$(GNU_TARGET_NAME) \
-                        --host=$(GNU_TARGET_NAME) \
-                        --build=$(GNU_HOST_NAME) \
-                        --prefix=/usr \
-                        --without-libiconv-prefix \
-                        --without-libintl-prefix \
-                        --disable-v4l2 \
-                        --disable-nls \
-        );
-        touch $@
+define Package/indiserver/description
+        INDI is a distributed control protocol designed to operate
+        astronomical instrumentation. INDI is small, flexible, easy to parse,
+        and scalable. It supports common DCS functions
+        such as remote control, data acquisition, monitoring, and a lot more.
+endef
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR)/src \
-                CC=$(TARGET_CC)
-        touch $@
+CONFIGURE_ARGS += \
+        --disable-v4l2 \
+        --disable-nls \
-$(IPKG_INDISERVER):
-        mkdir -p $(IDIR_INDISERVER)/usr/sbin
-        cp $(PKG_BUILD_DIR)/src/indiserver $(IDIR_INDISERVER)/usr/sbin/
-        cp $(PKG_BUILD_DIR)/src/lx200basic $(IDIR_INDISERVER)/usr/sbin/
-        cp $(PKG_BUILD_DIR)/src/lx200generic $(IDIR_INDISERVER)/usr/sbin/
-        cp $(PKG_BUILD_DIR)/src/v4ldriver $(IDIR_INDISERVER)/usr/sbin/
-        cp $(PKG_BUILD_DIR)/src/v4lphilips $(IDIR_INDISERVER)/usr/sbin/
-        $(STRIP) $(IDIR_INDISERVER)/usr/sbin/*
-        $(IPKG_BUILD) $(IDIR_INDISERVER) $(PACKAGE_DIR)
+define Build/Compile
+        # pass CFLAGS again to override -O2 set by configure
+        $(MAKE) -C $(PKG_BUILD_DIR)/src DESTDIR="$(PKG_INSTALL_DIR)" install
+endef
-mostlyclean:
-        $(MAKE) -C $(PKG_BUILD_DIR) clean
-        rm -f $(PKG_BUILD_DIR)/.built
+define Package/indiserver/install
+        $(INSTALL_DIR) $(1)/usr/bin
+        $(INSTALL_BIN) $(BUILD_DIR)/indi/src $(1)/usr/bin/
+endef
+$(eval $(call BuildPackage,indiserver))

/programy/C/mips/indi/patches/indiserver-0.5.patch
1,4 → 1,3
diff -ruN indi/src/apogee/ApogeeUsbLinux.cpp indi.new/src/apogee/ApogeeUsbLinux.cpp
--- indi/src/apogee/ApogeeUsbLinux.cpp 2007-04-15 21:14:46.000000000 +0200
+++ indi.new/src/apogee/ApogeeUsbLinux.cpp 2007-10-13 12:15:14.000000000 +0200
@@ -21,7 +21,7 @@
10,7 → 9,6
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ruN indi/src/apogee/CameraIO_LinuxISA.cpp indi.new/src/apogee/CameraIO_LinuxISA.cpp
--- indi/src/apogee/CameraIO_LinuxISA.cpp 2007-04-15 21:14:46.000000000 +0200
+++ indi.new/src/apogee/CameraIO_LinuxISA.cpp 2007-10-13 12:11:04.000000000 +0200
@@ -22,7 +22,7 @@
22,7 → 20,6
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ruN indi/src/apogee/CameraIO_LinuxPCI.cpp indi.new/src/apogee/CameraIO_LinuxPCI.cpp
--- indi/src/apogee/CameraIO_LinuxPCI.cpp 2007-04-15 21:14:46.000000000 +0200
+++ indi.new/src/apogee/CameraIO_LinuxPCI.cpp 2007-10-13 12:12:30.000000000 +0200
@@ -22,7 +22,7 @@
34,7 → 31,6
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/ioctl.h>
diff -ruN indi/src/indicom.c indi.new/src/indicom.c
--- indi/src/indicom.c 2007-04-15 23:06:20.000000000 +0200
+++ indi.new/src/indicom.c 2007-10-13 12:25:38.000000000 +0200
@@ -236,10 +236,6 @@

Subversion Repositories svnkaklik

Compare Revisions

Ignore whitespace Rev 496 → Rev 497