WebSVN – HelenOS – Path Comparison – / – /branches/dd/ Rev 4221 and /branches/dd/ Rev 4220

Ignore whitespace Rev 4221 → Rev 4220

/branches/dd/uspace/srv/pci/libpci/us2i.c
File deleted
\ No newline at end of file

 /branches/dd/uspace/srv/pci/libpci/i386-ports.c
 ,12 → 14,9
 #include "internal.h"
-#define PCI_CONF1   0xcf8
-#define PCI_CONF1_SIZE  8
 static void conf12_init(struct pci_access *a)
-{
+{
 }
 static void conf12_cleanup(struct pci_access *a UNUSED)
 ,14 → 70,6
 {
     unsigned int tmp;
     int res = 0;
-    /*
-     * Gain control over PCI configuration ports.
-     */
-    void * addr;
-    if (pio_enable((void *)PCI_CONF1, PCI_CONF1_SIZE, &addr)) {
-        return 0;
-    }
     pio_write_8(0xCFB, 0x01);
     tmp = pio_read_32(0xCF8);
 ,17 → 142,6
 static int conf2_detect(struct pci_access *a)
 {
-    /*
-     * Gain control over PCI configuration ports.
-     */
-    void * addr;
-    if (pio_enable((void *)PCI_CONF1, PCI_CONF1_SIZE, &addr)) {
-        return 0;
-    }
-    if (pio_enable((void *)0xC000, 0x1000, &addr)) {
-        return 0;
-    }
     /* This is ugly and tends to produce false positives. Beware. */
     pio_write_8(0xCFB, 0x00);
     pio_write_8(0xCF8, 0x00);
 ,7 → 178,7
         pio_write_8(0xcf8, 0);
         return pci_generic_block_read(d, pos, buf, len);
     }
-    pio_write_8(0xcf8, 0);
+    pio_write_8((void *)0xcf8, 0);
     return 1;
 }

 /branches/dd/uspace/srv/pci/libpci/Makefile
 ,7 → 15,7
 PCILIB=libpci.a
-OBJS += i386-ports.o us2i.o
+OBJS += i386-ports.o
 all: $(PCILIB)

/branches/dd/uspace/srv/pci/libpci/pci.h
26,7 → 26,6
/* Known access methods, remember to update access.c as well */
PCI_ACCESS_I386_TYPE1, /* i386 ports, type 1 (params: none) */
PCI_ACCESS_I386_TYPE2, /* i386 ports, type 2 (params: none) */
PCI_ACCESS_US2I,
PCI_ACCESS_MAX
};

 /branches/dd/uspace/srv/pci/libpci/access.c
 ,19 → 16,8
 #include "internal.h"
 static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
-    #ifdef UARCH_ia32
     &pm_intel_conf1,
     &pm_intel_conf2,
-    #else
-,
-,
-    #endif
-    #ifdef UARCH_sparc64
-    &pm_us2i
-    #else
-    #endif
 };
 struct pci_access *pci_alloc(void)

/branches/dd/uspace/srv/pci/libpci/internal.h
38,6 → 38,6
struct pci_dev pci_alloc_dev(struct pci_access );
int pci_link_dev(struct pci_access , struct pci_dev );

extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_us2i, pm_linux_proc,
extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_linux_proc,
pm_fbsd_device, pm_aix_device, pm_nbsd_libpci, pm_obsd_device,
pm_dump, pm_linux_sysfs;

 /branches/dd/uspace/srv/pci/pci.c
 ,6 → 22,9
 #include "libpci/pci.h"
+#define PCI_CONF1   0xcf8
+#define PCI_CONF1_SIZE  8
 #define NAME        "PCI"
 static struct pci_access *pacc;
 ,7 → 37,13
     ipcarg_t ns_in_phone_hash;
     printf("%s: HelenOS PCI driver\n", NAME);
+    /*
+     * Gain control over PCI configuration ports.
+     */
+    void * addr;
+    pio_enable((void *) PCI_CONF1, PCI_CONF1_SIZE, &addr);
     pacc = pci_alloc();           /* Get the pci_access structure */
     pci_init(pacc);               /* Initialize the PCI library */
     pci_scan_bus(pacc);           /* We want to get the list of devices */

 /branches/dd/uspace/Makefile
 ,8 → 65,7
 ifeq ($(UARCH),sparc64)
     DIRS += \
         srv/fhc \
-        srv/obio \
-        srv/pci
+        srv/obio
 endif
 BUILDS := $(addsuffix .build,$(DIRS))

 /branches/dd/kernel/generic/include/string.h
 ,14 → 42,14
 extern char invalch;
 extern wchar_t chr_decode(const char *, size_t *, size_t);
-extern bool chr_encode(const wchar_t, char *, size_t *, size_t);
-extern size_t str_lsize(const char *, count_t);
+extern bool chr_encode(const wchar_t, char *, size_t *, size_t limit);
+extern size_t utf8_count_bytes(const char *str, count_t count);
 extern bool ascii_check(const wchar_t ch);
 extern bool unicode_check(const wchar_t ch);
 extern size_t strlen(const char *str);
-extern count_t str_length(const char *str);
-extern count_t wstr_length(const wchar_t *str);
+extern size_t strlen_utf8(const char *str);
+extern size_t strlen_utf32(const wchar_t *str);
 extern int strcmp(const char *src, const char *dst);
 extern int strncmp(const char *src, const char *dst, size_t len);

 /branches/dd/kernel/generic/src/printf/printf_core.c
 ,7 → 254,7
         return printf_putstr(nullstr, ps);
     /* Print leading spaces */
-    size_t size = str_length(str);
+    size_t size = strlen_utf8(str);
     if (precision == 0)
         precision = size;
 ,7 → 268,7
     }
     int retval;
-    size_t bytes = str_lsize(str, min(size, precision));
+    size_t bytes = utf8_count_bytes(str, min(size, precision));
     if ((retval = printf_putnchars_utf8(str, bytes, ps)) < 0)
         return -counter;
 ,7 → 298,7
         return printf_putstr(nullstr, ps);
     /* Print leading spaces */
-    size_t size = wstr_length(str);
+    size_t size = strlen_utf32(str);
     if (precision == 0)
         precision = size;

 /branches/dd/kernel/generic/src/lib/string.c
 ,35 → 199,37
     return true;
 }
-/** Get size of string, with length limit.
+/** Get bytes used by UTF-8 characters.
  *
- * Get the number of bytes which are used by up to @a max_len first
- * characters in the string @a str. If @a max_len is greater than
- * the length of @a str, the entire string is measured.
+ * Get the number of bytes (count of plain characters) which
+ * are used by a given count of UTF-8 characters in a string.
+ * As UTF-8 encoding is multibyte, there is no constant
+ * correspondence between number of characters and used bytes.
  *
- * @param str   String to consider.
- * @param count Maximum number of characters to measure.
+ * @param str   UTF-8 string to consider.
+ * @param count Number of UTF-8 characters to count.
  *
  * @return Number of bytes used by the characters.
+ *
  */
-size_t str_lsize(const char *str, count_t max_len)
+size_t utf8_count_bytes(const char *str, count_t count)
 {
-    count_t len = 0;
-    size_t cur = 0;
-    size_t prev;
+    size_t size = 0;
+    index_t index = 0;
+    index_t iprev;
     wchar_t ch;
     while (true) {
-        prev = cur;
-        if (len >= max_len)
+        iprev = index;
+        if (size >= count)
             break;
-        ch = chr_decode(str, &cur, UTF8_NO_LIMIT);
+        ch = chr_decode(str, &index, UTF8_NO_LIMIT);
         if (ch == '\0') break;
-        len++;
+        size++;
     }
-    return prev;
+    return iprev;
 }
 /** Check whether character is plain ASCII.
 ,7 → 262,7
  *
  * @param str NULL-terminated string.
  *
- * @return Number of characters in @a str.
+ * @return Number of characters in str.
  *
  */
 size_t strlen(const char *str)
 ,37 → 273,38
     return size;
 }
-/** Return number of characters in a string.
+/** Return number of UTF-8 characters in a string.
  *
- * @param str NULL-terminated string.
- * @return Number of characters in string.
+ * @param str NULL-terminated UTF-8 string.
+ *
+ * @return Number of UTF-8 characters in str.
+ *
  */
-count_t str_length(const char *str)
+size_t strlen_utf8(const char *str)
 {
-    count_t len = 0;
-    size_t offset = 0;
-    while (chr_decode(str, &offset, UTF8_NO_LIMIT) != 0) {
-        len++;
+    size_t size = 0;
+    index_t index = 0;
+    while (chr_decode(str, &index, UTF8_NO_LIMIT) != 0) {
+        size++;
     }
-    return len;
+    return size;
 }
-/** Return number of characters in a wide string.
+/** Return number of UTF-32 characters in a string.
  *
- * @param str NULL-terminated wide string.
- * @return Number of characters in @a str.
+ * @param str NULL-terminated UTF-32 string.
+ *
+ * @return Number of UTF-32 characters in str.
+ *
  */
-count_t wstr_length(const wchar_t *wstr)
+size_t strlen_utf32(const wchar_t *str)
 {
-    count_t len;
-    len = 0;
-    while (*wstr++ != '\0')
-        ++len;
-    return len;
+    size_t size;
+    for (size = 0; str[size]; size++);
+    return size;
 }
 /** Compare two NULL terminated strings

 /branches/dd/kernel/arch/sparc64/include/memstr.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup sparc64
+/** @addtogroup sparc64
  * @{
  */
 /** @file

 /branches/dd/kernel/arch/sparc64/src/drivers/sgcn.c
 ,7 → 130,7
 /* functions referenced from definitions of I/O operations structures */
-static void sgcn_putchar(outdev_t *, const wchar_t, bool);
+static void sgcn_putchar(outdev_t *, const char, bool);
 /** SGCN output device operations */
 static outdev_operations_t sgcnout_ops = {
 ,20 → 264,18
 }
 /**
- * SGCN output operation. Prints a single character to the SGCN. Newline
- * character is converted to CRLF.
+ * SGCN output operation. Prints a single character to the SGCN. If the line
+ * feed character is written ('\n'), the carriage return character ('\r') is
+ * written straight away.
  */
-static void sgcn_putchar(outdev_t *od, const wchar_t ch, bool silent)
+static void sgcn_putchar(outdev_t *od, const char c, bool silent)
 {
     if (!silent) {
         spinlock_lock(&sgcn_output_lock);
-        if (ascii_check(ch)) {
-            if (ch == '\n')
-                sgcn_do_putchar('\r');
-            sgcn_do_putchar(ch);
-        } else
-            sgcn_do_putchar(invalch);
+        sgcn_do_putchar(c);
+        if (c == '\n')
+            sgcn_do_putchar('\r');
         spinlock_unlock(&sgcn_output_lock);
     }

 /branches/dd/kernel/arch/sparc64/src/asm.S
 ,12 → 228,7
     b _memsetb
     nop
-.global memsetw
-memsetw:
-    b _memsetw
-    nop
 .macro WRITE_ALTERNATE_REGISTER reg, bit
     rdpr %pstate, %g1               ! save PSTATE.PEF
     wrpr %g0, (\bit | PSTATE_PRIV_BIT), %pstate

 /branches/dd/boot/arch/sparc64/loader/Makefile
 ,8 → 101,7
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-    $(USPACEDIR)/srv/pci/pci
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
 ifeq ($(MACHINE),generic)
 RD_SRVS += \

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4221 → Rev 4220