summaryrefslogtreecommitdiffstats
path: root/perl-install/c/stuff.xs.pl
diff options
context:
space:
mode:
authorNicolas Planel <nplanel@mandriva.com>2004-08-17 07:19:06 +0000
committerNicolas Planel <nplanel@mandriva.com>2004-08-17 07:19:06 +0000
commit62e4100e3f24b84b904f3fa77510fd9baa728ee7 (patch)
tree34c6ec503c5f11782a252b70cdff3449c1539ab4 /perl-install/c/stuff.xs.pl
parent06bdc2d81905773e9afb9ae0a58bc4e796f4ff89 (diff)
downloaddrakx-62e4100e3f24b84b904f3fa77510fd9baa728ee7.tar
drakx-62e4100e3f24b84b904f3fa77510fd9baa728ee7.tar.gz
drakx-62e4100e3f24b84b904f3fa77510fd9baa728ee7.tar.bz2
drakx-62e4100e3f24b84b904f3fa77510fd9baa728ee7.tar.xz
drakx-62e4100e3f24b84b904f3fa77510fd9baa728ee7.zip
rework smp-dmi, add dmi memory detection suppport
Diffstat (limited to 'perl-install/c/stuff.xs.pl')
-rw-r--r--perl-install/c/stuff.xs.pl112
1 files changed, 10 insertions, 102 deletions
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 68a339243..dc2ceafb7 100644
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -23,8 +23,6 @@ print '
#include <sys/stat.h>
#include <sys/utsname.h>
#include <sys/mount.h>
-#undef __USE_MISC
-#include <linux/wireless.h>
#include <linux/keyboard.h>
#include <linux/kd.h>
#include <linux/hdreg.h>
@@ -33,7 +31,6 @@ print '
#include <linux/cdrom.h>
#include <linux/loop.h>
#include <linux/blkpg.h>
-#include <linux/iso_fs.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
@@ -52,7 +49,6 @@ typedef __uint8_t u8;
#include <ext2fs/ext2fs.h>
// for UPS on USB:
-# define HID_MAX_USAGES 1024
#include <linux/hiddev.h>
#include <libldetect.h>
@@ -73,11 +69,11 @@ char *promRootName();
';
-$Config{archname} =~ /i.86/ and print '
+$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
char *pcmcia_probe(void);
';
-print '
+$ENV{C_RPM} and print '
#undef Fflush
#undef Mkdir
#undef Stat
@@ -95,7 +91,7 @@ void rpmError_callback(void) {
';
-print '
+$ENV{C_DRAKX} and print '
void log_message(const char * s, ...) {
va_list args;
@@ -148,17 +144,11 @@ SV * iconv_(char* s, char* from_charset, char* to_charset) {
return newSVpv(retval, 0);
}
-int length_of_space_padded(char *str, int len) {
- while (len >= 0 && str[len-1] == \' \')
- --len;
- return len;
-}
-
MODULE = c::stuff PACKAGE = c::stuff
';
-$Config{archname} =~ /i.86/ and print '
+$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
char *
pcmcia_probe()
';
@@ -229,23 +219,6 @@ is_ext3(device_name)
OUTPUT:
RETVAL
-char *
-get_ext2_label(device_name)
- char * device_name
- CODE:
- {
- ext2_filsys fs;
- int retval = ext2fs_open (device_name, 0, 0, 0, unix_io_manager, &fs);
- if (retval) {
- RETVAL = 0;
- } else {
- RETVAL = fs->super->s_volume_name;
- ext2fs_close(fs);
- }
- }
- OUTPUT:
- RETVAL
-
void
setlocale()
CODE:
@@ -366,6 +339,9 @@ usleep(microseconds)
int
detectSMP()
+int
+dmiDetectMemory()
+
void
pci_probe()
PPCODE:
@@ -425,68 +401,13 @@ hasNetDevice(device)
int s = socket(AF_INET, SOCK_DGRAM, 0);
if (s == -1) { RETVAL = 0; return; }
- strncpy(req.ifr_name, device, IFNAMSIZ);
+ strcpy(req.ifr_name, device);
RETVAL = ioctl(s, SIOCGIFFLAGS, &req) == 0;
close(s);
OUTPUT:
RETVAL
-
-int
-isNetDeviceWirelessAware(device)
- char * device
- CODE:
- struct iwreq ifr;
-
- int s = socket(AF_INET, SOCK_DGRAM, 0);
-
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, device, IFNAMSIZ);
- RETVAL = ioctl(s, SIOCGIWNAME, &ifr) != -1;
- close(s);
- OUTPUT:
- RETVAL
-
-
-void
-get_netdevices()
- PPCODE:
- struct ifconf ifc;
- struct ifreq *ifr;
- int i;
- int numreqs = 10;
-
- int s = socket(AF_INET, SOCK_DGRAM, 0);
-
- ifc.ifc_buf = NULL;
- for (;;) {
- ifc.ifc_len = sizeof(struct ifreq) * numreqs;
- ifc.ifc_buf = realloc(ifc.ifc_buf, ifc.ifc_len);
-
- if (ioctl(s, SIOCGIFCONF, &ifc) < 0) {
- perror("SIOCGIFCONF");
- return;
- }
- if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
- /* assume it overflowed and try again */
- numreqs += 10;
- continue;
- }
- break;
- }
- if (ifc.ifc_len) {
- ifr = ifc.ifc_req;
- EXTEND(sp, ifc.ifc_len);
- for (i=0; i < ifc.ifc_len; i+= sizeof(struct ifreq)) {
- PUSHs(sv_2mortal(newSVpv(ifr->ifr_name, 0)));
- ifr++;
- }
- }
-
- close(s);
-
-
char*
getNetDriver(char* device)
ALIAS:
@@ -497,7 +418,7 @@ getNetDriver(char* device)
int s = socket(AF_INET, SOCK_DGRAM, 0);
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, device, IFNAMSIZ);
+ strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
drvinfo.cmd = ETHTOOL_GDRVINFO;
ifr.ifr_data = (caddr_t) &drvinfo;
@@ -705,22 +626,9 @@ standard_charset()
OUTPUT:
RETVAL
-void
-get_iso_volume_ids(int fd)
- INIT:
- struct iso_primary_descriptor voldesc;
- PPCODE:
- lseek(fd, 16 * ISOFS_BLOCK_SIZE, SEEK_SET);
- if (read(fd, &voldesc, sizeof(struct iso_primary_descriptor)) == sizeof(struct iso_primary_descriptor)) {
- if (voldesc.type[0] == ISO_VD_PRIMARY && !strncmp(voldesc.id, ISO_STANDARD_ID, sizeof(voldesc.id))) {
- XPUSHs(sv_2mortal(newSVpv(voldesc.volume_id, length_of_space_padded(voldesc.volume_id, sizeof(voldesc.volume_id)))));
- XPUSHs(sv_2mortal(newSVpv(voldesc.application_id, length_of_space_padded(voldesc.application_id, sizeof(voldesc.application_id)))));
- }
- }
-
';
-print '
+$ENV{C_RPM} and print '
const char *
rpmErrorString()