rpms/nqc/FC-6 nqc-3.1.6-linux.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nqc.spec, 1.6, 1.7 sources, 1.2, 1.3
Rick L. Vinyard, Jr. (rvinyard)
fedora-extras-commits at redhat.com
Sat Jul 21 06:44:51 UTC 2007
- Previous message (by thread): rpms/nqc/F-7 nqc-3.1.6-linux.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nqc.spec, 1.6, 1.7 sources, 1.2, 1.3
- Next message (by thread): rpms/nqc/devel nqc-3.1.6-linux.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nqc.spec, 1.6, 1.7 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rvinyard
Update of /cvs/extras/rpms/nqc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31320/FC-6
Modified Files:
.cvsignore nqc.spec sources
Added Files:
nqc-3.1.6-linux.patch
Log Message:
New release
nqc-3.1.6-linux.patch:
--- NEW FILE nqc-3.1.6-linux.patch ---
diff -rN -U 5 nqc-3.1.r6.orig/Makefile nqc-3.1.r6/Makefile
--- nqc-3.1.r6.orig/Makefile 2005-03-16 10:49:40.000000000 -0700
+++ nqc-3.1.r6/Makefile 2007-07-20 23:44:41.000000000 -0600
@@ -64,10 +64,11 @@
MKDIR?=mkdir
MV?=mv -f
RM?=rm -f
# CFLAGS
+CFLAGS = $(RPM_OPT_FLAGS)
#CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes
CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
@@ -84,11 +85,11 @@
CXX = c++
else
ifneq (,$(strip $(findstring $(OSTYPE), Linux)))
# Linux
# uncomment this next line if you have the USB tower library installed
-# USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
+ USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
CFLAGS += -I/usr/local/include/LegoUSB -Wno-deprecated
else
ifneq (,$(findstring $(OSTYPE), SunOS))
# Solaris
CFLAGS += -DSOLARIS
diff -rN -U 5 nqc-3.1.r6.orig/rcxlib/LegoUSB/legousbtower.h nqc-3.1.r6/rcxlib/LegoUSB/legousbtower.h
--- nqc-3.1.r6.orig/rcxlib/LegoUSB/legousbtower.h 1969-12-31 17:00:00.000000000 -0700
+++ nqc-3.1.r6/rcxlib/LegoUSB/legousbtower.h 2007-07-20 23:46:38.000000000 -0600
@@ -0,0 +1,52 @@
+/*
+ * legousbtower Lego USB IR Tower Linux Driver
+ *
+ * Copyright (c) 2001-2002 The LegoUSB DevTeam <legousb-devteam at lists.sourceforge.net>
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef __LEGOUSBTOWER_H
+#define __LEGOUSBTOWER_H
+
+#define LEGO_TOWER_SET_PARAM _IOW('u', 0xb0, int)
+#define LEGO_TOWER_GET_PARAM _IOW('u', 0xb1, int)
+#define LEGO_TOWER_RESET _IO('u', 0xb3)
+
+
+#define LEGO_TOWER_SET_READ_TIMEOUT _IOW('u', 0xc8, int)
+#define LEGO_TOWER_SET_WRITE_TIMEOUT _IOW('u', 0xc9, int)
+
+
+#define LEGO_USB_TOWER_REQUEST_GET 1
+#define LEGO_USB_TOWER_REQUEST_SET 2
+#define LEGO_USB_TOWER_REQUEST_RESET 4
+
+
+#define LEGO_USB_TOWER_ADDRESS_MODE 1
+#define LEGO_USB_TOWER_ADDRESS_POWER_LEVEL 2
+
+#define LEGO_USB_TOWER_POWER_LEVEL_LOW 1
+#define LEGO_USB_TOWER_POWER_LEVEL_MEDIUM 2
+#define LEGO_USB_TOWER_POWER_LEVEL_HIGH 3
+
+#define LEGO_USB_TOWER_MODE_VLL 1
+#define LEGO_USB_TOWER_MODE_RCX 2
+
+
+
+struct request_reply
+{
+ unsigned short length;
+ unsigned char error_code;
+ unsigned char value;
+ unsigned char buffer[16]; // variable replies from the tower
+ // at this stage we aren't interested in the data
+};
+
+#endif
diff -rN -U 5 nqc-3.1.r6.orig/rcxlib/RCX_USBTowerPipe_linux.cpp nqc-3.1.r6/rcxlib/RCX_USBTowerPipe_linux.cpp
--- nqc-3.1.r6.orig/rcxlib/RCX_USBTowerPipe_linux.cpp 2005-10-14 13:51:10.000000000 -0600
+++ nqc-3.1.r6/rcxlib/RCX_USBTowerPipe_linux.cpp 2007-07-20 23:47:57.000000000 -0600
@@ -57,11 +57,11 @@
RCX_Pipe* RCX_NewUSBTowerPipe()
{
return new RCX_USBTowerPipe_linux();
}
-#define DEFAULT_TOWER_NAME "/dev/usb/lego0"
+#define DEFAULT_TOWER_NAME "/dev/legousbtower0"
RCX_Result RCX_USBTowerPipe_linux::Open(const char *name, int mode)
{
// if (name == 0 || *name==0)
{
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nqc/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Aug 2006 19:08:00 -0000 1.2
+++ .cvsignore 21 Jul 2007 06:44:19 -0000 1.3
@@ -1,3 +1,5 @@
+nqc-3.1.r6.tgz
NQC_Guide.pdf
NQC_Manual.pdf
-nqc-3.1.r4.tgz
+NQC_Tutorial.pdf
+NQCTutorialSamples.zip
Index: nqc.spec
===================================================================
RCS file: /cvs/extras/rpms/nqc/FC-6/nqc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nqc.spec 4 Feb 2007 05:40:18 -0000 1.6
+++ nqc.spec 21 Jul 2007 06:44:19 -0000 1.7
@@ -1,19 +1,21 @@
Name: nqc
-Version: 3.1.4
-Release: 6%{?dist}
+Version: 3.1.6
+Release: 1%{?dist}
Summary: Not Quite C compiler
Group: Development/Languages
License: MPL
URL: http://bricxcc.sourceforge.net/nqc/
-Source0: http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r4.tgz
+Source0: http://bricxcc.sourceforge.net/nqc/release/nqc-3.1.r6.tgz
Source1: 60-legousbtower.rules
-Source2: http://bricxcc.sourceforge.net/nqc/doc/faq.html
-Source3: http://bricxcc.sourceforge.net/nqc/doc/NQC_Manual.pdf
-Source4: http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf
-Patch0: nqc-3.1.4-linux.patch
-BuildRequires: flex >= 2.5 bison >= 2.0
-Requires(pre): %{_sbindir}/groupadd
+Source2: http://bricxcc.sourceforge.net/nqc/doc/faq.html
+Source3: http://bricxcc.sourceforge.net/nqc/doc/NQC_Manual.pdf
+Source4: http://bricxcc.sourceforge.net/nqc/doc/NQC_Guide.pdf
+Source5: http://bricxcc.sourceforge.net/nqc/doc/NQC_Tutorial.pdf
+Source6: http://bricxcc.sourceforge.net/nqc/doc/NQCTutorialSamples.zip
+Patch0: nqc-3.1.6-linux.patch
+BuildRequires: flex >= 2.5 bison >= 2.0
+Requires(pre): %{_sbindir}/groupadd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -22,13 +24,17 @@
%prep
-%setup -q -n nqc-3.1.r4
+%setup -c -q -n nqc-3.1.r6
%patch0 -p1
-for i in %{SOURCE2} %{SOURCE3} %{SOURCE4}; do
+for i in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
cp $i .
done
+%{__mkdir} tutorial_files
+%{__unzip} -qq -a %{SOURCE6} -d tutorial_files
+
+
# This piece of software seems to come from the Dark Side. Fix permissions and
# line endings.
find -type f -exec chmod 644 {} \; -exec perl -pi -e 's/\r\n/\n/g' {} \;
@@ -60,10 +66,15 @@
%{_mandir}/man1/nqc.1.gz
%{_sysconfdir}/udev/rules.d/60-legousbtower.rules
%doc readme.txt scout.txt history.txt LICENSE test.nqc
-%doc faq.html NQC_Manual.pdf NQC_Guide.pdf
+%doc faq.html NQC_Manual.pdf NQC_Guide.pdf NQC_Tutorial.pdf tutorial_files/
%changelog
+* Fri Jul 20 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.6-1
+- New upstream release
+- Added NQC tutorial and samples to docs
+- Added -c option to setup to create top-level directory
+
* Sat Feb 03 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 3.1.4-6
- Added RPM_OPTS to Makefile in patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nqc/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Aug 2006 19:08:00 -0000 1.2
+++ sources 21 Jul 2007 06:44:19 -0000 1.3
@@ -1,3 +1,5 @@
+2ed4b2728ab6f0d21723a466996ce91b nqc-3.1.r6.tgz
9fcb55ef19750fd2f5519e45cfe6a8fa NQC_Guide.pdf
8a03d3a0099e4ebdb76a8c8cacc76e0a NQC_Manual.pdf
-f7868445a25615ad82e6e63bf16aef3c nqc-3.1.r4.tgz
+987211739544e39dc8616af629aa02c8 NQC_Tutorial.pdf
+0fb3c6bcf3c171de8d2646bd9b555197 NQCTutorialSamples.zip
- Previous message (by thread): rpms/nqc/F-7 nqc-3.1.6-linux.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nqc.spec, 1.6, 1.7 sources, 1.2, 1.3
- Next message (by thread): rpms/nqc/devel nqc-3.1.6-linux.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nqc.spec, 1.6, 1.7 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list