Changeset 42624 for titan

Timestamp:

08/05/18 15:35:38 (6 years ago)

Author:

obi

Message:

update i386 building

Location:

titan

Files:

• plugins/makei386.sh (added)
• titan/frontenddev.h (modified) (1 diff)
• titan/makei386.sh (modified) (1 diff)
• titan/struct.h (modified) (1 diff)

titan/titan/frontenddev.h

@@ -1726 +1726 @@
         else
         {
-                for(unsigned int i=0; i<prop[0].u.st.len; i++)
+                unsigned int i = 0;
+                for(i=0; i<prop[0].u.st.len; i++)
                 {
                         if (prop[0].u.st.stat[i].scale == FE_SCALE_RELATIVE)

titan/titan/makei386.sh

@@ -42 +42 @@
 fi
 
+SRCDIR=source.titan
 cd "$HOME"/flashimg/$SRCDIR/titan
+FRAMEBUFFER=y
 
-gcc -DSIMULATE -DI386 -DCAMSUPP -Os -mhard-float -export-dynamic -Wall -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-unused-result -Wunused-variable -Wno-parentheses -Wno-maybe-uninitialized -I/usr/include/freetype2 -I "$HOME"/flashimg/$SRCDIR/libdreamdvd -I "$HOME" -c titan.c
-/bin/bash libtool --tag=CC --mode=link gcc -DSIMULATE -DI386 -DNOFB -Os -export-dynamic -Wall -Wno-unused-but-set-variable -pipe -Os  -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/usr/lib -L/lib -L/usr/lib -L/usr/lib/i386-linux-gnu -o titan titan.o -lpthread -ldl -lpng -lfreetype -ljpeg -lz -lm
+if [ "$FRAMEBUFFER" == "y" ];then
+        # with framebuffer
+        gcc -DSIMULATE -DI386 -DCAMSUPP -Os -mhard-float -export-dynamic -Wall -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-unused-result -Wunused-variable -Wno-parentheses -Wno-maybe-uninitialized -I/usr/include/freetype2 -I "$HOME"/flashimg/$SRCDIR/libdreamdvd -I "$HOME" -c titan.c
+        /bin/bash libtool --tag=CC --mode=link gcc -DSIMULATE -DI386 -Os -export-dynamic -Wall -Wno-unused-but-set-variable -pipe -Os  -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/usr/lib -L/lib -L/usr/lib -L/usr/lib/i386-linux-gnu -o titan titan.o -lpthread -ldl -lpng -lfreetype -ljpeg -lz -lm
+else
+        # no framebuffer
+        gcc -DSIMULATE -DI386 -DNOFB -DCAMSUPP -Os -mhard-float -export-dynamic -Wall -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-unused-result -Wunused-variable -Wno-parentheses -Wno-maybe-uninitialized -I/usr/include/freetype2 -I "$HOME"/flashimg/$SRCDIR/libdreamdvd -I "$HOME" -c titan.c
+        /bin/bash libtool --tag=CC --mode=link gcc -DSIMULATE -DI386 -DNOFB -Os -export-dynamic -Wall -Wno-unused-but-set-variable -pipe -Os  -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/usr/lib -L/lib -L/usr/lib -L/usr/lib/i386-linux-gnu -o titan titan.o -lpthread -ldl -lpng -lfreetype -ljpeg -lz -lm
+fi

titan/titan/struct.h

@@ -2187 +2187 @@
 #endif
 
+#ifdef SIMULATE
+enum ca_descr_data_type {
+        CA_DATA_IV,
+        CA_DATA_KEY,
+};
+
+enum ca_descr_parity {
+        CA_PARITY_EVEN,
+        CA_PARITY_ODD,
+};
+
+struct ca_descr_data {
+        unsigned int index;
+        enum ca_descr_parity parity;
+        enum ca_descr_data_type data_type;
+        unsigned int length;
+        unsigned char *data;
+};
+
+#endif
+
 struct aes_xcbc_mac_ctx {
         uint8_t K[3][16];